Merge #10816: Properly forbid -salvagewallet and -zapwallettxes for multi wallet.

sipa · sipa · commit 1c011ff43010 · 2017-07-14T19:07:42.000-07:00
dd97a52 Properly forbid -salvagewallet and -zapwallettxes for multi wallet. (Alex Morcos) Tree-SHA512: dcde8f854ae957b4d3af4bcf1b811e0b6e9b93602764f86499e46a28d304cd4ee93ba058c03f6ca74ccb60e1310c83e53b698c64d93e5503115377655b80d44d
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4033,20 +4033,24 @@ bool CWallet::ParameterInteraction()
         LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
     }
 
-    if (GetBoolArg("-salvagewallet", false) && SoftSetBoolArg("-rescan", true)) {
+    if (GetBoolArg("-salvagewallet", false)) {
         if (is_multiwallet) {
             return InitError(strprintf("%s is only allowed with a single wallet file", "-salvagewallet"));
         }
         // Rewrite just private keys: rescan to find transactions
-        LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);
+        if (SoftSetBoolArg("-rescan", true)) {
+            LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);
+        }
     }
 
     // -zapwallettx implies a rescan
-    if (GetBoolArg("-zapwallettxes", false) && SoftSetBoolArg("-rescan", true)) {
+    if (GetBoolArg("-zapwallettxes", false)) {
         if (is_multiwallet) {
             return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes"));
         }
-        LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
+        if (SoftSetBoolArg("-rescan", true)) {
+            LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);
+        }
     }
 
     if (is_multiwallet) {

Original file line number	Diff line number	Diff line change
`@@ -4033,20 +4033,24 @@ bool CWallet::ParameterInteraction()`
`4033`	`4033`	`LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);`
`4034`	`4034`	`}`
`4035`	`4035`
`4036`		`- if (GetBoolArg("-salvagewallet", false) && SoftSetBoolArg("-rescan", true)) {`
	`4036`	`+ if (GetBoolArg("-salvagewallet", false)) {`
`4037`	`4037`	`if (is_multiwallet) {`
`4038`	`4038`	`return InitError(strprintf("%s is only allowed with a single wallet file", "-salvagewallet"));`
`4039`	`4039`	`}`
`4040`	`4040`	`// Rewrite just private keys: rescan to find transactions`
`4041`		`- LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);`
	`4041`	`+ if (SoftSetBoolArg("-rescan", true)) {`
	`4042`	`+ LogPrintf("%s: parameter interaction: -salvagewallet=1 -> setting -rescan=1\n", __func__);`
	`4043`	`+ }`
`4042`	`4044`	`}`
`4043`	`4045`
`4044`	`4046`	`// -zapwallettx implies a rescan`
`4045`		`- if (GetBoolArg("-zapwallettxes", false) && SoftSetBoolArg("-rescan", true)) {`
	`4047`	`+ if (GetBoolArg("-zapwallettxes", false)) {`
`4046`	`4048`	`if (is_multiwallet) {`
`4047`	`4049`	`return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes"));`
`4048`	`4050`	`}`
`4049`		`- LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);`
	`4051`	`+ if (SoftSetBoolArg("-rescan", true)) {`
	`4052`	`+ LogPrintf("%s: parameter interaction: -zapwallettxes=<mode> -> setting -rescan=1\n", __func__);`
	`4053`	`+ }`
`4050`	`4054`	`}`
`4051`	`4055`
`4052`	`4056`	`if (is_multiwallet) {`