The RPC service listens on localhost by default
This commit is contained in:
parent
d589cb7964
commit
d2b7ee27de
|
@ -363,7 +363,7 @@ proc sendAttestation(node: BeaconNode,
|
||||||
node.network.broadcast(
|
node.network.broadcast(
|
||||||
getAttestationTopic(attestationData.index), attestation)
|
getAttestationTopic(attestationData.index), attestation)
|
||||||
|
|
||||||
if node.config.dump:
|
if node.config.dumpEnabled:
|
||||||
SSZ.saveFile(
|
SSZ.saveFile(
|
||||||
node.config.dumpDir / "att-" & $attestationData.slot & "-" &
|
node.config.dumpDir / "att-" & $attestationData.slot & "-" &
|
||||||
$attestationData.index & "-" & validator.pubKey.shortLog &
|
$attestationData.index & "-" & validator.pubKey.shortLog &
|
||||||
|
@ -444,7 +444,7 @@ proc proposeBlock(node: BeaconNode,
|
||||||
validator = shortLog(validator),
|
validator = shortLog(validator),
|
||||||
cat = "consensus"
|
cat = "consensus"
|
||||||
|
|
||||||
if node.config.dump:
|
if node.config.dumpEnabled:
|
||||||
SSZ.saveFile(
|
SSZ.saveFile(
|
||||||
node.config.dumpDir / "block-" & $newBlock.message.slot & "-" &
|
node.config.dumpDir / "block-" & $newBlock.message.slot & "-" &
|
||||||
shortLog(newBlockRef.root) & ".ssz", newBlock)
|
shortLog(newBlockRef.root) & ".ssz", newBlock)
|
||||||
|
|
|
@ -60,34 +60,6 @@ type
|
||||||
desc: "Address of the deposit contract."
|
desc: "Address of the deposit contract."
|
||||||
name: "deposit-contract" }: string
|
name: "deposit-contract" }: string
|
||||||
|
|
||||||
statusBarEnabled* {.
|
|
||||||
defaultValue: true
|
|
||||||
desc: "Display a status bar at the bottom of the terminal screen."
|
|
||||||
name: "status-bar" }: bool
|
|
||||||
|
|
||||||
statusBarContents* {.
|
|
||||||
defaultValue: "peers: $connected_peers; " &
|
|
||||||
"epoch: $epoch, slot: $epoch_slot/$slots_per_epoch ($slot); " &
|
|
||||||
"finalized epoch: $last_finalized_epoch |" &
|
|
||||||
"ETH: $attached_validators_balance"
|
|
||||||
desc: "Textual template for the contents of the status bar."
|
|
||||||
name: "status-bar-contents" }: string
|
|
||||||
|
|
||||||
rpcEnabled* {.
|
|
||||||
defaultValue: false
|
|
||||||
desc: "Enable the JSON-RPC server"
|
|
||||||
name: "rpc" }: bool
|
|
||||||
|
|
||||||
rpcPort* {.
|
|
||||||
defaultValue: defaultEth2RpcPort
|
|
||||||
desc: "HTTP port for the JSON-RPC service."
|
|
||||||
name: "rpc-port" }: Port
|
|
||||||
|
|
||||||
rpcAddress* {.
|
|
||||||
defaultValue: defaultListenAddress(config)
|
|
||||||
desc: "Listening address of the RPC server"
|
|
||||||
name: "rpc-address" }: IpAddress
|
|
||||||
|
|
||||||
case cmd* {.
|
case cmd* {.
|
||||||
command
|
command
|
||||||
defaultValue: noCommand }: StartUpCmd
|
defaultValue: noCommand }: StartUpCmd
|
||||||
|
@ -103,14 +75,19 @@ type
|
||||||
desc: "Specifies a line-delimited file of bootsrap Ethereum network addresses."
|
desc: "Specifies a line-delimited file of bootsrap Ethereum network addresses."
|
||||||
name: "bootstrap-file" }: InputFile
|
name: "bootstrap-file" }: InputFile
|
||||||
|
|
||||||
|
libp2pAddress* {.
|
||||||
|
defaultValue: defaultListenAddress(config)
|
||||||
|
desc: "Listening address for the Ethereum LibP2P traffic."
|
||||||
|
name: "listen-address"}: IpAddress
|
||||||
|
|
||||||
tcpPort* {.
|
tcpPort* {.
|
||||||
defaultValue: defaultEth2TcpPort
|
defaultValue: defaultEth2TcpPort
|
||||||
desc: "TCP listening port."
|
desc: "Listening TCP port for Ethereum LibP2P traffic."
|
||||||
name: "tcp-port" }: Port
|
name: "tcp-port" }: Port
|
||||||
|
|
||||||
udpPort* {.
|
udpPort* {.
|
||||||
defaultValue: defaultEth2TcpPort
|
defaultValue: defaultEth2TcpPort
|
||||||
desc: "UDP listening port."
|
desc: "Listening UDP port for node discovery."
|
||||||
name: "udp-port" }: Port
|
name: "udp-port" }: Port
|
||||||
|
|
||||||
maxPeers* {.
|
maxPeers* {.
|
||||||
|
@ -156,7 +133,7 @@ type
|
||||||
name: "metrics" }: bool
|
name: "metrics" }: bool
|
||||||
|
|
||||||
metricsAddress* {.
|
metricsAddress* {.
|
||||||
defaultValue: defaultListenAddress(config)
|
defaultValue: defaultAdminListenAddress(config)
|
||||||
desc: "Listening address of the metrics server."
|
desc: "Listening address of the metrics server."
|
||||||
name: "metrics-address" }: IpAddress
|
name: "metrics-address" }: IpAddress
|
||||||
|
|
||||||
|
@ -165,10 +142,38 @@ type
|
||||||
desc: "Listening HTTP port of the metrics server."
|
desc: "Listening HTTP port of the metrics server."
|
||||||
name: "metrics-port" }: Port
|
name: "metrics-port" }: Port
|
||||||
|
|
||||||
dump* {.
|
statusBarEnabled* {.
|
||||||
|
defaultValue: true
|
||||||
|
desc: "Display a status bar at the bottom of the terminal screen."
|
||||||
|
name: "status-bar" }: bool
|
||||||
|
|
||||||
|
statusBarContents* {.
|
||||||
|
defaultValue: "peers: $connected_peers; " &
|
||||||
|
"epoch: $epoch, slot: $epoch_slot/$slots_per_epoch ($slot); " &
|
||||||
|
"finalized epoch: $last_finalized_epoch |" &
|
||||||
|
"ETH: $attached_validators_balance"
|
||||||
|
desc: "Textual template for the contents of the status bar."
|
||||||
|
name: "status-bar-contents" }: string
|
||||||
|
|
||||||
|
rpcEnabled* {.
|
||||||
|
defaultValue: false
|
||||||
|
desc: "Enable the JSON-RPC server"
|
||||||
|
name: "rpc" }: bool
|
||||||
|
|
||||||
|
rpcPort* {.
|
||||||
|
defaultValue: defaultEth2RpcPort
|
||||||
|
desc: "HTTP port for the JSON-RPC service."
|
||||||
|
name: "rpc-port" }: Port
|
||||||
|
|
||||||
|
rpcAddress* {.
|
||||||
|
defaultValue: defaultAdminListenAddress(config)
|
||||||
|
desc: "Listening address of the RPC server"
|
||||||
|
name: "rpc-address" }: IpAddress
|
||||||
|
|
||||||
|
dumpEnabled* {.
|
||||||
defaultValue: false
|
defaultValue: false
|
||||||
desc: "Write SSZ dumps of blocks, attestations and states to data dir"
|
desc: "Write SSZ dumps of blocks, attestations and states to data dir"
|
||||||
.}: bool
|
name: "dump" }: bool
|
||||||
|
|
||||||
of createTestnet:
|
of createTestnet:
|
||||||
validatorsDir* {.
|
validatorsDir* {.
|
||||||
|
@ -289,6 +294,9 @@ func defaultListenAddress*(conf: BeaconNodeConf): IpAddress =
|
||||||
# Maybe there should be a config option for this.
|
# Maybe there should be a config option for this.
|
||||||
parseIpAddress("0.0.0.0")
|
parseIpAddress("0.0.0.0")
|
||||||
|
|
||||||
|
func defaultAdminListenAddress*(conf: BeaconNodeConf): IpAddress =
|
||||||
|
parseIpAddress("127.0.0.1")
|
||||||
|
|
||||||
iterator validatorKeys*(conf: BeaconNodeConf): ValidatorPrivKey =
|
iterator validatorKeys*(conf: BeaconNodeConf): ValidatorPrivKey =
|
||||||
for validatorKeyFile in conf.validators:
|
for validatorKeyFile in conf.validators:
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -141,7 +141,7 @@ when networkBackend in [libp2p, libp2pDaemon]:
|
||||||
bootstrapNodes: seq[ENode]): Future[Eth2Node] {.async.} =
|
bootstrapNodes: seq[ENode]): Future[Eth2Node] {.async.} =
|
||||||
var
|
var
|
||||||
(extIp, extTcpPort, _) = setupNat(conf)
|
(extIp, extTcpPort, _) = setupNat(conf)
|
||||||
hostAddress = tcpEndPoint(globalListeningAddr, conf.tcpPort)
|
hostAddress = tcpEndPoint(conf.libp2pAddress, conf.tcpPort)
|
||||||
announcedAddresses = if extIp == globalListeningAddr: @[]
|
announcedAddresses = if extIp == globalListeningAddr: @[]
|
||||||
else: @[tcpEndPoint(extIp, extTcpPort)]
|
else: @[tcpEndPoint(extIp, extTcpPort)]
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,7 @@ cli do (skipGoerliKey {.
|
||||||
mode = Verbose
|
mode = Verbose
|
||||||
execIgnoringExitCode replace(&"""{beaconNodeBinary}
|
execIgnoringExitCode replace(&"""{beaconNodeBinary}
|
||||||
--data-dir="{dataDir}"
|
--data-dir="{dataDir}"
|
||||||
--dump=true
|
--dump
|
||||||
--web3-url={web3Url}
|
--web3-url={web3Url}
|
||||||
{bootstrapFileOpt}
|
{bootstrapFileOpt}
|
||||||
{logLevelOpt}
|
{logLevelOpt}
|
||||||
|
|
Loading…
Reference in New Issue