From a6703648b55db598427860eb5b1383d39232a1ca Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Thu, 3 Oct 2024 13:40:58 +0000
Subject: [PATCH 01/10] ci: bump kurtosis tag and cdk-erigon

Also remove testing fork9-rollup
---
 .github/workflows/test-e2e.yml            |  2 +-
 test/combinations/fork11-cdk-validium.yml | 12 ++++++++++++
 test/combinations/fork11-rollup.yml       | 12 ++++++++++++
 test/combinations/fork12-cdk-validium.yml |  1 +
 test/combinations/fork12-rollup.yml       |  1 +
 test/combinations/fork9-cdk-validium.yml  |  1 +
 test/combinations/fork9-rollup.yml        | 12 ------------
 7 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 test/combinations/fork11-cdk-validium.yml
 create mode 100644 test/combinations/fork11-rollup.yml
 delete mode 100644 test/combinations/fork9-rollup.yml

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 647c5daa..b856d4c1 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
       with:
         repository: 0xPolygon/kurtosis-cdk
         path: "kurtosis-cdk"
-        ref: "v0.2.11"
+        ref: "v0.2.12"
 
     - name: Setup Bats and bats libs
       uses: bats-core/bats-action@2.0.0
diff --git a/test/combinations/fork11-cdk-validium.yml b/test/combinations/fork11-cdk-validium.yml
new file mode 100644
index 00000000..0af2de10
--- /dev/null
+++ b/test/combinations/fork11-cdk-validium.yml
@@ -0,0 +1,12 @@
+args:
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.0-RC31-fork.11
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  cdk_node_image: cdk
+  zkevm_use_gas_token_contract: true
+  additional_services:
+    - pless_zkevm_node
+    - tx_spammer
+  data_availability_mode: cdk-validium
+  sequencer_type: erigon
diff --git a/test/combinations/fork11-rollup.yml b/test/combinations/fork11-rollup.yml
new file mode 100644
index 00000000..89f2f6cd
--- /dev/null
+++ b/test/combinations/fork11-rollup.yml
@@ -0,0 +1,12 @@
+args:
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.0-RC31-fork.11
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  cdk_node_image: cdk
+  zkevm_use_gas_token_contract: true
+  additional_services:
+    - pless_zkevm_node
+    - tx_spammer
+  data_availability_mode: rollup
+  sequencer_type: erigon
diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml
index 7772a677..cc0a34dc 100644
--- a/test/combinations/fork12-cdk-validium.yml
+++ b/test/combinations/fork12-cdk-validium.yml
@@ -1,6 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.3-fork.12
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC10-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:
diff --git a/test/combinations/fork12-rollup.yml b/test/combinations/fork12-rollup.yml
index 05e1f51f..ba8bb440 100644
--- a/test/combinations/fork12-rollup.yml
+++ b/test/combinations/fork12-rollup.yml
@@ -1,6 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.3-fork.12
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC10-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:
diff --git a/test/combinations/fork9-cdk-validium.yml b/test/combinations/fork9-cdk-validium.yml
index 21a20b58..13f16d48 100644
--- a/test/combinations/fork9-cdk-validium.yml
+++ b/test/combinations/fork9-cdk-validium.yml
@@ -3,6 +3,7 @@ args:
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.4
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:
diff --git a/test/combinations/fork9-rollup.yml b/test/combinations/fork9-rollup.yml
deleted file mode 100644
index a17daa2a..00000000
--- a/test/combinations/fork9-rollup.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-args:
-  zkevm_contracts_image: leovct/zkevm-contracts:v6.0.0-rc.1-fork.9
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.4
-  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
-  additional_services:
-    - pless_zkevm_node
-    - tx_spammer
-  data_availability_mode: rollup
-  sequencer_type: erigon

From b05d65a8e2c3421c0151071dd23536256d22ddaf Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Thu, 3 Oct 2024 13:43:12 +0000
Subject: [PATCH 02/10] ci: new matrix

---
 .github/workflows/test-e2e.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index b856d4c1..87e2a7dd 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -15,7 +15,8 @@ jobs:
         goarch: [ "amd64" ]
         e2e-group:
           - "fork9-validium"
-          - "fork9-rollup"
+          - "fork11-validium"
+          - "fork11-rollup"
           - "fork12-validium"
           - "fork12-rollup"
     runs-on: ubuntu-latest

From 771f691be5a04d1a85345447ab8aef0d9e930cf3 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Thu, 3 Oct 2024 13:52:00 +0000
Subject: [PATCH 03/10] ci: makefile

