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

Rename leader to validator, drop _keypair/-keypair suffix (#8876) 

automerge
This commit is contained in:
Michael Vines 2020-03-15 13:19:55 -07:00 committed by GitHub
parent 5481d1a039
commit b2a0cdaa38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
run.sh
View File

@ -46,29 +46,29 @@ dataDir=$PWD/config/"$(basename "$0" .sh)"
ledgerDir=$PWD/config/ledger ledgerDir=$PWD/config/ledger
set -x set -x
leader_keypair="$dataDir/leader-keypair.json" validator_identity="$dataDir/validator-identity.json"
if [[ -e $leader_keypair ]]; then if [[ -e $validator_identity ]]; then
echo "Use existing leader keypair" echo "Use existing validator keypair"
else else
solana-keygen new --no-passphrase -so "$leader_keypair" solana-keygen new --no-passphrase -so "$validator_identity"
fi fi
leader_vote_account_keypair="$dataDir/leader-vote-account-keypair.json" validator_vote_account="$dataDir/validator-vote-account.json"
if [[ -e $leader_vote_account_keypair ]]; then if [[ -e $validator_vote_account ]]; then
echo "Use existing leader vote account keypair" echo "Use existing validator vote account keypair"
else else
solana-keygen new --no-passphrase -so "$leader_vote_account_keypair" solana-keygen new --no-passphrase -so "$validator_vote_account"
fi fi
leader_stake_account_keypair="$dataDir/leader-stake-account-keypair.json" validator_stake_account="$dataDir/validator-stake-account.json"
if [[ -e $leader_stake_account_keypair ]]; then if [[ -e $validator_stake_account ]]; then
echo "Use existing leader stake account keypair" echo "Use existing validator stake account keypair"
else else
solana-keygen new --no-passphrase -so "$leader_stake_account_keypair" solana-keygen new --no-passphrase -so "$validator_stake_account"
fi fi
faucet_keypair="$dataDir"/faucet.json faucet="$dataDir"/faucet.json
if [[ -e $faucet_keypair ]]; then if [[ -e $faucet ]]; then
echo "Use existing faucet keypair" echo "Use existing faucet keypair"
else else
solana-keygen new --no-passphrase -fso "$faucet_keypair" solana-keygen new --no-passphrase -fso "$faucet"
fi fi
if [[ -e "$ledgerDir"/genesis.bin ]]; then if [[ -e "$ledgerDir"/genesis.bin ]]; then
@ -79,9 +79,9 @@ else
--faucet-pubkey "$dataDir"/faucet.json \ --faucet-pubkey "$dataDir"/faucet.json \
--faucet-lamports 500000000000000000 \ --faucet-lamports 500000000000000000 \
--bootstrap-validator \ --bootstrap-validator \
"$dataDir"/leader-keypair.json \ "$dataDir"/validator-identity.json \
"$dataDir"/leader-vote-account-keypair.json \ "$dataDir"/validator-vote-account.json \
"$dataDir"/leader-stake-account-keypair.json \ "$dataDir"/validator-stake-account.json \
--ledger "$ledgerDir" \ --ledger "$ledgerDir" \
--operating-mode development --operating-mode development
fi fi
@ -93,12 +93,12 @@ abort() {
} }
trap abort INT TERM EXIT trap abort INT TERM EXIT
solana-faucet --keypair "$dataDir"/faucet.json & solana-faucet - "$dataDir"/faucet.json &
faucet=$! faucet=$!
args=( args=(
--identity "$dataDir"/leader-keypair.json --identity "$dataDir"/validator-identity.json
--vote-account "$dataDir"/leader-vote-account-keypair.json --vote-account "$dataDir"/validator-vote-account.json
--ledger "$ledgerDir" --ledger "$ledgerDir"
--gossip-port 8001 --gossip-port 8001
--rpc-port 8899 --rpc-port 8899