Merge pull request #108 from Chomtana/main

Fix simple-optimism-node to work with latest OP mainnet

.env.example

@@ -31,9 +31,6 @@ OP_NODE__RPC_TYPE=basic
 # Reference L2 node to run healthcheck against
 HEALTHCHECK__REFERENCE_RPC_PROVIDER=
 
-# L1 node to run fault detection against
-FAULT_DETECTOR__L1_RPC_PROVIDER=
-
 ###############################################################################
 #                            ↓ OPTIONAL (BEDROCK) ↓                           #
 ###############################################################################
@@ -50,7 +47,6 @@ OP_GETH__HISTORICAL_RPC=
 IMAGE_TAG__L2GETH=
 IMAGE_TAG__DTL=
 IMAGE_TAG__HEALTCHECK=
-IMAGE_TAG__FAULT_DETECTOR=
 IMAGE_TAG__PROMETHEUS=
 IMAGE_TAG__GRAFANA=
 IMAGE_TAG__INFLUXDB=
@@ -63,7 +59,6 @@ PORT__L2GETH_HTTP=
 PORT__L2GETH_WS=
 PORT__DTL=
 PORT__HEALTHCHECK_METRICS=
-PORT__FAULT_DETECTOR_METRICS=
 PORT__PROMETHEUS=
 PORT__GRAFANA=
 PORT__INFLUXDB=

docker-compose.yml

@@ -1,20 +1,5 @@
 version: "3.4"
 services:
-  dtl:
-    image: ethereumoptimism/data-transport-layer:${IMAGE_TAG__DTL:-latest}
-    restart: unless-stopped
-    entrypoint: /scripts/start-dtl.sh
-    env_file:
-      - ./envs/${NETWORK_NAME}/dtl.env
-      - .env
-    volumes:
-      - dtl:/db
-      - ./scripts/:/scripts/
-    ports:
-      - ${PORT__DTL:-7878}:7878
-    profiles:
-      - legacy
-
   l2geth:
     image: ethereumoptimism/l2geth:${IMAGE_TAG__L2GETH:-latest}
     restart: unless-stopped
@@ -24,7 +9,7 @@ services:
       - -c
       - "/scripts/init-l2geth.sh && /scripts/start-l2geth.sh"
     env_file:
-      - ./envs/${NETWORK_NAME}/l2geth.env
+      - ./envs/common/l2geth.env
       - .env
     volumes:
       - geth:/geth
@@ -39,24 +24,13 @@ services:
     image: ethereumoptimism/replica-healthcheck:${IMAGE_TAG__HEALTHCHECK:-latest}
     restart: unless-stopped
     env_file:
-      - ./envs/${NETWORK_NAME}/healthcheck.env
+      - ./envs/common/healthcheck.env
       - .env
     ports:
       - ${PORT__HEALTHCHECK_METRICS:-7300}:7300
     profiles:
       - current
 
-  fault-detector:
-    image: ethereumoptimism/fault-detector:${IMAGE_TAG__FAULT_DETECTOR:-latest}
-    restart: unless-stopped
-    env_file:
-      - ./envs/${NETWORK_NAME}/fault-detector.env
-      - .env
-    ports:
-      - ${PORT__FAULT_DETECTOR_METRICS:-7301}:7300
-    profiles:
-      - current
-
   op-geth:
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101304.0
     restart: unless-stopped
@@ -66,6 +40,7 @@ services:
       - ./envs/${NETWORK_NAME}/op-geth.env
       - .env
     volumes:
+      - ./envs/${NETWORK_NAME}/config:/chainconfig
       - ./scripts/:/scripts
       - shared:/shared
       - op_geth:/geth
@@ -81,8 +56,10 @@ services:
     stop_grace_period: 5m
     entrypoint: /scripts/start-op-node.sh
     env_file:
+      - ./envs/${NETWORK_NAME}/op-node.env
       - .env
     volumes:
+      - ./envs/${NETWORK_NAME}/config:/chainconfig
       - ./scripts/:/scripts
       - shared:/shared
     ports:
@@ -125,7 +102,7 @@ services:
     image: grafana/grafana:${IMAGE_TAG__GRAFANA:-9.3.0}
     restart: unless-stopped
     env_file:
-      -  ./envs/${NETWORK_NAME}/grafana.env
+      -  ./envs/common/grafana.env
     volumes:
       - ./docker/grafana/provisioning/:/etc/grafana/provisioning/:ro
       - ./docker/grafana/dashboards/simple_node_dashboard.json:/var/lib/grafana/dashboards/simple_node_dashboard.json
@@ -140,7 +117,7 @@ services:
     image: influxdb:${IMAGE_TAG__INFLUXDB:-1.8}
     restart: unless-stopped
     env_file:
