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

[Merged by Bors] - Add mainnet merge values 🐼 #3462

Closed
wants to merge 7 commits into from
Closed

[Merged by Bors] - Add mainnet merge values 🐼 #3462

wants to merge 7 commits into from

Conversation

paulhauner
Copy link
Member

@paulhauner paulhauner commented Aug 12, 2022 •
edited
Loading

Issue Addressed

NA

Proposed Changes

Adds tentative values for the merge TTD and Bellatrix as per ethereum/consensus-specs#2969

Additional Info

@paulhauner paulhauner added work-in-progress PR is a work-in-progress do-not-merge blocked v3.0.0 🐼 Required for the v3.0.0 release labels Aug 12, 2022
paulhauner added a commit that referenced this pull request Aug 12, 2022
@paulhauner
Squashed commit of #3462
a1a6f1d 
commit b3c7d8e
Author: Paul Hauner <paul@paulhauner.com>
Date:   Fri Aug 12 09:57:27 2022 +1000

    Add tentative merge values
@paulhauner paulhauner mentioned this pull request Aug 12, 2022
Closed
@paulhauner paulhauner added ready-for-review The code is ready for review and removed work-in-progress PR is a work-in-progress blocked labels Aug 16, 2022
@paulhauner paulhauner marked this pull request as ready for review August 16, 2022 01:33
@paulhauner
Copy link
Member Author

We're going to wait for the ACD call on 2022-08-18 before we cut a release with these parameters, but considering that ethereum/consensus-specs#2969 is merged I think it's a good time for us to get this into unstable and start testing it.

michaelsproul
michaelsproul approved these changes Aug 16, 2022
View reviewed changes
Copy link
Member

@michaelsproul michaelsproul left a comment

Choose a reason for hiding this comment

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

All aboard the merge train 🐼 🚄

@paulhauner
Copy link
Member Author

bors r+

