update to besu 25.1-delivery42

This updates the linea-tracer to use the latest development branch of (linea) besu, and address some minor changes to its API.
Consensys · Jan 14, 2025 · 615340b · 615340b
1 parent b9ddc4f
commit 615340b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/arithmetization/src/main/java/net/consensys/linea/blockcapture/BlockCapturer.java b/arithmetization/src/main/java/net/consensys/linea/blockcapture/BlockCapturer.java
@@ -173,7 +173,7 @@ public void tracePreExecution(MessageFrame frame) {
             // Sanity check block within last 256 blocks.
             if (blockNumber < currentBlockNumber && (currentBlockNumber - blockNumber) <= 256) {
               // Use enclosing frame to determine hash
-              Hash blockHash = frame.getBlockHashLookup().apply(blockNumber);
+              Hash blockHash = frame.getBlockHashLookup().apply(frame, blockNumber);
               // Record it was seen
               this.reaper.touchBlockHash(blockNumber, blockHash);
             }

diff --git a/...tization/src/main/java/net/consensys/linea/blockcapture/snapshots/ConflationSnapshot.java b/...tization/src/main/java/net/consensys/linea/blockcapture/snapshots/ConflationSnapshot.java
@@ -20,7 +20,8 @@
 import java.util.Map;
 
 import org.hyperledger.besu.datatypes.Hash;
-import org.hyperledger.besu.evm.operation.BlockHashOperation.BlockHashLookup;
+import org.hyperledger.besu.evm.blockhash.BlockHashLookup;
+import org.hyperledger.besu.evm.frame.MessageFrame;
 
 /**
  * Contain the minimal set of information to replay a conflation as a unit test without requiring
@@ -64,7 +65,7 @@ private static class BlockHashMap implements BlockHashLookup {
     private final Map<Long, Hash> blockHashCache = new HashMap<>();
 
     @Override
-    public Hash apply(Long blockNumber) {
+    public Hash apply(MessageFrame frame, Long blockNumber) {
       // Sanity check we found the hash
       if (!this.blockHashCache.containsKey(blockNumber)) {
         // Missing for some reason

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 releaseVersion=0.8.0-rc8
-besuVersion=24.12-delivery41
+besuVersion=25.1-delivery42
 besuArtifactGroup=io.consensys.linea-besu
 distributionIdentifier=linea-tracer
 distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/

diff --git a/reference-tests/src/test/java/net/consensys/linea/CorsetBlockProcessor.java b/reference-tests/src/test/java/net/consensys/linea/CorsetBlockProcessor.java
@@ -40,8 +40,8 @@
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.worldview.BonsaiWorldState;
 import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
-import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
-import org.hyperledger.besu.evm.operation.BlockHashOperation;
+import org.hyperledger.besu.ethereum.vm.BlockchainBasedBlockHashLookup;
+import org.hyperledger.besu.evm.blockhash.BlockHashLookup;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 @Slf4j
@@ -96,8 +96,8 @@ public BlockProcessingResult processBlock(
 
       final WorldUpdater worldStateUpdater = worldState.updater();
 
-      final BlockHashOperation.BlockHashLookup blockHashLookup =
-          new CachingBlockHashLookup(blockHeader, blockchain);
+      final BlockHashLookup blockHashLookup =
+          new BlockchainBasedBlockHashLookup(blockHeader, blockchain);
       final Address miningBeneficiary =
           miningBeneficiaryCalculator.calculateBeneficiary(blockHeader);
 

diff --git a/reference-tests/src/test/java/net/consensys/linea/GeneralStateReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/GeneralStateReferenceTestTools.java
@@ -43,7 +43,7 @@
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.BlockchainBasedBlockHashLookup;
 import org.hyperledger.besu.evm.account.Account;
 import org.hyperledger.besu.evm.log.Log;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
@@ -187,7 +187,7 @@ public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
             transaction,
             blockHeader.getCoinbase(),
             zkTracer,
-            new CachingBlockHashLookup(blockHeader, blockchain),
+            new BlockchainBasedBlockHashLookup(blockHeader, blockchain),
             false,
             TransactionValidationParams.processingBlock(),
             blobGasPrice);

diff --git a/testing/src/main/java/net/consensys/linea/testing/ExecutionEnvironment.java b/testing/src/main/java/net/consensys/linea/testing/ExecutionEnvironment.java
@@ -28,7 +28,7 @@
 import net.consensys.linea.corset.CorsetValidator;
 import net.consensys.linea.zktracer.ZkTracer;
 import org.apache.tuweni.bytes.Bytes32;
-import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfig;
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions;
 import org.hyperledger.besu.consensus.clique.CliqueForksSchedulesFactory;
@@ -57,8 +57,8 @@
 public class ExecutionEnvironment {
   public static final String CORSET_VALIDATION_RESULT = "Corset validation result: ";
 
-  static GenesisConfigFile GENESIS_CONFIG =
-      GenesisConfigFile.fromSource(GenesisConfigFile.class.getResource("/linea.json"));
+  static GenesisConfig GENESIS_CONFIG =
+      GenesisConfig.fromSource(GenesisConfig.class.getResource("/linea.json"));
 
   static final BlockHeaderBuilder DEFAULT_BLOCK_HEADER_BUILDER =
       BlockHeaderBuilder.createDefault()

diff --git a/testing/src/main/java/net/consensys/linea/testing/GeneralStateReferenceTestTools.java b/testing/src/main/java/net/consensys/linea/testing/GeneralStateReferenceTestTools.java
@@ -40,7 +40,7 @@
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.BlockchainBasedBlockHashLookup;
 import org.hyperledger.besu.evm.account.Account;
 import org.hyperledger.besu.evm.log.Log;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
@@ -111,7 +111,7 @@ public static void executeTest(
               transaction,
               blockHeader.getCoinbase(),
               tracer,
-              new CachingBlockHashLookup(blockHeader, blockchain),
+              new BlockchainBasedBlockHashLookup(blockHeader, blockchain),
               false,
               TransactionValidationParams.processingBlock(),
               blobGasPrice);

diff --git a/testing/src/main/java/net/consensys/linea/testing/ReplayExecutionEnvironment.java b/testing/src/main/java/net/consensys/linea/testing/ReplayExecutionEnvironment.java
@@ -49,9 +49,9 @@
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
 import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.blockhash.BlockHashLookup;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.evm.internal.Words;
-import org.hyperledger.besu.evm.operation.BlockHashOperation;
 import org.hyperledger.besu.evm.tracing.OperationTracer;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
@@ -187,7 +187,7 @@ private static void executeFrom(
       final boolean txResultChecking,
       final boolean useCoinbaseAddressFromBlockHeader,
       final TransactionProcessingResultValidator resultValidator) {
-    BlockHashOperation.BlockHashLookup blockHashLookup = conflation.toBlockHashLookup();
+    BlockHashLookup blockHashLookup = conflation.toBlockHashLookup();
     // Initialise world state from conflation
     MutableWorldState world = initWorld(conflation);
     // Construct the transaction processor