[25.x] Further backports for 25.1 #28047

1. 
   fanquake commented at 4:35 pm on July 7, 2023: member

   Currently backports:

   • #28038
   • #28067 2nd & 3rd commits.
   • #28097
2. wallet: migration bugfix, clone 'send' record label to all wallets

   Github-Pull: #28038
   Rebased-From: 1b64f6498c394a143df196172a14204fe3b8a744

   59b06b696a
3. wallet: migration bugfix, persist empty labels

   addressbook records with no associated label could be
   treated as change. And we don't want that for external
   addresses.
   
   Github-Pull: #28038
   Rebased-From: a277f8357ad8b0eb26f33fc36f919d868c06847b

   4b16650c10
4. test: wallet, add coverage for addressbook migration

   Github-Pull: #28038
   Rebased-From: 7ecc29a0b7a23d8f5d3c1e6a0dad29b3ad839eb9

   37d9cc657c
5. fanquake added this to the milestone 25.1 on Jul 7, 2023
6. 
   DrahtBot commented at 4:35 pm on July 7, 2023: contributor

   The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

   Reviews

   See the guideline for information on the review process.

   Type	Reviewers
   ACK	stickies-v

   If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

7. DrahtBot added the label Backport on Jul 7, 2023
8. descriptor: InferScript, do not return top-level only func as sub descriptor

   e.g. sh(addr(ADDR)) or sh(raw(HEX)) are invalid descriptors.
   
   Making sh and wsh top level functions to return addr/raw descriptors when
   the subscript inference fails.
   
   Github-Pull: #28067
   Rebased-From: cc781a21800a6ce13875feefd0cb14ab0a84524c

   6d5a510dcd
9. test: wallet, add coverage for watch-only raw sh script migration

   Github-Pull: #28067
   Rebased-From: dd9633b516d6936ac4e23a40f9b0bea120117d35

   513ca0a711
10. depends: xcb-proto 1.15.2

    Resolves build failures under Python 3.12, i.e building on rawhide:
    ```bash
    make[3]: Nothing to be done for 'install-exec-am'.
     /usr/bin/mkdir -p '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen'
     /usr/bin/install -c -m 644 __init__.py error.py expr.py align.py matcher.py state.py xtypes.py '/bitcoin/depends/work/staging/aarch64-unknown-linux-gnu/xcb_proto/1.14.1-4a91ac9dc41/bitcoin/depends/aarch64-unknown-linux-gnu/lib/python3.12/site-packages/xcbgen'
    Traceback (most recent call last):
      File "<string>", line 2, in <module>
    ModuleNotFoundError: No module named 'imp'
    make[3]: *** [Makefile:271: install-pkgpythonPYTHON] Error 1
    ```
    
    `imp` was removed in 3.12: https://docs.python.org/3/library/imp.html.
    
    Github-Pull: #28097
    Rebased-From: 7cb88c8b46723d306b96953a6a60c90a4ab211e3

    494f1afa5a
11. DrahtBot added the label CI failed on Jul 21, 2023
12. DrahtBot removed the label CI failed on Jul 25, 2023
13. DrahtBot added the label CI failed on Jul 26, 2023
14. DrahtBot removed the label CI failed on Jul 26, 2023
15. fanquake marked this as ready for review on Sep 2, 2023
16. fanquake requested review from stickies-v on Sep 2, 2023
17. fanquake referenced this in commit 0df8f98d65 on Sep 5, 2023
18. stickies-v approved
19. 
    stickies-v commented at 2:23 pm on September 6, 2023: contributor

    ACK 494f1afa5a6eab4f243b19ab1691cd231a855b34

    Verified that the commits backport what’s specified in pull description, and nothing more. Not familiar with the underlying pulls so relying on the test suite for the changes to not mess things up.

    • 59b06b696a2fd730ff73bb45e4d1161517bd4562: clean backport
    • 4b16650c10b028485ece7b438b89236a52322b89: clean backport
    • 37d9cc657cf5b8126a0faef5237bc57e7453abb8: removed references to test_default_wallet() and test_direct_file() that were introduced only in 26740
    • 6d5a510dcdbed7b53f73b8422cea331dd6e9589e: clean backport
    • 513ca0a71173691fb030973612189ac6d064aedd: clean backport
    • 494f1afa5a6eab4f243b19ab1691cd231a855b34: clean backport
20. fanquake merged this on Sep 6, 2023
21. fanquake closed this on Sep 6, 2023

    ---

22. fanquake deleted the branch on Sep 6, 2023
23. 
    fanquake commented at 2:58 pm on September 6, 2023: member

    CI for 25.x: https://github.com/bitcoin/bitcoin/runs/16549476169
24. bitcoin locked this on Sep 5, 2024

Contributors
fanquake DrahtBot stickies-v

Labels
Backport

Milestone
25.1