From 9e28af33041da6cf1a33346c048a158af1983e33 Mon Sep 17 00:00:00 2001 From: leovct Date: Thu, 21 Nov 2024 15:40:39 +0100 Subject: [PATCH 1/5] chore: kurtosis-cdk bump (gas token update) --- test/combinations/fork11-rollup.yml | 3 +-- test/combinations/fork12-cdk-validium.yml | 4 +--- test/combinations/fork12-pessimistic.yml | 4 ++-- test/combinations/fork12-rollup.yml | 2 +- test/combinations/fork9-cdk-validium.yml | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/test/combinations/fork11-rollup.yml b/test/combinations/fork11-rollup.yml index 79baa92d..a0ffba40 100644 --- a/test/combinations/fork11-rollup.yml +++ b/test/combinations/fork11-rollup.yml @@ -4,7 +4,6 @@ args: cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2 zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1 cdk_node_image: cdk - zkevm_use_gas_token_contract: true + gas_token_enabled: true data_availability_mode: rollup sequencer_type: erigon - \ No newline at end of file diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml index c17444b3..0836fb08 100644 --- a/test/combinations/fork12-cdk-validium.yml +++ b/test/combinations/fork12-cdk-validium.yml @@ -3,8 +3,6 @@ args: zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12 cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2 cdk_node_image: cdk - zkevm_use_gas_token_contract: true + gas_token_enabled: true data_availability_mode: cdk-validium sequencer_type: erigon - - diff --git a/test/combinations/fork12-pessimistic.yml b/test/combinations/fork12-pessimistic.yml index 088822c5..ca53d674 100644 --- a/test/combinations/fork12-pessimistic.yml +++ b/test/combinations/fork12-pessimistic.yml @@ -10,5 +10,5 @@ args: consensus_contract_type: pessimistic sequencer_type: erigon erigon_strict_mode: false - zkevm_use_gas_token_contract: true - enable_normalcy: true \ No newline at end of file + gas_token_enabled: true + enable_normalcy: true diff --git a/test/combinations/fork12-rollup.yml b/test/combinations/fork12-rollup.yml index 95a5111a..ca597faa 100644 --- a/test/combinations/fork12-rollup.yml +++ b/test/combinations/fork12-rollup.yml @@ -3,6 +3,6 @@ args: zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12 cdk_erigon_node_image: hermeznetwork/cdk-erigon:v2.1.2 cdk_node_image: cdk - zkevm_use_gas_token_contract: true + gas_token_enabled: true data_availability_mode: rollup sequencer_type: erigon diff --git a/test/combinations/fork9-cdk-validium.yml b/test/combinations/fork9-cdk-validium.yml index e0543654..67b23bd0 100644 --- a/test/combinations/fork9-cdk-validium.yml +++ b/test/combinations/fork9-cdk-validium.yml @@ -5,7 +5,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk cdk_node_image: cdk - zkevm_use_gas_token_contract: true + gas_token_enabled: true additional_services: - pless_zkevm_node data_availability_mode: cdk-validium From 67474818a7da1c33801d67b1b73482bdf59e7e31 Mon Sep 17 00:00:00 2001 From: leovct Date: Thu, 21 Nov 2024 15:43:40 +0100 Subject: [PATCH 2/5] test --- .github/workflows/test-e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index abde0c6b..a230b9d4 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -69,9 +69,9 @@ jobs: - name: checkout kurtosis-cdk uses: actions/checkout@v4 with: - repository: 0xPolygon/kurtosis-cdk - path: "kurtosis-cdk" - ref: "v0.2.21" + repository: leovct/kurtosis-cdk + path: kurtosis-cdk + ref: feat/pre-deployed-erc20-gas-token - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 From ad6a5913808631554d0d7cde5c272636f44bfb0c Mon Sep 17 00:00:00 2001 From: leovct Date: Wed, 27 Nov 2024 09:32:55 +0100 Subject: [PATCH 3/5] chore: use new kurtosis-cdk tag --- .github/workflows/test-e2e.yml | 6 +++--- .github/workflows/test-resequence.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index a230b9d4..32fdb3a5 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -66,12 +66,12 @@ jobs: - name: Install foundry uses: foundry-rs/foundry-toolchain@v1 - - name: checkout kurtosis-cdk + - name: Checkout kurtosis-cdk uses: actions/checkout@v4 with: - repository: leovct/kurtosis-cdk + repository: 0xPolygon/kurtosis-cdk path: kurtosis-cdk - ref: feat/pre-deployed-erc20-gas-token + ref: v0.2.22 - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 diff --git a/.github/workflows/test-resequence.yml b/.github/workflows/test-resequence.yml index 66bc437a..bcaf3c01 100644 --- a/.github/workflows/test-resequence.yml +++ b/.github/workflows/test-resequence.yml @@ -34,8 +34,8 @@ jobs: uses: actions/checkout@v4 with: repository: 0xPolygon/kurtosis-cdk - ref: a7a80b7b5d98a69a23415ab0018e556257a6dfb6 path: kurtosis-cdk + ref: v0.2.22 - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk From 04b87576f9fb16731e2b0fe5ec0da792d7ac2366 Mon Sep 17 00:00:00 2001 From: leovct Date: Wed, 27 Nov 2024 10:08:26 +0100 Subject: [PATCH 4/5] chore: nit --- .github/workflows/test-resequence.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-resequence.yml b/.github/workflows/test-resequence.yml index bcaf3c01..10643901 100644 --- a/.github/workflows/test-resequence.yml +++ b/.github/workflows/test-resequence.yml @@ -23,7 +23,7 @@ jobs: with: path: cdk - - name: Checkout kurtosis-cdk + - name: Checkout cdk-erigon uses: actions/checkout@v4 with: repository: 0xPolygonHermez/cdk-erigon From b31ec10463dc9ee592246cd77ddfaa25b04dd8c1 Mon Sep 17 00:00:00 2001 From: leovct Date: Wed, 27 Nov 2024 10:13:09 +0100 Subject: [PATCH 5/5] chore: clean up --- .github/workflows/test-e2e.yml | 41 +++++++-------------------- .github/workflows/test-resequence.yml | 9 ------ 2 files changed, 11 insertions(+), 39 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 0f42d4fe..9451612a 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -33,26 +33,17 @@ jobs: - name: Build Docker run: make build-docker - - # this is better to get the action in - - name: Install kurtosis - shell: bash - run: | - echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list - sudo apt update - sudo apt install kurtosis-cli=1.4.1 - kurtosis version - - - name: Disable kurtosis analytics - shell: bash - run: kurtosis analytics disable - - - name: Install yq - shell: bash - run: | - pip3 install yq - yq --version - + + - name: Checkout kurtosis-cdk + uses: actions/checkout@v4 + with: + repository: 0xPolygon/kurtosis-cdk + path: kurtosis-cdk + ref: v0.2.22 + + - name: Install Kurtosis CDK tools + uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk + - name: Install polycli run: | POLYCLI_VERSION="${{ vars.POLYCLI_VERSION }}" @@ -63,16 +54,6 @@ jobs: sudo chmod +x /usr/local/bin/polycli /usr/local/bin/polycli version - - name: Install foundry - uses: foundry-rs/foundry-toolchain@v1 - - - name: Checkout kurtosis-cdk - uses: actions/checkout@v4 - with: - repository: 0xPolygon/kurtosis-cdk - path: kurtosis-cdk - ref: v0.2.22 - - name: Setup Bats and bats libs uses: bats-core/bats-action@2.0.0 diff --git a/.github/workflows/test-resequence.yml b/.github/workflows/test-resequence.yml index 10643901..d280c5f1 100644 --- a/.github/workflows/test-resequence.yml +++ b/.github/workflows/test-resequence.yml @@ -40,15 +40,6 @@ jobs: - name: Install Kurtosis CDK tools uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - - - name: Install yq - run: | - sudo curl -L https://github.com/mikefarah/yq/releases/download/v4.44.2/yq_linux_amd64 -o /usr/local/bin/yq - sudo chmod +x /usr/local/bin/yq - /usr/local/bin/yq --version - - name: Install polycli run: | POLYCLI_VERSION="${{ vars.POLYCLI_VERSION }}"