-      - ./envs/${NETWORK_NAME}/influxdb.env
+      - ./envs/common/influxdb.env
     volumes:
       - ./docker/influxdb/influx_init.iql:/docker-entrypoint-initdb.d/influx_init.iql
       - influxdb_data:/var/lib/influxdb

envs/common/l2geth.env

@@ -0,0 +1,8 @@
+USING_OVM=true
+ETH1_SYNC_SERVICE_ENABLE=false
+RPC_API=eth,rollup,net,web3,debug
+RPC_ADDR=0.0.0.0
+RPC_CORS_DOMAIN=*
+RPC_ENABLE=true
+RPC_PORT=8545
+RPC_VHOSTS=*

envs/op-mainnet/op-node.env

@@ -0,0 +1 @@
+# Official chain doesn't need custom 

scripts/init-bedrock.sh

@@ -23,9 +23,9 @@ echo "Initializing via download..."
 
 # Fix OP link with hardcoded official OP snapshot
 echo "Fetching download link..."
-if [ "$NETWORK_NAME" = "mainnet" ]; then
+if [ "$NETWORK_NAME" = "op-mainnet" ]; then
   BEDROCK_TAR_DOWNLOAD="https://datadirs.optimism.io/mainnet-bedrock.tar.zst"
-elif [ "$NETWORK_NAME" = "goerli" ]; then
+elif [ "$NETWORK_NAME" = "op-goerli" ]; then
   BEDROCK_TAR_DOWNLOAD="https://datadirs.optimism.io/goerli-bedrock.tar.zst"
 else
   BEDROCK_TAR_DOWNLOAD=$(config "bedrock/$NETWORK_NAME/bedrock-download")

scripts/start-op-geth.sh

@@ -7,6 +7,19 @@ while [ ! -f /shared/initialized.txt ]; do
   sleep 60
 done
 
+if [ -z "${IS_CUSTOM_CHAIN+x}" ]; then
+  if [ "$NETWORK_NAME" == "op-mainnet" ] || [ "$NETWORK_NAME" == "op-goerli" ]; then
+    export EXTENDED_ARG="--rollup.historicalrpc=${OP_GETH__HISTORICAL_RPC:-http://l2geth:8545} --op-network=$NETWORK_NAME"
+  else
+    export EXTENDED_ARG="--op-network=$NETWORK_NAME"
+  fi
+fi
+
+# Init genesis if custom chain
+if [ -n "${IS_CUSTOM_CHAIN+x}" ]; then
+  geth init --datadir="$BEDROCK_DATADIR" /chainconfig/genesis.json
+fi
+
 # Start op-geth.
 exec geth \
   --datadir="$BEDROCK_DATADIR" \
@@ -17,10 +30,10 @@ exec geth \
   --http.port=8545 \
   --http.api=web3,debug,eth,txpool,net,engine \
   --ws \
-	--ws.addr=0.0.0.0 \
-	--ws.port=8546 \
-	--ws.origins="*" \
-	--ws.api=debug,eth,txpool,net,engine,web3 \
+  --ws.addr=0.0.0.0 \
+  --ws.port=8546 \
+  --ws.origins="*" \
+  --ws.api=debug,eth,txpool,net,engine,web3 \
   --metrics \
   --metrics.influxdb \
   --metrics.influxdb.endpoint=http://influxdb:8086 \
@@ -36,6 +49,5 @@ exec geth \
   --authrpc.jwtsecret=/shared/jwt.txt \
   --rollup.sequencerhttp="$BEDROCK_SEQUENCER_HTTP" \
   --rollup.disabletxpoolgossip=true \
-  --rollup.historicalrpc="${OP_GETH__HISTORICAL_RPC:-http://l2geth:8545}" \
-  --op-network=$NETWORK_NAME \
-  $@
+  $EXTENDED_ARG $@
+

scripts/start-op-node.sh

@@ -7,11 +7,16 @@ while [ ! -f /shared/initialized.txt ]; do
   sleep 60
 done
 
+if [ -n "${IS_CUSTOM_CHAIN+x}" ]; then
+  export EXTENDED_ARG="--rollup.config=/chainconfig/rollup.json"
+else
+  export EXTENDED_ARG="--network=$NETWORK_NAME --rollup.load-protocol-versions=true"
+fi
+
 # Start op-node.
 exec op-node \
   --l1=$OP_NODE__RPC_ENDPOINT \
   --l2=http://op-geth:8551 \
-  --network=$NETWORK_NAME \
   --rpc.addr=127.0.0.1 \
   --rpc.port=9545 \
   --l2.jwt-secret=/shared/jwt.txt \
@@ -20,5 +25,4 @@ exec op-node \
   --metrics.enabled \
   --metrics.addr=0.0.0.0 \
   --metrics.port=7300 \
-  --rollup.load-protocol-versions=true \
-  $@
+  $EXTENDED_ARG $@