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] backports and final changes for v26.1rc2 #29509

Merged
merged 16 commits into from Mar 11, 2024

Conversation

The MinGW-w64 toolchain links executables to the old msvcrt C Runtime
Library that does not support the `x` modifier for the _wfopen()
function.

Github-Pull: bitcoin#29357
Rebased-From: d2fe905
@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 28, 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 achow101
Stale ACK hebasto

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 26.1 milestone Feb 28, 2024
@achow101
Copy link
Member

I think #29510 should be backported too, once it's merged.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 4ac0eb5.

dergoegge and others added 9 commits March 5, 2024 10:21
We preemptively perform a block mutation check before further processing
a block message (similar to early sanity checks on other messsage
types). The main reasons for this change are as follows:

- `CBlock::GetHash()` is a foot-gun without a prior mutation check, as
  the hash returned only commits to the header but not to the actual
  transactions (`CBlock::vtx`) contained in the block.
- We have observed attacks that abused mutated blocks in the past, which
  could have been prevented by simply not processing mutated blocks
  (e.g. bitcoin#27608).

Github-Pull: bitcoin#29412
Rebased-From: 49257c0
Slight performance improvement by avoiding duplicate work.

Github-Pull: bitcoin#29412
Rebased-From: 1ec6bbe
@glozow
Copy link
Member Author

glozow commented Mar 5, 2024

Noting changes for #29412:

  • LogDebug to LogPrint
  • GetSerializeSize(TX_NO_WITNESS(tx)) to GetSerializeSize(tx, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS)
  • Didn't add 1ed2c98, modified validation_tests to convert transaction hash data as needed. (26.x doesn't have transaction_identifier.h)

@fanquake
Copy link
Member

fanquake commented Mar 6, 2024

Can you also add #29529.

fanquake and others added 2 commits March 7, 2024 10:45
Should fix the GCC compilation portion of bitcoin#29517:
bitcoin#29517 (comment).

See also:
https://www.gnu.org/software/gnulib/manual/html_node/fopencookie.html
but note that FreeBSD has supported this function since 11.x.

Github-Pull: bitcoin#29529
Rebased-From: 312f338
@glozow glozow changed the title [26.x] even more backports [26.x] backports and final changes for v26.1rc2 Mar 7, 2024
@glozow
Copy link
Member Author

glozow commented Mar 7, 2024

Added #29529. Also updated release notes and added final changes for rc2.

@glozow glozow requested a review from hebasto March 8, 2024 12:44
@achow101
Copy link
Member

achow101 commented Mar 8, 2024

ACK c68d4d0

@glozow glozow merged commit c33e83a into bitcoin:26.x Mar 11, 2024
14 of 16 checks passed
@glozow glozow deleted the 2024-02-26-backports branch March 21, 2024 17:30
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

8 participants