|
|
|
@ -647,7 +647,7 @@ void EraseOrphansFor(NodeId peer)
@@ -647,7 +647,7 @@ void EraseOrphansFor(NodeId peer)
|
|
|
|
|
nErased += EraseOrphanTx(maybeErase->second.tx->GetHash()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer %d\n", nErased, peer); |
|
|
|
|
if (nErased > 0) LogPrint("mempool", "Erased %d orphan tx from peer=%d\n", nErased, peer); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -789,7 +789,7 @@ void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std:
@@ -789,7 +789,7 @@ void PeerLogicValidation::NewPoWValidBlock(const CBlockIndex *pindex, const std:
|
|
|
|
|
if (state.fPreferHeaderAndIDs && (!fWitnessEnabled || state.fWantsCmpctWitness) && |
|
|
|
|
!PeerHasHeader(&state, pindex) && PeerHasHeader(&state, pindex->pprev)) { |
|
|
|
|
|
|
|
|
|
LogPrint("net", "%s sending header-and-ids %s to peer %d\n", "PeerLogicValidation::NewPoWValidBlock", |
|
|
|
|
LogPrint("net", "%s sending header-and-ids %s to peer=%d\n", "PeerLogicValidation::NewPoWValidBlock", |
|
|
|
|
hashBlock.ToString(), pnode->id); |
|
|
|
|
connman->PushMessage(pnode, msgMaker.Make(NetMsgType::CMPCTBLOCK, *pcmpctblock)); |
|
|
|
|
state.pindexBestHeaderSent = pindex; |
|
|
|
@ -2889,7 +2889,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
@@ -2889,7 +2889,7 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
|
|
|
|
|
if (vHeaders.size() == 1 && state.fPreferHeaderAndIDs) { |
|
|
|
|
// We only send up to 1 block as header-and-ids, as otherwise
|
|
|
|
|
// probably means we're doing an initial-ish-sync or they're slow
|
|
|
|
|
LogPrint("net", "%s sending header-and-ids %s to peer %d\n", __func__, |
|
|
|
|
LogPrint("net", "%s sending header-and-ids %s to peer=%d\n", __func__, |
|
|
|
|
vHeaders.front().GetHash().ToString(), pto->id); |
|
|
|
|
|
|
|
|
|
int nSendFlags = state.fWantsCmpctWitness ? 0 : SERIALIZE_TRANSACTION_NO_WITNESS; |
|
|
|
|