Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
863af48
fix(op-reth): handle partial trie pipeline sync
joshklop Sep 25, 2026
96cd8ec
rust: update reth to v2.6.0
joshklop Sep 25, 2026
d94a116
refactor(op-reth): remove non-memoized receipt root helper
joshklop Sep 28, 2026
af05d31
op-reth: encapsulate durable trie execution check
joshklop Sep 29, 2026
7f9f9d3
op-reth: limit historical proof RPC tasks
joshklop Sep 29, 2026
17bc1b9
op-reth: simplify historical proof RPC flow
joshklop Sep 29, 2026
e9b77e6
op-reth: bump consensus crate to v2.0.0
joshklop Sep 29, 2026
fdbd59b
op-reth: disable untested block access list RPC methods
joshklop Sep 29, 2026
9a9dce8
op-reth: hide unsupported block access list options
joshklop Sep 30, 2026
1f945c5
Revert "op-reth: hide unsupported block access list options"
joshklop Sep 30, 2026
814676c
op-reth: deny unsupported block access list options
joshklop Sep 30, 2026
12d73f7
op-reth: use renamed proofs storage in ExEx test
joshklop Oct 10, 2026
cfe5c8e
op-reth: decouple proofs execution from reth parent state
joshklop Oct 11, 2026
d2c6f84
op-reth: read proofs execution data from a reth in-memory snapshot
joshklop Oct 11, 2026
2987977
rust: pin reordered reth fork branch
joshklop Oct 11, 2026
ed0fc14
op-reth: retry proofs execution failures in the sync loop
joshklop Oct 11, 2026
f3c3289
op-reth: test that failed proofs execution reaches the sync loop
joshklop Oct 11, 2026
bf5fbbd
op-reth: halt the proofs ExEx when verification fails
joshklop Oct 11, 2026
5ea8578
op-reth: acknowledge only persisted proofs heights
joshklop Oct 11, 2026
559a88e
op-revm, alloy-op-evm: support revm's feature-gated asyncdb fields
joshklop Oct 11, 2026
ec7fc1e
op-reth: fix filtered flashblock log streams
joshklop Oct 11, 2026
88f4981
op-reth: fix proofs trie test build without metrics
joshklop Oct 11, 2026
c55fb76
op-reth: refuse proofs init over a lagging state trie
sebastianst Sep 30, 2026
82f1dda
op-reth: close remaining block access list paths
sebastianst Sep 30, 2026
c220dec
rust: pin reth fork with overlay storage-root, trie and forkchoice ba…
joshklop Oct 11, 2026
8f6f8b3
op-reth: refuse proofs init when the reth tip moves
joshklop Oct 11, 2026
16aa7fc
op-reth: document the add-ons BAL check as a CLI backstop
joshklop Oct 11, 2026
6ee0a8e
op-reth: version the op-reth crates together at 2.0.0
joshklop Oct 12, 2026
92a8543
op-reth: call upstream's receipts root and logs bloom comparison
joshklop Oct 12, 2026
c677eda
op-reth: check the proofs window before taking a proof permit
joshklop Oct 12, 2026
445b54d
op-reth: tag the proofs window check as an upstream mirror
joshklop Oct 12, 2026
bed3f4b
op-reth: keep reth state masking off
joshklop Oct 12, 2026
f914e61
op-reth: deny --db.balstore-cache-size on every subcommand
joshklop Oct 12, 2026
e04bd75
op-reth: define CanonicalInMemoryStateProvider in op-reth
joshklop Oct 12, 2026
73f7f1e
rust: repin reth fork without the OP-only chain-state commit
joshklop Oct 12, 2026
78ff384
op-reth: stop the proofs engine instead of retrying a failing block
joshklop Oct 13, 2026
3b9dd26
op-reth: correct the proofs window check comment
joshklop Oct 13, 2026
4dcdefc
op-reth: restore develop's proofs ExEx failure handling
joshklop Oct 13, 2026
93d9ec9
rust: pin reth fork with the backward overlay seek fix
joshklop Oct 13, 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
645 changes: 339 additions & 306 deletions rust/Cargo.lock

Large diffs are not rendered by default.

