Merge 7ff8e6b240 into merged_master (Bitcoin PR bitcoin/bitcoin#28318)

This commit is contained in:
Byron Hambly 2025-11-18 09:03:13 +02:00
commit d8be967dc7
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
10 changed files with 139 additions and 55 deletions

View file

@ -1688,7 +1688,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
if (status == node::ChainstateLoadStatus::SUCCESS) {
uiInterface.InitMessage(_("Verifying blocks…").translated);
if (chainman.m_blockman.m_have_pruned && options.check_blocks > MIN_BLOCKS_TO_KEEP) {
LogPrintfCategory(BCLog::PRUNE, "pruned datadir may not have more than %d blocks; only checking available blocks\n",
LogWarning("pruned datadir may not have more than %d blocks; only checking available blocks\n",
MIN_BLOCKS_TO_KEEP);
}
std::tie(status, error) = catch_exceptions([&]{ return VerifyLoadedChainstate(chainman, options);});