Skip to content

chore!: Populate the headers field in the ExecutionWitness when calling debug_executionWitness #15608

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

Merged
merged 16 commits into from
Apr 11, 2025
Merged

chore!: Populate the headers field in the ExecutionWitness when calling debug_executionWitness #15608

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
180228e
Add block ids into execution_witness record
kevaundray Apr 8, 2025
55d172e
update builder in optimism
kevaundray Apr 8, 2025
db2a0d8
modify RPC, but don't break the API
kevaundray Apr 8, 2025
5296fa9
Update crates/rpc/rpc/src/debug.rs
kevaundray Apr 8, 2025
703413c
clippy
kevaundray Apr 8, 2025
b99184c
cargo fmt
kevaundray Apr 8, 2025
2c040d5
commit early -- (laptop freezing)
kevaundray Apr 9, 2025
5cda999
use lowest instead of earliest to be consistent
kevaundray Apr 9, 2025
6cd5009
use saturating_sub
kevaundray Apr 9, 2025
0cea189
clippy
kevaundray Apr 9, 2025
ee9f6be
patch alloy
kevaundray Apr 9, 2025
3b3bc58
update code to use Headers
kevaundray Apr 9, 2025
b143ed1
comment back out patch
kevaundray Apr 9, 2025
84704cc
Merge branch 'main' into kw/exec-witness-blockhashes
mattsse Apr 11, 2025
ee8971c
fmt
mattsse Apr 11, 2025
3129446
bump crossbeam
mattsse Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 32 additions & 61 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 29 additions & 29 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,35 +688,35 @@ visibility = "0.1.1"
walkdir = "2.3.3"
vergen-git2 = "1.0.5"

# [patch.crates-io]
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
[patch.crates-io]
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Using a patch of alloy: commit comes from the main branch here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

reverted this patch, now waiting for #15635 to merge

alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "997e211" }
#
# op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
# op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "ad607c1" }
Expand Down
7 changes: 6 additions & 1 deletion crates/engine/invalid-block-hooks/src/witness.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,12 @@ where
let state = state_provider.witness(Default::default(), hashed_state.clone())?;

// Write the witness to the output directory.
let response = ExecutionWitness { state, codes: Default::default(), keys: state_preimages };
let response = ExecutionWitness {
state,
codes: Default::default(),
keys: state_preimages,
headers: Vec::new(),
Copy link
Collaborator

@mattsse mattsse Apr 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

fyi @yash-atreya to keep the alloy bump pr simple, we can simply ini this with default and then send this pr as followup right away

};
let re_executed_witness_path = self.save_file(
format!("{}_{}.witness.re_executed.json", block.number(), block.hash()),
&response,
Expand Down
Loading
Loading