---
 test/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index a6ab9467..62152ffc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -51,9 +51,14 @@ test-e2e-fork9-validium: stop
 	./run-e2e.sh fork9 cdk-validium
 	bats .
 
-.PHONY: test-e2e-fork9-rollup
+.PHONY: test-e2e-fork11-validium
+test-e2e-fork9-validium: stop
+	./run-e2e.sh fork11 cdk-validium
+	bats .
+
+.PHONY: test-e2e-fork11-rollup
 test-e2e-fork9-rollup: stop
-	./run-e2e.sh fork9 rollup
+	./run-e2e.sh fork11 rollup
 	bats .
 
 .PHONY: test-e2e-fork12-validium

From 98b56824fabd47d9071a352555a65f539521f2e3 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Thu, 3 Oct 2024 14:09:12 +0000
Subject: [PATCH 04/10] ci: remove fork11-validium

---
 .github/workflows/test-e2e.yml            |  1 -
 test/Makefile                             |  5 -----
 test/combinations/fork11-cdk-validium.yml | 12 ------------
 3 files changed, 18 deletions(-)
 delete mode 100644 test/combinations/fork11-cdk-validium.yml

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 87e2a7dd..ea0029e7 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -15,7 +15,6 @@ jobs:
         goarch: [ "amd64" ]
         e2e-group:
           - "fork9-validium"
-          - "fork11-validium"
           - "fork11-rollup"
           - "fork12-validium"
           - "fork12-rollup"
diff --git a/test/Makefile b/test/Makefile
index 62152ffc..70c5cbcd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -51,11 +51,6 @@ test-e2e-fork9-validium: stop
 	./run-e2e.sh fork9 cdk-validium
 	bats .
 
-.PHONY: test-e2e-fork11-validium
-test-e2e-fork9-validium: stop
-	./run-e2e.sh fork11 cdk-validium
-	bats .
-
 .PHONY: test-e2e-fork11-rollup
 test-e2e-fork9-rollup: stop
 	./run-e2e.sh fork11 rollup
diff --git a/test/combinations/fork11-cdk-validium.yml b/test/combinations/fork11-cdk-validium.yml
deleted file mode 100644
index 0af2de10..00000000
--- a/test/combinations/fork11-cdk-validium.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-args:
-  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
-  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.0-RC31-fork.11
-  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
-  cdk_node_image: cdk
-  zkevm_use_gas_token_contract: true
-  additional_services:
-    - pless_zkevm_node
-    - tx_spammer
-  data_availability_mode: cdk-validium
-  sequencer_type: erigon

From 9f17818dc7ecacbba3c85e191d00b4ccf85accdf Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Thu, 3 Oct 2024 16:07:11 +0000
Subject: [PATCH 05/10] test: adapt to kurtosis port rename

---
 test/helpers/common-setup.bash             | 4 ++--
 test/scripts/batch_verification_monitor.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/helpers/common-setup.bash b/test/helpers/common-setup.bash
index 415f211d..95e35fe6 100644
--- a/test/helpers/common-setup.bash
+++ b/test/helpers/common-setup.bash
@@ -22,5 +22,5 @@ _common_setup() {
     readonly contracts_container=${KURTOSIS_CONTRACTS:-contracts-001}
     readonly contracts_service_wrapper=${KURTOSIS_CONTRACTS_WRAPPER:-"kurtosis service exec $enclave $contracts_container"}
     readonly erigon_rpc_node=${KURTOSIS_ERIGON_RPC:-cdk-erigon-node-001}
-    readonly l2_rpc_url=${L2_ETH_RPC_URL:-"$(kurtosis port print $enclave $erigon_rpc_node http-rpc)"}
-}
\ No newline at end of file
+    readonly l2_rpc_url=${L2_ETH_RPC_URL:-"$(kurtosis port print $enclave $erigon_rpc_node rpc)"}
+}
diff --git a/test/scripts/batch_verification_monitor.sh b/test/scripts/batch_verification_monitor.sh
index 9dc18e64..ac9481ad 100755
--- a/test/scripts/batch_verification_monitor.sh
+++ b/test/scripts/batch_verification_monitor.sh
@@ -17,7 +17,7 @@ timeout="$2"
 start_time=$(date +%s)
 end_time=$((start_time + timeout))
 
