Skip to content

Commit

Permalink
CTxMemPool::removeForBlock now uses RemoveStaged
Browse files Browse the repository at this point in the history
Coming from btc@7659438a63ef162b4a4f942f86683ae6785f8162
  • Loading branch information
furszy committed Jan 18, 2021
1 parent ba73898 commit c30fa16
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/txmempool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
entries.push_back(*i);
}
for (const auto& tx : vtx) {
std::list<CTransactionRef> dummy;
remove(*tx, dummy, false);
txiter it = mapTx.find(tx->GetHash());
if (it != mapTx.end()) {
setEntries stage;
stage.insert(it);
RemoveStaged(stage);
}
removeConflicts(*tx, conflicts);
ClearPrioritisation(tx->GetHash());
}
Expand Down

0 comments on commit c30fa16

Please sign in to comment.