Net script fix for expected shred version (solana-labs#280)

Fix for --expected-shred-version when maybeWaitForSupermajority is on Co-authored-by: Lijun Wang <lijun@anza.xyz>
paaul5 · Mar 20, 2024 · 9e2768a · 9e2768a
1 parent 62c458e
commit 9e2768a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/multinode-demo/bootstrap-validator.sh b/multinode-demo/bootstrap-validator.sh
@@ -88,6 +88,9 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --expected-bank-hash ]]; then
       args+=("$1" "$2")
       shift 2
+    elif [[ $1 == --expected-shred-version ]]; then
+      args+=("$1" "$2")
+      shift 2
     elif [[ $1 == --accounts ]]; then
       args+=("$1" "$2")
       shift 2

diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
@@ -264,7 +264,8 @@ EOF
 
       if [[ -n "$maybeWaitForSupermajority" ]]; then
         bankHash=$(solana-ledger-tool -l config/bootstrap-validator bank-hash --halt-at-slot 0)
-        extraNodeArgs="$extraNodeArgs --expected-bank-hash $bankHash"
+        shredVersion="$(cat "$SOLANA_CONFIG_DIR"/shred-version)"
+        extraNodeArgs="$extraNodeArgs --expected-bank-hash $bankHash --expected-shred-version $shredVersion"
         echo "$bankHash" > config/bank-hash
       fi
     fi