Modify GetNextWorkRequired to set Target Limit correctly on first PoS block

CaveSpectre11 · CaveSpectre11 · commit 9294bbfd4629 · 2019-08-08T06:28:24.000-04:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -4509,8 +4509,17 @@ bool CheckWork(const CBlock block, CBlockIndex* const pindexPrev)
         return true;
     }
 
-    if (block.nBits != nBitsRequired)
+    if (block.nBits != nBitsRequired) {
+        // Pivx Specific reference to the block with the wrong threshold was used.
+        static const int64_t PivxBadBlockTime = 1471401614;
+        static const unsigned int PivxBadBlocknBits = 0x1c056dac;
+        if ((block.nTime == PivxBadBlockTime) && (block.nBits == PivxBadBlocknBits)) {
+            // accept PIVX block minted with incorrect proof of work threshold
+            return true;
+        }
+
         return error("%s : incorrect proof of work at %d", __func__, pindexPrev->nHeight + 1);
+    }
 
     return true;
 }
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -37,7 +37,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
         return Params().ProofOfWorkLimit().GetCompact();
     }
 
-    if (pindexLast->nHeight > Params().LAST_POW_BLOCK()) {
+    if (pindexLast->nHeight >= Params().LAST_POW_BLOCK()) {
         uint256 bnTargetLimit = (~uint256(0) >> 24);
         int64_t nTargetSpacing = 60;
         int64_t nTargetTimespan = 60 * 40;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead`
`37`	`37`	`return Params().ProofOfWorkLimit().GetCompact();`
`38`	`38`	`}`
`39`	`39`
`40`		`- if (pindexLast->nHeight > Params().LAST_POW_BLOCK()) {`
	`40`	`+ if (pindexLast->nHeight >= Params().LAST_POW_BLOCK()) {`
`41`	`41`	`uint256 bnTargetLimit = (~uint256(0) >> 24);`
`42`	`42`	`int64_t nTargetSpacing = 60;`
`43`	`43`	`int64_t nTargetTimespan = 60 * 40;`