diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-11-30 17:10:07 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-11-30 17:10:07 -0800 |
| commit | cd7fb7d1deece9da15d7750b3e05f729555a2cbe (patch) | |
| tree | 6825effd685be37abf65c252e73c4263c67ed646 /src/main.h | |
| parent | aaef016a07e66d555bdeba0697de2f9e313d78ae (diff) | |
| parent | 231b399952fd620ee0f72b1947024dba9651630d (diff) | |
| download | bitcoin-cd7fb7d1deece9da15d7750b3e05f729555a2cbe.tar.xz | |
Merge pull request #2033 from sipa/kickconflicts
Bugfix: remove conflicting transactions from memory pool
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index a5f60fe945..4bd4782ccb 100644 --- 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); |