[28.x] Backports & 28.1rc1

fanquake commented at 3:52 pm on October 16, 2024: member

Backports:

Contains:

A commit to do the same as #31307.

doc: Archive 28.0 release notes

Github-Pull: #31035
Rebased-From: f019fcec4126aa2618734016711063d3b44260fc

6643fd2145

DrahtBot commented at 3:52 pm on October 16, 2024: 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/31104.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	willcl-ark

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

DrahtBot added the label Backport on Oct 16, 2024

DrahtBot added the label CI failed on Oct 16, 2024

DrahtBot removed the label CI failed on Oct 17, 2024

fanquake added this to the milestone 28.1 on Oct 21, 2024

doc: add testnet4 section header for config file

Github-Pull: #31007
Rebased-From: 61cdb1c9d83778b95f4f9596f34617b7a191d0a5

f072721181

test: add missing sync to feature_fee_estimation.py

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: #31016
Rebased-From: a1576edab356053c4c736691e4950b58e9a14f76

b917334208

ci: add LLVM_SYMBOLIZER_PATH to Valgrind fuzz job

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: #30961
Rebased-From: c1832584bfd1b352095bc41a13ff17564e456d43

0773560abf

fanquake force-pushed on Oct 22, 2024

fanquake marked this as a draft on Oct 22, 2024

key: clear out secret data in `DecodeExtKey`

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 #14242 (commit
d855e4cac8303ad4e34ac31cfa7634286589ce99).

Github-Pull: #31166
Rebased-From: 559a8dd9c0aafcecf00f9ccd9aabe5720bcebe8c

f998ac6286

fanquake force-pushed on Oct 31, 2024

depends: For mingw cross compile use -gcc-posix to prevent library conflict

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: #31013
Rebased-From: ae56b3230b287eef5a5657d3089abebffde51484

7fec638222

fanquake force-pushed on Oct 31, 2024

addrman, refactor: introduce user-defined type for internal nId

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: #30568
Rebased-From: 051ba3290e30e210bfc50dea974063053313ad3e

1d0411dc8f

fanquake force-pushed on Nov 4, 2024

fanquake force-pushed on Nov 11, 2024

fanquake force-pushed on Dec 2, 2024

fanquake renamed this:
~~[28.x] Some backports~~
[28.x] Backports & 28.1rc1
on Dec 2, 2024

fanquake marked this as ready for review on Dec 2, 2024

fanquake requested review from willcl-ark on Dec 2, 2024

fanquake force-pushed on Dec 2, 2024

willcl-ark commented at 2:09 pm on December 2, 2024: member

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” 4c1d74b60c8aee9702e2fe53ea9e680cc74c38dc, the commit message in this backport references the corrent PR, but wrong commit, it should be:

0- Rebased-From: 051ba3290e30e210bfc50dea974063053313ad3e
1+ Rebased-From: 51f7668d31e2624e41c7ce77fe33162802808f3f

addrman: change nid_type from int to int64_t

With 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 #22387), to be on the safe side change the
type to an int64_t.

Github-Pull: #30568
Rebased-From: 51f7668d31e2624e41c7ce77fe33162802808f3f

9976162a0e

refactor: Drop deprecated space in operator""_mst

Github-Pull: #31267
Rebased-From: faf21625652fd0d4bbf9b86fd9ebedb5857505ea

446f5d20d6

build: disable compiling fuzz/utxo_snapshot.cpp with MSVC

This is a backport of #31307 / b2d536100282bd901d3e0be7f7f4a6966e0ef817
for 28.x.

1025090fbe

doc: update release notes for 28.1rc1 9add853b65

build: bump version to 28.1rc1 df7764621e

doc: update manual pages for 28.1rc1 8fef83a0a0

fanquake force-pushed on Dec 2, 2024

fanquake commented at 2:30 pm on December 2, 2024: member

Thanks, fixed up the message.

willcl-ark approved

willcl-ark commented at 3:38 pm on December 2, 2024: member

ACK 8fef83a0a03f884e0c5399b318eb55064b84b718

Agree that it’s reasonable to apply the MSVC exclusion to all MSVC versions in this fixup.

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

fanquake merged this on Dec 4, 2024

fanquake closed this on Dec 4, 2024

fanquake deleted the branch on Dec 4, 2024

fanquake commented at 4:59 pm on December 4, 2024: member

One thing that didn’t happen here was re-genning the example bitcoin.conf, can be done in either rc2 or before final.

[28.x] Backports & 28.1rc1 #31104

Code Coverage & Benchmarks

Reviews