-
Notifications
You must be signed in to change notification settings - Fork 781
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
[Merged by Bors] - Add mainnet merge values 🐼 #3462
Conversation
commit b3c7d8e Author: Paul Hauner <[email protected]> Date: Fri Aug 12 09:57:27 2022 +1000 Add tentative merge values
b3c7d8e
to
a781220
Compare
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 |
There was a problem hiding this 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 🐼 🚄
bors r+ |
## 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
Build failed: |
@paulhauner we need to update the hardcoded values in |
Fixed! I had to fix some other tests that were assuming an Altair epoch that was higher than the Bellatrix epoch, too. |
I'm going to try adding these tests now: https://github.com/ethereum/consensus-specs/releases/tag/v1.2.0-rc.2 |
I had to make sure that the |
... and ignore some new tests: c19ab1f |
There was a problem hiding this 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
Co-authored-by: Michael Sproul <[email protected]>
bors r+ |
## 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
## 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
## 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 <[email protected]>
Issue Addressed
NA
Proposed Changes
Adds tentative values for the merge TTD and Bellatrix as per ethereum/consensus-specs#2969
Additional Info
Blocked on Merge mainnet ttd and bellatrix values ethereum/consensus-specs#2969