Merge ca041fc4ab into merged_master (Bitcoin PR bitcoin/bitcoin#28904)

This commit is contained in:
Byron Hambly 2025-11-10 14:58:08 +02:00
commit 32e1849401
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
11 changed files with 43 additions and 65 deletions

View file

@ -5125,7 +5125,7 @@ bool Chainstate::LoadGenesisBlock()
}
void ChainstateManager::LoadExternalBlockFile(
CAutoFile& file_in,
AutoFile& file_in,
FlatFilePos* dbp,
std::multimap<uint256, FlatFilePos>* blocks_with_unknown_parent)
{