diff --git a/apps/chat2/chat2.nim b/apps/chat2/chat2.nim index aa36300fc..647667b0c 100644 --- a/apps/chat2/chat2.nim +++ b/apps/chat2/chat2.nim @@ -544,7 +544,7 @@ proc processInput(rfd: AsyncFD, rng: crypto.Rng) {.async.} = epochSizeSec: conf.rlnEpochSizeSec, ) - waitFor node.mountRlnRelay(rlnConf, spamHandler = some(spamHandler)) + waitFor node.setRlnValidator(rlnConf, spamHandler = some(spamHandler)) let membershipIndex = node.rln.groupManager.membershipIndex.get() let identityCredential = node.rln.groupManager.idCredentials.get() diff --git a/apps/networkmonitor/networkmonitor.nim b/apps/networkmonitor/networkmonitor.nim index 2c0a5ca89..a23c778ef 100644 --- a/apps/networkmonitor/networkmonitor.nim +++ b/apps/networkmonitor/networkmonitor.nim @@ -619,7 +619,7 @@ when isMainModule: ) try: - waitFor node.mountRlnRelay(rlnConf) + waitFor node.setRlnValidator(rlnConf) except CatchableError: error "failed to setup RLN", error = getCurrentExceptionMsg() quit(QuitFailure) diff --git a/logos_delivery/waku/factory/node_factory.nim b/logos_delivery/waku/factory/node_factory.nim index 48a21aeb0..658a49e38 100644 --- a/logos_delivery/waku/factory/node_factory.nim +++ b/logos_delivery/waku/factory/node_factory.nim @@ -337,7 +337,7 @@ proc setupProtocols( ) try: - await node.mountRlnRelay(rlnConf) + await node.setRlnValidator(rlnConf) except CatchableError: return err("failed to mount waku RLN relay protocol: " & getCurrentExceptionMsg()) diff --git a/logos_delivery/waku/node/waku_node/relay.nim b/logos_delivery/waku/node/waku_node/relay.nim index 91744a3e6..c9947b237 100644 --- a/logos_delivery/waku/node/waku_node/relay.nim +++ b/logos_delivery/waku/node/waku_node/relay.nim @@ -185,7 +185,7 @@ proc mountRelay*( ## Waku RLN Relay -proc mountRlnRelay*( +proc setRlnValidator*( node: WakuNode, rlnConf: WakuRlnConfig, spamHandler = none(SpamHandler), @@ -230,6 +230,7 @@ proc mountRlnRelay*( shareY = inHex(msgProof.shareY) nullifier = inHex(msgProof.nullifier) payload = string.fromBytes(message.payload) + case validationRes of Valid: trace "message validity is verified, relaying", diff --git a/tests/node/test_wakunode_legacy_lightpush.nim b/tests/node/test_wakunode_legacy_lightpush.nim index 91be200f8..54cc0b6f6 100644 --- a/tests/node/test_wakunode_legacy_lightpush.nim +++ b/tests/node/test_wakunode_legacy_lightpush.nim @@ -128,7 +128,7 @@ suite "RLN Proofs as a Lightpush Service": (await server.mountRelay()).isOkOr: assert false, "Failed to mount relay" - await server.mountRlnRelay(wakuRlnConfig) + await server.setRlnValidator(wakuRlnConfig) check (await server.mountLegacyLightPush()).isOk() client.mountLegacyLightPushClient() diff --git a/tests/node/test_wakunode_lightpush.nim b/tests/node/test_wakunode_lightpush.nim index f5f8bdf45..6c28f5083 100644 --- a/tests/node/test_wakunode_lightpush.nim +++ b/tests/node/test_wakunode_lightpush.nim @@ -125,7 +125,7 @@ suite "RLN Proofs as a Lightpush Service": (await server.mountRelay()).isOkOr: assert false, "Failed to mount relay" - await server.mountRlnRelay(wakuRlnConfig) + await server.setRlnValidator(wakuRlnConfig) check (await server.mountLightPush()).isOk() client.mountLightPushClient() diff --git a/tests/node/test_wakunode_relay_rln.nim b/tests/node/test_wakunode_relay_rln.nim index c8aba49ee..34e09fe8e 100644 --- a/tests/node/test_wakunode_relay_rln.nim +++ b/tests/node/test_wakunode_relay_rln.nim @@ -93,7 +93,7 @@ proc setupRelayWithOnChainRln*( node: WakuNode, shards: seq[RelayShard], wakuRlnConfig: WakuRlnConfig ) {.async.} = await node.mountRelay(shards) - await node.mountRlnRelay(wakuRlnConfig) + await node.(wakuRlnConfig) suite "Waku RlnRelay - End to End - Static": var @@ -232,7 +232,7 @@ suite "Waku RlnRelay - End to End - Static": ) try: - await node.mountRlnRelay(wakuRlnConfig) + await node.setRlnValidator(wakuRlnConfig) except CatchableError as e: check e.msg == "failed to mount Rln: rln-relay-user-message-limit can't exceed the MAX_MESSAGE_LIMIT in the rln contract" diff --git a/tests/waku_relay/utils.nim b/tests/waku_relay/utils.nim index 8c5a6a184..eea37903d 100644 --- a/tests/waku_relay/utils.nim +++ b/tests/waku_relay/utils.nim @@ -36,7 +36,7 @@ proc newTestWakuRelay*(switch = newTestSwitch()): Future[WakuRelay] {.async.} = return proto proc setupRln*(node: WakuNode, identifier: uint) {.async.} = - await node.mountRlnRelay( + await node.setRlnValidator( WakuRlnConfig(dynamic: false, credIndex: some(identifier), epochSizeSec: 1) ) diff --git a/tests/waku_rln_relay/test_wakunode_rln_relay.nim b/tests/waku_rln_relay/test_wakunode_rln_relay.nim index 487d4a674..a92f5d3f8 100644 --- a/tests/waku_rln_relay/test_wakunode_rln_relay.nim +++ b/tests/waku_rln_relay/test_wakunode_rln_relay.nim @@ -52,7 +52,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig1 = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node1.mountRlnRelay(wakuRlnConfig1) + await node1.(wakuRlnConfig1) await node1.start() # Registration is mandatory before sending messages with rln-relay @@ -76,7 +76,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig2 = getWakuRlnConfig(manager = manager, index = MembershipIndex(2)) - await node2.mountRlnRelay(wakuRlnConfig2) + await node2.setRlnValidator(wakuRlnConfig2) await node2.start() let manager2 = cast[OnchainGroupManager](node2.rln.groupManager) @@ -94,7 +94,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig3 = getWakuRlnConfig(manager = manager, index = MembershipIndex(3)) - await node3.mountRlnRelay(wakuRlnConfig3) + await node3.setRlnValidator(wakuRlnConfig3) await node3.start() let manager3 = cast[OnchainGroupManager](node3.rln.groupManager) @@ -165,7 +165,7 @@ procSuite "WakuNode - RLN relay": assert false, "Failed to mount relay" let wakuRlnConfig1 = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node1.mountRlnRelay(wakuRlnConfig1) + await node1.setRlnValidator(wakuRlnConfig1) await node1.start() let manager1 = cast[OnchainGroupManager](node1.rln.groupManager) let idCredentials1 = generateCredentials() @@ -182,7 +182,7 @@ procSuite "WakuNode - RLN relay": assert false, "Failed to mount relay" let wakuRlnConfig2 = getWakuRlnConfig(manager = manager, index = MembershipIndex(2)) - await node2.mountRlnRelay(wakuRlnConfig2) + await node2.setRlnValidator(wakuRlnConfig2) await node2.start() let manager2 = cast[OnchainGroupManager](node2.rln.groupManager) let idCredentials2 = generateCredentials() @@ -199,7 +199,7 @@ procSuite "WakuNode - RLN relay": assert false, "Failed to mount relay" let wakuRlnConfig3 = getWakuRlnConfig(manager = manager, index = MembershipIndex(3)) - await node3.mountRlnRelay(wakuRlnConfig3) + await node3.setRlnValidator(wakuRlnConfig3) await node3.start() let manager3 = cast[OnchainGroupManager](node3.rln.groupManager) let idCredentials3 = generateCredentials() @@ -315,7 +315,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig1 = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node1.mountRlnRelay(wakuRlnConfig1) + await node1.setRlnValidator(wakuRlnConfig1) await node1.start() let manager1 = cast[OnchainGroupManager](node1.rln.groupManager) @@ -336,7 +336,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig2 = getWakuRlnConfig(manager = manager, index = MembershipIndex(2)) - await node2.mountRlnRelay(wakuRlnConfig2) + await node2.setRlnValidator(wakuRlnConfig2) await node2.start() let manager2 = cast[OnchainGroupManager](node2.rln.groupManager) @@ -352,7 +352,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig3 = getWakuRlnConfig(manager = manager, index = MembershipIndex(3)) - await node3.mountRlnRelay(wakuRlnConfig3) + await node3.setRlnValidator(wakuRlnConfig3) await node3.start() let manager3 = cast[OnchainGroupManager](node3.rln.groupManager) @@ -426,7 +426,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig1 = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node1.mountRlnRelay(wakuRlnConfig1) + await node1.setRlnValidator(wakuRlnConfig1) await node1.start() # Registration is mandatory before sending messages with rln-relay @@ -449,7 +449,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig2 = getWakuRlnConfig(manager = manager, index = MembershipIndex(2)) - await node2.mountRlnRelay(wakuRlnConfig2) + await node2.setRlnValidator(wakuRlnConfig2) await node2.start() # Registration is mandatory before sending messages with rln-relay @@ -467,7 +467,7 @@ procSuite "WakuNode - RLN relay": let wakuRlnConfig3 = getWakuRlnConfig(manager = manager, index = MembershipIndex(3)) - await node3.mountRlnRelay(wakuRlnConfig3) + await node3.setRlnValidator(wakuRlnConfig3) await node3.start() # Registration is mandatory before sending messages with rln-relay @@ -595,7 +595,7 @@ procSuite "WakuNode - RLN relay": assert false, "Failed to mount relay" let wakuRlnConfig1 = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node1.mountRlnRelay(wakuRlnConfig1) + await node1.setRlnValidator(wakuRlnConfig1) await node1.start() # Registration is mandatory before sending messages with rln-relay @@ -614,7 +614,7 @@ procSuite "WakuNode - RLN relay": assert false, "Failed to mount relay" let wakuRlnConfig2 = getWakuRlnConfig(manager = manager, index = MembershipIndex(2)) - await node2.mountRlnRelay(wakuRlnConfig2) + await node2.setRlnValidator(wakuRlnConfig2) await node2.start() # Registration is mandatory before sending messages with rln-relay diff --git a/tests/waku_rln_relay/utils_offchain.nim b/tests/waku_rln_relay/utils_offchain.nim index 625b4ea2a..9976ec783 100644 --- a/tests/waku_rln_relay/utils_offchain.nim +++ b/tests/waku_rln_relay/utils_offchain.nim @@ -22,7 +22,7 @@ proc setupStaticRln*( identifier: uint, rlnRelayEthContractAddress: Option[string] = none(string), ) {.async.} = - await node.mountRlnRelay( + await node.setRlnValidator( WakuRlnConfig(dynamic: false, credIndex: some(identifier), epochSizeSec: 1) ) diff --git a/tests/wakunode_rest/test_rest_health.nim b/tests/wakunode_rest/test_rest_health.nim index 18a5abc4c..4a2fa0250 100644 --- a/tests/wakunode_rest/test_rest_health.nim +++ b/tests/wakunode_rest/test_rest_health.nim @@ -67,7 +67,7 @@ suite "Waku v2 REST API - health": let client = newRestHttpClient(initTAddress(restAddress, restPort)) # kick in rln (currently the only check for health) - await node.mountRlnRelay( + await node.setRlnValidator( getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) ) diff --git a/tests/wakunode_rest/test_rest_relay.nim b/tests/wakunode_rest/test_rest_relay.nim index d32ba3373..ccf59b4fd 100644 --- a/tests/wakunode_rest/test_rest_relay.nim +++ b/tests/wakunode_rest/test_rest_relay.nim @@ -261,7 +261,7 @@ suite "Waku v2 Rest API - Relay": assert false, "Failed to mount relay" let wakuRlnConfig = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node.mountRlnRelay(wakuRlnConfig) + await node.setRlnValidator(wakuRlnConfig) await node.start() # Registration is mandatory before sending messages with rln-relay let manager = cast[OnchainGroupManager](node.rln.groupManager) @@ -509,7 +509,7 @@ suite "Waku v2 Rest API - Relay": let wakuRlnConfig = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await meshNode.mountRlnRelay(wakuRlnConfig) + await meshNode.setRlnValidator(wakuRlnConfig) await meshNode.start() const testPubsubTopic = PubsubTopic("/waku/2/rs/1/0") proc dummyHandler( @@ -530,7 +530,7 @@ suite "Waku v2 Rest API - Relay": let wakuRlnConfig = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node.mountRlnRelay(wakuRlnConfig) + await node.setRlnValidator(wakuRlnConfig) await node.start() await node.connectToNodes(@[meshNode.peerInfo.toRemotePeerInfo()]) @@ -600,7 +600,7 @@ suite "Waku v2 Rest API - Relay": require node.mountAutoSharding(1, 8).isOk let wakuRlnConfig = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node.mountRlnRelay(wakuRlnConfig) + await node.setRlnValidator(wakuRlnConfig) await node.start() # Registration is mandatory before sending messages with rln-relay @@ -659,7 +659,7 @@ suite "Waku v2 Rest API - Relay": (await node.mountRelay()).isOkOr: assert false, "Failed to mount relay" let wakuRlnConfig = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node.mountRlnRelay(wakuRlnConfig) + await node.setRlnValidator(wakuRlnConfig) await node.start() # Registration is mandatory before sending messages with rln-relay @@ -731,7 +731,7 @@ suite "Waku v2 Rest API - Relay": require node.mountAutoSharding(1, 8).isOk let wakuRlnConfig = getWakuRlnConfig(manager = manager, index = MembershipIndex(1)) - await node.mountRlnRelay(wakuRlnConfig) + await node.setRlnValidator(wakuRlnConfig) await node.start() # Registration is mandatory before sending messages with rln-relay