status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix libnimbus compilation error due to nim-eth changes

This commit is contained in:
jangko 2020-07-20 17:03:20 +07:00
parent 9ee04efca4
commit 45bbf65470
No known key found for this signature in database
GPG Key ID: 31702AE10541E6B9
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wrappers/libnimbus.nim
View File

@ -11,7 +11,8 @@ import
chronos, chronicles, nimcrypto/[utils, hmac, pbkdf2, hash, sysrand], tables, chronos, chronicles, nimcrypto/[utils, hmac, pbkdf2, hash, sysrand], tables,
stew/ranges/ptr_arith, eth/[keys, rlp, p2p, async_utils], stew/ranges/ptr_arith, eth/[keys, rlp, p2p, async_utils],
eth/p2p/rlpx_protocols/whisper_protocol, eth/p2p/rlpx_protocols/whisper_protocol,
eth/p2p/[peer_pool, bootnodes, whispernodes], ../nimbus/rpc/key_storage eth/p2p/[peer_pool, bootnodes, whispernodes], ../nimbus/rpc/key_storage,
../nimbus/random_keys
# TODO: lots of overlap with Nimbus Whisper RPC here, however not all # TODO: lots of overlap with Nimbus Whisper RPC here, however not all
# the same due to type conversion (no use of Option and such). Perhaps some # the same due to type conversion (no use of Option and such). Perhaps some
@ -24,7 +25,7 @@ type
CReceivedMessage* = object CReceivedMessage* = object
decoded*: ptr byte decoded*: ptr byte
decodedLen*: csize decodedLen*: int # csize_t
source*: ptr byte source*: ptr byte
recipientPublicKey*: ptr byte recipientPublicKey*: ptr byte
timestamp*: uint32 timestamp*: uint32
@ -48,9 +49,9 @@ type
ttl*: uint32 ttl*: uint32
topic*: Topic topic*: Topic
payload*: ptr byte payload*: ptr byte
payloadLen*: csize payloadLen*: int # csize_t
padding*: ptr byte padding*: ptr byte
paddingLen*: csize paddingLen*: int # csize_t
powTime*: float64 powTime*: float64
powTarget*: float64 powTarget*: float64
@ -93,11 +94,12 @@ proc nimbus_start(port: uint16, startListening: bool, enableDiscovery: bool,
var keypair: KeyPair var keypair: KeyPair
if privateKey.isNil: if privateKey.isNil:
var kp = KeyPair.random() #var kp = KeyPair.random()
if kp.isErr: #if kp.isErr:
error "Can't generate keypair", err = kp.error #error "Can't generate keypair", err = kp.error
return false #return false
keypair = kp[] #keypair = kp[]
keypair = randomKeyPair()
else: else:
let let
privKey = PrivateKey.fromRaw(makeOpenArray(privateKey, 32)) privKey = PrivateKey.fromRaw(makeOpenArray(privateKey, 32))
@ -165,7 +167,7 @@ proc nimbus_new_keypair(id: var Identifier): bool
id = generateRandomID() id = generateRandomID()
try: try:
whisperKeys.asymKeys.add(id.toHex(), KeyPair.random().tryGet()) whisperKeys.asymKeys.add(id.toHex(), randomKeyPair())
result = true result = true
except CatchableError: except CatchableError:
# Don't think this can actually happen, comes from the `getPublicKey` part # Don't think this can actually happen, comes from the `getPublicKey` part
@ -180,11 +182,12 @@ proc nimbus_add_keypair(privateKey: ptr byte, id: var Identifier):
var keypair: KeyPair var keypair: KeyPair
if privateKey.isNil: if privateKey.isNil:
var kp = KeyPair.random() #var kp = KeyPair.random()
if kp.isErr: #if kp.isErr:
error "Can't generate keypair", err = kp.error #error "Can't generate keypair", err = kp.error
return false #return false
keypair = kp[] #keypair = kp[]
keypair = randomKeyPair()
else: else:
let let
privKey = PrivateKey.fromRaw(makeOpenArray(privateKey, 32)) privKey = PrivateKey.fromRaw(makeOpenArray(privateKey, 32))
@ -373,7 +376,7 @@ proc nimbus_subscribe_filter(options: ptr CFilterOptions,
proc c_handler(msg: ReceivedMessage) {.gcsafe.} = proc c_handler(msg: ReceivedMessage) {.gcsafe.} =
var cmsg = CReceivedMessage( var cmsg = CReceivedMessage(
decoded: unsafeAddr msg.decoded.payload[0], decoded: unsafeAddr msg.decoded.payload[0],
decodedLen: csize msg.decoded.payload.len(), decodedLen: msg.decoded.payload.len(),
timestamp: msg.timestamp, timestamp: msg.timestamp,
ttl: msg.ttl, ttl: msg.ttl,
topic: msg.topic, topic: msg.topic,
@ -451,7 +454,7 @@ proc nimbus_join_public_chat(channel: cstring,
proc c_handler(msg: ReceivedMessage) = proc c_handler(msg: ReceivedMessage) =
var cmsg = CReceivedMessage( var cmsg = CReceivedMessage(
decoded: unsafeAddr msg.decoded.payload[0], decoded: unsafeAddr msg.decoded.payload[0],
decodedLen: csize msg.decoded.payload.len(), decodedLen: msg.decoded.payload.len(),
timestamp: msg.timestamp, timestamp: msg.timestamp,
ttl: msg.ttl, ttl: msg.ttl,
topic: msg.topic, topic: msg.topic,