-
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
Update merge consensus to v1.1.0-beta.5 #2630
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaelsproul
added
ready-for-review
The code is ready for review
merge-f2f
Relates to the Oct 2021 Merge F2F
labels
Sep 26, 2021
paulhauner
approved these changes
Sep 26, 2021
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.
LGTM! Merge at will!
paulhauner
pushed a commit
to paulhauner/lighthouse
that referenced
this pull request
Sep 27, 2021
paulhauner
pushed a commit
that referenced
this pull request
Sep 28, 2021
paulhauner
pushed a commit
that referenced
this pull request
Oct 1, 2021
paulhauner
pushed a commit
that referenced
this pull request
Oct 12, 2021
paulhauner
pushed a commit
that referenced
this pull request
Oct 27, 2021
paulhauner
pushed a commit
to paulhauner/lighthouse
that referenced
this pull request
Nov 3, 2021
paulhauner
pushed a commit
that referenced
this pull request
Nov 11, 2021
paulhauner
pushed a commit
that referenced
this pull request
Nov 28, 2021
paulhauner
pushed a commit
that referenced
this pull request
Nov 28, 2021
paulhauner
pushed a commit
that referenced
this pull request
Dec 2, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Update the merge consensus code to match spec v1.1.0-beta.5
Specifically, this PR incorporates the changes from these 3 spec PRs:
We already matched the new spec on 2 other consensus PRs:
I haven't done anything to update execution engine stuff or gossip validation conditions, as I believe others are working on that (@paulhauner, @ethDreamer).
The tests are updated and passing 👍