[28.x] Backports & 28.1rc1 #31104
Merged
[28.x] Backports & 28.1rc1 #31104
Conversation
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
Github-Pull: bitcoin#31035 Rebased-From: f019fce
|
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/31104. 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. |
Github-Pull: bitcoin#31007 Rebased-From: 61cdb1c
Fixes a race between node 1 catching up with the chain and mining a new block in the sanity_check_rbf_estimates subtest. Github-Pull: bitcoin#31016 Rebased-From: a1576ed
Otherwise: ```bash NEW_FUNC[1/23]: ==4710==WARNING: invalid path to external symbolizer! ==4710==WARNING: Failed to use and restart external symbolizer! 0xb72010 (/ci_container_base/ci/scratch/build-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0xa6a010) (BuildId: 2087ad415cb752eea259ed750f3b78a7fcb0b43b) NEW_FUNC[2/23]: 0xb72240 (/ci_container_base/ci/scratch/build-x86_64-pc-linux-gnu/src/test/fuzz/fuzz+0xa6a240) (BuildId: 2087ad415cb752eea259ed750f3b78a7fcb0b43b) ``` Github-Pull: bitcoin#30961 Rebased-From: c183258
05947b9 to
39e10f0
Compare
Same as in `DecodeSecret`, we should also clear out the secret data from the vector resulting from the Base58Check parsing for xprv keys. Note that the if condition is needed in order to avoid UB, see bitcoin#14242 (commit d855e4c). Github-Pull: bitcoin#31166 Rebased-From: 559a8dd
39e10f0 to
b3b7d08
Compare
…nflict CMake parses some paths from the spec of the C compiler, assuming it will be the linker, resulting in the link to end up with `-L/usr/lib/gcc/x86_64-w64-mingw32/12-win32` on debian bookworm if both -win32 and -posix variants are installed, and -win32 is the default alternative. This results in the wrong C++ library being linked, missing std::threads::hardware_concurrency and other threading functions. To fix this, use the -posix variant of gcc as well when available. This fixes a regression compared to autotools, where this scenario worked. Github-Pull: bitcoin#31013 Rebased-From: ae56b32
b3b7d08 to
1a56cea
Compare
This makes it easier to track which spots refer to an nId (as opposed to, for example, bucket index etc. which also use int) Co-authored-by: Pieter Wuille <pieter@wuille.net> Github-Pull: bitcoin#30568 Rebased-From: 051ba32
fbb0014 to
24cfce3
Compare
24cfce3 to
075a8a1
Compare
075a8a1 to
5ed2f29
Compare
willcl-ark
reviewed
Dec 2, 2024
There was a problem hiding this comment.
These backports look clean to me.
Due to how my helper script parses the diffs between originals and backports I noticed that in: "addrman: change nid_type from int to int64_t" 4c1d74b, the commit message in this backport references the corrent PR, but wrong commit, it should be:
- Rebased-From: 051ba3290e30e210bfc50dea974063053313ad3e
+ Rebased-From: 51f7668d31e2624e41c7ce77fe33162802808f3fWith nId being incremented for each addr received, an attacker could cause an overflow in the past. (https://bitcoincore.org/en/2024/07/31/disclose-addrman-int-overflow/) Even though that attack was made infeasible by rate-limiting (PR bitcoin#22387), to be on the safe side change the type to an int64_t. Github-Pull: bitcoin#30568 Rebased-From: 51f7668
Github-Pull: bitcoin#31267 Rebased-From: faf2162
This is a backport of bitcoin#31307 / b2d5361 for 28.x.
5ed2f29 to
8fef83a
Compare
|
Thanks, fixed up the message. |
willcl-ark
approved these changes
Dec 2, 2024
There was a problem hiding this comment.
ACK 8fef83a
Agree that it's reasonable to apply the MSVC exclusion to all MSVC versions in this fixup.
system info
| k | v |
|---|---|
| OS | Ubuntu 23.10 (mantic) |
| Arch | x86_64 |
| Kernel | 6.5.0-44-generic |
| System | Linux |
| CPU Model | 11th Gen Intel(R) Core(TM) i7-11700K @ 3.60GHz |
| CPU Cores | 16 |
| Memory | 62Gi |
| CC | Homebrew clang version 19.1.1 |
| CXX | Homebrew clang version 19.1.1 |
| Python | Python 3.9.18 |
| Make | GNU Make 4.3 |
| CMake | cmake version 3.30.5 |
| Boost | 1_74 |
| sqlite3 | 3.46.1 2024-08-13 09:16:08 |
| Git Branch | 28_some_backports |
|
One thing that didn't happen here was re-genning the example bitcoin.conf, can be done in either rc2 or before final. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
DecodeExtKey#31166Contains:
fuzz/utxo_snapshot.cppwith MSVC #31307.