Merge pull request #21 from JRedinger/master

FPOS Flip bugfix
Pink2Dev · Jan 22, 2019 · 16e40c6 · 16e40c6
2 parents 1706801 + f7bf6a5
commit 16e40c6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1095,13 +1095,20 @@ const CBlockIndex* GetLastBlockIndex(const CBlockIndex* pindex, bool fProofOfSta
 const CBlockIndex* GetLastBlockIndex2(const CBlockIndex* pindex, bool fFlashStake)
 {
     //bool bFlashStake = true;
-    while (pindex && pindex->pprev && IsFlashStake(pindex->nTime) != fFlashStake)
-    {
-        pindex = pindex->pprev;
+    if (pindex->nHeight >= 771000) {
+
+        while (pindex && pindex->pprev && !pindex->IsFPOS(fFlashStake))
+            pindex = pindex->pprev;
+
+    } else {
+
+        while (pindex && pindex->pprev && IsFlashStake(pindex->nTime) != fFlashStake)
+            pindex = pindex->pprev;
+        while (pindex && pindex->pprev && (!pindex->IsProofOfStake()))
+            pindex = pindex->pprev;
     }
-    while (pindex && pindex->pprev && (!pindex->IsProofOfStake()))
-        pindex = pindex->pprev;
     return pindex;
+
 }
 
 unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfStake, unsigned int nBlockTime)

diff --git a/src/main.h b/src/main.h
@@ -1279,10 +1279,10 @@ class CBlockIndex
         return (nFlags & BLOCK_PROOF_OF_STAKE);
     }
 
-    bool IsFlashPOS() const
+    bool IsFPOS(bool nFlash) const
     {
-        if (IsProofOfStake())
-           return (IsFlashStake(nTime));
+       if (IsProofOfStake())
+            return nFlash == IsFlashStake(nTime);
 
         return false;
     }