jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace reth-interface usage (#8394)

Browse Source
This commit is contained in:
Matthias Seitz
2024-05-25 13:34:28 +02:00
committed by GitHub
parent 7dd787707c
commit df83befcff
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -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",

2
crates/optimism/evm/Cargo.toml
View File

@ -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

8
crates/optimism/evm/src/l1.rs
View File

@ -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<DB>(
chain_spec: Arc<ChainSpec>,
timestamp: u64,
db: &mut revm::State<DB>,
) -> 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();