From d9828a9ccdea75d32637c3e6102a47c16376ac36 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 25 Apr 2025 14:29:58 +0000
Subject: [PATCH 01/10] refactor: move `ToJson` definitions relied by
 `TxToUniv` to source file

This helps us get rid of the redefinitions responsible for
`-Wredundant-decls` unhappiness.
---
 src/Makefile.am        |   1 +
 src/evo/assetlocktx.h  |  35 +---------
 src/evo/cbtx.h         |  21 +-----
 src/evo/core_write.cpp | 144 +++++++++++++++++++++++++++++++++++++++++
 src/evo/mnhftx.h       |   9 +--
 src/evo/providertx.h   |  72 ++-------------------
 src/llmq/commitment.h  |  10 +--
 7 files changed, 154 insertions(+), 138 deletions(-)
 create mode 100644 src/evo/core_write.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
index 8f5cac84d768..1f82cbf9f8bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -773,6 +773,7 @@ libbitcoin_common_a_SOURCES = \
   core_read.cpp \
   core_write.cpp \
   deploymentinfo.cpp \
+  evo/core_write.cpp \
   governance/common.cpp \
   init/common.cpp \
   key.cpp \
diff --git a/src/evo/assetlocktx.h b/src/evo/assetlocktx.h
index d63ef4092e32..0af346be0a20 100644
--- a/src/evo/assetlocktx.h
+++ b/src/evo/assetlocktx.h
@@ -22,10 +22,6 @@ namespace llmq {
 class CQuorumManager;
 } // namespace llmq
 
-// Forward declaration from core_io to get rid of circular dependency
-UniValue ValueFromAmount(const CAmount amount);
-void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex, bool include_addresses);
-
 class CAssetLockPayload
 {
 public:
@@ -53,23 +49,7 @@ class CAssetLockPayload
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue outputs(UniValue::VARR);
-        for (const CTxOut& credit_output : creditOutputs) {
-            UniValue out(UniValue::VOBJ);
-            out.pushKV("value", ValueFromAmount(credit_output.nValue));
-            out.pushKV("valueSat", credit_output.nValue);
-            UniValue spk(UniValue::VOBJ);
-            ScriptPubKeyToUniv(credit_output.scriptPubKey, spk, /* fIncludeHex = */ true, /* include_addresses = */ false);
-            out.pushKV("scriptPubKey", spk);
-            outputs.push_back(out);
-        }
-        UniValue obj(UniValue::VOBJ);
-        obj.pushKV("version", int(nVersion));
-        obj.pushKV("creditOutputs", outputs);
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
     // getters
     uint8_t getVersion() const
@@ -126,18 +106,7 @@ class CAssetUnlockPayload
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", int(nVersion));
-        obj.pushKV("index", int(index));
-        obj.pushKV("fee", int(fee));
-        obj.pushKV("requestedHeight", int(requestedHeight));
-        obj.pushKV("quorumHash", quorumHash.ToString());
-        obj.pushKV("quorumSig", quorumSig.ToString());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
     bool VerifySig(const llmq::CQuorumManager& qman, const uint256& msgHash, gsl::not_null<const CBlockIndex*> pindexTip, TxValidationState& state) const;
 
diff --git a/src/evo/cbtx.h b/src/evo/cbtx.h
index dce93949bb20..b18918c7173c 100644
--- a/src/evo/cbtx.h
+++ b/src/evo/cbtx.h
@@ -24,9 +24,6 @@ class CQuorumBlockProcessor;
 class CQuorumSnapshotManager;
 }// namespace llmq
 
-// Forward declaration from core_io to get rid of circular dependency
-UniValue ValueFromAmount(const CAmount amount);
-
 // coinbase transaction
 class CCbTx
 {
@@ -65,23 +62,7 @@ class CCbTx
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", (int)nVersion);
-        obj.pushKV("height", nHeight);
-        obj.pushKV("merkleRootMNList", merkleRootMNList.ToString());
-        if (nVersion >= Version::MERKLE_ROOT_QUORUMS) {
-            obj.pushKV("merkleRootQuorums", merkleRootQuorums.ToString());
-            if (nVersion >= Version::CLSIG_AND_BALANCE) {
-                obj.pushKV("bestCLHeightDiff", static_cast<int>(bestCLHeightDiff));
-                obj.pushKV("bestCLSignature", bestCLSignature.ToString());
-                obj.pushKV("creditPoolBalance", ValueFromAmount(creditPoolBalance));
-            }
-        }
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 };
 template<> struct is_serializable_enum<CCbTx::Version> : std::true_type {};
 
