Fix internal node lamport funding and staking allocation logic (#5192)
* Plumb node funding from genesis * Cleanup naming convention * Fix balance vs stake yml file logic * Lamps not Stakes
This commit is contained in:
Dan Albert
GitHub
32
net/net.sh
32
net/net.sh
@ -56,12 +56,16 @@ Operate a configured testnet
|
||||
|
||||
--hashes-per-tick NUM_HASHES|sleep|auto
|
||||
- Override the default --hashes-per-tick for the cluster
|
||||
--no-airdrop
|
||||
- If set, disables airdrops. Nodes must be funded in genesis block when airdrops are disabled.
|
||||
--lamports NUM_LAMPORTS_TO_MINT
|
||||
- Override the default 100000000000000 lamports minted in genesis
|
||||
--stake-internal-nodes NUM_LAMPORTS_PER_NODE
|
||||
- Amount to stake internal nodes in genesis block. If set, airdrops are disabled.
|
||||
--internal-nodes-stake-lamports NUM_LAMPORTS_PER_NODE
|
||||
- Amount to stake internal nodes.
|
||||
--internal-nodes-lamports NUM_LAMPORTS_PER_NODE
|
||||
- Amount to fund internal nodes in genesis block.
|
||||
--external-accounts-file FILE_PATH
|
||||
- A YML file with a list of account pubkeys and corresponding stakes for external nodes
|
||||
- A YML file with a list of account pubkeys and corresponding lamport balances in genesis block for external nodes
|
||||
--no-snapshot
|
||||
- If set, disables booting validators from a snapshot
|
||||
--skip-ledger-verify
|
||||
@ -108,9 +112,11 @@ genesisOptions=
|
||||
numFullnodesRequested=
|
||||
externalPrimordialAccountsFile=
|
||||
remoteExternalPrimordialAccountsFile=
|
||||
stakeNodesInGenesisBlock=
|
||||
internalNodesStakeLamports=
|
||||
internalNodesLamports=
|
||||
maybeNoSnapshot=""
|
||||
maybeSkipLedgerVerify=""
|
||||
maybeDisableAirdrops=""
|
||||
|
||||
command=$1
|
||||
[[ -n $command ]] || usage
|
||||
@ -137,13 +143,19 @@ while [[ -n $1 ]]; do
|
||||
elif [[ $1 = --deploy-update ]]; then
|
||||
updatePlatforms="$updatePlatforms $2"
|
||||
shift 2
|
||||
elif [[ $1 = --stake-internal-nodes ]]; then
|
||||
stakeNodesInGenesisBlock="$2"
|
||||
elif [[ $1 = --internal-nodes-stake-lamports ]]; then
|
||||
internalNodesStakeLamports="$2"
|
||||
shift 2
|
||||
elif [[ $1 = --internal-nodes-lamports ]]; then
|
||||
internalNodesLamports="$2"
|
||||
shift 2
|
||||
elif [[ $1 = --external-accounts-file ]]; then
|
||||
externalPrimordialAccountsFile="$2"
|
||||
remoteExternalPrimordialAccountsFile=/tmp/external-primordial-accounts.yml
|
||||
shift 2
|
||||
elif [[ $1 = --no-airdrop ]]; then
|
||||
maybeDisableAirdrops="$1"
|
||||
shift 1
|
||||
else
|
||||
usage "Unknown long option: $1"
|
||||
fi
|
||||
@ -369,7 +381,9 @@ startBootstrapLeader() {
|
||||
$skipSetup \
|
||||
$failOnValidatorBootupFailure \
|
||||
\"$remoteExternalPrimordialAccountsFile\" \
|
||||
\"$stakeNodesInGenesisBlock\" \
|
||||
\"$maybeDisableAirdrops\" \
|
||||
\"$internalNodesStakeLamports\" \
|
||||
\"$internalNodesLamports\" \
|
||||
$nodeIndex \
|
||||
$numBenchTpsClients \"$benchTpsExtraArgs\" \
|
||||
$numBenchExchangeClients \"$benchExchangeExtraArgs\" \
|
||||
@ -431,7 +445,9 @@ startNode() {
|
||||
$skipSetup \
|
||||
$failOnValidatorBootupFailure \
|
||||
\"$remoteExternalPrimordialAccountsFile\" \
|
||||
\"$stakeNodesInGenesisBlock\" \
|
||||
\"$maybeDisableAirdrops\" \
|
||||
\"$internalNodesStakeLamports\" \
|
||||
\"$internalNodesLamports\" \
|
||||
$nodeIndex \
|
||||
$numBenchTpsClients \"$benchTpsExtraArgs\" \
|
||||
$numBenchExchangeClients \"$benchExchangeExtraArgs\" \
|
||||
|
||||
@ -12,14 +12,16 @@ RUST_LOG="$5"
|
||||
skipSetup="$6"
|
||||
failOnValidatorBootupFailure="$7"
|
||||
externalPrimordialAccountsFile="$8"
|
||||
stakeNodesInGenesisBlock="$9"
|
||||
nodeIndex="${10}"
|
||||
numBenchTpsClients="${11}"
|
||||
benchTpsExtraArgs="${12}"
|
||||
numBenchExchangeClients="${13}"
|
||||
benchExchangeExtraArgs="${14}"
|
||||
genesisOptions="${15}"
|
||||
extraNodeArgs="${16}"
|
||||
maybeDisableAirdrops="$9"
|
||||
internalNodesStakeLamports="${10}"
|
||||
internalNodesLamports="${11}"
|
||||
nodeIndex="${12}"
|
||||
numBenchTpsClients="${13}"
|
||||
benchTpsExtraArgs="${14}"
|
||||
numBenchExchangeClients="${15}"
|
||||
benchExchangeExtraArgs="${16}"
|
||||
genesisOptions="${17}"
|
||||
extraNodeArgs="${18}"
|
||||
set +x
|
||||
export RUST_LOG
|
||||
|
||||
@ -29,7 +31,7 @@ export RUST_LOG
|
||||
# trouble
|
||||
#
|
||||
# Ref: https://github.com/solana-labs/solana/issues/3798
|
||||
stake=424243
|
||||
stake=${internalNodesStakeLamports:=424243}
|
||||
|
||||
missing() {
|
||||
echo "Error: $1 not specified"
|
||||
@ -44,7 +46,7 @@ missing() {
|
||||
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
|
||||
|
||||
airdropsEnabled=true
|
||||
if [[ -n $stakeNodesInGenesisBlock ]]; then
|
||||
if [[ -n $maybeDisableAirdrops ]]; then
|
||||
airdropsEnabled=false
|
||||
fi
|
||||
cat > deployConfig <<EOF
|
||||
@ -107,13 +109,13 @@ local|tar)
|
||||
fi
|
||||
set -x
|
||||
rm -rf ./solana-node-keys
|
||||
rm -rf ./solana-node-stakes
|
||||
mkdir ./solana-node-stakes
|
||||
if [[ -n $stakeNodesInGenesisBlock ]]; then
|
||||
rm -rf ./solana-node-balances
|
||||
mkdir ./solana-node-balances
|
||||
if [[ -n $internalNodesLamports ]]; then
|
||||
for i in $(seq 0 "$numNodes"); do
|
||||
solana-keygen new -o ./solana-node-keys/"$i"
|
||||
pubkey="$(solana-keygen pubkey ./solana-node-keys/"$i")"
|
||||
echo "${pubkey}: $stakeNodesInGenesisBlock" >> ./solana-node-stakes/fullnode-stakes.yml
|
||||
echo "${pubkey}: $internalNodesLamports" >> ./solana-node-balances/fullnode-balances.yml
|
||||
done
|
||||
fi
|
||||
|
||||
@ -144,9 +146,9 @@ local|tar)
|
||||
tail -n +2 -q ./solana-client-accounts/bench-exchange"$i".yml >> ./solana-client-accounts/client-accounts.yml
|
||||
echo "" >> ./solana-client-accounts/client-accounts.yml
|
||||
done
|
||||
[[ -z $externalPrimordialAccountsFile ]] || cat "$externalPrimordialAccountsFile" >> ./solana-node-stakes/fullnode-stakes.yml
|
||||
if [ -f ./solana-node-stakes/fullnode-stakes.yml ]; then
|
||||
genesisOptions+=" --primordial-accounts-file ./solana-node-stakes/fullnode-stakes.yml"
|
||||
[[ -z $externalPrimordialAccountsFile ]] || cat "$externalPrimordialAccountsFile" >> ./solana-node-balances/fullnode-balances.yml
|
||||
if [ -f ./solana-node-balances/fullnode-balances.yml ]; then
|
||||
genesisOptions+=" --primordial-accounts-file ./solana-node-balances/fullnode-balances.yml"
|
||||
fi
|
||||
if [ -f ./solana-client-accounts/client-accounts.yml ]; then
|
||||
genesisOptions+=" --primordial-keypairs-file ./solana-client-accounts/client-accounts.yml"
|
||||
@ -154,12 +156,15 @@ local|tar)
|
||||
if [[ $skipSetup != true ]]; then
|
||||
args=(
|
||||
--bootstrap-leader-stake-lamports "$stake"
|
||||
)
|
||||
)
|
||||
if [[ -n $internalNodesLamports ]]; then
|
||||
args+=(--bootstrap-leader-lamports "$internalNodesLamports")
|
||||
fi
|
||||
# shellcheck disable=SC2206 # Do not want to quote $genesisOptions
|
||||
args+=($genesisOptions)
|
||||
./multinode-demo/setup.sh "${args[@]}"
|
||||
fi
|
||||
if [[ -z $stakeNodesInGenesisBlock ]]; then
|
||||
if [[ $airdropsEnabled = true ]]; then
|
||||
./multinode-demo/drone.sh > drone.log 2>&1 &
|
||||
fi
|
||||
args=(
|
||||
@ -167,7 +172,7 @@ local|tar)
|
||||
--gossip-port "$entrypointIp":8001
|
||||
)
|
||||
|
||||
if [[ -n $stakeNodesInGenesisBlock ]]; then
|
||||
if [[ $airdropsEnabled != true ]]; then
|
||||
args+=(--no-airdrop)
|
||||
fi
|
||||
args+=(--init-complete-file "$initCompleteFile")
|
||||
@ -179,7 +184,7 @@ local|tar)
|
||||
validator|blockstreamer)
|
||||
net/scripts/rsync-retry.sh -vPrc "$entrypointIp":~/.cargo/bin/ ~/.cargo/bin/
|
||||
rm -f ~/solana/fullnode-identity.json
|
||||
[[ -z $stakeNodesInGenesisBlock ]] || net/scripts/rsync-retry.sh -vPrc \
|
||||
[[ -z $internalNodesLamports ]] || net/scripts/rsync-retry.sh -vPrc \
|
||||
"$entrypointIp":~/solana/solana-node-keys/"$nodeIndex" ~/solana/fullnode-identity.json
|
||||
|
||||
if [[ -e /dev/nvidia0 && -x ~/.cargo/bin/solana-validator-cuda ]]; then
|
||||
@ -202,13 +207,16 @@ local|tar)
|
||||
else
|
||||
args+=(--stake "$stake")
|
||||
args+=(--enable-rpc-exit)
|
||||
if [[ -n $internalNodesLamports ]]; then
|
||||
args+=(--node-lamports "$internalNodesLamports")
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -f ~/solana/fullnode-identity.json ]]; then
|
||||
args+=(--identity ~/solana/fullnode-identity.json)
|
||||
fi
|
||||
|
||||
if [[ -n $stakeNodesInGenesisBlock ]]; then
|
||||
if [[ $airdropsEnabled != true ]]; then
|
||||
args+=(--no-airdrop)
|
||||
fi
|
||||
|
||||
@ -223,7 +231,7 @@ local|tar)
|
||||
# a static IP/DNS name for hosting the blockexplorer web app, and is
|
||||
# a location that somebody would expect to be able to airdrop from
|
||||
scp "$entrypointIp":~/solana/config-local/mint-keypair.json config-local/
|
||||
if [[ -z $stakeNodesInGenesisBlock ]]; then
|
||||
if [[ $airdropsEnabled = true ]]; then
|
||||
./multinode-demo/drone.sh > drone.log 2>&1 &
|
||||
fi
|
||||
|
||||
@ -262,10 +270,14 @@ local|tar)
|
||||
"$entrypointIp":~/solana "$entrypointIp:8001"
|
||||
)
|
||||
|
||||
if [[ -n $stakeNodesInGenesisBlock ]]; then
|
||||
if [[ $airdropsEnabled != true ]]; then
|
||||
args+=(--no-airdrop)
|
||||
fi
|
||||
|
||||
if [[ -n $internalNodesLamports ]] ; then
|
||||
args+=(--node-lamports "$internalNodesLamports")
|
||||
fi
|
||||
|
||||
if [[ $skipSetup != true ]]; then
|
||||
./multinode-demo/clear-config.sh
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user