Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
leovct authored Feb 4, 2025
2 parents 44c7449 + 41d2d5d commit 93ce975
Show file tree
Hide file tree
Showing 48 changed files with 977 additions and 174 deletions.
12 changes: 8 additions & 4 deletions .github/tests/agglayer-sp1-key.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
deployment_stages:
deploy_cdk_bridge_ui: false

args:
agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.23
agglayer_prover_sp1_key: ""
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.4-pp-fork.12
agglayer_prover_sp1_key: null
agglayer_prover_network_url: https://rpc.production2.succinct.tools
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12

consensus_contract_type: pessimistic
erigon_strict_mode: false
gas_token_enabled: false
# zkevm_use_real_verifier: true
enable_normalcy: true
enable_normalcy: true
4 changes: 1 addition & 3 deletions .github/tests/attach-second-cdk-pessimistic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ 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.2
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.4-pp-fork.12
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12
additional_services: []
consensus_contract_type: pessimistic
sequencer_type: erigon
Expand Down
3 changes: 2 additions & 1 deletion .github/tests/attach-second-cdk.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
deployment_stages:
deploy_l1: false
deploy_agglayer: false
deploy_cdk_bridge_ui: false

args:
verbosity: debug
Expand All @@ -26,4 +27,4 @@ args:
zkevm_l2_proofsigner_address: "0xf1a661D7b601Ec46a040f57193cC99aB8c4132FA"
zkevm_l2_proofsigner_private_key: "0xc7fe3a006d75ba9326d9792523385abb49057c66aee0b8b4248821a89713f975"

zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.4-pp-fork.12
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12
3 changes: 2 additions & 1 deletion .github/tests/attach-third-cdk.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
deployment_stages:
deploy_l1: false
deploy_agglayer: false
deploy_cdk_bridge_ui: false

args:
deployment_suffix: "-003"
Expand Down Expand Up @@ -59,4 +60,4 @@ args:
erigon_strict_mode: false
gas_token_enabled: false
# zkevm_use_real_verifier: true
enable_normalcy: true
enable_normalcy: true
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.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-RC6
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.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-RC6
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.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-RC6
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.2
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
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.2
zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
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-RC6
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-RC6
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.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.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
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.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.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
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.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.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
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.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.11
zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC6
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
3 changes: 1 addition & 2 deletions .github/tests/fork12-pessimistic.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
args:
cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.4-pp-fork.12
zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.5-pp-fork.12
additional_services: []
consensus_contract_type: pessimistic
sequencer_type: erigon
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.2

# 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-RC6

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.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-RC6

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-RC6

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.2

# 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-RC6

additional_services:
- pless_zkevm_node
- tx_spammer
Expand Down
37 changes: 18 additions & 19 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ name: Deploy
on:
pull_request:
push:
branches:
- '**'
branches: [main]

concurrency:
group: deploy-${{ github.event.pull_request.number || github.ref }}
Expand Down Expand Up @@ -422,7 +421,7 @@ jobs:
# Step to handle when the SP1_PRIVATE_KEY secret is available.
- name: Replace Agglayer SP1 Prover Key with Github Secrets
run: |
sed -i "s/agglayer_prover_sp1_key: \"\"/agglayer_prover_sp1_key: \"${{ secrets.SP1_PRIVATE_KEY }}\"/" ./.github/tests/agglayer-sp1-key.yml
sed -i "s/agglayer_prover_sp1_key: null/agglayer_prover_sp1_key: \"${{ secrets.SP1_PRIVATE_KEY }}\"/" ./.github/tests/agglayer-sp1-key.yml
# This step will only execute if the necessary secrets are available, preventing failures
# on pull requests from forked repositories.
if: ${{ env.agglayer_prover_sp1_key && env.agglayer_prover_sp1_key != '' }}
Expand All @@ -432,6 +431,22 @@ jobs:
- name: Deploy L1 chain and a first CDK L2 chain (cdk-erigon sequencer + cdk stack)
run: kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/agglayer-sp1-key.yml .

- name: Update the agglayer config
run: |
# Download the agglayer config file.
kurtosis files download ${{ env.ENCLAVE_NAME }} agglayer-config-artifact
cd agglayer-config-artifact
# Update the config by adding the rpc and proof signer of the second chain.
tomlq -Y --toml-output --in-place '."full-node-rpcs" += {"2": "http://cdk-erigon-rpc-002:8123"}' agglayer-config.toml
# Update the config by adding the rpc and proof signer of the third chain.
tomlq -Y --toml-output --in-place '."full-node-rpcs" += {"3": "http://cdk-erigon-rpc-003:8123"}' agglayer-config.toml
# Replace the agglayer config.
agglayer_container_id="$(docker ps --filter name=agglayer --format json | jq -r -s '. | map(select(.Names | startswith("agglayer--"))) | .[].ID')"
docker cp agglayer-config.toml "$agglayer_container_id:/etc/zkevm/agglayer-config.toml"
# Restart the agglayer service.
kurtosis service stop ${{ env.ENCLAVE_NAME }} agglayer
kurtosis service start ${{ env.ENCLAVE_NAME }} agglayer
- name: Attach a second FEP CDK L2 chain (cdk-erigon sequencer + cdk FEP stack)
run: kurtosis run --enclave=${{ env.ENCLAVE_NAME }} --args-file=./.github/tests/attach-second-cdk.yml .

Expand All @@ -452,22 +467,6 @@ jobs:
env:
agglayer_prover_sp1_key: ${{ secrets.SP1_PRIVATE_KEY }}

- name: Update the agglayer config
run: |
# Download the agglayer config file.
kurtosis files download ${{ env.ENCLAVE_NAME }} agglayer-config-artifact
cd agglayer-config-artifact
# Update the config by adding the rpc and proof signer of the second chain.
tomlq -Y --toml-output --in-place '."full-node-rpcs" += {"2": "http://cdk-erigon-rpc-002:8123"}' agglayer-config.toml
# Update the config by adding the rpc and proof signer of the third chain.
tomlq -Y --toml-output --in-place '."full-node-rpcs" += {"3": "http://cdk-erigon-rpc-003:8123"}' agglayer-config.toml
# Replace the agglayer config.
agglayer_container_id="$(docker ps --filter name=agglayer --format json | jq -r -s '. | map(select(.Names | startswith("agglayer--"))) | .[].ID')"
docker cp agglayer-config.toml "$agglayer_container_id:/etc/zkevm/agglayer-config.toml"
# Restart the agglayer service.
kurtosis service stop ${{ env.ENCLAVE_NAME }} agglayer
kurtosis service start ${{ env.ENCLAVE_NAME }} agglayer
- name: Inspect enclave
run: kurtosis enclave inspect ${{ env.ENCLAVE_NAME }}

Expand Down
Loading

0 comments on commit 93ce975

Please sign in to comment.