Adjust diff for slow testnet/devnet blocks a bit smoother (dashpay#2161)

* Adjust diff for slow testnet/devnet blocks a bit smoother * bump to 000000000000000000000000000000000000000000000000003ff00000000000 * bump slow blocks to 10 minutes
jsb4ch · Jul 7, 2018 · 050cabd · 050cabd
1 parent c4698d5
commit 050cabd
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -103,8 +103,25 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockH
         // Special difficulty rule for testnet/devnet:
         // If the new block's timestamp is more than 2* 2.5 minutes
         // then allow mining of a min-difficulty block.
-        if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2)
-            return bnPowLimit.GetCompact();
+
+        // start using smoother adjustment on testnet when total work hits
+        // 000000000000000000000000000000000000000000000000003ff00000000000
+        if (pindexLast->nChainWork >= UintToArith256(uint256S("0x000000000000000000000000000000000000000000000000003ff00000000000"))
+            // and immediately on devnet
+            || !params.hashDevnetGenesisBlock.IsNull()) {
+            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*4) {
+                arith_uint256 bnNew = arith_uint256().SetCompact(pindexLast->nBits) * 10;
+                if (bnNew > bnPowLimit) {
+                    bnNew = bnPowLimit;
+                }
+                return bnNew.GetCompact();
+            }
+        } else {
+            // old stuff
+            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2) {
+                return bnPowLimit.GetCompact();
+            }
+        }
     }
 
     const CBlockIndex *pindex = pindexLast;