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

genesis: rename mint account to faucet account and make it optional (#6990)

Browse Source
This commit is contained in:
Michael Vines
2019-11-15 14:50:26 -07:00
committed by GitHub
parent cab2232aba
commit 5ab70c4e97
12 changed files with 52 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
multinode-demo/drone.sh
View File

@@ -7,8 +7,8 @@ here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh
source "$here"/common.sh
[[ -f "$SOLANA_CONFIG_DIR"/mint-keypair.json ]] || {
echo "$SOLANA_CONFIG_DIR/mint-keypair.json not found, create it by running:"
[[ -f "$SOLANA_CONFIG_DIR"/faucet-keypair.json ]] || {
echo "$SOLANA_CONFIG_DIR/faucet-keypair.json not found, create it by running:"
echo
echo " ${here}/setup.sh"
exit 1
@@ -16,4 +16,4 @@ source "$here"/common.sh
set -x
# shellcheck disable=SC2086 # Don't want to double quote $solana_drone
exec $solana_drone --keypair "$SOLANA_CONFIG_DIR"/mint-keypair.json "$@"
exec $solana_drone --keypair "$SOLANA_CONFIG_DIR"/faucet-keypair.json "$@"

9
multinode-demo/setup.sh
View File

@@ -10,10 +10,10 @@ rm -rf "$SOLANA_CONFIG_DIR"/bootstrap-leader
mkdir -p "$SOLANA_CONFIG_DIR"/bootstrap-leader
# Create genesis ledger
if [[ -r $MINT_KEYPAIR ]]; then
cp -f "$MINT_KEYPAIR" "$SOLANA_CONFIG_DIR"/mint-keypair.json
if [[ -r $FAUCET_KEYPAIR ]]; then
cp -f "$FAUCET_KEYPAIR" "$SOLANA_CONFIG_DIR"/faucet-keypair.json
else
$solana_keygen new -f -o "$SOLANA_CONFIG_DIR"/mint-keypair.json
$solana_keygen new -f -o "$SOLANA_CONFIG_DIR"/faucet-keypair.json
fi
if [[ -f $BOOTSTRAP_LEADER_IDENTITY_KEYPAIR ]]; then
@@ -32,7 +32,8 @@ default_arg --bootstrap-vote-pubkey "$SOLANA_CONFIG_DIR"/bootstrap-leader/vote-k
default_arg --bootstrap-stake-pubkey "$SOLANA_CONFIG_DIR"/bootstrap-leader/stake-keypair.json
default_arg --bootstrap-storage-pubkey "$SOLANA_CONFIG_DIR"/bootstrap-leader/storage-keypair.json
default_arg --ledger "$SOLANA_CONFIG_DIR"/bootstrap-leader
default_arg --mint "$SOLANA_CONFIG_DIR"/mint-keypair.json
default_arg --faucet-pubkey "$SOLANA_CONFIG_DIR"/faucet-keypair.json
default_arg --faucet-lamports 500000000000000000
default_arg --hashes-per-tick auto
default_arg --operating-mode development
$solana_genesis "${args[@]}"