From 84d7747ed8373c9a58e0dfc5c036bcc892579177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Vincent?=
 <28714795+leovct@users.noreply.github.com>
Date: Wed, 27 Nov 2024 12:43:32 +0100
Subject: [PATCH] chore: bump kurtosis-cdk version to support pre-deployed gas
 token (#202)

* chore: kurtosis-cdk bump (gas token update)

* test

* chore: use new kurtosis-cdk tag

* chore: nit

* chore: clean up
---
 .github/workflows/test-e2e.yml            | 41 ++++++-----------------
 .github/workflows/test-resequence.yml     | 13 ++-----
 test/combinations/fork11-rollup.yml       |  3 +-
 test/combinations/fork12-cdk-validium.yml |  4 +--
 test/combinations/fork12-rollup.yml       |  2 +-
 test/combinations/fork9-cdk-validium.yml  |  2 +-
 6 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 8994d8e6e..1d7e81a04 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -32,26 +32,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 }}"
@@ -62,16 +53,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.19"
-
     - 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 66bc437ac..d280c5f16 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
@@ -34,21 +34,12 @@ 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
 
-      - 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 }}"
diff --git a/test/combinations/fork11-rollup.yml b/test/combinations/fork11-rollup.yml
index 79baa92d2..a0ffba40f 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 c17444b30..0836fb083 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-rollup.yml b/test/combinations/fork12-rollup.yml
index 95a5111a8..ca597faa3 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 e05436546..67b23bd09 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