Merge remote-tracking branch 'origin/fix/parsing-constraint-failed' i…

…nto fix/parsing-constraint-failed
Consensys · Feb 7, 2025 · eb7896e · eb7896e
2 parents 9c7b730 + 639cab5
commit eb7896e
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 31 deletions.
diff --git a/.github/workflows/gradle-nightly-tests.yml b/.github/workflows/gradle-nightly-tests.yml
@@ -8,7 +8,7 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-  
+
 jobs:
   nightly-tests:
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
@@ -24,12 +24,13 @@ jobs:
           go-corset: true
 
       - name: Run Nightly tests
-        run: GOMEMLIMIT=64GiB ./gradlew nightlyTests
+        run: GOMEMLIMIT=32GiB ./gradlew nightlyTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -vw --ansi-escapes=false --report --mir
+          GOCORSET_FLAGS: -vw --ansi-escapes=false --report --hir
           ZKEVM_BIN: "zkevm.go.bin"
+          NIGHTLY_TESTS_PARALLELISM: 2
 
       - name: Upload test report
         if: ${{ always() }}

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.swp
 *.log
 *.out
+*~
 nohup.out
 .classpath
 .DS_Store

diff --git a/...ava/net/consensys/linea/zktracer/module/tables/instructionDecoder/InstructionDecoder.java b/...ava/net/consensys/linea/zktracer/module/tables/instructionDecoder/InstructionDecoder.java
@@ -28,7 +28,6 @@
 import net.consensys.linea.zktracer.opcode.gas.BillingRate;
 import net.consensys.linea.zktracer.opcode.gas.MxpType;
 import net.consensys.linea.zktracer.types.UnsignedByte;
