eth/catalyst: fix engine API #28135
Merged
eth/catalyst: fix engine API #28135
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rjl493456442
commented
Sep 17, 2023
| return fmt.Errorf("invalid parent beacon block root: %w", err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func checkAttribute(active func(*big.Int, uint64) bool, exists bool, time uint64) error { | ||
| if active(common.Big0, time) && !exists { | ||
| func checkAttribute(active func(*big.Int, uint64) bool, exists bool, block *big.Int, time uint64) error { |
There was a problem hiding this comment.
The london block is used to align with line https://github.com/ethereum/go-ethereum/pull/28135/files#diff-96840e4882901b94cef9f51a992a44e64df659335ff13dd011be8c1ffa097135R179
Although I don't think london block is correct here. The block number to generate is the one should pass, IIUC.
There was a problem hiding this comment.
The original code passed the weird london block because in merge mode we know that we already passed london. So instead of complicating everything with passing a block number, it was a hacky way to hard code "always london".
phenix3443
pushed a commit
to phenix3443/go-ethereum
that referenced
this pull request
Sep 19, 2023
0x366
pushed a commit
to Dexcelerate/go-ethereum
that referenced
this pull request
Nov 8, 2023
devopsbo3
pushed a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
devopsbo3
added a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
This reverts commit 15b7c0b.
devopsbo3
added a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
This reverts commit 15b7c0b.
devopsbo3
added a commit
to HorizenOfficial/go-ethereum
that referenced
this pull request
Nov 10, 2023
This reverts commit 15b7c0b.
sduchesneau
pushed a commit
to streamingfast/go-ethereum
that referenced
this pull request
Feb 26, 2024
eth/catalyst: fix engine API (ethereum#28135) Conflicts: eth/catalyst/api.go Conflicts due to us adding arbosversion to checkAttribute. Accepted both. Test fails: metrics/influxdb tests fail here, but they also fail on the merged upstream commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #28134