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/main.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/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index ee5be679c..a3d5dcc30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1448,9 +1448,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi // If prev is coinbase, check that it's matured if (coins->IsCoinBase()) { // Dogecoin: Switch maturity at depth 145,000 - int nCoinbaseMaturity = coins->nHeight < COINBASE_MATURITY_SWITCH - ? COINBASE_MATURITY_OLD - : COINBASE_MATURITY; + int nCoinbaseMaturity = Params().GetConsensus(coins->nHeight).nCoinbaseMaturity; if (nSpendHeight - coins->nHeight < nCoinbaseMaturity) return state.Invalid( error("CheckInputs(): tried to spend coinbase at depth %d", nSpendHeight - coins->nHeight), |