PPCoin: Reset sync-checkpoint when checkpoint master key changes

[novacoin.git] / src / db.cpp

diff --git a/src/db.cpp b/src/db.cpp
index a51c217..2d6293d 100644 (file)
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -470,25 +470,24 @@ bool CTxDB::WriteBestInvalidTrust(uint64 nBestInvalidTrust)
     return Write(string("nBestInvalidTrust"), nBestInvalidTrust);
 }
 
-bool CTxDB::ReadAutoCheckpoint(int& nAutoCheckpoint)
+bool CTxDB::ReadSyncCheckpoint(uint256& hashCheckpoint)
 {
-    return Read(string("nAutoCheckpoint"), nAutoCheckpoint);
+    return Read(string("hashSyncCheckpoint"), hashCheckpoint);
 }
 
-bool CTxDB::WriteAutoCheckpoint(int nCheckpoint, bool fReset)
+bool CTxDB::WriteSyncCheckpoint(uint256 hashCheckpoint)
 {
-    nCheckpoint = fReset? nCheckpoint : max(Checkpoints::nAutoCheckpoint, nCheckpoint);
-    return Write(string("nAutoCheckpoint"), nCheckpoint);
+    return Write(string("hashSyncCheckpoint"), hashCheckpoint);
 }
 
-bool CTxDB::ReadSyncCheckpoint(uint256& hashCheckpoint)
+bool CTxDB::ReadCheckpointPubKey(string& strPubKey)
 {
-    return Read(string("hashSyncCheckpoint"), hashCheckpoint);
+    return Read(string("strCheckpointPubKey"), strPubKey);
 }
 
-bool CTxDB::WriteSyncCheckpoint(uint256 hashCheckpoint)
+bool CTxDB::WriteCheckpointPubKey(const string& strPubKey)
 {
-    return Write(string("hashSyncCheckpoint"), hashCheckpoint);
+    return Write(string("strCheckpointPubKey"), strPubKey);
 }
 
 CBlockIndex static * InsertBlockIndex(uint256 hash)
@@ -550,7 +549,6 @@ bool CTxDB::LoadBlockIndex()
             pindexNew->nBlockPos      = diskindex.nBlockPos;
             pindexNew->nChainTrust    = diskindex.nChainTrust;
             pindexNew->nHeight        = diskindex.nHeight;
-            pindexNew->nCheckpoint    = diskindex.nCheckpoint;
             pindexNew->fProofOfStake  = diskindex.fProofOfStake;
             pindexNew->prevoutStake   = diskindex.prevoutStake;
             pindexNew->nVersion       = diskindex.nVersion;
@@ -568,7 +566,7 @@ bool CTxDB::LoadBlockIndex()
 
             // ppcoin: build setStakeSeen
             if (pindexNew->fProofOfStake)
-                setStakeSeen.insert(pindexNew->prevoutStake);
+                setStakeSeen.insert(make_pair(pindexNew->prevoutStake, pindexNew->nStakeTime));
         }
         else
         {
@@ -591,16 +589,24 @@ bool CTxDB::LoadBlockIndex()
     nBestChainTrust = pindexBest->nChainTrust;
     printf("LoadBlockIndex(): hashBestChain=%s  height=%d  trust=%d\n", hashBestChain.ToString().substr(0,20).c_str(), nBestHeight, nBestChainTrust);
 
-    // ppcoin: load nAutoCheckpoint
-    if (!ReadAutoCheckpoint(Checkpoints::nAutoCheckpoint))
-        return error("CTxDB::LoadBlockIndex() : nAutoCheckpoint not loaded");
-    printf("LoadBlockIndex(): automatic checkpoint at height=%d\n", Checkpoints::nAutoCheckpoint);
-
     // ppcoin: load hashSyncCheckpoint
     if (!ReadSyncCheckpoint(Checkpoints::hashSyncCheckpoint))
         return error("CTxDB::LoadBlockIndex() : hashSyncCheckpoint not loaded");
     printf("LoadBlockIndex(): synchronized checkpoint %s\n", Checkpoints::hashSyncCheckpoint.ToString().c_str());
 
+    // ppcoin: if checkpoint master key changed must reset sync-checkpoint
+    string strPubKey = "";
+    if (!ReadCheckpointPubKey(strPubKey) || strPubKey != CSyncCheckpoint::strMasterPubKey)
+    {
+        // write checkpoint master key to db
+        TxnBegin();
+        WriteCheckpointPubKey(CSyncCheckpoint::strMasterPubKey);
+        if (!TxnCommit())
+            return error("CTxDB::LoadBlockIndex() : failed to write new checkpoint master key");
+        if (!Checkpoints::ResetSyncCheckpoint())
+            return error("CTxDB::LoadBlockIndex() : failed to reset sync-checkpoint");
+    }
+
     // Load nBestInvalidTrust, OK if it doesn't exist
     ReadBestInvalidTrust(nBestInvalidTrust);