feat: use messageHash as msgIdFn

packages/core/src/lib/message/version_0.ts

@@ -128,17 +128,9 @@ export class Decoder implements IDecoder<DecodedMessage> {
   }
 
   fromWireToProtoObj(bytes: Uint8Array): Promise<IProtoMessage | undefined> {
-    const protoMessage = proto.WakuMessage.decode(bytes);
+    const protoMessage = fromBytesToProtoMessage(bytes);
     log("Message decoded", protoMessage);
-    return Promise.resolve({
-      payload: protoMessage.payload,
-      contentTopic: protoMessage.contentTopic,
-      version: protoMessage.version ?? undefined,
-      timestamp: protoMessage.timestamp ?? undefined,
-      meta: protoMessage.meta ?? undefined,
-      rateLimitProof: protoMessage.rateLimitProof ?? undefined,
-      ephemeral: protoMessage.ephemeral ?? false,
-    });
+    return Promise.resolve(protoMessage);
   }
 
   async fromProtoObj(
@@ -161,6 +153,24 @@ export class Decoder implements IDecoder<DecodedMessage> {
   }
 }
 
+/**
+ * Tries to decode bytes into IProtoMessage.
+ * @param bytes Uint8Array
+ * @returns IProtoMessage
+ */
+export function fromBytesToProtoMessage(bytes: Uint8Array): IProtoMessage {
+  const protoMessage = proto.WakuMessage.decode(bytes);
+  return {
+    payload: protoMessage.payload,
+    contentTopic: protoMessage.contentTopic,
+    version: protoMessage.version ?? undefined,
+    timestamp: protoMessage.timestamp ?? undefined,
+    meta: protoMessage.meta ?? undefined,
+    rateLimitProof: protoMessage.rateLimitProof ?? undefined,
+    ephemeral: protoMessage.ephemeral ?? false,
+  };
+}
+
 /**
  * Creates a decoder that decode messages without Waku level encryption.
  *

packages/relay/src/index.ts

@@ -9,7 +9,7 @@ import { SignaturePolicy } from "@chainsafe/libp2p-gossipsub/types";
 import type { Libp2p } from "@libp2p/interface-libp2p";
 import type { PubSub } from "@libp2p/interface-pubsub";
 import { sha256 } from "@noble/hashes/sha256";
-import { DefaultPubSubTopic } from "@waku/core";
+import { DefaultPubSubTopic, message } from "@waku/core";
 import {
   ActiveSubscriptions,
   Callback,
@@ -24,6 +24,7 @@ import {
   SendError,
   SendResult,
 } from "@waku/interfaces";
+import { messageHash } from "@waku/message-hash";
 import { groupByContentTopic, isSizeValid, toAsyncIterator } from "@waku/utils";
 import debug from "debug";
 
@@ -249,7 +250,17 @@ export function wakuGossipSub(
   return (components: GossipSubComponents) => {
     init = {
       ...init,
-      msgIdFn: ({ data }) => sha256(data),
+      msgIdFn: ({ topic, data }) => {
+        try {
+          const protoMessage = message.fromBytesToProtoMessage(data);
+          return messageHash(topic, protoMessage);
+        } catch (e) {
+          log(
+            "Failed to hash as ProtoMessage, falling back to sha256 from data."
+          );
+          return sha256(data);
+        }
+      },
       // Ensure that no signature is included nor expected in the messages.
       globalSignaturePolicy: SignaturePolicy.StrictNoSign,
       fallbackToFloodsub: false,