PPCoin: Matching prefix of public key for RPC command 'makekeypair'
[novacoin.git] / src / checkpoints.cpp
index c8ffdf7..204741c 100644 (file)
@@ -63,6 +63,19 @@ namespace Checkpoints
     uint256 hashInvalidCheckpoint = 0;
     CCriticalSection cs_hashSyncCheckpoint;
 
+    // ppcoin: get last synchronized checkpoint
+    CBlockIndex* GetLastSyncCheckpoint()
+    {
+        CRITICAL_BLOCK(cs_hashSyncCheckpoint)
+        {
+            if (!mapBlockIndex.count(hashSyncCheckpoint))
+                error("GetSyncCheckpoint: block index missing for current sync-checkpoint %s", hashSyncCheckpoint.ToString().c_str());
+            else
+                return mapBlockIndex[hashSyncCheckpoint];
+        }
+        return NULL;
+    }
+
     // ppcoin: only descendant of current sync-checkpoint is allowed
     bool ValidateSyncCheckpoint(uint256 hashCheckpoint)
     {
@@ -195,127 +208,19 @@ namespace Checkpoints
         return true;
     }
 
-    bool IsPendingSyncCheckpoint(uint256 hashBlock)
+    bool WantedByPendingSyncCheckpoint(uint256 hashBlock)
     {
         CRITICAL_BLOCK(cs_hashSyncCheckpoint)
-            return ((!checkpointMessagePending.IsNull()) && hashBlock == checkpointMessagePending.hashCheckpoint);
-    }
-
-    // ppcoin: automatic checkpoint (represented by height of checkpoint)
-    int nAutoCheckpoint = 0;
-    int nBranchPoint = 0;    // branch point to alternative branch
-
-    // ppcoin: check automatic checkpoint
-    // To pass the check:
-    //   - All ancestors (including the block itself) have block index already
-    //   - The immediate ancestor in main chain must not have height less than
-    //     checkpoint height
-    bool CheckAuto(const CBlockIndex *pindex)
-    {
-        while (pindex)
         {
-            if (pindex->IsInMainChain())
-            {
-                if (pindex->nHeight >= nAutoCheckpoint)
-                    return true;
-                else
-                {
-                    nBranchPoint = pindex->nHeight;
-                    return error("Checkpoints: new block on alternative branch at height=%d before auto checkpoint at height=%d", pindex->nHeight, nAutoCheckpoint);
-                }
-            }
-            else
-                pindex = pindex->pprev;
-        }
-        return error("Checkpoints: failed to find any ancestor on main chain for the new block - internal error");
-    }
-
-    // ppcoin: get next chain checkpoint
-    int GetNextChainCheckpoint(const CBlockIndex *pindexLast)
-    {
-        CBigNum bnTarget;
-        CBigNum bnTargetMax = 0;  // max target of all blocks since checkpoint
-        CBigNum bnTargetMin = 0;  // min target of all candidate checkpoints
-        int nMinTargetHeight = 0; // min target height of candidate checkpoints
-        int nCheckpointMin = 0;   // minimum candidate checkpoint
-        int nCheckpointMax = 0;   // maximum candidate checkpoint
-        int nDepth = pindexLast->nHeight - pindexLast->nCheckpoint;
-        const CBlockIndex *pindex = pindexLast;
-        while (nDepth >= 0 && pindex)
-        {
-            bnTarget.SetCompact(pindex->nBits);
-            if (bnTarget > bnTargetMax)
-                bnTargetMax = bnTarget;
-            if (nCheckpointMax > 0 && bnTarget < bnTargetMin)
-            {
-                bnTargetMin = bnTarget;
-                nMinTargetHeight = pindex->nHeight;
-            }
-            if (nCheckpointMax == 0 && pindexLast->GetBlockTime() - pindex->GetBlockTime() > AUTO_CHECKPOINT_MIN_SPAN)
-            {
-                nCheckpointMax = pindex->nHeight;
-                bnTargetMin.SetCompact(pindex->nBits);
-                nMinTargetHeight = pindex->nHeight;
-            }
-            if (pindexLast->GetBlockTime() - pindex->GetBlockTime() < AUTO_CHECKPOINT_MAX_SPAN)
-                nCheckpointMin = pindex->nHeight;
-            pindex = pindex->pprev;
-            nDepth--;
-        }
-
-        assert (nDepth == -1);  // arrive at chain checkpoint now
-
-        printf("Checkpoints: min=%d max=%d tminheight=%d tmin=0x%08x tmax=0x%08x\n",
-            nCheckpointMin, nCheckpointMax, nMinTargetHeight,
-            bnTargetMin.GetCompact(), bnTargetMax.GetCompact());
-        if (nCheckpointMax == 0) // checkpoint stays if max candidate not found
-            return pindexLast->nCheckpoint;
-
-        if (bnTargetMin * 100 > bnTargetMax * 90)
-            return nCheckpointMax;
-        if (bnTarget * 100 > bnTargetMax * 90)
-            return nMinTargetHeight;
-        else
-            return nCheckpointMin;
-    }
-
-    // ppcoin: get next auto checkpoint from the new chain checkpoint
-    int GetNextAutoCheckpoint(int nCheckpoint)
-    {
-        return (std::max(nAutoCheckpoint, nCheckpoint));
-    }
-
-    // ppcoin: advance to next automatic checkpoint
-    void AdvanceAutoCheckpoint(int nCheckpoint)
-    {
-        nAutoCheckpoint = GetNextAutoCheckpoint(nCheckpoint);
-        printf("Checkpoints: auto checkpoint now at height=%d\n", nAutoCheckpoint);
-    }
-
-    // ppcoin: reset auto checkpoint
-    bool ResetAutoCheckpoint(int nCheckpoint)
-    {
-        if (nCheckpoint <= 0 || nCheckpoint > nBestHeight)
-            return error("ResetAutoCheckpoint() : new checkpoint invalid");
-        if (nCheckpoint >= nAutoCheckpoint)
-            return error("ResetAutoCheckpoint() : new checkpoint not earlier than current auto checkpoint");
-        CTxDB txdb;
-        txdb.TxnBegin();
-        if (!txdb.WriteAutoCheckpoint(nCheckpoint, true))
-            return error("ResetAutoCheckpoint() : database write failed");
-        if (!txdb.TxnCommit())
-            return error("ResetAutoCheckpoint() : database commit failed");
-        nAutoCheckpoint = nCheckpoint;
-        nBranchPoint = 0;  // clear branch point
-
-        // clear ban list to accept alternative branches
-        CRITICAL_BLOCK(cs_vNodes)
-        {
-            BOOST_FOREACH(CNode* pnode, vNodes)
-                pnode->ClearBanned();
+            if (checkpointMessagePending.IsNull())
+                return false;
+            if (hashBlock == checkpointMessagePending.hashCheckpoint)
+                return true;
+            if (mapOrphanBlocks.count(checkpointMessagePending.hashCheckpoint) 
+                && hashBlock == WantedByOrphan(mapOrphanBlocks[checkpointMessagePending.hashCheckpoint]))
+                return true;
         }
-
-        return true;
+        return false;
     }
 }
 
@@ -356,7 +261,7 @@ bool CSyncCheckpoint::ProcessSyncCheckpoint(CNode* pfrom)
                 pfrom->PushGetBlocks(pindexBest, hashCheckpoint);
                 // ask directly as well in case rejected earlier by duplicate
                 // proof-of-stake because getblocks may not get it this time
-                pfrom->AskFor(CInv(MSG_BLOCK, mapOrphanBlocks.count(hashCheckpoint)? GetOrphanRoot(mapOrphanBlocks[hashCheckpoint]) : hashCheckpoint));
+                pfrom->AskFor(CInv(MSG_BLOCK, mapOrphanBlocks.count(hashCheckpoint)? WantedByOrphan(mapOrphanBlocks[hashCheckpoint]) : hashCheckpoint));
             }
             return false;
         }