From bb7df9301118da1c728dcb432d1398b9fc7b2d7e Mon Sep 17 00:00:00 2001
From: Roberto Bayardo <roberto.bayardo@coinbase.com>
Date: Mon, 6 Nov 2023 10:11:44 -0800
Subject: [PATCH] update rollup config flags to match optimism's
 recommendations

---
 .env.goerli     | 1 +
 .env.mainnet    | 1 +
 .env.sepolia    | 1 +
 geth-entrypoint | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.env.goerli b/.env.goerli
index ac7420b..eb4af93 100644
--- a/.env.goerli
+++ b/.env.goerli
@@ -28,6 +28,7 @@ OP_NODE_RPC_ADDR=0.0.0.0
 OP_NODE_RPC_PORT=8545
 OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
 OP_NODE_VERIFIER_L1_CONFS=4
+OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSION=true
 
 # OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
 # is fully trusted. It also allows op-node to work with clients such as Erigon that do not
diff --git a/.env.mainnet b/.env.mainnet
index b55009c..69e8260 100644
--- a/.env.mainnet
+++ b/.env.mainnet
@@ -28,6 +28,7 @@ OP_NODE_RPC_ADDR=0.0.0.0
 OP_NODE_RPC_PORT=8545
 OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
 OP_NODE_VERIFIER_L1_CONFS=4
+OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSION=true
 
 # OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
 # is fully trusted. It also allows op-node to work with clients such as Erigon that do not
diff --git a/.env.sepolia b/.env.sepolia
index 488dfeb..2288396 100644
--- a/.env.sepolia
+++ b/.env.sepolia
@@ -28,6 +28,7 @@ OP_NODE_RPC_ADDR=0.0.0.0
 OP_NODE_RPC_PORT=8545
 OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
 OP_NODE_VERIFIER_L1_CONFS=4
+OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSION=true
 
 # OP_NODE_L1_TRUST_RPC allows for faster syncing, but should be used *only* if your L1 RPC node
 # is fully trusted. It also allows op-node to work with clients such as Erigon that do not
diff --git a/geth-entrypoint b/geth-entrypoint
index ce6484a..075d484 100755
--- a/geth-entrypoint
+++ b/geth-entrypoint
@@ -37,7 +37,7 @@ if [ "${OP_GETH_ALLOW_UNPROTECTED_TXS+x}" = x ]; then
 fi
 
 if [ "${OP_NODE_NETWORK+x}" = x ]; then
-	ADDITIONAL_ARGS="$ADDITIONAL_ARGS --op-network=$OP_NODE_NETWORK --rollup.superchain-upgrades"
+	ADDITIONAL_ARGS="$ADDITIONAL_ARGS --op-network=$OP_NODE_NETWORK"
 fi
 
 exec ./geth \
@@ -68,5 +68,6 @@ exec ./geth \
 	--nat=extip:$HOST_IP \
 	--networkid="$CHAIN_ID" \
 	--rollup.sequencerhttp="$OP_GETH_SEQUENCER_HTTP" \
+	--rollup.halt=major \
 	--port="$P2P_PORT" \
 	$ADDITIONAL_ARGS # intentionally unquoted