From 12d471e2dada288616a3ee2ce2dc7e8ed121a327 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 10 Dec 2019 17:52:35 -0500 Subject: [PATCH] Update default node balance to 500 SOL and default stake to 1 SOL (#7411) --- ci/testnet-manager.sh | 2 +- multinode-demo/delegate-stake.sh | 2 +- multinode-demo/validator.sh | 22 +++++++++++----------- net/remote/remote-node.sh | 5 ++--- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index 057c087387..813e477e52 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -487,7 +487,7 @@ deploy() { fi if [[ -z $INTERNAL_NODES_LAMPORTS ]]; then - maybeInternalNodesLamports="--internal-nodes-lamports 2000000000" # 2 SOL + maybeInternalNodesLamports="--internal-nodes-lamports 500000000000" # 500 SOL elif [[ $INTERNAL_NODES_LAMPORTS == skip ]]; then maybeInternalNodesLamports="" else diff --git a/multinode-demo/delegate-stake.sh b/multinode-demo/delegate-stake.sh index 3e1149474b..45f52a8c1d 100755 --- a/multinode-demo/delegate-stake.sh +++ b/multinode-demo/delegate-stake.sh @@ -8,7 +8,7 @@ here=$(dirname "$0") # shellcheck source=multinode-demo/common.sh source "$here"/common.sh -stake_lamports=500000000 # default number of lamports to assign as stake (0.5 SOL) +stake_lamports=1000000000 # default number of lamports to assign as stake (1 SOL) url=http://127.0.0.1:8899 # default RPC url usage() { diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh index 567e5def0d..025102b3ba 100755 --- a/multinode-demo/validator.sh +++ b/multinode-demo/validator.sh @@ -6,6 +6,16 @@ here=$(dirname "$0") # shellcheck source=multinode-demo/common.sh source "$here"/common.sh +args=() +airdrops_enabled=1 +node_lamports=500000000000 # 500 SOL: number of lamports to airdrop the node for transaction fees and vote account rent exemption (ignored if airdrops_enabled=0) +label= +identity_keypair_path= +voting_keypair_path= +no_restart=0 +gossip_entrypoint= +ledger_dir= + usage() { if [[ -n $1 ]]; then echo "$*" @@ -23,7 +33,7 @@ OPTIONS: --init-complete-file FILE - create this file, if it doesn't already exist, once node initialization is complete --label LABEL - Append the given label to the configuration files, useful when running multiple validators in the same workspace - --node-lamports LAMPORTS - Number of lamports this node has been funded from the genesis config + --node-lamports LAMPORTS - Number of lamports this node has been funded from the genesis config (default: $node_lamports) --no-voting - start node without vote signer --rpc-port port - custom RPC port for this node --no-restart - do not restart the node if it exits @@ -33,16 +43,6 @@ EOF exit 1 } -args=() -airdrops_enabled=1 -node_lamports=500000000000 # 500 SOL: number of lamports to airdrop the node for transaction fees and vote account rent exemption (ignored if airdrops_enabled=0) -label= -identity_keypair_path= -voting_keypair_path= -no_restart=0 -gossip_entrypoint= -ledger_dir= - positional_args=() while [[ -n $1 ]]; do if [[ ${1:0:1} = - ]]; then diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh index 1b3f747343..875d38366c 100755 --- a/net/remote/remote-node.sh +++ b/net/remote/remote-node.sh @@ -28,7 +28,6 @@ gpuMode="${19:-auto}" GEOLOCATION_API_KEY="${20}" set +x - missing() { echo "Error: $1 not specified" exit 1 @@ -214,7 +213,7 @@ EOF fi if [[ -n $internalNodesStakeLamports ]]; then - args+=(--bootstrap-leader-stake-lamports "$internalNodesStakesLamports") + args+=(--bootstrap-leader-stake-lamports "$internalNodesStakesLamports") fi if [[ -n $internalNodesLamports ]]; then args+=(--bootstrap-leader-lamports "$internalNodesLamports") @@ -388,7 +387,7 @@ EOF args+=(--keypair config/validator-identity.json) fi - multinode-demo/delegate-stake.sh "${args[@]}" + multinode-demo/delegate-stake.sh "${args[@]}" "$internalNodesStakeLamports" fi if [[ $skipSetup != true ]]; then