diff --git a/crates/storage/codecs/src/alloy/transaction/optimism.rs b/crates/storage/codecs/src/alloy/transaction/optimism.rs
index ea06ae6b0..1bef8c565 100644
--- a/crates/storage/codecs/src/alloy/transaction/optimism.rs
+++ b/crates/storage/codecs/src/alloy/transaction/optimism.rs
@@ -3,9 +3,10 @@
 use alloy_consensus::constants::EIP7702_TX_TYPE_ID;
 use crate::Compact;
 use alloy_primitives::{Address, Bytes, TxKind, B256, U256};
-use op_alloy_consensus::{OpTxType, OpTypedTransaction, TxDeposit as AlloyTxDeposit, DEPOSIT_TX_TYPE_ID};
+use op_alloy_consensus::{OpTxType, OpTypedTransaction, TxDeposit as AlloyTxDeposit};
 use reth_codecs_derive::add_arbitrary_tests;
 use crate::txtype::{COMPACT_EXTENDED_IDENTIFIER_FLAG, COMPACT_IDENTIFIER_EIP1559, COMPACT_IDENTIFIER_EIP2930, COMPACT_IDENTIFIER_LEGACY};
+use crate::generate_tests;
 
 /// Deposit transactions, also known as deposits are initiated on L1, and executed on L2.
 ///
@@ -121,53 +122,42 @@ impl Compact for OpTypedTransaction {
     where
         B: bytes::BufMut + AsMut<[u8]>,
     {
+        let identifier = self.tx_type().to_compact(out);
         match self {
             Self::Legacy(tx) => tx.to_compact(out),
             Self::Eip2930(tx) => tx.to_compact(out),
             Self::Eip1559(tx) => tx.to_compact(out),
             Self::Eip7702(tx) => tx.to_compact(out),
             Self::Deposit(tx) => tx.to_compact(out),
-        }
+        };
+        identifier
     }
 
-    fn from_compact(mut buf: &[u8], identifier: usize) -> (Self, &[u8]) {
-        use bytes::Buf;
-
-        match identifier {
-            COMPACT_IDENTIFIER_LEGACY => {
+    fn from_compact(buf: &[u8], identifier: usize) -> (Self, &[u8]) {
+        let (tx_type, buf) = OpTxType::from_compact(buf, identifier);
+        match tx_type {
+            OpTxType::Legacy => {
                 let (tx, buf) = Compact::from_compact(buf, buf.len());
                 (Self::Legacy(tx), buf)
             }
-            COMPACT_IDENTIFIER_EIP2930 => {
+            OpTxType::Eip2930 => {
                 let (tx, buf) = Compact::from_compact(buf, buf.len());
                 (Self::Eip2930(tx), buf)
             }
-            COMPACT_IDENTIFIER_EIP1559 => {
+            OpTxType::Eip1559 => {
                 let (tx, buf) = Compact::from_compact(buf, buf.len());
                 (Self::Eip1559(tx), buf)
             }
-            COMPACT_EXTENDED_IDENTIFIER_FLAG => {
-                // An identifier of 3 indicates that the transaction type did not fit into
-                // the backwards compatible 2 bit identifier, their transaction types are
-                // larger than 2 bits (eg. 4844 and Deposit Transactions). In this case,
-                // we need to read the concrete transaction type from the buffer by
-                // reading the full 8 bits (single byte) and match on this transaction type.
-                let identifier = buf.get_u8();
-                match identifier {
-                    EIP7702_TX_TYPE_ID => {
-                        let (tx, buf) = Compact::from_compact(buf, buf.len());
-                        (Self::Eip7702(tx), buf)
-                    }
-                    DEPOSIT_TX_TYPE_ID => {
-                        let (tx, buf) = Compact::from_compact(buf, buf.len());
-                        (Self::Deposit(tx), buf)
-                    }
-                    _ => unreachable!(
-                        "Junk data in database: unknown Transaction variant: {identifier}"
-                    ),
-                }
+            OpTxType::Eip7702 => {
+                let (tx, buf) = Compact::from_compact(buf, buf.len());
+                (Self::Eip7702(tx), buf)
+            }
+            OpTxType::Deposit => {
+                let (tx, buf) = Compact::from_compact(buf, buf.len());
+                (Self::Deposit(tx), buf)
             }
-            _ => unreachable!("Junk data in database: unknown Transaction variant: {identifier}"),
         }
     }
 }
+
+generate_tests!(#[crate, compact] OpTypedTransaction, OpTypedTransactionTests);