Merge pull request #110 from Chomtana/main

feat: op-sepolia support

docker-compose.yml

@@ -74,6 +74,7 @@ services:
       dockerfile: Dockerfile.bedrock-init
     entrypoint: /scripts/init-bedrock.sh
     env_file:
+      - ./envs/${NETWORK_NAME}/op-geth.env
       - .env
     volumes:
       - ./scripts/:/scripts

envs/op-sepolia/op-geth.env

@@ -0,0 +1,2 @@
+BEDROCK_SEQUENCER_HTTP=https://sepolia-sequencer.optimism.io
+BEDROCK_DATADIR=/geth

scripts/init-bedrock.sh

@@ -7,7 +7,7 @@ source ./scripts/utils.sh
 # Common variables.
 INITIALIZED_FLAG=/shared/initialized.txt
 BEDROCK_JWT_PATH=/shared/jwt.txt
-GETH_DATA_DIR=/geth
+GETH_DATA_DIR=$BEDROCK_DATADIR
 TORRENTS_DIR=/torrents/$NETWORK_NAME
 BEDROCK_TAR_PATH=/downloads/bedrock.tar
 BEDROCK_TMP_PATH=/bedrock-tmp
@@ -27,26 +27,26 @@ if [ "$NETWORK_NAME" = "op-mainnet" ]; then
   BEDROCK_TAR_DOWNLOAD="https://datadirs.optimism.io/mainnet-bedrock.tar.zst"
 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")
 fi
 
-if [[ "$BEDROCK_TAR_DOWNLOAD" == *.zst ]]; then
-  BEDROCK_TAR_PATH+=".zst"
-fi
+if [ -n "${BEDROCK_TAR_DOWNLOAD+x}" ]; then
+  if [[ "$BEDROCK_TAR_DOWNLOAD" == *.zst ]]; then
+    BEDROCK_TAR_PATH+=".zst"
+  fi
 
-echo "Downloading bedrock.tar..."
-download $BEDROCK_TAR_DOWNLOAD $BEDROCK_TAR_PATH
+  echo "Downloading bedrock.tar..."
+  download $BEDROCK_TAR_DOWNLOAD $BEDROCK_TAR_PATH
 
-echo "Extracting bedrock.tar..."
-if [[ "$BEDROCK_TAR_DOWNLOAD" == *.zst ]]; then
-  extractzst $BEDROCK_TAR_PATH $GETH_DATA_DIR
-else
-  extract $BEDROCK_TAR_PATH $GETH_DATA_DIR
-fi
+  echo "Extracting bedrock.tar..."
+  if [[ "$BEDROCK_TAR_DOWNLOAD" == *.zst ]]; then
+    extractzst $BEDROCK_TAR_PATH $GETH_DATA_DIR
+  else
+    extract $BEDROCK_TAR_PATH $GETH_DATA_DIR
+  fi
 
-# Remove tar file to save disk space
-rm $BEDROCK_TAR_PATH
+  # Remove tar file to save disk space
+  rm $BEDROCK_TAR_PATH
+fi
 
 echo "Creating JWT..."
 mkdir -p $(dirname $BEDROCK_JWT_PATH)

scripts/start-op-geth.sh

@@ -4,14 +4,14 @@ set -eou
 # Wait for the Bedrock flag for this network to be set.
 while [ ! -f /shared/initialized.txt ]; do
   echo "Waiting for Bedrock node to initialize..."
-  sleep 60
+  sleep 1
 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"
+    export EXTENDED_ARG="${EXTENDED_ARG:-} --rollup.historicalrpc=${OP_GETH__HISTORICAL_RPC:-http://l2geth:8545} --op-network=$NETWORK_NAME"
   else
-    export EXTENDED_ARG="--op-network=$NETWORK_NAME"
+    export EXTENDED_ARG="${EXTENDED_ARG:-} --op-network=$NETWORK_NAME"
   fi
 fi
 

scripts/start-op-node.sh

@@ -4,13 +4,13 @@ set -eou
 # Wait for the Bedrock flag for this network to be set.
 while [ ! -f /shared/initialized.txt ]; do
   echo "Waiting for Bedrock node to initialize..."
-  sleep 60
+  sleep 1
 done
 
 if [ -n "${IS_CUSTOM_CHAIN+x}" ]; then
-  export EXTENDED_ARG="--rollup.config=/chainconfig/rollup.json"
+  export EXTENDED_ARG="${EXTENDED_ARG:-} --rollup.config=/chainconfig/rollup.json"
 else
-  export EXTENDED_ARG="--network=$NETWORK_NAME --rollup.load-protocol-versions=true"
+  export EXTENDED_ARG="${EXTENDED_ARG:-} --network=$NETWORK_NAME --rollup.load-protocol-versions=true"
 fi
 
 # Start op-node.