diff options
| author | Ross Nicoll <[email protected]> | 2018-01-08 19:39:10 +0000 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2018-09-19 21:09:16 +0100 |
| commit | 7b81f4de0a006a6c01b88c79b6ab34a921eb86b5 (patch) | |
| tree | 71f86cbdb71ef365ec893073d63f05ccfe1f8252 /src/txmempool.cpp | |
| parent | Check only the base block version (#1411) (diff) | |
| download | discoin-7b81f4de0a006a6c01b88c79b6ab34a921eb86b5.tar.xz discoin-7b81f4de0a006a6c01b88c79b6ab34a921eb86b5.zip | |
Move COINBASE_MATURITY to the consensus parameters (#1426)
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 72547b582..de0a1489e 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -5,6 +5,7 @@ #include "txmempool.h" +#include "chainparams.h" #include "clientversion.h" #include "consensus/consensus.h" #include "consensus/validation.h" @@ -556,7 +557,8 @@ void CTxMemPool::removeForReorg(const CCoinsViewCache *pcoins, unsigned int nMem continue; const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash); if (nCheckFrequency != 0) assert(coins); - if (!coins || (coins->IsCoinBase() && ((signed long)nMemPoolHeight) - coins->nHeight < COINBASE_MATURITY)) { + int nCoinbaseMaturity = Params().GetConsensus(coins->nHeight).nCoinbaseMaturity; + if (!coins || (coins->IsCoinBase() && ((signed long)nMemPoolHeight) - coins->nHeight < nCoinbaseMaturity)) { txToRemove.insert(it); break; } |