diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-11 13:17:34 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-11 15:24:00 +0100 |
| commit | 41cced21063a89992ef393dda4fffc44ff60c7c3 (patch) | |
| tree | 0131964c136ec4f2e69eb20c0ed63393f58cdee1 /src/txmempool.h | |
| parent | 7c001bb49c084a01a09827bf26447a418ecaeb9a (diff) | |
| parent | 34318d7fad7922ce56ff47908ff70e2c8a42ee56 (diff) | |
Merge pull request #5267
34318d7 RPC-test based on invalidateblock for mempool coinbase spends (Gavin Andresen)
7fd6219 Make CTxMemPool::remove more effecient by avoiding recursion (Matt Corallo)
b7b4318 Make CTxMemPool::check more thourough by using CheckInputs (Matt Corallo)
723d12c Remove txn which are invalidated by coinbase maturity during reorg (Matt Corallo)
868d041 Remove coinbase-dependant transactions during reorg. (Matt Corallo)
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index d00bdd0616..f671352b58 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -113,6 +113,7 @@ public: bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry); void remove(const CTransaction &tx, std::list<CTransaction>& removed, bool fRecursive = false); + void removeCoinbaseSpends(const CCoinsViewCache *pcoins, unsigned int nMemPoolHeight); void removeConflicts(const CTransaction &tx, std::list<CTransaction>& removed); void removeForBlock(const std::vector<CTransaction>& vtx, unsigned int nBlockHeight, std::list<CTransaction>& conflicts); |