Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/bridge sovereign support #442

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Feature/bridge sovereign support #442

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85ce598
new config parameters
ARR552 Jan 16, 2025
b33da62
update bridge service images
ARR552 Jan 16, 2025
6b4f237
docs: update cdk version matrix
leovct Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork11-legacy-zkevm-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork11-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork11-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork12-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork12-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork13-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork13-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork9-legacy-zkevm-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork9-legacy-zkevm-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork9-new-cdk-stack-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork9-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork13.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork9.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/fork9-to-fork12-migration.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions docs/upgrade-pp/README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions templates/bridge-infra/bridge-config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ PolygonZkEVMGlobalExitRootAddress = "{{.zkevm_global_exit_root_address}}"
PolygonRollupManagerAddress = "{{.zkevm_rollup_manager_address}}"
PolygonZkEVMAddress = "{{.zkevm_rollup_address}}"
L2PolygonBridgeAddresses = ["{{.zkevm_bridge_l2_address}}"]
SovereignChains = [false]
L2PolygonZkEVMGlobalExitRootAddresses = ["{{.zkevm_global_exit_root_l2_address}}"]

[ClaimTxManager]
FrequencyToMonitorTxs = "5s"
Expand Down
Loading