[0.16] Further Backports #13253

1. 
   fanquake commented at 2:28 AM on May 17, 2018: member

   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.

2. fanquake added the label Backport on May 17, 2018
3. fanquake added this to the milestone 0.16.1 on May 17, 2018
4. fanquake requested review from jnewbery on May 17, 2018
5. fanquake requested review from sdaftuar on May 17, 2018
6. [qa] Handle disconnect_node race

   Several tests call disconnect_nodes() on each node-pair in rapid
   succession, resulting in a race condition if a node disconnects a peer
   in-between the calculation of the nodeid's to disconnect and the
   invocation of the disconnectnode rpc call.  Handle this.
   
   GitHub-Pull: #13201
   Rebased-From: 09c6699

   b8aacd660e
7. RPC Docs: gettxout*: clarify bestblock and unspent counts

   GitHub-Pull: #13184
   Rebased-From: f30e9be

   4087dd08e7
8. [wallet] Fix zapwallettxes/multiwallet interaction.

   -zapwallettxes should be disallowed when starting bitcoin in multiwallet
   mode.
   
   GitHub-Pull: #13030
   Rebased-From: 3476e3c

   4c14e7b67c
9. fanquake force-pushed on May 17, 2018
10. 
    fanquake commented at 2:51 AM on May 17, 2018: member

    Removed #13199 for now, that may be slightly more complicated to backport.

11. 
    laanwj commented at 8:23 PM on May 17, 2018: member

    There seems to be a problem with two of the tests:

    wallet_multiwallet.py                 | ✖ Failed  | 3 s
    wallet_multiwallet.py --usecli        | ✖ Failed  | 4 s
    

12. 
    jnewbery commented at 8:58 PM on May 17, 2018: member

    Fails because commit [wallet] [tests] Test disallowed multiwallet params uses the new assert_start_raises_init_error() syntax introduced in #12718.

    Can be fixed by backporting #12718 (although I don't know how much that would conflict) or by applying this diff to the Test disallowed multiwallet params commit:

    diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py
    index 0c4b97a0c..3a34c43b7 100755
    --- a/test/functional/wallet_multiwallet.py
    +++ b/test/functional/wallet_multiwallet.py
    @@ -57,17 +57,17 @@ class MultiWalletTest(BitcoinTestFramework):
             self.assert_start_raises_init_error(0, ['-walletdir=' + not_a_dir], 'Error: Specified -walletdir "' + not_a_dir + '" is not a directory')
     
             self.log.info("Do not allow -zapwallettxes with multiwallet")
    -        self.nodes[0].assert_start_raises_init_error(['-zapwallettxes', '-wallet=w1', '-wallet=w2'], "Error: -zapwallettxes is only allowed with a single wallet file")
    -        self.nodes[0].assert_start_raises_init_error(['-zapwallettxes=1', '-wallet=w1', '-wallet=w2'], "Error: -zapwallettxes is only allowed with a single wallet file")
    -        self.nodes[0].assert_start_raises_init_error(['-zapwallettxes=2', '-wallet=w1', '-wallet=w2'], "Error: -zapwallettxes is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-zapwallettxes', '-wallet=w1', '-wallet=w2'], "Error: -zapwallettxes is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-zapwallettxes=1', '-wallet=w1', '-wallet=w2'], "Error: -zapwallettxes is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-zapwallettxes=2', '-wallet=w1', '-wallet=w2'], "Error: -zapwallettxes is only allowed with a single wallet file")
     
             self.log.info("Do not allow -salvagewallet with multiwallet")
    -        self.nodes[0].assert_start_raises_init_error(['-salvagewallet', '-wallet=w1', '-wallet=w2'], "Error: -salvagewallet is only allowed with a single wallet file")
    -        self.nodes[0].assert_start_raises_init_error(['-salvagewallet=1', '-wallet=w1', '-wallet=w2'], "Error: -salvagewallet is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-salvagewallet', '-wallet=w1', '-wallet=w2'], "Error: -salvagewallet is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-salvagewallet=1', '-wallet=w1', '-wallet=w2'], "Error: -salvagewallet is only allowed with a single wallet file")
     
             self.log.info("Do not allow -upgradewallet with multiwallet")
    -        self.nodes[0].assert_start_raises_init_error(['-upgradewallet', '-wallet=w1', '-wallet=w2'], "Error: -upgradewallet is only allowed with a single wallet file")
    -        self.nodes[0].assert_start_raises_init_error(['-upgradewallet=1', '-wallet=w1', '-wallet=w2'], "Error: -upgradewallet is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-upgradewallet', '-wallet=w1', '-wallet=w2'], "Error: -upgradewallet is only allowed with a single wallet file")
    +        self.assert_start_raises_init_error(0, ['-upgradewallet=1', '-wallet=w1', '-wallet=w2'], "Error: -upgradewallet is only allowed with a single wallet file")
     
             # if wallets/ doesn't exist, datadir should be the default wallet dir
             wallet_dir2 = data_dir('walletdir')
    

13. [wallet] [tests] Test disallowed multiwallet params

    Add a test to check that bitcoind fails to start when specifying
    -zapwallettxes, -salvagewallet and -upgradewallet when running in
    multiwallet mode.
    
    GitHub-Pull: #13030
    Rebased-From: 1f83839

    5ff571e90c
14. Hold cs_main while calling UpdatedBlockTip() and ui.NotifyBlockTip

    Ensures that callbacks are invoked in the order in which the chain is updated
    Resolves #12978
    
    GitHub-Pull: #12988
    Rebased-From: d86edd3

    acdf433822
15. fanquake force-pushed on May 18, 2018
16. 
    fanquake commented at 6:24 AM on May 18, 2018: member

    Thanks @jnewbery, I've updated the Test disallowed multiwallet params commit with your suggested changes.

17. 
    laanwj commented at 4:56 PM on May 18, 2018: member

    utACK 6c4a1f777ed934f313389a56e5f68d34d5804c7f

18. 
    MarcoFalke commented at 5:09 PM on May 18, 2018: member

    The last commit is already on the 0.16 branch, no need to include it twice.

19. 
    MarcoFalke commented at 5:15 PM on May 18, 2018: member

    utACK acdf4338221e35d5ec7b299bb18ccd953e28c985 (without the last commit they are clean cherry-picks except for the test change. Didn't review anything else)

20. fanquake force-pushed on May 20, 2018
21. fanquake added this to the "Blockers" column in a project

---

22. laanwj merged this on May 24, 2018
23. laanwj closed this on May 24, 2018

    ---

24. laanwj referenced this in commit 50b2c9e0df on May 24, 2018
25. fanquake removed this from the "Blockers" column in a project

---

26. fanquake deleted the branch on Jun 17, 2018
27. DrahtBot locked this on Sep 8, 2021

Review Requested
jnewberysdaftuar

Milestone
0.16.1