Fix PoW mining in mixed PoS/PoW, fix orphaned stake tx

2018-07-11 02:51:42 -11:00
parent d5a38d16a8
commit 1cdb961ba2
8 changed files with 77 additions and 14 deletions
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1358,6 +1358,18 @@ bool CWallet::IsFromMe(const uint256& nullifier) const
    return false;
 }

+void CWallet::EraseFromWallet(const uint256 &hash)
+{
+    if (!fFileBacked)
+        return;
+    {
+        LOCK(cs_wallet);
+        if (mapWallet.erase(hash))
+            CWalletDB(strWalletFile).EraseTx(hash);
+    }
+    return;
+}
+
 void CWallet::GetNoteWitnesses(std::vector<JSOutPoint> notes,
                               std::vector<boost::optional<ZCIncrementalWitness>>& witnesses,
                               uint256 &final_anchor)