Merge pull request #35 from rabbitprincess/feature/support-no-superchain-registry

gosunuts · web-flow · commit 89f1b8cfbd6f · 2024-10-24T16:37:29.000+09:00
Feature/support for not superchain
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 data-geth
 data-scan
-config
+config/*
+!config/**/
diff --git a/common.env b/common.env
@@ -3,6 +3,6 @@ GETH_DATA_DIR="../data-geth"
 SCAN_DATA_DIR="../data-scan"
 
 # chain config files in /envs
-# custom node : custom-mainnet.env, custom-sepolia.env, custom-holesky.env
+# sequencer node : sequencer-mainnet.env, sequencer-sepolia.env, sequencer-holesky.env
 # replica node : op, base, unichain, worldchain
-CHAIN_ENV_FILE="custom-holesky.env"
+CHAIN_ENV_FILE="sequencer-holesky.env"
diff --git a/config/unichain-sepolia/genesis.json b/config/unichain-sepolia/genesis.json
diff --git a/config/unichain-sepolia/rollup.json b/config/unichain-sepolia/rollup.json
diff --git a/config/worldchain-mainnet/genesis.json b/config/worldchain-mainnet/genesis.json
diff --git a/config/worldchain-sepolia/genesis.json b/config/worldchain-sepolia/genesis.json
diff --git a/envs/unichain-sepolia.env b/envs/unichain-sepolia.env
@@ -21,6 +21,7 @@ L2_BRIDGE_URL="http://host.docker.internal:3001/"
 ##################################################
 RUN_MODE="replica"
 # L2_SUPERCHAIN_NETWORK="unichain-sepolia"
+ROLLUP_CONFIG_PATH="/config/unichain-sepolia"
 OP_GETH_SEQUENCER_HTTP="https://sepolia-sequencer.unichain.org"
 OP_NODE_P2P_BOOTNODES=enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305,enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305,enr:-J24QNz9lbrKbN4iSmmjtnr7SjUMk4zB7f1krHZcTZx-JRKZd0kA2gjufUROD6T3sOWDVDnFJRvqBBo62zuF-hYCohOGAYiOoEyEgmlkgnY0gmlwhAPniryHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQKNVFlCxh_B-716tTs-h1vMzZkSs1FTu_OYTNjgufplG4N0Y3CCJAaDdWRwgiQG,enr:-J24QH-f1wt99sfpHy4c0QJM-NfmsIfmlLAMMcgZCUEgKG_BBYFc6FwYgaMJMQN5dsRBJApIok0jFn-9CS842lGpLmqGAYiOoDRAgmlkgnY0gmlwhLhIgb2Hb3BzdGFja4OFQgCJc2VjcDI1NmsxoQJ9FTIv8B9myn1MWaC_2lJ-sMoeCDkusCsk4BYHjjCq04N0Y3CCJAaDdWRwgiQG,enr:-J24QDXyyxvQYsd0yfsN0cRr1lZ1N11zGTplMNlW4xNEc7LkPXh0NAJ9iSOVdRO95GPYAIc6xmyoCCG6_0JxdL3a0zaGAYiOoAjFgmlkgnY0gmlwhAPckbGHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQJwoS7tzwxqXSyFL7g0JM-KWVbgvjfB8JA__T7yY_cYboN0Y3CCJAaDdWRwgiQG,enr:-J24QHmGyBwUZXIcsGYMaUqGGSl4CFdx9Tozu-vQCn5bHIQbR7On7dZbU61vYvfrJr30t0iahSqhc64J46MnUO2JvQaGAYiOoCKKgmlkgnY0gmlwhAPnCzSHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQINc4fSijfbNIiGhcgvwjsjxVFJHUstK9L1T8OTKUjgloN0Y3CCJAaDdWRwgiQG,enr:-J24QG3ypT4xSu0gjb5PABCmVxZqBjVw9ca7pvsI8jl4KATYAnxBmfkaIuEqy9sKvDHKuNCsy57WwK9wTt2aQgcaDDyGAYiOoGAXgmlkgnY0gmlwhDbGmZaHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQIeAK_--tcLEiu7HvoUlbV52MspE0uCocsx1f_rYvRenIN0Y3CCJAaDdWRwgiQG,enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305,enr:-J24QJOp5pPbdN4jVlyxUhCc5v1QerCvfSmT8xVijroUQj69QJkuq3b5SDQl9aCI8qiI3m246u2nf4rHjbBEeUTqwjGGAZJZTGwMgmlkgnY0gmlwhAOSdXaHb3BzdGFja4OVCgCJc2VjcDI1NmsxoQI0_WNHeARGz-kjyK_s7MjZkTf5xYSHrm7nL4C5LwbyJ4N0Y3CCJAaDdWRwgtHc,enr:-J24QJtEBSdW7uGgq-Yi_2xl8n8dgobDO2aIs9Pm4C86H7LtbH3Ua3CZcMZdB62SGn7r0WdoGOSkXKSol8xhsy3BsAKGAZJzEqL9gmlkgnY0gmlwhDQPNgiHb3BzdGFja4OVCgCJc2VjcDI1NmsxoQOKqwdtPsP4czpXIFwx56PmThevWwxQJ78gY0QaQxNdU4N0Y3CCJAaDdWRwgs_4,enr:-J24QPIMMWjzaUD3areppeM3GCAYEn4zt6U0ErUhH-kN3sIAXfaTyHl1F3RNaIt5rc4VyLWCuYI1AC3BO8m08K7nXKiGAZKT3fFTgmlkgnY0gmlwhAOS1UGHb3BzdGFja4OVCgCJc2VjcDI1NmsxoQL0xHUDIhXHIn_8yAKupnuK3c2TbqDdhRIn-IiYV2Wxe4N0Y3CCJAaDdWRwgt5z
 
diff --git a/envs/worldchain-mainnet.env b/envs/worldchain-mainnet.env
@@ -21,6 +21,7 @@ L2_BRIDGE_URL="http://host.docker.internal:3001/"
 ##################################################
 RUN_MODE="replica"
 # L2_SUPERCHAIN_NETWORK="worldchain-mainnet"
+ROLLUP_CONFIG_PATH="/config/worldchain-mainnet"
 OP_GETH_SEQUENCER_HTTP="https://worldchain-mainnet-sequencer.g.alchemy.com"
 # OP_NODE_P2P_BOOTNODES=
 
diff --git a/envs/worldchain-sepolia.env b/envs/worldchain-sepolia.env
@@ -21,6 +21,7 @@ L2_BRIDGE_URL="http://host.docker.internal:3001/"
 ##################################################
 RUN_MODE="replica"
 # L2_SUPERCHAIN_NETWORK="worldchain-sepolia"
+ROLLUP_CONFIG_PATH="/config/worldchain-sepolia"
 OP_GETH_SEQUENCER_HTTP="https://worldchain-sepolia-sequencer.g.alchemy.com"
 # OP_NODE_P2P_BOOTNODES=
 
diff --git a/run/geth-entrypoint.sh b/run/geth-entrypoint.sh
@@ -6,11 +6,11 @@ ADDITIONAL_ARGS=""
 
 if [ "$RUN_MODE" != "sequencer" ]; then
   if [ ! -z "${OP_GETH_SEQUENCER_HTTP:-}" ]; then
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS --rollup.halt=major"
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS --rollup.sequencerhttp=$OP_GETH_SEQUENCER_HTTP"
+    ADDITIONAL_ARGS+=" --rollup.halt=major"
+    ADDITIONAL_ARGS+=" --rollup.sequencerhttp=$OP_GETH_SEQUENCER_HTTP"
   fi
   if [ ! -z "${L2_SUPERCHAIN_NETWORK:-}" ]; then
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS --op-network=$L2_SUPERCHAIN_NETWORK"
+    ADDITIONAL_ARGS+=" --op-network=$L2_SUPERCHAIN_NETWORK"
   fi
 fi
 
