[28.x] 28.1rc2 backports

achow101 commented at 5:02 pm on December 11, 2024: member

Backports:

fuzz: add cstdlib to FuzzedDataProvider

Same as https://github.com/llvm/llvm-project/pull/113951.

Avoids compile failures under clang-20 &
`D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES`:
```bash
In file included from /bitcoin/src/test/fuzz/addition_overflow.cpp:5:
/bitcoin/src/test/fuzz/FuzzedDataProvider.h:209:5: error: use of undeclared identifier 'abort'
  209 |     abort();
      |     ^
/bitcoin/src/test/fuzz/FuzzedDataProvider.h:250:5: error: use of undeclared identifier 'abort'
  250 |     abort();
```

Github-Pull: bitcoin/bitcoin#31448
Rebased-From: bb7e686341e437b2e7aae887827710918c00ae0f

2835158be0

util: use explicit cast in MultiIntBitSet::Fill()

The current code does not have a bug, but is implicitly casting -1 to
65535 and the sanitizer has no way to know whether we intend that or
not.

```
FUZZ=bitset src/test/fuzz/fuzz /tmp/fuz

error: implicit conversion from type 'int' of value -1 (32-bit, signed)
to type 'value_type' (aka 'unsigned short') changed the value to 65535
(16-bit, unsigned)

Base64: Qv7bX/8=
```

Github-Pull: bitcoin/bitcoin#31431
Rebased-From: edb41e4814ccc2c06a5694b2d2632dbbd22bc0cf

b8112cf422

test: fix MIN macro-redefinition

Renames the `MIN` macro to `_TRACEPOINT_TEST_MIN`.

From #31418:

```
stderr:
/virtual/main.c:70:9: warning: 'MIN' macro redefined [-Wmacro-redefined]
   70 | #define MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
      |         ^
include/linux/minmax.h:329:9: note: previous definition is here
  329 | #define MIN(a,b) __cmp(min,a,b)
      |         ^
1 warning generated.
```

fixes: https://github.com/bitcoin/bitcoin/issues/31418

Github-Pull: bitcoin/bitcoin#31419
Rebased-From: 00c1dbd26ddb816e5541c5724397015a92a3d06b

227642d5af

DrahtBot commented at 5:02 pm on December 11, 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/31469.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	hodlinator

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 Dec 11, 2024

fanquake added this to the milestone 28.1 on Dec 11, 2024

DrahtBot added the label CI failed on Dec 11, 2024

fanquake commented at 10:35 am on December 12, 2024: member

https://cirrus-ci.com/task/5580834063777792?logs=ci#L1854:

0 test  2024-12-11T17:44:45.280000Z TestFramework (ERROR): Unexpected exception caught during testing 
1                                   Traceback (most recent call last):
2                                     File "/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/test_framework/test_framework.py", line 132, in main
3                                       self.run_test()
4                                     File "/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/wallet_migration.py", line 1095, in run_test
5                                       self.test_migrate_simple_watch_only()
6                                     File "/ci_container_base/ci/scratch/build/bitcoin-x86_64-pc-linux-gnu/test/functional/wallet_migration.py", line 1024, in test_migrate_simple_watch_only
7                                       res, _ = self.migrate_and_get_rpc("bare_p2pk")
8                                   AttributeError: 'WalletMigrationTest' object has no attribute 'migrate_and_get_rpc'

achow101 force-pushed on Dec 12, 2024

DrahtBot removed the label CI failed on Dec 12, 2024

hodlinator approved

hodlinator commented at 8:41 pm on December 13, 2024: contributor

ACK 227642d5afeb9918269192500d1a41bcb64b51c5

Only contains changes from 3 mentioned PRs. No longer includes #31374 which depended on additional changes.

net, init: derive default onion port if a user specified a -port

After port collisions are no longer tolerated but lead to
a startup failure in v28.0, local setups of multiple nodes,
each with a different -port value would not be possible anymore
due to collision of the onion default port - even if the nodes
were using tor or not interested in receiving onion inbound connections.

Fix this by deriving the onion listening port to be -port + 1.
(idea by vasild / laanwj)

Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

Github-Pull: bitcoin/bitcoin#31223
Rebased-From: 0e2b12b92a28a2949e75bf50f31563f52e647d6e

bbde830b97

test: add functional test for -port behavior

Github-Pull: bitcoin/bitcoin#31223
Rebased-From: 997757dd2b4d7b20b17299fbd21970b2efb8bbc8

a0585b6087

Add release note for #31223

Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

Github-Pull: bitcoin/bitcoin#31223
Rebased-From: 1dd3af8fbc350c6f1efa8ae6449e67e1b42ccff4

bdc6b3e531

build: Bump to 28.1rc2 e0b27b234c

doc: Generate manpages 7ddfcf32da

examples: Generate example bitcoin.conf 01fe07a2ce

doc: update release notes for 28.1rc2 5576618152

achow101 commented at 2:28 am on December 14, 2024: member

Added #31223 and also the rest of the rc2 things.

hodlinator approved

hodlinator commented at 10:44 pm on December 14, 2024: contributor

re-ACK 5576618152aff0358aeb1c5189422882b419de2d

Used git range-diff 0e2b12b^..1dd3af8 227642d..bdc6b3e to confirm only commit messages and diff context changed marginally vs #31223.

Last few added commits correspond well to release-process.md.

achow101 merged this on Dec 17, 2024

achow101 closed this on Dec 17, 2024

[28.x] 28.1rc2 backports #31469

Code Coverage & Benchmarks

Reviews