From b33da622a74a6a7e062184b07d42495ff5a9beb3 Mon Sep 17 00:00:00 2001 From: Alonso Date: Thu, 16 Jan 2025 11:37:28 +0100 Subject: [PATCH] update bridge service images --- .../tests/combinations/fork11-legacy-zkevm-stack-rollup.yml | 2 +- .../tests/combinations/fork11-new-cdk-stack-cdk-validium.yml | 2 +- .github/tests/combinations/fork11-new-cdk-stack-rollup.yml | 2 +- .../tests/combinations/fork12-new-cdk-stack-cdk-validium.yml | 2 +- .github/tests/combinations/fork12-new-cdk-stack-rollup.yml | 2 +- .../tests/combinations/fork13-new-cdk-stack-cdk-validium.yml | 2 +- .github/tests/combinations/fork13-new-cdk-stack-rollup.yml | 2 +- .../combinations/fork9-legacy-zkevm-stack-cdk-validium.yml | 2 +- .../tests/combinations/fork9-legacy-zkevm-stack-rollup.yml | 2 +- .../tests/combinations/fork9-new-cdk-stack-cdk-validium.yml | 2 +- .github/tests/combinations/fork9-new-cdk-stack-rollup.yml | 2 +- .github/tests/forks/fork11.yml | 2 +- .github/tests/forks/fork12.yml | 2 +- .github/tests/forks/fork13.yml | 2 +- .github/tests/forks/fork9.yml | 2 +- docs/fork9-to-fork12-migration.org | 4 ++-- docs/upgrade-pp/README.org | 4 ++-- input_parser.star | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml b/.github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml index 503aeeef..d7c874af 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index b0107c5a..42cf9569 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 9246f9ba..408d451d 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 3d3d646b..6a0eb6f9 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 0dc700de..eb4b6b8d 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index c8898222..c96023fd 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 892e55f9..101a34e0 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 0ab813b4..6b74bf8a 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 8b03216f..70f43333 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 8312a233..c0b900b1 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index 1b6d007b..abce2915 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 additional_services: - pless_zkevm_node - tx_spammer diff --git a/.github/tests/forks/fork11.yml b/.github/tests/forks/fork11.yml index 35ef98f7..222fef35 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 additional_services: - tx_spammer diff --git a/.github/tests/forks/fork12.yml b/.github/tests/forks/fork12.yml index eb2ae7ae..1e6e7190 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 additional_services: - tx_spammer diff --git a/.github/tests/forks/fork13.yml b/.github/tests/forks/fork13.yml index d0e83792..aa06f6ef 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 additional_services: - tx_spammer diff --git a/.github/tests/forks/fork9.yml b/.github/tests/forks/fork9.yml index a5c6f2b0..b73ed48a 100644 --- 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-RC3 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 additional_services: - pless_zkevm_node diff --git a/docs/fork9-to-fork12-migration.org b/docs/fork9-to-fork12-migration.org index 7307fe7e..253ba15f 100644 --- 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-RC1 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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-RC1" | + .args.zkevm_bridge_service_image = "hermeznetwork/zkevm-bridge-service:v0.6.0-RC6" | .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 index a6c3444d..e34e710f 100644 --- 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-RC1 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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-RC1 + zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6 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 index a146ab25..bc5fe6ff 100644 --- 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-RC5", # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/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_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