waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-02-24 12:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify config to parse and use libp2p nodekey

Browse Source
This commit is contained in:
Oskar Thoren 2020-05-21 12:16:00 +08:00
parent 05922c8ebc
commit 3d69658dab
No known key found for this signature in database
GPG Key ID: B2ECCFD3BC2EF77E
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
waku/node/v2/config.nim
View File

@ -1,6 +1,8 @@
import
confutils/defs, chronicles, chronos,
eth/keys
libp2p/crypto/crypto,
libp2p/crypto/secp,
nimcrypto/utils
type
Fleet* = enum
@ -83,10 +85,13 @@ type
defaultValue: 0.002
name: "waku-pow" }: float64
# NOTE: Signature is different here, we return PrivateKey and not KeyPair
nodekey* {.
desc: "P2P node private key as hex.",
defaultValue: keys.KeyPair.random().tryGet()
name: "nodekey" }: KeyPair
# defaultValue: keys.KeyPair.random().tryGet()
# Use PrivateKey here instead
defaultValue: PrivateKey.random(Secp256k1)
name: "nodekey" }: PrivateKey
# TODO: Add nodekey file option
bootnodeOnly* {.
@ -133,15 +138,15 @@ type
# - discv5 + topic register
# - mailserver functionality
proc parseCmdArg*(T: type KeyPair, p: TaintedString): T =
# NOTE: Keys are different in nim-libp2p
proc parseCmdArg*(T: type PrivateKey, p: TaintedString): T =
try:
# TODO: add isValidPrivateKey check from Nimbus?
result.seckey = PrivateKey.fromHex(string(p)).tryGet()
result.pubkey = result.seckey.toPublicKey()[]
let key = SkPrivateKey.init(utils.fromHex(p))
result = PrivateKey(scheme: Secp256k1, skkey: key)
except CatchableError as e:
raise newException(ConfigurationError, "Invalid private key")
proc completeCmdArg*(T: type KeyPair, val: TaintedString): seq[string] =
proc completeCmdArg*(T: type PrivateKey, val: TaintedString): seq[string] =
return @[]
proc parseCmdArg*(T: type IpAddress, p: TaintedString): T =