Skip to content

[31.x] Backports#34800

Draft
fanquake wants to merge 13 commits intobitcoin:31.xfrom
fanquake:31_x_backports
Draft

[31.x] Backports#34800
fanquake wants to merge 13 commits intobitcoin:31.xfrom
fanquake:31_x_backports

Conversation

@fanquake fanquake added this to the 31.0 milestone Mar 11, 2026
@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 11, 2026

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.
A summary of reviews will appear here.

@Sjors
Copy link
Member

Sjors commented Mar 11, 2026

Did you mean to make this a PR against 31.x?

@fanquake fanquake changed the base branch from master to 31.x March 11, 2026 15:09
the test silently passes on master because SetupAddressRelay
isn't called by default for inbound connections.

Github-Pull: bitcoin#34750
Rebased-From: ecb5ce6
since we're bumping mocktime more than CHAIN_SYNC_TIMEOUT = 20 * 60,
it's possible for disconnections like this to happen in the test:

$ test/functional/p2p_addr_relay.py --randomseed=7758649581790797022
...
TestFramework (INFO): Check that we answer getaddr messages only once per connection
TestFramework.p2p (WARNING): Connection lost to 127.0.0.1:58829 due to [Errno 54] Connection reset by peer
...

Github-Pull: bitcoin#34750
Rebased-From: 7ee8c0a
we don't need to send GETADDR for initial self announcement
anymore + can construct addr_receivers using
AddrReceiver(send_getaddr=False).

however we would need to send an empty ADDR message to each
of the addr_receivers to initialise addr relay for inbound
connections. so current code is simpler and we can just
clarify the comment.

Github-Pull: bitcoin#34750
Rebased-From: 57bfa86
* Show preview and ask for confirmation before git clean unless used with "--force"
* Error out when trying to pass args such as "guix-clean --help"

Github-Pull: bitcoin#34776
Rebased-From: be6d24e
Calling shutil.make_archive(), does not preserve symlinks when using the
zip format, see python/cpython#139679.

Call `zip` using subprocess instead. This code is only run when using a
macos machine, and I think it's safe to assume that zip is available, same
as codesign, and all other tools we call in this script.

Github-Pull: bitcoin#34787
Rebased-From: ab137cb
Rather than looking for /translations, which might not exist (it doesn't
in a recent brew installed qt on macOS). i.e:
```bash
ls /opt/homebrew/opt/qtbase/share/qt
doc
libexec
metatypes
mkspecs
modules
plugins
sbom
```

Github-Pull: bitcoin#34787
Rebased-From: 66d80d5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants