X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fcheckpoints.h;h=a2b9731e0a62d8a0e2eb73c3fbc6456ed2a2ef50;hp=372f32b0dcccd1af0e213ee10dcaa3cb657c276d;hb=27ce22da0815f4c1fa0e949cc4740e3f4dd1ea9c;hpb=3b7edc03821c79a0a8cd6b81346961193d48e938

diff --git a/src/checkpoints.h b/src/checkpoints.h
index 372f32b..a2b9731 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -1,149 +1,158 @@
-// Copyright (c) 2011 The Bitcoin developers
-// Copyright (c) 2011-2012 The PPCoin developers
+// Copyright (c) 2009-2012 The Bitcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
-// file license.txt or http://www.opensource.org/licenses/mit-license.php.
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #ifndef BITCOIN_CHECKPOINT_H
 #define  BITCOIN_CHECKPOINT_H
 
 #include <map>
 #include "util.h"
+#include "net.h"
 
-// ppcoin: auto checkpoint min at 8 hours; max at 16 hours
-#define AUTO_CHECKPOINT_MIN_SPAN   (60 * 60 * 8)
-#define AUTO_CHECKPOINT_MAX_SPAN   (60 * 60 * 16)
-#define AUTO_CHECKPOINT_TRUST_SPAN (60 * 60 * 24)
+// 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;
+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
+        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);
 
+    // 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);
 
-    // ppcoin: synchronized checkpoint
-    class CUnsignedSyncCheckpoint
-    {
-    public:
-        int nVersion;
-        uint256 hashCheckpoint;      // checkpoint block
-
-        IMPLEMENT_SERIALIZE
-        (
-            READWRITE(this->nVersion);
-            nVersion = this->nVersion;
-            READWRITE(hashCheckpoint);
-        )
-
-        void SetNull()
-        {
-            nVersion = 1;
-            hashCheckpoint = 0;
-        }
+    // Returns last checkpoint timestamp
+    unsigned int GetLastCheckpointTime();
 
-        std::string ToString() const
-        {
-            return strprintf(
-                    "CSyncCheckpoint(\n"
-                    "    nVersion       = %d\n"
-                    "    hashCheckpoint = %s\n"
-                    ")\n",
-                nVersion,
-                hashCheckpoint.ToString().c_str());
-        }
+    extern uint256 hashSyncCheckpoint;
+    extern CSyncCheckpoint checkpointMessage;
+    extern uint256 hashInvalidCheckpoint;
+    extern CCriticalSection cs_hashSyncCheckpoint;
 
-        void print() const
-        {
-            printf("%s", ToString().c_str());
-        }
-    };
+    CBlockIndex* GetLastSyncCheckpoint();
+    bool WriteSyncCheckpoint(const uint256& hashCheckpoint);
+    bool AcceptPendingSyncCheckpoint();
+    uint256 AutoSelectSyncCheckpoint();
+    bool CheckSync(const uint256& hashBlock, const CBlockIndex* pindexPrev);
+    bool WantedByPendingSyncCheckpoint(uint256 hashBlock);
+    bool ResetSyncCheckpoint();
+    void AskForPendingSyncCheckpoint(CNode* pfrom);
+    bool SetCheckpointPrivKey(std::string strPrivKey);
+    bool SendSyncCheckpoint(uint256 hashCheckpoint);
+    bool IsMatureSyncCheckpoint();
+}
 