diff --git a/src/evo/core_write.cpp b/src/evo/core_write.cpp
new file mode 100644
index 000000000000..b2a2cdbd7f0a
--- /dev/null
+++ b/src/evo/core_write.cpp
@@ -0,0 +1,144 @@
+// Copyright (c) 2018-2025 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <core_io.h>
+#include <evo/assetlocktx.h>
+#include <evo/cbtx.h>
+#include <evo/mnhftx.h>
+#include <evo/providertx.h>
+#include <llmq/commitment.h>
+
+#include <univalue.h>
+
+[[nodiscard]] UniValue CAssetLockPayload::ToJson() const
+{
+    UniValue outputs(UniValue::VARR);
+    for (const CTxOut& credit_output : creditOutputs) {
+        UniValue out(UniValue::VOBJ);
+        out.pushKV("value", ValueFromAmount(credit_output.nValue));
+        out.pushKV("valueSat", credit_output.nValue);
+        UniValue spk(UniValue::VOBJ);
+        ScriptPubKeyToUniv(credit_output.scriptPubKey, spk, /*include_hex=*/true, /*include_address=*/false);
+        out.pushKV("scriptPubKey", spk);
+        outputs.push_back(out);
+    }
+
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", int(nVersion));
+    ret.pushKV("creditOutputs", outputs);
+    return ret;
+}
+
+[[nodiscard]] UniValue CAssetUnlockPayload::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", int(nVersion));
+    ret.pushKV("index", int(index));
+    ret.pushKV("fee", int(fee));
+    ret.pushKV("requestedHeight", int(requestedHeight));
+    ret.pushKV("quorumHash", quorumHash.ToString());
+    ret.pushKV("quorumSig", quorumSig.ToString());
+    return ret;
+}
+
+[[nodiscard]] UniValue CCbTx::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", (int)nVersion);
+    ret.pushKV("height", nHeight);
+    ret.pushKV("merkleRootMNList", merkleRootMNList.ToString());
+    if (nVersion >= CCbTx::Version::MERKLE_ROOT_QUORUMS) {
+        ret.pushKV("merkleRootQuorums", merkleRootQuorums.ToString());
+        if (nVersion >= CCbTx::Version::CLSIG_AND_BALANCE) {
+            ret.pushKV("bestCLHeightDiff", static_cast<int>(bestCLHeightDiff));
+            ret.pushKV("bestCLSignature", bestCLSignature.ToString());
+            ret.pushKV("creditPoolBalance", ValueFromAmount(creditPoolBalance));
+        }
+    }
+    return ret;
+}
+
+[[nodiscard]] UniValue CProRegTx::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", nVersion);
+    ret.pushKV("type", ToUnderlying(nType));
+    ret.pushKV("collateralHash", collateralOutpoint.hash.ToString());
+    ret.pushKV("collateralIndex", (int)collateralOutpoint.n);
+    ret.pushKV("service", addr.ToStringAddrPort());
+    ret.pushKV("ownerAddress", EncodeDestination(PKHash(keyIDOwner)));
+    ret.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
+    if (CTxDestination dest; ExtractDestination(scriptPayout, dest)) {
+        ret.pushKV("payoutAddress", EncodeDestination(dest));
+    }
+    ret.pushKV("pubKeyOperator", pubKeyOperator.ToString());
+    ret.pushKV("operatorReward", (double)nOperatorReward / 100);
+    if (nType == MnType::Evo) {
+        ret.pushKV("platformNodeID", platformNodeID.ToString());
+        ret.pushKV("platformP2PPort", platformP2PPort);
+        ret.pushKV("platformHTTPPort", platformHTTPPort);
+    }
+    ret.pushKV("inputsHash", inputsHash.ToString());
+    return ret;
+}
+
+[[nodiscard]] UniValue CProUpRegTx::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", nVersion);
+    ret.pushKV("proTxHash", proTxHash.ToString());
+    ret.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
+    if (CTxDestination dest; ExtractDestination(scriptPayout, dest)) {
+        ret.pushKV("payoutAddress", EncodeDestination(dest));
+    }
+    ret.pushKV("pubKeyOperator", pubKeyOperator.ToString());
+    ret.pushKV("inputsHash", inputsHash.ToString());
+    return ret;
+}
+
+[[nodiscard]] UniValue CProUpRevTx::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", nVersion);
+    ret.pushKV("proTxHash", proTxHash.ToString());
+    ret.pushKV("reason", (int)nReason);
+    ret.pushKV("inputsHash", inputsHash.ToString());
+    return ret;
+}
+
+[[nodiscard]] UniValue CProUpServTx::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", nVersion);
+    ret.pushKV("type", ToUnderlying(nType));
+    ret.pushKV("proTxHash", proTxHash.ToString());
+    ret.pushKV("service", addr.ToStringAddrPort());
+    if (CTxDestination dest; ExtractDestination(scriptOperatorPayout, dest)) {
+        ret.pushKV("operatorPayoutAddress", EncodeDestination(dest));
+    }
+    if (nType == MnType::Evo) {
+        ret.pushKV("platformNodeID", platformNodeID.ToString());
+        ret.pushKV("platformP2PPort", platformP2PPort);
+        ret.pushKV("platformHTTPPort", platformHTTPPort);
+    }
+    ret.pushKV("inputsHash", inputsHash.ToString());
+    return ret;
+}
+
+[[nodiscard]] UniValue MNHFTxPayload::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", (int)nVersion);
+    ret.pushKV("signal", signal.ToJson());
+    return ret;
+}
+
+[[nodiscard]] UniValue llmq::CFinalCommitmentTxPayload::ToJson() const
+{
+    UniValue ret(UniValue::VOBJ);
+    ret.pushKV("version", int{nVersion});
+    ret.pushKV("height", int(nHeight));
+    ret.pushKV("commitment", commitment.ToJson());
+    return ret;
+}
diff --git a/src/evo/mnhftx.h b/src/evo/mnhftx.h
index 1d6b577f3c1f..d6a3ca59bcb2 100644
--- a/src/evo/mnhftx.h
+++ b/src/evo/mnhftx.h
@@ -86,14 +86,7 @@ class MNHFTxPayload
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", (int)nVersion);
-        obj.pushKV("signal", signal.ToJson());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 };
 
 class CMNHFManager : public AbstractEHFManager
diff --git a/src/evo/providertx.h b/src/evo/providertx.h
index 037dc3c24bc9..50f777293221 100644
--- a/src/evo/providertx.h
+++ b/src/evo/providertx.h
@@ -91,31 +91,7 @@ class CProRegTx
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", nVersion);
-        obj.pushKV("type", ToUnderlying(nType));
-        obj.pushKV("collateralHash", collateralOutpoint.hash.ToString());
-        obj.pushKV("collateralIndex", (int)collateralOutpoint.n);
-        obj.pushKV("service", addr.ToStringAddrPort());
-        obj.pushKV("ownerAddress", EncodeDestination(PKHash(keyIDOwner)));
-        obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
-
-        if (CTxDestination dest; ExtractDestination(scriptPayout, dest)) {
-            obj.pushKV("payoutAddress", EncodeDestination(dest));
-        }
-        obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
-        obj.pushKV("operatorReward", (double)nOperatorReward / 100);
-        if (nType == MnType::Evo) {
-            obj.pushKV("platformNodeID", platformNodeID.ToString());
-            obj.pushKV("platformP2PPort", platformP2PPort);
-            obj.pushKV("platformHTTPPort", platformHTTPPort);
-        }
-        obj.pushKV("inputsHash", inputsHash.ToString());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const;
 };
@@ -175,25 +151,7 @@ class CProUpServTx
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", nVersion);
-        obj.pushKV("type", ToUnderlying(nType));
-        obj.pushKV("proTxHash", proTxHash.ToString());
-        obj.pushKV("service", addr.ToStringAddrPort());
-        if (CTxDestination dest; ExtractDestination(scriptOperatorPayout, dest)) {
-            obj.pushKV("operatorPayoutAddress", EncodeDestination(dest));
-        }
-        if (nType == MnType::Evo) {
-            obj.pushKV("platformNodeID", platformNodeID.ToString());
-            obj.pushKV("platformP2PPort", platformP2PPort);
-            obj.pushKV("platformHTTPPort", platformHTTPPort);
-        }
-        obj.pushKV("inputsHash", inputsHash.ToString());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const;
 };
