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.

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 Mainnet config to schedule The Merge 🐼 #6067

Merged
merged 11 commits into from
Aug 15, 2022

Conversation

ajsutton
Copy link
Contributor

PR Description

Updates our Mainnet config as per ethereum/consensus-specs#2969 to schedule The Merge.

Unleash the pandas. 🐼

Documentation

  • I thought about documentation and added the doc-change-required label to this PR if updates are required.

Changelog

  • I thought about adding a changelog entry, and added one if I deemed necessary.

Copy link
Contributor

@rolfyone rolfyone left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -12,7 +12,7 @@ CONFIG_NAME: 'minimal'

# Transition
# ---------------------------------------------------------------
# TBD, 2**256-2**10 is a placeholder
# 2**256-2**10 for fake minimal network
Copy link
Contributor

Choose a reason for hiding this comment

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

not sure i'd say 'fake', maybe 'testing' or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's straight from the spec. :)

@ajsutton ajsutton enabled auto-merge (squash) August 15, 2022 03:15
@ajsutton ajsutton merged commit eedecbf into Consensys:master Aug 15, 2022
@ajsutton ajsutton deleted the schedule-the-merge branch August 15, 2022 04:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants