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

Use discv5's maxDiscv5TalkRespPayload const for payload size calc (#2643)

This commit is contained in:
Kim De Mey 2024-09-19 20:30:10 +02:00 committed by GitHub
parent a9ad10cadc
commit c77c6239b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fluffy/network/wire/portal_protocol.nim
View File

@ -116,19 +116,6 @@ const
## value in milliseconds ## value in milliseconds
initialLookups = 1 ## Amount of lookups done when populating the routing table initialLookups = 1 ## Amount of lookups done when populating the routing table
# TalkResp message is a response message so the session is established and a
# regular discv5 packet is assumed for size calculation.
# Regular message = IV + header + message
# talkResp message = rlp: [request-id, response]
talkRespOverhead =
16 + # IV size
55 + # header size
1 + # talkResp msg id
3 + # rlp encoding outer list, max length will be encoded in 2 bytes
9 + # request id (max = 8) + 1 byte from rlp encoding byte string
3 + # rlp encoding response byte string, max length in 2 bytes
16 # HMAC
# These are the concurrent offers per Portal wire protocol that is running. # These are the concurrent offers per Portal wire protocol that is running.
# Using the `offerQueue` allows for limiting the amount of offers send and # Using the `offerQueue` allows for limiting the amount of offers send and
# thus how many streams can be started. # thus how many streams can be started.
@ -385,7 +372,7 @@ proc handleFindNodes(p: PortalProtocol, fn: FindNodesMessage): seq[byte] =
# will still be passed. # will still be passed.
const const
nodesOverhead = 1 + 1 + 4 # msg id + total + container offset nodesOverhead = 1 + 1 + 4 # msg id + total + container offset
maxPayloadSize = maxDiscv5PacketSize - talkRespOverhead - nodesOverhead maxPayloadSize = maxDiscv5TalkRespPayload - nodesOverhead
enrOverhead = 4 # per added ENR, 4 bytes offset overhead enrOverhead = 4 # per added ENR, 4 bytes offset overhead
let enrs = truncateEnrs(nodes, maxPayloadSize, enrOverhead) let enrs = truncateEnrs(nodes, maxPayloadSize, enrOverhead)
@ -402,7 +389,7 @@ proc handleFindContent(
): seq[byte] = ): seq[byte] =
const const
contentOverhead = 1 + 1 # msg id + SSZ Union selector contentOverhead = 1 + 1 # msg id + SSZ Union selector
maxPayloadSize = maxDiscv5PacketSize - talkRespOverhead - contentOverhead maxPayloadSize = maxDiscv5TalkRespPayload - contentOverhead
enrOverhead = 4 # per added ENR, 4 bytes offset overhead enrOverhead = 4 # per added ENR, 4 bytes offset overhead
let contentId = p.toContentId(fc.contentKey).valueOr: let contentId = p.toContentId(fc.contentKey).valueOr:

2
vendor/nim-eth vendored

@ -1 +1 @@
Subproject commit 4eecab27efb6a743098632024505474d34a65e9b Subproject commit aa1e738a97d1995c1ddb821123e4842409218b0c