chore(reth_primitives): Use trait for size methods in primitive types

crates/net/downloaders/Cargo.toml

@@ -18,6 +18,7 @@ reth-consensus.workspace = true
 reth-network-p2p.workspace = true
 reth-network-peers.workspace = true
 reth-primitives.workspace = true
+reth-primitives-traits.workspace = true
 reth-storage-api.workspace = true
 reth-tasks.workspace = true
 
@@ -80,5 +81,6 @@ test-utils = [
 	"reth-chainspec/test-utils",
 	"reth-primitives/test-utils",
 	"reth-db-api?/test-utils",
-	"reth-provider/test-utils"
+	"reth-provider/test-utils",
+	"reth-primitives-traits/test-utils"
 ]

crates/net/downloaders/src/bodies/bodies.rs

@@ -14,6 +14,7 @@ use reth_network_p2p::{
     error::{DownloadError, DownloadResult},
 };
 use reth_primitives::SealedHeader;
+use reth_primitives_traits::size::HeuristicSize;
 use reth_storage_api::HeaderProvider;
 use reth_tasks::{TaskSpawner, TokioTaskExecutor};
 use std::{

crates/net/downloaders/src/bodies/request.rs

@@ -9,6 +9,7 @@ use reth_network_p2p::{
 };
 use reth_network_peers::{PeerId, WithPeerId};
 use reth_primitives::{BlockBody, GotExpected, SealedBlock, SealedHeader};
+use reth_primitives_traits::HeuristicSize;
 use std::{
     collections::VecDeque,
     mem,

crates/net/p2p/Cargo.toml

@@ -14,6 +14,7 @@ workspace = true
 [dependencies]
 # reth
 reth-primitives.workspace = true
+reth-primitives-traits.workspace = true
 reth-eth-wire-types.workspace = true
 reth-consensus.workspace = true
 reth-network-peers.workspace = true
@@ -32,7 +33,6 @@ tokio = { workspace = true, features = ["sync"] }
 auto_impl.workspace = true
 tracing.workspace = true
 derive_more.workspace = true
-
 parking_lot = { workspace = true, optional = true }
 
 [dev-dependencies]
@@ -47,11 +47,13 @@ test-utils = [
 	"reth-consensus/test-utils",
 	"parking_lot",
 	"reth-network-types/test-utils",
-	"reth-primitives/test-utils"
+	"reth-primitives/test-utils",
+	"reth-primitives-traits/test-utils"
 ]
 std = [
 	"reth-consensus/std",
 	"reth-primitives/std",
 	"alloy-eips/std",
-	"alloy-primitives/std"
+	"alloy-primitives/std",
+	"reth-primitives-traits/std"
 ]

crates/net/p2p/src/bodies/response.rs

@@ -1,5 +1,6 @@
 use alloy_primitives::{BlockNumber, U256};
 use reth_primitives::{SealedBlock, SealedHeader};
+use reth_primitives_traits::HeuristicSize;
 
 /// The block response
 #[derive(PartialEq, Eq, Debug, Clone)]
@@ -19,15 +20,6 @@ impl BlockResponse {
         }
     }
 
-    /// Calculates a heuristic for the in-memory size of the [`BlockResponse`].
-    #[inline]
-    pub fn size(&self) -> usize {
-        match self {
-            Self::Full(block) => SealedBlock::size(block),
-            Self::Empty(header) => SealedHeader::size(header),
-        }
-    }
-
     /// Return the block number
     pub fn block_number(&self) -> BlockNumber {
         self.header().number
@@ -41,3 +33,14 @@ impl BlockResponse {
         }
     }
 }
+
+impl HeuristicSize for BlockResponse {
+    /// Calculates a heuristic for the in-memory size of the [`BlockResponse`].
+    #[inline]
+    fn size(&self) -> usize {
+        match self {
+            Self::Full(block) => SealedBlock::size(block),
+            Self::Empty(header) => SealedHeader::size(header),
+        }
+    }
+}

crates/primitives-traits/src/header/sealed.rs

@@ -1,3 +1,5 @@
+use crate::HeuristicSize;
+
 use super::Header;
 use alloy_eips::BlockNumHash;
 use alloy_primitives::{keccak256, BlockHash, Sealable};
@@ -58,10 +60,12 @@ impl SealedHeader {
     pub fn num_hash(&self) -> BlockNumHash {
         BlockNumHash::new(self.number, self.hash)
     }
+}
 
