Merge branch 'arith-dev' into 2363-eip-7951-precompile-for-secp256r1-curve-support

lorenzogentile404 · lorenzogentile404 · commit 6372d9d7b83e · 2025-11-14T13:30:08.000+01:00
diff --git a/.github/actions/setup-go-corset/action.yml b/.github/actions/setup-go-corset/action.yml
@@ -12,4 +12,4 @@ runs:
 
     - name: Install Go Corset
       shell: bash
-      run: go install github.com/consensys/go-corset/cmd/go-corset@93c23f239542f79c1db60eb5b8250ab20e30f046 # v1.1.23
+      run: go install github.com/consensys/go-corset/cmd/go-corset@0d25749dc5e7ef6e0a75d551618248d4bad65ac6 # v1.1.27
diff --git a/.github/workflows/gradle-besu-node-tests.yml b/.github/workflows/gradle-besu-node-tests.yml
@@ -37,7 +37,7 @@ jobs:
 
       - name: Upload proof request and conflation files
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: traces-proof-requests-${{ github.sha }}
           path: arithmetization/build/besu/traces/**/*
diff --git a/.github/workflows/gradle-nightly-tests.yml b/.github/workflows/gradle-nightly-tests.yml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: nightly-replay-tests-report
           path: arithmetization/build/reports/tests/**/*
diff --git a/.github/workflows/gradle-tests.yml b/.github/workflows/gradle-tests.yml
@@ -47,7 +47,7 @@ jobs:
           JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
 
       - name: Store distribution artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: distributions
           path: arithmetization/build/libs
@@ -92,21 +92,21 @@ jobs:
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: replay-tests-report
           path: arithmetization/build/reports/tests/**/*
 
       - name: Upload jacoco fast replay tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-fast-replay-tests-coverage-report
           path: arithmetization/build/reports/jacoco/jacocoFastReplayTestsReport/**/*
 
       - name: Upload jacoco fast replay tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-fast-replay-tests-exec-file
           path: arithmetization/build/jacoco/fastReplayTests.exec
diff --git a/.github/workflows/gradle-weekly-tests.yml b/.github/workflows/gradle-weekly-tests.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: weekly-replay-tests-report
           path: arithmetization/build/reports/tests/**/*
diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml
@@ -61,7 +61,7 @@ jobs:
           JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
 
       - name: Store distribution artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: distributions
           path: arithmetization/build/libs
@@ -134,21 +134,21 @@ jobs:
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: replay-tests-report
           path: arithmetization/build/reports/tests/**/*
 
       - name: Upload jacoco fast replay tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-fast-replay-tests-coverage-report
           path: arithmetization/build/reports/jacoco/jacocoFastReplayTestsReport/**/*
 
       - name: Upload jacoco fast replay tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-fast-replay-tests-exec-file
           path: arithmetization/build/jacoco/fastReplayTests.exec
diff --git a/.github/workflows/reusable-blockchain-tests.yml b/.github/workflows/reusable-blockchain-tests.yml
@@ -67,7 +67,7 @@ jobs:
         run: GOMAXPROCS=10 GOMEMLIMIT=20GiB ./gradlew referenceExecutionSpecBlockchainTests -x spotlessCheck --tests "${{ inputs.test_filter || 'BlockchainReferenceTest_*' }}"
         timeout-minutes: 360
         env:
-          JUNIT_TESTS_PARALLELISM: 3
+          JUNIT_TESTS_PARALLELISM: 2
           JAVA_OPTS: -Dorg.gradle.daemon=false
           GOCORSET_FLAGS: -b1024 -v --ansi-escapes=false --report --air
           FAILED_TEST_JSON_DIRECTORY: ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/
@@ -78,28 +78,28 @@ jobs:
 
       - name: Upload artifact
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: failedBlockchainReferenceTests-${{ inputs.zkevm_fork }}.json
           path: ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/
 
       - name: Upload test report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: blockchain-reference-tests-report-${{ inputs.zkevm_fork }}
           path: reference-tests/build/reports/tests/**/*
 
       - name: Upload jacoco exec spec blockchain tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-blockchain-tests-coverage-report-${{ inputs.zkevm_fork }}
           path: reference-tests/build/reports/jacoco/jacocoReferenceExecutionSpecBlockchainTestsReport/**/*
 
       - name: Upload jacoco blockchain tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-blockchain-tests-exec-file-${{ inputs.zkevm_fork }}
           path: reference-tests/build/jacoco/referenceExecutionSpecBlockchainTests.exec
diff --git a/.github/workflows/reusable-nightly-tests.yml b/.github/workflows/reusable-nightly-tests.yml
@@ -35,21 +35,21 @@ jobs:
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: nightly-tests-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/tests/**/*
 
       - name: Upload jacoco nightly tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-nightly-tests-coverage-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/jacoco/jacocoNightlyTestsReport/**/*
 
       - name: Upload jacoco nightly tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-nightly-tests-exec-file-${{ inputs.zkevm_fork }}
           path: arithmetization/build/jacoco/nightlyTests.exec
diff --git a/.github/workflows/reusable-unit-tests.yml b/.github/workflows/reusable-unit-tests.yml
@@ -37,21 +37,21 @@ jobs:
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: unit-tests-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/tests/**/*
 
       - name: Upload jacoco unit tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-unit-tests-coverage-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/jacoco/test/**/*
 
       - name: Upload jacoco unit tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-unit-tests-exec-file-${{ inputs.zkevm_fork }}
           path: arithmetization/build/jacoco/test.exec
