From 831ec0bbfd46b5bf053b625b97d7ce1644a03d86 Mon Sep 17 00:00:00 2001
From: Ji Hwan <jkim@polygon.technology>
Date: Thu, 5 Mar 2026 11:05:56 +0900
Subject: [PATCH 1/2] feat: support l2 op-reth

Signed-off-by: Ji Hwan <jkim@polygon.technology>
---
 core/helpers/agglayer-cdk-common-setup.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/helpers/agglayer-cdk-common-setup.bash b/core/helpers/agglayer-cdk-common-setup.bash
index af506f94..968e4f77 100644
--- a/core/helpers/agglayer-cdk-common-setup.bash
+++ b/core/helpers/agglayer-cdk-common-setup.bash
@@ -107,7 +107,7 @@ _resolve_required_urls() {
 
     # L2_RPC_URL
     L2_RPC_URL=$(_resolve_url_or_use_env L2_RPC_URL \
-        "op-el-1-op-geth-op-node-001" "rpc" "cdk-erigon-rpc-001" "rpc" \
+        "op-el-1-op-geth-op-node-001" "rpc" "op-el-1-op-reth-op-node-001" "rpc" "cdk-erigon-rpc-001" "rpc" \
         "Failed to resolve L2 RPC URL" true)
     export L2_RPC_URL
 
@@ -444,18 +444,18 @@ _agglayer_cdk_common_multi_setup() {
 
     # Resolve L2 RPC URLs
     l2_rpc_url_1=$(_resolve_url_or_use_env L2_RPC_URL_1 \
-        "op-el-1-op-geth-op-node-001" "rpc" "cdk-erigon-rpc-001" "rpc" \
+        "op-el-1-op-geth-op-node-001" "rpc" "op-el-1-op-reth-op-node-001" "rpc" "cdk-erigon-rpc-001" "rpc" \
         "Failed to resolve L2 RPC URL (Rollup 1) " true)
     readonly l2_rpc_url_1
 
     l2_rpc_url_2=$(_resolve_url_or_use_env L2_RPC_URL_2 \
-        "op-el-1-op-geth-op-node-002" "rpc" "cdk-erigon-rpc-002" "rpc" \
+        "op-el-1-op-geth-op-node-002" "rpc" "op-el-1-op-reth-op-node-002" "rpc" "cdk-erigon-rpc-002" "rpc" \
         "Failed to resolve L2 RPC URL (Rollup 2) " true)
     readonly l2_rpc_url_2
 
     if [[ $number_of_chains -eq 3 ]]; then
         l2_rpc_url_3=$(_resolve_url_or_use_env L2_RPC_URL_3 \
-            "op-el-1-op-geth-op-node-003" "rpc" "cdk-erigon-rpc-003" "rpc" \
+            "op-el-1-op-geth-op-node-003" "rpc" "op-el-1-op-reth-op-node-003" "rpc" "cdk-erigon-rpc-003" "rpc" \
             "Failed to resolve L2 RPC URL (Rollup 3) " true)
         readonly l2_rpc_url_3
     fi

From 3fb8af01358583e8c6df167beac9c1d2b06961c1 Mon Sep 17 00:00:00 2001
From: Ji Hwan <jkim@polygon.technology>
Date: Thu, 5 Mar 2026 11:24:26 +0900
Subject: [PATCH 2/2] fix: l1 and l2 rpc handling

Signed-off-by: Ji Hwan <jkim@polygon.technology>
---
 core/helpers/agglayer-certificates-checks.bash |  4 ++--
 core/helpers/common.bash                       | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/helpers/agglayer-certificates-checks.bash b/core/helpers/agglayer-certificates-checks.bash
index ef77937b..d214d578 100644
--- a/core/helpers/agglayer-certificates-checks.bash
+++ b/core/helpers/agglayer-certificates-checks.bash
@@ -116,8 +116,8 @@ print_settlement_info() {
         return 1
     fi
 
-    # Check if L1 RPC is reachable
-    if ! curl -s --fail "$l1_rpc_url" >/dev/null; then
+    # Check if L1 RPC is reachable (use a JSON-RPC POST request since GET may not be supported)
+    if ! curl -s --fail -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"eth_chainId","params":[],"id":1}' "$l1_rpc_url" >/dev/null; then
         echo "Error: L1 RPC URL ($l1_rpc_url) is not reachable" >&3
         return 1
     fi
diff --git a/core/helpers/common.bash b/core/helpers/common.bash
index c59308f5..ddc23596 100644
--- a/core/helpers/common.bash
+++ b/core/helpers/common.bash
@@ -61,6 +61,8 @@ function _setup_vars() {
         export kurtosis_enclave_name=$ENCLAVE_NAME
         if kurtosis_l2_rpc_url=$(kurtosis port print "$kurtosis_enclave_name" op-el-1-op-geth-op-node-001 rpc 2>/dev/null); then
             l2_type="op-geth"
+        elif kurtosis_l2_rpc_url=$(kurtosis port print "$kurtosis_enclave_name" op-el-1-op-reth-op-node-001 rpc 2>/dev/null); then
+            l2_type="op-reth"
         elif kurtosis_l2_rpc_url=$(kurtosis port print "$kurtosis_enclave_name" cdk-erigon-rpc-001 rpc 2>/dev/null); then
             l2_type="cdk-erigon"
         else
@@ -199,15 +201,21 @@ function _setup_vars() {
     #
     # OP stack specific vars
     #
-    if [[ "$l2_type" == "op-geth" && -n "$kurtosis_enclave_name" ]]; then
+    if [[ ("$l2_type" == "op-geth" || "$l2_type" == "op-reth") && -n "$kurtosis_enclave_name" ]]; then
         if [[ -n "$L2_NODE_URL" ]]; then
             l2_node_url=$L2_NODE_URL
         else
-            run kurtosis port print "$kurtosis_enclave_name" op-cl-1-op-node-op-geth-001 http
+            local op_cl_service
+            if [[ "$l2_type" == "op-reth" ]]; then
+                op_cl_service="op-cl-1-op-node-op-reth-001"
+            else
+                op_cl_service="op-cl-1-op-node-op-geth-001"
+            fi
+            run kurtosis port print "$kurtosis_enclave_name" "$op_cl_service" http
             if [[ "$status" -eq 0 ]]; then
                 l2_node_url=$output
             else
-                l2_node_url=$(kurtosis port print "$kurtosis_enclave_name" op-cl-1-op-node-op-geth-001 rpc)
+                l2_node_url=$(kurtosis port print "$kurtosis_enclave_name" "$op_cl_service" rpc)
             fi
         fi