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.

Sign up for GitHub

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

Jump to bottom

fix: align BeaconBlockBody and BlindedBeaconBlockBody #6782

Merged
merged 2 commits into from
May 16, 2024
Merged

fix: align BeaconBlockBody and BlindedBeaconBlockBody #6782

merged 2 commits into from
May 16, 2024

Conversation

wemeetagain
Copy link
Member

Motivation

  • eip-7688 uncovered an inconsistency between our electra BeaconBlockBody and BlindedBeaconBlockBody definitions

Description

  • align BeaconBlockBody and BlindedBeaconBlockBody
  • add unit test that enforces equal # of fields between known blinded/unblinded variant types

@wemeetagain wemeetagain requested a review from a team as a code owner May 15, 2024 08:36
nflaig
nflaig approved these changes May 16, 2024
View reviewed changes
Copy link
Member

@nflaig nflaig left a comment

Choose a reason for hiding this comment

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

LGTM, I removed the type hacks in tests and fixed the assertion to use toBeWithMessage

@wemeetagain wemeetagain merged commit 44d9599 into electra-fork May 16, 2024
13 of 17 checks passed
@wemeetagain wemeetagain deleted the cayman/align-blinded-beaon-block-body branch May 16, 2024 12:12
g11tech pushed a commit that referenced this pull request May 24, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
117568c 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit to g11tech/lodestar that referenced this pull request Jun 19, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (ChainSafe#6782)
e78ee55 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Jun 25, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
59a9879 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Jun 25, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
274f629 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Jul 1, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
f49b58d 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Jul 30, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
17b1593 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Jul 31, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
834cdf8 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Aug 2, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
32e51c0 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Aug 9, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
5cf7215 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Aug 9, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
81a1b56 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Aug 23, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
0131288 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
g11tech pushed a commit that referenced this pull request Aug 27, 2024
@wemeetagain @nflaig @g11tech
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
296ce19 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
philknows pushed a commit that referenced this pull request Sep 3, 2024
@wemeetagain @nflaig @philknows
fix: align BeaconBlockBody and BlindedBeaconBlockBody (#6782)
55810e7 
* fix: align BeaconBlockBody and BlindedBeaconBlockBody

* Remove type hacks in test

---------

Co-authored-by: Nico Flaig <[email protected]>
@wemeetagain
Copy link
Member Author

🎉 This PR is included in v1.22.0 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeluard jeluard jeluard left review comments

@nflaig nflaig nflaig approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wemeetagain @jeluard @nflaig