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

Electra updates for v1.5.0-alpha.6 #6445

Merged
merged 21 commits into from
Oct 15, 2024
Merged

Conversation

pawanjay176
Copy link
Member

@pawanjay176 pawanjay176 commented Sep 28, 2024

Issue Addressed

N/A

Proposed Changes

  1. EIP-7251: Update correlation penalty computation ethereum/consensus-specs#3882 . I modified the existing process_single_slashing function instead of creating a new function for electra as I think both the pre-electra and electra functions have the same logic. I'm not completely sure if we need to make a separate >= Electra function and keep the pre-electra logic as is.
    Edit: Confirmed that we need different behaviour for pre and post electra. Modified in
    65bac11
  2. Remove unnecessary signing domain for consolidations ethereum/consensus-specs#3915 : just remove unused Consolidations domain
  3. Rename get_validator_max_effective_balance simplify name of helper get_validator_max_effective_balance ethereum/consensus-specs#3909
  4. Move execution_requests to beacon block body Moving requests out of execution_payload into beacon_block.body ethereum/consensus-specs#3875

Remaining spec updates for electra are cosmetic

Blocked on #6435 for EF tests to pass. Merged #6435 into this PR to get the tests passing.

@pawanjay176 pawanjay176 added electra Required for the Electra/Prague fork electra-v1.5.0-alpha.6 electra spec update labels Oct 1, 2024
@pawanjay176 pawanjay176 added ready-for-review The code is ready for review and removed blocked labels Oct 10, 2024
Copy link
Member

@ethDreamer ethDreamer left a comment

Choose a reason for hiding this comment

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

Looks good! Almost done reviewing, just gotta do the single pass changes.

Copy link
Member

@ethDreamer ethDreamer left a comment

Choose a reason for hiding this comment

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

lgtm!

Copy link
Member

@michaelsproul michaelsproul left a comment

Choose a reason for hiding this comment

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

LGTM!

Just a few minor comments

beacon_node/execution_layer/src/lib.rs Outdated Show resolved Hide resolved
beacon_node/execution_layer/src/test_utils/handle_rpc.rs Outdated Show resolved Hide resolved
ethDreamer and others added 3 commits October 15, 2024 11:15
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
@ethDreamer
Copy link
Member

@Mergifyio queue

Copy link

mergify bot commented Oct 15, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 83d5c52

mergify bot added a commit that referenced this pull request Oct 15, 2024
@mergify mergify bot merged commit 83d5c52 into sigp:unstable Oct 15, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
electra Required for the Electra/Prague fork electra-v1.5.0-alpha.6 electra spec update ready-for-review The code is ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants