Skip to content

Commit 4119957

Browse files
author
Roberto Bayardo
committed
update rollup config flags to match optimism's recommendations
1 parent 5f68f89 commit 4119957

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
lines changed

.env.goerli

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ OP_NODE_RPC_ADDR=0.0.0.0
2828
OP_NODE_RPC_PORT=8545
2929
OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
3030
OP_NODE_VERIFIER_L1_CONFS=4
31+
OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSION=true
3132

3233
# OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
3334
# is fully trusted. It also allows op-node to work with clients such as Erigon that do not

.env.mainnet

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ OP_NODE_RPC_ADDR=0.0.0.0
2828
OP_NODE_RPC_PORT=8545
2929
OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
3030
OP_NODE_VERIFIER_L1_CONFS=4
31+
OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSION=true
3132

3233
# OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
3334
# is fully trusted. It also allows op-node to work with clients such as Erigon that do not

.env.sepolia

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ OP_NODE_RPC_ADDR=0.0.0.0
2828
OP_NODE_RPC_PORT=8545
2929
OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
3030
OP_NODE_VERIFIER_L1_CONFS=4
31+
OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSION=true
3132

3233
# OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
3334
# is fully trusted. It also allows op-node to work with clients such as Erigon that do not

geth-entrypoint

+2-15
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ set -eu
33

44
VERBOSITY=${GETH_VERBOSITY:-3}
55
GETH_DATA_DIR=/data
6-
GETH_CHAINDATA_DIR="$GETH_DATA_DIR/geth/chaindata"
7-
OP_GETH_GENESIS_FILE_PATH="${OP_GETH_GENESIS_FILE_PATH:-/genesis.json}"
8-
CHAIN_ID=$(jq -r .config.chainId < "$OP_GETH_GENESIS_FILE_PATH")
96
RPC_PORT="${RPC_PORT:-8545}"
107
WS_PORT="${WS_PORT:-8546}"
118
AUTHRPC_PORT="${AUTHRPC_PORT:-8551}"
@@ -16,16 +13,6 @@ ADDITIONAL_ARGS=""
1613

1714
mkdir -p $GETH_DATA_DIR
1815

19-
if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
20-
echo "$GETH_CHAINDATA_DIR missing, running init"
21-
echo "Initializing genesis."
22-
./geth --verbosity="$VERBOSITY" init \
23-
--datadir="$GETH_DATA_DIR" \
24-
"$OP_GETH_GENESIS_FILE_PATH"
25-
else
26-
echo "$GETH_CHAINDATA_DIR exists."
27-
fi
28-
2916
echo "$OP_NODE_L2_ENGINE_AUTH_RAW" > "$OP_NODE_L2_ENGINE_AUTH"
3017

3118
if [ "${OP_GETH_ETH_STATS+x}" = x ]; then
@@ -37,7 +24,7 @@ if [ "${OP_GETH_ALLOW_UNPROTECTED_TXS+x}" = x ]; then
3724
fi
3825

3926
if [ "${OP_NODE_NETWORK+x}" = x ]; then
40-
ADDITIONAL_ARGS="$ADDITIONAL_ARGS --op-network=$OP_NODE_NETWORK --rollup.superchain-upgrades"
27+
ADDITIONAL_ARGS="$ADDITIONAL_ARGS --op-network=$OP_NODE_NETWORK"
4128
fi
4229

4330
exec ./geth \
@@ -66,7 +53,7 @@ exec ./geth \
6653
--nodiscover \
6754
--maxpeers=100 \
6855
--nat=extip:$HOST_IP \
69-
--networkid="$CHAIN_ID" \
7056
--rollup.sequencerhttp="$OP_GETH_SEQUENCER_HTTP" \
57+
--rollup.halt=major \
7158
--port="$P2P_PORT" \
7259
$ADDITIONAL_ARGS # intentionally unquoted

0 commit comments

Comments
 (0)