solana-keygen no longer blindly overwrites a keypair, or assumes "new" (#4599)

automerge
This commit is contained in:
Michael Vines
2019-06-07 17:54:54 -07:00
committed by Grimes
parent 66c41b3e8c
commit a9f73ea321
10 changed files with 65 additions and 45 deletions

10
run.sh
View File

@ -45,22 +45,22 @@ leader_keypair="$dataDir/leader-keypair.json"
if [[ -e $leader_keypair ]]; then
echo "Use existing leader keypair"
else
solana-keygen -o "$leader_keypair"
solana-keygen new -o "$leader_keypair"
fi
leader_vote_account_keypair="$dataDir/leader-vote-account-keypair.json"
if [[ -e $leader_vote_account_keypair ]]; then
echo "Use existing leader vote account keypair"
else
solana-keygen -o "$leader_vote_account_keypair"
solana-keygen new -o "$leader_vote_account_keypair"
fi
leader_stake_account_keypair="$dataDir/leader-stake-account-keypair.json"
if [[ -e $leader_stake_account_keypair ]]; then
echo "Use existing leader stake account keypair"
else
solana-keygen -o "$leader_stake_account_keypair"
solana-keygen new -o "$leader_stake_account_keypair"
fi
solana-keygen -o "$dataDir"/drone-keypair.json
solana-keygen -o "$dataDir"/leader-storage-account-keypair.json
solana-keygen new -o "$dataDir"/drone-keypair.json
solana-keygen new -o "$dataDir"/leader-storage-account-keypair.json
leaderVoteAccountPubkey=$(\
solana-wallet \