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

Keep mempool consistent after conflicting withdraw-spent

Browse source
This commit is contained in:
Matt Corallo 2016-03-18 21:24:04 -07:00 • committed by Gregory Sanders
parent bde5c0a819
commit eebbfb84b6
5 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/txmempool.cpp
View file

@ -601,7 +601,8 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
/**
* Called when a block is connected. Removes from mempool and updates the miner fee estimator.
*/
void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight)
void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
const std::set<std::pair<uint256, COutPoint> >& setWithdrawsSpent)
{
LOCK(cs);
std::vector<const CTxMemPoolEntry*> entries;
@ -626,6 +627,16 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
removeConflicts(*tx);
ClearPrioritisation(tx->GetHash());
}
for (std::set<std::pair<uint256, COutPoint> >::const_iterator it = setWithdrawsSpent.begin(); it != setWithdrawsSpent.end(); it++) {
std::map<std::pair<uint256, COutPoint>, uint256>::const_iterator it2 = mapWithdrawsSpentToTxid.find(*it);
if (it2 != mapWithdrawsSpentToTxid.end()) {
txiter txit = mapTx.find(it2->second);
assert(txit != mapTx.end());
setEntries stage;
stage.insert(txit);
RemoveStaged(stage, true);
}
}
lastRollingFeeUpdate = GetTime();
blockSinceLastRollingFeeBump = true;
}