Fix CDiskBlockIndex serialization of dummy fields for old DB versions

random-zebra · furszy · commit f021897c646f · 2021-07-03T09:02:56.000-03:00
diff --git a/src/chain.h b/src/chain.h
@@ -310,7 +310,7 @@ class CDiskBlockIndex : public CBlockIndex
             // Serialization with CLIENT_VERSION = 4009901
             std::map<libzerocoin::CoinDenomination, int64_t> mapZerocoinSupply;
             int64_t nMoneySupply = 0;
-            SER_READ(obj, nMoneySupply);
+            READWRITE(nMoneySupply);
             READWRITE(obj.nFlags);
             READWRITE(obj.nVersion);
             READWRITE(obj.vStakeModifier);
@@ -320,35 +320,35 @@ class CDiskBlockIndex : public CBlockIndex
             READWRITE(obj.nBits);
             READWRITE(obj.nNonce);
             if (obj.nVersion > 3) {
-                SER_READ(obj, mapZerocoinSupply);
+                READWRITE(mapZerocoinSupply);
                 if (obj.nVersion < 7) READWRITE(obj.nAccumulatorCheckpoint);
             }
         } else if (ser_action.ForRead()) {
             // Serialization with CLIENT_VERSION = 4009900-
             int64_t nMint = 0;
             uint256 hashNext{};
             int64_t nMoneySupply = 0;
-            SER_READ(obj, nMint);
-            SER_READ(obj, nMoneySupply);
+            READWRITE(nMint);
+            READWRITE(nMoneySupply);
             READWRITE(obj.nFlags);
             if (!Params().GetConsensus().NetworkUpgradeActive(obj.nHeight, Consensus::UPGRADE_V3_4)) {
                 uint64_t nStakeModifier = 0;
                 READWRITE(nStakeModifier);
                 SER_READ(obj, obj.SetStakeModifier(nStakeModifier, obj.GeneratedStakeModifier()));
             } else {
                 uint256 nStakeModifierV2;
-                SER_READ(obj, nStakeModifierV2);
+                READWRITE(nStakeModifierV2);
                 SER_READ(obj, obj.SetStakeModifier(nStakeModifierV2));
             }
             if (obj.IsProofOfStake()) {
                 COutPoint prevoutStake;
                 unsigned int nStakeTime = 0;
-                SER_READ(obj, prevoutStake);
-                SER_READ(obj, nStakeTime);
+                READWRITE(prevoutStake);
+                READWRITE(nStakeTime);
             }
             READWRITE(obj.nVersion);
             READWRITE(obj.hashPrev);
-            SER_READ(obj, hashNext);
+            READWRITE(hashNext);
             READWRITE(obj.hashMerkleRoot);
             READWRITE(obj.nTime);
             READWRITE(obj.nBits);
@@ -357,8 +357,8 @@ class CDiskBlockIndex : public CBlockIndex
                 std::map<libzerocoin::CoinDenomination, int64_t> mapZerocoinSupply;
                 std::vector<libzerocoin::CoinDenomination> vMintDenominationsInBlock;
                 READWRITE(obj.nAccumulatorCheckpoint);
-                SER_READ(obj, mapZerocoinSupply);
-                SER_READ(obj, vMintDenominationsInBlock);
+                READWRITE(mapZerocoinSupply);
+                READWRITE(vMintDenominationsInBlock);
             }
         }
     }
