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

[CHIA-1976] bump chia_rs to 0.16.0 and introduce soft-fork6 #18988

Merged
merged 2 commits into from
Dec 5, 2024

Conversation

arvidn
Copy link
Contributor

@arvidn arvidn commented Dec 4, 2024

Purpose:

back port soft-fork 6 on top of the release tag

These are the changes to chia_rs: Chia-Network/chia_rs@0.14.0...0.16.0

Current Behavior:

New Behavior:

The new chia_rs implements the keccak softfork.

The activation heights in this PR are:

network block height approx. date
mainnet 6800000 2025-03-22
testnet11 2000000 2025-02-06

(please double check these calculations)

Testing Notes:

Copy link

socket-security bot commented Dec 4, 2024

Removed dependencies detected. Learn more about Socket for GitHub ↗︎

🚮 Removed packages: pypi/chia-rs@0.14.0

View full report↗︎

@arvidn arvidn added the Changed Required label for PR that categorizes merge commit message as "Changed" for changelog label Dec 4, 2024
@arvidn arvidn changed the title bump chia_rs to 0.16.0 and introduce soft-fork6 [CHIA-1976] bump chia_rs to 0.16.0 and introduce soft-fork6 Dec 4, 2024
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Dec 5, 2024
Copy link
Contributor

github-actions bot commented Dec 5, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@arvidn arvidn force-pushed the back-port-keccak branch 2 times, most recently from 03c004b to 7434ff0 Compare December 5, 2024 17:59
@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Dec 5, 2024
Copy link
Contributor

github-actions bot commented Dec 5, 2024

Conflicts have been resolved. A maintainer will review the pull request shortly.

@arvidn arvidn marked this pull request as ready for review December 5, 2024 17:59
@arvidn arvidn requested a review from a team as a code owner December 5, 2024 17:59
@aqk
Copy link
Contributor

aqk commented Dec 5, 2024

Hey, I noticed that you set 2025-02-28 as the approximate date to trigger on testnet11.

Wouldn it be better to set a date more like 2024-12-15 or 2025-01-05, so we can confirm the behaviour earlier?

hoffmang9
hoffmang9 previously approved these changes Dec 5, 2024
chia/consensus/default_constants.py Outdated Show resolved Hide resolved
Copy link
Contributor

@emlowe emlowe left a comment

Choose a reason for hiding this comment

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

Looks ok to me

@arvidn arvidn added the ready_to_merge Submitter and reviewers think this is ready label Dec 5, 2024
@pmaslana pmaslana merged commit f9b7ddc into release/2.5.0 Dec 5, 2024
866 of 867 checks passed
@pmaslana pmaslana deleted the back-port-keccak branch December 5, 2024 23:43
Copy link
Contributor

github-actions bot commented Dec 6, 2024

File Coverage Missing Lines
chia/rpc/wallet_rpc_api.py 0.0% lines 1577
Total Missing Coverage
10 lines Unknown 90%

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog coverage-diff ready_to_merge Submitter and reviewers think this is ready
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants