Merge pull request #450 from 0xPolygon/feature/bridge_config

bridge config modification
0xPolygon · Jan 28, 2025 · ed87dcb · ed87dcb
2 parents d29e263 + e191b1a
commit ed87dcb
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 25 deletions.
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.2
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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.2
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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.2
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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.61.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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.61.2
   zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   additional_services:
     - pless_zkevm_node
     - tx_spammer

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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
 
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
 
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
 
   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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
 
   additional_services:
     - pless_zkevm_node

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.61.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.2)|[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-RC6](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC6)
-12|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[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-RC6](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC6)
-11|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[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-RC6](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC6)
-9|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[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-RC6](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC6)
+13|[v2.61.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.2)|[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-RC7](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC7)
+12|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[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-RC7](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC7)
+11|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[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-RC7](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC7)
+9|[v2.60.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.2)|[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-RC7](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC7)
diff --git a/docs/fork9-to-fork12-migration.org b/docs/fork9-to-fork12-migration.org
@@ -90,7 +90,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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   additional_services: []
   deploy_l2_contracts: true
   consensus_contract_type: cdk-validium
@@ -643,7 +643,7 @@ yq -y '
   .args.zkevm_prover_image = "hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12" |
   .args.cdk_erigon_node_image = "hermeznetwork/cdk-erigon:v2.60.0-beta10" |
   .args.zkevm_da_image = "0xpolygon/cdk-data-availability:0.0.11" |
-  .args.zkevm_bridge_service_image = "hermeznetwork/zkevm-bridge-service:v0.6.0-RC6" |
+  .args.zkevm_bridge_service_image = "hermeznetwork/zkevm-bridge-service:v0.6.0-RC7" |
   .args.consensus_contract_type = "cdk-validium" |
   .args.sequencer_type = "erigon" |
   .deployment_stages.deploy_cdk_erigon_node = true |

diff --git a/docs/upgrade-pp/README.org b/docs/upgrade-pp/README.org
@@ -43,7 +43,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-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   deploy_l2_contracts: true
   consensus_contract_type: cdk-validium
   sequencer_type: zkevm
@@ -299,7 +299,7 @@ args:
   cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta4
   cdk_node_image: nulyjkdhthz/cdk:6d775da5dad55990f534e0190a89613ae64f5ccf
   zkevm_bridge_proxy_image: haproxy:3.0-bookworm
-  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
+  zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
   zkevm_contracts_image: nulyjkdhthz/zkevm-contracts:v9.0.0-rc.3-pp-fork.12
   additional_services: []
   consensus_contract_type: pessimistic

diff --git a/input_parser.star b/input_parser.star
@@ -38,7 +38,7 @@ DEFAULT_IMAGES = {
     "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.5.0-beta10",  # 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-RC6",  # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
+    "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC7",  # 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

diff --git a/templates/bridge-infra/bridge-config.toml b/templates/bridge-infra/bridge-config.toml
@@ -47,7 +47,7 @@ PolygonZkEVMGlobalExitRootAddress = "{{.zkevm_global_exit_root_address}}"
 PolygonRollupManagerAddress = "{{.zkevm_rollup_manager_address}}"
 PolygonZkEVMAddress = "{{.zkevm_rollup_address}}"
 L2PolygonBridgeAddresses = ["{{.zkevm_bridge_l2_address}}"]
-SovereignChains = [false]
+RequireSovereignChainSmcs = [false]
 L2PolygonZkEVMGlobalExitRootAddresses = ["{{.zkevm_global_exit_root_l2_address}}"]
 
 [ClaimTxManager]