highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

[wallet] Notify conflicted transactions in TransactionRemovedFromMempool

Browse Source 
The only CValidationInterface client that cares about transactions that
are removed from the mempool because of CONFLICT is the wallet.

Start using the TransactionRemovedFromMempool method to notify about
conflicted transactions instead of using the vtxConflicted vector in
BlockConnected.
This commit is contained in:
John Newbery
2019-11-11 10:34:31 -05:00
parent eae48ec84c
commit 1168394d75
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/wallet.cpp
View File

@@ -1123,9 +1123,6 @@ void CWallet::BlockConnected(const CBlock& block, const std::vector<CTransaction
SyncTransaction(block.vtx[index], confirm);
TransactionRemovedFromMempool(block.vtx[index]);
}
for (const CTransactionRef& ptx : vtxConflicted) {
TransactionRemovedFromMempool(ptx);
}
}
void CWallet::BlockDisconnected(const CBlock& block, int height)