Conversation
mkalinin
approved these changes
Dec 23, 2021
Contributor
mkalinin
left a comment
There was a problem hiding this comment.
Congratulations on the new name! 🥳
I have commented a few places where the Merge is still used in the context of the fork name, another place is /phase0/deposit-contract.md:
- "in a followup fork after the Merge"
- "until sometime after the Merge"
Other than that, looks good to me! Let's get it merged after a few fixes!
tests/core/pyspec/eth2spec/test/bellatrix/fork/test_merge_fork_random.py
Outdated
Show resolved
Hide resolved
ralexstokes
approved these changes
Dec 23, 2021
Member
ralexstokes
left a comment
There was a problem hiding this comment.
phew nice job!!
i had two minor questions below, but otherwise looks good!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge -> Bellatrix
Description
As per ethereum/pm#430 discussion, we will use Bellatrix as the code name for the next CL hard fork.
This PR:
*/merge/to*/bellatrix/folderI kept the word "merge" when it is about the point of "merge transition".
Configuration name changes
MERGE_FORK_VERSIONBELLATRIX_FORK_VERSIONMERGE_FORK_EPOCHBELLATRIX_FORK_EPOCHGOSSIP_MAX_SIZE_MERGEGOSSIP_MAX_SIZE_BELLATRIXMAX_CHUNK_SIZE_MERGEMAX_CHUNK_SIZE_BELLATRIXPreset name changes
INACTIVITY_PENALTY_QUOTIENT_MERGEINACTIVITY_PENALTY_QUOTIENT_BELLATRIXMIN_SLASHING_PENALTY_QUOTIENT_MERGEMIN_SLASHING_PENALTY_QUOTIENT_BELLATRIXPROPORTIONAL_SLASHING_MULTIPLIER_MERGEPROPORTIONAL_SLASHING_MULTIPLIER_BELLATRIXTODO