From 9ed292a6e1b20a9955a6c2aca4d537b54e82a61d Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 22 Jul 2024 09:22:44 -0500
Subject: [PATCH 1/2] feat: harden all sporks on mainnet to current values

---
 src/spork.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/spork.cpp b/src/spork.cpp
index 3d489bc76f..6fd7a6388b 100644
--- a/src/spork.cpp
+++ b/src/spork.cpp
@@ -262,6 +262,16 @@ bool CSporkManager::IsSporkActive(SporkId nSporkID) const
 
 SporkValue CSporkManager::GetSporkValue(SporkId nSporkID) const
 {
+    // Harden all sporks on Mainnet
+    if (!Params().IsTestChain()) {
+        switch (nSporkID) {
+            case SPORK_21_QUORUM_ALL_CONNECTED:
+                return 1;
+            default:
+                return 0;
+        }
+    }
+
     LOCK(cs);
 
     if (auto opt_sporkValue = SporkValueIfActive(nSporkID)) {

From e1030a058c68a3fa262002ccd6211f28d3ef0787 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Mon, 22 Jul 2024 10:40:57 -0500
Subject: [PATCH 2/2] docs: add release notes for 6140

---
 doc/release-notes-6140.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/release-notes-6140.md

diff --git a/doc/release-notes-6140.md b/doc/release-notes-6140.md
new file mode 100644
index 0000000000..0ae9324b95
--- /dev/null
+++ b/doc/release-notes-6140.md
@@ -0,0 +1,6 @@
+Mainnet Spork Hardening
+-----------------------
+
+This version hardens all Sporks on mainnet. Sporks remain in effect on all devnets and testnet; however, on mainnet,
+the value of all sporks are hard coded to 0, or 1 for SPORK_21_QUORUM_ALL_CONNECTED. These hardened values match the
+active values historically used on mainnet, so there is no change in the network's functionality.