Add AllowMinDifficultyBlocks chain parameter

jtimon · jtimon · commit 21913a9ac952 · 2014-06-04T13:29:36.000+02:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -224,6 +224,8 @@ class CTestNetParams : public CMainParams {
         base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);
         base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94);
     }
+
+    virtual bool AllowMinDifficultyBlocks() const { return true; }
     virtual Network NetworkID() const { return CChainParams::TESTNET; }
 };
 static CTestNetParams testNetParams;
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -70,6 +70,8 @@ class CChainParams
     virtual bool MiningRequiresPeers() const { return true; }
     /* Default value for -checkmempool argument */
     virtual bool DefaultCheckMemPool() const { return false; }
+    /* Allow mining of a min-difficulty block */
+    virtual bool AllowMinDifficultyBlocks() const { return false; }
     const string& DataDir() const { return strDataDir; }
     /* Make miner stop after a block is found. In RPC, don't return
      * until nGenProcLimit blocks are generated */
diff --git a/src/main.cpp b/src/main.cpp
@@ -1210,7 +1210,7 @@ unsigned int ComputeMinWork(unsigned int nBase, int64_t nTime)
     const uint256 &bnLimit = Params().ProofOfWorkLimit();
     // Testnet has min-difficulty blocks
     // after nTargetSpacing*2 time between blocks:
-    if (TestNet() && nTime > nTargetSpacing*2)
+    if (Params().AllowMinDifficultyBlocks() && nTime > nTargetSpacing*2)
         return bnLimit.GetCompact();
 
     uint256 bnResult;
@@ -1238,7 +1238,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
     // Only change once per interval
     if ((pindexLast->nHeight+1) % nInterval != 0)
     {
-        if (TestNet())
+        if (Params().AllowMinDifficultyBlocks())
         {
             // Special difficulty rule for testnet:
             // If the new block's timestamp is more than 2* 10 minutes
@@ -1468,7 +1468,7 @@ void UpdateTime(CBlockHeader& block, const CBlockIndex* pindexPrev)
     block.nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
 
     // Updating time can change work required on testnet:
-    if (TestNet())
+    if (Params().AllowMinDifficultyBlocks())
         block.nBits = GetNextWorkRequired(pindexPrev, &block);
 }
 
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -632,7 +632,7 @@ void static BitcoinMiner(CWallet *pwallet)
             // Update nTime every few seconds
             UpdateTime(*pblock, pindexPrev);
             nBlockTime = ByteReverse(pblock->nTime);
-            if (TestNet())
+            if (Params().AllowMinDifficultyBlocks())
             {
                 // Changing pblock->nTime can change work required on testnet:
                 nBlockBits = ByteReverse(pblock->nBits);

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,8 @@ class CTestNetParams : public CMainParams {`
`224`	`224`	`base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);`
`225`	`225`	`base58Prefixes[EXT_SECRET_KEY] = list_of(0x04)(0x35)(0x83)(0x94);`
`226`	`226`	`}`
	`227`	`+`
	`228`	`+ virtual bool AllowMinDifficultyBlocks() const { return true; }`
`227`	`229`	`virtual Network NetworkID() const { return CChainParams::TESTNET; }`
`228`	`230`	`};`
`229`	`231`	`static CTestNetParams testNetParams;`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ void static BitcoinMiner(CWallet *pwallet)`
`632`	`632`	`// Update nTime every few seconds`
`633`	`633`	`UpdateTime(*pblock, pindexPrev);`
`634`	`634`	`nBlockTime = ByteReverse(pblock->nTime);`
`635`		`- if (TestNet())`
	`635`	`+ if (Params().AllowMinDifficultyBlocks())`
`636`	`636`	`{`
`637`	`637`	`// Changing pblock->nTime can change work required on testnet:`
`638`	`638`	`nBlockBits = ByteReverse(pblock->nBits);`