mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Release cs_main before calling ProcessNewBlock (cmpctblock handling)
This commit is contained in:
parent
041331e1da
commit
680b0c0138
@ -1782,11 +1782,19 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
||||
}
|
||||
}
|
||||
|
||||
// When we succeed in decoding a block's txids from a cmpctblock
|
||||
// message we typically jump to the BLOCKTXN handling code, with a
|
||||
// dummy (empty) BLOCKTXN message, to re-use the logic there in
|
||||
// completing processing of the putative block (without cs_main).
|
||||
bool fProcessBLOCKTXN = false;
|
||||
CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
|
||||
|
||||
// Keep a CBlock for "optimistic" compactblock reconstructions (see
|
||||
// below)
|
||||
std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
|
||||
bool fBlockReconstructed = false;
|
||||
|
||||
{
|
||||
LOCK(cs_main);
|
||||
// If AcceptBlockHeader returned true, it set pindex
|
||||
assert(pindex);
|
||||
@ -1868,9 +1876,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
||||
// Dirty hack to jump to BLOCKTXN code (TODO: move message handling into their own functions)
|
||||
BlockTransactions txn;
|
||||
txn.blockhash = cmpctblock.header.GetHash();
|
||||
CDataStream blockTxnMsg(SER_NETWORK, PROTOCOL_VERSION);
|
||||
blockTxnMsg << txn;
|
||||
return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
|
||||
fProcessBLOCKTXN = true;
|
||||
} else {
|
||||
req.blockhash = pindex->GetBlockHash();
|
||||
connman.PushMessage(pfrom, msgMaker.Make(NetMsgType::GETBLOCKTXN, req));
|
||||
@ -1911,6 +1918,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
||||
return ProcessMessage(pfrom, NetMsgType::HEADERS, vHeadersMsg, nTimeReceived, chainparams, connman);
|
||||
}
|
||||
}
|
||||
} // cs_main
|
||||
|
||||
if (fProcessBLOCKTXN)
|
||||
return ProcessMessage(pfrom, NetMsgType::BLOCKTXN, blockTxnMsg, nTimeReceived, chainparams, connman);
|
||||
|
||||
if (fBlockReconstructed) {
|
||||
// If we got here, we were able to optimistically reconstruct a
|
||||
|
Loading…
Reference in New Issue
Block a user