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 bloom filter of a new Waku/Whisper filter and update automatically for light node

This commit is contained in:
kdeme 2020-01-14 18:28:00 +01:00 committed by zah
parent d15286032d
commit 6e4b73b562
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nimbus/rpc/waku.nim
View File

@ -250,37 +250,51 @@ proc setupWakuRPC*(node: EthereumNode, keys: WhisperKeys, rpcsrv: RpcServer) =
# Check if there are Topics when symmetric key is used # Check if there are Topics when symmetric key is used
validateOptions(options.privateKeyID, options.symKeyID, options.topics) validateOptions(options.privateKeyID, options.symKeyID, options.topics)
var filter: Filter var
src: Option[PublicKey]
privateKey: Option[PrivateKey]
symKey: Option[SymKey]
topics: seq[waku_protocol.Topic]
powReq: float64
allowP2P: bool
src = options.sig
if options.privateKeyID.isSome(): if options.privateKeyID.isSome():
filter.privateKey = some(keys.asymKeys[options.privateKeyID.get().string].seckey) privateKey = some(keys.asymKeys[options.privateKeyID.get().string].seckey)
if options.symKeyID.isSome(): if options.symKeyID.isSome():
filter.symKey= some(keys.symKeys[options.symKeyID.get().string]) symKey= some(keys.symKeys[options.symKeyID.get().string])
filter.src = options.sig
if options.minPow.isSome(): if options.minPow.isSome():
filter.powReq = options.minPow.get() powReq = options.minPow.get()
if options.topics.isSome(): if options.topics.isSome():
filter.topics = options.topics.get() topics = options.topics.get()
if options.allowP2P.isSome(): if options.allowP2P.isSome():
filter.allowP2P = options.allowP2P.get() allowP2P = options.allowP2P.get()
let filter = newFilter(src, privateKey, symKey, topics, powReq, allowP2P)
result = node.subscribeFilter(filter).Identifier result = node.subscribeFilter(filter).Identifier
# TODO: Should we do this here "automatically" or separate it in another # TODO: Should we do this here "automatically" or separate it in another
# RPC call? Is there a use case for that? # RPC call? Is there a use case for that?
# Same could be said about bloomfilter, except that there is a use case # Same could be said about bloomfilter, except that there is a use case
# there to have a full node no matter what message filters. # there to have a full node no matter what message filters.
# Could also be moved to waku_protocol.nim
let config = node.protocolState(Waku).config let config = node.protocolState(Waku).config
if config.wakuMode == WakuChan: if config.wakuMode == WakuChan:
try: try:
# TODO: an addTopics call would probably more useful # TODO: an addTopics call would probably be more useful
waitFor node.setTopics(config.topics.concat(filter.topics)) waitFor node.setTopics(config.topics.concat(filter.topics))
except CatchableError: except CatchableError:
trace "setTopics error occured" trace "setTopics error occured"
elif config.isLightNode:
try:
waitFor node.setBloomFilter(node.filtersToBloom())
except CatchableError:
trace "setBloomFilter error occured"
rpcsrv.rpc("shh_deleteMessageFilter") do(id: Identifier) -> bool: rpcsrv.rpc("shh_deleteMessageFilter") do(id: Identifier) -> bool:
## Uninstall a message filter in the node. ## Uninstall a message filter in the node.

24
nimbus/rpc/whisper.nim
View File

@ -251,24 +251,32 @@ proc setupWhisperRPC*(node: EthereumNode, keys: WhisperKeys, rpcsrv: RpcServer)
# Check if there are Topics when symmetric key is used # Check if there are Topics when symmetric key is used
validateOptions(options.privateKeyID, options.symKeyID, options.topics) validateOptions(options.privateKeyID, options.symKeyID, options.topics)
var filter: Filter var
src: Option[PublicKey]
privateKey: Option[PrivateKey]
symKey: Option[SymKey]
topics: seq[whisper_protocol.Topic]
powReq: float64
allowP2P: bool
src = options.sig
if options.privateKeyID.isSome(): if options.privateKeyID.isSome():
filter.privateKey = some(keys.asymKeys[options.privateKeyID.get().string].seckey) privateKey = some(keys.asymKeys[options.privateKeyID.get().string].seckey)
if options.symKeyID.isSome(): if options.symKeyID.isSome():
filter.symKey= some(keys.symKeys[options.symKeyID.get().string]) symKey= some(keys.symKeys[options.symKeyID.get().string])
filter.src = options.sig
if options.minPow.isSome(): if options.minPow.isSome():
filter.powReq = options.minPow.get() powReq = options.minPow.get()
if options.topics.isSome(): if options.topics.isSome():
filter.topics = options.topics.get() topics = options.topics.get()
if options.allowP2P.isSome(): if options.allowP2P.isSome():
filter.allowP2P = options.allowP2P.get() allowP2P = options.allowP2P.get()
let filter = newFilter(src, privateKey, symKey, topics, powReq, allowP2P)
result = node.subscribeFilter(filter).Identifier result = node.subscribeFilter(filter).Identifier
rpcsrv.rpc("shh_deleteMessageFilter") do(id: Identifier) -> bool: rpcsrv.rpc("shh_deleteMessageFilter") do(id: Identifier) -> bool: