diff options
| author | langerhans <[email protected]> | 2015-07-31 21:23:27 +0200 |
|---|---|---|
| committer | langerhans <[email protected]> | 2015-07-31 21:29:43 +0200 |
| commit | 38a83007e827b4585e04f23f838bbf1eef4bf7a6 (patch) | |
| tree | f47a68b74366aea7824977d019a561554f4a8de1 /src/txmempool.cpp | |
| parent | Make RegTest use simplified rewards for easier test vector setup and use shor... (diff) | |
| download | discoin-38a83007e827b4585e04f23f838bbf1eef4bf7a6.tar.xz discoin-38a83007e827b4585e04f23f838bbf1eef4bf7a6.zip | |
Move COINBASE_MATURITY to the consensus 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; } |