Merge branch 'arith-dev' into fix/logmore

Consensys · Feb 7, 2025 · d48ab4f · d48ab4f
2 parents b638832 + fc4e83f
commit d48ab4f
Show file tree

Hide file tree

Showing 166 changed files with 3,817 additions and 47,494 deletions.
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@5cb0c28
+      run: go install github.com/consensys/go-corset/cmd/go-corset@75a88c5
diff --git a/.github/actions/setup-rust-corset/action.yml b/.github/actions/setup-rust-corset/action.yml
@@ -9,7 +9,7 @@ inputs:
     # Corresponds to the corset release tag for the desired version.
     description: 'Corset tag to use'
     required: false
-    default: 'v9.7.17'
+    default: 'v9.7.18'
   asset_id:
     # Corresponds to the Github asset id for the asset published as part
     # of the release.  Specifically, it should be the id for the asset

diff --git a/.github/workflows/gradle-ethereum-tests.yml b/.github/workflows/gradle-ethereum-tests.yml
@@ -5,56 +5,12 @@ on:
     - cron: "0 23 * * 1-5"
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ethereum-tests:
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Setup Test Environment
-        uses: ./.github/actions/setup-environment
-        with:
-          rust-corset: true
-
-      - name: Generate zkevm_for_reference_tests.bin
-        run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd ..
-
-      - name: Generate General State Reference Tests
-        run:  ./gradlew generateGeneralStateReferenceTests -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
-        env:
-          JAVA_OPTS: -Dorg.gradle.daemon=false
-          CORSET_FLAGS: fields,expand,expand,expand
-
-      - name: Run General State Reference Tests
-        run: ./gradlew referenceGeneralStateTests
-        env:
-          REFERENCE_TESTS_PARALLELISM: 10
-          JAVA_OPTS: -Dorg.gradle.daemon=false
-          CORSET_FLAGS: fields,expand,expand,expand
-
-      - name: Upload test report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ethereum-tests-report
-          path: |
-            reference-tests/build/reports/tests/**/*
-            tmp/local/*
-
-      - name: Failure Notification
-        if: ${{ failure() || cancelled() }}
-        uses: slackapi/[email protected]
-        with:
-          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
-          webhook-type: webhook-trigger
-          payload: |
-             name: "Daily State Tests (Rust Corset)"
-             status: "${{ job.status }}"
-
-  ethereum-tests-go-corset:
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
     steps:
       - name: Checkout repository
@@ -67,27 +23,23 @@ jobs:
         with:
           go-corset: true
 
-      - name: Generate zkevm_for_reference_tests.bin
-        run: cd ./linea-constraints; make zkevm_for_reference_tests.bin -B; cd ..
-
       - name: Generate General State Reference Tests
         run: ./gradlew generateGeneralStateReferenceTests -Dorg.gradle.caching=true
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
-          CORSET_FLAGS: fields,expand,expand,expand
 
       - name: Run General State Reference Tests
-        run: GOMEMLIMIT=196GiB ./gradlew referenceGeneralStateTests
+        run: GOMEMLIMIT=64GiB ./gradlew -Dblockchain=Ethereum referenceGeneralStateTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -vw -b1024 --ansi-escapes=false --report --air
 
       - name: Upload test report
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: ethereum-tests-go-corset-report
+          name: ethereum-tests-report
           path: |
             reference-tests/build/reports/tests/**/*
             tmp/local/*

diff --git a/.github/workflows/gradle-nightly-tests.yml b/.github/workflows/gradle-nightly-tests.yml
@@ -5,6 +5,10 @@ on:
     - cron: "0 22 * * 1-5"
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   nightly-tests:
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
@@ -20,15 +24,17 @@ jobs:
           go-corset: true
 
       - name: Run Nightly tests
-        run: GOMEMLIMIT=96GiB ./gradlew nightlyTests
+        run: GOMEMLIMIT=32GiB ./gradlew nightlyTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -vw --ansi-escapes=false --report --mir
+          ZKEVM_BIN: "zkevm.bin"
+          NIGHTLY_TESTS_PARALLELISM: 2
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nightly-tests-report
           path: build/reports/tests/**/*

diff --git a/.github/workflows/gradle-tests.yml b/.github/workflows/gradle-tests.yml
@@ -13,6 +13,10 @@ on:
         type: boolean
         default: false
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # ==================================================================
   # Build
