chore: relax ChainSpec impls (#18894)

Author: klkvr

crates/chainspec/src/api.rs

@@ -1,7 +1,6 @@
 use crate::{ChainSpec, DepositContract};
 use alloc::{boxed::Box, vec::Vec};
 use alloy_chains::Chain;
-use alloy_consensus::Header;
 use alloy_eips::{calc_next_block_base_fee, eip1559::BaseFeeParams, eip7840::BlobParams};
 use alloy_genesis::Genesis;
 use alloy_primitives::{B256, U256};
@@ -75,8 +74,8 @@ pub trait EthChainSpec: Send + Sync + Unpin + Debug {
     }
 }
 
-impl EthChainSpec for ChainSpec {
-    type Header = Header;
+impl<H: BlockHeader> EthChainSpec for ChainSpec<H> {
+    type Header = H;
 
     fn chain(&self) -> Chain {
         self.chain

crates/chainspec/src/spec.rs

@@ -266,7 +266,7 @@ impl From<ForkBaseFeeParams> for BaseFeeParamsKind {
 #[derive(Clone, Debug, PartialEq, Eq, From)]
 pub struct ForkBaseFeeParams(Vec<(Box<dyn Hardfork>, BaseFeeParams)>);
 
-impl core::ops::Deref for ChainSpec {
+impl<H: BlockHeader> core::ops::Deref for ChainSpec<H> {
     type Target = ChainHardforks;
 
     fn deref(&self) -> &Self::Target {
@@ -1033,7 +1033,7 @@ impl From<&Arc<ChainSpec>> for ChainSpecBuilder {
     }
 }
 
-impl EthExecutorSpec for ChainSpec {
+impl<H: BlockHeader> EthExecutorSpec for ChainSpec<H> {
     fn deposit_contract_address(&self) -> Option<Address> {
         self.deposit_contract.map(|deposit_contract| deposit_contract.address)
     }

crates/ethereum/consensus/src/lib.rs

@@ -196,6 +196,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloy_consensus::Header;
     use alloy_primitives::B256;
     use reth_chainspec::{ChainSpec, ChainSpecBuilder};
     use reth_consensus_common::validation::validate_against_parent_gas_limit;
@@ -215,7 +216,7 @@ mod tests {
         let child = header_with_gas_limit((parent.gas_limit + 5) as u64);
 
         assert_eq!(
-            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::default()),
+            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::<Header>::default()),
             Ok(())
         );
     }
@@ -226,7 +227,7 @@ mod tests {
         let child = header_with_gas_limit(MINIMUM_GAS_LIMIT - 1);
 
         assert_eq!(
-            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::default()),
+            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::<Header>::default()),
             Err(ConsensusError::GasLimitInvalidMinimum { child_gas_limit: child.gas_limit as u64 })
         );
     }
@@ -239,7 +240,7 @@ mod tests {
         );
 
         assert_eq!(
-            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::default()),
+            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::<Header>::default()),
             Err(ConsensusError::GasLimitInvalidIncrease {
                 parent_gas_limit: parent.gas_limit,
                 child_gas_limit: child.gas_limit,
@@ -253,7 +254,7 @@ mod tests {
         let child = header_with_gas_limit(parent.gas_limit - 5);
 
         assert_eq!(
-            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::default()),
+            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::<Header>::default()),
             Ok(())
         );
     }
@@ -266,7 +267,7 @@ mod tests {
         );
 
         assert_eq!(
-            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::default()),
+            validate_against_parent_gas_limit(&child, &parent, &ChainSpec::<Header>::default()),
             Err(ConsensusError::GasLimitInvalidDecrease {
                 parent_gas_limit: parent.gas_limit,
                 child_gas_limit: child.gas_limit,