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: Move consolidations from beacon block body to execution payload #14152

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

prestonvanloon
Copy link
Member

What type of PR is this?

Feature

What does this PR do? Why is it needed?

ethereum/consensus-specs#3775

Which issues(s) does this PR fix?

Other notes for review

  • Deletes old process_consolidation logic (To be replaced in another PR)
  • Deletes obsolete types and removes all uses
    • SignedConsolidation
    • Consolidation
  • Skips spectests which will now fail by these type changes.
    • t.Skip("Failing until spectests are updated to v1.5.0-alpha.3")

@@ -1243,7 +1252,6 @@ type executionPayloadHeaderElectra struct {
}

var _ interfaces.ExecutionData = &executionPayloadElectra{}
var _ interfaces.ExecutionDataElectra = &executionPayloadElectra{}
Copy link
Contributor

@james-prysm james-prysm Jun 26, 2024

Choose a reason for hiding this comment

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

we don't need this anymore?
I think this check would still be nice for the ConsolidationRequests function below

Copy link
Contributor

Choose a reason for hiding this comment

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

also never mind I found it described up above now

// source_index=consolidation.source_index,
// target_index=consolidation.target_index
// ))
func ProcessConsolidations(ctx context.Context, st state.BeaconState, cs []*ethpb.SignedConsolidation) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess this will be replaced in the electra operations where the TODO is

Copy link
Contributor

@james-prysm james-prysm left a comment

Choose a reason for hiding this comment

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

had 2 comments initially but answered myself with further review, lgtm

Copy link
Member

@terencechain terencechain left a comment

Choose a reason for hiding this comment

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

lgtm

@prestonvanloon prestonvanloon added this pull request to the merge queue Jun 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jun 27, 2024
@prestonvanloon prestonvanloon added this pull request to the merge queue Jun 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 27, 2024
@prestonvanloon prestonvanloon added this pull request to the merge queue Jun 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jun 27, 2024
@prestonvanloon prestonvanloon added this pull request to the merge queue Jun 27, 2024
Merged via the queue into develop with commit 7898e65 Jun 27, 2024
16 of 17 checks passed
@prestonvanloon prestonvanloon deleted the electra-type-changes-eip-7251 branch June 27, 2024 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants