fix issues

Author: meyer9

.env.mainnet

@@ -38,7 +38,7 @@ BASE_NODE_L1_TRUST_RPC="false"
 # ENGINE CONFIGURATION
 # -------------------
 OP_NODE_L2_ENGINE_KIND=reth
-OP_NODE_L2_ENGINE_RPC=ws://execution:8551
+OP_NODE_L2_ENGINE_RPC=http://execution:8551
 OP_NODE_L2_ENGINE_AUTH=/tmp/engine-auth-jwt
 OP_NODE_L2_ENGINE_AUTH_RAW=688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a
 

.env.sepolia

@@ -42,7 +42,7 @@ OP_NODE_L2_ENGINE_RPC=ws://execution:8551
 OP_NODE_L2_ENGINE_AUTH=/tmp/engine-auth-jwt
 OP_NODE_L2_ENGINE_AUTH_RAW=688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a
 
-BASE_NODE_L2_ENGINE_RPC=ws://execution:8551
+BASE_NODE_L2_ENGINE_RPC=http://execution:8551
 BASE_NODE_L2_ENGINE_AUTH=/tmp/engine-auth-jwt
 BASE_NODE_L2_ENGINE_AUTH_RAW=688f5d737bad920bdfb2fc2f488d6b6209eebda1dae949a8de91398d932c517a
 

base-consensus-entrypoint

@@ -44,8 +44,4 @@ export BASE_NODE_P2P_ADVERTISE_IP=$PUBLIC_IP
 
 echo "$BASE_NODE_L2_ENGINE_AUTH_RAW" > "$BASE_NODE_L2_ENGINE_AUTH"
 
-if [[ -n "${BASE_NODE_SOURCE_L2_RPC:-}" ]]; then
-  exec ./base-consensus follow
-fi
-
-exec ./base-consensus node
+exec ./base-consensus

consensus-entrypoint

@@ -3,8 +3,8 @@ set -eu
 
 if [ "${USE_BASE_CONSENSUS:-false}" = "true" ]; then
     echo "Using Base Client"
-    exec base-consensus-entrypoint
+    exec ./base-consensus-entrypoint
 else
     echo "Using OP Node"
-    exec op-node-entrypoint
-end
+    exec ./op-node-entrypoint
+fi

docker-compose.yml

@@ -13,6 +13,8 @@ services:
     command: ["bash", "./execution-entrypoint"]
     volumes:
       - ${HOST_DATA_DIR}:/data
+    environment:
+      - USE_BASE_CONSENSUS=${USE_BASE_CONSENSUS:-false}
     env_file:
       - ${NETWORK_ENV:-.env.mainnet} # Use .env.mainnet by default, override with .env.sepolia for testnet
   node:
@@ -29,5 +31,7 @@ services:
       - "7300:7300" # metrics
       - "6060:6060" # pprof
     command: ["bash", "./consensus-entrypoint"]
+    environment:
+      - USE_BASE_CONSENSUS=${USE_BASE_CONSENSUS:-false}
     env_file:
       - ${NETWORK_ENV:-.env.mainnet} # Use .env.mainnet by default, override with .env.sepolia for testnet