cleanup logic

rakita · rakita · commit b0c36e006ba0 · 2025-05-30T13:17:24.000+02:00
diff --git a/bins/revme/src/cmd/bench/transfer.rs b/bins/revme/src/cmd/bench/transfer.rs
@@ -48,6 +48,8 @@ pub fn run(criterion: &mut Criterion) {
     // drop the journal
     let _ = evm.finalize();
 
+    evm.modify_cfg(|cfg| cfg.disable_nonce_check = false);
+
     criterion.bench_function("transfer_finalize", |b| {
         b.iter(|| {
             let _ = evm.replay().unwrap();
diff --git a/crates/context/interface/src/result.rs b/crates/context/interface/src/result.rs
@@ -330,6 +330,8 @@ pub enum InvalidTransaction {
     CreateInitCodeSizeLimit,
     /// Transaction chain id does not match the config chain id.
     InvalidChainId,
+    /// Missing chain id.
+    MissingChainId,
     /// Access list is not supported for blocks before the Berlin hardfork.
     AccessListNotSupported,
     /// `max_fee_per_blob_gas` is not supported for blocks before the Cancun hardfork.
@@ -445,6 +447,7 @@ impl fmt::Display for InvalidTransaction {
                 write!(f, "create initcode size limit")
             }
             Self::InvalidChainId => write!(f, "invalid chain ID"),
+            Self::MissingChainId => write!(f, "missing chain ID"),
             Self::AccessListNotSupported => write!(f, "access list not supported"),
             Self::MaxFeePerBlobGasNotSupported => {
                 write!(f, "max fee per blob gas not supported")
diff --git a/crates/context/interface/src/transaction/transaction_type.rs b/crates/context/interface/src/transaction/transaction_type.rs
@@ -20,6 +20,18 @@ pub enum TransactionType {
     Custom = 0xFF,
 }
 
+impl TransactionType {
+    /// Returns true if the transaction type is legacy.
+    pub fn is_legacy(&self) -> bool {
+        matches!(self, Self::Legacy)
+    }
+
+    /// Returns true if the transaction type is custom.
+    pub fn is_custom(&self) -> bool {
+        matches!(self, Self::Custom)
+    }
+}
+
 impl PartialEq<u8> for TransactionType {
     fn eq(&self, other: &u8) -> bool {
         (*self as u8) == *other
diff --git a/crates/context/src/tx.rs b/crates/context/src/tx.rs
@@ -42,8 +42,6 @@ pub struct TxEnv {
 
     /// The chain ID of the transaction
     ///
-    /// If set to [`None`], no checks are performed.
-    ///
     /// Incorporated as part of the Spurious Dragon upgrade via [EIP-155].
     ///
     /// [EIP-155]: https://eips.ethereum.org/EIPS/eip-155
diff --git a/crates/handler/src/validation.rs b/crates/handler/src/validation.rs
@@ -96,20 +96,22 @@ pub fn validate_tx_env<CTX: ContextTr, Error>(
         Some(context.block().basefee() as u128)
     };
 
-    let is_legacy_some = matches!(TransactionType::from(tx_type), TransactionType::Legacy)
-        && tx.chain_id().is_some();
+    let tx_type = TransactionType::from(tx_type);
 
-    // Check chain_id only if it is present in the legacy transaction.
+    // Check chain_id if config is enabled.
     // EIP-155: Simple replay attack protection
-    if is_legacy_some && !context.cfg().tx_chain_id_check() {
+    if context.cfg().tx_chain_id_check() {
         if let Some(chain_id) = tx.chain_id() {
             if chain_id != context.cfg().chain_id() {
                 return Err(InvalidTransaction::InvalidChainId);
             }
+        } else if !tx_type.is_legacy() && !tx_type.is_custom() {
+            // Legacy transaction are the only one that can omit chain_id.
+            return Err(InvalidTransaction::MissingChainId);
         }
     }
 
-    match TransactionType::from(tx_type) {
+    match tx_type {
         TransactionType::Legacy => {
             // Gas price must be at least the basefee.
             if let Some(base_fee) = base_fee {
