[Miner] Update block header's current version to v8

Fuzzbawls · Fuzzbawls · commit fb58f5f03428 · 2020-12-16T15:53:53.000-08:00
Avoids an upgrade warning from being triggered after 100 v8 blocks are on chain. Moved the network upgrade consensus check further up. Github-Pull: #2052 Rebased-From: 710f480
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -164,8 +164,14 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
     // Make sure to create the correct block version
     const Consensus::Params& consensus = Params().GetConsensus();
 
-    //!> Block v7: Removes accumulator checkpoints
-    pblock->nVersion = CBlockHeader::CURRENT_VERSION;
+    bool fSaplingActive = NetworkUpgradeActive(nHeight, consensus, Consensus::UPGRADE_V5_0);
+
+    if (fSaplingActive) {
+        //!> Block v8: Sapling / tx v2
+        pblock->nVersion = CBlockHeader::CURRENT_VERSION;
+    } else {
+        pblock->nVersion = 7;
+    }
     // -regtest only: allow overriding block.nVersion with
     // -blockversion=N to test forking scenarios
     if (Params().IsRegTestNet()) {
@@ -391,8 +397,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
         LogPrintf("%s : total size %u\n", __func__, nBlockSize);
 
         // Sapling
-        if (NetworkUpgradeActive(nHeight, consensus, Consensus::UPGRADE_V5_0)) {
-            pblock->nVersion = 8;
+        if (fSaplingActive) {
             SaplingMerkleTree sapling_tree;
             assert(view.GetSaplingAnchorAt(view.GetBestAnchor(), sapling_tree));
 
diff --git a/src/primitives/block.h b/src/primitives/block.h
@@ -23,7 +23,7 @@ class CBlockHeader
 {
 public:
     // header
-    static const int32_t CURRENT_VERSION=7;     //!> Version 7 removes nAccumulatorCheckpoint from serialization
+    static const int32_t CURRENT_VERSION=8;     //!> Version 8 Sapling feature and tx v2
     int32_t nVersion;
     uint256 hashPrevBlock;
     uint256 hashMerkleRoot;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class CBlockHeader`
`23`	`23`	`{`
`24`	`24`	`public:`
`25`	`25`	`// header`
`26`		`- static const int32_t CURRENT_VERSION=7; //!> Version 7 removes nAccumulatorCheckpoint from serialization`
	`26`	`+ static const int32_t CURRENT_VERSION=8; //!> Version 8 Sapling feature and tx v2`
`27`	`27`	`int32_t nVersion;`
`28`	`28`	`uint256 hashPrevBlock;`
`29`	`29`	`uint256 hashMerkleRoot;`