X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcheckpoints.h;h=347b2d08ea9f5d9ad0be83af28ff7e6ac995ea4a;hb=5f3f7465db4444e49dd4a896f88c090b40d0a303;hp=1074cd20b63c80495b18e690cce16989d1e76b12;hpb=5043313a037be9aa7c15f873b40515b927c694af;p=novacoin.git

diff --git a/src/checkpoints.h b/src/checkpoints.h
index 1074cd2..347b2d0 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -5,10 +5,17 @@
 #define  BITCOIN_CHECKPOINT_H
 
 #include <map>
-#include "net.h"
 #include "util.h"
+#include "net.h"
+
+// max 1 hour before latest block
+static const int64_t CHECKPOINT_MAX_SPAN = nOneHour;
 
-#define CHECKPOINT_MAX_SPAN (60 * 60 * 4) // max 4 hours before latest block
+#ifdef WIN32
+#undef STRICT
+#undef PERMISSIVE
+#undef ADVISORY
+#endif
 
 class uint256;
 class CBlockIndex;
@@ -19,6 +26,17 @@ class CSyncCheckpoint;
  */
 namespace Checkpoints
 {
+    /** Checkpointing mode */
+    enum CPMode
+    {
+        // Scrict checkpoints policy, perform conflicts verification and resolve conflicts
+        STRICT = 0,
+        // Advisory checkpoints policy, perform conflicts verification but don't try to resolve them
+        ADVISORY = 1,
+        // Permissive checkpoints policy, don't perform any checking
+        PERMISSIVE = 2
+    };
+
     // Returns true if block passes checkpoint checks
     bool CheckHardened(int nHeight, const uint256& hash);
 
@@ -29,7 +47,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;
@@ -47,7 +65,6 @@ namespace Checkpoints
     bool SetCheckpointPrivKey(std::string strPrivKey);
     bool SendSyncCheckpoint(uint256 hashCheckpoint);
     bool IsMatureSyncCheckpoint();
-    bool IsSyncCheckpointTooOld(unsigned int nSeconds);
 }
 
 // ppcoin: synchronized checkpoint