fix(rln-relay): uncomment fields in proto decode

waku-org · Jan 23, 2023 · ab64d4b · ab64d4b
1 parent 30c08d6
commit ab64d4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/tests/v2/test_wakunode_rln_relay.nim b/tests/v2/test_wakunode_rln_relay.nim
@@ -130,8 +130,6 @@ procSuite "WakuNode - RLN relay":
       rlnRelayPubSubTopic = RlnRelayPubsubTopic
       contentTopic = ContentTopic("/waku/2/default-content/proto")
 
-    # set up three nodes
-    # node1
     # set up three nodes
     # node1
     await node1.mountRelay(@[rlnRelayPubSubTopic])

diff --git a/waku/v2/protocol/waku_message.nim b/waku/v2/protocol/waku_message.nim
@@ -66,20 +66,20 @@ proc decode*(T: type WakuMessage, buffer: seq[byte]): ProtoResult[T] =
 
   discard ?pb.getField(1, msg.payload)
   discard ?pb.getField(2, msg.contentTopic)
-  # discard ?pb.getField(3, msg.version)
+  discard ?pb.getField(3, msg.version)
 
   var timestamp: zint64
-  # discard ?pb.getField(10, timestamp)
+  discard ?pb.getField(10, timestamp)
   msg.timestamp = Timestamp(timestamp)
 
   # Experimental: this is part of https://rfc.vac.dev/spec/17/ spec
   when defined(rln):
     var proofBytes: seq[byte]
-    # if ?pb.getField(21, proofBytes):
-      # msg.proof = proofBytes
+    if ?pb.getField(21, proofBytes):
+      msg.proof = proofBytes
 
   var ephemeral: uint
-  # if ?pb.getField(31, ephemeral):
-    # msg.ephemeral = bool(ephemeral)
+  if ?pb.getField(31, ephemeral):
+    msg.ephemeral = bool(ephemeral)
 
   ok(msg)
diff --git a/waku/v2/protocol/waku_rln_relay/rln_relay.nim b/waku/v2/protocol/waku_rln_relay/rln_relay.nim
@@ -250,7 +250,7 @@ proc validateMessage*(rlnPeer: WakuRLNRelay, msg: WakuMessage,
     # message's epoch is too old or too ahead
     # accept messages whose epoch is within +-MaxEpochGap from the current epoch
     warn "invalid message: epoch gap exceeds a threshold", gap = gap,
-        payload = string.fromBytes(msg.payload)
+        payload = string.fromBytes(msg.payload), msgEpoch = fromEpoch(proof.epoch)
     waku_rln_invalid_messages_total.inc(labelValues=["invalid_epoch"])
     return MessageValidationResult.Invalid