Add shred version support to net/ (#8689) (#8694)

automerge
This commit is contained in:
mergify[bot]
2020-03-06 15:41:16 -08:00
committed by GitHub
parent 085e773f27
commit 175651c497
2 changed files with 8 additions and 0 deletions

View File

@ -66,6 +66,9 @@ while [[ -n $1 ]]; do
elif [[ $1 = --expected-genesis-hash ]]; then
args+=("$1" "$2")
shift 2
elif [[ $1 = --expected-shred-version ]]; then
args+=("$1" "$2")
shift 2
elif [[ $1 = --identity-keypair ]]; then
identity_keypair_path=$2
args+=("$1" "$2")

View File

@ -228,6 +228,8 @@ EOF
export BOOTSTRAP_VALIDATOR_IDENTITY_KEYPAIR=net/keypairs/bootstrap-validator-identity.json
fi
multinode-demo/setup.sh "${args[@]}"
solana-ledger-tool -l config/bootstrap-validator shred-version | tee config/shred-version
fi
args=(
--gossip-host "$entrypointIp"
@ -273,12 +275,15 @@ EOF
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/validator-identity-"$nodeIndex".json config/validator-identity.json
fi
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/shred-version config/shred-version
fi
args=(
--entrypoint "$entrypointIp:8001"
--gossip-port 8001
--rpc-port 8899
--expected-shred-version "$(cat config/shred-version)"
)
if [[ $nodeType = blockstreamer ]]; then
args+=(