+impl HeuristicSize for SealedHeader {
     /// Calculates a heuristic for the in-memory size of the [`SealedHeader`].
     #[inline]
-    pub fn size(&self) -> usize {
+    fn size(&self) -> usize {
         self.header.size() + mem::size_of::<BlockHash>()
     }
 }

crates/primitives-traits/src/lib.rs

@@ -61,3 +61,7 @@ pub use header::{BlockHeader, Header, HeaderError, SealedHeader};
 pub mod serde_bincode_compat {
     pub use super::header::{serde_bincode_compat as header, serde_bincode_compat::*};
 }
+
+/// Heuristic size trait
+pub mod size;
+pub use size::HeuristicSize;

crates/primitives-traits/src/size.rs

@@ -0,0 +1,5 @@
+/// Trait for calculating a heuristic for the in-memory size of a struct.
+pub trait HeuristicSize {
+    /// Returns a heuristic for the in-memory size of a struct.
+    fn size(&self) -> usize;
+}

crates/primitives/src/block.rs

@@ -11,6 +11,7 @@ use alloy_rlp::{Decodable, Encodable, RlpDecodable, RlpEncodable};
 use derive_more::{Deref, DerefMut};
 #[cfg(any(test, feature = "arbitrary"))]
 pub use reth_primitives_traits::test_utils::{generate_valid_header, valid_header_strategy};
+use reth_primitives_traits::HeuristicSize;
 use serde::{Deserialize, Serialize};
 
 /// Ethereum full block.
@@ -89,10 +90,12 @@ impl Block {
         let senders = self.senders()?;
         Some(BlockWithSenders { block: self, senders })
     }
+}
 
