Rename `Merge` to `Bellatrix` #5601

macladson · 2024-04-18T09:18:56Z

Proposed Changes

Rename various references to "The Merge" to reference the Bellatrix hard fork instead.
This mainly covers enum/superstruct variants such as ForkName::Merge and BeaconBlockMerge which are now ForkName::Bellatrix and BeaconBlockBellatrix respectively.
Other changes include updates to functions, variable names and comments.

Additional Info

Not all references to "Merge" have been changed, but the codebase now skews towards referencing "Bellatrix".

Certain references to "The Merge" have been kept, such as any references to merge_transition or merge_block as these are present and distinct in the spec. Related functions and variable names have also been kept.

This also doesn't update the lighthouse/merge_readiness endpoint as this would be a breaking change. I'd also be in favour of removing this endpoint entirely.

dapplion

No xz backdoor either! LGTM

pawanjay176 · 2024-04-23T18:02:23Z

This would be a big conflict in existing feature PRs, so we should either rip of the bandaid and merge this asap or do it after we get all feature PRs in to unstable.
I vote for merging this ASAP

macladson · 2024-04-24T03:00:04Z

Yeah this is one of those things where there is never a "good" time to do it. It'll conflict with a lot of stuff now, but if we choose to wait, then it'll conflict even more with PeerDAS, Verkle and whatever else is coming in the future.

Also, I'm happy to assist in fixing conflicts on your/anyone's PRs, just ping me 😁

realbigsean · 2024-04-24T11:32:00Z

@mergify queue

mergify · 2024-04-24T11:32:11Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

realbigsean · 2024-04-25T17:14:58Z

@mergify requeue

mergify · 2024-04-25T17:15:05Z

requeue

✅ This pull request will be re-embarked automatically

The followup queue command will be automatically executed to re-embark the pull request

mergify · 2024-04-25T17:15:08Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

realbigsean · 2024-04-25T19:45:54Z

@mergify requeue

mergify · 2024-04-25T19:46:04Z

requeue

✅ This pull request will be re-embarked automatically

The followup queue command will be automatically executed to re-embark the pull request

mergify · 2024-04-25T19:46:10Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 13f94ef

