Merge dbb3113082 into merged_master (Bitcoin PR bitcoin/bitcoin#30083)

This commit is contained in:
ivanlele 2026-02-20 13:18:11 +00:00
commit a6e0fc5af5
No known key found for this signature in database
3 changed files with 56 additions and 58 deletions

View file

@ -72,6 +72,7 @@
#include <txdb.h>
#include <txmempool.h>
#include <util/asmap.h>
#include <util/batchpriority.h>
#include <util/chaintype.h>
#include <util/check.h>
#include <util/fs.h>
@ -1889,6 +1890,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
}
chainman.m_thread_load = std::thread(&util::TraceThread, "initload", [=, &chainman, &args, &node] {
ScheduleBatchPriority();
// Import blocks
ImportBlocks(chainman, vImportFiles);
if (args.GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {