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

Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413)

Browse source
This commit is contained in:
James Dorfman 2023-06-01 18:51:42 +00:00
commit 72a90148c8
24 changed files with 125 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net_processing.cpp
View file

@ -1819,7 +1819,7 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
if (!ReadRawBlockFromDisk(block_data, pindex, m_chainparams.MessageStart())) {
assert(!"cannot load block from disk");
}
m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::BLOCK, MakeSpan(block_data)));
m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::BLOCK, Span{block_data}));
// Don't set pblock as we've sent the block
} else {
// Send block from disk