Browse Source

[wallet] Fix zapwallettxes/multiwallet interaction.

-zapwallettxes should be disallowed when starting bitcoin in multiwallet
mode.

GitHub-Pull: #13030
Rebased-From: 3476e3c
0.16
John Newbery 7 years ago committed by fanquake
parent
commit
4c14e7b67c
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
  1. 10
      src/wallet/init.cpp

10
src/wallet/init.cpp

@ -82,19 +82,19 @@ bool WalletParameterInteraction()
} }
} }
int zapwallettxes = gArgs.GetArg("-zapwallettxes", 0); bool zapwallettxes = gArgs.GetBoolArg("-zapwallettxes", false);
// -zapwallettxes implies dropping the mempool on startup // -zapwallettxes implies dropping the mempool on startup
if (zapwallettxes != 0 && gArgs.SoftSetBoolArg("-persistmempool", false)) { if (zapwallettxes && gArgs.SoftSetBoolArg("-persistmempool", false)) {
LogPrintf("%s: parameter interaction: -zapwallettxes=%s -> setting -persistmempool=0\n", __func__, zapwallettxes); LogPrintf("%s: parameter interaction: -zapwallettxes enabled -> setting -persistmempool=0\n", __func__);
} }
// -zapwallettxes implies a rescan // -zapwallettxes implies a rescan
if (zapwallettxes != 0) { if (zapwallettxes) {
if (is_multiwallet) { if (is_multiwallet) {
return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes")); return InitError(strprintf("%s is only allowed with a single wallet file", "-zapwallettxes"));
} }
if (gArgs.SoftSetBoolArg("-rescan", true)) { if (gArgs.SoftSetBoolArg("-rescan", true)) {
LogPrintf("%s: parameter interaction: -zapwallettxes=%s -> setting -rescan=1\n", __func__, zapwallettxes); LogPrintf("%s: parameter interaction: -zapwallettxes enabled -> setting -rescan=1\n", __func__);
} }
} }

Loading…
Cancel
Save