X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcheckpoints.h;h=0250618e47a04f55c11e6635b0b1d36071cb4c43;hb=32b53bb54ee7591fd47dd1ee24e05b73337f40b5;hp=15851263843feb48f88d998fc187298ef70ec431;hpb=d442c8e26cc71979b12cbfbbf4af14460e206995;p=novacoin.git

diff --git a/src/checkpoints.h b/src/checkpoints.h
index 1585126..0250618 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"
 
-#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;
+
+#ifdef WIN32
+#undef STRICT
+#undef PERMISSIVE
+#undef ADVISORY
+#endif
 
 class uint256;
 class CBlockIndex;
@@ -27,12 +34,15 @@ namespace Checkpoints
         // 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,
+        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();
 
@@ -40,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;
@@ -58,7 +68,6 @@ namespace Checkpoints
     bool SetCheckpointPrivKey(std::string strPrivKey);
     bool SendSyncCheckpoint(uint256 hashCheckpoint);
     bool IsMatureSyncCheckpoint();
-    bool IsSyncCheckpointTooOld(unsigned int nSeconds);
 }
 
 // ppcoin: synchronized checkpoint