Skip to content

Commit

Permalink
Bumping to Final 0.4.0 CDK Version (#395)
Browse files Browse the repository at this point in the history
* chore: bumping some versions

* chore: update test combinations

---------

Co-authored-by: leovct <[email protected]>
  • Loading branch information
praetoriansentry and leovct authored Nov 25, 2024
1 parent b133786 commit 529a3e7
Show file tree
Hide file tree
Showing 18 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/combinations/fork9-new-cdk-stack-rollup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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.10
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/fork12-pessimistic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ args:
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8
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-RC2
zkevm_bridge_ui_image: leovct/zkevm-bridge-ui:multi-network
zkevm_contracts_image: nulyjkdhthz/zkevm-contracts:v9.0.0-rc.3-pp-fork.12
additional_services: []
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ args:
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

# https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2

additional_services:
- tx_spammer
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ args:
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

# https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2

additional_services:
- tx_spammer
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ args:
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

# https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2

additional_services:
- tx_spammer
Expand Down
2 changes: 1 addition & 1 deletion .github/tests/forks/fork9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ args:
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10

# https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2

additional_services:
- pless_zkevm_node
Expand Down
8 changes: 4 additions & 4 deletions CDK_VERSION_MATRIX.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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-beta10](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta10)|[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.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
12|[v2.60.0-beta10](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta10)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-rc.4-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-rc.4-fork.12)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
11|[v2.60.0-beta10](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta10)|[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.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
9|[v2.1.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.1.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.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC1](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC1)
13|[v2.60.0-beta10](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta10)|[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.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
12|[v2.60.0-beta10](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta10)|[v8.0.0-RC14-fork.12](https://github.com/0xPolygonHermez/zkevm-prover/releases/tag/v8.0.0-RC14)|[v8.0.0-rc.4-fork.12](https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/v8.0.0-rc.4-fork.12)|[0.0.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
11|[v2.60.0-beta10](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0-beta10)|[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.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
9|[v2.1.2](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.1.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.10](https://github.com/0xPolygon/cdk-data-availability/releases/tag/v0.0.10)|[v0.6.0-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
6 changes: 3 additions & 3 deletions input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ DEFAULT_DEPLOYMENT_STAGES = {
}

DEFAULT_IMAGES = {
"agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.12", # https://github.com/agglayer/agglayer/pkgs/container/agglayer-rs
"agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.14", # https://github.com/agglayer/agglayer/pkgs/container/agglayer-rs
"cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.1.2", # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
"cdk_node_image": "ghcr.io/0xpolygon/cdk:0.4.0-beta10", # https://github.com/0xpolygon/cdk/pkgs/container/cdk
"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.0-bookworm", # https://hub.docker.com/_/haproxy/tags
"zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1", # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/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_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-rc.4-fork.12", # https://hub.docker.com/repository/docker/leovct/zkevm-contracts/tags
"zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10", # https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
Expand Down

0 comments on commit 529a3e7

Please sign in to comment.