fix: add deployment stages for L2 contracts and update prover images …

…in fork configurations
0xPolygon · Feb 23, 2025 · f2b88ed · f2b88ed
1 parent a430095
commit f2b88ed
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/test/combinations/fork11-rollup.yml b/test/combinations/fork11-rollup.yml
@@ -1,8 +1,10 @@
+deployment_stages:
+  deploy_l2_contracts: true
+
 args:
   agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
   zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.2-fork.11
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
   cdk_node_image: cdk:latest
   gas_token_enabled: true

diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml
@@ -1,3 +1,6 @@
+deployment_stages:
+  deploy_l2_contracts: true
+
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12

diff --git a/test/combinations/fork12-pessimistic.yml b/test/combinations/fork12-pessimistic.yml
@@ -14,5 +14,4 @@ args:
   zkevm_use_real_verifier: false
   enable_normalcy: true
   verifier_program_vkey: 0x00766aa16a6efe4ac05c0fe21d4b50f9631dbd1a2663a982da861427085ea2ea
-  agglayer_prover_sp1_key: {{.agglayer_prover_sp1_key}}
 
diff --git a/test/combinations/fork12-rollup.yml b/test/combinations/fork12-rollup.yml
@@ -1,6 +1,9 @@
+deployment_stages:
+  deploy_l2_contracts: true
+
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.4-fork.12-patch.1
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.14-RC1-amd64
   cdk_node_image: cdk:latest
   gas_token_enabled: true

diff --git a/test/combinations/fork9-cdk-validium.yml b/test/combinations/fork9-cdk-validium.yml
@@ -1,8 +1,10 @@
+deployment_stages:
+  deploy_l2_contracts: true
+
 args:
   agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.19
   zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.6
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
   consensus_contract_type: cdk-validium