@@ -243,20 +201,7 @@ class CProUpRegTx
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", nVersion);
-        obj.pushKV("proTxHash", proTxHash.ToString());
-        obj.pushKV("votingAddress", EncodeDestination(PKHash(keyIDVoting)));
-        if (CTxDestination dest; ExtractDestination(scriptPayout, dest)) {
-            obj.pushKV("payoutAddress", EncodeDestination(dest));
-        }
-        obj.pushKV("pubKeyOperator", pubKeyOperator.ToString());
-        obj.pushKV("inputsHash", inputsHash.ToString());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const;
 };
@@ -309,16 +254,7 @@ class CProUpRevTx
 
     std::string ToString() const;
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", nVersion);
-        obj.pushKV("proTxHash", proTxHash.ToString());
-        obj.pushKV("reason", (int)nReason);
-        obj.pushKV("inputsHash", inputsHash.ToString());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 
     bool IsTriviallyValid(bool is_basic_scheme_active, TxValidationState& state) const;
 };
diff --git a/src/llmq/commitment.h b/src/llmq/commitment.h
index 02fb2e3cac9b..3c88256bbbe5 100644
--- a/src/llmq/commitment.h
+++ b/src/llmq/commitment.h
@@ -166,15 +166,7 @@ class CFinalCommitmentTxPayload
         READWRITE(obj.nVersion, obj.nHeight, obj.commitment);
     }
 
-    [[nodiscard]] UniValue ToJson() const
-    {
-        UniValue obj;
-        obj.setObject();
-        obj.pushKV("version", int{nVersion});
-        obj.pushKV("height", int(nHeight));
-        obj.pushKV("commitment", commitment.ToJson());
-        return obj;
-    }
+    [[nodiscard]] UniValue ToJson() const;
 };
 
 bool CheckLLMQCommitment(CDeterministicMNManager& dmnman, CQuorumSnapshotManager& qsnapman,

From c587838c63b501b441af5f34d047b33019d65eab Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Tue, 22 Apr 2025 16:57:38 +0000
Subject: [PATCH 02/10] refactor: use `GetTransactionBlock()` as narrow
 `GetTransaction()` proxy

Currently, we rely on redefinition to avoid an explosion in reported
circular dependencies but that is verboten with `-Wredundant-decls`. To
trim down the amount of circular dependencies that would happen once
we remove the circular definition, we have to proxy `GetTransaction()`
through another function located elsewhere.

Since all Dash-specific invocations either rely on the txindex or the
mempool, we can safely trim down the number of arguments and add a
fast-fail. Since we do (sometimes) care about the block the transaction
is in, we return that as well.
---
 src/coinjoin/client.cpp                      |  2 +-
 src/coinjoin/util.cpp                        |  1 -
 src/evo/assetlocktx.cpp                      |  2 +-
 src/evo/cbtx.cpp                             |  1 -
 src/evo/chainhelper.cpp                      | 10 ++++++++++
 src/evo/chainhelper.h                        |  7 +++++++
 src/evo/deterministicmns.cpp                 | 14 +++++++-------
 src/governance/object.cpp                    |  4 ++--
 src/governance/vote.cpp                      |  1 -
 src/llmq/chainlocks.cpp                      |  4 ++--
 src/llmq/dkgsession.cpp                      |  1 -
 src/llmq/instantsend.cpp                     | 12 +++++-------
 src/llmq/utils.cpp                           |  1 -
 src/rpc/blockchain.h                         |  2 +-
 src/rpc/mempool.cpp                          |  1 +
 src/test/block_reward_reallocation_tests.cpp |  1 +
 src/test/evo_deterministicmns_tests.cpp      |  1 +
 src/validation.cpp                           |  5 ++---
 src/validation.h                             |  2 --
 test/lint/lint-circular-dependencies.py      | 15 ++++++++++-----
 20 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
index 7e2747c91a6b..26b1e7cb70f5 100644
--- a/src/coinjoin/client.cpp
+++ b/src/coinjoin/client.cpp
@@ -4,6 +4,7 @@
 
 #include <coinjoin/client.h>
 
+#include <chain.h>
 #include <chainparams.h>
 #include <coinjoin/options.h>
 #include <consensus/validation.h>
@@ -21,7 +22,6 @@
 #include <util/ranges.h>
 #include <util/system.h>
 #include <util/translation.h>
-#include <validation.h>
 #include <version.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
diff --git a/src/coinjoin/util.cpp b/src/coinjoin/util.cpp
index a7c3235d3765..0a379a054f86 100644
--- a/src/coinjoin/util.cpp
+++ b/src/coinjoin/util.cpp
@@ -7,7 +7,6 @@
 #include <policy/fees.h>
 #include <policy/policy.h>
 #include <script/sign.h>
-#include <validation.h>
 #include <wallet/fees.h>
 #include <wallet/wallet.h>
 #include <util/translation.h>
diff --git a/src/evo/assetlocktx.cpp b/src/evo/assetlocktx.cpp
index d8f2c502b604..d64eb126ffa5 100644
--- a/src/evo/assetlocktx.cpp
+++ b/src/evo/assetlocktx.cpp
@@ -14,9 +14,9 @@
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <logging.h>
+#include <node/blockstorage.h>
 #include <tinyformat.h>
 #include <util/ranges_set.h>
-#include <validation.h>
 
 #include <algorithm>
 
diff --git a/src/evo/cbtx.cpp b/src/evo/cbtx.cpp
index deb4f1d75660..8d29b485b376 100644
--- a/src/evo/cbtx.cpp
+++ b/src/evo/cbtx.cpp
@@ -18,7 +18,6 @@
 #include <chainparams.h>
 #include <consensus/merkle.h>
 #include <deploymentstatus.h>
-#include <validation.h>
 
 
 bool CheckCbTx(const CTransaction& tx, const CBlockIndex* pindexPrev, TxValidationState& state)
diff --git a/src/evo/chainhelper.cpp b/src/evo/chainhelper.cpp
index 9f9c985f5880..ca19f850c8e3 100644
--- a/src/evo/chainhelper.cpp
+++ b/src/evo/chainhelper.cpp
@@ -6,9 +6,12 @@
 
 #include <consensus/params.h>
 #include <evo/specialtxman.h>
+#include <index/txindex.h>
 #include <llmq/chainlocks.h>
 #include <llmq/instantsend.h>
 #include <masternode/payments.h>
+#include <node/transaction.h>
+#include <txmempool.h>
 
 CChainstateHelper::CChainstateHelper(CCreditPoolManager& cpoolman, CDeterministicMNManager& dmnman,
                                      CMNHFManager& mnhfman, CGovernanceManager& govman, llmq::CInstantSendManager& isman,
@@ -58,3 +61,10 @@ bool CChainstateHelper::RemoveConflictingISLockByTx(const CTransaction& tx)
 }
 
 bool CChainstateHelper::ShouldInstantSendRejectConflicts() const { return isman.RejectConflictingBlocks(); }
+
+std::pair<CTransactionRef, uint256> GetTransactionBlock(const uint256& hash, const CTxMemPool* const mempool)
+{
+    uint256 hashBlock{};
+    if (!g_txindex && !mempool) return {nullptr, hashBlock}; // Fast-fail as we don't have any other way to search
+    return {GetTransaction(/*block_index=*/nullptr, mempool, hash, Params().GetConsensus(), hashBlock), hashBlock};
+}
diff --git a/src/evo/chainhelper.h b/src/evo/chainhelper.h
index 6dd94bf1941f..374d59b4f128 100644
--- a/src/evo/chainhelper.h
+++ b/src/evo/chainhelper.h
@@ -18,6 +18,7 @@ class CGovernanceManager;
 class CSpecialTxProcessor;
 class CSporkManager;
 class CTransaction;
+class CTxMemPool;
 class uint256;
 
 namespace Consensus { struct Params; }
@@ -29,6 +30,8 @@ class CQuorumManager;
 class CQuorumSnapshotManager;
 }
 
