Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708)

This commit is contained in:
Byron Hambly 2025-06-27 14:01:27 +02:00
commit 30814e6064
14 changed files with 85 additions and 56 deletions

View file

@ -941,8 +941,7 @@ void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFile
for (Chainstate* chainstate : WITH_LOCK(::cs_main, return chainman.GetAll())) {
BlockValidationState state;
if (!chainstate->ActivateBestChain(state, nullptr)) {
LogPrintf("Failed to connect best block (%s)\n", state.ToString());
StartShutdown();
AbortNode(strprintf("Failed to connect best block (%s)", state.ToString()));
return;
}
}