+impl HeuristicSize for Block {
     /// Calculates a heuristic for the in-memory size of the [`Block`].
     #[inline]
-    pub fn size(&self) -> usize {
+    fn size(&self) -> usize {
         self.header.size() + self.body.size()
     }
 }
@@ -380,12 +383,6 @@ impl SealedBlock {
         Block { header: self.header.unseal(), body: self.body }
     }
 
-    /// Calculates a heuristic for the in-memory size of the [`SealedBlock`].
-    #[inline]
-    pub fn size(&self) -> usize {
-        self.header.size() + self.body.size()
-    }
-
     /// Calculates the total gas used by blob transactions in the sealed block.
     pub fn blob_gas_used(&self) -> u64 {
         self.blob_transactions().iter().filter_map(|tx| tx.blob_gas_used()).sum()
@@ -435,6 +432,14 @@ impl SealedBlock {
     }
 }
 
+impl HeuristicSize for SealedBlock {
+    /// Calculates a heuristic for the in-memory size of the [`SealedBlock`].
+    #[inline]
+    fn size(&self) -> usize {
+        self.header.size() + self.body.size()
+    }
+}
+
 impl From<SealedBlock> for Block {
     fn from(block: SealedBlock) -> Self {
         block.unseal()
@@ -608,10 +613,12 @@ impl BlockBody {
     pub fn transactions(&self) -> impl Iterator<Item = &TransactionSigned> + '_ {
         self.transactions.iter()
     }
+}
 
+impl HeuristicSize for BlockBody {
     /// Calculates a heuristic for the in-memory size of the [`BlockBody`].
     #[inline]
-    pub fn size(&self) -> usize {
+    fn size(&self) -> usize {
         self.transactions.iter().map(TransactionSigned::size).sum::<usize>() +
             self.transactions.capacity() * core::mem::size_of::<TransactionSigned>() +
             self.ommers.iter().map(Header::size).sum::<usize>() +

crates/primitives/src/transaction/mod.rs

@@ -19,6 +19,7 @@ use once_cell as _;
 #[cfg(not(feature = "std"))]
 use once_cell::sync::Lazy as LazyLock;
 use rayon::prelude::{IntoParallelIterator, ParallelIterator};
+use reth_primitives_traits::HeuristicSize;
 use serde::{Deserialize, Serialize};
 use signature::{decode_with_eip155_chain_id, with_eip155_parity};
 #[cfg(feature = "std")]
@@ -486,20 +487,6 @@ impl Transaction {
         }
     }
 
-    /// Calculates a heuristic for the in-memory size of the [Transaction].
-    #[inline]
-    pub fn size(&self) -> usize {
-        match self {
-            Self::Legacy(tx) => tx.size(),
-            Self::Eip2930(tx) => tx.size(),
-            Self::Eip1559(tx) => tx.size(),
-            Self::Eip4844(tx) => tx.size(),
-            Self::Eip7702(tx) => tx.size(),
-            #[cfg(feature = "optimism")]
-            Self::Deposit(tx) => tx.size(),
-        }
-    }
-
     /// Returns true if the transaction is a legacy transaction.
     #[inline]
     pub const fn is_legacy(&self) -> bool {
@@ -571,6 +558,22 @@ impl Transaction {
     }
 }
 
+impl HeuristicSize for Transaction {
+    /// Calculates a heuristic for the in-memory size of the [Transaction].
+    #[inline]
+    fn size(&self) -> usize {
+        match self {
+            Self::Legacy(tx) => tx.size(),
+            Self::Eip2930(tx) => tx.size(),
+            Self::Eip1559(tx) => tx.size(),
+            Self::Eip4844(tx) => tx.size(),
+            Self::Eip7702(tx) => tx.size(),
+            #[cfg(feature = "optimism")]
+            Self::Deposit(tx) => tx.size(),
+        }
+    }
+}
+
 #[cfg(any(test, feature = "reth-codec"))]
 impl reth_codecs::Compact for Transaction {
     // Serializes the TxType to the buffer if necessary, returning 2 bits of the type as an

crates/prune/prune/Cargo.toml

@@ -21,6 +21,7 @@ reth-errors.workspace = true
 reth-provider.workspace = true
 reth-tokio-util.workspace = true
 reth-config.workspace = true
+reth-primitives-traits.workspace = true
 reth-prune-types.workspace = true
 reth-static-file-types.workspace = true
 

crates/prune/prune/src/segments/user/receipts_by_logs.rs

@@ -4,13 +4,14 @@ use crate::{
     PrunerError,
 };
 use reth_db::{tables, transaction::DbTxMut};
+#[allow(unused_imports)]
+use reth_primitives_traits::HeuristicSize;
 use reth_provider::{BlockReader, DBProvider, PruneCheckpointWriter, TransactionsProvider};
 use reth_prune_types::{
     PruneCheckpoint, PruneMode, PruneProgress, PrunePurpose, PruneSegment, ReceiptsLogPruneConfig,
     SegmentOutput, MINIMUM_PRUNING_DISTANCE,
 };
 use tracing::{instrument, trace};
-
 #[derive(Debug)]
 pub struct ReceiptsByLogs {
     config: ReceiptsLogPruneConfig,
@@ -223,6 +224,7 @@ mod tests {
     use assert_matches::assert_matches;
     use reth_db::tables;
     use reth_db_api::{cursor::DbCursorRO, transaction::DbTx};
+    use reth_primitives_traits::HeuristicSize;
     use reth_provider::{DatabaseProviderFactory, PruneCheckpointReader, TransactionsProvider};
     use reth_prune_types::{PruneLimiter, PruneMode, PruneSegment, ReceiptsLogPruneConfig};
     use reth_stages::test_utils::{StorageKind, TestStageDB};

crates/rpc/rpc-types-compat/Cargo.toml

@@ -30,4 +30,4 @@ alloy-consensus.workspace = true
 serde.workspace = true
 
 [dev-dependencies]
-serde_json.workspace = true
+serde_json.workspace = true

crates/rpc/rpc-types-compat/src/transaction/mod.rs

@@ -160,3 +160,14 @@ pub fn transaction_to_call_request(tx: TransactionSignedEcRecovered) -> Transact
         authorization_list,
     }
 }
+
+/// Convert [`reth_primitives::TxType`] to [`alloy_consensus::TxType`]
+/// Will panics if the `TxType` is `TxType::Deposit` (Optimism Deposit transaction)
+pub fn tx_type_to_alloy(tx_type: TxType) -> alloy_consensus::TxType {
+    u8::from(tx_type).try_into().unwrap()
+}
+
+/// Convert [`alloy_consensus::TxType`] to [`reth_primitives::TxType`]
+pub fn tx_type_from_alloy(tx_type: alloy_consensus::TxType) -> TxType {
+    u8::from(tx_type).try_into().unwrap()
+}

crates/transaction-pool/Cargo.toml

@@ -17,6 +17,7 @@ reth-chain-state.workspace = true
 reth-chainspec.workspace = true
 reth-eth-wire-types.workspace = true
 reth-primitives = { workspace = true, features = ["c-kzg", "secp256k1"] }
+reth-primitives-traits.workspace = true
 reth-execution-types.workspace = true
 reth-fs-util.workspace = true
 reth-storage-api.workspace = true
@@ -94,7 +95,8 @@ test-utils = [
 	"reth-chainspec/test-utils",
 	"reth-primitives/test-utils",
 	"reth-provider/test-utils",
-	"revm/test-utils"
+	"revm/test-utils",
+	"reth-primitives-traits/test-utils"
 ]
 arbitrary = [
 	"proptest",
@@ -107,7 +109,8 @@ arbitrary = [
 	"alloy-primitives/arbitrary",
 	"bitflags/arbitrary",
 	"revm/arbitrary",
-	"smallvec/arbitrary"
+	"smallvec/arbitrary",
+	"reth-primitives-traits/arbitrary"
 ]
 
 [[bench]]

crates/transaction-pool/src/lib.rs

@@ -157,6 +157,7 @@ use aquamarine as _;
 use reth_eth_wire_types::HandleMempoolData;
 use reth_execution_types::ChangedAccount;
 use reth_primitives::{BlobTransactionSidecar, PooledTransactionsElement};
+use reth_primitives_traits as _;
 use reth_storage_api::StateProviderFactory;
 use std::{collections::HashSet, sync::Arc};
 use tokio::sync::mpsc::Receiver;

crates/transaction-pool/src/test_utils/mock.rs

@@ -23,9 +23,11 @@ use reth_primitives::{
     BlobTransactionValidationError, PooledTransactionsElementEcRecovered, Signature, Transaction,
     TransactionSigned, TransactionSignedEcRecovered, TxType,
 };
-
 use std::{ops::Range, sync::Arc, time::Instant, vec::IntoIter};
 
+#[cfg(any(test, feature = "arbitrary"))]
+use reth_primitives_traits::HeuristicSize;
+
 /// A transaction pool implementation using [`MockOrdering`] for transaction ordering.
 ///
 /// This type is an alias for [`TxPool<MockOrdering>`].