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

Adjust version check (disabled) and don't pass unsupported RateLimits

This commit is contained in:
kdeme 2020-02-13 13:05:10 +01:00 committed by zah
parent 31a4e8f959
commit 1fcac8b30d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eth/p2p/rlpx_protocols/waku_protocol.nim
View File

@ -78,7 +78,7 @@ type
isLightNode*: bool isLightNode*: bool
maxMsgSize*: uint32 maxMsgSize*: uint32
confirmationsEnabled*: bool confirmationsEnabled*: bool
rateLimits*: RateLimits rateLimits*: Option[RateLimits]
topics*: Option[seq[Topic]] topics*: Option[seq[Topic]]
WakuPeer = ref object WakuPeer = ref object
@ -224,12 +224,10 @@ proc initProtocolState*(network: WakuNetwork, node: EthereumNode) {.gcsafe.} =
network.config.bloom = fullBloom() network.config.bloom = fullBloom()
network.config.powRequirement = defaultMinPow network.config.powRequirement = defaultMinPow
network.config.isLightNode = false network.config.isLightNode = false
# confirmationsEnabled and rateLimits is not yet used but we add it here and # RateLimits and confirmations are not yet implemented so we set confirmations
# in the status message to be compatible with the Status go implementation. # to false and we don't pass RateLimits at all.
network.config.confirmationsEnabled = false network.config.confirmationsEnabled = false
# TODO: Limits of 0 are ignored I hope, this is not clearly written in spec. network.config.rateLimits = none(RateLimits)
network.config.rateLimits =
RateLimits(limitIp: 0, limitPeerId: 0, limitTopic:0)
network.config.maxMsgSize = defaultMaxMsgSize network.config.maxMsgSize = defaultMaxMsgSize
network.config.topics = none(seq[Topic]) network.config.topics = none(seq[Topic])
asyncCheck node.run(network) asyncCheck node.run(network)
@ -250,16 +248,21 @@ p2pProtocol Waku(version = wakuVersion,
bloomFilter: some(wakuNet.config.bloom), bloomFilter: some(wakuNet.config.bloom),
lightNode: some(wakuNet.config.isLightNode), lightNode: some(wakuNet.config.isLightNode),
confirmationsEnabled: some(wakuNet.config.confirmationsEnabled), confirmationsEnabled: some(wakuNet.config.confirmationsEnabled),
rateLimits: some(wakuNet.config.rateLimits), rateLimits: wakuNet.config.rateLimits,
topicInterest: wakuNet.config.topics) topicInterest: wakuNet.config.topics)
let m = await peer.status(wakuVersion, list, let m = await peer.status(wakuVersion, list,
timeout = chronos.milliseconds(5000)) timeout = chronos.milliseconds(5000))
if m.protocolVersion == wakuVersion: debug "Waku peer", peer, wakuVersion, peerWakuVersion = m.protocolVersion
debug "Waku peer", peer, wakuVersion # TODO: Can't do this check yet as current version is 0. Can activate this
else: # code on version 1.
raise newException(UselessPeerError, "Incompatible Waku version") # if m.protocolVersion >= wakuVersion:
# # Continue if the version is the same or higher
# debug "Waku peer", peer, wakuVersion, peerWakuVersion = m.protocolVersion
# else:
# # This node needs to decide if compatibility remains with lower versions
# raise newException(UselessPeerError, "Incompatible Waku version")
wakuPeer.powRequirement = m.list.powRequirement.get(defaultMinPow) wakuPeer.powRequirement = m.list.powRequirement.get(defaultMinPow)
wakuPeer.bloom = m.list.bloomFilter.get(fullBloom()) wakuPeer.bloom = m.list.bloomFilter.get(fullBloom())