From ee4115e73497e3753bd8d5c94c0e52e30b981bfe Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 20 Sep 2024 12:33:01 +0000
Subject: [PATCH 1/2] revert: Only sync mempool from v0.15+ (proto 70216+)
 nodes

commits reverted:
- e3120ebc3db22f6a63cf3261f72f7ef0eeb3b930

Nodes running at 0.15 wouldn't be compatible with the current network,
safe to assume anything below 0.15 wouldn't be either.
---
 src/masternode/sync.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/masternode/sync.cpp b/src/masternode/sync.cpp
index fefc12730d..d4cf62a735 100644
--- a/src/masternode/sync.cpp
+++ b/src/masternode/sync.cpp
@@ -206,7 +206,7 @@ void CMasternodeSync::ProcessTick(const PeerManager& peerman)
                         // Now that the blockchain is synced request the mempool from the connected outbound nodes if possible
                         for (auto pNodeTmp : snap.Nodes()) {
                             bool fRequestedEarlier = m_netfulfilledman.HasFulfilledRequest(pNodeTmp->addr, "mempool-sync");
-                            if (pNodeTmp->nVersion >= 70216 && !pNodeTmp->IsInboundConn() && !fRequestedEarlier && !pNodeTmp->IsBlockRelayOnly()) {
+                            if (!pNodeTmp->IsInboundConn() && !fRequestedEarlier && !pNodeTmp->IsBlockRelayOnly()) {
                                 m_netfulfilledman.AddFulfilledRequest(pNodeTmp->addr, "mempool-sync");
                                 connman.PushMessage(pNodeTmp, msgMaker.Make(NetMsgType::MEMPOOL));
                                 LogPrint(BCLog::MNSYNC, "CMasternodeSync::ProcessTick -- nTick %d nCurrentAsset %d -- syncing mempool from peer=%d\n", nTick, nCurrentAsset, pNodeTmp->GetId());

From 4602e097515bc949bb34dad8994cc3f979d4553e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 24 Sep 2024 14:04:38 +0000
Subject: [PATCH 2/2] chore: bump `MIN_PEER_PROTO_VERSION` to `70216`

---
 doc/release-notes-6281.md | 4 ++++
 src/version.h             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 doc/release-notes-6281.md

diff --git a/doc/release-notes-6281.md b/doc/release-notes-6281.md
new file mode 100644
index 0000000000..8958cd8b81
--- /dev/null
+++ b/doc/release-notes-6281.md
@@ -0,0 +1,4 @@
+P2P and Network Changes
+-----------------------
+
+`MIN_PEER_PROTO_VERSION` has been bumped to `70216`
diff --git a/src/version.h b/src/version.h
index 7b5b48e641..291ffdee25 100644
--- a/src/version.h
+++ b/src/version.h
@@ -17,7 +17,7 @@ static const int PROTOCOL_VERSION = 70234;
 static const int INIT_PROTO_VERSION = 209;
 
 //! disconnect from peers older than this proto version
-static const int MIN_PEER_PROTO_VERSION = 70215;
+static const int MIN_PEER_PROTO_VERSION = 70216;
 
 //! minimum proto version of masternode to accept in DKGs
 static const int MIN_MASTERNODE_PROTO_VERSION = 70233;