From 9239188093e31f372e562e528cb610e403ece540 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Wed, 9 Apr 2025 12:09:57 +0200
Subject: [PATCH] chore: prep alloy TxEnvelope transition (#15628)

---
 crates/optimism/payload/src/builder.rs              |  2 +-
 crates/optimism/payload/src/traits.rs               |  2 +-
 crates/optimism/primitives/src/transaction/mod.rs   | 13 +++++++++++++
 .../optimism/primitives/src/transaction/signed.rs   |  8 +-------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/crates/optimism/payload/src/builder.rs b/crates/optimism/payload/src/builder.rs
index fa40989dfa..d8663a1e5c 100644
--- a/crates/optimism/payload/src/builder.rs
+++ b/crates/optimism/payload/src/builder.rs
@@ -24,7 +24,7 @@ use reth_evm::{
 use reth_execution_types::ExecutionOutcome;
 use reth_optimism_evm::OpNextBlockEnvAttributes;
 use reth_optimism_forks::OpHardforks;
-use reth_optimism_primitives::transaction::signed::OpTransaction;
+use reth_optimism_primitives::transaction::OpTransaction;
 use reth_optimism_txpool::{
     interop::{is_valid_interop, MaybeInteropTransaction},
     OpPooledTx,
diff --git a/crates/optimism/payload/src/traits.rs b/crates/optimism/payload/src/traits.rs
index a394ed1fbc..a0d13022cd 100644
--- a/crates/optimism/payload/src/traits.rs
+++ b/crates/optimism/payload/src/traits.rs
@@ -1,5 +1,5 @@
 use alloy_consensus::{BlockBody, Header};
-use reth_optimism_primitives::{transaction::signed::OpTransaction, DepositReceipt};
+use reth_optimism_primitives::{transaction::OpTransaction, DepositReceipt};
 use reth_primitives_traits::{NodePrimitives, SignedTransaction};
 
 /// Helper trait to encapsulate common bounds on [`NodePrimitives`] for OP payload builder.
diff --git a/crates/optimism/primitives/src/transaction/mod.rs b/crates/optimism/primitives/src/transaction/mod.rs
index ab45ec9ea4..0d048d056d 100644
--- a/crates/optimism/primitives/src/transaction/mod.rs
+++ b/crates/optimism/primitives/src/transaction/mod.rs
@@ -2,3 +2,16 @@
 
 pub mod signed;
 pub mod tx_type;
+
+/// A trait that represents an optimism transaction, mainly used to indicate whether or not the
+/// transaction is a deposit transaction.
+pub trait OpTransaction {
+    /// Whether or not the transaction is a dpeosit transaction.
+    fn is_deposit(&self) -> bool;
+}
+
+impl OpTransaction for op_alloy_consensus::OpTxEnvelope {
+    fn is_deposit(&self) -> bool {
+        Self::is_deposit(self)
+    }
+}
diff --git a/crates/optimism/primitives/src/transaction/signed.rs b/crates/optimism/primitives/src/transaction/signed.rs
index 92c549a6b6..0cd997d32b 100644
--- a/crates/optimism/primitives/src/transaction/signed.rs
+++ b/crates/optimism/primitives/src/transaction/signed.rs
@@ -1,5 +1,6 @@
 //! A signed Optimism transaction.
 
+use crate::transaction::OpTransaction;
 use alloc::vec::Vec;
 use alloy_consensus::{
     transaction::{RlpEcdsaDecodableTx, RlpEcdsaEncodableTx},
@@ -196,13 +197,6 @@ impl From<Sealed<TxDeposit>> for OpTransactionSigned {
     }
 }
 
-/// A trait that represents an optimism transaction, mainly used to indicate whether or not the
-/// transaction is a deposit transaction.
-pub trait OpTransaction {
-    /// Whether or not the transaction is a dpeosit transaction.
-    fn is_deposit(&self) -> bool;
-}
-
 impl OpTransaction for OpTransactionSigned {
     fn is_deposit(&self) -> bool {
         self.is_deposit()