feat: make block struct generic over header type (#1179)

* make block struct generic over header type

* add generic default, make some changes

* change generic name and self

crates/network/src/any/mod.rs

@@ -75,5 +75,5 @@ impl Network for AnyNetwork {
 
     type HeaderResponse = Header;
 
-    type BlockResponse = WithOtherFields<Block<Self::TransactionResponse>>;
+    type BlockResponse = WithOtherFields<Block<Self::HeaderResponse, Self::TransactionResponse>>;
 }

crates/rpc-types-eth/src/block.rs

@@ -14,10 +14,10 @@ pub use alloy_eips::{
 /// Block representation
 #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct Block<T = Transaction> {
+pub struct Block<H = Header, T = Transaction> {
     /// Header of the block.
     #[serde(flatten)]
-    pub header: Header,
+    pub header: H,
     /// Uncles' hashes.
     #[serde(default)]
     pub uncles: Vec<B256>,
@@ -36,7 +36,7 @@ pub struct Block<T = Transaction> {
     pub withdrawals: Option<Vec<Withdrawal>>,
 }
 
-impl Block {
+impl<H> Block<H> {
     /// Converts a block with Tx hashes into a full block.
     pub fn into_full_block(self, txs: Vec<Transaction>) -> Self {
         Self { transactions: txs.into(), ..self }
@@ -334,9 +334,9 @@ pub struct BlockOverrides {
     pub block_hash: Option<BTreeMap<u64, B256>>,
 }
 
-impl<T> BlockResponse for Block<T> {
+impl<H, T> BlockResponse for Block<H, T> {
     type Transaction = T;
-    type Header = Header;
+    type Header = H;
 
     fn header(&self) -> &Self::Header {
         &self.header