Merge pull request #3674

77cbd46 Let -zapwallettxes recover transaction meta data (Cozz Lovan)
This commit is contained in:
Wladimir J. van der Laan
2014-06-24 16:48:48 +02:00
7 changed files with 212 additions and 11 deletions

View File

@@ -1514,11 +1514,11 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
}
DBErrors CWallet::ZapWalletTx()
DBErrors CWallet::ZapWalletTx(std::vector<CWalletTx>& vWtx)
{
if (!fFileBacked)
return DB_LOAD_OK;
DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(this);
DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(this, vWtx);
if (nZapWalletTxRet == DB_NEED_REWRITE)
{
if (CDB::Rewrite(strWalletFile, "\x04pool"))