* Fix execution integration tests (#5647) * update waiting status * revert to old nethermind version * Add electra presets to beacon API (#5630) * add presets to API * add extra fields to config spec in beacon API * remove unused * add mainnet presets for gnosis and fix minimal preset default values * Rename `Merge` to `Bellatrix` (#5601) * Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase * Deterministic block generation for tests (#5654) * Deterministic block generation for tests * Electra other containers (#5652) * add new fields to execution payload and header * beacon state changes * partial beacon state * safe arith in upgrade to electra * initialize balances cache in interop genesis state * Revert "initialize balances cache in interop genesis state" This reverts commit c60b522. * always initialize balances cache if necessary in electra upgrade * build cache earlier * fix block test * per fork NUM_FIELDS_POW2 * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-other-containers * fix lints * get fields based on post state, as is spec'd * fix type and move cache build * Add more electra helpers (#5653) * Add new helpers * Fix some stuff * Fix compilation errors * lint * Address review * Ignore gossip blob already imported (#5656) * Ignore gossip blob already imported * Beta compiler fix (#5659) * fix beta compiler compilation * remove unused import * Revert "remove unused import" This reverts commit 0bef36b. * Revert "fix beta compiler compilation" This reverts commit 23152cf. * rename ununsed fields * allow dead code on some error variants * remove unused blob download queue * add back debug to backfill error * more allow dead code on errors * fix(validator_client): raise soft fd limit (#4796) * fix(validator_client): raise soft fd limit * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * cargo lock * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * Proposer and attester slashing sse events (#5327) * default vc to block v3 endpoint and deprecate block-v3 flag * Merge branch 'unstable' of https://github.com/sigp/lighthouse into unstable * add proposer and attester event variants * add TOOOs * add tests, event triggers * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * revert * revert * remove double event tracking * Merge branch 'unstable' into proposer-and-attester-slashing-sse-events * remove todo, fix test * resolve merge conflicts * Merge branch 'proposer-and-attester-slashing-sse-events' of https://github.com/eserilev/lighthouse into proposer-and-attester-slashing-sse-events * leftover debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * pin macos release runner to `macos-13` (#5665) * pin macos release runner to `macos-13` * Update .github/workflows/release.yml * Remove snapshot cache related code (#5661) * Remove snapshot cache and other references. * Fix default state cache size in docs * Remove cache miss comment entirely * Add state cache CLI tests * Uncomment self_hosted_runner after PR Merge #5137 (#5291) * Uncomment self_hosted_runner after PR Merge #5137 * Merge branch 'unstable' into fix_todo * Merge branch 'unstable' of https://github.com/sigp/lighthouse into fix_todo * Only `portable` builds (binaries) (#5615) * release workflow: portable builds by default * Delete outdated comment * Merge branch 'unstable' into portable-builds-binaries # Conflicts: # .github/workflows/release.yml * Merge parent and current sync lookups (#5655) * Drop lookup type trait for a simple arg * Drop reconstructed for processing * Send parent blocks one by one * Merge current and parent lookups * Merge current and parent lookups clean up todos * Merge current and parent lookups tests * Merge remote-tracking branch 'origin/unstable' into sync-merged-lookup * Merge branch 'unstable' of https://github.com/sigp/lighthouse into sync-merged-lookup * fix compile after merge * #5655 pr review (#26) * fix compile after merge * remove todos, fix typos etc * fix compile * stable rng * delete TODO and unfilled out test * make download result a struct * enums instead of bools as params * fix comment * Various fixes * Track ignored child components * Track dropped lookup reason as metric * fix test * add comment describing behavior of avail check error * update ordering * delete spammy log (#5672) * delete spammy log * Ensure block only range requests don't fail on download (#5675) * ensure pruned blobs don't fail on download * Typo * Improve ENR updates (#5483) * Improve ENR updates * forever fmt * Appease my old friend clippy * Merge network unstable * Check da_checker before doing a block lookup request (#5681) * Check da_checker before doing a block lookup request * Ensure consistent handling of lookup result * use req resp pre import cache rather than da checker * Update Cargo.lock (#5670) * update rust-yamux * update Cargo.lock * Merge branch 'unstable' of github.com:jxs/lighthouse into update-cargo * Merge branch 'unstable' of github.com:sigp/lighthouse into update-cargo * update to new libp2p versions * Add metric for current epoch total balance (#5688) * Add metric for current epoch total balance --------- Co-authored-by: realbigsean <sean@sigmaprime.io> Co-authored-by: Mac L <mjladson@pm.me> Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Eitan Seri-Levi <eserilev@ucsc.edu> Co-authored-by: antondlr <anton@delaruelle.net> Co-authored-by: Jimmy Chen <jchen.tc@gmail.com> Co-authored-by: Ærvin <arvin.morawej@gmail.com> Co-authored-by: Age Manning <Age@AgeManning.com> Co-authored-by: João Oliveira <hello@jxs.pt> Co-authored-by: Michael Sproul <michael@sigmaprime.io>

macladson added work-in-progress PR is a work-in-progress code-quality labels Apr 18, 2024

dapplion approved these changes Apr 22, 2024

View reviewed changes

macladson added ready-for-review The code is ready for review and removed work-in-progress PR is a work-in-progress labels Apr 23, 2024

pawanjay176 approved these changes Apr 23, 2024

View reviewed changes

pawanjay176 added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Apr 23, 2024

Rename Merge to Bellatrix

8fc2c59

macladson force-pushed the bellatrix-rename branch from 7803b8a to 8fc2c59 Compare April 24, 2024 02:36

Remove tree-hash-cache which got readded from the rebase

e2fecf4

mergify bot added a commit that referenced this pull request Apr 24, 2024

Merge of #5601

247037d

mergify bot mentioned this pull request Apr 24, 2024

merge queue: embarking unstable (4a48d7b) and #5601 together #5645

Closed

5 tasks

mergify bot added a commit that referenced this pull request Apr 25, 2024

Merge of #5601

5e9d768

This was referenced Apr 25, 2024

merge queue: embarking unstable (dd340ee) and [#5630 + #5601] together #5648

Closed

Add electra presets to beacon API #5630

Merged

mergify bot added a commit that referenced this pull request Apr 25, 2024

Merge of #5601

797c6ac

mergify bot mentioned this pull request Apr 25, 2024

merge queue: embarking unstable (3203456) and #5601 together #5651

Closed

5 tasks

mergify bot merged commit 13f94ef into sigp:unstable Apr 25, 2024
27 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename `Merge` to `Bellatrix` #5601

Rename `Merge` to `Bellatrix` #5601

macladson commented Apr 18, 2024 •

edited

Loading

dapplion left a comment

pawanjay176 commented Apr 23, 2024

macladson commented Apr 24, 2024

realbigsean commented Apr 24, 2024

mergify bot commented Apr 24, 2024 •

edited

Loading

realbigsean commented Apr 25, 2024

mergify bot commented Apr 25, 2024

mergify bot commented Apr 25, 2024 •

edited

Loading

realbigsean commented Apr 25, 2024

mergify bot commented Apr 25, 2024

mergify bot commented Apr 25, 2024 •

edited

Loading

Rename Merge to Bellatrix #5601

Rename Merge to Bellatrix #5601

Conversation

macladson commented Apr 18, 2024 • edited Loading

Proposed Changes

Additional Info

dapplion left a comment

Choose a reason for hiding this comment

pawanjay176 commented Apr 23, 2024

macladson commented Apr 24, 2024

realbigsean commented Apr 24, 2024

mergify bot commented Apr 24, 2024 • edited Loading

🛑 The pull request has been removed from the queue default

realbigsean commented Apr 25, 2024

mergify bot commented Apr 25, 2024

✅ This pull request will be re-embarked automatically

mergify bot commented Apr 25, 2024 • edited Loading

🛑 The pull request has been removed from the queue default

realbigsean commented Apr 25, 2024

mergify bot commented Apr 25, 2024

✅ This pull request will be re-embarked automatically

mergify bot commented Apr 25, 2024 • edited Loading

✅ The pull request has been merged automatically

Rename `Merge` to `Bellatrix` #5601

Rename `Merge` to `Bellatrix` #5601

macladson commented Apr 18, 2024 •

edited

Loading

mergify bot commented Apr 24, 2024 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

mergify bot commented Apr 25, 2024 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

mergify bot commented Apr 25, 2024 •

edited

Loading