From 97a51472c6fd736aa6ff794312f0b86a090c2149 Mon Sep 17 00:00:00 2001
From: Tuyen Nguyen <vutuyen2636@gmail.com>
Date: Wed, 14 Dec 2022 11:23:21 +0700
Subject: [PATCH 1/2] feat: tracer to track delivered message if duplicate

---
 src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.ts b/src/index.ts
index 664bf57f..be44b32b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1093,6 +1093,7 @@ export class GossipSub extends EventEmitter<GossipsubEvents> implements PubSub<G
       case MessageStatus.duplicate:
         // Report the duplicate
         this.score.duplicateMessage(from.toString(), validationResult.msgIdStr, rpcMsg.topic)
+        this.gossipTracer.deliverMessage(validationResult.msgIdStr)
         this.mcache.observeDuplicate(validationResult.msgIdStr, from.toString())
         return
 

From 55cdaad696cbc85f16577a6ad03502ecdd76a6a5 Mon Sep 17 00:00:00 2001
From: Tuyen Nguyen <vutuyen2636@gmail.com>
Date: Thu, 15 Dec 2022 09:55:26 +0700
Subject: [PATCH 2/2] chore: add iwantPromiseResolvedFromDuplicate metric

---
 src/index.ts   | 5 ++++-
 src/metrics.ts | 5 +++++
 src/tracer.ts  | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index be44b32b..c7268431 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1093,7 +1093,10 @@ export class GossipSub extends EventEmitter<GossipsubEvents> implements PubSub<G
       case MessageStatus.duplicate:
         // Report the duplicate
         this.score.duplicateMessage(from.toString(), validationResult.msgIdStr, rpcMsg.topic)
-        this.gossipTracer.deliverMessage(validationResult.msgIdStr)
+        // due to the collision of fastMsgIdFn, 2 different messages may end up the same fastMsgId
+        // so we need to also mark the duplicate message as delivered or the promise is not resolved
+        // and peer gets penalized. See https://github.com/ChainSafe/js-libp2p-gossipsub/pull/385
+        this.gossipTracer.deliverMessage(validationResult.msgIdStr, true)
         this.mcache.observeDuplicate(validationResult.msgIdStr, from.toString())
         return
 
diff --git a/src/metrics.ts b/src/metrics.ts
index 2015042b..2f01e9e8 100644
--- a/src/metrics.ts
+++ b/src/metrics.ts
@@ -460,6 +460,11 @@ export function getMetrics(
       name: 'gossipsub_iwant_promise_resolved_total',
       help: 'Total count of resolved IWANT promises'
     }),
+    /** Total count of resolved IWANT promises from duplicate messages */
+    iwantPromiseResolvedFromDuplicate: register.gauge({
+      name: 'gossipsub_iwant_promise_resolved_from_duplicate_total',
+      help: 'Total count of resolved IWANT promises from duplicate messages'
+    }),
     /** Total count of peers we have asked IWANT promises that are resolved */
     iwantPromiseResolvedPeers: register.gauge({
       name: 'gossipsub_iwant_promise_resolved_peers',
diff --git a/src/tracer.ts b/src/tracer.ts
index 52e13e56..8150c305 100644
--- a/src/tracer.ts
+++ b/src/tracer.ts
@@ -105,7 +105,7 @@ export class IWantTracer {
   /**
    * Someone delivered a message, stop tracking promises for it
    */
-  deliverMessage(msgIdStr: MsgIdStr): void {
+  deliverMessage(msgIdStr: MsgIdStr, isDuplicate = false): void {
     this.trackMessage(msgIdStr)
 
     const expireByPeer = this.promises.get(msgIdStr)
@@ -116,6 +116,7 @@ export class IWantTracer {
 
       if (this.metrics) {
         this.metrics.iwantPromiseResolved.inc(1)
+        if (isDuplicate) this.metrics.iwantPromiseResolvedFromDuplicate.inc(1)
         this.metrics.iwantPromiseResolvedPeers.inc(expireByPeer.size)
       }
     }