Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168)

This commit is contained in:
James Dorfman 2024-08-13 18:44:23 +00:00
commit 66bc45020f
21 changed files with 68 additions and 94 deletions

View file

@ -318,7 +318,7 @@ static bool rest_block(const std::any& context,
if (chainman.m_blockman.IsBlockPruned(pblockindex))
return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not available (pruned data)");
if (!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))
if (!ReadBlockFromDisk(block, pblockindex, chainman.GetParams().GetConsensus()))
return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
}