From 90461245f9db9b43721cc98058d592c6d2e37ae1 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 24 Oct 2019 20:37:23 -0700 Subject: [PATCH] Reduce TdS fees to 1 lamport per sig, and slots_per_epoch/2 (#6542) --- ci/testnet-deploy.sh | 11 +++++++++++ ci/testnet-manager.sh | 6 ++++-- net/net.sh | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh index 56894668d9..3d52119947 100755 --- a/ci/testnet-deploy.sh +++ b/ci/testnet-deploy.sh @@ -29,6 +29,9 @@ maybeInternalNodesStakeLamports= maybeInternalNodesLamports= maybeExternalPrimordialAccountsFile= maybeLamports= +maybeSlotsPerEpoch= +maybeTargetLamportsPerSignature= +maybeSlotsPerEpoch= maybeLetsEncrypt= maybeValidatorAdditionalDiskSize= maybeNoSnapshot= @@ -108,9 +111,15 @@ while [[ -n $1 ]]; do if [[ $1 = --hashes-per-tick ]]; then maybeHashesPerTick="$1 $2" shift 2 + elif [[ $1 = --slots-per-epoch ]]; then + maybeSlotsPerEpoch="$1 $2" + shift 2 elif [[ $1 = --lamports ]]; then maybeLamports="$1 $2" shift 2 + elif [[ $1 = --target-lamports-per-signature ]]; then + maybeTargetLamportsPerSignature="$1 $2" + shift 2 elif [[ $1 = --no-airdrop ]]; then maybeDisableAirdrops=$1 shift 1 @@ -394,6 +403,8 @@ if ! $skipStart; then $maybeInternalNodesLamports $maybeExternalPrimordialAccountsFile $maybeLamports + $maybeSlotsPerEpoch + $maybeTargetLamportsPerSignature $maybeNoSnapshot $maybeLimitLedgerSize ) diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh index 8474267012..3586a54322 100755 --- a/ci/testnet-manager.sh +++ b/ci/testnet-manager.sh @@ -479,7 +479,7 @@ deploy() { fi if [[ -z $INTERNAL_NODES_STAKE_LAMPORTS ]]; then - maybeInternalNodesStakeLamports="--internal-nodes-stake-lamports 1000000000000" + maybeInternalNodesStakeLamports="--internal-nodes-stake-lamports 17179869184" elif [[ $INTERNAL_NODES_STAKE_LAMPORTS == skip ]]; then maybeInternalNodesStakeLamports="" else @@ -487,7 +487,7 @@ deploy() { fi if [[ -z $INTERNAL_NODES_LAMPORTS ]]; then - maybeInternalNodesLamports="--internal-nodes-lamports 2000000000000" + maybeInternalNodesLamports="--internal-nodes-lamports 17179869184" elif [[ $INTERNAL_NODES_LAMPORTS == skip ]]; then maybeInternalNodesLamports="" else @@ -546,6 +546,8 @@ deploy() { ${maybeInternalNodesLamports} \ ${maybeExternalAccountsFile} \ ${maybeLamports} \ + --target-lamports-per-signature 1 \ + --slots-per-epoch 4096 \ ${maybeAdditionalDisk} ) ;; diff --git a/net/net.sh b/net/net.sh index a989f31257..fd99a77388 100755 --- a/net/net.sh +++ b/net/net.sh @@ -149,6 +149,9 @@ while [[ -n $1 ]]; do if [[ $1 = --hashes-per-tick ]]; then genesisOptions="$genesisOptions $1 $2" shift 2 + elif [[ $1 = --slots-per-epoch ]]; then + genesisOptions="$genesisOptions $1 $2" + shift 2 elif [[ $1 = --target-lamports-per-signature ]]; then genesisOptions="$genesisOptions $1 $2" shift 2