From 7d144a0c5ed0372bd458cbb990973de7cd041980 Mon Sep 17 00:00:00 2001
From: Victor Castell <victor@polygon.technology>
Date: Fri, 8 Nov 2024 16:22:01 +0100
Subject: [PATCH] chore: bump kustoris (#168)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: bump kustoris
* Adapt to changes in services names
* fix: update minter key
* Apply feedback

Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>
---------
Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com>
---
 .github/workflows/test-e2e.yml        |  2 +-
 .github/workflows/test-resequence.yml | 26 ++++++++++++--------------
 crates/cdk/versions.json              |  2 +-
 scripts/local_config                  |  2 +-
 test/bridge-e2e.bats                  |  4 ++--
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 980ad990..9efddba0 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -39,7 +39,7 @@ jobs:
       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.3.0
+        sudo apt install kurtosis-cli=1.4.1
         kurtosis version
 
     - name: Disable kurtosis analytics
diff --git a/.github/workflows/test-resequence.yml b/.github/workflows/test-resequence.yml
index 23d73423..66bc437a 100644
--- a/.github/workflows/test-resequence.yml
+++ b/.github/workflows/test-resequence.yml
@@ -86,22 +86,20 @@ jobs:
         working-directory: ./cdk-erigon
         run: .github/scripts/test_resequence.sh
 
-      - name: Prepare logs
-        if: always()
-        working-directory: ./kurtosis-cdk
+      - name: Dump enclave logs
+        if: failure()
+        run: kurtosis dump ./dump
+  
+      - name: Generate archive name
+        if: failure()
         run: |
-          mkdir -p ci_logs
-          cd ci_logs
-          kurtosis service logs cdk-v1 cdk-erigon-rpc-001 --all > cdk-erigon-rpc-001.log
-          kurtosis service logs cdk-v1 cdk-erigon-sequencer-001 --all > cdk-erigon-sequencer-001.log
-          kurtosis service logs cdk-v1 zkevm-agglayer-001 --all > zkevm-agglayer-001.log
-          kurtosis service logs cdk-v1 zkevm-prover-001 --all > zkevm-prover-001.log
-          kurtosis service logs cdk-v1 cdk-node-001 --all > cdk-node-001.log
-          kurtosis service logs cdk-v1 zkevm-bridge-service-001 --all > zkevm-bridge-service-001.log
+          archive_name="dump_run_with_args_${{matrix.e2e-group}}_${{ github.run_id }}"
+          echo "ARCHIVE_NAME=${archive_name}" >> "$GITHUB_ENV"
+          echo "Generated archive name: ${archive_name}"
 
       - name: Upload logs
-        if: always()
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: logs_${{ github.run_id }}
-          path: ./kurtosis-cdk/ci_logs
+          name: ${{ env.ARCHIVE_NAME }}
+          path: ./dump
diff --git a/crates/cdk/versions.json b/crates/cdk/versions.json
index 36f2af1f..bafbd00b 100644
--- a/crates/cdk/versions.json
+++ b/crates/cdk/versions.json
@@ -1,7 +1,7 @@
 {
   "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.5",
   "cdk_erigon_node_image": "hermeznetwork/cdk-erigon:v2.1.2",
-  "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.4.0-beta4",
+  "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.4.0-beta5",
   "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk",
   "zkevm_bridge_proxy_image": "haproxy:3.0-bookworm",
   "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1",
diff --git a/scripts/local_config b/scripts/local_config
index 0a3b9473..274ec803 100755
--- a/scripts/local_config
+++ b/scripts/local_config
@@ -447,4 +447,4 @@ EOF
 echo " -----------------------------------------------------------"
 echo " "
 echo " - rembember to clean previous execution data: "
-echo "     rm -Rf ${path_rw_data}/*"
\ No newline at end of file
+echo "     rm -Rf ${path_rw_data}/*"
diff --git a/test/bridge-e2e.bats b/test/bridge-e2e.bats
index 01411a11..ed599c7d 100644
--- a/test/bridge-e2e.bats
+++ b/test/bridge-e2e.bats
@@ -76,8 +76,8 @@ setup() {
     local initial_receiver_balance=$(cast balance "$receiver" --rpc-url "$l2_rpc_url")
     echo "Initial receiver balance of native token on L2 $initial_receiver_balance" >&3
 
-    local initial_mint_balance=$(cast balance "0x8943545177806ED17B9F23F0a21ee5948eCaa776" --rpc-url "$l1_rpc_url")
-    echo "Initial minter balance on L1 $initial_mint_balance" >&3
+    local l1_minter_balance=$(cast balance "0x8943545177806ED17B9F23F0a21ee5948eCaa776" --rpc-url "$l1_rpc_url")
+    echo "Initial minter balance on L1 $l1_minter_balance" >&3
 
     # Query for initial sender balance
     run query_contract "$l1_rpc_url" "$gas_token_addr" "$balance_of_fn_sig" "$sender_addr"