@@ -28,6 +32,8 @@ jobs:
 
       - name: Setup Environment
         uses: ./.github/actions/setup-environment
+        with:
+          rust-corset: true
 
       - name: Set up GCC
         uses: egor-tensin/setup-gcc@v1
@@ -38,7 +44,7 @@ jobs:
           JAVA_OPTS: -Xmx2g -Dorg.gradle.daemon=false
 
       - name: Store distribution artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: distributions
           path: arithmetization/build/libs
@@ -49,38 +55,9 @@ jobs:
   # ==================================================================
   # Unit Tests
   # ==================================================================
-  corset-unit-tests:
-    needs: [ build ]
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          submodules: false
-
-      - name: Setup Test Environment
-        uses: ./.github/actions/setup-environment
-        with:
-          enable-ssh: ${{ inputs.tests-with-ssh }}
-          rust-corset: true
-
-      - name: Run unit tests
-        run: ./gradlew :arithmetization:test --stacktrace
-        env:
-          JAVA_OPTS: -Dorg.gradle.daemon=false
-          CORSET_FLAGS: trace-span=3,fields,expand,expand,expand
-          UNIT_TESTS_PARALLELISM: 2
-
-      - name: Upload test report
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: corset-unit-test-report
-          path: arithmetization/build/reports/tests/**/*
-
-  go-corset-unit-tests:
+  unit-tests:
     needs: [ build ]
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
     continue-on-error: true
     steps:
       - name: Checkout repository
@@ -99,51 +76,22 @@ jobs:
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -b1024 -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -b1024 -vw --ansi-escapes=false --report --air
           UNIT_TESTS_PARALLELISM: 1
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: go-corset-unit-tests-report
+          name: unit-tests-report
           path: arithmetization/build/reports/tests/**/*
 
   # ==================================================================
   # Fast Replay Tests
   # ==================================================================
-  corset-replay-tests:
-    needs: [ build ]
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          submodules: false
-
-      - name: Setup Environment
-        uses: ./.github/actions/setup-environment
-        with:
-          enable-ssh: ${{ inputs.tests-with-ssh }}
-          rust-corset: true
-
-      - name: Run Replay tests
-        run: ./gradlew :arithmetization:fastReplayTests --stacktrace
-        env:
-          JAVA_OPTS: -Dorg.gradle.daemon=false
-          CORSET_FLAGS: trace-span=3,fields,expand,expand,expand
-          REPLAY_TESTS_PARALLELISM: 2
-
-      - name: Upload test report
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: replay-test-report
-          path: arithmetization/build/reports/tests/**/*
-
-  go-corset-replay-tests:
+  replay-tests:
     needs: [ build ]
-    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-large
+    runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
     continue-on-error: true
     steps:
       - name: Checkout repository
@@ -162,11 +110,11 @@ jobs:
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -b1024 -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -b1024 -vw --ansi-escapes=false --report --air
 
       - name: Upload test report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: go-corset-replay-tests-report
+          name: replay-tests-report
           path: arithmetization/build/reports/tests/**/*
diff --git a/.github/workflows/gradle-weekly-tests.yml b/.github/workflows/gradle-weekly-tests.yml
@@ -5,6 +5,11 @@ on:
     - cron: "0 4 * * 1"
   workflow_dispatch:
 
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-med
@@ -28,7 +33,7 @@ jobs:
 
       - name: Upload test report
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nightly-tests-report
           path: build/reports/tests/**/*
@@ -43,7 +48,7 @@ jobs:
              name: "Weekly (Go-Corset)"
              status: "${{ job.status }}"
 
-  go-corset-tests:
+  weekly-tests:
     runs-on: gha-runner-scale-set-ubuntu-22.04-amd64-xxl
     continue-on-error: true
     steps:
@@ -58,11 +63,11 @@ jobs:
           go-corset: true
 
       - name: Run Weekly tests
-        run: GOMEMLIMIT=196GiB ./gradlew weeklyTests
+        run: GOMEMLIMIT=96GiB ./gradlew weeklyTests
         env:
           JAVA_OPTS: -Dorg.gradle.daemon=false
           CORSET_FLAGS: disable
-          GOCORSET_FLAGS: -wd --ansi-escapes=false --report --air
+          GOCORSET_FLAGS: -vw -b1024 --ansi-escapes=false --report --air
 
       - name: Failure Notification
         if: ${{ failure() || cancelled() }}