gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Plumb --wait-for-supermajority through scripts (#10611) (#10613)

Browse Source 
(cherry picked from commit 348bf78cd1)

Co-authored-by: Trent Nelson <trent@solana.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2020-06-16 17:55:16 +00:00
committed by GitHub
parent be6edb950c
commit 4afa64c20d
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
multinode-demo/bootstrap-validator.sh
View File

@ -57,6 +57,9 @@ while [[ -n $1 ]]; do
elif [[ $1 = --no-restart ]]; then
no_restart=1
shift
elif [[ $1 == --wait-for-supermajority ]]; then
args+=("$1" "$2")
shift 2
else
echo "Unknown argument: $1"
$program --help

3
multinode-demo/validator.sh
View File

@ -152,6 +152,9 @@ while [[ -n $1 ]]; do
elif [[ $1 = --max-genesis-archive-unpacked-size ]]; then
args+=("$1" "$2")
shift 2
elif [[ $1 == --wait-for-supermajority ]]; then
args+=("$1" "$2")
shift 2
elif [[ $1 = -h ]]; then
usage "$@"
else

8
net/net.sh
View File

@ -272,7 +272,7 @@ startBootstrapLeader() {
${#clientIpList[@]} \"$benchTpsExtraArgs\" \
${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
\"$genesisOptions\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
\"$gpuMode\" \
\"$GEOLOCATION_API_KEY\" \
"
@ -341,7 +341,7 @@ startNode() {
${#clientIpList[@]} \"$benchTpsExtraArgs\" \
${#clientIpList[@]} \"$benchExchangeExtraArgs\" \
\"$genesisOptions\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize\" \
\"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \
\"$gpuMode\" \
\"$GEOLOCATION_API_KEY\" \
"
@ -727,6 +727,7 @@ maybeNoSnapshot=""
maybeLimitLedgerSize=""
maybeSkipLedgerVerify=""
maybeDisableAirdrops=""
maybeWaitForSupermajority=""
debugBuild=false
doBuild=true
gpuMode=auto
@ -837,6 +838,9 @@ while [[ -n $1 ]]; do
elif [[ $1 == --client-delay-start ]]; then
clientDelayStart=$2
shift 2
elif [[ $1 == --wait-for-supermajority ]]; then
maybeWaitForSupermajority="$1 $2"
shift 2
else
usage "Unknown long option: $1"
fi