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: remove DefaultExternalContext AT (#13797)

Browse Source
This commit is contained in:
Arsenii Kulikov
2025-01-15 02:40:22 +04:00
committed by GitHub
parent d318aa3c85
commit 46f4d73c4d
6 changed files with 27 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/evm/src/builder.rs
View File

@ -11,7 +11,7 @@ use revm_primitives::EnvWithHandlerCfg;
/// This is useful for creating an EVM with a custom database and environment without having to
/// necessarily rely on Revm inspector.
#[derive(Debug)]
pub struct RethEvmBuilder<DB: Database, EXT = ()> {
pub struct RethEvmBuilder<DB, EXT = ()> {
/// The database to use for the EVM.
db: DB,
/// The environment to use for the EVM.
@ -20,15 +20,17 @@ pub struct RethEvmBuilder<DB: Database, EXT = ()> {
external_context: EXT,
}
impl<DB> RethEvmBuilder<DB> {
/// Create a new EVM builder with the given database.
pub const fn new(db: DB) -> Self {
Self { db, env: None, external_context: () }
}
}
impl<DB, EXT> RethEvmBuilder<DB, EXT>
where
DB: Database,
{
/// Create a new EVM builder with the given database.
pub const fn new(db: DB, external_context: EXT) -> Self {
Self { db, env: None, external_context }
}
/// Set the environment for the EVM.
pub fn with_env(mut self, env: Box<EnvWithHandlerCfg>) -> Self {
self.env = Some(env);
@ -79,22 +81,16 @@ pub trait ConfigureEvmBuilder {
/// Trait for configuring the EVM for executing full blocks.
pub trait EvmFactory {
/// Associated type for the default external context that should be configured for the EVM.
type DefaultExternalContext<'a>;
/// Provides the default external context.
fn default_external_context<'a>(&self) -> Self::DefaultExternalContext<'a>;
/// Returns new EVM with the given database
///
/// This does not automatically configure the EVM with [`crate::ConfigureEvmEnv`] methods. It is
/// up to the caller to call an appropriate method to fill the transaction and block
/// environment before executing any transactions using the provided EVM.
fn evm<DB: Database>(self, db: DB) -> Evm<'static, Self::DefaultExternalContext<'static>, DB>
fn evm<DB: Database>(self, db: DB) -> Evm<'static, (), DB>
where
Self: Sized,
{
RethEvmBuilder::new(db, self.default_external_context()).build()
RethEvmBuilder::new(db).build()
}
/// Returns a new EVM with the given database configured with the given environment settings,
@ -105,8 +101,8 @@ pub trait EvmFactory {
&self,
db: DB,
env: EnvWithHandlerCfg,
) -> Evm<'a, Self::DefaultExternalContext<'a>, DB> {
RethEvmBuilder::new(db, self.default_external_context()).with_env(env.into()).build()
) -> Evm<'a, (), DB> {
RethEvmBuilder::new(db).with_env(env.into()).build()
}
/// Returns a new EVM with the given database configured with the given environment settings,
@ -125,9 +121,7 @@ pub trait EvmFactory {
DB: Database,
I: GetInspector<DB>,
{
RethEvmBuilder::new(db, self.default_external_context())
.with_env(env.into())
.build_with_inspector(inspector)
RethEvmBuilder::new(db).with_env(env.into()).build_with_inspector(inspector)
}
/// Returns a new EVM with the given inspector.
@ -140,14 +134,8 @@ pub trait EvmFactory {
DB: Database,
I: GetInspector<DB>,
{
RethEvmBuilder::new(db, self.default_external_context()).build_with_inspector(inspector)
RethEvmBuilder::new(db).build_with_inspector(inspector)
}
}
impl<DB: Database, EXT: Clone> EvmFactory for RethEvmBuilder<DB, EXT> {
type DefaultExternalContext<'a> = EXT;
fn default_external_context<'a>(&self) -> Self::DefaultExternalContext<'a> {
self.external_context.clone()
}
}
impl<DB: Database, EXT: Clone> EvmFactory for RethEvmBuilder<DB, EXT> {}

44
crates/evm/src/lib.rs
View File

@ -43,27 +43,20 @@ pub mod test_utils;
/// Trait for configuring the EVM for executing full blocks.
pub trait ConfigureEvm: ConfigureEvmEnv {
/// Associated type for the default external context that should be configured for the EVM.
type DefaultExternalContext<'a>;
/// Returns new EVM with the given database
///
/// This does not automatically configure the EVM with [`ConfigureEvmEnv`] methods. It is up to
/// the caller to call an appropriate method to fill the transaction and block environment
/// before executing any transactions using the provided EVM.
fn evm<DB: Database>(&self, db: DB) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> {
RethEvmBuilder::new(db, self.default_external_context()).build()
fn evm<DB: Database>(&self, db: DB) -> Evm<'_, (), DB> {
RethEvmBuilder::new(db).build()
}
/// Returns a new EVM with the given database configured with the given environment settings,
/// including the spec id.
///
/// This will preserve any handler modifications
fn evm_with_env<DB: Database>(
&self,
db: DB,
env: EnvWithHandlerCfg,
) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> {
fn evm_with_env<DB: Database>(&self, db: DB, env: EnvWithHandlerCfg) -> Evm<'_, (), DB> {
let mut evm = self.evm(db);
evm.modify_spec_id(env.spec_id());
evm.context.evm.env = env.env;
@ -77,11 +70,7 @@ pub trait ConfigureEvm: ConfigureEvmEnv {
/// # Caution
///
/// This does not initialize the tx environment.
fn evm_for_block<DB: Database>(
&self,
db: DB,
header: &Self::Header,
) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> {
fn evm_for_block<DB: Database>(&self, db: DB, header: &Self::Header) -> Evm<'_, (), DB> {
let EvmEnv {
cfg_env_with_handler_cfg: CfgEnvWithHandlerCfg { cfg_env, handler_cfg },
block_env,
@ -127,11 +116,8 @@ pub trait ConfigureEvm: ConfigureEvmEnv {
DB: Database,
I: GetInspector<DB>,
{
RethEvmBuilder::new(db, self.default_external_context()).build_with_inspector(inspector)
RethEvmBuilder::new(db).build_with_inspector(inspector)
}
/// Provides the default external context.
fn default_external_context<'a>(&self) -> Self::DefaultExternalContext<'a>;
}
impl<'b, T> ConfigureEvm for &'b T
@ -139,29 +125,15 @@ where
T: ConfigureEvm,
&'b T: ConfigureEvmEnv<Header = T::Header>,
{
type DefaultExternalContext<'a> = T::DefaultExternalContext<'a>;
fn default_external_context<'a>(&self) -> Self::DefaultExternalContext<'a> {
(*self).default_external_context()
}
fn evm<DB: Database>(&self, db: DB) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> {
fn evm<DB: Database>(&self, db: DB) -> Evm<'_, (), DB> {
(*self).evm(db)
}
fn evm_for_block<DB: Database>(
&self,
db: DB,
header: &Self::Header,
) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> {
fn evm_for_block<DB: Database>(&self, db: DB, header: &Self::Header) -> Evm<'_, (), DB> {
(*self).evm_for_block(db, header)
}
fn evm_with_env<DB: Database>(
&self,
db: DB,
env: EnvWithHandlerCfg,
) -> Evm<'_, Self::DefaultExternalContext<'_>, DB> {
fn evm_with_env<DB: Database>(&self, db: DB, env: EnvWithHandlerCfg) -> Evm<'_, (), DB> {
(*self).evm_with_env(db, env)
}