diff --git a/Cargo.lock b/Cargo.lock index 7f4dce068..987c4ad46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7009,7 +7009,7 @@ version = "0.2.0-beta.7" dependencies = [ "reth-consensus-common", "reth-evm", - "reth-interfaces", + "reth-execution-errors", "reth-optimism-consensus", "reth-primitives", "reth-provider", diff --git a/crates/optimism/evm/Cargo.toml b/crates/optimism/evm/Cargo.toml index f9008dc37..0423f1bd7 100644 --- a/crates/optimism/evm/Cargo.toml +++ b/crates/optimism/evm/Cargo.toml @@ -15,7 +15,7 @@ workspace = true reth-evm.workspace = true reth-primitives.workspace = true reth-revm.workspace = true -reth-interfaces.workspace = true +reth-execution-errors.workspace = true reth-provider.workspace = true reth-consensus-common.workspace = true diff --git a/crates/optimism/evm/src/l1.rs b/crates/optimism/evm/src/l1.rs index 66093e857..82fbb06e9 100644 --- a/crates/optimism/evm/src/l1.rs +++ b/crates/optimism/evm/src/l1.rs @@ -1,7 +1,7 @@ //! Optimism-specific implementation and utilities for the executor use crate::OptimismBlockExecutionError; -use reth_interfaces::{executor::BlockExecutionError, RethError}; +use reth_execution_errors::BlockExecutionError; use reth_primitives::{address, b256, hex, Address, Block, Bytes, ChainSpec, Hardfork, B256, U256}; use revm::{ primitives::{Bytecode, HashMap, SpecId}, @@ -232,7 +232,7 @@ pub fn ensure_create2_deployer( chain_spec: Arc, timestamp: u64, db: &mut revm::State, -) -> Result<(), RethError> +) -> Result<(), DB::Error> where DB: revm::Database, { @@ -246,9 +246,7 @@ where trace!(target: "evm", "Forcing create2 deployer contract deployment on Canyon transition"); // Load the create2 deployer account from the cache. - let acc = db - .load_cache_account(CREATE_2_DEPLOYER_ADDR) - .map_err(|_| RethError::Custom("Failed to load account".to_string()))?; + let acc = db.load_cache_account(CREATE_2_DEPLOYER_ADDR)?; // Update the account info with the create2 deployer codehash and bytecode. let mut acc_info = acc.account_info().unwrap_or_default();