Skip to content

refactor: migrate engine validation to reth main hooks #140

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
panos-xyz merged 5 commits into from
Jul 16, 2026
Merged

refactor: migrate engine validation to reth main hooks #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7f8920
refactor: migrate engine validation to reth main hooks
panos-xyz Jul 13, 2026
204c2ce
fix(node): clear withdraw expectation on L1 index pre-check failure
panos-xyz Jul 14, 2026
b33856f
chore: fix rustfmt and bump crossbeam-epoch for RUSTSEC-2026-0204
panos-xyz Jul 14, 2026
f1c0cac
chore(deps): upgrade reth to v2.4.0
panos-xyz Jul 16, 2026
8e3b97e
fix(node): clear withdraw expectation on block validation failure
panos-xyz Jul 16, 2026
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
1,648 changes: 827 additions & 821 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

170 changes: 84 additions & 86 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace.package]
version = "1.0.0"
edition = "2024"
rust-version = "1.93"
rust-version = "1.95"
license = "MIT OR Apache-2.0"
publish = false

Expand All @@ -13,7 +13,6 @@ members = [
"crates/chainspec",
"crates/consensus",
"crates/engine-api",
"crates/engine-tree-ext",
"crates/evm",
"crates/node",
"crates/rpc",
Expand Down Expand Up @@ -90,7 +89,6 @@ codegen-units = 1
morph-chainspec = { path = "crates/chainspec", default-features = false }
morph-consensus = { path = "crates/consensus", default-features = false }
morph-engine-api = { path = "crates/engine-api", default-features = false }
morph-engine-tree-ext = { path = "crates/engine-tree-ext", default-features = false }
morph-evm = { path = "crates/evm", default-features = false }
morph-node = { path = "crates/node"}
morph-payload-builder = { path = "crates/payload/builder", default-features = false }
Expand All @@ -101,98 +99,98 @@ morph-rpc = { path = "crates/rpc" }
morph-revm = { path = "crates/revm", default-features = false }
morph-txpool = { path = "crates/txpool", default-features = false }

reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-codecs = { version = "0.3.1", default-features = false }
reth-codecs-derive = "0.3.1"
reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-exex-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0", default-features = false }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-primitives-traits = { version = "0.3.1", default-features = false }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-zstd-compressors = { version = "0.3.1", default-features = false }
reth-execution-cache = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0" }
reth-trie-sparse = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0", default-features = false }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-codecs = { version = "0.5.0", default-features = false }
reth-codecs-derive = "0.5.0"
reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-exex-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0", default-features = false }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-primitives-traits = { version = "0.5.0", default-features = false }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-zstd-compressors = { version = "0.5.0", default-features = false }
reth-execution-cache = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0" }
reth-trie-sparse = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0", default-features = false }

reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.2.0", features = [
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.4.0", features = [
"std",
"optional-checks",
] }
revm = { version = "38.0.0", features = [
revm = { version = "41.0.0", features = [
"optional_fee_charge",
"optional_eip7623",
], default-features = false }

alloy = { version = "2.0.4", default-features = false }
alloy-consensus = { version = "2.0.4", default-features = false }
alloy-contract = { version = "2.0.4", default-features = false }
alloy-eip7928 = { version = "0.3.4", default-features = false }
alloy-eips = { version = "2.0.4", default-features = false }
alloy-evm = { version = "0.34.0", default-features = false }
alloy-genesis = "2.0.4"
alloy = { version = "2.1.1", default-features = false }
alloy-consensus = { version = "2.1.1", default-features = false }
alloy-contract = { version = "2.1.1", default-features = false }
alloy-eip7928 = { version = "0.4.5", default-features = false }
alloy-eips = { version = "2.1.1", default-features = false }
alloy-evm = { version = "0.37.0", default-features = false }
alloy-genesis = "2.1.1"
alloy-hardforks = "0.4.7"
alloy-network = { version = "2.0.4", default-features = false }
alloy-primitives = { version = "1.5.6", default-features = false }
alloy-provider = { version = "2.0.4", default-features = false }
alloy-rlp = "0.3.13"
alloy-trie = "0.9.5"
alloy-rpc-types-engine = "2.0.4"
alloy-rpc-types-eth = { version = "2.0.4" }
alloy-serde = "2.0.4"
alloy-signer = "2.0.4"
alloy-signer-local = "2.0.4"
alloy-sol-types = { version = "1.5.6", default-features = false }
alloy-transport = "2.0.4"
alloy-network = { version = "2.1.1", default-features = false }
alloy-primitives = { version = "1.6.0", default-features = false }
alloy-provider = { version = "2.1.1", default-features = false }
alloy-rlp = "0.3.16"
alloy-trie = "0.9.4"
alloy-rpc-types-engine = "2.1.1"
alloy-rpc-types-eth = { version = "2.1.1" }
alloy-serde = "2.1.1"
alloy-signer = "2.1.1"
alloy-signer-local = "2.1.1"
alloy-sol-types = { version = "1.6.0", default-features = false }
alloy-transport = "2.1.1"
alloy-chains = { version = "0.2.33", default-features = false }
crossbeam-channel = "0.5.13"
revm-primitives = { version = "23.0.0", default-features = false }
revm-statetest-types = { version = "17.0.1", default-features = false }
revm-primitives = { version = "41.0.0", default-features = false }
revm-statetest-types = { version = "41.0.0", default-features = false }
arbitrary = { version = "1.3", features = ["derive"] }
async-lock = "3.4.1"
async-trait = "0.1"
Expand Down Expand Up @@ -234,8 +232,8 @@ tokio-stream = "0.1.17"
tokio-util = "0.7.16"
tracing = "0.1.41"
tracing-subscriber = "0.3.22"
vergen = "9.1.0"
vergen-git2 = "9.1.0"
vergen = "10.0.1"
vergen-git2 = "10.0.1"
criterion = "0.7.0"
test-case = "3"
pyroscope = "0.5.8"
Expand Down
11 changes: 5 additions & 6 deletions crates/chainspec/src/hardfork.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ mod tests {

let params = GasParams::new_spec(spec);
assert_eq!(
params.tx_eip7702_per_auth_state_gas(),
params.tx_eip7702_state_gas(),
0,
"MorphHardfork {fork:?} must not enable EIP-8037 state gas"
);
Expand All @@ -245,15 +245,14 @@ mod tests {
fn test_eip7702_refund_stays_regular_for_morph_specs() {
for spec in [SpecId::CANCUN, SpecId::PRAGUE, SpecId::OSAKA] {
let params = GasParams::new_spec(spec);
let total_refund = 25_000;
let (state_refund, regular_refund) = params.split_eip7702_refund(total_refund);

assert_eq!(
state_refund, 0,
params.tx_eip7702_state_refund(2, 2),
0,
"spec={spec:?}: Morph must not route EIP-7702 refunds to state gas"
);
assert_eq!(
regular_refund, total_refund,
params.tx_eip7702_auth_refund_regular(),
params.tx_eip7702_auth_refund(),
"spec={spec:?}: Morph EIP-7702 refunds must remain subject to the regular refund cap"
);
}
Expand Down
5 changes: 3 additions & 2 deletions crates/consensus/src/validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const GAS_LIMIT_BOUND_DIVISOR: u64 = 1024;
/// start, have sequential queue indices, and are consistent with `header.next_l1_msg_index`.
/// 2. **Cross-block monotonicity** (`validate_header_against_parent`): `header.next_l1_msg_index`
/// is monotonically non-decreasing relative to the parent.
/// 3. **Parent-aware exactness** (`MorphBasicEngineValidator`): once the engine tree has
/// 3. **Parent-aware exactness** (`MorphTreeEngineValidator`): once the engine tree has
/// both parent header and block body, Jade blocks must exactly match the value derived
/// from `parent.next_l1_msg_index` and the block's leading L1 messages.
///
Expand Down Expand Up @@ -356,6 +356,7 @@ impl FullConsensus<morph_primitives::MorphPrimitives> for MorphConsensus {
block: &RecoveredBlock<Block>,
result: &BlockExecutionResult<MorphReceipt>,
receipt_root_bloom: Option<ReceiptRootBloom>,
_block_access_list_hash: Option<B256>,
) -> Result<(), ConsensusError> {
// Verify the block gas used
let cumulative_gas_used = result
Expand Down Expand Up @@ -2070,7 +2071,7 @@ mod tests {
let recovered =
reth_primitives_traits::RecoveredBlock::new_unhashed(block, vec![Address::ZERO]);

let post_result = consensus.validate_block_post_execution(&recovered, &result, None);
let post_result = consensus.validate_block_post_execution(&recovered, &result, None, None);
assert!(matches!(
post_result,
Err(ConsensusError::BlockGasUsed { .. })
Expand Down
3 changes: 2 additions & 1 deletion crates/engine-api/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ impl<Provider> RealMorphL2EngineApi<Provider> {
parent_beacon_block_root: None,
// Morph L2 has no PoS slot semantics; introduced in alloy 2.0.
slot_number: None,
target_gas_limit: None,
},
transactions: Some(params.transactions),
gas_limit: gas_limit_override,
Expand All @@ -737,7 +738,7 @@ impl<Provider> RealMorphL2EngineApi<Provider> {
attributes: rpc_attributes,
parent_hash,
cache: None,
trie_handle: None,
state_root_handle: None,
};
let _ = self
.payload_builder
Expand Down
80 changes: 0 additions & 80 deletions crates/engine-tree-ext/Cargo.toml
View file
Open in desktop

This file was deleted.

Loading