Merge b7702bd546 into merged_master (Bitcoin PR bitcoin/bitcoin#25943)

This commit is contained in:
Tom Trevethan 2025-04-08 17:27:41 +00:00
commit c222787622
9 changed files with 111 additions and 19 deletions

View file

@ -4654,7 +4654,7 @@ VerifyDBResult CVerifyDB::VerifyDB(
LogPrintf("Verification error: ReadBlockFromDisk failed at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
return VerifyDBResult::CORRUPTED_BLOCK_DB;
}
if (!chainstate.ConnectBlock(block, state, pindex, coins)) {
if (!chainstate.ConnectBlock(block, state, pindex, coins, nullptr)) {
LogPrintf("Verification error: found unconnectable block at %d, hash=%s (%s)\n", pindex->nHeight, pindex->GetBlockHash().ToString(), state.ToString());
return VerifyDBResult::CORRUPTED_BLOCK_DB;
}