bors bot pushed a commit that referenced this pull request Aug 16, 2022
@paulhauner
Add mainnet merge values 🐼 (#3462)
aecb67b 
## Issue Addressed

NA

## Proposed Changes

Adds **tentative** values for the merge TTD and Bellatrix as per ethereum/consensus-specs#2969

## Additional Info

- ~~Blocked on ethereum/consensus-specs#2969
@michaelsproul michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review do-not-merge labels Aug 16, 2022
@bors
Copy link

bors bot commented Aug 16, 2022

Build failed:

@michaelsproul
Copy link
Member

@paulhauner we need to update the hardcoded values in ChainSpec::mainnet

@paulhauner
Copy link
Member Author

@paulhauner we need to update the hardcoded values in ChainSpec::mainnet

Fixed! I had to fix some other tests that were assuming an Altair epoch that was higher than the Bellatrix epoch, too.

@paulhauner
Copy link
Member Author

I'm going to try adding these tests now: https://github.com/ethereum/consensus-specs/releases/tag/v1.2.0-rc.2

@paulhauner
Copy link
Member Author

I had to make sure that the minimal spec still uses the placeholder TTD: f465785

@paulhauner
Copy link
Member Author

... and ignore some new tests: c19ab1f

michaelsproul
michaelsproul approved these changes Aug 17, 2022
View reviewed changes
Copy link
Member

@michaelsproul michaelsproul left a comment

Choose a reason for hiding this comment

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

Looks good modulo one typo

@paulhauner @michaelsproul
Update testing/ef_tests/check_all_files_accessed.py
329dedb 
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
@paulhauner
Copy link
Member Author

bors r+

bors bot pushed a commit that referenced this pull request Aug 17, 2022
@paulhauner
Add mainnet merge values 🐼 (#3462)
d9d1288 
## Issue Addressed

NA

## Proposed Changes

Adds **tentative** values for the merge TTD and Bellatrix as per ethereum/consensus-specs#2969

## Additional Info

- ~~Blocked on ethereum/consensus-specs#2969
@bors
Copy link

bors bot commented Aug 17, 2022

Pull request successfully merged into unstable.

Build succeeded:

@bors bors bot changed the title Add mainnet merge values 🐼 [Merged by Bors] - Add mainnet merge values 🐼 Aug 17, 2022
@bors bors bot closed this Aug 17, 2022
bors bot pushed a commit that referenced this pull request Aug 21, 2022
@paulhauner
v3.0.0 (#3464)
81e5c8d 
## Issue Addressed

NA

## Proposed Changes

Bump versions to v3.0.0

## Additional Info

- ~~Blocked on #3439~~
- ~~Blocked on #3459~~
- ~~Blocked on #3463~~
- ~~Blocked on #3462~~
- ~~Requires further testing~~
bors bot pushed a commit that referenced this pull request Aug 22, 2022
@paulhauner
v3.0.0 (#3464)
c617d08 
## Issue Addressed

NA

## Proposed Changes

Bump versions to v3.0.0

## Additional Info

- ~~Blocked on #3439~~
- ~~Blocked on #3459~~
- ~~Blocked on #3463~~
- ~~Blocked on #3462~~
- ~~Requires further testing~~
bors bot pushed a commit that referenced this pull request Aug 22, 2022
@paulhauner
v3.0.0 (#3464)
1b4ef72 
## Issue Addressed

NA

## Proposed Changes

Bump versions to v3.0.0

## Additional Info

- ~~Blocked on #3439~~
- ~~Blocked on #3459~~
- ~~Blocked on #3463~~
- ~~Blocked on #3462~~
- ~~Requires further testing~~
bors bot pushed a commit that referenced this pull request Aug 22, 2022
@paulhauner @michaelsproul
v3.0.0 (#3464)
795c01f 
## Issue Addressed

NA

## Proposed Changes

Bump versions to v3.0.0

## Additional Info

- ~~Blocked on #3439~~
- ~~Blocked on #3459~~
- ~~Blocked on #3463~~
- ~~Blocked on #3462~~
- ~~Requires further testing~~


Co-authored-by: Michael Sproul <michael@sigmaprime.io>
bors bot pushed a commit that referenced this pull request Aug 22, 2022
@paulhauner @michaelsproul
v3.0.0 (#3464)
18c61a5 
## Issue Addressed

NA

## Proposed Changes

Bump versions to v3.0.0

## Additional Info

- ~~Blocked on #3439~~
- ~~Blocked on #3459~~
- ~~Blocked on #3463~~
- ~~Blocked on #3462~~
- ~~Requires further testing~~


Co-authored-by: Michael Sproul <michael@sigmaprime.io>
@paulhauner paulhauner deleted the mainnet-merge branch November 24, 2022 02:45
Woodpile37 pushed a commit to Woodpile37/lighthouse that referenced this pull request Jan 6, 2024
@paulhauner @Woodpile37
Add mainnet merge values 🐼 (sigp#3462)
059716a 
## Issue Addressed

NA

## Proposed Changes

Adds **tentative** values for the merge TTD and Bellatrix as per ethereum/consensus-specs#2969

## Additional Info

- ~~Blocked on ethereum/consensus-specs#2969
Woodpile37 pushed a commit to Woodpile37/lighthouse that referenced this pull request Jan 6, 2024
@paulhauner @michaelsproul @Woodpile37
v3.0.0 (sigp#3464)
88d7b38 
## Issue Addressed

NA

## Proposed Changes

Bump versions to v3.0.0

## Additional Info

- ~~Blocked on sigp#3439~~
- ~~Blocked on sigp#3459~~
- ~~Blocked on sigp#3463~~
- ~~Blocked on sigp#3462~~
- ~~Requires further testing~~


Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelsproul michaelsproul michaelsproul approved these changes

Assignees
No one assigned
Labels
ready-for-merge This PR is ready to merge. v3.0.0 🐼 Required for the v3.0.0 release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@paulhauner @michaelsproul