Skip to content

Conversation

@jnewbery
Copy link
Contributor

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

There's code in WalletInit::ParameterInteraction() to disallow -zapwallettxes when running in multiwallet mode. This code functioned as expected when passing the parameter -zapwallettxes=1, but not when passing the parameter -zapwallettxes (ie without the value specified). Fix that and add a test.

The new test in the
[wallet] [tests] Test disallowed multiwallet params commit reproduces the bug and should fail against master.

Fixes #12505

-zapwallettxes should be disallowed when starting bitcoin in multiwallet
mode.
Add a test to check that bitcoind fails to start when specifying
-zapwallettxes, -salvagewallet and -upgradewallet when running in
multiwallet mode.
@maflcko
Copy link
Member

maflcko commented Apr 19, 2018

utACK 1f83839 (GetBoolArg is also used later on in CreateWalletFromFile)

@maflcko maflcko added this to the 0.16.1 milestone Apr 19, 2018
@laanwj
Copy link
Member

laanwj commented Apr 23, 2018

utACK 1f83839

@laanwj laanwj merged commit 1f83839 into bitcoin:master Apr 23, 2018
laanwj added a commit that referenced this pull request Apr 23, 2018
…tion.

1f83839 [wallet] [tests] Test disallowed multiwallet params (John Newbery)
3476e3c [wallet] Fix zapwallettxes/multiwallet interaction. (John Newbery)

Pull request description:

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

  There's code in `WalletInit::ParameterInteraction()` to disallow `-zapwallettxes` when running in multiwallet mode. This code functioned as expected when passing the parameter `-zapwallettxes=1`, but not when passing the parameter `-zapwallettxes` (ie without the value specified). Fix that and add a test.

  The new test in the
  _[wallet] [tests] Test disallowed multiwallet params_ commit reproduces the bug and should fail against master.

  Fixes #12505

Tree-SHA512: 6cd921717e9c7d2773ca84c946c310c2adec8430e37cbecdb33a620f510db3058a72bd328411812ba415111bc52a3367b332c9d15a37a92ccfd7ae785d2f32ab
@jnewbery jnewbery deleted the fix_zapwallet_multiwallet_interaction branch April 23, 2018 18:40
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request May 17, 2018
-zapwallettxes should be disallowed when starting bitcoin in multiwallet
mode.

GitHub-Pull: bitcoin#13030
Rebased-From: 3476e3c
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request May 18, 2018
Add a test to check that bitcoind fails to start when specifying
-zapwallettxes, -salvagewallet and -upgradewallet when running in
multiwallet mode.

GitHub-Pull: bitcoin#13030
Rebased-From: 1f83839
laanwj added a commit that referenced this pull request May 24, 2018
acdf433 Hold cs_main while calling UpdatedBlockTip() and ui.NotifyBlockTip (Jesse Cohen)
5ff571e [wallet] [tests] Test disallowed multiwallet params (John Newbery)
4c14e7b [wallet] Fix zapwallettxes/multiwallet interaction. (John Newbery)
4087dd0 RPC Docs: gettxout*: clarify bestblock and unspent counts (David A. Harding)
b8aacd6 [qa] Handle disconnect_node race (Suhas Daftuar)

Pull request description:

  Backports:
  - #13201 [qa] Handle disconnect_node race
  - #13184 RPC Docs: gettxout*: clarify bestblock and unspent counts
  - #13030 [bugfix] [wallet] Fix zapwallettxes/multiwallet interaction.
  - #12988 Hold cs_main while calling UpdatedBlockTip() signal

  to the 0.16 branch.

Tree-SHA512: 8f65002bbafaf9c436f89051b2d79bf6a668fbd07bd317c64af238ed4a7c8efe776864b739a7f2869f1e3daa16f2f4366a85f41b188f9c454879d2c7b309be50
HashUnlimited pushed a commit to chaincoin/chaincoin that referenced this pull request Jun 29, 2018
-zapwallettxes should be disallowed when starting bitcoin in multiwallet
mode.

GitHub-Pull: bitcoin#13030
Rebased-From: 3476e3c
HashUnlimited pushed a commit to chaincoin/chaincoin that referenced this pull request Jun 29, 2018
Add a test to check that bitcoind fails to start when specifying
-zapwallettxes, -salvagewallet and -upgradewallet when running in
multiwallet mode.

GitHub-Pull: bitcoin#13030
Rebased-From: 1f83839
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Nov 17, 2020
…interaction.

1f83839 [wallet] [tests] Test disallowed multiwallet params (John Newbery)
3476e3c [wallet] Fix zapwallettxes/multiwallet interaction. (John Newbery)

Pull request description:

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

  There's code in `WalletInit::ParameterInteraction()` to disallow `-zapwallettxes` when running in multiwallet mode. This code functioned as expected when passing the parameter `-zapwallettxes=1`, but not when passing the parameter `-zapwallettxes` (ie without the value specified). Fix that and add a test.

  The new test in the
  _[wallet] [tests] Test disallowed multiwallet params_ commit reproduces the bug and should fail against master.

  Fixes bitcoin#12505

Tree-SHA512: 6cd921717e9c7d2773ca84c946c310c2adec8430e37cbecdb33a620f510db3058a72bd328411812ba415111bc52a3367b332c9d15a37a92ccfd7ae785d2f32ab
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bad interaction of -zapwallettxes and pruning / multiwallet

4 participants