232 changes: 116 additions & 116 deletions rust/Cargo.toml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions rust/alloy-op-evm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ std = [
"thiserror/std",
]
gmp = ["alloy-evm/gmp"]
# Compile against revm's feature-gated async database fields; mainly a CI feature-unification check.
# Host targets only: revm's fiber stack does not build for wasm or MIPS.
asyncdb = ["std", "op-revm/asyncdb"]
metrics = ["std", "dep:metrics"]
engine = ["op-alloy/rpc-types-engine"]
rpc = ["alloy-evm/rpc", "op-alloy/rpc-types"]
Expand Down
5 changes: 3 additions & 2 deletions rust/alloy-op-evm/src/block/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -847,14 +847,15 @@ fn validate_block_gas(
Ok(())
}

/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::block::EthBlockExecutor`
/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::block::EthBlockExecutor`
///
/// Mirrors upstream's `BlockExecutor` impl, reusing its `EthTxResult` for the inner result
/// but reimplementing every method. Known divergences to re-confirm on each bump: upstream
/// tracks regular and state block gas separately and returns `GasOutput::with_state_gas`,
/// this tracks `gas_used`/`evm_gas_used` and returns `GasOutput::new`; upstream's admission
/// check clamps the transaction gas limit by `cfg.tx_gas_limit_cap`, `validate_block_gas`
/// does not.
/// does not. Upstream's Amsterdam state-gas capacity check is inapplicable until an OP fork maps
/// to Amsterdam semantics.
impl<E, R, Spec> BlockExecutor for OpBlockExecutor<E, R, Spec>
where
E: PostExecEvm<
Expand Down
4 changes: 2 additions & 2 deletions rust/alloy-op-evm/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub fn spec_by_timestamp_after_bedrock(chain_spec: impl OpHardforks, timestamp:
OpSpecId::BEDROCK
}

/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::env::EvmEnvInput`
/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::env::EvmEnvInput`
///
/// Omits upstream `excess_blob_gas` and `slot_number`; OP uses synthetic blob values and zero slot.
/// Internal helper for constructing EVM environment from block header fields.
Expand Down Expand Up @@ -120,7 +120,7 @@ pub fn evm_env_for_op_next_block(
)
}

/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::env::EvmEnv::for_eth`
/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::env::EvmEnv::for_eth`
///
/// Copies upstream environment construction with OP fork mapping and blob semantics. Upstream
/// sets `cfg_env.tx_gas_limit_cap` explicitly at Osaka; this leaves it unset and relies on revm's
Expand Down
76 changes: 41 additions & 35 deletions rust/alloy-op-evm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,27 +85,35 @@ pub struct OpEvm<DB: Database, I, P = OpPrecompiles, Tx = OpTx, R = post_exec::N
_tx: PhantomData<Tx>,
}

/// UPSTREAM-MIRROR(copy): revm-context@43.0.2 `revm_context::Evm::with_inspector`
///
/// Rebuilds `evm` with its inspector replaced by `f(inspector)`. Upstream `with_inspector` takes
/// the new inspector by value, so it cannot derive it from the old one.
///
/// revm's [`Evm`](revm::context::Evm) has feature-gated fields, so it must not be constructed or
/// destructured exhaustively here: Cargo feature unification can enable those fields without this
/// crate knowing. Construct through the upstream constructor instead, carrying over the frame
/// stack; every field not named below is reset to its default. In revm 43 the only such field is
/// `async_stack` (under `revm/asyncdb`), a lazily allocated fiber stack, so resetting it only drops
/// a cached allocation. On a revm bump, compare `Evm`'s fields against the ones carried over here.
fn map_inspector<CTX, INSP, OINSP, I, P, F: Default>(
evm: revm::context::Evm<CTX, INSP, I, P, F>,
f: impl FnOnce(INSP) -> OINSP,
) -> revm::context::Evm<CTX, OINSP, I, P, F> {
let revm::context::Evm { ctx, inspector, instruction, precompiles, frame_stack, .. } = evm;
let mut evm =
revm::context::Evm::new_with_inspector(ctx, f(inspector), instruction, precompiles);
evm.frame_stack = frame_stack;
evm
}

