[Stealth] Fix process stealth address queue

AmirAbrams · AmirAbrams · commit df5211c66c17 · 2019-04-28T20:52:21.000-05:00
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
@@ -333,10 +333,12 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn, bool fForMixin
         }
         if (keyPass && keyFail) {
             LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.\n");
-            assert(false);
+            // TODO (BDAP): Fix locked stealth address
+            //assert(false);
         }
-        if (keyFail || (!keyPass && cryptedHDChain.IsNull()))
-            return false;
+        // TODO (BDAP): Fix locked stealth address
+        //if (keyFail || (!keyPass && cryptedHDChain.IsNull()))
+        //    return false;
 
         vMasterKey = vMasterKeyIn;
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -5441,6 +5441,9 @@ bool CWallet::ProcessStealthQueue()
     if (!pwdb)
         return false;
 
+    if (IsLocked())
+        return false;
+
     std::vector<std::pair<CKeyID, CStealthKeyQueueData>> vStealthKeyQueue;
     if (pwdb->GetStealthQueue(vStealthKeyQueue)) {
         for (const std::pair<CKeyID, CStealthKeyQueueData>& data : vStealthKeyQueue) {
@@ -5470,6 +5473,7 @@ bool CWallet::ProcessStealthQueue()
                 continue;
             }
             nFoundStealth++;
+            pwdb->EraseStealthKeyQueue(data.first);
         }
     }
     return true;

Original file line number	Diff line number	Diff line change
`@@ -333,10 +333,12 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn, bool fForMixin`
`333`	`333`	`}`
`334`	`334`	`if (keyPass && keyFail) {`
`335`	`335`	`LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.\n");`
`336`		`- assert(false);`
	`336`	`+ // TODO (BDAP): Fix locked stealth address`
	`337`	`+ //assert(false);`
`337`	`338`	`}`
`338`		`- if (keyFail \|\| (!keyPass && cryptedHDChain.IsNull()))`
`339`		`- return false;`
	`339`	`+ // TODO (BDAP): Fix locked stealth address`
	`340`	`+ //if (keyFail \|\| (!keyPass && cryptedHDChain.IsNull()))`
	`341`	`+ // return false;`
`340`	`342`
`341`	`343`	`vMasterKey = vMasterKeyIn;`
`342`	`344`
Original file line number	Diff line number	Diff line change
`@@ -5441,6 +5441,9 @@ bool CWallet::ProcessStealthQueue()`
`5441`	`5441`	`if (!pwdb)`
`5442`	`5442`	`return false;`
`5443`	`5443`
	`5444`	`+ if (IsLocked())`
	`5445`	`+ return false;`
	`5446`	`+`
`5444`	`5447`	`std::vector<std::pair<CKeyID, CStealthKeyQueueData>> vStealthKeyQueue;`
`5445`	`5448`	`if (pwdb->GetStealthQueue(vStealthKeyQueue)) {`
`5446`	`5449`	`for (const std::pair<CKeyID, CStealthKeyQueueData>& data : vStealthKeyQueue) {`
`@@ -5470,6 +5473,7 @@ bool CWallet::ProcessStealthQueue()`
`5470`	`5473`	`continue;`
`5471`	`5474`	`}`
`5472`	`5475`	`nFoundStealth++;`
	`5476`	`+ pwdb->EraseStealthKeyQueue(data.first);`
`5473`	`5477`	`}`
`5474`	`5478`	`}`
`5475`	`5479`	`return true;`