Merge pull request #363 from svost/c++11

[novacoin.git] / src / checkpoints.h

diff --git a/src/checkpoints.h b/src/checkpoints.h
index fb7ac4c..8f044da 100644 (file)
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -1,35 +1,50 @@
 // Copyright (c) 2009-2012 The Bitcoin developers
-// Copyright (c) 2011-2012 The PPCoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_CHECKPOINT_H
 #define  BITCOIN_CHECKPOINT_H
 
 #include <map>
-#include "net.h"
 #include "util.h"
+#include "net.h"
 
-#define STAKE_MIN_AGE (60 * 60 * 24)      // minimum age for coin age
-#define CHECKPOINT_MAX_SPAN (60 * 60 * 4) // max 4 hours before latest block
+// max 1 hour before latest block
+static const int64_t CHECKPOINT_MAX_SPAN = nOneHour;
 
 class uint256;
 class CBlockIndex;
 class CSyncCheckpoint;
 
-/** Block-chain checkpoints are compiled-in sanity checks.
- * They are updated every release or three.
- */
+// Block-chain checkpoints are compiled-in sanity checks.
+// They are updated every release or three.
 namespace Checkpoints
 {
+    // Checkpointing mode
+    enum CPMode
+    {
+        // Scrict checkpoints policy, perform conflicts verification and resolve conflicts
+        CP_STRICT = 0,
+        // Advisory checkpoints policy, perform conflicts verification but don't try to resolve them
+        CP_ADVISORY = 1,
+        // Permissive checkpoints policy, don't perform any checking
+        CP_PERMISSIVE = 2
+    };
+
     // Returns true if block passes checkpoint checks
     bool CheckHardened(int nHeight, const uint256& hash);
 
+    // Returns true if block passes banlist checks
+    bool CheckBanned(const uint256 &nHash);
+
     // Return conservative estimate of total number of blocks, 0 if unknown
     int GetTotalBlocksEstimate();
 
     // Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
     CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex);
 
+    // Returns last checkpoint timestamp
+    unsigned int GetLastCheckpointTime();
+
     extern uint256 hashSyncCheckpoint;
     extern CSyncCheckpoint checkpointMessage;
     extern uint256 hashInvalidCheckpoint;
@@ -40,11 +55,11 @@ namespace Checkpoints
     bool AcceptPendingSyncCheckpoint();
     uint256 AutoSelectSyncCheckpoint();
     bool CheckSync(const uint256& hashBlock, const CBlockIndex* pindexPrev);
-    bool WantedByPendingSyncCheckpoint(uint256 hashBlock);
+    bool WantedByPendingSyncCheckpoint(const uint256 &hashBlock);
     bool ResetSyncCheckpoint();
     void AskForPendingSyncCheckpoint(CNode* pfrom);
-    bool SetCheckpointPrivKey(std::string strPrivKey);
-    bool SendSyncCheckpoint(uint256 hashCheckpoint);
+    bool SetCheckpointPrivKey(const std::string &strPrivKey);
+    bool SendSyncCheckpoint(const uint256 &hashCheckpoint);
     bool IsMatureSyncCheckpoint();
 }
 
@@ -52,7 +67,7 @@ namespace Checkpoints
 class CUnsignedSyncCheckpoint
 {
 public:
-    int nVersion;
+    int32_t nVersion;
     uint256 hashCheckpoint;      // checkpoint block
 
     IMPLEMENT_SERIALIZE
@@ -62,27 +77,8 @@ public:
         READWRITE(hashCheckpoint);
     )
 
-    void SetNull()
-    {
-        nVersion = 1;
-        hashCheckpoint = 0;
-    }
-
-    std::string ToString() const
-    {
-        return strprintf(
-                "CSyncCheckpoint(\n"
-                "    nVersion       = %d\n"
-                "    hashCheckpoint = %s\n"
-                ")\n",
-            nVersion,
-            hashCheckpoint.ToString().c_str());
-    }
-
-    void print() const
-    {
-        printf("%s", ToString().c_str());
-    }
+    void SetNull();
+    std::string ToString() const;
 };
 
 class CSyncCheckpoint : public CUnsignedSyncCheckpoint
@@ -94,10 +90,7 @@ public:
     std::vector<unsigned char> vchMsg;
     std::vector<unsigned char> vchSig;
 
-    CSyncCheckpoint()
-    {
-        SetNull();
-    }
+    CSyncCheckpoint();
 
     IMPLEMENT_SERIALIZE
     (
@@ -105,35 +98,10 @@ public:
         READWRITE(vchSig);
     )
 
-    void SetNull()
-    {
-        CUnsignedSyncCheckpoint::SetNull();
-        vchMsg.clear();
-        vchSig.clear();
-    }
-
-    bool IsNull() const
-    {
-        return (hashCheckpoint == 0);
-    }
-
-    uint256 GetHash() const
-    {
-        return SerializeHash(*this);
-    }
-
-    bool RelayTo(CNode* pnode) const
-    {
-        // returns true if wasn't already sent
-        if (pnode->hashCheckpointKnown != hashCheckpoint)
-        {
-            pnode->hashCheckpointKnown = hashCheckpoint;
-            pnode->PushMessage("checkpoint", *this);
-            return true;
-        }
-        return false;
-    }
-
+    void SetNull();
+    bool IsNull() const;
+    uint256 GetHash() const;
+    bool RelayTo(CNode* pnode) const;
     bool CheckSignature();
     bool ProcessSyncCheckpoint(CNode* pfrom);
 };