From e1399d447b0e846152f4749188ef8fd5aa1e9443 Mon Sep 17 00:00:00 2001
From: Yihau Chen <yihau.chen@icloud.com>
Date: Wed, 6 Aug 2025 02:38:07 +0800
Subject: [PATCH] ci: ensure bootstrap node is ready before starting other
 nodes (#7321)

(cherry picked from commit e0b720b2d164e4ac3a7a7284376b05d6f6766874)
---
 ci/localnet-sanity.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh
index 3a301e4b31e..bdcff355bfd 100755
--- a/ci/localnet-sanity.sh
+++ b/ci/localnet-sanity.sh
@@ -156,19 +156,7 @@ startNodes() {
   initCompleteFiles=()
   maybeExpectedGenesisHash=
   for i in $(seq 0 $((${#nodes[@]} - 1))); do
-    declare cmd=${nodes[$i]}
-
-    declare initCompleteFile="init-complete-node$i.log"
-    rm -f "$initCompleteFile"
-    initCompleteFiles+=("$initCompleteFile")
-
-    startNode "$i" "$cmd $maybeExpectedGenesisHash"
-    if $addLogs; then
-      logs+=("$(getNodeLogFile "$i" "$cmd")")
-    fi
-
-    # 1 == bootstrap validator, wait until it boots before starting
-    # other validators
+    # wait for bootstrap validator to boot before starting other validators
     if [[ "$i" -eq 1 ]]; then
       SECONDS=
       waitForNodeToInit "$initCompleteFile"
@@ -180,6 +168,17 @@ startNodes() {
       ) | tee genesis-hash.log
       maybeExpectedGenesisHash="--expected-genesis-hash $(tail -n1 genesis-hash.log)"
     fi
+
+    declare cmd=${nodes[$i]}
+
+    declare initCompleteFile="init-complete-node$i.log"
+    rm -f "$initCompleteFile"
+    initCompleteFiles+=("$initCompleteFile")
+
+    startNode "$i" "$cmd $maybeExpectedGenesisHash"
+    if $addLogs; then
+      logs+=("$(getNodeLogFile "$i" "$cmd")")
+    fi
   done
 
   waitForAllNodesToInit