[Refactor] Consensus: wrapped serials params (nSupplyBeforeFakeSerial)

random-zebra · random-zebra · commit 1e5a33d666b1 · 2020-02-25T19:19:34.000+01:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -192,6 +192,9 @@ class CMainParams : public CChainParams
         consensus.height_start_ZC_SerialsV2 = 1153160;
         consensus.height_ZC_RecalcAccumulators = 908000;
 
+        // Zerocoin-related params
+        consensus.ZC_WrappedSerialsSupply = 4131563 * COIN;   // zerocoin supply at height_last_ZC_WrappedSerials
+
         /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -225,9 +228,6 @@ class CMainParams : public CChainParams
         nEnforceNewSporkKey = 1566860400; //!> Sporks signed after Monday, August 26, 2019 11:00:00 PM GMT must use the new spork key
         nRejectOldSporkKey = 1569538800; //!> Fully reject old spork key after Thursday, September 26, 2019 11:00:00 PM GMT
 
-        // Fake Serial Attack
-        nSupplyBeforeFakeSerial = 4131563 * COIN;   // zerocoin supply at height_last_ZC_WrappedSerials
-
         // Note that of those with the service bits flag, most only support a subset of possible options
         vSeeds.push_back(CDNSSeedData("fuzzbawls.pw", "pivx.seed.fuzzbawls.pw"));     // Primary DNS Seeder from Fuzzbawls
         vSeeds.push_back(CDNSSeedData("fuzzbawls.pw", "pivx.seed2.fuzzbawls.pw"));    // Secondary DNS Seeder from Fuzzbawls
@@ -329,6 +329,9 @@ class CTestNetParams : public CMainParams
         consensus.height_start_ZC_SerialsV2 = 444020;
         consensus.height_ZC_RecalcAccumulators = 999999999;
 
+        // Zerocoin-related params
+        consensus.ZC_WrappedSerialsSupply = 0;   // WrappedSerials only on main net
+
         /**
          * The message start string is designed to be unlikely to occur in normal data.
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
@@ -359,9 +362,6 @@ class CTestNetParams : public CMainParams
         nEnforceNewSporkKey = 1566860400; //!> Sporks signed after Monday, August 26, 2019 11:00:00 PM GMT must use the new spork key
         nRejectOldSporkKey = 1569538800; //!> Reject old spork key after Thursday, September 26, 2019 11:00:00 PM GMT
 
-        // Fake Serial Attack
-        nSupplyBeforeFakeSerial = 0;
-
         vFixedSeeds.clear();
         vSeeds.clear();
         vSeeds.push_back(CDNSSeedData("fuzzbawls.pw", "pivx-testnet.seed.fuzzbawls.pw"));
@@ -447,6 +447,9 @@ class CRegTestParams : public CTestNetParams
         consensus.height_start_ZC_SerialsV2 = 300;
         consensus.height_ZC_RecalcAccumulators = 999999999;
 
+        // Zerocoin-related params
+        consensus.ZC_WrappedSerialsSupply = 0;   // WrappedSerials only on main net
+
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -107,7 +107,6 @@ class CChainParams
     bool IsRegTestNet() const { return NetworkID() == CBaseChainParams::REGTEST; }
 
     /** Zerocoin **/
-    std::string Zerocoin_Modulus() const { return zerocoinModulus; }
     libzerocoin::ZerocoinParams* Zerocoin_Params(bool useModulusV1) const;
     int Zerocoin_MaxSpendsPerTransaction() const { return nMaxZerocoinSpendsPerTransaction; }
     int Zerocoin_MaxPublicSpendsPerTransaction() const { return nMaxZerocoinPublicSpendsPerTransaction; }
@@ -123,9 +122,6 @@ class CChainParams
     int PivxBadBlocknBits() const { return nPivxBadBlocknBits; }
     int Zerocoin_StartTime() const { return nZerocoinStartTime; }
 
-    // fake serial attack
-    CAmount GetSupplyBeforeFakeSerial() const { return nSupplyBeforeFakeSerial; }
-
     CAmount InvalidAmountFiltered() const { return nInvalidAmountFiltered; };
 
 
@@ -183,9 +179,6 @@ class CChainParams
     int64_t nProposalEstablishmentTime;
 
     CAmount nMinColdStakingAmount;
-
-    // fake serial attack
-    CAmount nSupplyBeforeFakeSerial = 0;
 };
 
 /**
diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -50,6 +50,9 @@ struct Params {
     int height_start_ZC_SerialsV2;
     int height_ZC_RecalcAccumulators;
 
+    // Zerocoin-related params
+    CAmount ZC_WrappedSerialsSupply;
+
     int64_t TargetTimespan(const bool fV2 = true) const { return fV2 ? nTargetTimespanV2 : nTargetTimespan; }
     uint256 ProofOfStakeLimit(const bool fV2) const { return fV2 ? posLimitV2 : posLimitV1; }
     bool MoneyRange(const CAmount& nValue) const { return (nValue >= 0 && nValue <= nMaxMoneyOut); }
diff --git a/src/consensus/zerocoin_verify.cpp b/src/consensus/zerocoin_verify.cpp
@@ -352,8 +352,9 @@ bool UpdateZPIVSupply(const CBlock& block, CBlockIndex* pindex, bool fJustCheck)
 
     // Update Wrapped Serials amount
     // A one-time event where only the zPIV supply was off (due to serial duplication off-chain on main net)
-    if (Params().NetworkID() == CBaseChainParams::MAIN && pindex->nHeight == Params().GetConsensus().height_last_ZC_WrappedSerials + 1
-            && pindex->GetZerocoinSupply() < Params().GetSupplyBeforeFakeSerial() + GetWrapppedSerialInflationAmount()) {
+    const Consensus::Params& consensus = Params().GetConsensus();
+    if (Params().NetworkID() == CBaseChainParams::MAIN && pindex->nHeight == consensus.height_last_ZC_WrappedSerials + 1
+            && pindex->GetZerocoinSupply() < consensus.ZC_WrappedSerialsSupply + GetWrapppedSerialInflationAmount()) {
         for (auto denom : libzerocoin::zerocoinDenomList) {
             pindex->mapZerocoinSupply.at(denom) += GetWrapppedSerialInflation(denom);
         }
diff --git a/src/init.cpp b/src/init.cpp
@@ -1527,7 +1527,7 @@ bool AppInit2()
 
                     // Supply needs to be exactly GetSupplyBeforeFakeSerial + GetWrapppedSerialInflationAmount
                     CBlockIndex* pblockindex = chainActive[consensus.height_last_ZC_WrappedSerials + 1];
-                    CAmount zpivSupplyCheckpoint = Params().GetSupplyBeforeFakeSerial() + GetWrapppedSerialInflationAmount();
+                    CAmount zpivSupplyCheckpoint = consensus.ZC_WrappedSerialsSupply + GetWrapppedSerialInflationAmount();
 
                     if (pblockindex->GetZerocoinSupply() < zpivSupplyCheckpoint) {
                         // Trigger reindex due wrapping serials