+using CTransactionRef = std::shared_ptr<const CTransaction>;
+
 class CChainstateHelper
 {
 private:
@@ -63,4 +66,8 @@ class CChainstateHelper
     const std::unique_ptr<CSpecialTxProcessor> special_tx;
 };
 
+/* Retrieve transaction and block from txindex (or mempool) */
+std::pair</*tx=*/CTransactionRef, /*hash_block=*/uint256> GetTransactionBlock(const uint256& hash,
+                                                                              const CTxMemPool* const mempool = nullptr);
+
 #endif // BITCOIN_EVO_CHAINHELPER_H
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
index 008dcaeb7ba2..ee6c4bba93cc 100644
--- a/src/evo/deterministicmns.cpp
+++ b/src/evo/deterministicmns.cpp
@@ -2,6 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/dmn_types.h>
 #include <evo/dmnstate.h>
@@ -13,15 +14,15 @@
 
 #include <base58.h>
 #include <chainparams.h>
+#include <coins.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <script/standard.h>
-#include <validation.h>
-#include <validationinterface.h>
-#include <univalue.h>
 #include <messagesigner.h>
-#include <uint256.h>
+#include <script/standard.h>
 #include <stats/client.h>
+#include <uint256.h>
+#include <univalue.h>
+#include <validationinterface.h>
 
 #include <optional>
 #include <memory>
@@ -51,8 +52,7 @@ UniValue CDeterministicMN::ToJson() const
     obj.pushKV("collateralHash", collateralOutpoint.hash.ToString());
     obj.pushKV("collateralIndex", (int)collateralOutpoint.n);
 
