[29.x] backports and rc2#32062
Merged
Merged
Conversation
In bitcoin#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: bitcoin#32049 Rebased-From: a24419f
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32062. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. |
Contributor
|
lgtm ACK 188ec87 |
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: bitcoin#31917 Rebased-From: bad1433 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>
…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: bitcoin#31917 Rebased-From: d5537c1 Co-authored-by: maflcko <6399679+maflcko@users.noreply.github.com> Co-authored-by: marcofleon <marleo23@proton.me>
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: bitcoin#32063 Rebased-From: 0294205
Github-Pull: bitcoin#32064 Rebased-From: 80b5e7f
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 bitcoin#32068 Github-Pull: bitcoin#32070 Rebased-From: 9157d9e Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
This was referenced Mar 17, 2025
Member
|
Can also pull in bitcoin-core/gui#858 (if not this rc than next). |
Member
|
ACK 02d030292a93fdf77bf59c8007fea3cebb2bf3fa I cherry-picked the pull requests, ran I do get a slightly difference in Update: it's because I had to delete |
Member
+1 |
Member
Author
added |
Member
|
ACK 74df31c Don't forget to add bitcoin-core/gui#858 to the PR description. |
morozow
pushed a commit
to morozow/bitcoin_rd
that referenced
this pull request
May 8, 2026
ad14c74 [doc] update example bitcoin.conf with missing options (glozow) 1c2f931 [doc] update man pages for 29.0rc2 (glozow) 4429e5c [build] bump to 29.0rc2 (glozow) 85c2b16 qt: doc: adapt outdated binary paths to CMake changes (Sebastian Falbesoner) 3500b19 build: use make < 3.82 syntax for define directive (Sjors Provoost) 5c99872 build: Remove manpages when making MacOS app (Ava Chow) f806cd5 test: fix intermittent failure in p2p_orphan_handling.py (Martin Zumsande) 4e7c6d8 fuzz: make sure DecodeBase58(Check) is called with valid values more often (Lőrinc) bf054d7 fuzz: Always restrict base conversion input lengths (Lőrinc) 24c6aa9 contrib: Fix `gen-bitcoin-conf.sh`. (David Gumberg) Pull request description: backports: - bitcoin#32049 - bitcoin#32063 - bitcoin#32064 - bitcoin#32070 - bitcoin#31917 ACKs for top commit: Sjors: ACK ad14c74 hebasto: ACK ad14c74, I have reviewed the code and it looks OK. ismaelsadeeq: Code review ACK ad14c74 Tree-SHA512: df4ef832a03c9c3f89d30d3f65d81b7c7e4793d2cad8a269f1ff221454a4b0b05e06109f4556926c1c4f7fcbd2537052b4d58b4b3911dfcfc35726c600b587d9
tomt1664
added a commit
to tomt1664/elements
that referenced
this pull request
Jul 13, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backports:
gen-bitcoin-conf.sh#32049