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.

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

bump soft-fork3 activation height #15938

Merged
merged 1 commit into from
Aug 5, 2023
Merged

bump soft-fork3 activation height #15938

merged 1 commit into from
Aug 5, 2023

Conversation

arvidn
Copy link
Contributor

@arvidn arvidn commented Aug 4, 2023 •
edited
Loading

since release is slipping

@arvidn arvidn added the Changed Required label for PR that categorizes merge commit message as "Changed" for changelog label Aug 4, 2023
@arvidn arvidn marked this pull request as ready for review August 4, 2023 18:57
@arvidn arvidn requested a review from a team as a code owner August 4, 2023 18:57
@emlowe
Copy link
Contributor

emlowe commented Aug 5, 2023

Does this need to change in initial-config?

hoffmang9
hoffmang9 approved these changes Aug 5, 2023
View reviewed changes
Copy link
Member

@hoffmang9 hoffmang9 left a comment

Choose a reason for hiding this comment

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

lgtm

@wallentx
Copy link
Contributor

wallentx commented Aug 5, 2023

Does this need to change in initial-config?

chia-blockchain/chia/util/initial-config.yaml

Lines 74 to 78 in a5a988c

SOFT_FORK2_HEIGHT: 0
# planned 2.0 release is July 26, height 2965036 on testnet
# 1 week later
SOFT_FORK3_HEIGHT: 2997292
HARD_FORK_HEIGHT: 2997292

These look like they are prob not right.

@arvidn
Copy link
Contributor Author

arvidn commented Aug 5, 2023

the config file contains overrides for testnet. but testnet has already activated soft-fork3, so we can't change those.

@arvidn arvidn added the ready_to_merge Submitter and reviewers think this is ready label Aug 5, 2023
@arvidn
Copy link
Contributor Author

arvidn commented Aug 5, 2023

I think we have to accept the benchmark workflow an exception, since we don't have those runners back up yet

@wallentx wallentx merged commit 6a5bf15 into release/2.0.0 Aug 5, 2023
@wallentx wallentx deleted the extend-softfor3 branch August 5, 2023 01:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hoffmang9 hoffmang9 hoffmang9 approved these changes

@emlowe emlowe emlowe approved these changes

Assignees
No one assigned
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog ready_to_merge Submitter and reviewers think this is ready
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@arvidn @emlowe @wallentx @hoffmang9