Make zpiv unarchiving work with zpivtracker.

presstab · Fuzzbawls · commit d22a4562b890 · 2018-04-26T00:14:41.000-07:00
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -4967,7 +4967,7 @@ void CWallet::ReconsiderZerocoins(std::list<CZerocoinMint>& listMintsRestored, s
         mint.SetHeight(nHeight);
         mint.SetUsed(IsSerialInBlockchain(mint.GetValue(), nHeight));
 
-        if (!zpivTracker->UnArchive(hashPubcoin)) {
+        if (!zpivTracker->UnArchive(hashPubcoin, false)) {
             LogPrintf("%s : failed to unarchive mint %s\n", __func__, mint.GetValue().GetHex());
         } else {
             zpivTracker->UpdateZerocoinMint(mint);
@@ -4985,7 +4985,7 @@ void CWallet::ReconsiderZerocoins(std::list<CZerocoinMint>& listMintsRestored, s
         dMint.SetHeight(nHeight);
         dMint.SetUsed(IsSerialInBlockchain(dMint.GetSerialHash(), nHeight));
 
-        if (!zpivTracker->UnArchive(dMint.GetPubcoinHash())) {
+        if (!zpivTracker->UnArchive(dMint.GetPubcoinHash(), true)) {
             LogPrintf("%s : failed to unarchive deterministic mint %s\n", __func__, dMint.GetPubcoinHash().GetHex());
         } else {
             zpivTracker->Add(dMint, true);
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
@@ -1128,9 +1128,8 @@ bool CWalletDB::ArchiveDeterministicOrphan(const CDeterministicMint& dMint)
     return true;
 }
 
-bool CWalletDB::UnarchiveDeterministicMint(const uint256& hashPubcoin)
+bool CWalletDB::UnarchiveDeterministicMint(const uint256& hashPubcoin, CDeterministicMint& dMint)
 {
-    CDeterministicMint dMint;
     if (!Read(make_pair(string("dzco"), hashPubcoin), dMint))
         return error("%s: failed to retrieve deterministic mint from archive", __func__);
 
@@ -1143,9 +1142,8 @@ bool CWalletDB::UnarchiveDeterministicMint(const uint256& hashPubcoin)
     return true;
 }
 
-bool CWalletDB::UnarchiveZerocoinMint(const uint256& hashPubcoin)
+bool CWalletDB::UnarchiveZerocoinMint(const uint256& hashPubcoin, CZerocoinMint& mint)
 {
-    CZerocoinMint mint;
     if (!Read(make_pair(string("zco"), hashPubcoin), mint))
         return error("%s: failed to retrieve zerocoinmint from archive", __func__);
 
diff --git a/src/walletdb.h b/src/walletdb.h
@@ -162,8 +162,8 @@ class CWalletDB : public CDB
     bool ReadZerocoinMint(const uint256& hashPubcoin, CZerocoinMint& mint);
     bool ArchiveMintOrphan(const CZerocoinMint& zerocoinMint);
     bool ArchiveDeterministicOrphan(const CDeterministicMint& dMint);
-    bool UnarchiveZerocoinMint(const uint256& hashPubcoin);
-    bool UnarchiveDeterministicMint(const uint256& hashPubcoin);
+    bool UnarchiveZerocoinMint(const uint256& hashPubcoin, CZerocoinMint& mint);
+    bool UnarchiveDeterministicMint(const uint256& hashPubcoin, CDeterministicMint& dMint);
     std::list<CZerocoinMint> ListMintedCoins();
     std::list<CDeterministicMint> ListDeterministicMints();
     std::list<CZerocoinSpend> ListSpentCoins();
diff --git a/src/zpivtracker.cpp b/src/zpivtracker.cpp
@@ -43,23 +43,22 @@ bool CzPIVTracker::Archive(CMintMeta& meta)
     return true;
 }
 
-bool CzPIVTracker::UnArchive(const uint256& hashPubcoin)
+bool CzPIVTracker::UnArchive(const uint256& hashPubcoin, bool isDeterministic)
 {
-    if (!HasPubcoinHash(hashPubcoin))
-        return error("%s: tracker does not have record of pubcoinhash %s", __func__, hashPubcoin.GetHex());
-
-    CMintMeta meta = GetMetaFromPubcoin(hashPubcoin);
     CWalletDB walletdb(strWalletFile);
-    if (meta.isDeterministic) {
-        if (!walletdb.UnarchiveDeterministicMint(hashPubcoin))
-            return error("%s: failed to unarchive", __func__);
+    if (isDeterministic) {
+        CDeterministicMint dMint;
+        if (!walletdb.UnarchiveDeterministicMint(hashPubcoin, dMint))
+            return error("%s: failed to unarchive deterministic mint", __func__);
+        Add(dMint, false);
     } else {
-        if (!walletdb.UnarchiveZerocoinMint(hashPubcoin))
-            return error("%s: failed to unarchive", __func__);
+        CZerocoinMint mint;
+        if (!walletdb.UnarchiveZerocoinMint(hashPubcoin, mint))
+            return error("%s: failed to unarchivezerocoin mint", __func__);
+        Add(mint, false);
     }
 
-    mapSerialHashes.at(meta.hashSerial).isArchived = false;
-    LogPrintf("%s: unarchived %s\n", __func__, meta.hashPubcoin.GetHex());
+    LogPrintf("%s: unarchived %s\n", __func__, hashPubcoin.GetHex());
     return true;
 }
 
diff --git a/src/zpivtracker.h b/src/zpivtracker.h
@@ -35,7 +35,7 @@ class CzPIVTracker
     void RemovePending(const uint256& txid);
     void SetPubcoinUsed(const uint256& hashPubcoin, const uint256& txid);
     void SetPubcoinNotUsed(const uint256& hashPubcoin);
-    bool UnArchive(const uint256& hashPubcoin);
+    bool UnArchive(const uint256& hashPubcoin, bool isDeterministic);
     bool UpdateZerocoinMint(const CZerocoinMint& mint);
     bool UpdateState(const CMintMeta& meta);
     void Clear();

Original file line number	Diff line number	Diff line change
`@@ -1128,9 +1128,8 @@ bool CWalletDB::ArchiveDeterministicOrphan(const CDeterministicMint& dMint)`
`1128`	`1128`	`return true;`
`1129`	`1129`	`}`
`1130`	`1130`
`1131`		`-bool CWalletDB::UnarchiveDeterministicMint(const uint256& hashPubcoin)`
	`1131`	`+bool CWalletDB::UnarchiveDeterministicMint(const uint256& hashPubcoin, CDeterministicMint& dMint)`
`1132`	`1132`	`{`
`1133`		`- CDeterministicMint dMint;`
`1134`	`1133`	`if (!Read(make_pair(string("dzco"), hashPubcoin), dMint))`
`1135`	`1134`	`return error("%s: failed to retrieve deterministic mint from archive", __func__);`
`1136`	`1135`
`@@ -1143,9 +1142,8 @@ bool CWalletDB::UnarchiveDeterministicMint(const uint256& hashPubcoin)`
`1143`	`1142`	`return true;`
`1144`	`1143`	`}`
`1145`	`1144`
`1146`		`-bool CWalletDB::UnarchiveZerocoinMint(const uint256& hashPubcoin)`
	`1145`	`+bool CWalletDB::UnarchiveZerocoinMint(const uint256& hashPubcoin, CZerocoinMint& mint)`
`1147`	`1146`	`{`
`1148`		`- CZerocoinMint mint;`
`1149`	`1147`	`if (!Read(make_pair(string("zco"), hashPubcoin), mint))`
`1150`	`1148`	`return error("%s: failed to retrieve zerocoinmint from archive", __func__);`
`1151`	`1149`