From 63ff7e40c9957ff9814de67491955362beb28648 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Sat, 10 Oct 2020 10:20:26 -0700
Subject: [PATCH] Don't merge in re-rumours' nServices

---
 db.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/db.cpp b/db.cpp
index 1474a79..97b6777 100644
--- a/db.cpp
+++ b/db.cpp
@@ -141,12 +141,8 @@ void CAddrDb::Add_(const CAddress &addr, bool force) {
   }
   if (ipToId.count(ipp)) {
     CAddrInfo &ai = idToInfo[ipToId[ipp]];
-    if (addr.nTime > ai.lastTry || ai.services != addr.nServices)
-    {
-      ai.lastTry = addr.nTime;
-      ai.services |= addr.nServices;
-//      printf("%s: updated\n", ToString(addr).c_str());
-    }
+    if (addr.nTime > ai.lastTry) ai.lastTry = addr.nTime;
+    // Do not update ai.nServices (data from VERSION from the peer itself is better than random ADDR rumours).
     if (force) {
       ai.ignoreTill = 0;
     }