Enable non-zero fees for all testnets (#4513)

automerge
This commit is contained in:
Michael Vines 2019-05-31 22:33:55 -07:00 committed by Grimes
parent ec5cca41bc
commit e15246746d
5 changed files with 13 additions and 1 deletions

View File

@ -270,6 +270,7 @@ EOF
default_arg --storage-keypair "$storage_keypair_path" default_arg --storage-keypair "$storage_keypair_path"
default_arg --ledger "$ledger_config_dir" default_arg --ledger "$ledger_config_dir"
rsync_entrypoint_url=$(rsync_url "$entrypoint")
elif [[ $node_type = bootstrap_leader ]]; then elif [[ $node_type = bootstrap_leader ]]; then
if [[ ${#positional_args[@]} -ne 0 ]]; then if [[ ${#positional_args[@]} -ne 0 ]]; then
fullnode_usage "Unknown argument: ${positional_args[0]}" fullnode_usage "Unknown argument: ${positional_args[0]}"

View File

@ -723,6 +723,13 @@ info)
zone=${blockstreamerIpListZone[$i]} zone=${blockstreamerIpListZone[$i]}
printNode blockstreamer "$ipAddress" "$ipAddressPrivate" "$zone" printNode blockstreamer "$ipAddress" "$ipAddressPrivate" "$zone"
done done
for i in $(seq 0 $(( ${#replicatorIpList[@]} - 1)) ); do
ipAddress=${replicatorIpList[$i]}
ipAddressPrivate=${replicatorIpListPrivate[$i]}
zone=${replicatorIpListZone[$i]}
printNode replicator "$ipAddress" "$ipAddressPrivate" "$zone"
done
;; ;;
*) *)
usage "Unknown command: $command" usage "Unknown command: $command"

View File

@ -80,6 +80,7 @@ local|tar)
args=( args=(
--bootstrap-leader-lamports "$stake" --bootstrap-leader-lamports "$stake"
--bootstrap-leader-stake-lamports "$stake" --bootstrap-leader-stake-lamports "$stake"
--lamports-per-signature 1
) )
# shellcheck disable=SC2206 # Do not want to quote $genesisOptions # shellcheck disable=SC2206 # Do not want to quote $genesisOptions
args+=($genesisOptions) args+=($genesisOptions)
@ -152,6 +153,8 @@ local|tar)
sleep 1 sleep 1
;; ;;
replicator) replicator)
net/scripts/rsync-retry.sh -vPrc "$entrypointIp":~/.cargo/bin/ ~/.cargo/bin/
args=( args=(
"$entrypointIp":~/solana "$entrypointIp:8001" "$entrypointIp":~/solana "$entrypointIp:8001"
) )

View File

@ -77,7 +77,7 @@ if [[ ${#replicatorIpList[@]} -eq 0 ]]; then
echo " None" echo " None"
else else
for ipAddress in "${replicatorIpList[@]}"; do for ipAddress in "${replicatorIpList[@]}"; do
printNode replicator "$ipAddress" printNode fullnode "$ipAddress"
done done
fi fi
echo echo

View File

@ -39,6 +39,7 @@ BIN_CRATES=(
install install
keygen keygen
ledger-tool ledger-tool
replicator
validator validator
wallet wallet
) )