0.19: Backports #17792

1. 
   promag commented at 2:17 AM on December 23, 2019: member

   Backports

   • #16963
   • #17445
   • #17258
   • #17621
   • #17924
   • #17634
2. fanquake added the label Backport on Dec 23, 2019
3. 
   promag commented at 2:18 AM on December 23, 2019: member

   I can also include #17621 once it gets more reviews or gets merged.

4. promag force-pushed on Dec 23, 2019
5. 
   fanquake commented at 3:42 AM on December 24, 2019: member

   In general I'd prefer if backport PRs weren't opened until the changes they contain are actually all merged into master (I realise there are other similar backport PRs open now, and might close them).

   Just because a PR has had some review or has an ACK, doesn't mean it wont need additional changes before merge; and having backport PRs open before then just guarantees more changes/noise etc.

6. 
   fanquake commented at 6:43 PM on December 31, 2019: member

   Going to reopen this when the PRs it's backporting have been merged.

7. fanquake closed this on Dec 31, 2019

   ---

8. ryanofsky reopened this on Jan 8, 2020

   ---

9. 
   fanquake commented at 1:24 AM on January 14, 2020: member

   I can also include #17621 once it gets more reviews or gets merged.

   Can you include #17621 and #17258 here.

10. fanquake added this to the milestone 0.19.1 on Jan 14, 2020
11. zmq: Fix due to invalid argument and multiple notifiers

    Github-Pull: #17445
    Rebased-From: 3e730bf90aaf53c41ff3a778f6aac15d163d1c0c

    179d55f052
12. Drop signal CClientUIInterface::LoadWallet

    Github-Pull: #16963
    Rebased-From: 81ea66c30e2953dee24d5b127c28daa0d9452a28

    7e66d04770
13. gui: Fix duplicate wallet showing up

    The slot BitcoinGUI::addWallet can be invoked twice for the same
    WalletModel due to a concurrent wallet being loaded after the first `connect()`:
    
    ```cpp
     connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet);
     connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet);
    
     for (WalletModel* wallet_model : m_wallet_controller->getOpenWallets()) {
         addWallet(wallet_model);
    ```
    
    Github-Pull: #16963
    Rebased-From: 6d6a7a8403ae923f189812edebdd95761de0e7f2

    eafcea7a0a
14. Fix issue with conflicted mempool tx in listsinceblock

    listsinceblock now checks that returned transactions are not
    conflicting with any transactions that are filtered out by
    the given blockhash
    
    Co-Authored-By: Michael Chrostowski <michael.chrostowski@gmail.com>
    
    Github-Pull: #17258
    Rebased-From: 436ad436434b94982bcb7dc1d13a21949263ef73

    88729d804e
15. promag force-pushed on Jan 14, 2020
16. 
    promag commented at 9:39 AM on January 14, 2020: member

    @fanquake done.

17. 
    fanquake commented at 9:47 AM on January 14, 2020: member

    @instagibbs @adamjonas Can you check the relevant backports here.

18. IsUsedDestination should count any known single-key address

    Github-Pull: #17621
    Rebased-From: 09502452bbbe21bb974f1de8cf53196373921ab9

    a5489c9892
19. promag force-pushed on Jan 14, 2020
20. 
    promag commented at 10:36 AM on January 14, 2020: member

    @instagibbs note that I had to change a bit because #17300 is not in 0.19 branch.

21. 
    adamjonas commented at 3:22 PM on January 14, 2020: member

    88729d804e39fbb42aa92c039afe3641edf9190c looks good

22. 
    instagibbs commented at 3:24 PM on January 14, 2020: member

    https://github.com/bitcoin/bitcoin/pull/17792/commits/a5489c9892fc12cb70c6c7b017881a9218d0b041 looks right

23. 
    promag commented at 4:28 PM on January 14, 2020: member

    @instagibbs any idea why wallet_avoidreuse.py fails?

24. 
    instagibbs commented at 4:30 PM on January 14, 2020: member

    investigating

25. 
    instagibbs commented at 6:31 PM on January 14, 2020: member

    @promag unfortunately the original PR introduced a regression that makes it worse for this branch: #17924

26. IsUsedDestination shouldn't use key id as script id for ScriptHash

    Github-Pull: #17924
    Rebased-From: 4b8f1e989f3b969dc628b0801d5c31ebd373719c

    e2c45d89f7
27. Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation

    Github-Pull: #17924
    Rebased-From: 6dd59d2e491bc11ab26498668543e65440a3a931

    eac49073eb
28. 
    promag commented at 12:04 PM on January 15, 2020: member

    @instagibbs included #17924.

29. Fix comparison function signature

    This commit fixes build on CentOS 7 with GCC 4.8.5
    
    Github-Pull: #17634
    Rebased-From: b66861e2e5e8a49e11e7489cf22c3007bc7082cc

    b8101fb7ac
30. Use correct C++11 header for std::swap()

    Github-Pull: #17634
    Rebased-From: 98fbd1cdffaa69357091cc67e959ac21119dfa16

    cd67b1dcb8
31. 
    promag commented at 12:14 PM on January 15, 2020: member

    @hebasto included #17634, please take a look.

32. 
    fanquake commented at 10:27 PM on January 16, 2020: member

    @promag #17924 has been merged. Can you re-check your backport here.

33. 
    promag commented at 2:31 AM on January 17, 2020: member

    @fanquake updated OP, backport is still up to date.

34. 
    laanwj commented at 6:34 PM on January 20, 2020: member

    ACK cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5, checked that I got more or less the same result (including conflict resolution) backporting these commits

35. laanwj referenced this in commit 98159132c3 on Jan 20, 2020
36. laanwj merged this on Jan 20, 2020
37. laanwj closed this on Jan 20, 2020

    ---

38. promag deleted the branch on Jan 20, 2020
39. MarkLTZ referenced this in commit d99bc96496 on Feb 13, 2020
40. DrahtBot locked this on Feb 15, 2022

Milestone
0.19.1