Skip to content
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.

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

[26.x] more backports #29209

Merged
merged 7 commits into from
Feb 16, 2024
Merged

[26.x] more backports #29209

merged 7 commits into from
Feb 16, 2024

Conversation

@glozow glozow added the Backport label Jan 9, 2024
@DrahtBot
Copy link
Contributor

DrahtBot commented Jan 9, 2024

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

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v

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

Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

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

ACK 234f328

@achow101
Copy link
Member

perhaps add #28791

@stickies-v
Copy link
Contributor

stickies-v commented Jan 18, 2024

Backports LGTM d055ada but it seems that the commit messages are different than usual? It doesn't seem like we have formal documentation on this, but keeping things uniform helps keep scripts simple (e.g. compiling a list of all pulls that are backported from git log) so this might be worth updating?

  • Rebased-From only mentions the short hash when I think typically we use the full hash (needed for git fetch)
  • Github-Pull uses bitcoin#<number> when I think typically we just use #number (do we ever backport from different repos?)
  • ddfed7a is missing both Rebased-From and Github-Pull

@glozow
Copy link
Member Author

glozow commented Jan 18, 2024

fixed commit messages.

@fanquake
Copy link
Member

Lets add #29127, so if we decide to, we can test macOS notarization: #15774 (comment).

stickies-v and others added 7 commits January 19, 2024 16:12
Instead of reaching into the mapTx data structure, use a helper method
that provides the required vector of CTxMemPoolEntry pointers.

Github-Pull: bitcoin#28391
Rebased-From: 453b481
A Bitcoin Core node may only connect to a peer destination via I2P if both sides
have sessions with the same encryption type.  The encryption type is a property
of the session, not the destination.  Sessions may support multiple encryption
types.

As Bitcoin Core is not currently setting the I2P encryption type when creating
sessions, it is using the older default, ElGamal (type 0).

This pull updates Bitcoin Core to use both ECIES-X25519 and ElGamal (types 4 and
0, respectively).  This allows to connect to I2P peers with either type, and the
newer, faster ECIES-X25519 will be preferred.

See also the recently updated section "Signature and Encryption Types" in
https://geti2p.net/en/docs/api/samv3

Thanks and credit to zzzi2p (https://github.com/zzzi2p) for reporting.

Closes bitcoin#29197.

Github-Pull: bitcoin#29200
Rebased-From: 9d72891
Log at the top before incrementing so that this log isn't printed when
there's only 1 tx.

Github-Pull: bitcoin#29227
Rebased-From: eb78ea4
…empool

Test that wallet rescans process transactions topologically, even if a
parent's entry into the mempool is later than that of its child.
This behavior is important because IsFromMe requires the ability to look
up a transaction's inputs.

Github-Pull: bitcoin#29179
Rebased-From: c3d02be
…in mempool

Test that wallet rescans process transactions topologically, even if a
parent's entry into the mempool is later than that of its child.
This behavior is important because IsFromMe requires the ability to look
up a transaction's inputs.

Co-authored-by: furszy <matiasfurszyfer@protonmail.com>

Github-Pull: bitcoin#29179
Rebased-From: df30247
The Apple notary service requires submitted app bundles to be configured to use the hardened runtime libraries.  This is configured at signing time, and supported by the signapple tool Bitcoin Core uses for reproduceable signed binaries.  We simply need to pass "--hardened-runtime" when the signature is created.  Once attached to the bundle, the resulting codesigned binary can be successfully submitted to the Apple binary notarization service by any Apple Developer.

Github-Pull: bitcoin#29127
Rebased-From: 4fdd836
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

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

ACK 11f3a7e

@fanquake fanquake merged commit 74df372 into bitcoin:26.x Feb 16, 2024
14 of 16 checks passed
@glozow glozow deleted the 2024-01-backports-26.1 branch February 16, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants