-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Rename "Merge" -> "Bellatrix" #2774
Conversation
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.
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
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.
phew nice job!!
i had two minor questions below, but otherwise looks good!
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_VERSION
BELLATRIX_FORK_VERSION
MERGE_FORK_EPOCH
BELLATRIX_FORK_EPOCH
GOSSIP_MAX_SIZE_MERGE
GOSSIP_MAX_SIZE_BELLATRIX
MAX_CHUNK_SIZE_MERGE
MAX_CHUNK_SIZE_BELLATRIX
Preset name changes
INACTIVITY_PENALTY_QUOTIENT_MERGE
INACTIVITY_PENALTY_QUOTIENT_BELLATRIX
MIN_SLASHING_PENALTY_QUOTIENT_MERGE
MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX
PROPORTIONAL_SLASHING_MULTIPLIER_MERGE
PROPORTIONAL_SLASHING_MULTIPLIER_BELLATRIX
TODO