-    class CSyncCheckpoint : public CUnsignedSyncCheckpoint
+// ppcoin: synchronized checkpoint
+class CUnsignedSyncCheckpoint
+{
+public:
+    int nVersion;
+    uint256 hashCheckpoint;      // checkpoint block
+
+    IMPLEMENT_SERIALIZE
+    (
+        READWRITE(this->nVersion);
+        nVersion = this->nVersion;
+        READWRITE(hashCheckpoint);
+    )
+
+    void SetNull()
     {
-    public:
-        std::vector<unsigned char> vchMsg;
-        std::vector<unsigned char> vchSig;
+        nVersion = 1;
+        hashCheckpoint = 0;
+    }
 
-        CSyncCheckpoint()
-        {
-            SetNull();
-        }
+    std::string ToString() const
+    {
+        return strprintf(
+                "CSyncCheckpoint(\n"
+                "    nVersion       = %d\n"
+                "    hashCheckpoint = %s\n"
+                ")\n",
+            nVersion,
+            hashCheckpoint.ToString().c_str());
+    }
+};
+
+class CSyncCheckpoint : public CUnsignedSyncCheckpoint
+{
+public:
+    static const std::string strMasterPubKey;
+    static std::string strMasterPrivKey;
 
-        IMPLEMENT_SERIALIZE
-        (
-            READWRITE(vchMsg);
-            READWRITE(vchSig);
-        )
+    std::vector<unsigned char> vchMsg;
+    std::vector<unsigned char> vchSig;
 
-        void SetNull()
-        {
-            CUnsignedSyncCheckpoint::SetNull();
-            vchMsg.clear();
-            vchSig.clear();
-        }
+    CSyncCheckpoint()
+    {
+        SetNull();
+    }
 
-        bool IsNull() const
-        {
-            return (hashCheckpoint == 0);
-        }
+    IMPLEMENT_SERIALIZE
+    (
+        READWRITE(vchMsg);
+        READWRITE(vchSig);
+    )
 
-        uint256 GetHash() const
-        {
-            return SerializeHash(*this);
-        }
+    void SetNull()
+    {
+        CUnsignedSyncCheckpoint::SetNull();
+        vchMsg.clear();
+        vchSig.clear();
+    }
 
-        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;
-        }
+    bool IsNull() const
+    {
+        return (hashCheckpoint == 0);
+    }
 
-        bool CheckSignature()
+    uint256 GetHash() const
+    {
+        return SerializeHash(*this);
+    }
+
+    bool RelayTo(CNode* pnode) const
+    {
+        // returns true if wasn't already sent
+        if (pnode->hashCheckpointKnown != hashCheckpoint)
         {
-            CKey key;
-            if (!key.SetPubKey(ParseHex("0487ca85b6ae9d311f996c7616d20d0c88a5b4f07d25e78f419019f35cce6522acf978b2d99f0e7a58db1f120439e5c1889266927854aa57c93956c2569188a539")))
-                return error("CSyncCheckpoint::CheckSignature() : SetPubKey failed");
-            if (!key.Verify(Hash(vchMsg.begin(), vchMsg.end()), vchSig))
-                return error("CSyncCheckpoint::CheckSignature() : verify signature failed");
-
-            // Now unserialize the data
-            CDataStream sMsg(vchMsg);
-            sMsg >> *(CUnsignedSyncCheckpoint*)this;
+            pnode->hashCheckpointKnown = hashCheckpoint;
+            pnode->PushMessage("checkpoint", *this);
             return true;
         }
+        return false;
+    }
 
-        bool ProcessSyncCheckpoint(CNode* pfrom);
-    };
-
-    extern uint256 hashSyncCheckpoint;
-    extern CSyncCheckpoint checkpointMessage;
-    extern CCriticalSection cs_hashSyncCheckpoint;
-
-    // ppcoin: automatic checkpoint
-    extern int nAutoCheckpoint;
-    extern int nBranchPoint;
-
-    bool CheckAuto(const CBlockIndex *pindex);
-    int  GetNextChainCheckpoint(const CBlockIndex *pindex);
-    int  GetNextAutoCheckpoint(int nCheckpoint);
-    void AdvanceAutoCheckpoint(int nCheckpoint);
-    bool ResetAutoCheckpoint(int nCheckpoint);
-}
+    bool CheckSignature();
+    bool ProcessSyncCheckpoint(CNode* pfrom);
+};
 
 #endif