blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply s/faucet-keypair/faucet renaming to net scripts (#8867)

This commit is contained in:
Dan Albert 2020-03-14 16:49:28 -07:00 committed by GitHub
parent 29fb79382c
commit ae70f4ea92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/remote/remote-client.sh
View File

@ -77,7 +77,7 @@ solana-bench-exchange)
idle) idle)
# Add the faucet keypair to idle clients for convenience # Add the faucet keypair to idle clients for convenience
net/scripts/rsync-retry.sh -vPrc \ net/scripts/rsync-retry.sh -vPrc \
"$entrypointIp":~/solana/config/faucet-keypair.json ~/solana/ "$entrypointIp":~/solana/config/faucet.json ~/solana/
exit 0 exit 0
;; ;;
*) *)

2
net/remote/remote-deploy-update.sh
View File

@ -36,5 +36,5 @@ PATH="$HOME"/.cargo/bin:"$PATH"
set -x set -x
scripts/solana-install-deploy.sh \ scripts/solana-install-deploy.sh \
--keypair config/faucet-keypair.json \ --keypair config/faucet.json \
localhost "$releaseChannel" "$updatePlatform" localhost "$releaseChannel" "$updatePlatform"

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

@ -310,13 +310,13 @@ EOF
set -x set -x
# Add the faucet keypair to validators for convenient access from tools # Add the faucet keypair to validators for convenient access from tools
# like bench-tps and add to blocktreamers to run a faucet # like bench-tps and add to blocktreamers to run a faucet
scp "$entrypointIp":~/solana/config/faucet-keypair.json config/ scp "$entrypointIp":~/solana/config/faucet.json config/
if [[ $nodeType = blockstreamer ]]; then if [[ $nodeType = blockstreamer ]]; then
# Run another faucet with the same keypair on the blockstreamer node. # Run another faucet with the same keypair on the blockstreamer node.
# Typically the blockstreamer node has a static IP/DNS name for hosting # Typically the blockstreamer node has a static IP/DNS name for hosting
# the blockexplorer web app, and is a location that somebody would expect # the blockexplorer web app, and is a location that somebody would expect
# to be able to airdrop from # to be able to airdrop from
scp "$entrypointIp":~/solana/config/faucet-keypair.json config/ scp "$entrypointIp":~/solana/config/faucet.json config/
if [[ $airdropsEnabled = true ]]; then if [[ $airdropsEnabled = true ]]; then
cat >> ~/solana/on-reboot <<EOF cat >> ~/solana/on-reboot <<EOF
multinode-demo/faucet.sh > faucet.log 2>&1 & multinode-demo/faucet.sh > faucet.log 2>&1 &

6
run.sh
View File

@ -64,7 +64,7 @@ if [[ -e $leader_stake_account_keypair ]]; then
else else
solana-keygen new --no-passphrase -so "$leader_stake_account_keypair" solana-keygen new --no-passphrase -so "$leader_stake_account_keypair"
fi fi
faucet_keypair="$dataDir"/faucet-keypair.json faucet_keypair="$dataDir"/faucet.json
if [[ -e $faucet_keypair ]]; then if [[ -e $faucet_keypair ]]; then
echo "Use existing faucet keypair" echo "Use existing faucet keypair"
else else
@ -76,7 +76,7 @@ if [[ -e "$ledgerDir"/genesis.bin ]]; then
else else
solana-genesis \ solana-genesis \
--hashes-per-tick sleep \ --hashes-per-tick sleep \
--faucet-pubkey "$dataDir"/faucet-keypair.json \ --faucet-pubkey "$dataDir"/faucet.json \
--faucet-lamports 500000000000000000 \ --faucet-lamports 500000000000000000 \
--bootstrap-validator \ --bootstrap-validator \
"$dataDir"/leader-keypair.json \ "$dataDir"/leader-keypair.json \
@ -93,7 +93,7 @@ abort() {
} }
trap abort INT TERM EXIT trap abort INT TERM EXIT
solana-faucet --keypair "$dataDir"/faucet-keypair.json & solana-faucet --keypair "$dataDir"/faucet.json &
faucet=$! faucet=$!
args=( args=(