Merge branch 'main' into feature/adding-agglayer-prover

0xPolygon · Oct 23, 2024 · 4463ecf · 4463ecf
2 parents f1ed3c7 + cecf43b
commit 4463ecf
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 30 deletions.
diff --git a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer
   data_availability_mode: cdk-validium

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:acceptance-2.0.0-beta26-0f01107
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.3-fork.11
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
   additional_services:
     - tx_spammer
   data_availability_mode: cdk-validium

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml
@@ -1,7 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC13-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
   additional_services:
     - tx_spammer
   data_availability_mode: rollup

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml
@@ -1,8 +1,8 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.7
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:ab3013d
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   additional_services:
     - pless_zkevm_node

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ env:
   KURTOSIS_VERSION: 0.90.1
 
 jobs:
-  check:
+  lint:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -51,3 +51,28 @@ jobs:
 
       - name: Run shellcheck
         run: find . -type f -name '*.sh' | sort | xargs -I {} shellcheck {}
+
+  check-test-combinations:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install yq
+        run: |
+          pip3 install yq
+          yq --version
+
+      - name: Generate test combinations
+        working-directory: .github/tests
+        run: ./combine-ymls.sh
+
+      - name: Check if test combinations are up to date
+        run: |
+          if [[ -n $(git status --porcelain) ]]; then
+            echo "❌ Error: Test combinations are not up to date. Please run \`./combine-ymls.sh\`."
+            git status --porcelain
+            git diff
+            exit 1
+          else
+            echo "✅ Test combinations are up to date."
+          fi
diff --git a/.github/workflows/security-build.yml b/.github/workflows/security-build.yml
@@ -3,7 +3,7 @@ name: Security Build
 on:
   push:
     branches: [main]
-  #pull_request:
+  pull_request:
   workflow_dispatch:
 
 jobs:
@@ -17,11 +17,9 @@ jobs:
           fetch-depth: 0
 
       - uses: sonarsource/sonarcloud-github-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         # This step will only execute if the necessary secrets are available, preventing failures
         # on pull requests from forked repositories.
         if: ${{ env.SONAR_TOKEN}}
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}