-import org.apache.tuweni.bytes.Bytes;
 
 public final class InstructionDecoder implements Module {
   private static void traceFamily(OpCodeData op, Trace trace) {
@@ -126,7 +125,7 @@ public void commit(List<MappedByteBuffer> buffers) {
       traceStackSettings(op, trace);
       traceBillingSettings(op, trace);
       trace
-          .opcode(Bytes.ofUnsignedInt(i))
+          .opcode(UnsignedByte.of(i))
           .isPush(op.isPush())
           .isJumpdest(op.isJumpDest())
           .validateRow();

diff --git a/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1124Tests.java b/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1124Tests.java
@@ -18,13 +18,15 @@
 import static net.consensys.linea.testing.ReplayExecutionEnvironment.LINEA_MAINNET;
 
 import net.consensys.linea.UnitTestWatcher;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /** STP constraints were failing for these ranges */
 @Tag("replay")
 @Tag("nightly")
+@Disabled
 @ExtendWith(UnitTestWatcher.class)
 public class Issue1124Tests {
 

diff --git a/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1126Tests.java b/arithmetization/src/test/java/net/consensys/linea/replaytests/Issue1126Tests.java
@@ -18,6 +18,7 @@
 import static net.consensys.linea.testing.ReplayExecutionEnvironment.LINEA_MAINNET;
 
 import net.consensys.linea.UnitTestWatcher;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,110 +39,111 @@
  * <p>See https://github.com/Consensys/linea-tracer/issues/1121
  */
 @Tag("nightly")
+@Disabled
 @ExtendWith(UnitTestWatcher.class)
 public class Issue1126Tests {
   @Test
-  void test_3108622_3108633() {
+  void issue_1126_3108622_3108633() {
     replay(LINEA_MAINNET, "3108622-3108633.mainnet.json.gz");
   }
 
   @Test
-  void test_3175608_3175636() {
+  void issue_1126_3175608_3175636() {
     replay(LINEA_MAINNET, "3175608-3175636.mainnet.json.gz");
   }
 
   @Test
-  void test_3432730_3432768() {
+  void issue_1126_3432730_3432768() {
     replay(LINEA_MAINNET, "3432730-3432768.mainnet.json.gz");
   }
 
   @Test
-  void test_4392225_4392280() {
+  void issue_1126_4392225_4392280() {
     replay(LINEA_MAINNET, "4392225-4392280.mainnet.json.gz");
   }
 
   @Test
-  void test_4477086_4477226() {
+  void issue_1126_4477086_4477226() {
     replay(LINEA_MAINNET, "4477086-4477226.mainnet.json.gz");
   }
 
   @Test
-  void test_3290673_3290679() {
+  void issue_1126_3290673_3290679() {
     replay(LINEA_MAINNET, "3290673-3290679.mainnet.json.gz");
   }
 
   @Test
-  void test_3290746_3290752() {
+  void issue_1126_3290746_3290752() {
     replay(LINEA_MAINNET, "3290746-3290752.mainnet.json.gz");
   }
 
   @Test
-  void test_3315684_3315690() {
+  void issue_1126_3315684_3315690() {
     replay(LINEA_MAINNET, "3315684-3315690.mainnet.json.gz");
   }
 
   @Test
-  void test_3374278_3374284() {
+  void issue_1126_3374278_3374284() {
     replay(LINEA_MAINNET, "3374278-3374284.mainnet.json.gz");
   }
 
   @Test
-  void test_3385404_3385411() {
+  void issue_1126_3385404_3385411() {
     replay(LINEA_MAINNET, "3385404-3385411.mainnet.json.gz");
   }
 
   @Test
-  void test_3410170_3410240() {
+  void issue_1126_3410170_3410240() {
     replay(LINEA_MAINNET, "3410170-3410240.mainnet.json.gz");
   }
 
   @Test
-  void test_3423488_3423521() {
+  void issue_1126_3423488_3423521() {
     replay(LINEA_MAINNET, "3423488-3423521.mainnet.json.gz");
   }
 
   @Test
-  void test_3424829_3424864() {
+  void issue_1126_3424829_3424864() {
     replay(LINEA_MAINNET, "3424829-3424864.mainnet.json.gz");
   }
 
   @Test
-  void test_3429701_3429735() {
+  void issue_1126_3429701_3429735() {
     replay(LINEA_MAINNET, "3429701-3429735.mainnet.json.gz");
   }
 
   @Test
-  void test_3431193_3431232() {
+  void issue_1126_3431193_3431232() {
     replay(LINEA_MAINNET, "3431193-3431232.mainnet.json.gz");
   }
 
   @Test
-  void test_3431567_3431601() {
+  void issue_1126_3431567_3431601() {
     replay(LINEA_MAINNET, "3431567-3431601.mainnet.json.gz");
   }
 
   @Test
-  void test_4323962_4324012() {
+  void issue_1126_4323962_4324012() {
     replay(LINEA_MAINNET, "4323962-4324012.mainnet.json.gz");
   }
 
   @Test
-  void test_4343434_4343473() {
+  void issue_1126_4343434_4343473() {
     replay(LINEA_MAINNET, "4343434-4343473.mainnet.json.gz");
   }
 
   @Test
-  void test_4519246_4519309() {
+  void issue_1126_4519246_4519309() {
     replay(LINEA_MAINNET, "4519246-4519309.mainnet.json.gz");
   }
 
   @Test
-  void test_4556007_4556115() {
+  void issue_1126_4556007_4556115() {
     replay(LINEA_MAINNET, "4556007-4556115.mainnet.json.gz");
   }
 
   @Test
-  void test_4583379_4583463() {
+  void issue_1126_4583379_4583463() {
     replay(LINEA_MAINNET, "4583379-4583463.mainnet.json.gz");
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 releaseVersion=beta-v1.2.0-rc3
-besuVersion=25.1-delivery44
+besuVersion=25.2-delivery46
 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/linea-constraints b/linea-constraints
diff --git a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
@@ -54,6 +54,7 @@
 import org.hyperledger.besu.ethereum.referencetests.BlockchainReferenceTestCaseSpec;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams;
 import org.hyperledger.besu.testutil.JsonTestParameters;
 import org.junit.jupiter.api.Assumptions;
 
@@ -366,8 +367,10 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
     final BlockHeader genesisBlockHeader = spec.getGenesisBlockHeader();
     final MutableWorldState worldState =
         spec.getWorldStateArchive()
-            .getMutable(genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash())
-            .get();
+            .getWorldState(
+                WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead(
+                    genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash()))
+            .orElseThrow();
 
     log.info(
         "checking roothash {} is {}", worldState.rootHash(), genesisBlockHeader.getStateRoot());

diff --git a/testing/src/main/java/net/consensys/linea/testing/ExecutionEnvironment.java b/testing/src/main/java/net/consensys/linea/testing/ExecutionEnvironment.java
@@ -175,7 +175,8 @@ private static NodeKey createNodeKey() {
    */
   public static String constructTestPrefix() {
     for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
-      if (ste.getClassName().endsWith("Test")) {
+      String className = ste.getClassName();
+      if (className.endsWith("Test") || className.endsWith("Tests")) {
         // Yes, it is.  Now tidy up the name.
         String name = ste.getClassName().replace(LINEA_PACKAGE, "").replace(".", "_");
         // Done
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     *.swp
     *.log
     *.out
+    *~
     nohup.out
     .classpath
     .DS_Store
@@ Expand Down @@
+2 −2		loginfo/columns.lisp
+1 −1		reftables/inst_decoder.lisp