Use default client keypair for faucet to avoid the need for airdrops
This commit is contained in:
parent
ab5814cd90
commit
b5820f9325
13
run.sh
13
run.sh
|
@ -37,6 +37,10 @@ ledgerDir=$PWD/config/ledger
|
||||||
SOLANA_RUN_SH_CLUSTER_TYPE=${SOLANA_RUN_SH_CLUSTER_TYPE:-development}
|
SOLANA_RUN_SH_CLUSTER_TYPE=${SOLANA_RUN_SH_CLUSTER_TYPE:-development}
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
if ! solana address; then
|
||||||
|
echo Generating default keypair
|
||||||
|
solana-keygen new --no-passphrase
|
||||||
|
fi
|
||||||
validator_identity="$dataDir/validator-identity.json"
|
validator_identity="$dataDir/validator-identity.json"
|
||||||
if [[ -e $validator_identity ]]; then
|
if [[ -e $validator_identity ]]; then
|
||||||
echo "Use existing validator keypair"
|
echo "Use existing validator keypair"
|
||||||
|
@ -55,12 +59,6 @@ if [[ -e $validator_stake_account ]]; then
|
||||||
else
|
else
|
||||||
solana-keygen new --no-passphrase -so "$validator_stake_account"
|
solana-keygen new --no-passphrase -so "$validator_stake_account"
|
||||||
fi
|
fi
|
||||||
faucet="$dataDir"/faucet.json
|
|
||||||
if [[ -e $faucet ]]; then
|
|
||||||
echo "Use existing faucet keypair"
|
|
||||||
else
|
|
||||||
solana-keygen new --no-passphrase -fso "$faucet"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -e "$ledgerDir"/genesis.bin || -e "$ledgerDir"/genesis.tar.bz2 ]]; then
|
if [[ -e "$ledgerDir"/genesis.bin || -e "$ledgerDir"/genesis.tar.bz2 ]]; then
|
||||||
echo "Use existing genesis"
|
echo "Use existing genesis"
|
||||||
|
@ -73,7 +71,6 @@ else
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
solana-genesis \
|
solana-genesis \
|
||||||
--hashes-per-tick sleep \
|
--hashes-per-tick sleep \
|
||||||
--faucet-pubkey "$dataDir"/faucet.json \
|
|
||||||
--faucet-lamports 500000000000000000 \
|
--faucet-lamports 500000000000000000 \
|
||||||
--bootstrap-validator \
|
--bootstrap-validator \
|
||||||
"$dataDir"/validator-identity.json \
|
"$dataDir"/validator-identity.json \
|
||||||
|
@ -92,7 +89,7 @@ abort() {
|
||||||
}
|
}
|
||||||
trap abort INT TERM EXIT
|
trap abort INT TERM EXIT
|
||||||
|
|
||||||
solana-faucet --keypair "$dataDir"/faucet.json &
|
solana-faucet &
|
||||||
faucet=$!
|
faucet=$!
|
||||||
|
|
||||||
args=(
|
args=(
|
||||||
|
|
Loading…
Reference in New Issue