Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core/helpers/agglayer-cdk-common-setup.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions core/helpers/agglayer-certificates-checks.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 11 additions & 3 deletions core/helpers/common.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down