diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-11-12 10:23:57 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-11-12 10:25:34 +0100 |
| commit | 2e448930815074bbb07214604ed16e905f68558d (patch) | |
| tree | fe42fc48e85f266c3a3c91c3c36b1f0545f7a394 /src/wallet | |
| parent | ab914a65301bd48f2b6c7a64bf57295ae74f2902 (diff) | |
| download | bitcoin-2e448930815074bbb07214604ed16e905f68558d.tar.xz | |
Move -salvagewallet, -zap(wtx) to where they belong
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index c2bac6e330..7537604814 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3568,6 +3568,16 @@ bool CWallet::ParameterInteraction() LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__); } + if (GetBoolArg("-salvagewallet", false) && SoftSetBoolArg("-rescan", true)) { + // Rewrite just private keys: rescan to find transactions + LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__); + } + + // -zapwallettx implies a rescan + if (GetBoolArg("-zapwallettxes", false) && SoftSetBoolArg("-rescan", true)) { + LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__); + } + if (GetBoolArg("-sysperms", false)) return InitError("-sysperms is not allowed in combination with enabled wallet functionality"); if (GetArg("-prune", 0) && GetBoolArg("-rescan", false)) |