Merge branch 'main' into feat/op-stack-integration

0xPolygon · Dec 10, 2024 · 633ce54 · 633ce54
2 parents 538af86 + af3798e
commit 633ce54
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 225 deletions.
diff --git a/.github/actions/setup-kurtosis-cdk/action.yml b/.github/actions/setup-kurtosis-cdk/action.yml
@@ -27,7 +27,7 @@ runs:
       run: |
         echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
         sudo apt update
-        sudo apt install kurtosis-cli=${{ inputs.kurtosis-version }}
+        sudo apt install -y kurtosis-cli=${{ inputs.kurtosis-version }}
         kurtosis version
 
     - name: Disable kurtosis analytics

diff --git a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
@@ -5,7 +5,7 @@ args:
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
@@ -5,7 +5,7 @@ args:
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork11-new-cdk-stack-rollup.yml
@@ -5,7 +5,7 @@ args:
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
@@ -4,7 +4,7 @@ args:
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork12-new-cdk-stack-rollup.yml
@@ -4,7 +4,7 @@ args:
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml
@@ -4,7 +4,7 @@ args:
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork13-new-cdk-stack-rollup.yml
@@ -4,7 +4,7 @@ args:
   zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - tx_spammer
   deploy_l2_contracts: true

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
@@ -6,7 +6,7 @@ args:
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - pless_zkevm_node
     - tx_spammer

diff --git a/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
@@ -6,7 +6,7 @@ args:
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - pless_zkevm_node
     - tx_spammer

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml b/.github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
@@ -6,7 +6,7 @@ args:
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - pless_zkevm_node
     - tx_spammer

diff --git a/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml b/.github/tests/combinations/fork9-new-cdk-stack-rollup.yml
@@ -6,7 +6,7 @@ args:
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   additional_services:
     - pless_zkevm_node
     - tx_spammer

diff --git a/.github/tests/fork12-pessimistic.yml b/.github/tests/fork12-pessimistic.yml
@@ -1,7 +1,7 @@
 args:
   agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.11
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
   zkevm_bridge_ui_image: leovct/zkevm-bridge-ui:multi-network
   zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1
   additional_services: []

diff --git a/.github/tests/forks/fork11.yml b/.github/tests/forks/fork11.yml
@@ -17,7 +17,7 @@ args:
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
 
   additional_services:
     - tx_spammer

diff --git a/.github/tests/forks/fork12.yml b/.github/tests/forks/fork12.yml
@@ -14,7 +14,7 @@ args:
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
 
   additional_services:
     - tx_spammer

diff --git a/.github/tests/forks/fork13.yml b/.github/tests/forks/fork13.yml
@@ -14,7 +14,7 @@ args:
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
 
   additional_services:
     - tx_spammer

diff --git a/.github/tests/forks/fork9.yml b/.github/tests/forks/fork9.yml
@@ -20,7 +20,7 @@ args:
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
 
   # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC3
 
   additional_services:
     - pless_zkevm_node

diff --git a/.github/workflows/regression-tests.yml b/.github/workflows/regression-tests.yml
diff --git a/CDK_VERSION_MATRIX.MD b/CDK_VERSION_MATRIX.MD
@@ -4,7 +4,7 @@ Which versions of the CDK stack are meant to work together?
 
 Fork ID|CDK Erigon|ZkEVM Prover|ZkEVM Contracts|Data Availability|Bridge
 ---|---|---|---|---|---
-13|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v9.0.0-RC2-fork.13](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v9.0.0-RC2)|[v8.1.0-rc.1-fork.13](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.1.0-rc.1-fork.13)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
-12|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-fork.12)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
-11|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v7.0.4-fork.11](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v7.0.4)|[v7.0.0-rc.2-fork.11](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v7.0.0-rc.2-fork.11)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
-9|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v6.0.8](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v6.0.8)|[v6.0.0-rc.1-fork.9](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v6.0.0-rc.1-fork.9)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
+13|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v9.0.0-RC2-fork.13](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v9.0.0-RC2)|[v8.1.0-rc.1-fork.13](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.1.0-rc.1-fork.13)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+12|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-fork.12)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+11|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v7.0.4-fork.11](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v7.0.4)|[v7.0.0-rc.2-fork.11](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v7.0.0-rc.2-fork.11)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
+9|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[v6.0.8](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v6.0.8)|[v6.0.0-rc.1-fork.9](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v6.0.0-rc.1-fork.9)|[0.0.11](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.11)|[v0.6.0-RC3](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC3)
diff --git a/action.yml b/action.yml
diff --git a/input_parser.star b/input_parser.star
@@ -36,7 +36,7 @@ DEFAULT_IMAGES = {
     "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.4.0",  # https://github.com/0xpolygon/cdk/pkgs/container/cdk
     "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk",  # https://hub.docker.com/r/0xpolygon/cdk-validium-node/tags
     "zkevm_bridge_proxy_image": "haproxy:3.1-bookworm",  # https://hub.docker.com/_/haproxy/tags
-    "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC2",  # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
+    "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC3",  # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
     "zkevm_bridge_ui_image": "leovct/zkevm-bridge-ui:multi-network",  # https://hub.docker.com/r/leovct/zkevm-bridge-ui/tags
     "zkevm_contracts_image": "leovct/zkevm-contracts:v8.0.0-fork.12-patch.1",  # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags
     "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.11",  # https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags