Merge pull request #2033 from sipa/kickconflicts

Bugfix: remove conflicting transactions from memory pool
2012-11-30 17:10:07 -08:00
parent aaef016a07 231b399952
commit cd7fb7d1de
2 changed files with 28 additions and 3 deletions
--- a/src/main.h
+++ b/src/main.h
@@ -1831,7 +1831,8 @@ public:

    bool accept(CTransaction &tx, bool fCheckInputs, bool* pfMissingInputs);
    bool addUnchecked(const uint256& hash, CTransaction &tx);
-    bool remove(CTransaction &tx);
+    bool remove(const CTransaction &tx, bool fRecursive = false);
+    bool removeConflicts(const CTransaction &tx);
    void clear();
    void queryHashes(std::vector<uint256>& vtxid);
    void pruneSpent(const uint256& hash, CCoins &coins);