Merge branch 'master' of github.com:novacoin-project/novacoin

[novacoin.git] / src / checkpoints.h

diff --git a/src/checkpoints.h b/src/checkpoints.h
index fedcf36..a2b9731 100644 (file)
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -5,10 +5,11 @@
 #define  BITCOIN_CHECKPOINT_H
 
 #include <map>
-#include "net.h"
 #include "util.h"
+#include "net.h"
 
-#define CHECKPOINT_MAX_SPAN (60 * 60) // max 1 hour before latest block
+// max 1 hour before latest block
+static const int64_t CHECKPOINT_MAX_SPAN = nOneHour;
 
 #ifdef WIN32
 #undef STRICT
@@ -39,6 +40,9 @@ namespace Checkpoints
     // 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();
 
@@ -46,7 +50,7 @@ namespace Checkpoints
     CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex);
 
     // Returns last checkpoint timestamp
-    int GetLastCheckpointTime();
+    unsigned int GetLastCheckpointTime();
 
     extern uint256 hashSyncCheckpoint;
     extern CSyncCheckpoint checkpointMessage;
@@ -64,7 +68,6 @@ namespace Checkpoints
     bool SetCheckpointPrivKey(std::string strPrivKey);
     bool SendSyncCheckpoint(uint256 hashCheckpoint);
     bool IsMatureSyncCheckpoint();
-    bool IsSyncCheckpointTooOld(unsigned int nSeconds);
 }
 
 // ppcoin: synchronized checkpoint
@@ -97,11 +100,6 @@ public:
             nVersion,
             hashCheckpoint.ToString().c_str());
     }
-
-    void print() const
-    {
-        printf("%s", ToString().c_str());
-    }
 };
 
 class CSyncCheckpoint : public CUnsignedSyncCheckpoint