Skip to content

[28.x] 28.1rc2 backports #31469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
achow101 merged 10 commits into from
Dec 17, 2024
Merged

[28.x] 28.1rc2 backports #31469

achow101 merged 10 commits into from
Dec 17, 2024

Conversation

@achow101
Copy link
Member

@achow101 achow101 commented Dec 11, 2024 •
edited by fanquake
Loading

fanquake and others added 3 commits December 11, 2024 11:41
@fanquake @achow101
fuzz: add cstdlib to FuzzedDataProvider
2835158 
Same as llvm/llvm-project#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#31448
Rebased-From: bb7e686
@vasild @achow101
util: use explicit cast in MultiIntBitSet::Fill()
b8112cf 
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#31431
Rebased-From: edb41e4
@0xB10C @achow101
test: fix MIN macro-redefinition
227642d 
Renames the `MIN` macro to `_TRACEPOINT_TEST_MIN`.

From bitcoin#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: bitcoin#31418

Github-Pull: bitcoin#31419
Rebased-From: 00c1dbd
@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 11, 2024 •
edited
Loading

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.

@fanquake fanquake added this to the 28.1 milestone Dec 11, 2024
@fanquake
Copy link
Member

fanquake commented Dec 12, 2024

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

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

hodlinator
hodlinator approved these changes Dec 13, 2024
View reviewed changes
Copy link
Contributor

@hodlinator hodlinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 227642d

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

mzumsande and others added 7 commits December 13, 2024 21:15
@mzumsande @achow101
net, init: derive default onion port if a user specified a -port
bbde830 
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 <[email protected]>

Github-Pull: bitcoin#31223
Rebased-From: 0e2b12b
@mzumsande @achow101
test: add functional test for -port behavior
a0585b6 
Github-Pull: bitcoin#31223
Rebased-From: 997757d
@mzumsande @achow101
Add release note for bitcoin#31223
bdc6b3e 
Co-authored-by: Vasil Dimov <[email protected]>

Github-Pull: bitcoin#31223
Rebased-From: 1dd3af8
@achow101
build: Bump to 28.1rc2
e0b27b2
@achow101
doc: Generate manpages
7ddfcf3
@achow101
examples: Generate example bitcoin.conf
01fe07a
@achow101
doc: update release notes for 28.1rc2
5576618
@achow101
Copy link
Member Author

achow101 commented Dec 14, 2024

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

hodlinator
hodlinator approved these changes Dec 14, 2024
View reviewed changes
Copy link
Contributor

@hodlinator hodlinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-ACK 5576618

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.

This was referenced Dec 17, 2024
Merged
Merged
Merged
@achow101 achow101 merged commit 6db7256 into bitcoin:28.x Dec 17, 2024
16 checks passed
PlatinumWrist5055

This comment was marked as off-topic.

Sign in to view

@bitcoin bitcoin locked and limited conversation to collaborators Dec 23, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@PlatinumWrist5055 PlatinumWrist5055 PlatinumWrist5055 left review comments

@hodlinator hodlinator hodlinator approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Backport

Projects

None yet

Milestone

28.1

Development

Successfully merging this pull request may close these issues.

8 participants

@achow101 @DrahtBot @fanquake @PlatinumWrist5055 @hodlinator @vasild @0xB10C @mzumsande