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

Rename "Merge" -> "Bellatrix" #2774

Merged
merged 4 commits into from
Dec 23, 2021
Merged

Rename "Merge" -> "Bellatrix" #2774

merged 4 commits into from
Dec 23, 2021

Conversation

hwwhww
Copy link
Contributor

@hwwhww hwwhww commented Dec 23, 2021

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:

  1. Move the files from */merge/ to */bellatrix/ folder
  2. Replace the keyword "Merge" with "Bellatrix" in most places
  3. Update the names of fork-specific configuration and preset items

I kept the word "merge" when it is about the point of "merge transition".

Configuration name changes

Old name New name
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

Old name New name
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

  • Check if test generators work well

@hwwhww hwwhww added the Bellatrix CL+EL Merge label Dec 23, 2021
@hwwhww hwwhww requested a review from mkalinin December 23, 2021 06:47
@hwwhww hwwhww changed the title Merge -> Bellatrix Rename "Merge" -> "Bellatrix" Dec 23, 2021
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.

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!

README.md Show resolved Hide resolved
presets/minimal/bellatrix.yaml Show resolved Hide resolved
Copy link
Member

@ralexstokes ralexstokes left a 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!

README.md Outdated Show resolved Hide resolved
specs/custody_game/beacon-chain.md Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bellatrix CL+EL Merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants