review: Address first few comments

crates/primitives/src/env.rs

@@ -301,6 +301,19 @@ impl Env {
     /// Return initial spend gas (Gas needed to execute transaction).
     #[inline]
     pub fn validate_tx<SPEC: Spec>(&self) -> Result<(), InvalidTransaction> {
+        #[cfg(feature = "optimism")]
+        if self.cfg.optimism {
+            // Do not allow for a system transaction to be processed if Regolith is enabled.
+            if self.tx.is_system_transaction.unwrap_or(false) && SPEC::enabled(SpecId::REGOLITH) {
+                return Err(InvalidTransaction::DepositSystemTxPostRegolith);
+            }
+
+            // Do not perform any extra validation for deposit transactions, they are pre-verified on L1.
+            if self.tx.source_hash.is_some() {
+                return Ok(());
+            }
+        }
+
         let gas_limit = self.tx.gas_limit;
         let effective_gas_price = self.effective_gas_price();
         let is_create = self.tx.transact_to.is_create();

crates/revm/Cargo.toml

@@ -15,8 +15,6 @@ revm-interpreter = { path = "../interpreter", version = "1.1.2", default-feature
 
 #misc
 auto_impl = { version = "1.1", default-features = false }
-once_cell = "1.18.0"
-bytes = "1.4.0"
 
 # Optional
 serde = { version = "1.0", features = ["derive", "rc"], optional = true }

crates/revm/src/evm_impl.rs

@@ -99,30 +99,7 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> Transact<DB::Error>
     fn preverify_transaction(&mut self) -> Result<(), EVMError<DB::Error>> {
         let env = self.env();
 
-        #[cfg(feature = "optimism")]
-        let is_deposit = env.cfg.optimism && env.tx.source_hash.is_some();
-
         env.validate_block_env::<GSPEC, DB::Error>()?;
-
-        // If the transaction is a deposit transaction on Optimism, there are no fee fields to check,
-        // no nonce to check, and no need to check if EOA (L1 already verified it for us)
-        // Gas is free, but no refunds!
-        #[cfg(feature = "optimism")]
-        if env.cfg.optimism {
-            if !is_deposit {
-                env.validate_tx::<GSPEC>()?;
-            }
-
-            // Do not allow for a system transaction to be processed if Regolith is enabled.
-            if is_deposit
-                && env.tx.is_system_transaction.unwrap_or(false)
-                && GSPEC::enabled(SpecId::REGOLITH)
-            {
-                return Err(InvalidTransaction::DepositSystemTxPostRegolith.into());
-            }
-        }
-
-        #[cfg(not(feature = "optimism"))]
         env.validate_tx::<GSPEC>()?;
 
         let tx_caller = env.tx.caller;
@@ -474,7 +451,7 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> EVMImpl<'a, GSPEC, DB,
                     let Ok((l1_fee_vault_account, _)) = self
                         .data
                         .journaled_state
-                        .load_account(*optimism::L1_FEE_RECIPIENT, self.data.db)
+                        .load_account(optimism::L1_FEE_RECIPIENT.into(), self.data.db)
                     else {
                         panic!("[OPTIMISM] Failed to load L1 Fee Vault account");
                     };
@@ -486,7 +463,7 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> EVMImpl<'a, GSPEC, DB,
                 let Ok((base_fee_vault_account, _)) = self
                     .data
                     .journaled_state
-                    .load_account(*optimism::BASE_FEE_RECIPIENT, self.data.db)
+                    .load_account(optimism::BASE_FEE_RECIPIENT.into(), self.data.db)
                 else {
                     panic!("[OPTIMISM] Failed to load Base Fee Vault account");
                 };

crates/revm/src/optimism.rs

@@ -1,28 +1,25 @@
 //! Optimism-specific constants, types, and helpers.
 
-use bytes::Bytes;
 use core::ops::Mul;
-use once_cell::sync::Lazy;
-use revm_interpreter::primitives::{db::Database, hex_literal::hex, Address, Spec, SpecId, U256};
+use revm_interpreter::primitives::{
+    db::Database, hex_literal::hex, Bytes, Spec, SpecId, B160, U256,
+};
 
 const ZERO_BYTE_COST: u64 = 4;
 const NON_ZERO_BYTE_COST: u64 = 16;
 
-static L1_BASE_FEE_SLOT: Lazy<U256> = Lazy::new(|| U256::from(1));
-static L1_OVERHEAD_SLOT: Lazy<U256> = Lazy::new(|| U256::from(5));
-static L1_SCALAR_SLOT: Lazy<U256> = Lazy::new(|| U256::from(6));
+const L1_BASE_FEE_SLOT: U256 = U256::from_limbs([1u64, 0, 0, 0]);
+const L1_OVERHEAD_SLOT: U256 = U256::from_limbs([5u64, 0, 0, 0]);
+const L1_SCALAR_SLOT: U256 = U256::from_limbs([6u64, 0, 0, 0]);
 
 /// The address of L1 fee recipient.
-pub static L1_FEE_RECIPIENT: Lazy<Address> =
-    Lazy::new(|| Address::from_slice(&hex!("420000000000000000000000000000000000001A")));
+pub const L1_FEE_RECIPIENT: B160 = B160(hex!("420000000000000000000000000000000000001A"));
 
 /// The address of the base fee recipient.
-pub static BASE_FEE_RECIPIENT: Lazy<Address> =
-    Lazy::new(|| Address::from_slice(&hex!("4200000000000000000000000000000000000019")));
+pub const BASE_FEE_RECIPIENT: B160 = B160(hex!("4200000000000000000000000000000000000019"));
 
 /// The address of the L1Block contract.
-pub static L1_BLOCK_CONTRACT: Lazy<Address> =
-    Lazy::new(|| Address::from_slice(&hex!("4200000000000000000000000000000000000015")));
+pub const L1_BLOCK_CONTRACT: B160 = B160(hex!("4200000000000000000000000000000000000015"));
 
 /// L1 block info
 ///
@@ -48,9 +45,9 @@ pub struct L1BlockInfo {
 impl L1BlockInfo {
     /// Fetches the L1 block info from the `L1Block` contract in the database.
     pub fn try_fetch<DB: Database>(db: &mut DB) -> Result<L1BlockInfo, DB::Error> {
-        let l1_base_fee = db.storage(*L1_BLOCK_CONTRACT, *L1_BASE_FEE_SLOT)?;
-        let l1_fee_overhead = db.storage(*L1_BLOCK_CONTRACT, *L1_OVERHEAD_SLOT)?;
-        let l1_fee_scalar = db.storage(*L1_BLOCK_CONTRACT, *L1_SCALAR_SLOT)?;
+        let l1_base_fee = db.storage(L1_BLOCK_CONTRACT.into(), L1_BASE_FEE_SLOT)?;
+        let l1_fee_overhead = db.storage(L1_BLOCK_CONTRACT.into(), L1_OVERHEAD_SLOT)?;
+        let l1_fee_scalar = db.storage(L1_BLOCK_CONTRACT.into(), L1_SCALAR_SLOT)?;
 
         Ok(L1BlockInfo {
             l1_base_fee,