From 2e8bbed75b9f3be743930c8627b2626848e58ff1 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 2 Jan 2020 21:07:06 -0700 Subject: [PATCH] Revert "Remov dead code from TdS testnet manager config (#7414)" This reverts commit 8920ac02f69d4b5820b24fb6cf4734f9efda9201. --- ci/testnet-manager.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index 982e8192a..813e477e5 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -460,6 +460,14 @@ deploy() { maybeGpu=(-G "${ENABLE_GPU}") fi + if [[ -z $HASHES_PER_TICK ]]; then + maybeHashesPerTick="--hashes-per-tick auto" + elif [[ $HASHES_PER_TICK == skip ]]; then + maybeHashesPerTick="" + else + maybeHashesPerTick="--hashes-per-tick ${HASHES_PER_TICK}" + fi + if [[ -z $DISABLE_AIRDROPS ]]; then DISABLE_AIRDROPS="true" fi @@ -470,6 +478,22 @@ deploy() { maybeDisableAirdrops="" fi + if [[ -z $INTERNAL_NODES_STAKE_LAMPORTS ]]; then + maybeInternalNodesStakeLamports="--internal-nodes-stake-lamports 1000000000" # 1 SOL + elif [[ $INTERNAL_NODES_STAKE_LAMPORTS == skip ]]; then + maybeInternalNodesStakeLamports="" + else + maybeInternalNodesStakeLamports="--internal-nodes-stake-lamports ${INTERNAL_NODES_STAKE_LAMPORTS}" + fi + + if [[ -z $INTERNAL_NODES_LAMPORTS ]]; then + maybeInternalNodesLamports="--internal-nodes-lamports 500000000000" # 500 SOL + elif [[ $INTERNAL_NODES_LAMPORTS == skip ]]; then + maybeInternalNodesLamports="" + else + maybeInternalNodesLamports="--internal-nodes-lamports ${INTERNAL_NODES_LAMPORTS}" + fi + EXTERNAL_ACCOUNTS_FILE=/tmp/validator.yml if [[ -z $EXTERNAL_ACCOUNTS_FILE_URL ]]; then EXTERNAL_ACCOUNTS_FILE_URL=https://raw.githubusercontent.com/solana-labs/tour-de-sol/master/validators/all.yml @@ -503,11 +527,14 @@ deploy() { --idle-clients \ -P -u \ -a tds-solana-com --letsencrypt tds.solana.com \ + ${maybeHashesPerTick} \ ${skipCreate:+-e} \ ${skipStart:+-s} \ ${maybeStop:+-S} \ ${maybeDelete:+-D} \ ${maybeDisableAirdrops} \ + ${maybeInternalNodesStakeLamports} \ + ${maybeInternalNodesLamports} \ ${maybeExternalAccountsFile} \ --target-lamports-per-signature 0 \ --slots-per-epoch 4096 \