scripted-diff: Merge bitcoin#23517: scripted-diff: Move miner to src/…

…node -BEGIN VERIFY SCRIPT- # Move module git mv src/miner.cpp src/node/ git mv src/miner.h src/node/ # Replacements sed -i 's:miner\.h:node/miner.h:g' $(git grep -l miner) sed -i 's:miner\.cpp:node/miner.cpp:g' $(git grep -l miner) sed -i 's:MINER_H:NODE_MINER_H:g' $(git grep -l MINER_H) -END VERIFY SCRIPT-
dashpay · Sep 9, 2024 · 184a622 · 184a622
1 parent 0c243ab
commit 184a622
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 20 deletions.
diff --git a/doc/release-notes/dash/release-notes-0.14.0.md b/doc/release-notes/dash/release-notes-0.14.0.md
@@ -566,7 +566,7 @@ See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.13.3.0.
 - [`d7474fd56`](https://github.com/dashpay/dash/commit/d7474fd56) remove all references to pwalletMain in rpc folder
 - [`87af11781`](https://github.com/dashpay/dash/commit/87af11781) Merge #8775: RPC refactoring: Access wallet using new GetWalletForJSONRPCRequest
 - [`1fa7f7e74`](https://github.com/dashpay/dash/commit/1fa7f7e74) stop test failures
-- [`444f671ab`](https://github.com/dashpay/dash/commit/444f671ab) Update src/miner.cpp
+- [`444f671ab`](https://github.com/dashpay/dash/commit/444f671ab) Update src/node/miner.cpp
 - [`514769940`](https://github.com/dashpay/dash/commit/514769940) fix 9868
 - [`7ee31cbd6`](https://github.com/dashpay/dash/commit/7ee31cbd6) Speed up integration tests with masternodes (#2642)
 - [`fda16f1fe`](https://github.com/dashpay/dash/commit/fda16f1fe) Fix off-by-1 in phase calculations and the rest of llmq-signing.py issues (#2641)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -258,7 +258,6 @@ BITCOIN_CORE_H = \
   memusage.h \
   merkleblock.h \
   messagesigner.h \
-  miner.h \
   net.h \
   net_permissions.h \
   net_processing.h \
@@ -272,6 +271,7 @@ BITCOIN_CORE_H = \
   node/coin.h \
   node/coinstats.h \
   node/context.h \
+  node/miner.h \
   node/psbt.h \
   node/transaction.h \
   node/ui_interface.h \
@@ -490,7 +490,6 @@ libbitcoin_server_a_SOURCES = \
   masternode/payments.cpp \
   masternode/sync.cpp \
   masternode/utils.cpp \
-  miner.cpp \
   net.cpp \
   netfulfilledman.cpp \
   netgroup.cpp \
@@ -500,6 +499,7 @@ libbitcoin_server_a_SOURCES = \
   node/coinstats.cpp \
   node/context.cpp \
   node/interfaces.cpp \
+  node/miner.cpp \
   node/psbt.cpp \
   node/transaction.cpp \
   node/ui_interface.cpp \

diff --git a/src/init.cpp b/src/init.cpp
@@ -31,14 +31,14 @@
 #include <index/txindex.h>
 #include <interfaces/node.h>
 #include <mapport.h>
-#include <miner.h>
 #include <net.h>
 #include <net_permissions.h>
 #include <net_processing.h>
 #include <netbase.h>
 #include <netgroup.h>
 #include <node/blockstorage.h>
 #include <node/context.h>
+#include <node/miner.h>
 #include <node/ui_interface.h>
 #include <policy/feerate.h>
 #include <policy/fees.h>

diff --git a/src/miner.cpp → src/node/miner.cpp b/src/miner.cpp → src/node/miner.cpp
@@ -4,7 +4,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <miner.h>
+#include <node/miner.h>
 
 #include <amount.h>
 #include <chain.h>
@@ -22,6 +22,7 @@
 #include <timedata.h>
 #include <util/moneystr.h>
 #include <util/system.h>
+#include <validation.h>
 
 #include <evo/specialtx.h>
 #include <evo/cbtx.h>

diff --git a/src/miner.h → src/node/miner.h b/src/miner.h → src/node/miner.h
@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_MINER_H
-#define BITCOIN_MINER_H
+#ifndef BITCOIN_NODE_MINER_H
+#define BITCOIN_NODE_MINER_H
 
 #include <primitives/block.h>
 #include <txmempool.h>
@@ -13,10 +13,11 @@
 #include <optional>
 #include <stdint.h>
 
-#include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index_container.hpp>
 
 class BlockManager;
+class ChainstateManager;
 class CBlockIndex;
 class CChainParams;
 class CChainstateHelper;
@@ -231,4 +232,4 @@ class BlockAssembler
 void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
 int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev);
 
-#endif // BITCOIN_MINER_H
+#endif // BITCOIN_NODE_MINER_H
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -19,9 +19,8 @@
 #include <llmq/chainlocks.h>
 #include <llmq/instantsend.h>
 #include <evo/evodb.h>
-#include <miner.h>
-#include <net.h>
 #include <node/context.h>
+#include <node/miner.h>
 #include <policy/fees.h>
 #include <pow.h>
 #include <rpc/blockchain.h>

diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp
@@ -9,7 +9,7 @@
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
 #include <messagesigner.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <netbase.h>
 #include <script/interpreter.h>
 #include <script/sign.h>

diff --git a/src/test/blockfilter_index_tests.cpp b/src/test/blockfilter_index_tests.cpp
@@ -6,7 +6,7 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <index/blockfilterindex.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <pow.h>
 #include <script/standard.h>
 #include <spork.h>

diff --git a/src/test/dynamic_activation_thresholds_tests.cpp b/src/test/dynamic_activation_thresholds_tests.cpp
@@ -7,7 +7,7 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <deploymentstatus.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <script/interpreter.h>
 #include <spork.h>
 #include <validation.h>

diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <consensus/validation.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <test/fuzz/FuzzedDataProvider.h>
 #include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>

diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
@@ -13,7 +13,7 @@
 #include <llmq/chainlocks.h>
 #include <llmq/context.h>
 #include <llmq/instantsend.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <policy/policy.h>
 #include <pow.h>
 #include <script/standard.h>

diff --git a/src/test/util/mining.cpp b/src/test/util/mining.cpp
@@ -8,8 +8,8 @@
 #include <consensus/merkle.h>
 #include <evo/evodb.h>
 #include <key_io.h>
-#include <miner.h>
 #include <node/context.h>
+#include <node/miner.h>
 #include <pow.h>
 #include <script/standard.h>
 #include <spork.h>

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -27,9 +27,9 @@
 #include <llmq/snapshot.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
-#include <miner.h>
 #include <net.h>
 #include <net_processing.h>
+#include <node/miner.h>
 #include <noui.h>
 #include <policy/fees.h>
 #include <pow.h>

diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp
@@ -8,7 +8,7 @@
 #include <consensus/consensus.h>
 #include <consensus/merkle.h>
 #include <consensus/validation.h>
-#include <miner.h>
+#include <node/miner.h>
 #include <pow.h>
 #include <random.h>
 #include <script/standard.h>

diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
@@ -82,7 +82,7 @@ implicit-signed-integer-truncation:addrman.h
 implicit-signed-integer-truncation:chain.h
 implicit-signed-integer-truncation:crypto/
 implicit-signed-integer-truncation:leveldb/
-implicit-signed-integer-truncation:miner.cpp
+implicit-signed-integer-truncation:node/miner.cpp
 implicit-signed-integer-truncation:net.cpp
 implicit-signed-integer-truncation:streams.h
 implicit-signed-integer-truncation:test/arith_uint256_tests.cpp