clean up

Author: zerosnacks

Diff for: Cargo.lock

@@ -16,10 +16,9 @@ use foundry_fork_db::DatabaseError;
 use revm::{
     bytecode::Bytecode,
     context::{result::ResultAndState, JournalInit},
-    context_interface::result::ResultAndState,
     database::DatabaseRef,
     primitives::{hardfork::SpecId, EnvWithHandlerCfg, HashMap as Map},
-    state::{Account, AccountInfo, Bytecode},
+    state::{Account, AccountInfo},
     Database, DatabaseCommit, ExecuteEvm, JournaledState,
 };
 use std::{borrow::Cow, collections::BTreeMap};
@@ -91,7 +90,7 @@ impl<'a> CowBackend<'a> {
     /// Returns a mutable instance of the Backend.
     ///
     /// If this is the first time this is called, the backed is cloned and initialized.
-    fn backend_mut(&mut self, env: EnvMut<'_>) -> &mut Backend {
+    fn backend_mut(&mut self, mut env: EnvMut<'_>) -> &mut Backend {
         let env = env.as_env_mut().to_owned();
         if !self.is_initialized {
             let backend = self.backend.to_mut();
@@ -167,7 +166,7 @@ impl DatabaseExt for CowBackend<'_> {
         &mut self,
         id: Option<LocalForkId>,
         block_number: u64,
-        env: EnvMut<'_>,
+        mut env: EnvMut<'_>,
         journaled_state: &mut JournaledState<'_>,
     ) -> eyre::Result<()> {
         self.backend_mut(env.as_env_mut()).roll_fork(id, block_number, env, journaled_state)

Diff for: crates/evm/core/src/backend/cow.rs

@@ -1,6 +1,6 @@
 use alloy_primitives::Address;
 pub use foundry_fork_db::{DatabaseError, DatabaseResult};
-use revm::{context::result::EVMError, context_interface::result::EVMError};
+use revm::context::result::EVMError;
 use std::{convert::Infallible, fmt::Display};
 
 pub type BackendResult<T> = Result<T, BackendError>;

Diff for: crates/evm/core/src/backend/error.rs

@@ -20,11 +20,8 @@ use revm::{
     database::{CacheDB, DatabaseRef},
     inspector::NoOpInspector,
     precompile::{PrecompileSpecId, Precompiles},
-    primitives::{
-        hardfork::SpecId, EnvWithHandlerCfg, EvmState, EvmStorageSlot, HashMap as Map, Log,
-        KECCAK_EMPTY,
-    },
-    state::{Account, AccountInfo},
+    primitives::{hardfork::SpecId, EnvWithHandlerCfg, HashMap as Map, Log, KECCAK_EMPTY},
+    state::{Account, AccountInfo, EvmState, EvmStorageSlot},
     Database, DatabaseCommit, JournaledState,
 };
 use std::{
@@ -1054,8 +1051,8 @@ impl DatabaseExt for Backend {
         if let Some(active_fork_id) = self.active_fork_id() {
             self.forks.update_block(
                 self.ensure_fork_id(active_fork_id).cloned()?,
-                env.evm_env.block_env.number,
-                env.evm_env.block_env.timestamp,
+                env.block.number,
+                env.block.timestamp,
             )?;
         }
 

Diff for: crates/evm/core/src/backend/mod.rs

@@ -3,8 +3,6 @@ use alloy_primitives::{map::AddressHashMap, B256, U256};
 use revm::{primitives::HashMap, state::AccountInfo, JournaledState};
 use serde::{Deserialize, Serialize};
 
-use crate::Env;
-
 /// A minimal abstraction of a state at a certain point in time
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
 pub struct StateSnapshot {

Diff for: crates/evm/core/src/backend/snapshot.rs

@@ -3,8 +3,6 @@
 //! The design is similar to the single `SharedBackend`, `BackendHandler` but supports multiple
 //! concurrently active pairs at once.
 
-use crate::Env;
-
 use super::CreateFork;
 use crate::Env;
 use alloy_consensus::BlockHeader;

Diff for: crates/evm/core/src/fork/multi.rs

@@ -37,7 +37,6 @@ pub mod opts;
 pub mod precompiles;
 pub mod state_snapshot;
 pub mod utils;
-pub use env::*;
 use utils::FoundryEvmCtx;
 
 /// An extension trait that allows us to add additional hooks to Inspector for later use in

Diff for: crates/evm/core/src/lib.rs

@@ -1,10 +1,10 @@
 pub use crate::ic::*;
 use crate::{
     backend::DatabaseExt, constants::DEFAULT_CREATE2_DEPLOYER_CODEHASH, precompiles::ODYSSEY_P256,
-    AsEnvMut, Env, InspectorExt,
+    AsEnvMut, Env, EnvMut, InspectorExt,
 };
 use alloy_consensus::BlockHeader;
-use alloy_evm::{eth::EthEvmContext, EvmEnv};
+use alloy_evm::eth::EthEvmContext;
 use alloy_json_abi::{Function, JsonAbi};
 use alloy_network::{AnyTxEnvelope, TransactionResponse};
 use alloy_primitives::{Address, Bytes, Selector, TxKind, B256, U256};
@@ -20,7 +20,6 @@ use revm::{
         return_ok, CallInputs, CallOutcome, CallScheme, CallValue, CreateInputs, CreateOutcome,
         Gas, InstructionResult, InterpreterResult,
     },
-    precompile::secp256r1::P256VERIFY,
     primitives::{hardfork::SpecId, HandlerCfg, KECCAK_EMPTY},
 };
 use std::{cell::RefCell, rc::Rc, sync::Arc};

Diff for: crates/evm/core/src/utils.rs

@@ -18,6 +18,7 @@ foundry-config.workspace = true
 foundry-cli.workspace = true
 foundry-common.workspace = true
 foundry-evm.workspace = true
+foundry-evm-core.workspace = true
 serde_json.workspace = true
 alloy-json-abi.workspace = true
 alloy-primitives.workspace = true

Diff for: crates/verify/Cargo.toml

@@ -243,7 +243,7 @@ impl VerifyBytecodeArgs {
             )
             .await?;
 
-            env.evm_env.block_env.number = 0_u64; // Genesis block
+            env.block.number = 0_u64; // Genesis block
             let genesis_block = provider.get_block(gen_blk_num.into()).full().await?;
 
             // Setup genesis tx and env.
@@ -445,7 +445,7 @@ impl VerifyBytecodeArgs {
                 evm_opts,
             )
             .await?;
-            env.evm_env.block_env.number = simulation_block;
+            env.block.number = simulation_block;
             let block = provider.get_block(simulation_block.into()).full().await?;
 
             // Workaround for the NonceTooHigh issue as we're not simulating prior txs of the same

Diff for: crates/verify/src/bytecode.rs

@@ -16,6 +16,7 @@ use foundry_evm::{
     constants::DEFAULT_CREATE2_DEPLOYER, executors::TracingExecutor, opts::EvmOpts,
     traces::TraceMode,
 };
+use foundry_evm_core::AsEnvMut;
 use reqwest::Url;
 use revm::primitives::{
     bytecode::Bytecode,
@@ -350,13 +351,14 @@ pub async fn get_tracing_executor(
     Ok((env, executor))
 }
 
-pub fn configure_env_block(env: &mut Env, block: &AnyRpcBlock) {
-    env.evm_env.block_env.timestamp = block.header.timestamp;
-    env.evm_env.block_env.beneficiary = block.header.beneficiary;
-    env.evm_env.block_env.difficulty = block.header.difficulty;
-    env.evm_env.block_env.prevrandao = block.header.mix_hash;
-    env.evm_env.block_env.basefee = block.header.base_fee_per_gas.unwrap_or_default();
-    env.evm_env.block_env.gas_limit = block.header.gas_limit;
+pub fn configure_env_block(mut env: impl AsEnvMut, block: &AnyRpcBlock) {
+    let env = env.as_env_mut();
+    env.block.timestamp = block.header.timestamp;
+    env.block.beneficiary = block.header.beneficiary;
+    env.block.difficulty = block.header.difficulty;
+    env.block.prevrandao = block.header.mix_hash;
+    env.block.basefee = block.header.base_fee_per_gas.unwrap_or_default();
+    env.block.gas_limit = block.header.gas_limit;
 }
 
 pub fn deploy_contract(