zpivTracker better check for orphans. Also no redundant adding wtx's.

presstab · Fuzzbawls · commit b4a8f9b9cddc · 2018-04-08T18:02:32.000-07:00
diff --git a/src/zpivtracker.cpp b/src/zpivtracker.cpp
@@ -377,7 +377,7 @@ std::list<CMintMeta> CzPIVTracker::ListMints(bool fUnusedOnly, bool fMatureOnly,
 
         if (fMatureOnly || fUpdateStatus) {
             //if there is not a record of the block height, then look it up and assign it
-            if (!mint.nHeight) {
+            if (!mint.nHeight || !mapBlockIndex.count(mint.hashSerial) || !chainActive.Contains(mapBlockIndex.at(mint.hashSerial))) {
                 CTransaction tx;
                 uint256 hashBlock;
 
diff --git a/src/zpivwallet.cpp b/src/zpivwallet.cpp
@@ -119,6 +119,7 @@ void CzPIVWallet::SyncWithChain(bool fGenerateMintPool)
     CWalletDB walletdb(strWalletFile);
     CzPIVTracker* zpivTracker = pwalletMain->zpivTracker;
     std::set<uint256> setChecked;
+    set<uint256> setAddedTx;
     while (found) {
         found = false;
         if (fGenerateMintPool)
@@ -190,24 +191,23 @@ void CzPIVWallet::SyncWithChain(bool fGenerateMintPool)
                     break;
                 }
 
-                CBlock block;
-                CWalletTx wtx(pwalletMain, tx);
-                if (mapBlockIndex.count(hashBlock) && ReadBlockFromDisk(block, mapBlockIndex.at(hashBlock)))
-                    wtx.SetMerkleBranch(block);
-
-                //The mint was found in the chain, so recalculate the randomness and serial and DB it
-                int nHeight = 0;
-                int nTimeReceived = 0;
-                if (mapBlockIndex.count(hashBlock)) {
-                    nHeight = mapBlockIndex.at(hashBlock)->nHeight;
-                    nTimeReceived = mapBlockIndex.at(hashBlock)->nTime;
-                }
+                CBlockIndex* pindex;
+                if (mapBlockIndex.count(hashBlock))
+                    pindex = mapBlockIndex.at(hashBlock);
+
+                if (!setAddedTx.count(txHash)) {
+                    CBlock block;
+                    CWalletTx wtx(pwalletMain, tx);
+                    if (pindex && ReadBlockFromDisk(block, pindex))
+                        wtx.SetMerkleBranch(block);
 
-                //Fill out wtx so that a transaction record can be created
-                wtx.nTimeReceived = nTimeReceived;
-                pwalletMain->AddToWallet(wtx);
+                    //Fill out wtx so that a transaction record can be created
+                    wtx.nTimeReceived = pindex->GetBlockTime();
+                    pwalletMain->AddToWallet(wtx);
+                    setAddedTx.insert(txHash);
+                }
 
-                SetMintSeen(bnValue, nHeight, txHash, denomination);
+                SetMintSeen(bnValue, pindex->nHeight, txHash, denomination);
                 nLastCountUsed = std::max(pMint.second, nLastCountUsed);
                 nCountLastUsed = std::max(nLastCountUsed, nCountLastUsed);
                 LogPrint("zero", "%s: updated count to %d\n", __func__, nCountLastUsed);
