PPCoin: Separate newmint value from stake in RPC 'getinfo' output

[novacoin.git] / src / checkpoints.cpp

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 8898ca1..f3bfe5d 100644 (file)
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -1,5 +1,5 @@
 // Copyright (c) 2011 The Bitcoin developers
-// Copyright (c) 2011 The PPCoin developers
+// Copyright (c) 2011-2012 The PPCoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 
@@ -27,6 +27,7 @@ namespace Checkpoints
 
     // ppcoin: automatic checkpoint (represented by height of checkpoint)
     int nAutoCheckpoint = 0;
+    int nBranchPoint = 0;    // branch point to alternative branch
 
     bool CheckHardened(int nHeight, const uint256& hash)
     {
@@ -51,7 +52,10 @@ namespace Checkpoints
                 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;
@@ -59,13 +63,13 @@ namespace Checkpoints
         return error("Checkpoints: failed to find any ancestor on main chain for the new block - internal error");
     }
 
-    // ppcoin: get next auto checkpoint in the chain
+    // 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 since checkpoint
+        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;
@@ -103,15 +107,21 @@ namespace Checkpoints
         if (bnTargetMin * 100 > bnTargetMax * 90)
             return nCheckpointMax;
         if (bnTarget * 100 > bnTargetMax * 90)
-            return std::min(nCheckpointMax, nMinTargetHeight);
+            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 = std::max(nAutoCheckpoint, nCheckpoint);
+        nAutoCheckpoint = GetNextAutoCheckpoint(nCheckpoint);
         printf("Checkpoints: auto checkpoint now at height=%d\n", nAutoCheckpoint);
     }
 
@@ -122,6 +132,32 @@ namespace Checkpoints
         return mapCheckpoints.rbegin()->first;
     }
 
+    // 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();
+        }
+
+        return true;
+    }
+
     CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex)
     {
         if (fTestNet) return NULL;