PPCoin: Remove automatic checkpoint code

[novacoin.git] / src / db.cpp

diff --git a/src/db.cpp b/src/db.cpp
index c260fb3..e52e6cf 100644 (file)
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -470,15 +470,14 @@ 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);
 }
 
 CBlockIndex static * InsertBlockIndex(uint256 hash)
@@ -540,6 +539,8 @@ bool CTxDB::LoadBlockIndex()
             pindexNew->nBlockPos      = diskindex.nBlockPos;
             pindexNew->nChainTrust    = diskindex.nChainTrust;
             pindexNew->nHeight        = diskindex.nHeight;
+            pindexNew->fProofOfStake  = diskindex.fProofOfStake;
+            pindexNew->prevoutStake   = diskindex.prevoutStake;
             pindexNew->nVersion       = diskindex.nVersion;
             pindexNew->hashMerkleRoot = diskindex.hashMerkleRoot;
             pindexNew->nTime          = diskindex.nTime;
@@ -552,6 +553,10 @@ bool CTxDB::LoadBlockIndex()
 
             if (!pindexNew->CheckIndex())
                 return error("LoadBlockIndex() : CheckIndex failed at %d", pindexNew->nHeight);
+
+            // ppcoin: build setStakeSeen
+            if (pindexNew->fProofOfStake)
+                setStakeSeen.insert(make_pair(pindexNew->prevoutStake, pindexNew->nStakeTime));
         }
         else
         {
@@ -574,10 +579,10 @@ bool CTxDB::LoadBlockIndex()
     nBestChainTrust = pindexBest->nChainTrust;
     printf("LoadBlockIndex(): hashBestChain=%s  height=%d  trust=%d\n", hashBestChain.ToString().substr(0,20).c_str(), nBestHeight, nBestChainTrust);
 
-    // 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());
 
     // Load nBestInvalidTrust, OK if it doesn't exist
     ReadBestInvalidTrust(nBestInvalidTrust);
@@ -930,6 +935,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
                 if (strKey == "fUseProxy")          ssValue >> fUseProxy;
                 if (strKey == "addrProxy")          ssValue >> addrProxy;
                 if (fHaveUPnP && strKey == "fUseUPnP")           ssValue >> fUseUPnP;
+                if (strKey == "nBalanceReserve")    ssValue >> nBalanceReserve;
             }
             else if (strType == "minversion")
             {