From 00934ff02ee31b4a26e4a7bca46acdddafcc7e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Mon, 13 Jan 2025 13:54:22 +0100 Subject: [PATCH 1/8] ci: use main branch for kurtosis cdk --- .github/workflows/test-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 8df39db4..fed7cdd5 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -138,7 +138,7 @@ jobs: with: repository: 0xPolygon/kurtosis-cdk path: kurtosis-cdk - ref: jhilliard/multi-pp-testing + ref: main - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk From 7da5a3b3b904ae7919119caf78973976915cc451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Mon, 13 Jan 2025 14:10:08 +0100 Subject: [PATCH 2/8] fix: use variable for polycli version in e2e workflow --- .github/workflows/test-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index fed7cdd5..438eccd9 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -145,7 +145,7 @@ jobs: - name: Install polycli run: | - git clone https://github.com/0xPolygon/polygon-cli -b jhilliard/alonso + git clone https://github.com/0xPolygon/polygon-cli -b ${{ vars.POLYCLI_VERSION }} cd polygon-cli make install cp ~/go/bin/polycli /usr/local/bin/polycli From 7ffddffdac3422b1f85309950be2a4acbc429832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Mon, 13 Jan 2025 14:33:10 +0100 Subject: [PATCH 3/8] fix: bump cdk-erigon node image version in the fork 12 combinations --- .../fork12-pessimistic-multi-attach-second-cdk.yml | 4 +--- test/combinations/fork12-pessimistic-multi.yml | 1 - test/combinations/fork12-pessimistic.yml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml index 47aa6d78..adb6b8d4 100644 --- a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml +++ b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml @@ -27,7 +27,7 @@ args: cdk_node_image: cdk:latest - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2 zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 additional_services: [] consensus_contract_type: pessimistic @@ -36,5 +36,3 @@ args: gas_token_enabled: false zkevm_use_real_verifier: true enable_normalcy: true - verifier_program_vkey: 0x00766aa16a6efe4ac05c0fe21d4b50f9631dbd1a2663a982da861427085ea2ea - diff --git a/test/combinations/fork12-pessimistic-multi.yml b/test/combinations/fork12-pessimistic-multi.yml index 46845991..a7ae6170 100644 --- a/test/combinations/fork12-pessimistic-multi.yml +++ b/test/combinations/fork12-pessimistic-multi.yml @@ -12,4 +12,3 @@ args: enable_normalcy: true verifier_program_vkey: 0x00766aa16a6efe4ac05c0fe21d4b50f9631dbd1a2663a982da861427085ea2ea agglayer_prover_sp1_key: {{.AGGLAYER_PROVER_SP1_KEY}} - diff --git a/test/combinations/fork12-pessimistic.yml b/test/combinations/fork12-pessimistic.yml index f4f229d3..d56857fd 100644 --- a/test/combinations/fork12-pessimistic.yml +++ b/test/combinations/fork12-pessimistic.yml @@ -1,6 +1,6 @@ args: agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.20 - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0-beta8 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2 cdk_node_image: cdk zkevm_bridge_proxy_image: haproxy:3.0-bookworm zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1 From 34c8567fc6096236c416722e21bc8df3f867dbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Mon, 13 Jan 2025 15:01:45 +0100 Subject: [PATCH 4/8] fix: update cdk-erigon node image version to v2.61.2 in multiple test configurations --- .../combinations/fork12-pessimistic-multi-attach-second-cdk.yml | 2 +- test/combinations/fork12-pessimistic-multi.yml | 2 +- test/combinations/fork12-pessimistic.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml index adb6b8d4..a89518e7 100644 --- a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml +++ b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml @@ -27,7 +27,7 @@ args: cdk_node_image: cdk:latest - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2 zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 additional_services: [] consensus_contract_type: pessimistic diff --git a/test/combinations/fork12-pessimistic-multi.yml b/test/combinations/fork12-pessimistic-multi.yml index a7ae6170..36bb57ea 100644 --- a/test/combinations/fork12-pessimistic-multi.yml +++ b/test/combinations/fork12-pessimistic-multi.yml @@ -1,7 +1,7 @@ args: cdk_node_image: cdk:latest agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.20 - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.0 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2 zkevm_contracts_image: leovct/zkevm-contracts:v9.0.0-rc.3-pp-fork.12-patch.1 additional_services: [] consensus_contract_type: pessimistic diff --git a/test/combinations/fork12-pessimistic.yml b/test/combinations/fork12-pessimistic.yml index d56857fd..96b3ec18 100644 --- a/test/combinations/fork12-pessimistic.yml +++ b/test/combinations/fork12-pessimistic.yml @@ -1,6 +1,6 @@ args: agglayer_image: ghcr.io/agglayer/agglayer:0.2.0-rc.20 - cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.60.2 + cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.61.2 cdk_node_image: cdk zkevm_bridge_proxy_image: haproxy:3.0-bookworm zkevm_bridge_service_image: hermeznetwork/zkevm-bridge-service:v0.6.0-RC1 From 92a91bcdb8212594f0a6f2eb8b663c8a33106c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Tue, 14 Jan 2025 08:37:50 +0100 Subject: [PATCH 5/8] fix: simplify polycli installation --- .github/workflows/test-e2e.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 438eccd9..237b202d 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -55,15 +55,11 @@ jobs: - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk - - name: Install polycli + - name: Install Polygon CLI run: | - POLYCLI_VERSION="${{ vars.POLYCLI_VERSION }}" - tmp_dir=$(mktemp -d) - curl -L "https://github.com/0xPolygon/polygon-cli/releases/download/${POLYCLI_VERSION}/polycli_${POLYCLI_VERSION}_linux_amd64.tar.gz" | tar -xz -C "$tmp_dir" - mv "$tmp_dir"/* /usr/local/bin/polycli - rm -rf "$tmp_dir" - sudo chmod +x /usr/local/bin/polycli - /usr/local/bin/polycli version + go install github.com/0xPolygon/polygon-cli@${{ vars.POLYCLI_VERSION }} + polycli_version = $(polycli version) + echo Polygon CLI version: $polycli_version - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 @@ -143,13 +139,11 @@ jobs: - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk - - name: Install polycli + - name: Install Polygon CLI run: | - git clone https://github.com/0xPolygon/polygon-cli -b ${{ vars.POLYCLI_VERSION }} - cd polygon-cli - make install - cp ~/go/bin/polycli /usr/local/bin/polycli - /usr/local/bin/polycli version + go install github.com/0xPolygon/polygon-cli@${{ vars.POLYCLI_VERSION }} + polycli_version = $(polycli version) + echo Polygon CLI version: $polycli_version - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 From 7191b3dec86809b26ee4defdaca28d2729494a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Tue, 14 Jan 2025 10:08:27 +0100 Subject: [PATCH 6/8] fix: remove Polygon CLI installation from multi PP E2E workflow --- .github/workflows/test-e2e.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 237b202d..b980f749 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -138,12 +138,6 @@ jobs: - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk - - - name: Install Polygon CLI - run: | - go install github.com/0xPolygon/polygon-cli@${{ vars.POLYCLI_VERSION }} - polycli_version = $(polycli version) - echo Polygon CLI version: $polycli_version - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 From de27759c1ef052335fcd4e6df29a08dbd05acc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Tue, 14 Jan 2025 12:27:22 +0100 Subject: [PATCH 7/8] fix: remove Polygon CLI installation from E2E workflow --- .github/workflows/test-e2e.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index b980f749..6522d256 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -55,12 +55,6 @@ jobs: - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk - - name: Install Polygon CLI - run: | - go install github.com/0xPolygon/polygon-cli@${{ vars.POLYCLI_VERSION }} - polycli_version = $(polycli version) - echo Polygon CLI version: $polycli_version - - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 From 0d735692993c78aecf1c82f608fbb860a5ee6998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Tue, 14 Jan 2025 17:04:31 +0100 Subject: [PATCH 8/8] fix: add verifier program vkey to fork 12 pessimistic multi pp configuration --- test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml index a89518e7..18e555d2 100644 --- a/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml +++ b/test/combinations/fork12-pessimistic-multi-attach-second-cdk.yml @@ -36,3 +36,4 @@ args: gas_token_enabled: false zkevm_use_real_verifier: true enable_normalcy: true + verifier_program_vkey: 0x00766aa16a6efe4ac05c0fe21d4b50f9631dbd1a2663a982da861427085ea2ea