[Core] define Block version 7 removing the accumulator checkpoints

PIVX-Project · Nov 22, 2019 · 9cf6c69 · 9cf6c69
1 parent 750d04f
commit 9cf6c69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -130,15 +130,15 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
     const int nHeight = pindexPrev->nHeight + 1;
 
     // Make sure to create the correct block version after zerocoin is enabled
-    bool fZerocoinActive = nHeight >= Params().Zerocoin_StartHeight();
-    if(Params().IsStakeModifierV2(nHeight)) {
-        pblock->nVersion = 6;       //!> Supports V2 Stake Modifiers.
+    if(nHeight >= Params().Block_V7_StartHeight()) {
+        pblock->nVersion = 7;       //!> Removes accumulator checkpoints
     } else {
-        pblock->nVersion = 5;       //!> Supports CLTV activation
+        pblock->nVersion = 6;       //!> Supports V2 Stake Modifiers.
     }
 
     // -regtest only: allow overriding block.nVersion with
     // -blockversion=N to test forking scenarios
+    bool fZerocoinActive = nHeight >= Params().Zerocoin_StartHeight();
     if (Params().MineBlocksOnDemand()) {
         if (fZerocoinActive)
             pblock->nVersion = 5;

diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -27,14 +27,14 @@ class CBlockHeader
 {
 public:
     // header
-    static const int32_t CURRENT_VERSION=6;     //!> Version 6 supports V2 Stake Modifiers
+    static const int32_t CURRENT_VERSION=7;     //!> Version 7 removes nAccumulatorCheckpoint from serialization
     int32_t nVersion;
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;
     uint32_t nTime;
     uint32_t nBits;
     uint32_t nNonce;
-    uint256 nAccumulatorCheckpoint;
+    uint256 nAccumulatorCheckpoint;             // only for version 4, 5 and 6.
 
     CBlockHeader()
     {
@@ -54,7 +54,7 @@ class CBlockHeader
         READWRITE(nNonce);
 
         //zerocoin active, header changes to include accumulator checksum
-        if(nVersion > 3)
+        if(nVersion > 3 && nVersion < 7)
             READWRITE(nAccumulatorCheckpoint);
     }