-rpc_url="$(kurtosis port print cdk-v1 cdk-erigon-node-001 http-rpc)"
+rpc_url="$(kurtosis port print cdk-v1 cdk-erigon-node-001 rpc)"
 
 while true; do
   verified_batches="$(cast to-dec "$(cast rpc --rpc-url "$rpc_url" zkevm_verifiedBatchNumber | sed 's/"//g')")"

From de19e5402e2ef53751f37fd4e195428c72743e81 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Thu, 3 Oct 2024 16:09:31 +0000
Subject: [PATCH 06/10] fix: makefile

---
 test/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Makefile b/test/Makefile
index 70c5cbcd..580454e6 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -52,7 +52,7 @@ test-e2e-fork9-validium: stop
 	bats .
 
 .PHONY: test-e2e-fork11-rollup
-test-e2e-fork9-rollup: stop
+test-e2e-fork11-rollup: stop
 	./run-e2e.sh fork11 rollup
 	bats .
 

From b2d3614a54ab4fdddc1f5af5e3a9816ead209db9 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Fri, 4 Oct 2024 15:51:42 +0000
Subject: [PATCH 07/10] ci: erigon back

---
 test/combinations/fork12-cdk-validium.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml
index cc0a34dc..7772a677 100644
--- a/test/combinations/fork12-cdk-validium.yml
+++ b/test/combinations/fork12-cdk-validium.yml
@@ -1,7 +1,6 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.3-fork.12
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC10-fork.12
-  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:

From 1afc12718ee9a672deace9092bc37667b2161bc3 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Sat, 5 Oct 2024 10:31:05 +0200
Subject: [PATCH 08/10] ci: try with prev

---
 .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 ea0029e7..a4886613 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
       with:
         repository: 0xPolygon/kurtosis-cdk
         path: "kurtosis-cdk"
-        ref: "v0.2.12"
+        ref: "v0.2.11"
 
     - name: Setup Bats and bats libs
       uses: bats-core/bats-action@2.0.0

From fad744a8155e39ec86c52e9ae4a8c17a222ebd21 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Sat, 5 Oct 2024 11:15:05 +0200
Subject: [PATCH 09/10] test: revert

---
 test/helpers/common-setup.bash             | 2 +-
 test/scripts/batch_verification_monitor.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/helpers/common-setup.bash b/test/helpers/common-setup.bash
index 95e35fe6..7cb4dec7 100644
--- a/test/helpers/common-setup.bash
+++ b/test/helpers/common-setup.bash
@@ -22,5 +22,5 @@ _common_setup() {
     readonly contracts_container=${KURTOSIS_CONTRACTS:-contracts-001}
     readonly contracts_service_wrapper=${KURTOSIS_CONTRACTS_WRAPPER:-"kurtosis service exec $enclave $contracts_container"}
     readonly erigon_rpc_node=${KURTOSIS_ERIGON_RPC:-cdk-erigon-node-001}
-    readonly l2_rpc_url=${L2_ETH_RPC_URL:-"$(kurtosis port print $enclave $erigon_rpc_node rpc)"}
+    readonly l2_rpc_url=${L2_ETH_RPC_URL:-"$(kurtosis port print $enclave $erigon_rpc_node http-rpc)"}
 }
diff --git a/test/scripts/batch_verification_monitor.sh b/test/scripts/batch_verification_monitor.sh
index ac9481ad..9dc18e64 100755
--- a/test/scripts/batch_verification_monitor.sh
+++ b/test/scripts/batch_verification_monitor.sh
@@ -17,7 +17,7 @@ timeout="$2"
 start_time=$(date +%s)
 end_time=$((start_time + timeout))
 
-rpc_url="$(kurtosis port print cdk-v1 cdk-erigon-node-001 rpc)"
+rpc_url="$(kurtosis port print cdk-v1 cdk-erigon-node-001 http-rpc)"
 
 while true; do
   verified_batches="$(cast to-dec "$(cast rpc --rpc-url "$rpc_url" zkevm_verifiedBatchNumber | sed 's/"//g')")"

From 6ca3f1013370f2bec3e0e5e9b2cee14752fa6197 Mon Sep 17 00:00:00 2001
From: Victor Castell <0x@vcastellm.xyz>
Date: Sat, 5 Oct 2024 22:08:30 +0200
Subject: [PATCH 10/10] ci: fork12 update

---
 test/combinations/fork12-cdk-validium.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml
index 7772a677..cc0a34dc 100644
--- a/test/combinations/fork12-cdk-validium.yml
+++ b/test/combinations/fork12-cdk-validium.yml
@@ -1,6 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.3-fork.12
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC10-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services: