fix(driver, prover): remove prover_set req, move flags (#411)

* fix(driver, prover): remove prover_set req, move flags

* .

* .

Author: RogerLamTd

script/start-driver-hekla.sh

@@ -12,20 +12,21 @@ ARGS="--l1.ws ${L1_ENDPOINT_WS} \
     --taikoAnchor ${TAIKO_ANCHOR_ADDRESS} \
     --verbosity ${VERBOSITY} \
     --preconfirmation.whitelist ${PRECONFIRMATION_WHITELIST} \
-    --preconfirmation.serverPort 9871 \
-    --jwtSecret /data/taiko-geth/geth/jwtsecret \
-    --p2p.bootnodes ${P2P_BOOTNODES} \
-    --p2p.listen.ip 0.0.0.0 \
-    --p2p.useragent taiko \
-    --p2p.peerstore.path /node-keys/peerstore \
-    --p2p.discovery.path /node-keys/discv5"
+    --jwtSecret /data/taiko-geth/geth/jwtsecret"
 
 if [ "$DISABLE_P2P_SYNC" = "false" ]; then
     ARGS="${ARGS} --p2p.sync \
     --p2p.checkPointSyncUrl ${P2P_SYNC_URL}"
 fi
 
 if [ "$ENABLE_PRECONFS_P2P" = "true" ]; then
+  ARGS="${ARGS} --p2p.peerstore.path /node-keys/peerstore \
+      --p2p.discovery.path /node-keys/discv5 \
+      --preconfirmation.serverPort 9871 \
+      --p2p.listen.ip 0.0.0.0 \
+      --p2p.useragent taiko \
+      --p2p.bootnodes ${P2P_BOOTNODES}"
+
   if [ -z "$PRIV_FILE" ] && [ -z "$PRIV_RAW" ]; then
       echo "Error: Either PRIV_FILE or PRIV_RAW must be provided" >&2
       exit 1

script/start-driver.sh

@@ -12,20 +12,21 @@ ARGS="--l1.ws "${L1_ENDPOINT_WS}" \
     --taikoAnchor "${TAIKO_ANCHOR_ADDRESS}" \
     --verbosity ${VERBOSITY} \
     --preconfirmation.whitelist ${PRECONFIRMATION_WHITELIST} \
-    --preconfirmation.serverPort 9871 \
-    --jwtSecret /data/taiko-geth/geth/jwtsecret \
-    --p2p.bootnodes ${P2P_BOOTNODES} \
-    --p2p.listen.ip 0.0.0.0 \
-    --p2p.useragent taiko \
-    --p2p.peerstore.path /node-keys/peerstore \
-    --p2p.discovery.path /node-keys/discv5"
+    --jwtSecret /data/taiko-geth/geth/jwtsecret"
 
 if [ "$DISABLE_P2P_SYNC" = "false" ]; then
     ARGS="${ARGS} --p2p.sync \
         --p2p.checkPointSyncUrl ${P2P_SYNC_URL}"
 fi
 
 if [ "$ENABLE_PRECONFS_P2P" = "true" ]; then
+  ARGS="${ARGS} --p2p.peerstore.path /node-keys/peerstore \
+      --p2p.discovery.path /node-keys/discv5 \
+      --preconfirmation.serverPort 9871 \
+      --p2p.listen.ip 0.0.0.0 \
+      --p2p.useragent taiko \
+      --p2p.bootnodes ${P2P_BOOTNODES}"
+
   if [ -z "$PRIV_FILE" ] && [ -z "$PRIV_RAW" ]; then
       echo "Error: Either PRIV_FILE or PRIV_RAW must be provided" >&2
       exit 1

script/start-prover-relayer-hekla.sh

@@ -29,10 +29,6 @@ if [ "$ENABLE_PROVER" = "true" ]; then
         exit 1
     fi
 
-    if [ -n "$PROVER_SET" ]; then
-        ARGS="${ARGS} --proverSet ${PROVER_SET}"
-    fi
-
     if [ -n "$TOKEN_ALLOWANCE" ]; then
         ARGS="${ARGS} --prover.allowance ${TOKEN_ALLOWANCE}"
     fi

script/start-prover-relayer.sh

@@ -29,10 +29,6 @@ if [ "$ENABLE_PROVER" = "true" ]; then
         exit 1
     fi
 
-    if [ -n "$PROVER_SET" ]; then
-        ARGS="${ARGS} --proverSet ${PROVER_SET}"
-    fi
-
     if [ -n "$TOKEN_ALLOWANCE" ]; then
         ARGS="${ARGS} --prover.allowance ${TOKEN_ALLOWANCE}"
     fi