-    uint256 tmpHashBlock;
-    CTransactionRef collateralTx = GetTransaction(/* block_index */ nullptr,  /* mempool */ nullptr, collateralOutpoint.hash, Params().GetConsensus(), tmpHashBlock);
+    auto [collateralTx, _] = GetTransactionBlock(collateralOutpoint.hash);
     if (collateralTx) {
         CTxDestination dest;
         if (ExtractDestination(collateralTx->vout[collateralOutpoint.n].scriptPubKey, dest)) {
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index fc3a850e5d93..8dcf9015887a 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -7,6 +7,7 @@
 #include <bls/bls.h>
 #include <chainparams.h>
 #include <core_io.h>
+#include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
 #include <governance/validators.h>
@@ -467,8 +468,7 @@ bool CGovernanceObject::IsCollateralValid(const ChainstateManager& chainman, std
     uint256 nExpectedHash = GetHash();
 
     // RETRIEVE TRANSACTION IN QUESTION
-    uint256 nBlockHash;
-    CTransactionRef txCollateral = GetTransaction(/* block_index */ nullptr, /* mempool */ nullptr, m_obj.collateralHash, Params().GetConsensus(), nBlockHash);
+    auto [txCollateral, nBlockHash] = GetTransactionBlock(m_obj.collateralHash);
     if (!txCollateral) {
         strError = strprintf("Can't find collateral tx %s", m_obj.collateralHash.ToString());
         LogPrintf("CGovernanceObject::IsCollateralValid -- %s\n", strError);
diff --git a/src/governance/vote.cpp b/src/governance/vote.cpp
index 501078c6caec..3e4473be3c0b 100644
--- a/src/governance/vote.cpp
+++ b/src/governance/vote.cpp
@@ -15,7 +15,6 @@
 #include <timedata.h>
 #include <util/string.h>
 #include <util/system.h>
-#include <validation.h>
 
 #include <evo/deterministicmns.h>
 
diff --git a/src/llmq/chainlocks.cpp b/src/llmq/chainlocks.cpp
index 66f41b49bda5..bd49fd0ad6ad 100644
--- a/src/llmq/chainlocks.cpp
+++ b/src/llmq/chainlocks.cpp
@@ -10,6 +10,7 @@
 #include <chain.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
+#include <evo/chainhelper.h>
 #include <masternode/sync.h>
 #include <node/blockstorage.h>
 #include <node/interface_ui.h>
@@ -635,8 +636,7 @@ void CChainLocksHandler::Cleanup()
         }
     }
     for (auto it = txFirstSeenTime.begin(); it != txFirstSeenTime.end(); ) {
-        uint256 hashBlock;
-        CTransactionRef tx = GetTransaction(/* block_index */ nullptr, &mempool, it->first, Params().GetConsensus(), hashBlock);
+        auto [tx, hashBlock] = GetTransactionBlock(it->first, &mempool);
         if (!tx) {
             // tx has vanished, probably due to conflicts
             it = txFirstSeenTime.erase(it);
diff --git a/src/llmq/dkgsession.cpp b/src/llmq/dkgsession.cpp
index b9dfe63bf421..b5d713bdebbe 100644
--- a/src/llmq/dkgsession.cpp
+++ b/src/llmq/dkgsession.cpp
@@ -21,7 +21,6 @@
 #include <masternode/meta.h>
 #include <masternode/node.h>
 #include <netmessagemaker.h>
-#include <validation.h>
 #include <util/irange.h>
 #include <util/underlying.h>
 
diff --git a/src/llmq/instantsend.cpp b/src/llmq/instantsend.cpp
index 65c881826b99..2b52deeb8f3c 100644
--- a/src/llmq/instantsend.cpp
+++ b/src/llmq/instantsend.cpp
@@ -13,17 +13,18 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <dbwrapper.h>
+#include <evo/chainhelper.h>
 #include <index/txindex.h>
 #include <masternode/sync.h>
 #include <net_processing.h>
 #include <node/blockstorage.h>
 #include <spork.h>
+#include <stats/client.h>
 #include <txmempool.h>
 #include <util/irange.h>
 #include <util/ranges.h>
 #include <util/thread.h>
 #include <validation.h>
-#include <stats/client.h>
 
 #include <cxxtimer.hpp>
 
@@ -574,8 +575,7 @@ bool CInstantSendManager::CheckCanLock(const COutPoint& outpoint, bool printDebu
         return false;
     }
 
-    uint256 hashBlock;
-    CTransactionRef tx = GetTransaction(/* block_index */ nullptr, &mempool, outpoint.hash, params, hashBlock);
+    auto [tx, hashBlock] = GetTransactionBlock(outpoint.hash, &mempool);
     // this relies on enabled txindex and won't work if we ever try to remove the requirement for txindex for masternodes
     if (!tx) {
         if (printDebug) {
@@ -632,8 +632,7 @@ void CInstantSendManager::HandleNewInputLockRecoveredSig(const CRecoveredSig& re
         g_txindex->BlockUntilSyncedToCurrentChain();
     }
 
-    uint256 hashBlock;
-    CTransactionRef tx = GetTransaction(/* block_index */ nullptr, &mempool, txid, Params().GetConsensus(), hashBlock);
+    auto [tx, hashBlock] = GetTransactionBlock(txid, &mempool);
     if (!tx) {
         return;
     }
@@ -1012,8 +1011,7 @@ void CInstantSendManager::ProcessInstantSendLock(NodeId from, PeerManager& peerm
         return;
     }
 
-    uint256 hashBlock;
-    CTransactionRef tx = GetTransaction(/* block_index */ nullptr, &mempool, islock->txid, Params().GetConsensus(), hashBlock);
+    auto [tx, hashBlock] = GetTransactionBlock(islock->txid, &mempool);
     const CBlockIndex* pindexMined{nullptr};
     // we ignore failure here as we must be able to propagate the lock even if we don't have the TX locally
     if (tx && !hashBlock.IsNull()) {
diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
index 7ac0b3316af7..2379e6eeef02 100644
--- a/src/llmq/utils.cpp
+++ b/src/llmq/utils.cpp
@@ -18,7 +18,6 @@
 #include <util/ranges.h>
 #include <util/time.h>
 #include <util/underlying.h>
-#include <validation.h>
 
 #include <atomic>
 #include <optional>
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h
index 846171889f5a..bd0a69381410 100644
--- a/src/rpc/blockchain.h
+++ b/src/rpc/blockchain.h
@@ -10,13 +10,13 @@
 #include <fs.h>
 #include <streams.h>
 #include <sync.h>
-#include <validation.h>
 
 #include <stdint.h>
 #include <vector>
 
 extern RecursiveMutex cs_main;
 
+class BlockManager;
 class CBlock;
 class CBlockIndex;
 class CChainState;
diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp
index 2a1908be33a0..e6baf2717680 100644
--- a/src/rpc/mempool.cpp
+++ b/src/rpc/mempool.cpp
@@ -14,6 +14,7 @@
 #include <rpc/util.h>
 #include <txmempool.h>
 #include <univalue.h>
+#include <validation.h>
 
 #include <llmq/context.h>
 #include <llmq/instantsend.h>
diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp
index b3cb5a95ffcc..adb1f09ba415 100644
--- a/src/test/block_reward_reallocation_tests.cpp
+++ b/src/test/block_reward_reallocation_tests.cpp
@@ -11,6 +11,7 @@
 #include <messagesigner.h>
 #include <netbase.h>
 #include <node/miner.h>
+#include <node/transaction.h>
 #include <script/interpreter.h>
 #include <script/sign.h>
 #include <script/signingprovider.h>
diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index 567b1114a20c..26eae84c15a7 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -10,6 +10,7 @@
 #include <deploymentstatus.h>
 #include <messagesigner.h>
 #include <netbase.h>
+#include <node/transaction.h>
 #include <policy/policy.h>
 #include <script/interpreter.h>
 #include <script/sign.h>
diff --git a/src/validation.cpp b/src/validation.cpp
index b54504fc35ab..c584f55c5bdc 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -726,9 +726,8 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
 
     if (auto conflictLockOpt = m_chain_helper.ConflictingISLockIfAny(tx); conflictLockOpt.has_value()) {
         auto& [_, conflict_txid] = conflictLockOpt.value();
-        uint256 hashBlock;
-        CTransactionRef txConflict = GetTransaction(/* block_index */ nullptr, &m_pool, conflict_txid, chainparams.GetConsensus(), hashBlock);
-        if (txConflict) {
+
+        if (auto [txConflict, _] = GetTransactionBlock(conflict_txid, &m_pool); txConflict) {
             GetMainSignals().NotifyInstantSendDoubleSpendAttempt(ptx, txConflict);
         }
         LogPrintf("ERROR: AcceptToMemoryPool : Transaction %s conflicts with locked TX %s\n", hash.ToString(), conflict_txid.ToString());
diff --git a/src/validation.h b/src/validation.h
index 51f91d3b2475..de466aab6ec9 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -139,8 +139,6 @@ void StartScriptCheckWorkerThreads(int threads_num);
 /** Stop all of the script checking worker threads */
 void StopScriptCheckWorkerThreads();
 
-CTransactionRef GetTransaction(const CBlockIndex* const block_index, const CTxMemPool* const mempool, const uint256& hash, const Consensus::Params& consensusParams, uint256& hashBlock);
-
 double ConvertBitsToDouble(unsigned int nBits);
 /**
  * Due to difference in logic, the GetBlockSubsidy() has also different list of
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index 87d9a133a710..bfaead0ca5c6 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -36,19 +36,24 @@
     "coinjoin/server -> net_processing -> coinjoin/server",
     "common/bloom -> evo/assetlocktx -> llmq/quorums -> net -> common/bloom",
     "common/bloom -> evo/assetlocktx -> llmq/signing -> net_processing -> merkleblock -> common/bloom",
-    "consensus/tx_verify -> evo/assetlocktx -> validation -> consensus/tx_verify",
-    "consensus/tx_verify -> evo/assetlocktx -> validation -> txmempool -> consensus/tx_verify",
+    "consensus/tx_verify -> evo/assetlocktx -> llmq/commitment -> validation -> consensus/tx_verify",
+    "consensus/tx_verify -> evo/assetlocktx -> llmq/signing -> net_processing -> txmempool -> consensus/tx_verify",
     "core_io -> evo/cbtx -> evo/simplifiedmns -> core_io",
     "dsnotificationinterface -> llmq/chainlocks -> node/blockstorage -> dsnotificationinterface",
-    "evo/assetlocktx -> validation -> txmempool -> evo/assetlocktx",
+    "evo/assetlocktx -> llmq/signing -> net_processing -> txmempool -> evo/assetlocktx",
     "evo/cbtx -> evo/simplifiedmns -> evo/cbtx",
+    "evo/chainhelper -> evo/specialtxman -> evo/deterministicmns -> evo/chainhelper",
     "evo/chainhelper -> evo/specialtxman -> validation -> evo/chainhelper",
+    "evo/chainhelper -> llmq/chainlocks -> evo/chainhelper",
+    "evo/chainhelper -> llmq/instantsend -> evo/chainhelper",
+    "evo/chainhelper -> masternode/payments -> governance/classes -> governance/object -> evo/chainhelper",
+    "evo/chainhelper -> node/transaction -> node/context -> evo/chainhelper",
     "evo/deterministicmns -> llmq/commitment -> evo/deterministicmns",
+    "evo/deterministicmns -> llmq/commitment -> validation -> evo/deterministicmns",
+    "evo/deterministicmns -> llmq/commitment -> validation -> txmempool -> evo/deterministicmns",
     "evo/deterministicmns -> llmq/utils -> evo/deterministicmns",
     "evo/deterministicmns -> llmq/utils -> llmq/snapshot -> evo/simplifiedmns -> evo/deterministicmns",
     "evo/deterministicmns -> llmq/utils -> net -> evo/deterministicmns",
-    "evo/deterministicmns -> validation -> evo/deterministicmns",
-    "evo/deterministicmns -> validation -> txmempool -> evo/deterministicmns",
     "evo/deterministicmns -> validationinterface -> evo/deterministicmns",
     "evo/deterministicmns -> validationinterface -> governance/vote -> evo/deterministicmns",
     "evo/mnhftx -> validation -> evo/mnhftx",

From 7dd0daab07a89391965f60140114f313faf405be Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 20 Apr 2025 21:20:07 +0000
Subject: [PATCH 03/10] fix: resolve `-Woverloaded-virtual` warning

---
 src/wallet/scriptpubkeyman.cpp | 6 ++++++
 src/wallet/scriptpubkeyman.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp
index c12549110087..2191f57526f5 100644
--- a/src/wallet/scriptpubkeyman.cpp
+++ b/src/wallet/scriptpubkeyman.cpp
@@ -1825,6 +1825,12 @@ isminetype DescriptorScriptPubKeyMan::IsMine(const CScript& script) const
     return ISMINE_NO;
 }
 
+isminetype DescriptorScriptPubKeyMan::IsMine(const CTxDestination& dest) const
+{
+    CScript script = GetScriptForDestination(dest);
+    return IsMine(script);
+}
+
 bool DescriptorScriptPubKeyMan::CheckDecryptionKey(const CKeyingMaterial& master_key, bool accept_no_keys)
 {
     LOCK(cs_desc_man);
diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h
index 1ada71281df2..2686ce4d41ea 100644
--- a/src/wallet/scriptpubkeyman.h
+++ b/src/wallet/scriptpubkeyman.h
@@ -544,6 +544,7 @@ class DescriptorScriptPubKeyMan : public ScriptPubKeyMan
 
     bool GetNewDestination(CTxDestination& dest, bilingual_str& error) override;
     isminetype IsMine(const CScript& script) const override;
+    isminetype IsMine(const CTxDestination& dest) const override;
 
     bool CheckDecryptionKey(const CKeyingMaterial& master_key, bool accept_no_keys = false) override;
     bool Encrypt(const CKeyingMaterial& master_key, WalletBatch* batch) override;

From b208018d6f57e306b34a4fc2e14e5bd8ce8703f2 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 20 Apr 2025 21:21:37 +0000
Subject: [PATCH 04/10] fix: resolve `-Wignored-qualifiers` warning

---
 src/util/irange.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/irange.h b/src/util/irange.h
index da951662e7a1..f450dd83dfd9 100644
--- a/src/util/irange.h
+++ b/src/util/irange.h
@@ -40,7 +40,7 @@ class Range {
                                                                            positive_step_(step_ > 0) {}
         iterator operator++() { value_ += step_; return *this; }
         reference operator*() { return value_; }
-        const pointer operator->() { return &value_; }
+        pointer operator->() { return &value_; }
         bool operator==(const iterator& rhs) const { return positive_step_ ? (value_ >= rhs.value_ && value_ > boundary_)
                                                                            : (value_ <= rhs.value_ && value_ < boundary_); }
         bool operator!=(const iterator& rhs) const { return positive_step_ ? (value_ < rhs.value_ && value_ >= boundary_)

From 7a653155a8af63203a618de30d049f975e05289c Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 20 Apr 2025 21:28:28 +0000
Subject: [PATCH 05/10] fix: resolve `-Wmaybe-uninitialized` warnings

---
 src/util/wpipe.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/wpipe.cpp b/src/util/wpipe.cpp
index 732e23c791e5..e3e3979256c1 100644
--- a/src/util/wpipe.cpp
+++ b/src/util/wpipe.cpp
@@ -64,7 +64,7 @@ void WakeupPipe::Drain() const
     assert(m_valid && m_pipe[0] != -1);
 
     int ret{0};
-    std::array<uint8_t, 128> buf;
+    std::array<uint8_t, 128> buf{};
     do {
         ret = read(m_pipe[0], buf.data(), buf.size());
     } while (ret > 0);
@@ -78,7 +78,7 @@ void WakeupPipe::Write()
 #ifdef USE_WAKEUP_PIPE
     assert(m_valid && m_pipe[1] != -1);
 
-    std::array<uint8_t, EXPECTED_PIPE_WRITTEN_BYTES> buf;
+    std::array<uint8_t, EXPECTED_PIPE_WRITTEN_BYTES> buf{};
     int ret = write(m_pipe[1], buf.data(), buf.size());
     if (ret == -1) {
         LogPrintf("write() to m_pipe[1] = %d failed with error %s\n", m_pipe[1], NetworkErrorString(WSAGetLastError()));

From 18fcb26be5ce510fff79248a1e66e7e3440720ef Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Mon, 21 Apr 2025 09:08:06 +0000
Subject: [PATCH 06/10] fix: resolve `-Wunused-function` warning

---
 src/stacktraces.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stacktraces.cpp b/src/stacktraces.cpp
index 8696c097484a..fb364df9fa45 100644
--- a/src/stacktraces.cpp
+++ b/src/stacktraces.cpp
@@ -146,6 +146,7 @@ static uint64_t GetBaseAddress()
     return 0;
 }
 
+#ifdef ENABLE_STACKTRACES
 // PC addresses returned by StackWalk64 are in the real mapped space, while libbacktrace expects them to be in the
 // default mapped space starting at 0x400000. This method converts the address.
 // TODO this is probably the same reason libbacktrace is not able to gather the stacktrace on Windows (returns pointers like 0x1 or 0xfffffff)
@@ -161,6 +162,7 @@ static uint64_t ConvertAddress(uint64_t addr)
     uint64_t offset = addr - hMod;
     return 0x400000 + offset;
 }
+#endif // ENABLE_STACKTRACES
 
 static __attribute__((noinline)) std::vector<uint64_t> GetStackFrames(size_t skip, size_t max_frames, const CONTEXT* pContext = nullptr)
 {

From 9aab60b92eac82eeb1576902e1acd3944ce37f3a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 25 Apr 2025 18:22:25 +0000
Subject: [PATCH 07/10] build: don't error on `-Warray-bounds` and
 `-Wdangling-reference` with GCC

Currently, `-Warray-bounds` is triggered by `immer` code and
`-Wdangling-reference` is triggered by UniValue-adjacent code.

Co-authored-by: Konstantin Akimov <knstqq@gmail.com>
---
 configure.ac | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/configure.ac b/configure.ac
index 41ba2952771b..b04b4a830bba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,6 +452,22 @@ if test "$enable_werror" = "yes"; then
   fi
   ERROR_CXXFLAGS=$CXXFLAG_WERROR
 
+  dnl -Warray-bounds and -Wdangling-reference cause problems with GCC. Do not treat these warnings as errors.
+  dnl Suppress -Warray-bounds entirely because of noisy output, currently unhappy with immer implementation.
+  AX_CHECK_COMPILE_FLAG([-Warray-bounds], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-array-bounds"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
+    #if defined(__clang__) || defined(__INTEL_COMPILER) || !defined(__GNUC__)
+      #error Non-GCC compiler detected, not setting flag
+    #endif
+    int main(void) { return 0; }
+  ])])
+  dnl TODO: Remove suppression after backporting bitcoin#27605
+  AX_CHECK_COMPILE_FLAG([-Wdangling-reference], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-error=dangling-reference"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
+    #if defined(__clang__) || defined(__INTEL_COMPILER) || !defined(__GNUC__)
+      #error Non-GCC compiler detected, not setting flag
+    #endif
+    int main(void) { return 0; }
+  ])])
+
   dnl -Wstringop-overread and -Wstringop-overflow are broken in gcc
   AX_CHECK_COMPILE_FLAG([-Wstringop-overread], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wno-stringop-overread"], [], [$CXXFLAG_WERROR])
   AX_CHECK_COMPILE_FLAG([-Wstringop-overflow], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wno-stringop-overflow"], [], [$CXXFLAG_WERROR])

From 6bff03b0cb301c5dc2b3f29beb6ebaf12eb8b005 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 25 Apr 2025 13:35:03 +0000
Subject: [PATCH 08/10] build: don't error on `-Wattributes` with GCC <14

We need to annotate `CHDPubKey::nVersion` with `[[maybe_unused]]` to
avoid upsetting Clang due to `-Wunused-private-field`. GCC 11 doesn't
seem to emit a warning for that variable and therefore, finds the
annotation unnecessary, triggering an error due to `-Wattributes`.

Since both Clang 18 and GCC 14 agree with the `-Wunused-private-field`
assessment, we are better off suppressing `-Wattributes` error-like
treatment on lower compiler versions.
---
 configure.ac | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index b04b4a830bba..348a7d01cd15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -468,6 +468,16 @@ if test "$enable_werror" = "yes"; then
     int main(void) { return 0; }
   ])])
 
+  dnl -Wattributes cause problems with some versions of GCC. Do not treat these warnings as errors.
+  AX_CHECK_COMPILE_FLAG([-Wattributes], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-error=attributes"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
+    #if defined(__clang__) || defined(__INTEL_COMPILER) || !defined(__GNUC__)
+      #error Non-GCC compiler detected, not setting flag
+    #elif defined(__GNUC__) && __GNUC__ >= 14
+      #error GCC >=14 detected, not setting flag
+    #endif
+    int main(void) { return 0; }
+  ])])
+
   dnl -Wstringop-overread and -Wstringop-overflow are broken in gcc
   AX_CHECK_COMPILE_FLAG([-Wstringop-overread], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wno-stringop-overread"], [], [$CXXFLAG_WERROR])
   AX_CHECK_COMPILE_FLAG([-Wstringop-overflow], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wno-stringop-overflow"], [], [$CXXFLAG_WERROR])

From 96e494cf25e93a98ec62ab7f527287d70cb54928 Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Fri, 25 Apr 2025 18:21:36 +0000
Subject: [PATCH 09/10] build: constrain `-Wstringop-over{read,flow}`
 suppression to GCC only

Also, move it to `NOWARN_CXXFLAGS`, which is placed *after*
`WARN_CXXFLAGS`.
---
 configure.ac | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 348a7d01cd15..2aded2cac746 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,9 +478,19 @@ if test "$enable_werror" = "yes"; then
     int main(void) { return 0; }
   ])])
 
-  dnl -Wstringop-overread and -Wstringop-overflow are broken in gcc
-  AX_CHECK_COMPILE_FLAG([-Wstringop-overread], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wno-stringop-overread"], [], [$CXXFLAG_WERROR])
-  AX_CHECK_COMPILE_FLAG([-Wstringop-overflow], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wno-stringop-overflow"], [], [$CXXFLAG_WERROR])
+  dnl -Wstringop-overread and -Wstringop-overflow are broken in GCC. Suppress warnings entirely to avoid noisy output.
+  AX_CHECK_COMPILE_FLAG([-Wstringop-overread], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-stringop-overread"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
+    #if defined(__clang__) || defined(__INTEL_COMPILER) || !defined(__GNUC__)
+      #error Non-GCC compiler detected, not setting flag
+    #endif
+    int main(void) { return 0; }
+  ])])
+  AX_CHECK_COMPILE_FLAG([-Wstringop-overflow], [NOWARN_CXXFLAGS="$NOWARN_CXXFLAGS -Wno-stringop-overflow"], [], [$CXXFLAG_WERROR], [AC_LANG_SOURCE([
+    #if defined(__clang__) || defined(__INTEL_COMPILER) || !defined(__GNUC__)
+      #error Non-GCC compiler detected, not setting flag
+    #endif
+    int main(void) { return 0; }
+  ])])
 fi
 
 AX_CHECK_COMPILE_FLAG([-Wall], [WARN_CXXFLAGS="$WARN_CXXFLAGS -Wall"], [], [$CXXFLAG_WERROR])

From 40caa7dc74d3f7bf34a09f4a0bf96ee893898c1e Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Sun, 20 Apr 2025 22:40:26 +0000
Subject: [PATCH 10/10] revert: don't build using `-Werror` when using GCC

reverts:
- ba4270519560469afee30c142fd02eebd9d5a09c
---
 ci/test/00_setup_env_arm.sh             | 1 -
 ci/test/00_setup_env_native_nowallet.sh | 1 -
 ci/test/00_setup_env_native_qt5.sh      | 1 -
 ci/test/00_setup_env_native_sqlite.sh   | 1 -
 ci/test/00_setup_env_win64.sh           | 1 -
 5 files changed, 5 deletions(-)

diff --git a/ci/test/00_setup_env_arm.sh b/ci/test/00_setup_env_arm.sh
index 53807359718e..7e3136d5844d 100755
--- a/ci/test/00_setup_env_arm.sh
+++ b/ci/test/00_setup_env_arm.sh
@@ -26,4 +26,3 @@ export GOAL="install"
 # -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
 # This could be removed once the ABI change warning does not show up by default
 export BITCOIN_CONFIG="--enable-reduce-exports CXXFLAGS=-Wno-psabi --with-boost-process"
-export NO_WERROR=1
diff --git a/ci/test/00_setup_env_native_nowallet.sh b/ci/test/00_setup_env_native_nowallet.sh
index cf76fd67f416..3637d3b8d0da 100755
--- a/ci/test/00_setup_env_native_nowallet.sh
+++ b/ci/test/00_setup_env_native_nowallet.sh
@@ -12,4 +12,3 @@ export PACKAGES="python3-zmq"
 export DEP_OPTS="NO_WALLET=1 CC=gcc-14 CXX=g++-14"
 export GOAL="install"
 export BITCOIN_CONFIG="--enable-reduce-exports --with-boost-process CC=gcc-14 CXX=g++-14"
-export NO_WERROR=1
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh
index 2a9866383067..7614ae933ef2 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_qt5.sh
@@ -16,4 +16,3 @@ export RUN_UNIT_TESTS="false"
 export GOAL="install"
 export PREVIOUS_RELEASES_TO_DOWNLOAD="v0.15.0.0 v0.16.1.1 v0.17.0.3 v18.2.2 v19.3.0 v20.0.1"
 export BITCOIN_CONFIG="--enable-zmq --with-libs=no --enable-reduce-exports --disable-fuzz-binary LDFLAGS=-static-libstdc++ --with-boost-process"
-export NO_WERROR=1
diff --git a/ci/test/00_setup_env_native_sqlite.sh b/ci/test/00_setup_env_native_sqlite.sh
index ec35f4061f7a..8af6d3fd9ae9 100755
--- a/ci/test/00_setup_env_native_sqlite.sh
+++ b/ci/test/00_setup_env_native_sqlite.sh
@@ -11,4 +11,3 @@ export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libhar
 export DEP_OPTS="NO_BDB=1 NO_UPNP=1 DEBUG=1"
 export GOAL="install"
 export BITCOIN_CONFIG="--enable-zmq --enable-reduce-exports --with-sqlite --without-bdb CC=gcc-11 CXX=g++-11"
-export NO_WERROR=1
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
index f1a4356f772d..fa39b532213e 100755
--- a/ci/test/00_setup_env_win64.sh
+++ b/ci/test/00_setup_env_win64.sh
@@ -18,4 +18,3 @@ export GOAL="deploy"
 # https://github.com/mingw-w64/mingw-w64/commit/1690994f515910a31b9fb7c7bd3a52d4ba987abe
 export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner --without-boost-process CXXFLAGS='-Wno-return-type -Wno-error=maybe-uninitialized -Wno-error=array-bounds'"
 export DIRECT_WINE_EXEC_TESTS=true
-export NO_WERROR=1