[Refactor] Consensus: nStakeMinAge, nStakeMinDepth, nFutureTimeDrift

random-zebra · random-zebra · commit 4d1c6963102b · 2020-02-20T10:04:19.000+01:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -157,10 +157,10 @@ bool CChainParams::HasStakeMinAgeOrDepth(const int contextHeight, const uint32_t
 {
     // before stake modifier V2, the age required was 60 * 60 (1 hour).
     if (!IsStakeModifierV2(contextHeight))
-        return (utxoFromBlockTime + nStakeMinAge <= contextTime);
+        return (utxoFromBlockTime + consensus.nStakeMinAge <= contextTime);
 
     // after stake modifier V2, we require the utxo to be nStakeMinDepth deep in the chain
-    return (contextHeight - utxoFromBlockHeight >= nStakeMinDepth);
+    return (contextHeight - utxoFromBlockHeight >= consensus.nStakeMinDepth);
 }
 
 int CChainParams::FutureBlockTimeDrift(const int nHeight) const
@@ -196,8 +196,10 @@ class CMainParams : public CChainParams
         consensus.powLimit   = ~uint256(0) >> 20; // PIVX starting difficulty is 1 / 2^12
         consensus.posLimitV1 = ~uint256(0) >> 24;
         consensus.posLimitV2 = ~uint256(0) >> 20;
-        consensus.nMaxMoneyOut = 21000000 * COIN;
         consensus.nCoinbaseMaturity = 100;
+        consensus.nMaxMoneyOut = 21000000 * COIN;
+        consensus.nStakeMinAge = 60 * 60;
+        consensus.nStakeMinDepth = 600;
         consensus.nTargetTimespan = 40 * 60;
         consensus.nTargetTimespanV2 = 30 * 60;
         consensus.nTargetSpacing = 1 * 60;
@@ -228,8 +230,6 @@ class CMainParams : public CChainParams
         nRejectBlockOutdatedMajority = 10260; // 95%
         nToCheckBlockUpgradeMajority = 10800; // Approximate expected amount of blocks in 7 days (1440*7.5)
         nMinerThreads = 0;
-        nStakeMinAge = 60 * 60;                         // 1 hour
-        nStakeMinDepth = 600;
         nFutureTimeDriftPoW = 7200;
         nFutureTimeDriftPoS = 180;
         nMasternodeCountDrift = 20;
@@ -345,6 +345,8 @@ class CTestNetParams : public CMainParams
         consensus.posLimitV2 = ~uint256(0) >> 20;
         consensus.nCoinbaseMaturity = 15;
         consensus.nMaxMoneyOut = 43199500 * COIN;
+        consensus.nStakeMinAge = 60 * 60;
+        consensus.nStakeMinDepth = 100;
         consensus.nTargetTimespan = 40 * 60;
         consensus.nTargetTimespanV2 = 30 * 60;
         consensus.nTargetSpacing = 1 * 60;
@@ -378,7 +380,6 @@ class CTestNetParams : public CMainParams
         nLastPOWBlock = 200;
         nPivxBadBlockTime = 1489001494; // Skip nBit validation of Block 259201 per PR #915
         nPivxBadBlocknBits = 0x1e0a20bd; // Skip nBit validation of Block 201 per PR #915
-        nStakeMinDepth = 100;
         nMasternodeCountDrift = 4;
         nModifierUpdateBlock = 51197; //approx Mon, 17 Apr 2017 04:00:00 GMT
         nZerocoinStartHeight = 201576;
@@ -469,6 +470,8 @@ class CRegTestParams : public CTestNetParams
         consensus.posLimitV2 = ~uint256(0) >> 20;
         consensus.nCoinbaseMaturity = 100;
         consensus.nMaxMoneyOut = 43199500 * COIN;
+        consensus.nStakeMinAge = 0;
+        consensus.nStakeMinDepth = 0;
         consensus.nTargetTimespan = 40 * 60;
         consensus.nTargetTimespanV2 = 30 * 60;
         consensus.nTargetSpacing = 1 * 60;
@@ -500,8 +503,6 @@ class CRegTestParams : public CTestNetParams
         nToCheckBlockUpgradeMajority = 1000;
         nMinerThreads = 1;
         nLastPOWBlock = 250;
-        nStakeMinAge = 0;
-        nStakeMinDepth = 0;
         nMasternodeCountDrift = 4;
         nModifierUpdateBlock = 0;
         nZerocoinStartHeight = 300;
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -76,11 +76,7 @@ class CChainParams
     bool SkipProofOfWorkCheck() const { return fSkipProofOfWorkCheck; }
     /** Make standard checks */
     bool RequireStandard() const { return fRequireStandard; }
-
-
     /** returns the coinstake maturity (min depth required) **/
-    int COINSTAKE_MIN_AGE() const { return nStakeMinAge; }
-    int COINSTAKE_MIN_DEPTH() const { return nStakeMinDepth; }
     bool HasStakeMinAgeOrDepth(const int contextHeight, const uint32_t contextTime, const int utxoFromBlockHeight, const uint32_t utxoFromBlockTime) const;
 
     /** Time Protocol V2 **/
@@ -174,8 +170,6 @@ class CChainParams
     unsigned int nPivxBadBlocknBits;
     int nMasternodeCountDrift;
     int nMaturity;
-    int nStakeMinDepth;
-    int nStakeMinAge;
     int nFutureTimeDriftPoW;
     int nFutureTimeDriftPoS;
 
diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -24,6 +24,8 @@ struct Params {
     uint256 posLimitV2;
     int nCoinbaseMaturity;
     CAmount nMaxMoneyOut;
+    int nStakeMinAge;
+    int nStakeMinDepth;
     int64_t nTargetTimespan;
     int64_t nTargetTimespanV2;
     int64_t nTargetSpacing;
diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -204,7 +204,7 @@ bool Stake(const CBlockIndex* pindexPrev, CStakeInput* stakeInput, unsigned int
 
     // check required min depth for stake
     const int nHeightBlockFrom = pindexFrom->nHeight;
-    if (nHeight < nHeightBlockFrom + Params().COINSTAKE_MIN_DEPTH())
+    if (nHeight < nHeightBlockFrom + Params().GetConsensus().nStakeMinDepth)
         return error("%s : min depth violation, nHeight=%d, nHeightBlockFrom=%d", __func__, nHeight, nHeightBlockFrom);
 
     const bool fRegTest = Params().IsRegTestNet();
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1896,7 +1896,7 @@ bool CWallet::AvailableCoins(
             if (nDepth == 0 && !pcoin->InMempool()) continue;
 
             // Check min depth requirement for stake inputs
-            if (nCoinType == STAKEABLE_COINS && nDepth <= Params().COINSTAKE_MIN_DEPTH()) continue;
+            if (nCoinType == STAKEABLE_COINS && nDepth <= Params().GetConsensus().nStakeMinDepth) continue;
 
             for (unsigned int i = 0; i < pcoin->vout.size(); i++) {
                 bool found = false;
