diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-27 11:57:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-27 11:58:35 +0100 |
| commit | 8f3b3cdee497b8a1d7c6a7279e7bb13435527b60 (patch) | |
| tree | 0300f0b3a5d31e5e963025b1caf27c480bd69871 | |
| parent | 38369dda325d704041e7eb43222cdd5c23daa7c3 (diff) | |
| parent | 2d8c49d126bf2551ef0268f314ab75932fa96510 (diff) | |
| download | bitcoin-8f3b3cdee497b8a1d7c6a7279e7bb13435527b60.tar.xz | |
Merge pull request #6464
2d8c49d Clean up tx prioritization when conflict mined (Casey Rodarmor)
| -rw-r--r-- | src/txmempool.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index efa5c8f7a3..47e8de5361 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -512,6 +512,7 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction> if (txConflict != tx) { remove(txConflict, removed, true); + ClearPrioritisation(txConflict.GetHash()); } } } |