minor fixes

Cargo.toml

@@ -317,8 +317,6 @@ vergen = { version = "8", default-features = false }
 yansi = { version = "1.0", features = ["detect-tty", "detect-env"] }
 
 [patch.crates-io]
-revm = { git = "https://github.com/bluealloy/revm", rev = "9e39df5" }
-revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "2a365e3" }
 ## alloy-core
 # alloy-dyn-abi = { path = "../../alloy-rs/core/crates/dyn-abi" }
 # alloy-json-abi = { path = "../../alloy-rs/core/crates/json-abi" }
@@ -354,3 +352,7 @@ revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev
 # alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
 # alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
 # alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
+
+## revm
+# revm = { git = "https://github.com/bluealloy/revm", rev = "9e39df5" }
+# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "2a365e3" }

crates/evm/core/src/backend/cow.rs

@@ -69,7 +69,7 @@ impl<'a> CowBackend<'a> {
         // this is a new call to inspect with a new env, so even if we've cloned the backend
         // already, we reset the initialized state
         self.is_initialized = false;
-        self.spec_id = env.handler_cfg.spec_id;
+        self.spec_id = env.evm_env.cfg_env.spec;
         let mut evm = crate::utils::new_evm_with_inspector(self, env.clone(), inspector);
 
         let res = evm.replay().wrap_err("EVM error")?;

crates/evm/core/src/backend/mod.rs

@@ -2045,8 +2045,7 @@ mod tests {
         }
         drop(backend);
 
-        let meta =
-            BlockchainDbMeta { cfg_env: env.cfg, block_env: env.block, hosts: Default::default() };
+        let meta = BlockchainDbMeta { block_env: env.evm_env.block_env, hosts: Default::default() };
 
         let db = BlockchainDb::new(
             meta,

crates/evm/core/src/opts.rs

@@ -169,7 +169,7 @@ impl EvmOpts {
                 cfg_env: cfg,
             },
             tx: TxEnv {
-                gas_price: self.env.gas_price.unwrap_or_default(),
+                gas_price: self.env.gas_price.unwrap_or_default().into(),
                 gas_limit: self.gas_limit(),
                 caller: self.sender,
                 ..Default::default()

crates/evm/core/src/utils.rs

@@ -169,8 +169,7 @@ pub fn configure_tx_req_env(
 
     // Type 4, EIP-7702
     if let Some(authorization_list) = authorization_list {
-        env.tx.authorization_list =
-            Some(revm::primitives::AuthorizationList::Signed(authorization_list.clone()));
+        env.tx.authorization_list = authorization_list.clone();
     }
 
     Ok(())