diff options
| author | Ross Nicoll <[email protected]> | 2015-07-31 20:45:56 +0100 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2015-07-31 20:45:56 +0100 |
| commit | d988dc7ba0eecf4bdefb38287ddc0e2b49031fc6 (patch) | |
| tree | 3b2c3ecf53e68f96056a30146b12bb758a32d143 /src/txmempool.cpp | |
| parent | Merge pull request #1204 from rnicoll/1.10-fees (diff) | |
| parent | Move COINBASE_MATURITY to the consensus parameters (diff) | |
| download | discoin-d988dc7ba0eecf4bdefb38287ddc0e2b49031fc6.tar.xz discoin-d988dc7ba0eecf4bdefb38287ddc0e2b49031fc6.zip | |
Merge pull request #1213 from langerhans/1.10-dev-maturity
Minor fixes to concensus relevant parameters
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 1c16e2092..1502cc6d2 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" @@ -166,7 +167,8 @@ void CTxMemPool::removeCoinbaseSpends(const CCoinsViewCache *pcoins, unsigned in continue; const CCoins *coins = pcoins->AccessCoins(txin.prevout.hash); if (fSanityCheck) assert(coins); - if (!coins || (coins->IsCoinBase() && nMemPoolHeight - coins->nHeight < COINBASE_MATURITY)) { + int nCoinbaseMaturity = Params().GetConsensus(coins->nHeight).nCoinbaseMaturity; + if (!coins || (coins->IsCoinBase() && nMemPoolHeight - coins->nHeight < nCoinbaseMaturity)) { transactionsToRemove.push_back(tx); break; } |