nuke validation

src/CMakeLists.txt

@@ -171,10 +171,11 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   net_processing.cpp
   netgroup.cpp
   node/abort.cpp
+  node/blockimport.cpp
   node/blockmanager_args.cpp
   node/blockstorage.cpp
   node/caches.cpp
-  node/chainstate.cpp
+  node/chainstate_load.cpp
   node/chainstatemanager_args.cpp
   node/coin.cpp
   node/coins_view_args.cpp
@@ -207,14 +208,17 @@ add_library(bitcoin_node STATIC EXCLUDE_FROM_ALL
   policy/settings.cpp
   policy/truc_policy.cpp
   private_broadcast.cpp
+  script/script_check.cpp
   script/sigcache.cpp
   signet.cpp
   torcontrol.cpp
   txdb.cpp
   txgraph.cpp
   txmempool.cpp
   txrequest.cpp
-  validation.cpp
+  block_validation.cpp
+  mempool_validation.cpp
+  chainstate.cpp
   validationinterface.cpp
   versionbits.cpp
 )

src/bench/block_assemble.cpp

@@ -4,6 +4,7 @@
 
 #include <bench/bench.h>
 #include <consensus/consensus.h>
+#include <mempool_validation.h>
 #include <node/miner.h>
 #include <primitives/transaction.h>
 #include <random.h>
@@ -12,7 +13,7 @@
 #include <test/util/mining.h>
 #include <test/util/script.h>
 #include <test/util/setup_common.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <array>
 #include <cassert>
@@ -46,7 +47,7 @@ static void AssembleBlock(benchmark::Bench& bench)
         LOCK(::cs_main);
 
         for (const auto& txr : txs) {
-            const MempoolAcceptResult res = test_setup->m_node.chainman->ProcessTransaction(txr);
+            const MempoolAcceptResult res = ProcessTransaction(*test_setup->m_node.chainman, txr);
             assert(res.m_result_type == MempoolAcceptResult::ResultType::VALID);
         }
     }

src/bench/checkblock.cpp

@@ -8,7 +8,7 @@
 #include <primitives/block.h>
 #include <primitives/transaction.h>
 #include <streams.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <cassert>
 #include <cstddef>

src/bench/checkblockindex.cpp

@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <test/util/setup_common.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <memory>
 

src/bench/connectblock.cpp

@@ -4,12 +4,13 @@
 
 #include <addresstype.h>
 #include <bench/bench.h>
+#include <block_validation.h>
 #include <interfaces/chain.h>
 #include <kernel/cs_main.h>
 #include <script/interpreter.h>
 #include <sync.h>
 #include <test/util/setup_common.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <cassert>
 #include <vector>
@@ -100,7 +101,7 @@ void BenchmarkConnectBlock(benchmark::Bench& bench, std::vector<CKey>& keys, std
         auto* pindex{chainman->m_blockman.AddToBlockIndex(test_block, chainman->m_best_header)}; // Doing this here doesn't impact the benchmark
         CCoinsViewCache viewNew{&chainstate.CoinsTip()};
 
-        assert(chainstate.ConnectBlock(test_block, test_block_state, pindex, viewNew));
+        assert(ConnectBlock(chainstate, test_block, test_block_state, pindex, viewNew));
     });
 }
 

src/bench/duplicate_inputs.cpp

@@ -16,7 +16,7 @@
 #include <sync.h>
 #include <test/util/setup_common.h>
 #include <uint256.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <cassert>
 #include <cstdint>

src/bench/load_external.cpp

@@ -12,7 +12,7 @@
 #include <test/util/setup_common.h>
 #include <uint256.h>
 #include <util/fs.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <cstdint>
 #include <cstdio>

src/bench/mempool_stress.cpp

@@ -12,7 +12,7 @@
 #include <test/util/setup_common.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <cstddef>
 #include <cstdint>

src/bench/readwriteblock.cpp

@@ -12,7 +12,7 @@
 #include <span.h>
 #include <streams.h>
 #include <test/util/setup_common.h>
-#include <validation.h>
+#include <chainstate.h>
 
 #include <cassert>
 #include <cstdint>