chore(primitives): simplify TxEnv conversions + bump alloy-evm (#12805)

- Bump versions for `alloy-evm` and `alloy-op-evm` to 0.25.1
- Update `op-alloy-consensus` and `op-alloy-rpc-types` to 0.23.1
- Use conversion sugar intrduced in latest alloy-evm version

Author: mablr

Cargo.lock

@@ -284,13 +284,13 @@ alloy-rlp = "0.3"
 alloy-trie = "0.9"
 
 ## op-alloy
-op-alloy-consensus = "0.22.0"
-op-alloy-rpc-types = "0.22.0"
+op-alloy-consensus = "0.23.1"
+op-alloy-rpc-types = "0.23.1"
 op-alloy-flz = "0.13.1"
 
 ## alloy-evm
-alloy-evm = "0.24.1"
-alloy-op-evm = "0.24.1"
+alloy-evm = "0.25.1"
+alloy-op-evm = "0.25.1"
 
 # revm
 revm = { version = "33.1.0", default-features = false }

Cargo.toml

@@ -12,7 +12,7 @@ use alloy_rlp::Encodable;
 use alloy_rpc_types::ConversionError;
 use alloy_serde::WithOtherFields;
 use op_alloy_consensus::{DEPOSIT_TX_TYPE_ID, OpTransaction as OpTransactionTrait, TxDeposit};
-use op_revm::{OpTransaction, transaction::deposit::DepositTransactionParts};
+use op_revm::OpTransaction;
 use revm::context::TxEnv;
 
 /// Container type for signed, typed transactions.
@@ -174,9 +174,7 @@ impl FromRecoveredTx<FoundryTxEnvelope> for TxEnv {
             FoundryTxEnvelope::Legacy(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
             FoundryTxEnvelope::Eip2930(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
             FoundryTxEnvelope::Eip1559(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
-            FoundryTxEnvelope::Eip4844(signed_tx) => {
-                Self::from_recovered_tx(signed_tx.tx().tx(), caller)
-            }
+            FoundryTxEnvelope::Eip4844(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
             FoundryTxEnvelope::Eip7702(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
             FoundryTxEnvelope::Deposit(sealed_tx) => {
                 Self::from_recovered_tx(sealed_tx.inner(), caller)
@@ -187,19 +185,16 @@ impl FromRecoveredTx<FoundryTxEnvelope> for TxEnv {
 
 impl FromRecoveredTx<FoundryTxEnvelope> for OpTransaction<TxEnv> {
     fn from_recovered_tx(tx: &FoundryTxEnvelope, caller: Address) -> Self {
-        let base = TxEnv::from_recovered_tx(tx, caller);
-
-        let deposit = if let FoundryTxEnvelope::Deposit(deposit_tx) = tx {
-            DepositTransactionParts {
-                source_hash: deposit_tx.source_hash,
-                mint: Some(deposit_tx.mint),
-                is_system_transaction: deposit_tx.is_system_transaction,
+        match tx {
+            FoundryTxEnvelope::Legacy(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
+            FoundryTxEnvelope::Eip2930(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
+            FoundryTxEnvelope::Eip1559(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
+            FoundryTxEnvelope::Eip4844(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
+            FoundryTxEnvelope::Eip7702(signed_tx) => Self::from_recovered_tx(signed_tx, caller),
+            FoundryTxEnvelope::Deposit(sealed_tx) => {
+                Self::from_recovered_tx(sealed_tx.inner(), caller)
             }
-        } else {
-            Default::default()
-        };
-
-        Self { base, deposit, enveloped_tx: None }
+        }
     }
 }