Add --allow-private-addr to bootstrap-validator.sh (#30163)
* Add --allow-private-addr to bootstrap-validator.sh * Remove --allow-private-addr argument option since it is default * fix bench-tps docs, remove option for private-addr (default)
This commit is contained in:
parent
6a66d4631c
commit
045b9fec11
|
@ -74,12 +74,10 @@ source multinode-demo/common.sh --prebuild
|
|||
|
||||
nodes=(
|
||||
"multinode-demo/bootstrap-validator.sh \
|
||||
--allow-private-addr \
|
||||
--no-restart \
|
||||
--init-complete-file init-complete-node0.log \
|
||||
--dynamic-port-range 8000-8050"
|
||||
"multinode-demo/validator.sh \
|
||||
--allow-private-addr \
|
||||
--no-restart \
|
||||
--dynamic-port-range 8050-8100
|
||||
--init-complete-file init-complete-node1.log \
|
||||
|
@ -92,7 +90,6 @@ if [[ extraNodes -gt 0 ]]; then
|
|||
portEnd=$((portStart + 49))
|
||||
nodes+=(
|
||||
"multinode-demo/validator.sh \
|
||||
--allow-private-addr \
|
||||
--no-restart \
|
||||
--dynamic-port-range $portStart-$portEnd
|
||||
--label dyn$i \
|
||||
|
|
|
@ -75,12 +75,6 @@ NDEBUG=1 SOLANA_CUDA=1 ./multinode-demo/bootstrap-validator.sh
|
|||
NDEBUG=1 SOLANA_CUDA=1 ./multinode-demo/validator.sh
|
||||
```
|
||||
|
||||
To run multiple nodes on the same machine using loopback IP address, pass parameter to allow private addresses
|
||||
|
||||
```bash
|
||||
NDEBUG=1 ./multinode-demo/bootstrap-validator.sh --allow-private-addr
|
||||
NDEBUG=1 ./multinode-demo/validator-x.sh --allow-private-addr
|
||||
```
|
||||
|
||||
### Testnet Client Demo
|
||||
|
||||
|
|
|
@ -97,9 +97,6 @@ while [[ -n $1 ]]; do
|
|||
elif [[ $1 == --no-snapshot-fetch ]]; then
|
||||
args+=("$1")
|
||||
shift
|
||||
elif [[ $1 == --allow-private-addr ]]; then
|
||||
args+=("$1")
|
||||
shift
|
||||
elif [[ $1 == --accounts-db-skip-shrink ]]; then
|
||||
args+=("$1")
|
||||
shift
|
||||
|
@ -149,6 +146,7 @@ args+=(
|
|||
--no-os-network-limits-test
|
||||
--no-wait-for-vote-to-start-leader
|
||||
--full-rpc-api
|
||||
--allow-private-addr
|
||||
)
|
||||
default_arg --gossip-port 8001
|
||||
default_arg --log -
|
||||
|
|
|
@ -19,7 +19,6 @@ vote_account=
|
|||
no_restart=0
|
||||
gossip_entrypoint=
|
||||
ledger_dir=
|
||||
maybe_allow_private_addr=
|
||||
|
||||
usage() {
|
||||
if [[ -n $1 ]]; then
|
||||
|
@ -177,10 +176,6 @@ while [[ -n $1 ]]; do
|
|||
elif [[ $1 == --expected-bank-hash ]]; then
|
||||
args+=("$1" "$2")
|
||||
shift 2
|
||||
elif [[ $1 == --allow-private-addr ]]; then
|
||||
args+=("$1")
|
||||
maybe_allow_private_addr=$1
|
||||
shift
|
||||
elif [[ $1 == --accounts-db-skip-shrink ]]; then
|
||||
args+=("$1")
|
||||
shift
|
||||
|
@ -265,6 +260,7 @@ default_arg --ledger "$ledger_dir"
|
|||
default_arg --log -
|
||||
default_arg --full-rpc-api
|
||||
default_arg --no-incremental-snapshots
|
||||
default_arg --allow-private-addr
|
||||
|
||||
if [[ $maybeRequireTower = true ]]; then
|
||||
default_arg --require-tower
|
||||
|
@ -335,8 +331,8 @@ setup_validator_accounts() {
|
|||
return 0
|
||||
}
|
||||
|
||||
# shellcheck disable=SC2086 # Don't want to double quote "$maybe_allow_private_addr"
|
||||
rpc_url=$($solana_gossip $maybe_allow_private_addr rpc-url --timeout 180 --entrypoint "$gossip_entrypoint")
|
||||
# shellcheck disable=SC2086
|
||||
rpc_url=$($solana_gossip --allow-private-addr rpc-url --timeout 180 --entrypoint "$gossip_entrypoint")
|
||||
|
||||
[[ -r "$identity" ]] || $solana_keygen new --no-passphrase -so "$identity"
|
||||
[[ -r "$vote_account" ]] || $solana_keygen new --no-passphrase -so "$vote_account"
|
||||
|
|
Loading…
Reference in New Issue