refactor: consolidate masternode mode logic to src/active/

kwvg · kwvg · commit 18d7f5cc3316 · 2025-12-14T04:18:27.000+05:30
Also:
- Headers cleanup
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -145,8 +145,10 @@ endif
 .PHONY: FORCE check-symbols check-security
 # dash core #
 BITCOIN_CORE_H = \
+  active/context.h \
   active/dkgsession.h \
   active/dkgsessionhandler.h \
+  active/masternode.h \
   active/quorums.h \
   addrdb.h \
   addressindex.h \
@@ -287,8 +289,6 @@ BITCOIN_CORE_H = \
   logging.h \
   logging/timer.h \
   mapport.h \
-  masternode/active/context.h \
-  masternode/node.h \
   masternode/meta.h \
   masternode/payments.h \
   masternode/sync.h \
@@ -475,8 +475,10 @@ libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 libbitcoin_node_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
 libbitcoin_node_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_node_a_SOURCES = \
+  active/context.cpp \
   active/dkgsession.cpp \
   active/dkgsessionhandler.cpp \
+  active/masternode.cpp \
   active/quorums.cpp \
   addrdb.cpp \
   addressindex.cpp \
@@ -556,8 +558,6 @@ libbitcoin_node_a_SOURCES = \
   llmq/observer/context.cpp \
   llmq/observer/quorums.cpp \
   mapport.cpp \
-  masternode/active/context.cpp \
-  masternode/node.cpp \
   masternode/meta.cpp \
   masternode/payments.cpp \
   masternode/sync.cpp \
diff --git a/src/active/context.cpp b/src/active/context.cpp
@@ -2,9 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <masternode/active/context.h>
+#include <active/context.h>
 
 #include <active/dkgsessionhandler.h>
+#include <active/masternode.h>
 #include <active/quorums.h>
 #include <chainlock/chainlock.h>
 #include <chainlock/signing.h>
@@ -19,7 +20,6 @@
 #include <llmq/ehf_signals.h>
 #include <llmq/quorumsman.h>
 #include <llmq/signing_shares.h>
-#include <masternode/node.h>
 #include <validation.h>
 
 ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
diff --git a/src/active/context.h b/src/active/context.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_MASTERNODE_ACTIVE_CONTEXT_H
-#define BITCOIN_MASTERNODE_ACTIVE_CONTEXT_H
+#ifndef BITCOIN_ACTIVE_CONTEXT_H
+#define BITCOIN_ACTIVE_CONTEXT_H
 
 #include <llmq/options.h>
 
@@ -99,4 +99,4 @@ struct ActiveContext final : public CValidationInterface {
     const std::unique_ptr<instantsend::InstantSendSigner> is_signer;
 };
 
-#endif // BITCOIN_MASTERNODE_ACTIVE_CONTEXT_H
+#endif // BITCOIN_ACTIVE_CONTEXT_H
diff --git a/src/active/dkgsession.cpp b/src/active/dkgsession.cpp
@@ -4,13 +4,13 @@
 
 #include <active/dkgsession.h>
 
+#include <active/masternode.h>
 #include <evo/deterministicmns.h>
 #include <llmq/debug.h>
 #include <llmq/dkgsessionhandler.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/options.h>
 #include <masternode/meta.h>
-#include <masternode/node.h>
 
 #include <chain.h>
 #include <deploymentstatus.h>
diff --git a/src/active/dkgsessionhandler.cpp b/src/active/dkgsessionhandler.cpp
@@ -5,13 +5,13 @@
 #include <active/dkgsessionhandler.h>
 
 #include <active/dkgsession.h>
+#include <active/masternode.h>
 #include <evo/deterministicmns.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/debug.h>
 #include <llmq/dkgsession.h>
 #include <llmq/options.h>
 #include <llmq/utils.h>
-#include <masternode/node.h>
 
 #include <deploymentstatus.h>
 #include <logging.h>
diff --git a/src/active/masternode.cpp b/src/active/masternode.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <masternode/node.h>
+#include <active/masternode.h>
 
 #include <bls/bls_ies.h>
 #include <chainparams.h>
diff --git a/src/active/masternode.h b/src/active/masternode.h
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_MASTERNODE_NODE_H
-#define BITCOIN_MASTERNODE_NODE_H
+#ifndef BITCOIN_ACTIVE_MASTERNODE_H
+#define BITCOIN_ACTIVE_MASTERNODE_H
 
 #include <bls/bls.h>
 
@@ -74,4 +74,4 @@ class CActiveMasternodeManager
     bool GetLocalAddress(CService& addrRet) EXCLUSIVE_LOCKS_REQUIRED(cs);
 };
 
-#endif // BITCOIN_MASTERNODE_NODE_H
+#endif // BITCOIN_ACTIVE_MASTERNODE_H
diff --git a/src/active/quorums.cpp b/src/active/quorums.cpp
@@ -4,14 +4,14 @@
 
 #include <active/quorums.h>
 
+#include <active/masternode.h>
 #include <bls/bls_ies.h>
 #include <evo/deterministicmns.h>
 #include <llmq/commitment.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/options.h>
 #include <llmq/quorums.h>
 #include <llmq/utils.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 
 #include <chain.h>
diff --git a/src/coinjoin/server.cpp b/src/coinjoin/server.cpp
@@ -4,20 +4,21 @@
 
 #include <coinjoin/server.h>
 
-#include <core_io.h>
+#include <active/masternode.h>
 #include <evo/deterministicmns.h>
 #include <masternode/meta.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
+#include <util/ranges.h>
+
+#include <core_io.h>
 #include <net.h>
-#include <netmessagemaker.h>
 #include <net_processing.h>
+#include <netmessagemaker.h>
 #include <script/interpreter.h>
 #include <shutdown.h>
 #include <streams.h>
 #include <txmempool.h>
 #include <util/moneystr.h>
-#include <util/ranges.h>
 #include <util/system.h>
 #include <validation.h>
 
diff --git a/src/evo/mnauth.cpp b/src/evo/mnauth.cpp
@@ -4,13 +4,14 @@
 
 #include <evo/mnauth.h>
 
+#include <active/masternode.h>
 #include <bls/bls.h>
-#include <chainparams.h>
 #include <evo/deterministicmns.h>
 #include <llmq/utils.h>
 #include <masternode/meta.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
+
+#include <chainparams.h>
 #include <net.h>
 #include <netmessagemaker.h>
 #include <util/time.h>
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
@@ -4,9 +4,9 @@
 
 #include <governance/signing.h>
 
+#include <active/masternode.h>
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 
 #include <chainparams.h>
diff --git a/src/init.cpp b/src/init.cpp
@@ -76,6 +76,8 @@
 #include <validationinterface.h>
 #include <walletinitinterface.h>
 
+#include <active/context.h>
+#include <active/masternode.h>
 #include <bls/bls.h>
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/server.h>
@@ -95,9 +97,7 @@
 #include <llmq/net_signing.h>
 #include <llmq/options.h>
 #include <llmq/observer/context.h>
-#include <masternode/active/context.h>
 #include <masternode/meta.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
 #include <masternode/utils.h>
 #include <messagesigner.h>
diff --git a/src/llmq/dkgsessionhandler.cpp b/src/llmq/dkgsessionhandler.cpp
@@ -4,22 +4,19 @@
 
 #include <llmq/dkgsessionhandler.h>
 
+#include <evo/deterministicmns.h>
 #include <llmq/commitment.h>
-#include <llmq/dkgsession.h>
-#include <llmq/blockprocessor.h>
 #include <llmq/debug.h>
+#include <llmq/dkgsession.h>
 #include <llmq/options.h>
 #include <llmq/utils.h>
-
-#include <evo/deterministicmns.h>
+#include <util/underlying.h>
 
 #include <deploymentstatus.h>
-#include <masternode/node.h>
 #include <chainparams.h>
 #include <net_processing.h>
 #include <validation.h>
 #include <util/thread.h>
-#include <util/underlying.h>
 
 namespace llmq {
 CDKGSessionHandler::CDKGSessionHandler(CBLSWorker& _blsWorker, CDeterministicMNManager& dmnman,
diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp
@@ -4,23 +4,23 @@
 
 #include <llmq/signing_shares.h>
 
+#include <active/masternode.h>
+#include <bls/bls_batchverifier.h>
+#include <evo/deterministicmns.h>
 #include <llmq/commitment.h>
 #include <llmq/options.h>
 #include <llmq/quorumsman.h>
 #include <llmq/signhash.h>
 #include <llmq/signing.h>
+#include <spork.h>
+#include <util/irange.h>
+#include <util/underlying.h>
 
-#include <bls/bls_batchverifier.h>
 #include <chainparams.h>
-#include <evo/deterministicmns.h>
-#include <masternode/node.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
-#include <spork.h>
-#include <util/irange.h>
 #include <util/thread.h>
 #include <util/time.h>
-#include <util/underlying.h>
 #include <validation.h>
 
 #include <cxxtimer.hpp>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -40,6 +40,7 @@
 #include <util/underlying.h>
 #include <validation.h>
 
+#include <active/context.h>
 #include <chainlock/chainlock.h>
 #include <coinjoin/server.h>
 #include <coinjoin/walletman.h>
@@ -60,7 +61,6 @@
 #include <llmq/signing_shares.h>
 #include <llmq/snapshot.h>
 #include <llmq/observer/context.h>
-#include <masternode/active/context.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
 #include <msg_result.h>
diff --git a/src/node/context.cpp b/src/node/context.cpp
@@ -6,6 +6,17 @@
 
 #include <addrman.h>
 #include <banman.h>
+#include <interfaces/chain.h>
+#include <net.h>
+#include <netfulfilledman.h>
+#include <net_processing.h>
+#include <netgroup.h>
+#include <policy/fees.h>
+#include <scheduler.h>
+#include <txmempool.h>
+#include <validation.h>
+
+#include <active/context.h>
 #include <coinjoin/coinjoin.h>
 #include <coinjoin/walletman.h>
 #include <evo/chainhelper.h>
@@ -14,22 +25,12 @@
 #include <evo/evodb.h>
 #include <evo/mnhftx.h>
 #include <governance/governance.h>
-#include <interfaces/chain.h>
 #include <interfaces/coinjoin.h>
 #include <llmq/context.h>
 #include <llmq/observer/context.h>
-#include <masternode/active/context.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
-#include <net.h>
-#include <netfulfilledman.h>
-#include <net_processing.h>
-#include <netgroup.h>
-#include <policy/fees.h>
-#include <scheduler.h>
 #include <spork.h>
-#include <txmempool.h>
-#include <validation.h>
 
 namespace node {
 NodeContext::NodeContext() = default;
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
@@ -2,9 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coinjoin/server.h>
-#include <coinjoin/walletman.h>
-#include <masternode/active/context.h>
 #include <node/context.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
@@ -14,6 +11,10 @@
 #include <wallet/rpc/util.h>
 #include <walletinitinterface.h>
 
+#include <active/context.h>
+#include <coinjoin/server.h>
+#include <coinjoin/walletman.h>
+
 #ifdef ENABLE_WALLET
 #include <coinjoin/options.h>
 #include <interfaces/coinjoin.h>
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
@@ -2,18 +2,19 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <chainparams.h>
-#include <core_io.h>
+#include <active/context.h>
+#include <active/masternode.h>
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
 #include <governance/common.h>
 #include <governance/governance.h>
 #include <governance/validators.h>
 #include <governance/vote.h>
-#include <index/txindex.h>
-#include <masternode/active/context.h>
-#include <masternode/node.h>
 #include <masternode/sync.h>
+
+#include <chainparams.h>
+#include <core_io.h>
+#include <index/txindex.h>
 #include <node/context.h>
 #include <rpc/server.h>
 #include <rpc/server_util.h>
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
diff --git a/src/test/coinjoin_queue_tests.cpp b/src/test/coinjoin_queue_tests.cpp
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
diff --git a/src/test/net_peer_connection_tests.cpp b/src/test/net_peer_connection_tests.cpp
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
diff --git a/test/util/data/non-backported.txt b/test/util/data/non-backported.txt
