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

bump libp2p: seq[byte] message IDs and improve reject/ignore handling (#1898) 

* bump libp2p: use seq[byte] message IDs and improve reject/ignore handling

* bump libp2p to pick up debug message details
This commit is contained in:
tersec 2020-10-21 20:03:12 +00:00 committed by GitHub
parent 9810a31447
commit decfd66a78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
beacon_chain/eth2_network.nim
View File

@ -1361,7 +1361,7 @@ proc getPersistentNetKeys*(rng: var BrHmacDrbgContext,
let privKey = res.get() let privKey = res.get()
return KeyPair(seckey: privKey, pubkey: privkey.getKey().tryGet()) return KeyPair(seckey: privKey, pubkey: privkey.getKey().tryGet())
func gossipId(data: openArray[byte]): string = func gossipId(data: openArray[byte]): seq[byte] =
# https://github.com/ethereum/eth2.0-specs/blob/v1.0.0-rc.0/specs/phase0/p2p-interface.md#topics-and-messages # https://github.com/ethereum/eth2.0-specs/blob/v1.0.0-rc.0/specs/phase0/p2p-interface.md#topics-and-messages
# We don't use non-Snappy-compressed messages, so don't define # We don't use non-Snappy-compressed messages, so don't define
# MESSAGE_DOMAIN_INVALID_SNAPPY. # MESSAGE_DOMAIN_INVALID_SNAPPY.
@ -1370,9 +1370,10 @@ func gossipId(data: openArray[byte]): string =
h.update uint_to_bytes4(MESSAGE_DOMAIN_VALID_SNAPPY) h.update uint_to_bytes4(MESSAGE_DOMAIN_VALID_SNAPPY)
h.update data h.update data
string.fromBytes(messageDigest.data.toOpenArray(0, 19)) result = newSeq[byte](20)
result[0..19] = messageDigest.data.toOpenArray(0, 19)
func msgIdProvider(m: messages.Message): string = func msgIdProvider(m: messages.Message): seq[byte] =
gossipId(m.data) gossipId(m.data)
proc createEth2Node*(rng: ref BrHmacDrbgContext, proc createEth2Node*(rng: ref BrHmacDrbgContext,
@ -1467,4 +1468,4 @@ proc broadcast*(node: Eth2Node, topic: string, msg: auto) =
let let
data = snappy.encode(SSZ.encode(msg)) data = snappy.encode(SSZ.encode(msg))
var futSnappy = node.pubsub.publish(topic & "_snappy", data) var futSnappy = node.pubsub.publish(topic & "_snappy", data)
traceMessage(futSnappy, gossipId(data)) traceMessage(futSnappy, string.fromBytes(gossipId(data)))

2
vendor/nim-libp2p vendored

@ -1 +1 @@
Subproject commit 9c58356823dd47591bdd1a0df17345fca16d6719 Subproject commit eeaa62feecf7717859cc2a65d93ff4165a0764c4