refactor: llmq/chainlocks.{cpp,h} > chainlock/chainlock.{cpp,h}

kwvg · kwvg · commit 021062cd3167 · 2025-08-02T16:56:34.000Z
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -150,6 +150,7 @@ BITCOIN_CORE_H = \
   cachemultimap.h \
   blockfilter.h \
   chain.h \
+  chainlock/chainlock.h \
   chainlock/clsig.h \
   chainparams.h \
   chainparamsbase.h \
@@ -240,7 +241,6 @@ BITCOIN_CORE_H = \
   key_io.h \
   limitedmap.h \
   llmq/blockprocessor.h \
-  llmq/chainlocks.h \
   llmq/commitment.h \
   llmq/context.h \
   llmq/debug.h \
@@ -455,6 +455,7 @@ libbitcoin_node_a_SOURCES = \
   blockencodings.cpp \
   blockfilter.cpp \
   chain.cpp \
+  chainlock/chainlock.cpp \
   chainlock/clsig.cpp \
   coinjoin/coinjoin.cpp \
   coinjoin/context.cpp \
@@ -499,7 +500,6 @@ libbitcoin_node_a_SOURCES = \
   instantsend/lock.cpp \
   instantsend/signing.cpp \
   llmq/blockprocessor.cpp \
-  llmq/chainlocks.cpp \
   llmq/commitment.cpp \
   llmq/context.cpp \
   llmq/debug.cpp \
diff --git a/src/bench/rpc_blockchain.cpp b/src/bench/rpc_blockchain.cpp
@@ -5,9 +5,9 @@
 #include <bench/bench.h>
 #include <bench/data.h>
 
+#include <chainlock/chainlock.h>
 #include <consensus/validation.h>
 #include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <rpc/blockchain.h>
 #include <streams.h>
diff --git a/src/chainlock/chainlock.cpp b/src/chainlock/chainlock.cpp
@@ -2,26 +2,27 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <llmq/chainlocks.h>
-#include <llmq/quorums.h>
+#include <chainlock/chainlock.h>
 
 #include <chain.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
-#include <instantsend/instantsend.h>
-#include <masternode/sync.h>
 #include <node/blockstorage.h>
 #include <node/interface_ui.h>
 #include <scheduler.h>
-#include <spork.h>
-#include <stats/client.h>
 #include <txmempool.h>
 #include <util/thread.h>
 #include <util/time.h>
 #include <util/underlying.h>
 #include <validation.h>
 #include <validationinterface.h>
 
+#include <instantsend/instantsend.h>
+#include <llmq/quorums.h>
+#include <masternode/sync.h>
+#include <spork.h>
+#include <stats/client.h>
+
 using node::ReadBlockFromDisk;
 
 // Forward declaration to break dependency over node/transaction.h
diff --git a/src/chainlock/chainlock.h b/src/chainlock/chainlock.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_LLMQ_CHAINLOCKS_H
-#define BITCOIN_LLMQ_CHAINLOCKS_H
+#ifndef BITCOIN_CHAINLOCK_CHAINLOCK_H
+#define BITCOIN_CHAINLOCK_CHAINLOCK_H
 
 #include <chainlock/clsig.h>
 
@@ -130,4 +130,4 @@ class CChainLocksHandler : public CRecoveredSigsListener
 bool AreChainLocksEnabled(const CSporkManager& sporkman);
 } // namespace llmq
 
-#endif // BITCOIN_LLMQ_CHAINLOCKS_H
+#endif // BITCOIN_CHAINLOCK_CHAINLOCK_H
diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
@@ -4,20 +4,21 @@
 
 #include <coinjoin/coinjoin.h>
 
-#include <bls/bls.h>
 #include <chain.h>
 #include <chainparams.h>
-#include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
-#include <masternode/node.h>
-#include <masternode/sync.h>
 #include <txmempool.h>
 #include <util/moneystr.h>
 #include <util/system.h>
 #include <util/translation.h>
 #include <validation.h>
-
 #include <tinyformat.h>
