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

refactor: replace extra fields with ExecutionPayloadSidecar in engine #11901

Merged
merged 1 commit into from
Oct 23, 2024

Conversation

onbjerg
Copy link
Member

@onbjerg onbjerg commented Oct 19, 2024

Follow up on #11865

Replaces the hack to add execution requests throughout the engine + engine interceptor components with the new ExecutionPayloadSidecar introduced in alloy-rs/alloy#1517. The ExecutionPayloadSidecar replaces both Prague and Cancun fields.

This also finishes Prague integration in most of the engine interceptors, but does not adjust a lot of the testing code we have to support execution requests.

@onbjerg onbjerg added C-debt Refactor of code section that is hard to understand or maintain A-consensus Related to the consensus engine labels Oct 19, 2024
@onbjerg onbjerg force-pushed the onbjerg/exec-payload-sidecar branch from 38e3089 to 2cb12ef Compare October 19, 2024 23:39
@onbjerg onbjerg changed the title refactor: replace cancun + prague fields with ExecutionPayloadSidecar in engine refactor: replace extra fields with ExecutionPayloadSidecar in engine Oct 19, 2024
@onbjerg onbjerg added the S-blocked This cannot more forward until something else changes label Oct 19, 2024
@onbjerg
Copy link
Member Author

onbjerg commented Oct 19, 2024

This is blocked, ExecutionPayloadSidecar needs to be ser/de upstream because of one of our engine interceptors: alloy-rs/alloy#1535

@onbjerg onbjerg force-pushed the onbjerg/exec-payload-sidecar branch from 2cb12ef to ffb777a Compare October 20, 2024 15:17
@onbjerg onbjerg added S-blocked This cannot more forward until something else changes and removed S-blocked This cannot more forward until something else changes labels Oct 20, 2024
@onbjerg
Copy link
Member Author

onbjerg commented Oct 20, 2024

Blocked by Alloy release and alloy-rs/op-alloy#178

Edit: Not actually blocked

@onbjerg onbjerg force-pushed the onbjerg/exec-payload-sidecar branch 5 times, most recently from 5d289a7 to 8735ca1 Compare October 20, 2024 15:59
@onbjerg onbjerg marked this pull request as ready for review October 20, 2024 16:07
@onbjerg onbjerg added the E-prague Related to the prague network upgrade label Oct 23, 2024
@onbjerg onbjerg force-pushed the onbjerg/exec-payload-sidecar branch from 8735ca1 to dc9d048 Compare October 23, 2024 13:40
@onbjerg onbjerg removed the S-blocked This cannot more forward until something else changes label Oct 23, 2024
Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

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

lgtm, some cosmetic suggestions

Comment on lines +80 to +85
"reth-chainspec",
"reth-primitives/optimism",
"reth-provider/optimism",
"reth-blockchain-tree/optimism",
"reth-db/optimism",
"reth-db-api/optimism",
Copy link
Collaborator

Choose a reason for hiding this comment

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

absolutely losing it :D

Copy link
Member Author

Choose a reason for hiding this comment

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

just get talgo!

crates/engine/util/src/engine_store.rs Outdated Show resolved Hide resolved
@@ -439,11 +419,16 @@ where

Ok((
block_to_payload(reorg_block),
// todo(onbjerg): how do we support execution requests?
Copy link
Collaborator

Choose a reason for hiding this comment

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

meh, good question, lets track?

Copy link
Member Author

Choose a reason for hiding this comment

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

crates/payload/validator/src/lib.rs Outdated Show resolved Hide resolved
crates/rpc/rpc-types-compat/src/engine/payload.rs Outdated Show resolved Hide resolved
@onbjerg onbjerg force-pushed the onbjerg/exec-payload-sidecar branch 2 times, most recently from 4dfe699 to cae526e Compare October 23, 2024 14:25
@onbjerg onbjerg force-pushed the onbjerg/exec-payload-sidecar branch from cae526e to 7c9f2f3 Compare October 23, 2024 14:30
@onbjerg onbjerg enabled auto-merge October 23, 2024 14:33
@onbjerg onbjerg added this pull request to the merge queue Oct 23, 2024
Merged via the queue into main with commit 89eb73f Oct 23, 2024
39 checks passed
@onbjerg onbjerg deleted the onbjerg/exec-payload-sidecar branch October 23, 2024 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-consensus Related to the consensus engine C-debt Refactor of code section that is hard to understand or maintain E-prague Related to the prague network upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants