Skip to content

Commit

Permalink
feat: version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
praetoriansentry committed Jan 29, 2025
1 parent af13f6d commit bb1017a
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 87 deletions.
2 changes: 0 additions & 2 deletions .github/tests/attach-second-cdk-pessimistic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ args:
zkevm_l2_proofsigner_private_key: "0xc7fe3a006d75ba9326d9792523385abb49057c66aee0b8b4248821a89713f975"


cdk_node_image: ghcr.io/0xpolygon/cdk:0.5.0-beta10
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12
additional_services: []
consensus_contract_type: pessimistic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
3 changes: 0 additions & 3 deletions .github/tests/combinations/fork11-new-cdk-stack-rollup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ args:
verbosity: debug
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.6
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
3 changes: 0 additions & 3 deletions .github/tests/combinations/fork12-new-cdk-stack-rollup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ args:
verbosity: debug
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.6
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ args:
verbosity: debug
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.61.2
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
3 changes: 0 additions & 3 deletions .github/tests/combinations/fork13-new-cdk-stack-rollup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ args:
verbosity: debug
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.61.2
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7
additional_services:
- tx_spammer
deploy_l2_contracts: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
3 changes: 0 additions & 3 deletions .github/tests/combinations/fork9-new-cdk-stack-rollup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ args:
verbosity: debug
zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
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-RC7
additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
23 changes: 16 additions & 7 deletions .github/tests/combine-ymls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ forks=(forks/*.yml)
data_availability=(da-modes/*.yml)
components=(components/*.yml)

default_erigon_version="$(grep -P "cdk_erigon_node_image.*hermeznetwork/cdk-erigon" ../../input_parser.star | sed 's#.*hermeznetwork/cdk-erigon:\([^"]*\).*#\1#')"
default_bridge_version="$(grep -P "zkevm_bridge_service_image.*hermeznetwork" ../../input_parser.star | sed 's#.*hermeznetwork/zkevm-bridge-service:\([^"]*\).*#\1#')"
default_da_version="$(grep -P "zkevm_da_image.*0xpolygon" ../../input_parser.star | sed 's#.*0xpolygon/cdk-data-availability:\([^"]*\).*#\1#')"

# Nested loops to create all combinations.
echo "Creating combinations..."
mkdir -p "$COMBINATIONS_FOLDER"
Expand Down Expand Up @@ -66,11 +70,16 @@ for fork in "${forks[@]}"; do
if [[ "$base_da" == "cdk-validium" && "$base_comp" == "new-cdk-stack" ]]; then
fork_id=${base_fork#fork}
# shellcheck disable=SC2016
yq --raw-output --arg fork_id "$fork_id" --yaml-output '{
yq --raw-output \
--arg fork_id "$fork_id" \
--arg bridge_version "$default_bridge_version" \
--arg da_version "$default_da_version" \
--arg erigon_version "$default_erigon_version" \
--yaml-output '{
($fork_id): {
cdk_erigon: {
version: .args.cdk_erigon_node_image | split(":")[1],
source: "https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/\(.args.cdk_erigon_node_image | split(":")[1])",
version: $erigon_version,
source: "https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/\($erigon_version)",
},
zkevm_prover: {
version: .args.zkevm_prover_image | split(":")[1],
Expand All @@ -81,12 +90,12 @@ for fork in "${forks[@]}"; do
source: "https://github.com/0xPolygonHermez/zkevm-contracts/releases/tag/\(.args.zkevm_contracts_image | split(":")[1] | split("-patch.")[0])",
},
data_availability: {
version: .args.zkevm_da_image | split(":")[1],
source: "https://github.com/0xPolygon/cdk-data-availability/releases/tag/v\(.args.zkevm_da_image | split(":")[1])",
version: $da_version,
source: "https://github.com/0xPolygon/cdk-data-availability/releases/tag/v\($da_version)",
},
bridge_service: {
version: .args.zkevm_bridge_service_image | split(":")[1],
source: "https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/\(.args.zkevm_bridge_service_image | split(":")[1])",
version: $bridge_version,
source: "https://github.com/0xPolygonHermez/zkevm-bridge-service/releases/tag/\($bridge_version)",
},
}}
' "$output_file" >> "$MATRIX_VERSION_FILE"
Expand Down
1 change: 0 additions & 1 deletion .github/tests/fork12-pessimistic.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12
additional_services: []
consensus_contract_type: pessimistic
Expand Down
9 changes: 0 additions & 9 deletions .github/tests/forks/fork11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,9 @@ args:
# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=fork.11
zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.4-fork.11

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6

# https://hub.docker.com/r/hermeznetwork/zkevm-node/tags?name=fork11
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.11

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

additional_services:
- tx_spammer

Expand Down
9 changes: 0 additions & 9 deletions .github/tests/forks/fork12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ args:
# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v8
zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC14-fork.12

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6

# 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/hermeznetwork/zkevm-bridge-service/tags
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7

additional_services:
- tx_spammer

Expand Down
9 changes: 0 additions & 9 deletions .github/tests/forks/fork13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ args:
# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v9
zkevm_prover_image: hermeznetwork/zkevm-prover:v9.0.0-RC2-fork.13

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2

# 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/hermeznetwork/zkevm-bridge-service/tags
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC7

additional_services:
- tx_spammer

Expand Down
9 changes: 0 additions & 9 deletions .github/tests/forks/fork9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,12 @@ args:
# https://hub.docker.com/r/hermeznetwork/zkevm-prover/tags?name=v6
zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.8

# https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.6

# https://hub.docker.com/r/hermeznetwork/zkevm-node/tags?name=v0.7
zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3

# https://hub.docker.com/r/0xpolygon/cdk-validium-node/tags?name=0.7
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.11

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

additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
9 changes: 4 additions & 5 deletions CDK_VERSION_MATRIX.MD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +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-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)

13|[v2.61.6-RC1](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.6-RC1)|[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.61.6-RC1](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.6-RC1)|[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.61.6-RC1](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.6-RC1)|[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.61.6-RC1](https://github.com/0xPolygonHermez/cdk-erigon/releases/tag/v2.61.6-RC1)|[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)
6 changes: 3 additions & 3 deletions input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ DEFAULT_DEPLOYMENT_STAGES = {
}

DEFAULT_IMAGES = {
"agglayer_image": "ghcr.io/agglayer/agglayer:0.2.1", # https://github.com/agglayer/agglayer/tags
"cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.60.6", # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
"cdk_node_image": "ghcr.io/0xpolygon/cdk:0.5.0-beta10", # https://github.com/0xpolygon/cdk/pkgs/container/cdk
"agglayer_image": "ghcr.io/agglayer/agglayer:0.2.2-rc.1", # https://github.com/agglayer/agglayer/tags
"cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.61.6-RC1", # https://hub.docker.com/r/hermeznetwork/cdk-erigon/tags
"cdk_node_image": "ghcr.io/0xpolygon/cdk:0.5.1-rc2", # 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-RC7", # https://hub.docker.com/r/hermeznetwork/zkevm-bridge-service/tags
Expand Down

0 comments on commit bb1017a

Please sign in to comment.