Chore: set besuVersion=25.11.0-RC1-linea2 (#2459)

Signed-off-by: Fabio Di Fabio <[email protected]>

Author: fab-10

arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeSharedCliOptions.java

@@ -19,7 +19,7 @@
 import net.consensys.linea.plugins.LineaCliOptions;
 import net.consensys.linea.plugins.config.converters.AddressConverter;
 import net.consensys.linea.plugins.config.converters.BytesConverter;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 import org.hyperledger.besu.datatypes.Address;
 import picocli.CommandLine;
 
@@ -42,7 +42,7 @@ public class LineaL1L2BridgeSharedCliOptions implements LineaCliOptions {
       paramLabel = "<HEX_STRING>",
       converter = BytesConverter.class,
       description = "The log topic of the L1 L2 bridge (default: ${DEFAULT-VALUE})")
-  private Bytes l1l2BridgeTopic = Bytes.EMPTY;
+  private Bytes32 l1l2BridgeTopic = Bytes32.ZERO;
 
   private LineaL1L2BridgeSharedCliOptions() {}
 

arithmetization/src/main/java/net/consensys/linea/plugins/config/LineaL1L2BridgeSharedConfiguration.java

@@ -17,17 +17,17 @@
 
 import lombok.Builder;
 import net.consensys.linea.plugins.LineaOptionsConfiguration;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 import org.hyperledger.besu.datatypes.Address;
 
 /** The Linea L1 L2 bridge configuration. */
 @Builder(toBuilder = true)
-public record LineaL1L2BridgeSharedConfiguration(Address contract, Bytes topic)
+public record LineaL1L2BridgeSharedConfiguration(Address contract, Bytes32 topic)
     implements LineaOptionsConfiguration {
 
   // = Hash(MessageSent(address,address,uint256,uint256,uint256,bytes,bytes32))
-  private static Bytes LINEA_L2L1TOPIC =
-      Bytes.fromHexString("0xe856c2b8bd4eb0027ce32eeaf595c21b0b6b4644b326e5b7bd80a1cf8db72e6c");
+  private static Bytes32 LINEA_L2L1TOPIC =
+      Bytes32.fromHexString("0xe856c2b8bd4eb0027ce32eeaf595c21b0b6b4644b326e5b7bd80a1cf8db72e6c");
 
   private static final Address SEPOLIA_L2L1LOGS_SMC =
       Address.fromHexString("0x971e727e956690b9957be6d51Ec16E73AcAC83A7");
@@ -41,6 +41,6 @@ public record LineaL1L2BridgeSharedConfiguration(Address contract, Bytes topic)
   public static final LineaL1L2BridgeSharedConfiguration EMPTY =
       LineaL1L2BridgeSharedConfiguration.builder()
           .contract(Address.ZERO)
-          .topic(Bytes.EMPTY)
+          .topic(Bytes32.ZERO)
           .build();
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java

@@ -120,6 +120,7 @@
 import net.consensys.linea.zktracer.types.MemoryRange;
 import net.consensys.linea.zktracer.types.TransactionProcessingMetadata;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.datatypes.Wei;
@@ -439,10 +440,9 @@ public Hub(final ChainConfig chain) {
     gasCalculator = getGasCalculatorFromFork(fork);
     opCodes = OpCodes.load(fork);
     gasProjector = new GasProjector(fork, gasCalculator);
-    checkState(chain.id.signum() >= 0, "Hub constructor: chain id must be nonnegative");
-    Address l2l1ContractAddress = chain.bridgeConfiguration.contract();
-    final Bytes l2l1Topic = chain.bridgeConfiguration.topic();
-    //
+    checkState(chain.id.signum() >= 0, "Hub constructor: chain id must be non-negative");
+    final Address l2l1ContractAddress = chain.bridgeConfiguration.contract();
+    final Bytes32 l2l1Topic = chain.bridgeConfiguration.topic();
     if (l2l1ContractAddress.equals(TEST_DEFAULT.contract())) {
       log.info("WARN: Using default testing L2L1 contract address");
     }

gradle.properties

@@ -1,5 +1,5 @@
 releaseVersion=beta-v4.0-rc20
-besuVersion=25.10.0-linea3
+besuVersion=25.11.0-RC1-linea2
 shomeiVersion=2.4-develop
 besuShomeiPluginVersion=v0.7.4
 besuArtifactGroup=org.hyperledger.besu

reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java

@@ -924,8 +924,10 @@ public static Object[] markTestToRun(Object[] param, Set<String> failedTests) {
 
   public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
     final BlockHeader genesisBlockHeader = spec.getGenesisBlockHeader();
+    final ProtocolContext context = spec.buildProtocolContext();
     final MutableWorldState worldState =
-        spec.getWorldStateArchive()
+        context
+            .getWorldStateArchive()
             .getWorldState(
                 WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead(
                     genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash()))
@@ -939,7 +941,6 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
         REFERENCE_TEST_PROTOCOL_SCHEDULES.getByName(spec.getNetwork());
     final ChainConfig chain = ChainConfig.ETHEREUM_CHAIN(fork);
     final MutableBlockchain blockchain = spec.getBlockchain();
-    final ProtocolContext context = spec.getProtocolContext();
 
     // Add system accounts if the fork requires it.
     addSystemAccountsIfRequired(worldState.updater(), chain.fork);

testing/src/main/java/net/consensys/linea/reporting/TracerTestBase.java

@@ -30,7 +30,7 @@ public class TracerTestBase {
   public static void init() {
     // Configure chain information and fork before any tests are run, including any methods used as
     // MethodSource.
-    TracerTestBase.chainConfig = ChainConfig.MAINNET_TESTCONFIG(getForkOrDefault(LONDON));
+    TracerTestBase.chainConfig = ChainConfig.MAINNET_TESTCONFIG(getForkOrDefault(PRAGUE));
     TracerTestBase.fork = TracerTestBase.chainConfig.fork;
     TracerTestBase.opcodes = OpCodes.load(fork);
   }