We don't need the more complicated port setup anymore
This commit is contained in:
parent
edd9826464
commit
6629897567
|
@ -6,6 +6,9 @@ import
|
||||||
export
|
export
|
||||||
defs
|
defs
|
||||||
|
|
||||||
|
const
|
||||||
|
defaultPort = 9000
|
||||||
|
|
||||||
type
|
type
|
||||||
ValidatorKeyPath* = TypedInputFile[ValidatorPrivKey, Txt, "privkey"]
|
ValidatorKeyPath* = TypedInputFile[ValidatorPrivKey, Txt, "privkey"]
|
||||||
|
|
||||||
|
@ -49,11 +52,11 @@ type
|
||||||
|
|
||||||
tcpPort* {.
|
tcpPort* {.
|
||||||
desc: "TCP listening port"
|
desc: "TCP listening port"
|
||||||
defaultValue: config.defaultPort().}: int
|
defaultValue: defaultPort .}: int
|
||||||
|
|
||||||
udpPort* {.
|
udpPort* {.
|
||||||
desc: "UDP listening port",
|
desc: "UDP listening port",
|
||||||
defaultValue: config.defaultPort().}: int
|
defaultValue: defaultPort .}: int
|
||||||
|
|
||||||
nat* {.
|
nat* {.
|
||||||
desc: "Specify method to use for determining public address. Must be one of: any, extip:<IP>"
|
desc: "Specify method to use for determining public address. Must be one of: any, extip:<IP>"
|
||||||
|
@ -99,7 +102,7 @@ type
|
||||||
|
|
||||||
bootstrapPort* {.
|
bootstrapPort* {.
|
||||||
desc: "The TCP/UDP port that will be used by the bootstrap node"
|
desc: "The TCP/UDP port that will be used by the bootstrap node"
|
||||||
defaultValue: config.defaultPort().}: int
|
defaultValue: defaultPort .}: int
|
||||||
|
|
||||||
genesisOffset* {.
|
genesisOffset* {.
|
||||||
desc: "Seconds from now to add to genesis time"
|
desc: "Seconds from now to add to genesis time"
|
||||||
|
@ -137,9 +140,6 @@ proc defaultDataDir*(conf: BeaconNodeConf): string =
|
||||||
|
|
||||||
getHomeDir() / dataDir / "BeaconNode" / networkDir
|
getHomeDir() / dataDir / "BeaconNode" / networkDir
|
||||||
|
|
||||||
proc defaultPort*(conf: BeaconNodeConf): int =
|
|
||||||
(if conf.network == "testnet0": 9630 else: 9632) + ord(useRLPx)
|
|
||||||
|
|
||||||
proc validatorFileBaseName*(validatorIdx: int): string =
|
proc validatorFileBaseName*(validatorIdx: int): string =
|
||||||
# there can apparently be tops 4M validators so we use 7 digits..
|
# there can apparently be tops 4M validators so we use 7 digits..
|
||||||
fmt"v{validatorIdx:07}"
|
fmt"v{validatorIdx:07}"
|
||||||
|
|
|
@ -40,6 +40,7 @@ regenTestnetFiles() {
|
||||||
--outputGenesis=$NETWORK_DIR/genesis.json \
|
--outputGenesis=$NETWORK_DIR/genesis.json \
|
||||||
--outputNetwork=$NETWORK_DIR/$NETWORK_FLAVOUR-network.json \
|
--outputNetwork=$NETWORK_DIR/$NETWORK_FLAVOUR-network.json \
|
||||||
--bootstrapAddress=$PUBLIC_IP \
|
--bootstrapAddress=$PUBLIC_IP \
|
||||||
|
--bootstrapPort=$BOOTSTRAP_PORT \
|
||||||
--genesisOffset=600 # Delay in seconds
|
--genesisOffset=600 # Delay in seconds
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,5 @@ SHARD_COUNT=8
|
||||||
SLOTS_PER_EPOCH=8
|
SLOTS_PER_EPOCH=8
|
||||||
VALIDATOR_COUNT=400
|
VALIDATOR_COUNT=400
|
||||||
FIRST_USER_VALIDATOR=340
|
FIRST_USER_VALIDATOR=340
|
||||||
|
BOOTSTRAP_PORT=9000
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,5 @@ SHARD_COUNT=128
|
||||||
SLOTS_PER_EPOCH=64
|
SLOTS_PER_EPOCH=64
|
||||||
VALIDATOR_COUNT=20000
|
VALIDATOR_COUNT=20000
|
||||||
FIRST_USER_VALIDATOR=19000
|
FIRST_USER_VALIDATOR=19000
|
||||||
|
BOOTSTRAP_PORT=9100
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue