From ef2b434ec969b716364d958eb9c025bc28f30e5f Mon Sep 17 00:00:00 2001
From: Etan Kissling <etan@status.im>
Date: Thu, 17 Nov 2022 10:40:27 +0100
Subject: [PATCH] quicker Geth startup in local testnet (#4329)

Local testnet simulation currently waits 5 seconds when starting each
individual Geth instance. Waiting a shorter amount saves almost a minute
per minimum + mainnet CI finalization job.
Measured startup times per Geth: Linux ~100ms, macOS Intel ~300ms.
---
 scripts/start_geth_nodes.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/start_geth_nodes.sh b/scripts/start_geth_nodes.sh
index 1a3590684..67e4517b6 100755
--- a/scripts/start_geth_nodes.sh
+++ b/scripts/start_geth_nodes.sh
@@ -27,7 +27,18 @@ for GETH_NUM_NODE in $(seq 0 $(( GETH_NUM_NODES - 1 ))); do
     openssl rand -hex 32 | tr -d "\n" > "${GETHDATADIR}/jwtsecret"
     ${GETH_BINARY} --http --ws -http.api "engine" --datadir "${GETHDATADIR}" init "${GENESISJSON}"
     ${GETH_BINARY} --http --ws --http.corsdomain '*' --http.api "eth,net,engine" -ws.api "eth,net,engine" --datadir "${GETHDATADIR}" ${DISCOVER} --port ${GETH_NET_PORT} --http.port ${GETH_HTTP_PORT} --ws.port ${GETH_WS_PORT} --authrpc.port ${GETH_AUTH_RPC_PORT} --authrpc.jwtsecret "${GETHDATADIR}/jwtsecret" &> "${DATA_DIR}/geth-log${GETH_NUM_NODE}.txt" &
-    sleep 5
+    GETH_RETRY=0
+    while :; do
+        if [[ -S "${GETHDATADIR}/geth.ipc" ]]; then
+            echo "Geth ${GETH_NUM_NODE} started in $(( GETH_RETRY * 100 ))ms"
+            break
+        fi
+        if (( ++GETH_RETRY >= 300 )); then
+            echo "Geth ${GETH_NUM_NODE} failed to start"
+            exit 1
+        fi
+        sleep 0.1
+    done
     NODE_ID=$(${GETH_BINARY} attach --datadir "${GETHDATADIR}" --exec admin.nodeInfo.enode)
     GETH_ENODES+=("${NODE_ID}")
     GETH_HTTP_PORTS+=("${GETH_HTTP_PORT}")