Merge 1801d8c3c9 into merged_master (Bitcoin PR bitcoin/bitcoin#26308)

This commit is contained in:
Tom Trevethan 2025-03-25 16:20:40 +00:00
commit ef3c367aa4
4 changed files with 29 additions and 28 deletions

View file

@ -311,8 +311,10 @@ 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, chainman.GetParams().GetConsensus()))
return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
}
if (!ReadBlockFromDisk(block, pblockindex, chainman.GetParams().GetConsensus())) {
return RESTERR(req, HTTP_NOT_FOUND, hashStr + " not found");
}
switch (rf) {