diff --git a/.env.example b/.env.example index 81d7a77..1be5c4f 100644 --- a/.env.example +++ b/.env.example @@ -8,13 +8,6 @@ NETWORK_NAME=op-mainnet # Type of node to run ("full" or "archive"), note that "archive" is 10x bigger NODE_TYPE=full -############################################################################### -# ↓ REQUIRED (LEGACY) ↓ # -############################################################################### - -# L1 node to get chain data from (L2 sync no longer supported) -DATA_TRANSPORT_LAYER__RPC_ENDPOINT= - ############################################################################### # ↓ REQUIRED (BEDROCK) ↓ # ############################################################################### diff --git a/docker-compose.yml b/docker-compose.yml index aacc3bd..2caf76f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: - ${PORT__HEALTHCHECK_METRICS:-7300}:7300 op-geth: - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101308.0 + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101308.1 restart: unless-stopped stop_grace_period: 5m entrypoint: /scripts/start-op-geth.sh @@ -47,7 +47,7 @@ services: - "host.docker.internal:host-gateway" op-node: - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.5.1 + image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:v1.6.1 restart: unless-stopped stop_grace_period: 5m entrypoint: /scripts/start-op-node.sh diff --git a/scripts/init-bedrock.sh b/scripts/init-bedrock.sh index 7543ec1..87f253d 100755 --- a/scripts/init-bedrock.sh +++ b/scripts/init-bedrock.sh @@ -23,10 +23,23 @@ echo "Initializing via download..." # Fix OP link with hardcoded official OP snapshot echo "Fetching download link..." -if [ "$NETWORK_NAME" = "op-mainnet" ]; then - BEDROCK_TAR_DOWNLOAD="https://r2-snapshots.fastnode.io/op/$(curl -s https://r2-snapshots.fastnode.io/op/latest-mainnet)" -elif [ "$NETWORK_NAME" = "op-goerli" ]; then - BEDROCK_TAR_DOWNLOAD="https://datadirs.optimism.io/goerli-bedrock.tar.zst" + +if [ "$NODE_TYPE" = "full" ]; then + if [ "$NETWORK_NAME" = "op-mainnet" ]; then + BEDROCK_TAR_DOWNLOAD="https://r2-snapshots.fastnode.io/op/$(curl -s https://r2-snapshots.fastnode.io/op/latest-mainnet)" + elif [ "$NETWORK_NAME" = "op-goerli" ]; then + BEDROCK_TAR_DOWNLOAD="https://datadirs.optimism.io/goerli-bedrock.tar.zst" + elif [ "$NETWORK_NAME" = "base-mainnet" ]; then + BEDROCK_TAR_DOWNLOAD="https://base-snapshots-mainnet-archive.s3.amazonaws.com/$(curl -s https://base-snapshots-mainnet-archive.s3.amazonaws.com/latest)" + elif [ "$NETWORK_NAME" = "base-goerli" ]; then + BEDROCK_TAR_DOWNLOAD="https://base-snapshots-goerli-archive.s3.amazonaws.com/$(curl -s https://base-snapshots-goerli-archive.s3.amazonaws.com/latest)" + elif [ "$NETWORK_NAME" = "base-sepolia" ]; then + BEDROCK_TAR_DOWNLOAD="https://base-snapshots-sepolia-archive.s3.amazonaws.com/$(curl -s https://base-snapshots-sepolia-archive.s3.amazonaws.com/latest)" + fi +elif [ "$NODE_TYPE" = "archive" ]; then + if [ "$NETWORK_NAME" = "op-mainnet" ]; then + BEDROCK_TAR_DOWNLOAD="$(curl -s https://datadirs.optimism.io/latest/ | grep -oE 'https://[^\"]+')" + fi fi if [ -n "${BEDROCK_TAR_DOWNLOAD+x}" ]; then