[Chain] remove CBlockIndex::mapZerocoinSupply and bump client version

random-zebra · random-zebra · commit 56b454a73e27 · 2020-04-10T11:42:21.000+02:00
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 99)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2020)
diff --git a/src/chain.cpp b/src/chain.cpp
@@ -71,21 +71,12 @@ CBlockIndex::CBlockIndex(const CBlock& block):
         nBits{block.nBits},
         nNonce{block.nNonce}
 {
-    ClearMapZcSupply();
     if(block.nVersion > 3 && block.nVersion < 7)
         nAccumulatorCheckpoint = block.nAccumulatorCheckpoint;
     if (block.IsProofOfStake())
         SetProofOfStake();
 }
 
-void CBlockIndex::ClearMapZcSupply()
-{
-    mapZerocoinSupply.clear();
-    // Start supply of each denomination with 0s
-    for (auto& denom : libzerocoin::zerocoinDenomList)
-        mapZerocoinSupply.insert(std::make_pair(denom, 0));
-}
-
 std::string CBlockIndex::ToString() const
 {
     return strprintf("CBlockIndex(pprev=%p, nHeight=%d, merkle=%s, hashBlock=%s)",
diff --git a/src/chain.h b/src/chain.h
@@ -229,12 +229,8 @@ class CBlockIndex
     //! (memory only) Sequential id assigned to distinguish order in which blocks are received.
     uint32_t nSequenceId{0};
 
-    //! zerocoin specific fields
-    std::map<libzerocoin::CoinDenomination, int64_t> mapZerocoinSupply;
-
-    CBlockIndex() { ClearMapZcSupply(); }
+    CBlockIndex() {}
     CBlockIndex(const CBlock& block);
-    void ClearMapZcSupply();
 
     std::string ToString() const;
 
@@ -279,6 +275,7 @@ class CBlockIndex
 
 // New serialization introduced with 4.0.99
 static const int DBI_OLD_SER_VERSION = 4009900;
+static const int DBI_SER_VERSION_NO_ZC = 4009902;   // removes mapZerocoinSupply
 
 class CDiskBlockIndex : public CBlockIndex
 {
@@ -325,7 +322,11 @@ class CDiskBlockIndex : public CBlockIndex
             READWRITE(nBits);
             READWRITE(nNonce);
             if(this->nVersion > 3) {
-                READWRITE(mapZerocoinSupply);
+                // zc supply removed in 4.0.99.2
+                if (nSerVersion < DBI_SER_VERSION_NO_ZC) {
+                    std::map<libzerocoin::CoinDenomination, int64_t> mapZerocoinSupply;
+                    READWRITE(mapZerocoinSupply);
+                }
                 if(this->nVersion < 7) READWRITE(nAccumulatorCheckpoint);
             }
 
@@ -359,6 +360,7 @@ class CDiskBlockIndex : public CBlockIndex
             READWRITE(nBits);
             READWRITE(nNonce);
             if(this->nVersion > 3) {
+                std::map<libzerocoin::CoinDenomination, int64_t> mapZerocoinSupply;
                 std::vector<libzerocoin::CoinDenomination> vMintDenominationsInBlock;
                 READWRITE(nAccumulatorCheckpoint);
                 READWRITE(mapZerocoinSupply);
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -147,7 +147,10 @@ UniValue getinfo(const UniValue& params, bool fHelp)
     obj.push_back(Pair("moneysupply",ValueFromAmount(chainActive.Tip()->nMoneySupply)));
     UniValue zpivObj(UniValue::VOBJ);
     for (auto denom : libzerocoin::zerocoinDenomList) {
-        zpivObj.push_back(Pair(std::to_string(denom), ValueFromAmount(mapZerocoinSupply.at(denom) * (denom*COIN))));
+        if (mapZerocoinSupply.empty())
+            zpivObj.push_back(Pair(std::to_string(denom), ValueFromAmount(0)));
+        else
+            zpivObj.push_back(Pair(std::to_string(denom), ValueFromAmount(mapZerocoinSupply.at(denom) * (denom*COIN))));
     }
     zpivObj.push_back(Pair("total", ValueFromAmount(GetZerocoinSupply())));
     obj.push_back(Pair("zPIVsupply", zpivObj));
diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -246,7 +246,6 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
 
                 //zerocoin
                 pindexNew->nAccumulatorCheckpoint = diskindex.nAccumulatorCheckpoint;
-                pindexNew->mapZerocoinSupply = diskindex.mapZerocoinSupply;
 
                 //Proof Of Stake
                 pindexNew->nMoneySupply = diskindex.nMoneySupply;
