From 747ddbddd528b6492a98f6eccd719cdce1df99a3 Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Sun, 2 Nov 2025 02:27:57 +0100
Subject: [PATCH] Implemented duplicate signalling on PN message download

---
 LXMF/Handlers.py       |  2 +-
 LXMF/LXMRouter.py      | 16 ++++++++++++----
 LXMF/Utilities/lxmd.py |  3 ++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/LXMF/Handlers.py b/LXMF/Handlers.py
index aa39ea2..01841f9 100644
--- a/LXMF/Handlers.py
+++ b/LXMF/Handlers.py
@@ -54,7 +54,7 @@ class LXMFPropagationAnnounceHandler:
                         metadata                           =     data[6]
                         
                         if destination_hash in self.lxmrouter.static_peers:
-                            static_peer = self.lxmrouter.static_peers[destination_hash]
+                            static_peer = self.lxmrouter.peers[destination_hash]
                             if not is_path_response or static_peer.last_heard == 0:
                                 self.lxmrouter.peer(destination_hash=destination_hash,
                                                     timestamp=node_timebase,
diff --git a/LXMF/LXMRouter.py b/LXMF/LXMRouter.py
index 10e1892..0cc59b1 100644
--- a/LXMF/LXMRouter.py
+++ b/LXMF/LXMRouter.py
@@ -75,6 +75,8 @@ class LXMRouter:
 
     PR_ALL_MESSAGES       = 0x00
 
+    DUPLICATE_SIGNAL      = "lxmf_duplicate"
+
     STATS_GET_PATH        = "/pn/get/stats"
     SYNC_REQUEST_PATH     = "/pn/peer/sync"
     UNPEER_REQUEST_PATH   = "/pn/peer/unpeer"
@@ -1537,10 +1539,12 @@ class LXMRouter:
             self.propagation_transfer_state = LXMRouter.PR_NO_ACCESS
 
         else:
+            duplicates = 0
             if request_receipt.response != None and len(request_receipt.response) > 0:
                 haves = []
                 for lxmf_data in request_receipt.response:
-                    self.lxmf_propagation(lxmf_data)
+                    result = self.lxmf_propagation(lxmf_data, signal_duplicate=LXMRouter.DUPLICATE_SIGNAL)
+                    if result == LXMRouter.DUPLICATE_SIGNAL: duplicates += 1
                     haves.append(RNS.Identity.full_hash(lxmf_data))
 
                 # Return a list of successfully received messages to the node.
@@ -1556,6 +1560,7 @@ class LXMRouter:
 
             self.propagation_transfer_state = LXMRouter.PR_COMPLETE
             self.propagation_transfer_progress = 1.0
+            self.propagation_transfer_last_duplicates = duplicates
             self.propagation_transfer_last_result = len(request_receipt.response)
             self.save_locally_delivered_transient_ids()
 
@@ -1674,11 +1679,14 @@ class LXMRouter:
     def get_outbound_lxm_stamp_cost(self, lxm_hash):
         for lxm in self.pending_outbound:
             if lxm.hash == lxm_hash:
-                return lxm.stamp_cost
+                if lxm.outbound_ticket: return None
+                else:                   return lxm.stamp_cost
 
         for lxm_id in self.pending_deferred_stamps:
             if self.pending_deferred_stamps[lxm_id].hash == lxm_hash:
-                return self.pending_deferred_stamps[lxm_id].stamp_cost
+                lxm = self.pending_deferred_stamps[lxm_id]
+                if lxm.outbound_ticket: return None
+                else:                   return lxm.stamp_cost
         
         return None
 
@@ -1689,7 +1697,7 @@ class LXMRouter:
 
         for lxm_id in self.pending_deferred_stamps:
             if self.pending_deferred_stamps[lxm_id].hash == lxm_hash:
-                return self.pending_deferred_stamps[lxm_id].stamp_cost
+                return self.pending_deferred_stamps[lxm_id].propagation_target_cost
         
         return None
 
diff --git a/LXMF/Utilities/lxmd.py b/LXMF/Utilities/lxmd.py
index 8c7cd82..de69ab1 100644
--- a/LXMF/Utilities/lxmd.py
+++ b/LXMF/Utilities/lxmd.py
@@ -758,7 +758,8 @@ def get_status(remote=None, configdir=None, rnsconfigdir=None, verbosity=0, quie
                     ls = "never synced"
 
                 sstr = RNS.prettyspeed(p["str"]); sler = RNS.prettyspeed(p["ler"])
-                stl = RNS.prettysize(p["transfer_limit"]*1000); ssl = RNS.prettysize(p["sync_limit"]*1000)
+                stl = RNS.prettysize(p["transfer_limit"]*1000) if p["transfer_limit"] else "Unknown"
+                ssl = RNS.prettysize(p["sync_limit"]*1000) if p["sync_limit"] else "unknown"
                 srxb = RNS.prettysize(p["rx_bytes"]); stxb = RNS.prettysize(p["tx_bytes"]); pmo = pm["offered"]; pmout = pm["outgoing"]
                 pmi  = pm["incoming"]; pmuh = pm["unhandled"]; ar = round(p["acceptance_rate"]*100, 2)
                 if p["name"] == None: nn = ""