Merge pull request #11 from RSerhii/scypt2_fork

Added checkpoint
phoenixkonsole · Sep 14, 2020 · 519db41 · 519db41
2 parents 236b49b + 6707ec4
commit 519db41
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -25,10 +25,11 @@ bool IsScrypt2AdjustmentBlocks(const int nLastBlockHeight)
     return nLastBlockHeight >= SCRYPT2_THRESHOLD + 3 && nLastBlockHeight < SCRYPT2_THRESHOLD + 50;
 }
 
+const int difficultyAdjustmentBlock = 668075;
+
 bool IsScrypt2SecondAdjustment(const int nLastBlockHeight)
 {
-    const int adjustmentBlock = 668075;
-    return nLastBlockHeight >= adjustmentBlock && nLastBlockHeight < adjustmentBlock + 190;
+    return nLastBlockHeight >= difficultyAdjustmentBlock && nLastBlockHeight < difficultyAdjustmentBlock + 190;
 }
 
 unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params) {
@@ -106,20 +107,22 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const CBlockH
     bnNew *= nActualTimespan;
     bnNew /= nTargetTimespan;
 
-    // new difficulty can be maximum 50 times higher than previous
-    const int maxDifMultiplier = 40;
-    arith_uint256 bnLast = arith_uint256().SetCompact(pindexLast->nBits);
-    if ((bnLast / bnNew) > maxDifMultiplier) {
-        bnNew = bnLast / maxDifMultiplier;
-    }
+    if (pindexLast->nHeight >= difficultyAdjustmentBlock) {
+        // new difficulty can be maximum 50 times higher than previous
+        const int maxDifMultiplier = 40;
+        arith_uint256 bnLast = arith_uint256().SetCompact(pindexLast->nBits);
+        if ((bnLast / bnNew) > maxDifMultiplier) {
+            bnNew = bnLast / maxDifMultiplier;
+        }
 
-    // significantly reduce the difficulty if the last timespan is too large
-    const int64_t lastTimespan = pindexLast->GetBlockTime() - pindexLast->pprev->GetBlockTime();
-    const int timeMultiplier = lastTimespan / params.nPowTargetSpacing;
-    if (timeMultiplier > maxDifMultiplier) {
-        bnLast *= (timeMultiplier - (maxDifMultiplier / 2));
-        if (bnLast > bnNew) {
-            bnNew = bnLast;
+        // significantly reduce the difficulty if the last timespan is too large
+        const int64_t lastTimespan = pindexLast->GetBlockTime() - pindexLast->pprev->GetBlockTime();
+        const int timeMultiplier = lastTimespan / params.nPowTargetSpacing;
+        if (timeMultiplier > maxDifMultiplier) {
+            bnLast *= (timeMultiplier - (maxDifMultiplier / 2));
+            if (bnLast > bnNew) {
+                bnNew = bnLast;
+            }
         }
     }
 

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -763,7 +763,7 @@ UniValue submitblock(const JSONRPCRequest& request)
         }
     }
 
-    submitblock_StateCatcher sc(block.GetNextBlockHash());
+    submitblock_StateCatcher sc(hash);
     RegisterValidationInterface(&sc);
     bool fAccepted = ProcessNewBlock(Params(), blockptr, true, nullptr);
     UnregisterValidationInterface(&sc);

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2118,8 +2118,8 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
     assert(pindex);
     // pindex->phashBlock can be null if called by CreateNewBlock/TestBlockValidity
     assert((pindex->phashBlock == nullptr) ||
-           (*pindex->phashBlock == block.GetMinedHash(pindex->nHeight)) || 
-           (*pindex->phashBlock == block.GetHash()));
+           (*pindex->phashBlock == block.GetHash()) || 
+           (*pindex->phashBlock == block.GetMinedHash(pindex->nHeight)));
     int64_t nTimeStart = GetTimeMicros();
 
     // Check it again in case a previous version let a bad block in