LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Optimization: don't add txn back to mempool after 10 invalidates

Browse source
This commit is contained in:
Pieter Wuille 2019-02-13 18:07:16 -08:00
parent 9ce9c37004
commit 8d220417cd
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/validation.cpp
View file

@ -2797,6 +2797,7 @@ bool CChainState::InvalidateBlock(CValidationState& state, const CChainParams& c
{ {
CBlockIndex* to_mark_failed = pindex; CBlockIndex* to_mark_failed = pindex;
bool pindex_was_in_chain = false; bool pindex_was_in_chain = false;
int disconnected = 0;
// Disconnect (descendants of) pindex, and mark them invalid. // Disconnect (descendants of) pindex, and mark them invalid.
while (true) { while (true) {
@ -2816,8 +2817,10 @@ bool CChainState::InvalidateBlock(CValidationState& state, const CChainParams& c
bool ret = DisconnectTip(state, chainparams, &disconnectpool); bool ret = DisconnectTip(state, chainparams, &disconnectpool);
// DisconnectTip will add transactions to disconnectpool. // DisconnectTip will add transactions to disconnectpool.
// Adjust the mempool to be consistent with the new tip, adding // Adjust the mempool to be consistent with the new tip, adding
// transactions back to the mempool if disconnecting was succesful. // transactions back to the mempool if disconnecting was succesful,
UpdateMempoolForReorg(disconnectpool, /* fAddToMempool = */ ret); // and we're not doing a very deep invalidation (in which case
// keeping the mempool up to date is probably futile anyway).
UpdateMempoolForReorg(disconnectpool, /* fAddToMempool = */ (++disconnected <= 10) && ret);
if (!ret) return false; if (!ret) return false;
assert(invalid_walk_tip->pprev == chainActive.Tip()); assert(invalid_walk_tip->pprev == chainActive.Tip());