GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge be44332803 into merged_master (Bitcoin PR bitcoin/bitcoin#28191)

Browse source
This commit is contained in:
Byron Hambly 2025-07-03 15:53:03 +02:00
commit 8bc9cd62fb
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net_processing.cpp
View file

@ -2216,7 +2216,7 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
// Fast-path: in this case it is possible to serve the block directly from disk,
// as the network format matches the format on disk
std::vector<uint8_t> block_data;
if (!m_chainman.m_blockman.ReadRawBlockFromDisk(block_data, pindex->GetBlockPos(), m_chainparams.MessageStart())) {
if (!m_chainman.m_blockman.ReadRawBlockFromDisk(block_data, pindex->GetBlockPos())) {
assert(!"cannot load block from disk");
}
m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::BLOCK, Span{block_data}));