aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-09-18 14:30:47 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-10-08 17:46:45 -0400
commiteed1785f701be93ac2464e854c2a7de1f748ef84 (patch)
tree012b0bae35dfc7f35c10d341e50dd31fb88c6cf1 /src/wallet.h
parent8d5f461cb6d4bb954fef5c3deebe2b2a7bdbfe27 (diff)
Handle corrupt wallets gracefully.
Corrupt wallets used to cause a DB_RUNRECOVERY uncaught exception and a crash. This commit does three things: 1) Runs a BDB verify early in the startup process, and if there is a low-level problem with the database: + Moves the bad wallet.dat to wallet.timestamp.bak + Runs a 'salvage' operation to get key/value pairs, and writes them to a new wallet.dat + Continues with startup. 2) Much more tolerant of serialization errors. All errors in deserialization are reported by tolerated EXCEPT for errors related to reading keypairs or master key records-- those are reported and then shut down, so the user can get help (or recover from a backup). 3) Adds a new -salvagewallet option, which: + Moves the wallet.dat to wallet.timestamp.bak + extracts ONLY keypairs and master keys into a new wallet.dat + soft-sets -rescan, to recreate transaction history This was tested by randomly corrupting testnet wallets using a little python script I wrote (https://gist.github.com/3812689)
Diffstat (limited to 'src/wallet.h')
-rw-r--r--src/wallet.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.h b/src/wallet.h
index 22795b75ba..c5f1243907 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -16,11 +16,11 @@
#include "script.h"
#include "ui_interface.h"
#include "util.h"
+#include "walletdb.h"
class CAccountingEntry;
class CWalletTx;
class CReserveKey;
-class CWalletDB;
class COutput;
/** (client) version numbers for particular wallet features */
@@ -256,7 +256,7 @@ public:
}
void SetBestChain(const CBlockLocator& loc);
- int LoadWallet(bool& fFirstRunRet);
+ DBErrors LoadWallet(bool& fFirstRunRet);
bool SetAddressBookName(const CTxDestination& address, const std::string& strName);