parent
a2e28bef27
commit
1d709c09f4
|
@ -67,7 +67,7 @@ proc main() {.async.} =
|
||||||
let cfg = CliConfig.load()
|
let cfg = CliConfig.load()
|
||||||
let web3 = await newWeb3(cfg.web3Url)
|
let web3 = await newWeb3(cfg.web3Url)
|
||||||
if cfg.privateKey.len != 0:
|
if cfg.privateKey.len != 0:
|
||||||
web3.privateKey = PrivateKey.fromHex(cfg.privateKey)[]
|
web3.privateKey = some(PrivateKey.fromHex(cfg.privateKey)[])
|
||||||
else:
|
else:
|
||||||
let accounts = await web3.provider.eth_accounts()
|
let accounts = await web3.provider.eth_accounts()
|
||||||
doAssert(accounts.len > 0)
|
doAssert(accounts.len > 0)
|
||||||
|
|
|
@ -75,7 +75,7 @@ proc loadBootstrapFile*(bootstrapFile: string,
|
||||||
proc new*(T: type Eth2DiscoveryProtocol,
|
proc new*(T: type Eth2DiscoveryProtocol,
|
||||||
conf: BeaconNodeConf,
|
conf: BeaconNodeConf,
|
||||||
ip: Option[ValidIpAddress], tcpPort, udpPort: Port,
|
ip: Option[ValidIpAddress], tcpPort, udpPort: Port,
|
||||||
rawPrivKeyBytes: openarray[byte],
|
pk: PrivateKey,
|
||||||
enrFields: openarray[(string, seq[byte])]):
|
enrFields: openarray[(string, seq[byte])]):
|
||||||
T {.raises: [Exception, Defect].} =
|
T {.raises: [Exception, Defect].} =
|
||||||
# TODO
|
# TODO
|
||||||
|
@ -83,8 +83,7 @@ proc new*(T: type Eth2DiscoveryProtocol,
|
||||||
# * for setting up a specific key
|
# * for setting up a specific key
|
||||||
# * for using a persistent database
|
# * for using a persistent database
|
||||||
let
|
let
|
||||||
pk = PrivateKey.fromRaw(rawPrivKeyBytes).expect("Valid private key")
|
ourPubKey = pk.toPublicKey()
|
||||||
ourPubKey = pk.toPublicKey().expect("Public key from valid private key")
|
|
||||||
# TODO: `newMemoryDB()` causes raises: [Exception]
|
# TODO: `newMemoryDB()` causes raises: [Exception]
|
||||||
db = DiscoveryDB.init(newMemoryDB())
|
db = DiscoveryDB.init(newMemoryDB())
|
||||||
|
|
||||||
|
|
|
@ -809,7 +809,7 @@ proc init*(T: type Eth2Node, conf: BeaconNodeConf, enrForkId: ENRForkID,
|
||||||
result.metadata = getPersistentNetMetadata(conf)
|
result.metadata = getPersistentNetMetadata(conf)
|
||||||
result.forkId = enrForkId
|
result.forkId = enrForkId
|
||||||
result.discovery = Eth2DiscoveryProtocol.new(
|
result.discovery = Eth2DiscoveryProtocol.new(
|
||||||
conf, ip, tcpPort, udpPort, privKey.toRaw,
|
conf, ip, tcpPort, udpPort, privKey,
|
||||||
{"eth2": SSZ.encode(result.forkId), "attnets": SSZ.encode(result.metadata.attnets)})
|
{"eth2": SSZ.encode(result.forkId), "attnets": SSZ.encode(result.metadata.attnets)})
|
||||||
|
|
||||||
newSeq result.protocolStates, allProtocols.len
|
newSeq result.protocolStates, allProtocols.len
|
||||||
|
@ -822,7 +822,7 @@ proc init*(T: type Eth2Node, conf: BeaconNodeConf, enrForkId: ENRForkID,
|
||||||
msg.protocolMounter result
|
msg.protocolMounter result
|
||||||
|
|
||||||
template publicKey*(node: Eth2Node): keys.PublicKey =
|
template publicKey*(node: Eth2Node): keys.PublicKey =
|
||||||
node.discovery.privKey.toPublicKey.tryGet()
|
node.discovery.privKey.toPublicKey
|
||||||
|
|
||||||
template addKnownPeer*(node: Eth2Node, peer: enr.Record) =
|
template addKnownPeer*(node: Eth2Node, peer: enr.Record) =
|
||||||
node.discovery.addNode peer
|
node.discovery.addNode peer
|
||||||
|
|
|
@ -164,7 +164,7 @@ proc sendDeposits*(deposits: seq[Deposit],
|
||||||
delayGenerator: DelayGenerator = nil) {.async.} =
|
delayGenerator: DelayGenerator = nil) {.async.} =
|
||||||
var web3 = await newWeb3(web3Url)
|
var web3 = await newWeb3(web3Url)
|
||||||
if privateKey.len != 0:
|
if privateKey.len != 0:
|
||||||
web3.privateKey = PrivateKey.fromHex(privateKey).tryGet
|
web3.privateKey = some(PrivateKey.fromHex(privateKey).tryGet)
|
||||||
else:
|
else:
|
||||||
let accounts = await web3.provider.eth_accounts()
|
let accounts = await web3.provider.eth_accounts()
|
||||||
if accounts.len == 0:
|
if accounts.len == 0:
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5c6d8ccb3624ebbdb5f277677850879e21a88d9a
|
Subproject commit 61feae0f21d49f102e1e0252f3559b600ff54a69
|
|
@ -1 +1 @@
|
||||||
Subproject commit b99fd88deb18c6e4c2b06b1faa3c5d5729be52a0
|
Subproject commit 6331b04cb494d4140ea1b96c84ad23cec96910ef
|
|
@ -1 +1 @@
|
||||||
Subproject commit e8fa92a0c6217103eecce2a9e6f274c7eedac13b
|
Subproject commit be989635994377e0e421e4a039230098ba5ccd28
|
|
@ -1 +1 @@
|
||||||
Subproject commit 05f2a17ba444433d615c5b3d0e1a1de0b0beae65
|
Subproject commit 4889e41a1ca74dba5a85622e5dbf50547bec08f2
|
Loading…
Reference in New Issue