chore(sdk): improve usability BlockBody and Block traits

crates/e2e-test-utils/src/engine_api.rs

@@ -55,8 +55,7 @@ impl<E: EngineTypes, ChainSpec: EthereumHardforks> EngineApiTestContext<E, Chain
         E::ExecutionPayloadEnvelopeV3: From<E::BuiltPayload> + PayloadEnvelopeExt,
         E::ExecutionPayloadEnvelopeV4: From<E::BuiltPayload> + PayloadEnvelopeExt,
     {
-        let versioned_hashes =
-            payload.block().blob_versioned_hashes_iter().copied().collect::<Vec<_>>();
+        let versioned_hashes = payload.block().blob_versioned_hashes_copied();
         // submit payload to engine api
         let submission = if self
             .chain_spec

crates/net/eth-wire-types/src/primitives.rs

@@ -3,7 +3,7 @@
 use std::fmt::Debug;
 
 use alloy_rlp::{Decodable, Encodable};
-use reth_primitives_traits::{Block, BlockHeader};
+use reth_primitives_traits::{Block, BlockBody, BlockHeader};
 
 /// Abstraction over primitive types which might appear in network messages. See
 /// [`crate::EthMessage`] for more context.
@@ -23,7 +23,8 @@ pub trait NetworkPrimitives:
         + Eq
         + 'static;
     /// The block body type.
-    type BlockBody: Encodable
+    type BlockBody: BlockBody<Header = Self::BlockHeader>
+        + Encodable
         + Decodable
         + Send
         + Sync

crates/optimism/payload/src/payload.rs

@@ -7,7 +7,7 @@ use alloy_eips::{
 use alloy_primitives::{keccak256, Address, Bytes, B256, B64, U256};
 use alloy_rlp::Encodable;
 use alloy_rpc_types_engine::{ExecutionPayloadEnvelopeV2, ExecutionPayloadV1, PayloadId};
-use op_alloy_consensus::eip1559::{decode_holocene_extra_data, EIP1559ParamError};
+use op_alloy_consensus::{decode_holocene_extra_data, EIP1559ParamError};
 /// Re-export for use in downstream arguments.
 pub use op_alloy_rpc_types_engine::OpPayloadAttributes;
 use op_alloy_rpc_types_engine::{OpExecutionPayloadEnvelopeV3, OpExecutionPayloadEnvelopeV4};

crates/payload/validator/src/lib.rs

@@ -64,7 +64,8 @@ impl<ChainSpec: EthereumHardforks> ExecutionPayloadValidator<ChainSpec> {
         sealed_block: &SealedBlock,
         cancun_fields: &MaybeCancunPayloadFields,
     ) -> Result<(), PayloadError> {
-        let num_blob_versioned_hashes = sealed_block.blob_versioned_hashes_iter().count();
+        let blob_versioned_hashes = sealed_block.blob_versioned_hashes();
+        let num_blob_versioned_hashes = blob_versioned_hashes.len();
         // Additional Cancun checks for blob transactions
         if let Some(versioned_hashes) = cancun_fields.versioned_hashes() {
             if num_blob_versioned_hashes != versioned_hashes.len() {
@@ -73,9 +74,9 @@ impl<ChainSpec: EthereumHardforks> ExecutionPayloadValidator<ChainSpec> {
             }
             // we can use `zip` safely here because we already compared their length
             for (payload_versioned_hash, block_versioned_hash) in
-                versioned_hashes.iter().zip(sealed_block.blob_versioned_hashes_iter())
+                versioned_hashes.iter().zip(blob_versioned_hashes.iter())
             {
-                if payload_versioned_hash != block_versioned_hash {
+                if payload_versioned_hash != *block_versioned_hash {
                     return Err(PayloadError::InvalidVersionedHashes)
                 }
             }

crates/primitives-traits/Cargo.toml

@@ -6,7 +6,7 @@ homepage.workspace = true
 license.workspace = true
 repository.workspace = true
 rust-version.workspace = true
-description = "Common types in reth."
+description = "Reth abstraction of EVM data primitives."
 
 [lints]
 workspace = true
@@ -23,19 +23,25 @@ alloy-primitives.workspace = true
 alloy-rlp.workspace = true
 revm-primitives.workspace = true
 
-# misc
+# async
+once_cell.workspace = true
+
+# io
+rayon.workspace = true
+
+# codec
 byteorder = "1"
-derive_more.workspace = true
 roaring = "0.10.2"
+serde.workspace = true
 serde_with = { workspace = true, optional = true }
-auto_impl.workspace = true
-
-# required by reth-codecs
 bytes.workspace = true
 modular-bitfield.workspace = true
-serde.workspace = true
 
-# arbitrary utils
+# misc
+derive_more.workspace = true
+auto_impl.workspace = true
+
+# test-utils
 arbitrary = { workspace = true, features = ["derive"], optional = true }
 proptest = { workspace = true, optional = true }
 proptest-arbitrary-interop = { workspace = true, optional = true }
@@ -59,7 +65,8 @@ std = [
 	"alloy-genesis/std",
 	"alloy-primitives/std",
 	"revm-primitives/std",
-	"serde/std"
+	"serde/std",
+	"once_cell/std",
 ]
 test-utils = [
 	"arbitrary",