diff --git a/.github/workflows/reusable-weekly-prc-tests.yml b/.github/workflows/reusable-weekly-prc-tests.yml
@@ -32,21 +32,21 @@ jobs:
 
       - name: Upload prc calls test report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: prc-call-tests-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/tests/**/*
 
       - name: Upload jacoco weekly prc-call tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-prc-call-tests-coverage-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/jacoco/jacocoPrcCallTestsReport/**/*
 
       - name: Upload jacoco weekly prc-call tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-prc-call-tests-exec-file-${{ inputs.zkevm_fork }}
           path: arithmetization/build/jacoco/prcCallTests.exec
diff --git a/.github/workflows/reusable-weekly-tests.yml b/.github/workflows/reusable-weekly-tests.yml
@@ -31,21 +31,21 @@ jobs:
 
       - name: Upload test report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: weekly-tests-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/tests/**/*
 
       - name: Upload jacoco weekly tests coverage report
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-weekly-tests-coverage-report-${{ inputs.zkevm_fork }}
           path: arithmetization/build/reports/jacoco/jacocoWeeklyTestsReport/**/*
 
       - name: Upload jacoco weekly tests exec file
         if: always()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: jacoco-weekly-tests-exec-file-${{ inputs.zkevm_fork }}
           path: arithmetization/build/jacoco/weeklyTests.exec
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/euc/EucOperation.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/euc/EucOperation.java
@@ -15,14 +15,11 @@
 
 package net.consensys.linea.zktracer.module.euc;
 
-import static net.consensys.linea.zktracer.types.Utils.leftPadTo;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 import net.consensys.linea.zktracer.Trace;
 import net.consensys.linea.zktracer.container.ModuleOperation;
-import net.consensys.linea.zktracer.types.UnsignedByte;
 import org.apache.tuweni.bytes.Bytes;
 
 @Accessors(fluent = true)
@@ -32,7 +29,6 @@ public class EucOperation extends ModuleOperation {
   @Getter @EqualsAndHashCode.Include private final Bytes divisor;
   @Getter private final Bytes remainder;
   @Getter private final Bytes quotient;
-  private int ctMax;
 
   public EucOperation(
       final Bytes dividend, final Bytes divisor, final Bytes quotient, final Bytes remainder) {
@@ -55,36 +51,19 @@ public Bytes ceiling() {
   }
 
   void trace(Trace.Euc trace) {
-    final Bytes divisor = leftPadTo(this.divisor, this.ctMax + 1);
-    final Bytes quotient = leftPadTo(this.quotient, this.ctMax + 1);
-    final Bytes remainder = leftPadTo(this.remainder, this.ctMax + 1);
     final Bytes ceil = this.ceiling();
 
-    for (int ct = 0; ct <= ctMax; ct++) {
-      trace
-          .iomf(true)
-          .ct((short) ct)
-          .ctMax((short) ctMax)
-          .done(ct == ctMax)
-          .dividend(dividend)
-          .divisor(divisor.slice(0, ct + 1))
-          .quotient(quotient.slice(0, ct + 1))
-          .remainder(remainder.slice(0, ct + 1))
-          .ceil(ceil)
-          .divisorByte(UnsignedByte.of(divisor.get(ct)))
-          .quotientByte(UnsignedByte.of(quotient.get(ct)))
-          .remainderByte(UnsignedByte.of(remainder.get(ct)))
-          .validateRow();
-    }
+    trace
+        .dividend(this.dividend)
+        .divisor(this.divisor)
+        .quotient(this.quotient)
+        .remainder(this.remainder)
+        .ceil(ceil)
+        .validateRow();
   }
 
   @Override
   protected int computeLineCount() {
-    ctMax = computeCtMax();
-    return ctMax + 1;
-  }
-
-  private int computeCtMax() {
-    return Math.max(quotient.size(), divisor.size()) - 1;
+    return 1;
   }
 }
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/section/skip/TxSkipSection.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/section/skip/TxSkipSection.java
@@ -126,8 +126,7 @@ public void resolveAtEndTransaction(
     final Wei value = (Wei) txMetadata.getBesuTransaction().getValue();
 
     if (txMetadata.senderAddressCollision()) {
-      final BigInteger gasUsed =
-          BigInteger.valueOf(txMetadata.getGasLimit() - txMetadata.getGasRefunded());
+      final BigInteger gasUsed = BigInteger.valueOf(txMetadata.getTotalGasUsed());
       final BigInteger gasPrice = BigInteger.valueOf(txMetadata.getEffectiveGasPrice());
       final BigInteger gasCost = gasUsed.multiply(gasPrice);
       senderNew =
diff --git a/linea-constraints b/linea-constraints
@@ -1 +1 @@
-Subproject commit 8923512b30aea647e40c32aada7980d16d20a57f
+Subproject commit 15aa249c327409ed5da1c028981d4db65e9f97f3
diff --git a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
@@ -974,10 +974,8 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
         context
             .getWorldStateArchive()
             .getWorldState(
-                WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead(
-                    genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash()))
+                WorldStateQueryParams.withBlockHeaderAndNoUpdateNodeHead(genesisBlockHeader))
             .orElseThrow();
-
     log.info(
         "checking roothash {} is {}", worldState.rootHash(), genesisBlockHeader.getStateRoot());
     assertThat(worldState.rootHash()).isEqualTo(genesisBlockHeader.getStateRoot());
