Add trait methods to alloy_network_primitives::TransactionResponse

crates/consensus/src/transaction/eip1559.rs

@@ -1,5 +1,5 @@
 use crate::{EncodableSignature, SignableTransaction, Signed, Transaction, TxType};
-use alloy_eips::eip2930::AccessList;
+use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
 use alloy_primitives::{keccak256, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{BufMut, Decodable, Encodable, Header};
 use core::mem;
@@ -290,6 +290,10 @@ impl Transaction for TxEip1559 {
         self.max_priority_fee_per_gas
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        None
+    }
+
     fn to(&self) -> TxKind {
         self.to
     }
@@ -313,6 +317,10 @@ impl Transaction for TxEip1559 {
     fn blob_versioned_hashes(&self) -> Option<&[B256]> {
         None
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        None
+    }
 }
 
 impl SignableTransaction<Signature> for TxEip1559 {

crates/consensus/src/transaction/eip2930.rs

@@ -1,5 +1,5 @@
 use crate::{EncodableSignature, SignableTransaction, Signed, Transaction, TxType};
-use alloy_eips::eip2930::AccessList;
+use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
 use alloy_primitives::{keccak256, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable, Header};
 use core::mem;
@@ -254,6 +254,10 @@ impl Transaction for TxEip2930 {
         self.gas_price
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        None
+    }
+
     fn to(&self) -> TxKind {
         self.to
     }
@@ -277,6 +281,10 @@ impl Transaction for TxEip2930 {
     fn blob_versioned_hashes(&self) -> Option<&[B256]> {
         None
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        None
+    }
 }
 
 impl SignableTransaction<Signature> for TxEip2930 {

crates/consensus/src/transaction/eip4844.rs

@@ -1,6 +1,6 @@
 use crate::{EncodableSignature, SignableTransaction, Signed, Transaction, TxType};
 
-use alloy_eips::{eip2930::AccessList, eip4844::DATA_GAS_PER_BLOB};
+use alloy_eips::{eip2930::AccessList, eip4844::DATA_GAS_PER_BLOB, eip7702::SignedAuthorization};
 use alloy_primitives::{keccak256, Address, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable, Header};
 use core::mem;
@@ -237,6 +237,13 @@ impl Transaction for TxEip4844Variant {
         }
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        match self {
+            Self::TxEip4844(tx) => tx.max_fee_per_blob_gas(),
+            Self::TxEip4844WithSidecar(tx) => tx.max_fee_per_blob_gas(),
+        }
+    }
+
     fn to(&self) -> TxKind {
         match self {
             Self::TxEip4844(tx) => tx.to,
@@ -276,6 +283,10 @@ impl Transaction for TxEip4844Variant {
             Self::TxEip4844WithSidecar(tx) => tx.blob_versioned_hashes(),
         }
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        None
+    }
 }
 
 impl SignableTransaction<Signature> for TxEip4844Variant {
@@ -700,6 +711,10 @@ impl Transaction for TxEip4844 {
         self.max_priority_fee_per_gas
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        Some(self.max_fee_per_blob_gas)
+    }
+
     fn to(&self) -> TxKind {
         self.to.into()
     }
@@ -723,6 +738,10 @@ impl Transaction for TxEip4844 {
     fn blob_versioned_hashes(&self) -> Option<&[B256]> {
         Some(&self.blob_versioned_hashes)
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        None
+    }
 }
 
 impl Encodable for TxEip4844 {
@@ -965,6 +984,10 @@ impl Transaction for TxEip4844WithSidecar {
         self.tx.priority_fee_or_price()
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        self.tx.max_fee_per_blob_gas()
+    }
+
     fn to(&self) -> TxKind {
         self.tx.to()
     }
@@ -988,6 +1011,10 @@ impl Transaction for TxEip4844WithSidecar {
     fn blob_versioned_hashes(&self) -> Option<&[B256]> {
         self.tx.blob_versioned_hashes()
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        None
+    }
 }
 
 #[cfg(test)]

crates/consensus/src/transaction/eip7702.rs

@@ -313,6 +313,10 @@ impl Transaction for TxEip7702 {
         self.max_priority_fee_per_gas
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        None
+    }
+
     fn to(&self) -> TxKind {
         self.to
     }
@@ -336,6 +340,10 @@ impl Transaction for TxEip7702 {
     fn blob_versioned_hashes(&self) -> Option<&[B256]> {
         None
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        Some(&self.authorization_list)
+    }
 }
 
 impl SignableTransaction<Signature> for TxEip7702 {

crates/consensus/src/transaction/envelope.rs

@@ -468,6 +468,16 @@ impl Transaction for TxEnvelope {
         }
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        match self {
+            Self::Legacy(tx) => tx.tx().max_fee_per_blob_gas(),
+            Self::Eip2930(tx) => tx.tx().max_fee_per_blob_gas(),
+            Self::Eip1559(tx) => tx.tx().max_fee_per_blob_gas(),
+            Self::Eip4844(tx) => tx.tx().max_fee_per_blob_gas(),
+            Self::Eip7702(tx) => tx.tx().max_fee_per_blob_gas(),
+        }
+    }
+
     fn input(&self) -> &[u8] {
         match self {
             Self::Legacy(tx) => tx.tx().input(),
@@ -537,6 +547,16 @@ impl Transaction for TxEnvelope {
             Self::Eip7702(tx) => tx.tx().blob_versioned_hashes(),
         }
     }
+
+    fn authorization_list(&self) -> Option<&[alloy_eips::eip7702::SignedAuthorization]> {
+        match self {
+            Self::Legacy(tx) => tx.tx().authorization_list(),
+            Self::Eip2930(tx) => tx.tx().authorization_list(),
+            Self::Eip1559(tx) => tx.tx().authorization_list(),
+            Self::Eip4844(tx) => tx.tx().authorization_list(),
+            Self::Eip7702(tx) => tx.tx().authorization_list(),
+        }
+    }
 }
 
 #[cfg(test)]

crates/consensus/src/transaction/legacy.rs

@@ -1,6 +1,6 @@
 use core::mem;
 
-use alloy_eips::eip2930::AccessList;
+use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
 use alloy_primitives::{keccak256, Bytes, ChainId, Signature, TxKind, B256, U256};
 use alloy_rlp::{length_of_length, BufMut, Decodable, Encodable, Header, Result};
 
@@ -232,6 +232,10 @@ impl Transaction for TxLegacy {
         self.gas_price
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        None
+    }
+
     fn to(&self) -> TxKind {
         self.to
     }
@@ -255,6 +259,10 @@ impl Transaction for TxLegacy {
     fn blob_versioned_hashes(&self) -> Option<&[B256]> {
         None
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        None
+    }
 }
 
 impl SignableTransaction<Signature> for TxLegacy {

crates/consensus/src/transaction/mod.rs

@@ -1,7 +1,7 @@
 //! Transaction types.
 
 use crate::Signed;
-use alloy_eips::eip2930::AccessList;
+use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
 use alloy_primitives::{keccak256, ChainId, TxKind, B256, U256};
 use core::any;
 
@@ -56,14 +56,21 @@ pub trait Transaction: any::Any + Send + Sync + 'static {
     ///
     /// For legacy transactions this is `gas_price`.
     ///
-    /// This is also commonly referred to as the "Gas Fee Cap" (`GasFeeCap`).
+    /// This is also commonly referred to as the "Gas Fee Cap".
     fn max_fee_per_gas(&self) -> u128;
 
     /// Returns the EIP-1559 Priority fee the caller is paying to the block author.
     ///
     /// This will return `None` for non-EIP1559 transactions
     fn max_priority_fee_per_gas(&self) -> Option<u128>;
 
+    /// Max fee per blob gas for EIP-4844 transaction.
+    ///
+    /// Returns `None` for non-eip4844 transactions.
+    ///
+    /// This is also commonly referred to as the "Blob Gas Fee Cap".
+    fn max_fee_per_blob_gas(&self) -> Option<u128>;
+
     /// Return the max priority fee per gas if the transaction is an EIP-1559 transaction, and
     /// otherwise return the gas price.
     ///
@@ -107,13 +114,18 @@ pub trait Transaction: any::Any + Send + Sync + 'static {
     /// Returns the transaction type
     fn ty(&self) -> u8;
 
-    /// Returns the EIP2930 `access_list` for the particular transaction type. Returns `None` for
+    /// Returns the EIP-2930 `access_list` for the particular transaction type. Returns `None` for
     /// older transaction types.
     fn access_list(&self) -> Option<&AccessList>;
 
     /// Blob versioned hashes for eip4844 transaction. For previous transaction types this is
     /// `None`.
     fn blob_versioned_hashes(&self) -> Option<&[B256]>;
+
+    /// Returns the [`SignedAuthorization`] list of the transaction.
+    ///
+    /// Returns `None` if this transaction is not EIP-7702.
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]>;
 }
 
 /// A signable transaction.

crates/consensus/src/transaction/typed.rs

@@ -1,7 +1,7 @@
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
 
-use alloy_eips::eip2930::AccessList;
+use alloy_eips::{eip2930::AccessList, eip7702::SignedAuthorization};
 use alloy_primitives::{ChainId, TxKind, B256};
 
 use crate::{
@@ -209,6 +209,16 @@ impl Transaction for TypedTransaction {
         }
     }
 
+    fn max_fee_per_blob_gas(&self) -> Option<u128> {
+        match self {
+            Self::Legacy(tx) => tx.max_fee_per_blob_gas(),
+            Self::Eip2930(tx) => tx.max_fee_per_blob_gas(),
+            Self::Eip1559(tx) => tx.max_fee_per_blob_gas(),
+            Self::Eip4844(tx) => tx.max_fee_per_blob_gas(),
+            Self::Eip7702(tx) => tx.max_fee_per_blob_gas(),
+        }
+    }
+
     fn to(&self) -> TxKind {
         match self {
             Self::Legacy(tx) => tx.to(),
@@ -268,6 +278,16 @@ impl Transaction for TypedTransaction {
             Self::Eip7702(tx) => tx.blob_versioned_hashes(),
         }
     }
+
+    fn authorization_list(&self) -> Option<&[SignedAuthorization]> {
+        match self {
+            Self::Legacy(tx) => tx.authorization_list(),
+            Self::Eip2930(tx) => tx.authorization_list(),
+            Self::Eip1559(tx) => tx.authorization_list(),
+            Self::Eip4844(tx) => tx.authorization_list(),
+            Self::Eip7702(tx) => tx.authorization_list(),
+        }
+    }
 }
 
 #[cfg(feature = "serde")]

crates/network-primitives/Cargo.toml

@@ -21,6 +21,7 @@ workspace = true
 [dependencies]
 alloy-primitives.workspace = true
 alloy-serde.workspace = true
+alloy-consensus.workspace = true
 
 serde.workspace = true
 

crates/network-primitives/src/traits.rs

@@ -1,4 +1,5 @@
-use alloy_primitives::{Address, BlockHash, Bytes, TxHash, U256};
+use alloy_consensus::Signed;
+use alloy_primitives::{Address, BlockHash, Bytes, TxHash, B256, U256};
 use alloy_serde::WithOtherFields;
 
 use crate::BlockTransactions;
@@ -46,6 +47,22 @@ pub trait TransactionResponse {
     /// Input data
     #[doc(alias = "calldata")]
     fn input(&self) -> &Bytes;
+
+    /// Returns the gas price formatted for the RPC response.
+    fn gas_price(tx: &impl alloy_consensus::Transaction, base_fee: Option<u64>) -> u128;
+
+    /// Returns the max fee per gas.
+    fn max_fee_per_gas(tx: impl alloy_consensus::Transaction) -> Option<u128>;
+
+    /// Assemble from signed transaction.
+    fn fill(
+        signed_tx: Signed<impl alloy_consensus::Transaction>,
+        signer: Address,
+        block_hash: Option<B256>,
+        block_number: Option<u64>,
+        base_fee: Option<u64>,
+        transaction_index: Option<usize>,
+    ) -> Self;
 }
 
 /// Header JSON-RPC response.
@@ -107,6 +124,25 @@ impl<T: TransactionResponse> TransactionResponse for WithOtherFields<T> {
     fn input(&self) -> &Bytes {
         self.inner.input()
     }
+
+    fn gas_price(tx: &impl alloy_consensus::Transaction, base_fee: Option<u64>) -> u128 {
+        T::gas_price(tx, base_fee)
+    }
+
+    fn max_fee_per_gas(tx: impl alloy_consensus::Transaction) -> Option<u128> {
+        T::max_fee_per_gas(tx)
+    }
+
+    fn fill(
+        signed_tx: Signed<impl alloy_consensus::Transaction>,
+        signer: Address,
+        block_hash: Option<B256>,
+        block_number: Option<u64>,
+        base_fee: Option<u64>,
+        transaction_index: Option<usize>,
+    ) -> Self {
+        Self::new(T::fill(signed_tx, signer, block_hash, block_number, base_fee, transaction_index))
+    }
 }
 
 impl<T: ReceiptResponse> ReceiptResponse for WithOtherFields<T> {