feat: throw if fork id differs between fromBlock and toBlock

Author: amkCha

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/batchlinecount/ConflatedCountTracesV2.java

@@ -91,7 +91,7 @@ private ConflatedLineCounts countConflation(PluginRpcRequest request) {
 
     final long fromBlock = params.startBlockNumber();
     final long toBlock = params.endBlockNumber();
-    final LineCountingTracer counter = createLineCountingTracer(fromBlock);
+    final LineCountingTracer counter = createLineCountingTracer(fromBlock, toBlock);
 
     traceService.trace(
         fromBlock,
@@ -112,9 +112,9 @@ private ConflatedLineCounts countConflation(PluginRpcRequest request) {
         params.expectedTracesEngineVersion(), fromBlock, toBlock, new TreeMap<>(counts));
   }
 
-  private LineCountingTracer createLineCountingTracer(long blockNumber) {
+  private LineCountingTracer createLineCountingTracer(long fromBlock, long toBlock) {
     // Retrieve fork from Besu plugin API with block number
-    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock);
+    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock, toBlock);
 
     return tracerSharedConfiguration.isLimitless()
         ? new ZkCounter(l1L2BridgeSharedConfiguration)

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/capture/CaptureToFile.java

@@ -63,7 +63,7 @@ public Capture execute(final PluginRpcRequest request) {
     final long toBlock = params.toBlock();
 
     // Retrieve fork from Besu plugin API with block number
-    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock);
+    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock, toBlock);
 
     final BlockCapturer tracer = new BlockCapturer(fork);
 

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/linecounts/GenerateLineCountsV2.java

@@ -123,7 +123,7 @@ private LineCounts getLineCounts(PluginRpcRequest request) {
 
   private LineCountingTracer createLineCountingTracer(long blockNumber) {
     // Retrieve fork from Besu plugin API with block number
-    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock);
+    final Fork fork = getForkFromBesuBlockchainService(besuContext, blockNumber);
 
     return tracerSharedConfiguration.isLimitless()
         ? new ZkCounter(l1L2BridgeSharedConfiguration)

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/GenerateConflatedTracesV2.java

@@ -101,7 +101,7 @@ private TraceFile generateTraceFile(PluginRpcRequest request) {
     final long toBlock = params.endBlockNumber();
 
     // Retrieve fork from Besu plugin API with block number
-    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock);
+    final Fork fork = getForkFromBesuBlockchainService(besuContext, fromBlock, toBlock);
 
     final ZkTracer tracer =
         new ZkTracer(

arithmetization/src/main/java/net/consensys/linea/zktracer/Fork.java

@@ -81,19 +81,42 @@ private static Fork fromMainnetHardforkId(MainnetHardforkId hardForkId) {
   }
 
   /**
-   * Start a Besu Blockchain service and retrieve the hardfork id at a given block number
+   * Start a Besu Blockchain service and retrieve the hardfork id for a given block range
    *
    * @param context the context on which to start the service
-   * @param blockNumber the block number at which to retrieve the hardfork id
-   * @return Fork corresponding Fork instance
+   * @param fromBlock the block number at which to retrieve the hardfork id
+   * @param toBlock the block number at which to retrieve the hardfork id
+   * @return Fork corresponding Fork instance if the hardfork id is the same between fromBlock and
+   *     toBlock, else throw
    */
   // Waiting for https://github.com/hyperledger/besu/pull/9115 to uncomment
-  public static Fork getForkFromBesuBlockchainService(ServiceManager context, long blockNumber) {
-    //  MainnetHardforkId hardforkId =  BesuServiceProvider.getBesuService(context,
+  public static Fork getForkFromBesuBlockchainService(
+      ServiceManager context, long fromBlock, long toBlock) {
+    //  MainnetHardforkId hardforkIdFromBlock =  BesuServiceProvider.getBesuService(context,
     // BlockchainService.class)
-    // .getHardforkId(blockNumber)
+    // .getHardforkId(fromBlock)
     // .orElseThrow();
-    // return fromMainnetHardforkId(hardforkId);
+    // if (fromBlock != toBlock) {
+    //  MainnetHardforkId hardforkIdToBlock =  BesuServiceProvider.getBesuService(context,
+    // BlockchainService.class)
+    // .getHardforkId(toBlock)
+    // .orElseThrow();
+    //  if(hardforkIdFromBlock != hardforkIdToBlock) {
+    //    throw new IllegalArgumentException("Fork change between blocks " + fromBlock + " and " +
+    // toBlock) ;
+    //  }    }
+    // return fromMainnetHardforkId(hardforkIdFromBlock);
     return LONDON;
   }
+
+  /**
+   * Start a Besu Blockchain service and retrieve the hardfork id for a given block number
+   *
+   * @param context the context on which to start the service
+   * @param blockNumber the block number at which to retrieve the hardfork id
+   * @return Fork corresponding Fork instance
+   */
+  public static Fork getForkFromBesuBlockchainService(ServiceManager context, long blockNumber) {
+    return getForkFromBesuBlockchainService(context, blockNumber, blockNumber);
+  }
 }