@@ -21,8 +21,6 @@ exec /app/geth \
   --networkid=${L2_CHAIN_ID} \
   --syncmode=full \
   --gcmode=full \
-  --nodiscover \
-  --maxpeers=0 \
   --http \
   --http.vhosts="*" \
   --http.corsdomain="*" \
diff --git a/run/init-entrypoint.sh b/run/init-entrypoint.sh
@@ -28,4 +28,4 @@ exec /app/geth init \
   --datadir=/data \
   --state.scheme=path \
   --db.engine=pebble \
-  /config/genesis.json
+  ${ROLLUP_CONFIG_PATH:-"/config"}/genesis.json
diff --git a/run/op-batcher-entrypoint.sh b/run/op-batcher-entrypoint.sh
@@ -12,9 +12,7 @@ fi
 
 ADDITIONAL_ARGS=""
 if [ ! -z "${ALT_DA_SERVER:-}" ]; then
-  ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
-    --altda.da-server=$ALT_DA_SERVER \
-    --altda.enabled"
+  ADDITIONAL_ARGS+=" --altda.da-server=$ALT_DA_SERVER --altda.enabled"
 fi
 
 OP_BATCHER_PRIVATE_KEY=$(grep "BATCHER_PRIVATE_KEY" /config/address.ini | cut -d'=' -f2)
diff --git a/run/op-node-entrypoint.sh b/run/op-node-entrypoint.sh
@@ -8,36 +8,29 @@ OP_NODE_L1_BEACON=${L1_BEACON_URL}
 ADDITIONAL_ARGS=""
 if [ "$RUN_MODE" = "sequencer" ]; then
   SEQUENCER_PRIVATE_KEY=$(grep "SEQUENCER_PRIVATE_KEY" /config/address.ini | cut -d'=' -f2)
-  ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
+  ADDITIONAL_ARGS+=" \
     --rollup.config=/config/rollup.json \
     --sequencer.enabled \
     --sequencer.l1-confs=5 \
     --verifier.l1-confs=4 \
     --p2p.sequencer.key=${SEQUENCER_PRIVATE_KEY}"
 else
   if [ ! -z "${OP_NODE_P2P_BOOTNODES:-}" ]; then
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
-      --p2p.bootnodes=$OP_NODE_P2P_BOOTNODES"
+    ADDITIONAL_ARGS+=" --p2p.bootnodes=$OP_NODE_P2P_BOOTNODES"
   fi
-
   if [ ! -z "${L1_BEACON_FALLBACK_URL:-}" ]; then
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
-      --l1.beacon-fallbacks=$L1_BEACON_FALLBACK_URL"
+    ADDITIONAL_ARGS+=" --l1.beacon-fallbacks=$L1_BEACON_FALLBACK_URL"
   fi
-
   if [ ! -z "${L2_SUPERCHAIN_NETWORK:-}" ]; then
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
-      --network=$L2_SUPERCHAIN_NETWORK"
+    ADDITIONAL_ARGS+=" --network=$L2_SUPERCHAIN_NETWORK"
   else
-    ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
-      --rollup.config=/config/rollup.json"
+    ROLLUP_CONFIG_PATH=${ROLLUP_CONFIG_PATH:-"/config"}
+    ADDITIONAL_ARGS+=" --rollup.config=$ROLLUP_CONFIG_PATH/rollup.json"
   fi
 fi
 
 if [ ! -z "${ALT_DA_SERVER:-}" ]; then
-  ADDITIONAL_ARGS="$ADDITIONAL_ARGS \
-    --altda.da-server=$ALT_DA_SERVER \
-    --altda.enabled"
+  ADDITIONAL_ARGS+=" --altda.da-server=$ALT_DA_SERVER --altda.enabled"
 fi
 
 get_public_ip() {
