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

update electra specs to v1.5.0-alpha.6 #163

Merged
merged 12 commits into from
Sep 25, 2024

Conversation

pk910
Copy link
Contributor

@pk910 pk910 commented Sep 21, 2024

Updates electra types for latest v1.5.0-alpha.6 spec release:

  • Reverted electra.ExecutionPayload & electra.ExecutionPayloadHeader
  • Created new electra.ExecutionRequests type & added to electra.BeaconBlockBody
  • merged latest master branch to fix unrelated linter errors

@pk910 pk910 marked this pull request as ready for review September 23, 2024 17:28
@MariusVanDerWijden
Copy link

Don't you need the RequestHash in the ExecutionPayloadHeader?

@pk910
Copy link
Contributor Author

pk910 commented Sep 25, 2024

All changes to the ExecutionPayloadHeader have been reverted, it's no longer in the list of modified containers:
https://github.com/ethereum/consensus-specs/blob/dev/specs/electra/beacon-chain.md#modified-containers

so I guess, no? :D

@mcdee
Copy link
Contributor

mcdee commented Sep 25, 2024

@pk910 when this is ready please tag me as a reviewer and I'll merge it. Thanks.

@pk910
Copy link
Contributor Author

pk910 commented Sep 25, 2024

Oh yea, it's ready @mcdee :)
I unfortunately can't assign a reviewer ;)

However, I haven't been able to test it yet as there is no client ready for alpha.6

Copy link
Contributor

@jtraglia jtraglia left a comment

Choose a reason for hiding this comment

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

LGTM! A couple questions & one suggestion.

if int(d) >= len(ForkChoiceNodeValidityStrings) {
if uint64(d) >= uint64(len(ForkChoiceNodeValidityStrings)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the rationale for this change? I see this in a few other spots too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change is coming from master (50179b8).
I've merged in master due to unrelated linter issues that were already fixed in master.
sorry for the messed up diff.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah okay, that makes sense. No worries!

Comment on lines -124 to +125
intVal, err := strconv.ParseUint(v, 10, 64)
if err == nil && intVal != 0 {
intVal, err := strconv.ParseInt(v, 10, 64)
if err == nil && intVal >= 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

This allows a zero value now. Is that intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above. coming from master (50179b8).

spec/electra/generate.go Outdated Show resolved Hide resolved
@jtraglia
Copy link
Contributor

@pk910, I've made a similar PR for go-builder-client which MEV software needs:

I noticed this when integrating your branch (this PR) into flashbots/go-boost-utils:

image

@pk910
Copy link
Contributor Author

pk910 commented Sep 25, 2024

@pk910, I've made a similar PR for go-builder-client which MEV software needs:

I noticed this when integrating your branch (this PR) into flashbots/go-boost-utils:

image

Yea, this looks right. The electra.ExecutionPayloadHeader & electra.ExecutionPayloadtypes have been removed as these are unchanged compared to deneb.
So the downstream projects should use deneb.ExecutionPayloadHeader & deneb.ExecutionPayload instead.
The error seems to be coming from the go-builder-client which is still referring to these types?

@jtraglia
Copy link
Contributor

Oh sorry for the confusion, I saw the errors, then realized that go-builder-client needed to be updated too.

Everything is sorted out now!

@mcdee mcdee merged commit 393fff1 into attestantio:electra Sep 25, 2024
3 checks passed
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.

4 participants