Merge pull request #3674

77cbd46 Let -zapwallettxes recover transaction meta data (Cozz Lovan)
2014-06-24 16:48:48 +02:00
parent 36db6633c3 77cbd4623e
commit d4392c8989
7 changed files with 212 additions and 11 deletions
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -341,7 +341,7 @@ public:
    void SetBestChain(const CBlockLocator& loc);

    DBErrors LoadWallet(bool& fFirstRunRet);
-    DBErrors ZapWalletTx();
+    DBErrors ZapWalletTx(std::vector<CWalletTx>& vWtx);

    bool SetAddressBook(const CTxDestination& address, const std::string& strName, const std::string& purpose);