chore(deps): Replace OpTxEnvelope with TxEnvelope

crates/protocol/src/batch/transactions.rs

@@ -270,7 +270,7 @@ impl SpanBatchTransactions {
             } else {
                 true
             };
-            let tx_envelope = tx.to_enveloped_tx(*nonce, *gas, to, chain_id, sig, is_protected)?;
+            let tx_envelope = tx.to_signed_tx(*nonce, *gas, to, chain_id, sig, is_protected)?;
             let mut buf = Vec::new();
             tx_envelope.encode_2718(&mut buf);
             txs.push(buf);

crates/protocol/src/batch/tx_data/eip1559.rs

@@ -5,7 +5,6 @@ use alloy_consensus::{SignableTransaction, Signed, TxEip1559};
 use alloy_eips::eip2930::AccessList;
 use alloy_primitives::{Address, PrimitiveSignature as Signature, TxKind, U256};
 use alloy_rlp::{Bytes, RlpDecodable, RlpEncodable};
-use op_alloy_consensus::OpTxEnvelope;
 
 /// The transaction data for an EIP-1559 transaction within a span batch.
 #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -23,15 +22,15 @@ pub struct SpanBatchEip1559TransactionData {
 }
 
 impl SpanBatchEip1559TransactionData {
-    /// Converts [SpanBatchEip1559TransactionData] into an [OpTxEnvelope].
-    pub fn to_enveloped_tx(
+    /// Converts [SpanBatchEip1559TransactionData] into a signed [`TxEip1559`].
+    pub fn to_signed_tx(
         &self,
         nonce: u64,
         gas: u64,
         to: Option<Address>,
         chain_id: u64,
         signature: Signature,
-    ) -> Result<OpTxEnvelope, SpanBatchError> {
+    ) -> Result<Signed<TxEip1559>, SpanBatchError> {
         let eip1559_tx = TxEip1559 {
             chain_id,
             nonce,
@@ -52,8 +51,7 @@ impl SpanBatchEip1559TransactionData {
             access_list: self.access_list.clone(),
         };
         let signature_hash = eip1559_tx.signature_hash();
-        let signed_eip1559_tx = Signed::new_unchecked(eip1559_tx, signature, signature_hash);
-        Ok(OpTxEnvelope::Eip1559(signed_eip1559_tx))
+        Ok(Signed::new_unchecked(eip1559_tx, signature, signature_hash))
     }
 }
 

crates/protocol/src/batch/tx_data/eip2930.rs

@@ -5,7 +5,6 @@ use alloy_consensus::{SignableTransaction, Signed, TxEip2930};
 use alloy_eips::eip2930::AccessList;
 use alloy_primitives::{Address, PrimitiveSignature as Signature, TxKind, U256};
 use alloy_rlp::{Bytes, RlpDecodable, RlpEncodable};
-use op_alloy_consensus::OpTxEnvelope;
 
 /// The transaction data for an EIP-2930 transaction within a span batch.
 #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -21,15 +20,15 @@ pub struct SpanBatchEip2930TransactionData {
 }
 
 impl SpanBatchEip2930TransactionData {
-    /// Converts [SpanBatchEip2930TransactionData] into a [OpTxEnvelope].
-    pub fn to_enveloped_tx(
+    /// Converts [SpanBatchEip2930TransactionData] into a signed [`TxEip2930`].
+    pub fn to_signed_tx(
         &self,
         nonce: u64,
         gas: u64,
         to: Option<Address>,
         chain_id: u64,
         signature: Signature,
-    ) -> Result<OpTxEnvelope, SpanBatchError> {
+    ) -> Result<Signed<TxEip2930>, SpanBatchError> {
         let access_list_tx = TxEip2930 {
             chain_id,
             nonce,
@@ -45,9 +44,7 @@ impl SpanBatchEip2930TransactionData {
             access_list: self.access_list.clone(),
         };
         let signature_hash = access_list_tx.signature_hash();
-        let signed_access_list_tx =
-            Signed::new_unchecked(access_list_tx, signature, signature_hash);
-        Ok(OpTxEnvelope::Eip2930(signed_access_list_tx))
+        Ok(Signed::new_unchecked(access_list_tx, signature, signature_hash))
     }
 }
 

crates/protocol/src/batch/tx_data/legacy.rs

@@ -4,7 +4,6 @@ use crate::{SpanBatchError, SpanDecodingError};
 use alloy_consensus::{SignableTransaction, Signed, TxLegacy};
 use alloy_primitives::{Address, PrimitiveSignature as Signature, TxKind, U256};
 use alloy_rlp::{Bytes, RlpDecodable, RlpEncodable};
-use op_alloy_consensus::OpTxEnvelope;
 
 /// The transaction data for a legacy transaction within a span batch.
 #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@@ -18,16 +17,16 @@ pub struct SpanBatchLegacyTransactionData {
 }
 
 impl SpanBatchLegacyTransactionData {
-    /// Converts [SpanBatchLegacyTransactionData] into a [OpTxEnvelope].
-    pub fn to_enveloped_tx(
+    /// Converts [SpanBatchLegacyTransactionData] into a signed [`TxLegacy`].
+    pub fn to_signed_tx(
         &self,
         nonce: u64,
         gas: u64,
         to: Option<Address>,
         chain_id: u64,
         signature: Signature,
         is_protected: bool,
-    ) -> Result<OpTxEnvelope, SpanBatchError> {
+    ) -> Result<Signed<TxLegacy>, SpanBatchError> {
         let legacy_tx = TxLegacy {
             chain_id: is_protected.then_some(chain_id),
             nonce,
@@ -42,8 +41,7 @@ impl SpanBatchLegacyTransactionData {
             input: self.data.clone().into(),
         };
         let signature_hash = legacy_tx.signature_hash();
-        let signed_legacy_tx = Signed::new_unchecked(legacy_tx, signature, signature_hash);
-        Ok(OpTxEnvelope::Legacy(signed_legacy_tx))
+        Ok(Signed::new_unchecked(legacy_tx, signature, signature_hash))
     }
 }
 

crates/protocol/src/batch/tx_data/wrapper.rs

@@ -3,7 +3,6 @@
 use alloy_consensus::{Transaction, TxEnvelope, TxType};
 use alloy_primitives::{Address, PrimitiveSignature as Signature, U256};
 use alloy_rlp::{Bytes, Decodable, Encodable};
-use op_alloy_consensus::OpTxEnvelope;
 
 use crate::{
     SpanBatchEip1559TransactionData, SpanBatchEip2930TransactionData, SpanBatchError,
@@ -114,22 +113,31 @@ impl SpanBatchTransactionData {
         }
     }
 
-    /// Converts the [SpanBatchTransactionData] into a [OpTxEnvelope].
-    pub fn to_enveloped_tx(
+    /// Converts the [SpanBatchTransactionData] into a singed transaction as [`TxEnvelope`].
+    pub fn to_signed_tx(
         &self,
         nonce: u64,
         gas: u64,
         to: Option<Address>,
         chain_id: u64,
         signature: Signature,
         is_protected: bool,
-    ) -> Result<OpTxEnvelope, SpanBatchError> {
-        match self {
-            Self::Legacy(data) => {
-                data.to_enveloped_tx(nonce, gas, to, chain_id, signature, is_protected)
+    ) -> Result<TxEnvelope, SpanBatchError> {
+        Ok(match self {
+            Self::Legacy(data) => TxEnvelope::Legacy(data.to_signed_tx(
+                nonce,
+                gas,
+                to,
+                chain_id,
+                signature,
+                is_protected,
+            )?),
+            Self::Eip2930(data) => {
+                TxEnvelope::Eip2930(data.to_signed_tx(nonce, gas, to, chain_id, signature)?)
             }
-            Self::Eip2930(data) => data.to_enveloped_tx(nonce, gas, to, chain_id, signature),
-            Self::Eip1559(data) => data.to_enveloped_tx(nonce, gas, to, chain_id, signature),
-        }
+            Self::Eip1559(data) => {
+                TxEnvelope::Eip1559(data.to_signed_tx(nonce, gas, to, chain_id, signature)?)
+            }
+        })
     }
 }

crates/protocol/src/block.rs

@@ -101,8 +101,8 @@ pub enum FromBlockError {
     /// The first payload transaction has an unexpected type.
     #[error("First payload transaction has unexpected type: {0}")]
     UnexpectedTxType(u8),
-    /// Failed to decode the first transaction into an [OpTxEnvelope].
-    #[error("Failed to decode the first transaction into an OpTxEnvelope: {0}")]
+    /// Failed to decode the first transaction into an OP transaction.
+    #[error("Failed to decode the first transaction into an OP transaction: {0}")]
     TxEnvelopeDecodeError(Eip2718Error),
     /// The first payload transaction is not a deposit transaction.
     #[error("First payload transaction is not a deposit transaction, type: {0}")]

crates/protocol/src/info/variant.rs

@@ -4,9 +4,9 @@
 use alloc::{format, string::ToString};
 use alloy_consensus::Header;
 use alloy_eips::{eip7840::BlobParams, BlockNumHash};
-use alloy_primitives::{address, Address, Bytes, Sealable, TxKind, B256, U256};
+use alloy_primitives::{address, Address, Bytes, Sealable, Sealed, TxKind, B256, U256};
 use maili_genesis::{RollupConfig, SystemConfig};
-use op_alloy_consensus::{OpTxEnvelope, TxDeposit};
+use op_alloy_consensus::TxDeposit;
 
 use crate::{
     BlockInfoError, DecodeError, DepositSourceDomain, L1BlockInfoBedrock, L1BlockInfoEcotone,
@@ -100,7 +100,7 @@ impl L1BlockInfoTx {
         sequence_number: u64,
         l1_header: &Header,
         l2_block_time: u64,
-    ) -> Result<(Self, OpTxEnvelope), BlockInfoError> {
+    ) -> Result<(Self, Sealed<TxDeposit>), BlockInfoError> {
         let l1_info =
             Self::try_new(rollup_config, system_config, sequence_number, l1_header, l2_block_time)?;
 
@@ -127,7 +127,7 @@ impl L1BlockInfoTx {
             deposit_tx.gas_limit = REGOLITH_SYSTEM_TX_GAS;
         }
 
-        Ok((l1_info, OpTxEnvelope::Deposit(deposit_tx.seal_slow())))
+        Ok((l1_info, deposit_tx.seal_slow()))
     }
 
     /// Decodes the [L1BlockInfoEcotone] object from ethereum transaction calldata.