Skip to content

Make modified helpers in electra fork aware#5698

Merged
mergify[bot] merged 3 commits intosigp:unstablefrom
pawanjay176:fix-electra-helpers
May 3, 2024
Merged

Make modified helpers in electra fork aware#5698
mergify[bot] merged 3 commits intosigp:unstablefrom
pawanjay176:fix-electra-helpers

Conversation

@pawanjay176
Copy link
Member

Issue Addressed

N/A

Proposed Changes

In #5653 , we modified a bunch of functions for electra without making them fork aware.
This PR aims to make the functions that the spec marks as "Modified in electra" fork aware.

Additional info

I intend to create pre and post electra versions for existing functions that are modified in the electra spec even if the logic doesn't change to make sure we don't shoot ourself in the foot in cases like these in the future.

@pawanjay176 pawanjay176 added the work-in-progress PR is a work-in-progress label May 3, 2024
@pawanjay176 pawanjay176 added ready-for-review The code is ready for review electra Required for the Electra/Prague fork v5.2.0 Q2 2024 and removed work-in-progress PR is a work-in-progress labels May 3, 2024
michaelsproul added a commit that referenced this pull request May 3, 2024
Squashed commit of the following:

commit 64440c4
Author: Pawan Dhananjay <[email protected]>
Date:   Thu May 2 17:42:15 2024 -0700

    Make more functions fork aware

commit 40397fb
Author: Pawan Dhananjay <[email protected]>
Date:   Thu May 2 17:14:41 2024 -0700

    Make modified helpers in electra fork aware
@michaelsproul michaelsproul mentioned this pull request May 3, 2024
@jimmygchen jimmygchen added the consensus An issue/PR that touches consensus code, such as state_processing or block verification. label May 3, 2024
Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

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

LGTM. Confirmed that existing pre-electra logic unchanged.

@jimmygchen jimmygchen added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels May 3, 2024
@jimmygchen
Copy link
Member

@mergify queue

@mergify
Copy link

mergify bot commented May 3, 2024

queue

✅ The pull request has been merged automatically

Details

The pull request has been merged automatically at 1af3f0f

mergify bot added a commit that referenced this pull request May 3, 2024
@mergify mergify bot merged commit 1af3f0f into sigp:unstable May 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

consensus An issue/PR that touches consensus code, such as state_processing or block verification. electra Required for the Electra/Prague fork ready-for-merge This PR is ready to merge. v5.2.0 Q2 2024

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants