Skip to content

refactor(evm): use CTX::Db instead of dyn DatabaseExt in nested EVM APIs #13951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaniPopes merged 2 commits into from
Mar 26, 2026
Merged

refactor(evm): use CTX::Db instead of dyn DatabaseExt in nested EVM APIs #13951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb3177c
refactor(evm): use `CTX::Db` instead of `dyn DatabaseExt` in nested E…
mablr Mar 26, 2026
e85568f
Merge branch 'master' into refactor/use-ctx-db-instead-of-dyn-databas…
mablr Mar 26, 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
2 changes: 1 addition & 1 deletion crates/cheatcodes/src/evm/fork.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ fn create_fork_request<CTX: EthCheatCtx>(
fn fork_env_op<CTX: EthCheatCtx, T: SolValue>(
ccx: &mut CheatsCtxt<'_, CTX>,
f: impl FnOnce(
&mut dyn DatabaseExt<CTX::Block, CTX::Tx, CTX::Spec>,
&mut CTX::Db,
&mut EvmEnv<CTX::Spec, CTX::Block>,
&mut CTX::Tx,
&mut JournaledState,
Expand Down
4 changes: 2 additions & 2 deletions crates/cheatcodes/src/inspector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ pub trait CheatcodesExecutor<CTX: ContextTr> {
fn with_fresh_nested_evm(
&mut self,
cheats: &mut Cheatcodes,
db: &mut dyn DatabaseExt<CTX::Block, CTX::Tx, <CTX::Cfg as Cfg>::Spec>,
db: &mut CTX::Db,
evm_env: EvmEnv<<CTX::Cfg as Cfg>::Spec, CTX::Block>,
f: NestedEvmClosure<'_, CTX::Tx>,
) -> Result<EvmEnv<<CTX::Cfg as Cfg>::Spec, CTX::Block>, EVMError<DatabaseError>>;
Expand Down Expand Up @@ -188,7 +188,7 @@ impl<CTX: EthCheatCtx> CheatcodesExecutor<CTX> for TransparentCheatcodesExecutor
fn with_fresh_nested_evm(
&mut self,
cheats: &mut Cheatcodes,
db: &mut dyn DatabaseExt<CTX::Block, CTX::Tx, CTX::Spec>,
db: &mut CTX::Db,
evm_env: EvmEnv<CTX::Spec, CTX::Block>,
f: NestedEvmClosure<'_, CTX::Tx>,
) -> Result<EvmEnv<CTX::Spec, CTX::Block>, EVMError<DatabaseError>> {
Expand Down
6 changes: 2 additions & 4 deletions crates/evm/core/src/evm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,10 @@ pub type NestedEvmClosure<'a, Tx> =
/// and cloned journal inner to the callback. The callback builds whatever EVM it
/// needs, runs its operations, and returns `(result, modified_env, modified_journal)`.
/// Modified state is written back after the callback returns.
pub fn with_cloned_context<
CTX: FoundryContextExt<Db: DatabaseExt<CTX::Block, CTX::Tx, CTX::Spec>>,
>(
pub fn with_cloned_context<CTX: FoundryContextExt>(
ecx: &mut CTX,
f: impl FnOnce(
&mut dyn DatabaseExt<CTX::Block, CTX::Tx, CTX::Spec>,
&mut CTX::Db,
EvmEnv<CTX::Spec, CTX::Block>,
JournaledState,
)
Expand Down
2 changes: 1 addition & 1 deletion crates/evm/evm/src/inspectors/stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ impl<CTX: EthCheatCtx> CheatcodesExecutor<CTX> for InspectorStackInner {
fn with_fresh_nested_evm(
&mut self,
cheats: &mut Cheatcodes,
db: &mut dyn DatabaseExt<CTX::Block, CTX::Tx, CTX::Spec>,
db: &mut CTX::Db,
evm_env: EvmEnv<CTX::Spec, CTX::Block>,
f: NestedEvmClosure<'_, CTX::Tx>,
) -> Result<EvmEnv<CTX::Spec, CTX::Block>, EVMError<DatabaseError>> {
Expand Down
Loading