From 74dd254158ca474d99a1f0f093dad934e5cb5c7c Mon Sep 17 00:00:00 2001 From: Giovanni Petrantoni Date: Wed, 8 Jul 2020 16:08:19 +0900 Subject: [PATCH] Fix gossip messages seqno according to spec --- libp2p/peerinfo.nim | 1 + libp2p/protocols/pubsub/rpc/message.nim | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libp2p/peerinfo.nim b/libp2p/peerinfo.nim index b885714d9..c37802c1a 100644 --- a/libp2p/peerinfo.nim +++ b/libp2p/peerinfo.nim @@ -39,6 +39,7 @@ type privateKey*: PrivateKey of HasPublic: key: Option[PublicKey] + seqno*: uint64 proc id*(p: PeerInfo): string = if not(isNil(p)): diff --git a/libp2p/protocols/pubsub/rpc/message.nim b/libp2p/protocols/pubsub/rpc/message.nim index d203035d4..3cb16bf96 100644 --- a/libp2p/protocols/pubsub/rpc/message.nim +++ b/libp2p/protocols/pubsub/rpc/message.nim @@ -19,6 +19,7 @@ import messages, protobuf, ../../../peerinfo, ../../../crypto/crypto, ../../../protobuf/minprotobuf +import stew/endians2 logScope: topics = "pubsubmessage" @@ -63,13 +64,12 @@ proc init*( topic: string, sign: bool = true): Message {.gcsafe, raises: [CatchableError, Defect].} = var seqno: seq[byte] = newSeq[byte](8) - if randomBytes(addr seqno[0], 8) <= 0: - raise (ref CatchableError)(msg: "Cannot get randomness for message") - + # peer is a ref obj + inc p.seqno result = Message( fromPeer: p.peerId, data: data, - seqno: seqno, + seqno: @(p.seqno.toBytesBE), # unefficient, fine for now topicIDs: @[topic]) if sign and p.publicKey.isSome: