Skip to content

Commit

Permalink
Merge pull request #159 from Chomtana/main
Browse files Browse the repository at this point in the history
Removing +x
  • Loading branch information
Chomtana authored Aug 29, 2024
2 parents cdb75a4 + f47f9d0 commit ef14847
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions scripts/init-bedrock.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eou
set -e

# Import utilities.
source ./scripts/utils.sh
Expand All @@ -26,7 +26,7 @@ echo "Fetching download link..."

if [ "$NODE_TYPE" = "full" ]; then
# Warning: syncmode=full for syncing full node is deprecated and not recommended to use
if [ "${OP_GETH__SYNCMODE+x}" = "full" ]; then
if [ "$OP_GETH__SYNCMODE" = "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
Expand All @@ -45,7 +45,7 @@ elif [ "$NODE_TYPE" = "archive" ]; then
fi
fi

if [ -n "${BEDROCK_TAR_DOWNLOAD+x}" ]; then
if [ -n "$BEDROCK_TAR_DOWNLOAD" ]; then
if [[ "$BEDROCK_TAR_DOWNLOAD" == *.zst ]]; then
BEDROCK_TAR_PATH+=".zst"
elif [[ "$BEDROCK_TAR_DOWNLOAD" == *.lz4 ]]; then
Expand Down
4 changes: 2 additions & 2 deletions scripts/init-l2geth.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/sh
set -eou
set -e

if [ "$NETWORK_NAME" != "op-mainnet" ]; then
echo "Stopping l2geth for a non op-mainnet chain"
exit
fi

if [ -n "${OP_GETH__HISTORICAL_RPC+x}" ]; then
if [ -n "${OP_GETH__HISTORICAL_RPC}" ]; then
echo "Stopping l2geth for using an external historical RPC"
exit
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/start-dtl.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
set -eou
set -e

# Setting both endpoints doesn't hurt.
export DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=$DATA_TRANSPORT_LAYER__RPC_ENDPOINT
Expand Down
4 changes: 2 additions & 2 deletions scripts/start-l2geth.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/sh
set -eou
set -e

if [ "$NETWORK_NAME" != "op-mainnet" ]; then
echo "Stopping l2geth for a non op-mainnet chain"
exit
fi

if [ -n "${OP_GETH__HISTORICAL_RPC+x}" ]; then
if [ -n "${OP_GETH__HISTORICAL_RPC}" ]; then
echo "Stopping l2geth for using an external historical RPC"
exit
fi
Expand Down
6 changes: 3 additions & 3 deletions scripts/start-op-geth.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/sh
set -eou
set -e

# Wait for the Bedrock flag for this network to be set.
echo "Waiting for Bedrock node to initialize..."
while [ ! -f /shared/initialized.txt ]; do
sleep 1
done

if [ -z "${IS_CUSTOM_CHAIN+x}" ]; then
if [ -z "${IS_CUSTOM_CHAIN}" ]; then
if [ "$NETWORK_NAME" == "op-mainnet" ] || [ "$NETWORK_NAME" == "op-goerli" ]; then
export EXTENDED_ARG="${EXTENDED_ARG:-} --rollup.historicalrpc=${OP_GETH__HISTORICAL_RPC:-http://l2geth:8545} --op-network=$NETWORK_NAME"
else
Expand All @@ -16,7 +16,7 @@ if [ -z "${IS_CUSTOM_CHAIN+x}" ]; then
fi

# Init genesis if custom chain
if [ -n "${IS_CUSTOM_CHAIN+x}" ]; then
if [ -n "${IS_CUSTOM_CHAIN}" ]; then
geth init --datadir="$BEDROCK_DATADIR" /chainconfig/genesis.json
fi

Expand Down
4 changes: 2 additions & 2 deletions scripts/start-op-node.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/sh
set -eou
set -e

# Wait for the Bedrock flag for this network to be set.
echo "Waiting for Bedrock node to initialize..."
while [ ! -f /shared/initialized.txt ]; do
sleep 1
done

if [ -n "${IS_CUSTOM_CHAIN+x}" ]; then
if [ -n "${IS_CUSTOM_CHAIN}" ]; then
export EXTENDED_ARG="${EXTENDED_ARG:-} --rollup.config=/chainconfig/rollup.json"
else
export EXTENDED_ARG="${EXTENDED_ARG:-} --network=$NETWORK_NAME --rollup.load-protocol-versions=true --rollup.halt=major"
Expand Down

0 comments on commit ef14847

Please sign in to comment.