[29.x] backports and rc2 #32062

1. 
   glozow commented at 9:10 pm on March 13, 2025: member

   backports:

   • #32049
   • #32063
   • #32064
   • #32070
   • #31917
   • https://github.com/bitcoin-core/gui/pull/858
2. contrib: Fix `gen-bitcoin-conf.sh`.

   In #31118, the format of bitcoind's `--help` output changed slightly in
   a way that breaks `gen-bitcoin-conf.sh`, modify the script to accomodate
   the new format, by starting after the line that says "Options:" and
   strip the `-help` option and its description from the output.
   
   Github-Pull: #32049
   Rebased-From: a24419f8bed5e1145ce171dbbdad957750585471

   80c5d57bd1
3. glozow added the label Backport on Mar 13, 2025
4. glozow added this to the milestone 29.0 on Mar 13, 2025
5. 
   DrahtBot commented at 9:10 pm on March 13, 2025: contributor

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

   Code Coverage & Benchmarks

   For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32062.

   Reviews

   See the guideline for information on the review process.

   Type	Reviewers
   ACK	Sjors, hebasto, ismaelsadeeq
   Stale ACK	davidgumberg

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

6. 
   davidgumberg commented at 9:37 pm on March 13, 2025: contributor

   lgtm ACK https://github.com/bitcoin/bitcoin/pull/32062/commits/188ec87589476355a4280f8a561d954b9fbbb7af
7. fuzz: Always restrict base conversion input lengths

   They seem to cause timeouts:
   > Issue 397734700: bitcoin-core:base58check_encode_decode: Timeout in base58check_encode_decode
   
   The `encoded_string.empty()` check was corrected here to `decoded.empty()` to make sure the `(0, decoded.size() - 1)` range is always valid.
   
   Github-Pull: #31917
   Rebased-From: bad1433ef2b5b02ac4b1c6c1d9482c513e5b2192
   
   Co-authored-by: maflcko <6399679+maflcko@users.noreply.github.com>
   Co-authored-by: marcofleon <marleo23@proton.me>
   Co-authored-by: Martin Zumsande <mzumsande@gmail.com>

   15ecae31a8
8. fuzz: make sure DecodeBase58(Check) is called with valid values more often

   In Base58 fuzz the two roundtrips are merged now, the new `decode_input` switches between a completely random input and a valid encoded one, to make sure the decoding passes more often.
   The `max_ret_len` can also exceed the original length now and is being validated more thoroughly.
   
   Github-Pull: #31917
   Rebased-From: d5537c18a9034647ba4c9ed4008abd7fee33989e
   
   Co-authored-by: maflcko <6399679+maflcko@users.noreply.github.com>
   Co-authored-by: marcofleon <marleo23@proton.me>

   458655bca8
9. test: fix intermittent failure in p2p_orphan_handling.py

   If we bump the mocktime before the node has successfully disconnected
   the peer, the requests for both parents could be spread over
   two GETDATAS, which would make the test fail.
   
   Github-Pull: #32063
   Rebased-From: 02942056fd861581503a8a35a06dcf22d4ba1473

   5ebcb59fdb
10. build: Remove manpages when making MacOS app

    Github-Pull: #32064
    Rebased-From: 80b5e7f2cb7fbfbd724e1f52b00c0e72b79a200b

    7ff0b02161
11. build: use make < 3.82 syntax for define directive

    From the GNU make 3.82 release announcement:
    
    * The 'define' make directive now allows a variable assignment operator
      after the variable name, to allow for simple, conditional, or appending
      multi-line variable assignment.
    
    macOS ships with 3.81. This caused the multiprocess config options
    to be ignored.
    
    Fixes #32068
    
    Github-Pull: #32070
    Rebased-From: 9157d9e449870851ef455e077249ac46fc2df24c
    
    Co-authored-by: Ryan Ofsky <ryan@ofsky.org>

    4e438d326e
12. glozow force-pushed on Mar 17, 2025
13. glozow marked this as ready for review on Mar 17, 2025
14. 
    fanquake commented at 5:44 am on March 17, 2025: member

    Can also pull in https://github.com/bitcoin-core/gui/pull/858 (if not this rc than next).
15. 
    Sjors commented at 8:14 am on March 17, 2025: member

    ACK 02d030292a93fdf77bf59c8007fea3cebb2bf3fa

    I cherry-picked the pull requests, ran gen-bitcoin-conf.sh (built with -DWITH_ZMQ=ON) and compared to this PR (minus the version bump commits).

    I do get a slightly difference in share/examples/bitcoin.conf, maybe due to a build option?

    0-# estimatefee, http, i2p, ipc, leveldb, libevent, mempool,
    1+# estimatefee, http, i2p, ipc, leveldb, libevent, lock, mempool,
    

    Update: it’s because I had to delete build, rather than just remove -DCMAKE_BUILD_TYPE=Debug

16. DrahtBot requested review from davidgumberg on Mar 17, 2025
17. 
    hebasto commented at 9:10 am on March 17, 2025: member

    Can also pull in bitcoin-core/gui#858 (if not this rc than next).

    +1

18. qt: doc: adapt outdated binary paths to CMake changes

    Github-Pull: bitcoin-core/gui#858
    Rebased-From: 7ebc458a8cb994bc3c0c129da61353968d955bc2

    a4c30bd00a
19. [build] bump to 29.0rc2 472d582bfe
20. [doc] update man pages for 29.0rc2 8082f88d1a
21. [doc] update example bitcoin.conf with missing options 74df31cb0b
22. glozow force-pushed on Mar 17, 2025
23. 
    glozow commented at 10:18 am on March 17, 2025: member

    Can also pull in bitcoin-core/gui#858 (if not this rc than next).

    added

24. 
    Sjors commented at 11:25 am on March 17, 2025: member

    ACK 74df31cb0bdef9cce31ae62ed71a1e386cba0274

    Don’t forget to add https://github.com/bitcoin-core/gui/pull/858 to the PR description.

25. hebasto approved
26. 
    hebasto commented at 11:28 am on March 17, 2025: member

    ACK 74df31cb0bdef9cce31ae62ed71a1e386cba0274, I have reviewed the code and it looks OK.

    I’ve backported PRs and generated contrib/devtools/gen-bitcoin-conf.sh locally and got zero-diff with this PR branch.

27. 
    ismaelsadeeq commented at 3:05 pm on March 17, 2025: member

    Code review ACK 74df31cb0bdef9cce31ae62ed71a1e386cba0274

    I’ve verified that the patch-ids are identical. Only 4e438d326ea55ac0f98f89e41e69b56354e801e7 has a different patch-id from the original commit, and that’s due to line number differences.

    I’ve verified that the backported commits is identical to the PR commits.

28. fanquake merged this on Mar 18, 2025
29. fanquake closed this on Mar 18, 2025

    ---

30. glozow deleted the branch on Mar 18, 2025

Contributors
glozow DrahtBot davidgumberg fanquake Sjors hebasto ismaelsadeeq

Review Requested
davidgumberg

Labels
Backport

Milestone
29.0