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

chore: bump DAC #412

Merged
merged 3 commits into from
Dec 3, 2024
Merged

chore: bump DAC #412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83383a8
bump dac
rachit77 Dec 3, 2024
3ffbb7f
chore: use the cdk repository, instead of the fork and pass the e2e t…
Stefan-Ethernal Dec 3, 2024
abb3363
chore: update cdk version in ci tests
leovct Dec 3, 2024
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 @@ -4,7 +4,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/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 @@ -4,7 +4,7 @@ args:
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/combinations/fork11-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:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/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 @@ -3,7 +3,7 @@ args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/combinations/fork12-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-fork.12-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/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 @@ -3,7 +3,7 @@ args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/combinations/fork13-new-cdk-stack-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ args:
zkevm_contracts_image: leovct/zkevm-contracts:v8.1.0-rc.1-fork.13-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
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/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 @@ -5,7 +5,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
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_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
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 @@ -5,7 +5,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
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_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
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 @@ -5,7 +5,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
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_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
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 @@ -5,7 +5,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0
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_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC2
additional_services:
- pless_zkevm_node
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 @@ -14,7 +14,7 @@ args:
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11

# https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
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-RC2
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 @@ -11,7 +11,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0

# https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
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-RC2
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 @@ -11,7 +11,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0

# https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
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-RC2
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 @@ -17,7 +17,7 @@ args:
cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk

# https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10
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-RC2
Expand Down
8 changes: 4 additions & 4 deletions CDK_VERSION_MATRIX.MD
View file
Open in desktop
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](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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.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](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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)
13|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
12|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
11|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
9|[v2.60.0](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.60.0)|[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-RC2](https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/v0.6.0-RC2)
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 @@ -89,7 +89,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
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_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
additional_services: []
deploy_l2_contracts: true
Expand Down Expand Up @@ -642,7 +642,7 @@ yq -y '
.args.zkevm_contracts_image = "leovct/zkevm-contracts:v8.0.0-rc.4-fork.12" |
.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.10" |
.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.consensus_contract_type = "cdk-validium" |
.args.sequencer_type = "erigon" |
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade-pp/README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2
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_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1
deploy_l2_contracts: true
consensus_contract_type: cdk-validium
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 @@ -37,7 +37,7 @@ DEFAULT_IMAGES = {
"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-fork.12-patch.1", # 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
"zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.11", # https://hub.docker.com/r/0xpolygon/cdk-data-availability/tags
"zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3", # https://hub.docker.com/r/hermeznetwork/zkevm-node/tags
"zkevm_pool_manager_image": "hermeznetwork/zkevm-pool-manager:v0.1.2", # https://hub.docker.com/r/hermeznetwork/zkevm-pool-manager/tags
"zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12", # https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags
Expand Down
Loading