Reduce TdS fees to 1 lamport per sig, and slots_per_epoch/2 (#6542)

This commit is contained in:
Michael Vines
2019-10-24 20:37:23 -07:00
committed by GitHub
parent 1c91c1e880
commit 90461245f9
3 changed files with 18 additions and 2 deletions

View File

@ -29,6 +29,9 @@ maybeInternalNodesStakeLamports=
maybeInternalNodesLamports= maybeInternalNodesLamports=
maybeExternalPrimordialAccountsFile= maybeExternalPrimordialAccountsFile=
maybeLamports= maybeLamports=
maybeSlotsPerEpoch=
maybeTargetLamportsPerSignature=
maybeSlotsPerEpoch=
maybeLetsEncrypt= maybeLetsEncrypt=
maybeValidatorAdditionalDiskSize= maybeValidatorAdditionalDiskSize=
maybeNoSnapshot= maybeNoSnapshot=
@ -108,9 +111,15 @@ while [[ -n $1 ]]; do
if [[ $1 = --hashes-per-tick ]]; then if [[ $1 = --hashes-per-tick ]]; then
maybeHashesPerTick="$1 $2" maybeHashesPerTick="$1 $2"
shift 2 shift 2
elif [[ $1 = --slots-per-epoch ]]; then
maybeSlotsPerEpoch="$1 $2"
shift 2
elif [[ $1 = --lamports ]]; then elif [[ $1 = --lamports ]]; then
maybeLamports="$1 $2" maybeLamports="$1 $2"
shift 2 shift 2
elif [[ $1 = --target-lamports-per-signature ]]; then
maybeTargetLamportsPerSignature="$1 $2"
shift 2
elif [[ $1 = --no-airdrop ]]; then elif [[ $1 = --no-airdrop ]]; then
maybeDisableAirdrops=$1 maybeDisableAirdrops=$1
shift 1 shift 1
@ -394,6 +403,8 @@ if ! $skipStart; then
$maybeInternalNodesLamports $maybeInternalNodesLamports
$maybeExternalPrimordialAccountsFile $maybeExternalPrimordialAccountsFile
$maybeLamports $maybeLamports
$maybeSlotsPerEpoch
$maybeTargetLamportsPerSignature
$maybeNoSnapshot $maybeNoSnapshot
$maybeLimitLedgerSize $maybeLimitLedgerSize
) )

View File

@ -479,7 +479,7 @@ deploy() {
fi fi
if [[ -z $INTERNAL_NODES_STAKE_LAMPORTS ]]; then 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 elif [[ $INTERNAL_NODES_STAKE_LAMPORTS == skip ]]; then
maybeInternalNodesStakeLamports="" maybeInternalNodesStakeLamports=""
else else
@ -487,7 +487,7 @@ deploy() {
fi fi
if [[ -z $INTERNAL_NODES_LAMPORTS ]]; then if [[ -z $INTERNAL_NODES_LAMPORTS ]]; then
maybeInternalNodesLamports="--internal-nodes-lamports 2000000000000" maybeInternalNodesLamports="--internal-nodes-lamports 17179869184"
elif [[ $INTERNAL_NODES_LAMPORTS == skip ]]; then elif [[ $INTERNAL_NODES_LAMPORTS == skip ]]; then
maybeInternalNodesLamports="" maybeInternalNodesLamports=""
else else
@ -546,6 +546,8 @@ deploy() {
${maybeInternalNodesLamports} \ ${maybeInternalNodesLamports} \
${maybeExternalAccountsFile} \ ${maybeExternalAccountsFile} \
${maybeLamports} \ ${maybeLamports} \
--target-lamports-per-signature 1 \
--slots-per-epoch 4096 \
${maybeAdditionalDisk} ${maybeAdditionalDisk}
) )
;; ;;

View File

@ -149,6 +149,9 @@ while [[ -n $1 ]]; do
if [[ $1 = --hashes-per-tick ]]; then if [[ $1 = --hashes-per-tick ]]; then
genesisOptions="$genesisOptions $1 $2" genesisOptions="$genesisOptions $1 $2"
shift 2 shift 2
elif [[ $1 = --slots-per-epoch ]]; then
genesisOptions="$genesisOptions $1 $2"
shift 2
elif [[ $1 = --target-lamports-per-signature ]]; then elif [[ $1 = --target-lamports-per-signature ]]; then
genesisOptions="$genesisOptions $1 $2" genesisOptions="$genesisOptions $1 $2"
shift 2 shift 2