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

Rebase The Merge onto Altair base functionality #2530

Merged
merged 4 commits into from
Jul 23, 2021
Merged

Rebase The Merge onto Altair base functionality #2530

merged 4 commits into from
Jul 23, 2021

Conversation

protolambda
Copy link
Contributor

@protolambda protolambda commented Jul 22, 2021 •
edited
Loading

No functional changes to the Merge itself, but extending the Altair specification now that it is in beta and looking stable.

  • Update Merge Beacon doc
    • Update type definitions to full (fixes linting error for state.slot type, also does not mix common types of different modules)
    • Update extended processing functions to call Altair
  • Update Merge genesis state creation
  • Update validator and other doc references to previous forks
  • Update test utils to handle sequence
  • Update helpers/constants.py
  • Update fork tests to start with Altair state when forking to Merge
  • Update setup.py to generate code
  • Update sharding beacon doc for consistency

@protolambda protolambda added the Bellatrix CL+EL Merge label Jul 22, 2021
djrtwo
djrtwo reviewed Jul 22, 2021
View reviewed changes
Copy link
Contributor

@djrtwo djrtwo left a comment •
edited
Loading

Choose a reason for hiding this comment

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

nice! one small fix

setup.py Show resolved Hide resolved
specs/merge/fork.md Show resolved Hide resolved
@djrtwo djrtwo mentioned this pull request Jul 22, 2021
Merged
@protolambda protolambda marked this pull request as ready for review July 22, 2021 18:04
hwwhww
hwwhww reviewed Jul 22, 2021
View reviewed changes
specs/merge/beacon-chain.md Show resolved Hide resolved
specs/merge/beacon-chain.md Show resolved Hide resolved
djrtwo
djrtwo approved these changes Jul 22, 2021
View reviewed changes
Copy link
Contributor

@djrtwo djrtwo 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 to me. not too bad

hwwhww
hwwhww approved these changes Jul 23, 2021
View reviewed changes
Copy link
Contributor

@hwwhww hwwhww left a comment

Choose a reason for hiding this comment

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

Nice!

specs/merge/beacon-chain.md Show resolved Hide resolved
mkalinin
mkalinin approved these changes Jul 23, 2021
View reviewed changes
Copy link
Contributor

@mkalinin mkalinin left a comment

Choose a reason for hiding this comment

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

LGTM! 👍

@protolambda protolambda merged commit d3081d0 into dev Jul 23, 2021
@protolambda protolambda deleted the merge-rebase-altair branch July 23, 2021 10:05
@hwwhww hwwhww mentioned this pull request Aug 31, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hwwhww hwwhww hwwhww approved these changes

@mkalinin mkalinin mkalinin approved these changes

@djrtwo djrtwo djrtwo approved these changes

Assignees
No one assigned
Labels
Bellatrix CL+EL Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@protolambda @djrtwo @mkalinin @hwwhww