diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-23 07:17:47 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-23 07:18:24 +0100 |
| commit | 40022fe5f2b576d023fa260eb176bde6d0779330 (patch) | |
| tree | 196cf75e2927ec2148f69cc42065f42e6b83481c /src/wallet | |
| parent | 4d8558a2871ec70b9d09028c49fa39e4911435f5 (diff) | |
| parent | 2e448930815074bbb07214604ed16e905f68558d (diff) | |
| download | bitcoin-40022fe5f2b576d023fa260eb176bde6d0779330.tar.xz | |
Merge #9142: Move -salvagewallet, -zap(wtx) to where they belong
2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)
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 2e512fd57f..9d7ea577de 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)) |