+
+#include <bls/bls.h>
+#include <chainlock/chainlock.h>
+#include <instantsend/instantsend.h>
+#include <masternode/node.h>
+#include <masternode/sync.h>
+
 #include <string>
 
 constexpr static CAmount DEFAULT_MAX_RAW_TX_FEE{COIN / 10};
diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
@@ -12,10 +12,10 @@
 #include <masternode/sync.h>
 #include <validation.h>
 
+#include <chainlock/chainlock.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
 #include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/ehf_signals.h>
diff --git a/src/evo/chainhelper.cpp b/src/evo/chainhelper.cpp
@@ -5,10 +5,11 @@
 #include <evo/chainhelper.h>
 
 #include <chainparams.h>
+
+#include <chainlock/chainlock.h>
 #include <evo/specialtxman.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/lock.h>
-#include <llmq/chainlocks.h>
 #include <masternode/payments.h>
 
 CChainstateHelper::CChainstateHelper(CCreditPoolManager& cpoolman, CDeterministicMNManager& dmnman,
diff --git a/src/evo/specialtxman.cpp b/src/evo/specialtxman.cpp
@@ -13,6 +13,7 @@
 #include <util/irange.h>
 #include <validation.h>
 
+#include <chainlock/chainlock.h>
 #include <chainlock/clsig.h>
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
@@ -21,7 +22,6 @@
 #include <evo/mnhftx.h>
 #include <evo/simplifiedmns.h>
 #include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
 #include <llmq/commitment.h>
 #include <llmq/quorums.h>
 #include <llmq/utils.h>
diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
@@ -8,18 +8,18 @@
 #include <consensus/validation.h>
 #include <net_processing.h>
 #include <node/blockstorage.h>
-#include <stats/client.h>
 #include <txmempool.h>
 #include <util/thread.h>
 #include <validation.h>
 
 #include <bls/bls_batchverifier.h>
+#include <chainlock/chainlock.h>
 #include <instantsend/signing.h>
-#include <llmq/chainlocks.h>
 #include <llmq/commitment.h>
 #include <llmq/quorums.h>
 #include <masternode/sync.h>
 #include <spork.h>
+#include <stats/client.h>
 
 #include <cxxtimer.hpp>
 
diff --git a/src/instantsend/signing.cpp b/src/instantsend/signing.cpp
@@ -11,7 +11,7 @@
 #include <util/irange.h>
 #include <validation.h>
 
-#include <llmq/chainlocks.h>
+#include <chainlock/chainlock.h>
 #include <llmq/quorums.h>
 #include <masternode/sync.h>
 #include <spork.h>
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
@@ -5,9 +5,9 @@
 #include <llmq/context.h>
 
 #include <bls/bls_worker.h>
+#include <chainlock/chainlock.h>
 #include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
 #include <llmq/debug.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/ehf_signals.h>
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -59,13 +59,13 @@
 #include <coinjoin/context.h>
 #include <coinjoin/server.h>
 
+#include <chainlock/chainlock.h>
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
 #include <evo/smldiff.h>
 #include <instantsend/lock.h>
 #include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
 #include <llmq/commitment.h>
 #include <llmq/context.h>
 #include <llmq/dkgsession.h>
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
@@ -7,6 +7,7 @@
 #include <addrdb.h>
 #include <banman.h>
 #include <chain.h>
+#include <chainlock/chainlock.h>
 #include <chainparams.h>
 #include <coinjoin/common.h>
 #include <deploymentstatus.h>
@@ -21,7 +22,6 @@
 #include <interfaces/handler.h>
 #include <interfaces/wallet.h>
 #include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <mapport.h>
 #include <masternode/sync.h>
diff --git a/src/node/miner.cpp b/src/node/miner.cpp
@@ -24,6 +24,7 @@
 #include <util/system.h>
 #include <validation.h>
 
+#include <chainlock/chainlock.h>
 #include <evo/specialtx.h>
 #include <evo/cbtx.h>
 #include <evo/chainhelper.h>
@@ -35,7 +36,6 @@
 #include <governance/governance.h>
 #include <instantsend/instantsend.h>
 #include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <llmq/options.h>
 #include <llmq/snapshot.h>
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -6,13 +6,13 @@
 #include <blockfilter.h>
 #include <chain.h>
 #include <chainparams.h>
+#include <chainlock/chainlock.h>
 #include <context.h>
 #include <core_io.h>
 #include <httpserver.h>
 #include <index/blockfilterindex.h>
 #include <index/txindex.h>
 #include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <node/blockstorage.h>
 #include <node/context.h>
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -20,7 +20,6 @@
 #include <index/blockfilterindex.h>
 #include <index/coinstatsindex.h>
 #include <index/txindex.h>
-#include <llmq/context.h>
 #include <logging/timer.h>
 #include <node/blockstorage.h>
 #include <node/coinstats.h>
@@ -49,13 +48,14 @@
 #include <versionbits.h>
 #include <warnings.h>
 
+#include <chainlock/chainlock.h>
 #include <evo/assetlocktx.h>
 #include <evo/cbtx.h>
 #include <evo/evodb.h>
 #include <evo/mnhftx.h>
 #include <evo/specialtx.h>
 #include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
+#include <llmq/context.h>
 
 #include <stdint.h>
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -5,6 +5,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chain.h>
+#include <chainlock/chainlock.h>
 #include <chainparams.h>
 #include <consensus/amount.h>
 #include <consensus/consensus.h>
@@ -17,7 +18,6 @@
 #include <key_io.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/context.h>
-#include <llmq/chainlocks.h>
 #include <evo/evodb.h>
 #include <net.h>
 #include <node/context.h>
diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp
@@ -13,11 +13,9 @@
 #include <util/check.h>
 #include <validation.h>
 
-#include <masternode/node.h>
+#include <chainlock/chainlock.h>
 #include <evo/deterministicmns.h>
-
 #include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
 #include <llmq/commitment.h>
 #include <llmq/context.h>
 #include <llmq/debug.h>
@@ -28,6 +26,7 @@
 #include <llmq/signing_shares.h>
 #include <llmq/snapshot.h>
 #include <llmq/utils.h>
+#include <masternode/node.h>
 
 #include <iomanip>
 #include <optional>
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -48,11 +48,11 @@
 #include <validationinterface.h>
 #include <util/irange.h>
 
+#include <chainlock/chainlock.h>
 #include <evo/cbtx.h>
 #include <evo/specialtx.h>
 #include <instantsend/lock.h>
 #include <instantsend/instantsend.h>
-#include <llmq/chainlocks.h>
 #include <llmq/context.h>
 
 #include <numeric>
diff --git a/src/test/fuzz/process_message.cpp b/src/test/fuzz/process_message.cpp
@@ -24,7 +24,6 @@
 #include <version.h>
 
 #include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
 #include <llmq/dkgsessionmgr.h>
 #include <llmq/quorums.h>
 #include <llmq/signing.h>
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -7,23 +7,24 @@
 #include <consensus/merkle.h>
 #include <consensus/tx_verify.h>
 #include <consensus/validation.h>
-#include <evo/evodb.h>
-#include <governance/governance.h>
-#include <llmq/blockprocessor.h>
-#include <llmq/chainlocks.h>
-#include <llmq/context.h>
 #include <node/miner.h>
 #include <policy/policy.h>
 #include <pow.h>
 #include <script/standard.h>
-#include <spork.h>
 #include <uint256.h>
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <util/time.h>
 #include <validation.h>
 #include <versionbits.h>
 
+#include <evo/evodb.h>
+#include <governance/governance.h>
+#include <instantsend/instantsend.h>
+#include <llmq/blockprocessor.h>
+#include <llmq/context.h>
+#include <spork.h>
+
 #include <test/util/setup_common.h>
 
 #include <memory>
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -50,12 +50,12 @@
 #include <validationinterface.h>
 #include <warnings.h>
 
+#include <chainlock/chainlock.h>
 #include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
 #include <evo/evodb.h>
 #include <evo/specialtx.h>
 #include <evo/specialtxman.h>
-#include <llmq/chainlocks.h>
 #include <masternode/payments.h>
 #include <stats/client.h>
 
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
