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

Fix validator keys path (#13772)

Browse Source
This commit is contained in:
sakridge
2020-11-26 19:20:56 -08:00
committed by GitHub
parent d18b417346
commit 008b56e535
3 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
net/remote/remote-node.sh
View File

@ -306,30 +306,30 @@ EOF
if [[ $nodeType = blockstreamer ]]; then
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/blockstreamer-identity.json config/validator-identity.json
"$entrypointIp":~/solana/config/blockstreamer-identity.json "$SOLANA_CONFIG_DIR"/validator-identity.json
else
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/validator-identity-"$nodeIndex".json config/validator-identity.json
"$entrypointIp":~/solana/config/validator-identity-"$nodeIndex".json "$SOLANA_CONFIG_DIR"/validator-identity.json
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/validator-stake-"$nodeIndex".json config/stake-account.json
"$entrypointIp":~/solana/config/validator-stake-"$nodeIndex".json "$SOLANA_CONFIG_DIR"/stake-account.json
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/validator-vote-"$nodeIndex".json config/vote-account.json
"$entrypointIp":~/solana/config/validator-vote-"$nodeIndex".json "$SOLANA_CONFIG_DIR"/vote-account.json
fi
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/shred-version config/shred-version
"$entrypointIp":~/solana/config/shred-version "$SOLANA_CONFIG_DIR"/shred-version
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/bank-hash config/bank-hash || true
"$entrypointIp":~/solana/config/bank-hash "$SOLANA_CONFIG_DIR"/bank-hash || true
net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/faucet.json config/faucet.json
"$entrypointIp":~/solana/config/faucet.json "$SOLANA_CONFIG_DIR"/faucet.json
fi
args=(
--entrypoint "$entrypointIp:8001"
--gossip-port 8001
--rpc-port 8899
--expected-shred-version "$(cat config/shred-version)"
--expected-shred-version "$(cat "$SOLANA_CONFIG_DIR"/shred-version)"
)
if [[ $nodeType = blockstreamer ]]; then
args+=(
@ -344,27 +344,27 @@ EOF
fi
fi
if [[ ! -f config/validator-identity.json ]]; then
solana-keygen new --no-passphrase -so config/validator-identity.json
if [[ ! -f "$SOLANA_CONFIG_DIR"/validator-identity.json ]]; then
solana-keygen new --no-passphrase -so "$SOLANA_CONFIG_DIR"/validator-identity.json
fi
args+=(--identity config/validator-identity.json)
if [[ ! -f config/vote-account.json ]]; then
solana-keygen new --no-passphrase -so config/vote-account.json
args+=(--identity "$SOLANA_CONFIG_DIR"/validator-identity.json)
if [[ ! -f "$SOLANA_CONFIG_DIR"/vote-account.json ]]; then
solana-keygen new --no-passphrase -so "$SOLANA_CONFIG_DIR"/vote-account.json
fi
args+=(--vote-account config/vote-account.json)
args+=(--vote-account "$SOLANA_CONFIG_DIR"/vote-account.json)
if [[ $airdropsEnabled != true ]]; then
args+=(--no-airdrop)
fi
if [[ -r config/bank-hash ]]; then
args+=(--expected-bank-hash "$(cat config/bank-hash)")
if [[ -r "$SOLANA_CONFIG_DIR"/bank-hash ]]; then
args+=(--expected-bank-hash "$(cat "$SOLANA_CONFIG_DIR"/bank-hash)")
fi
set -x
# Add the faucet keypair to validators for convenient access from tools
# like bench-tps and add to blocktreamers to run a faucet
scp "$entrypointIp":~/solana/config/faucet.json config/
scp "$entrypointIp":~/solana/config/faucet.json "$SOLANA_CONFIG_DIR"/
if [[ $nodeType = blockstreamer ]]; then
# Run another faucet with the same keypair on the blockstreamer node.
# Typically the blockstreamer node has a static IP/DNS name for hosting
@ -422,7 +422,9 @@ EOF
if [[ ${extraPrimordialStakes} -eq 0 ]]; then
echo "0 Primordial stakes, staking with $internalNodesStakeLamports"
multinode-demo/delegate-stake.sh "${args[@]}" "$internalNodesStakeLamports"
multinode-demo/delegate-stake.sh --vote-account "$SOLANA_CONFIG_DIR"/vote-account.json \
--stake-account "$SOLANA_CONFIG_DIR"/stake-account.json \
"${args[@]}" "$internalNodesStakeLamports"
else
echo "Skipping staking with extra stakes: ${extraPrimordialStakes}"
fi