Don't start drone if primordial accounts are created for nodes (#4704)
* disable wallet sanity if no airdrops
This commit is contained in:
parent
cc48773b03
commit
7fe10ba060
|
@ -316,7 +316,9 @@ elif [[ $node_type = bootstrap_leader ]]; then
|
||||||
configured_flag=$SOLANA_CONFIG_DIR/bootstrap-leader.configured
|
configured_flag=$SOLANA_CONFIG_DIR/bootstrap-leader.configured
|
||||||
|
|
||||||
default_arg --rpc-port 8899
|
default_arg --rpc-port 8899
|
||||||
default_arg --rpc-drone-address 127.0.0.1:9900
|
if ((airdrops_enabled)); then
|
||||||
|
default_arg --rpc-drone-address 127.0.0.1:9900
|
||||||
|
fi
|
||||||
default_arg --gossip-port 8001
|
default_arg --gossip-port 8001
|
||||||
|
|
||||||
elif [[ $node_type = validator ]]; then
|
elif [[ $node_type = validator ]]; then
|
||||||
|
@ -342,7 +344,9 @@ elif [[ $node_type = validator ]]; then
|
||||||
[[ -r "$storage_keypair_path" ]] || $solana_keygen new -o "$storage_keypair_path"
|
[[ -r "$storage_keypair_path" ]] || $solana_keygen new -o "$storage_keypair_path"
|
||||||
|
|
||||||
default_arg --entrypoint "$entrypoint_address"
|
default_arg --entrypoint "$entrypoint_address"
|
||||||
default_arg --rpc-drone-address "${entrypoint_address%:*}:9900"
|
if ((airdrops_enabled)); then
|
||||||
|
default_arg --rpc-drone-address "${entrypoint_address%:*}:9900"
|
||||||
|
fi
|
||||||
|
|
||||||
rsync_entrypoint_url=$(rsync_url "$entrypoint")
|
rsync_entrypoint_url=$(rsync_url "$entrypoint")
|
||||||
else
|
else
|
||||||
|
|
|
@ -42,12 +42,17 @@ missing() {
|
||||||
[[ -n $skipSetup ]] || missing skipSetup
|
[[ -n $skipSetup ]] || missing skipSetup
|
||||||
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
|
[[ -n $failOnValidatorBootupFailure ]] || missing failOnValidatorBootupFailure
|
||||||
|
|
||||||
|
airdropsEnabled=true
|
||||||
|
if [[ -n $stakeNodesInGenesisBlock ]]; then
|
||||||
|
airdropsEnabled=false
|
||||||
|
fi
|
||||||
cat > deployConfig <<EOF
|
cat > deployConfig <<EOF
|
||||||
deployMethod="$deployMethod"
|
deployMethod="$deployMethod"
|
||||||
entrypointIp="$entrypointIp"
|
entrypointIp="$entrypointIp"
|
||||||
numNodes="$numNodes"
|
numNodes="$numNodes"
|
||||||
failOnValidatorBootupFailure=$failOnValidatorBootupFailure
|
failOnValidatorBootupFailure=$failOnValidatorBootupFailure
|
||||||
genesisOptions="$genesisOptions"
|
genesisOptions="$genesisOptions"
|
||||||
|
airdropsEnabled=$airdropsEnabled
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
source net/common.sh
|
source net/common.sh
|
||||||
|
@ -141,8 +146,9 @@ local|tar)
|
||||||
args+=($genesisOptions)
|
args+=($genesisOptions)
|
||||||
./multinode-demo/setup.sh "${args[@]}"
|
./multinode-demo/setup.sh "${args[@]}"
|
||||||
fi
|
fi
|
||||||
./multinode-demo/drone.sh > drone.log 2>&1 &
|
if [[ -z $stakeNodesInGenesisBlock ]]; then
|
||||||
|
./multinode-demo/drone.sh > drone.log 2>&1 &
|
||||||
|
fi
|
||||||
args=(
|
args=(
|
||||||
--enable-rpc-exit
|
--enable-rpc-exit
|
||||||
--gossip-port "$entrypointIp":8001
|
--gossip-port "$entrypointIp":8001
|
||||||
|
@ -201,8 +207,9 @@ local|tar)
|
||||||
# a static IP/DNS name for hosting the blockexplorer web app, and is
|
# 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
|
# a location that somebody would expect to be able to airdrop from
|
||||||
scp "$entrypointIp":~/solana/config-local/mint-keypair.json config-local/
|
scp "$entrypointIp":~/solana/config-local/mint-keypair.json config-local/
|
||||||
./multinode-demo/drone.sh > drone.log 2>&1 &
|
if [[ -z $stakeNodesInGenesisBlock ]]; then
|
||||||
|
./multinode-demo/drone.sh > drone.log 2>&1 &
|
||||||
|
fi
|
||||||
export BLOCKEXPLORER_GEOIP_WHITELIST=$PWD/net/config/geoip.yml
|
export BLOCKEXPLORER_GEOIP_WHITELIST=$PWD/net/config/geoip.yml
|
||||||
npm install @solana/blockexplorer@1
|
npm install @solana/blockexplorer@1
|
||||||
npx solana-blockexplorer > blockexplorer.log 2>&1 &
|
npx solana-blockexplorer > blockexplorer.log 2>&1 &
|
||||||
|
|
|
@ -13,6 +13,7 @@ deployMethod=
|
||||||
entrypointIp=
|
entrypointIp=
|
||||||
numNodes=
|
numNodes=
|
||||||
failOnValidatorBootupFailure=
|
failOnValidatorBootupFailure=
|
||||||
|
airdropsEnabled=true
|
||||||
|
|
||||||
[[ -r deployConfig ]] || {
|
[[ -r deployConfig ]] || {
|
||||||
echo deployConfig missing
|
echo deployConfig missing
|
||||||
|
@ -122,11 +123,16 @@ echo "--- $sanityTargetIp: RPC API: getTransactionCount"
|
||||||
http://"$sanityTargetIp":8899
|
http://"$sanityTargetIp":8899
|
||||||
)
|
)
|
||||||
|
|
||||||
echo "--- $sanityTargetIp: wallet sanity"
|
if [[ "$airdropsEnabled" = true ]]; then
|
||||||
(
|
echo "--- $sanityTargetIp: wallet sanity"
|
||||||
set -x
|
(
|
||||||
scripts/wallet-sanity.sh --url http://"$sanityTargetIp":8899
|
set -x
|
||||||
)
|
scripts/wallet-sanity.sh --url http://"$sanityTargetIp":8899
|
||||||
|
)
|
||||||
|
else
|
||||||
|
echo "^^^ +++"
|
||||||
|
echo "Note: wallet sanity is disabled as airdrops are disabled"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "--- $sanityTargetIp: verify ledger"
|
echo "--- $sanityTargetIp: verify ledger"
|
||||||
if $ledgerVerify; then
|
if $ledgerVerify; then
|
||||||
|
|
Loading…
Reference in New Issue