Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions Cargo.lock

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

9 changes: 1 addition & 8 deletions crates/block/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::{borrow::Cow, convert::Infallible, sync::Arc};

use alloy_consensus::{BlockHeader, Header};
use alloy_eips::Decodable2718;
use alloy_evm::Database;
use alloy_hardforks::EthereumHardforks;
use alloy_primitives::Bytes;
use alloy_rpc_types_eth::Withdrawals;
Expand All @@ -17,8 +16,7 @@ use reth::{
use reth_ethereum::EthPrimitives;
use reth_ethereum_forks::Hardforks;
use reth_evm::{
ConfigureEngineEvm, ConfigureEvm, EvmEnv, EvmEnvFor, EvmFactory, EvmFor, ExecutableTxIterator,
ExecutionCtxFor,
ConfigureEngineEvm, ConfigureEvm, EvmEnv, EvmEnvFor, ExecutableTxIterator, ExecutionCtxFor,
};
use reth_evm_ethereum::RethReceiptBuilder;
use reth_node_api::ExecutionPayload;
Expand Down Expand Up @@ -249,11 +247,6 @@ impl ConfigureEvm for TaikoEvmConfig {
})
}

/// Returns a new EVM with the given database configured with the given environment settings,
/// including the spec id and transaction environment.
fn evm_with_env<DB: Database>(&self, db: DB, evm_env: EvmEnvFor<Self>) -> EvmFor<Self, DB> {
self.evm_factory().create_evm(db, evm_env)
}
}

/// Context relevant for execution of a next block w.r.t Taiko.
Expand Down
5 changes: 2 additions & 3 deletions crates/evm/src/factory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ impl EvmFactory for TaikoEvmFactory {
.with_cfg(input.cfg_env)
.with_block(input.block_env)
.with_db(db)
.build_mainnet_with_inspector(NoOpInspector {})
.build_mainnet_with_inspector(inspector)
.with_precompiles(PrecompilesMap::from_static(Precompiles::new(
PrecompileSpecId::from_spec_id(spec_id.into()),
)))
.with_inspector(inspector);
)));

TaikoEvmWrapper::new(TaikoEvm::new(evm), true)
}
Expand Down
Loading
Loading