impl<DB: Database, I, P, Tx, R> OpEvm<DB, I, P, Tx, R> {
/// Consumes self and return the inner EVM instance.
pub fn into_inner(
self,
) -> op_revm::OpEvm<OpEvmContext<DB>, I, EthInstructions<EthInterpreter, OpEvmContext<DB>>, P>
{
let op_revm::OpEvm(revm::context::Evm {
ctx,
inspector,
instruction,
precompiles,
frame_stack,
}) = self.inner;

op_revm::OpEvm(revm::context::Evm {
ctx,
inspector: inspector.into_inner(),
instruction,
precompiles,
frame_stack,
})
op_revm::OpEvm(map_inspector(self.inner.0, |inspector| inspector.into_inner()))
}

/// Provides a reference to the EVM context.
Expand Down Expand Up @@ -134,25 +142,18 @@ impl<DB: Database, I, P, Tx, R> OpEvm<DB, I, P, Tx, R> {
inspect: bool,
refund_policy: R,
) -> Self {
let op_revm::OpEvm(revm::context::Evm {
ctx,
inspector,
instruction,
precompiles,
frame_stack,
}) = evm;
Self::from_inner(
op_revm::OpEvm(map_inspector(evm.0, |inspector| {
post_exec::PostExecCompositeInspector::new_with_post_exec(inspector, refund_policy)
})),
inspect,
)
}

/// Wraps an inner EVM whose inspector already carries the post-exec refund policy.
fn from_inner(inner: OpEvmInner<DB, I, P, R>, inspect: bool) -> Self {
Self {
inner: op_revm::OpEvm(revm::context::Evm {
ctx,
inspector: post_exec::PostExecCompositeInspector::new_with_post_exec(
inspector,
refund_policy,
),
instruction,
precompiles,
frame_stack,
}),
inner,
inspect,
post_exec_tracking_active: false,
last_tx_post_exec_result: Default::default(),
Expand Down Expand Up @@ -193,12 +194,17 @@ impl<DB: Database, I, Tx, R> OpEvm<DB, I, PrecompilesMap, Tx, R> {
.with_db(db)
.with_block(input.block_env)
.with_cfg(input.cfg_env)
.build_op_with_inspector(inspector)
// Wrap the inspector before building, rather than via `new_with_refund_policy`, so the
// EVM's frame stack is only allocated once.
.build_op_with_inspector(post_exec::PostExecCompositeInspector::new_with_post_exec(
inspector,
refund_policy,
))
.with_precompiles(PrecompilesMap::from_static(
OpPrecompiles::new_with_spec(spec_id).precompiles(),
));

Self::new_with_refund_policy(inner, inspect, refund_policy)
Self::from_inner(inner, inspect)
}
}

Expand Down Expand Up @@ -329,7 +335,7 @@ impl<DB: Database, I, P, Tx, R> DerefMut for OpEvm<DB, I, P, Tx, R> {
}
}

/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::EthEvm`
/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::EthEvm`
///
/// Mirrors upstream's `Evm` impl for `EthEvm`, adding the OP transaction wrapper, the post-exec
/// transaction short-circuit and the post-exec refund tracking. A method added to the `Evm`
Expand Down
2 changes: 1 addition & 1 deletion rust/alloy-op-evm/src/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ impl OpTxEnv for OpTx {
}
}

/// UPSTREAM-MIRROR(delegate): revm-context-interface@42.0.0 `revm_context_interface::Transaction`
/// UPSTREAM-MIRROR(delegate): revm-context-interface@43.0.1 `revm_context_interface::Transaction`
///
/// Forwards the required getters and `effective_gas_price` to the inner `OpTransaction<TxEnv>`,
/// which overrides `tx_type` and `effective_gas_price` for deposits. The remaining defaulted
Expand Down
3 changes: 2 additions & 1 deletion rust/alloy-op-hardforks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ impl OpHardfork {
*self as usize
}

/// UPSTREAM-MIRROR(set): alloy-hardforks@0.4.7 `alloy_hardforks::EthereumHardfork`
/// UPSTREAM-MIRROR(set): alloy-hardforks@0.4.8 `alloy_hardforks::EthereumHardfork`
///
/// A new upstream variant needs an explicit decision here. The `VARIANTS` loop below
/// only smoke-tests lookup; semantic mappings remain explicit assertions.
Expand Down Expand Up @@ -820,6 +820,7 @@ mod tests {
// L1 forks newer than the latest implied one are not activated by any OP fork.
assert_eq!(OpHardfork::activating_op_fork(EthereumHardfork::Bpo1), None);
assert_eq!(OpHardfork::activating_op_fork(EthereumHardfork::Amsterdam), None);
assert_eq!(OpHardfork::activating_op_fork(EthereumHardfork::Bogota), None);
}

#[test]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ where
true
}

/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::EthPrecompiles::run`
/// UPSTREAM-MIRROR(copy): revm-handler@43.0.2 `revm_handler::EthPrecompiles::run`
///
/// FPVM acceleration replaces dispatch, while output conversion delegates to revm. Re-check
/// input materialization, execution errors, and gas/reservoir propagation across both paths.
Expand Down
Loading
Loading