primitives: rm alloy Header reexport

crates/blockchain-tree/src/block_indices.rs

@@ -377,8 +377,9 @@ impl BlockIndices {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloy_consensus::Header;
     use alloy_primitives::B256;
-    use reth_primitives::{Header, SealedBlock, SealedHeader};
+    use reth_primitives::{SealedBlock, SealedHeader};
 
     #[test]
     fn pending_block_num_hash_returns_none_if_no_fork() {

crates/blockchain-tree/src/blockchain_tree.rs

@@ -1374,7 +1374,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use alloy_consensus::{TxEip1559, EMPTY_ROOT_HASH};
+    use alloy_consensus::{Header, TxEip1559, EMPTY_ROOT_HASH};
     use alloy_eips::{eip1559::INITIAL_BASE_FEE, eip4895::Withdrawals};
     use alloy_genesis::{Genesis, GenesisAccount};
     use alloy_primitives::{keccak256, Address, PrimitiveSignature as Signature, B256};
@@ -1389,7 +1389,7 @@ mod tests {
     use reth_primitives::{
         proofs::{calculate_receipt_root, calculate_transaction_root},
         revm_primitives::AccountInfo,
-        Account, BlockBody, Header, Transaction, TransactionSigned, TransactionSignedEcRecovered,
+        Account, BlockBody, Transaction, TransactionSigned, TransactionSignedEcRecovered,
     };
     use reth_provider::{
         test_utils::{

crates/chain-state/src/in_memory.rs

@@ -4,14 +4,15 @@ use crate::{
     CanonStateNotification, CanonStateNotificationSender, CanonStateNotifications,
     ChainInfoTracker, MemoryOverlayStateProvider,
 };
+use alloy_consensus::Header;
 use alloy_eips::{BlockHashOrNumber, BlockNumHash};
 use alloy_primitives::{map::HashMap, Address, TxHash, B256};
 use parking_lot::RwLock;
 use reth_chainspec::ChainInfo;
 use reth_execution_types::{Chain, ExecutionOutcome};
 use reth_metrics::{metrics::Gauge, Metrics};
 use reth_primitives::{
-    BlockWithSenders, Header, Receipt, Receipts, SealedBlock, SealedBlockWithSenders, SealedHeader,
+    BlockWithSenders, Receipt, Receipts, SealedBlock, SealedBlockWithSenders, SealedHeader,
     TransactionMeta, TransactionSigned,
 };
 use reth_storage_api::StateProviderBox;

crates/chain-state/src/test_utils.rs

@@ -2,7 +2,7 @@ use crate::{
     in_memory::ExecutedBlock, CanonStateNotification, CanonStateNotifications,
     CanonStateSubscriptions,
 };
-use alloy_consensus::{Transaction as _, TxEip1559, EMPTY_ROOT_HASH};
+use alloy_consensus::{Header, Transaction as _, TxEip1559, EMPTY_ROOT_HASH};
 use alloy_eips::{eip1559::INITIAL_BASE_FEE, eip7685::Requests};
 use alloy_primitives::{Address, BlockNumber, B256, U256};
 use alloy_signer::SignerSync;
@@ -12,8 +12,8 @@ use reth_chainspec::{ChainSpec, EthereumHardfork, MIN_TRANSACTION_GAS};
 use reth_execution_types::{Chain, ExecutionOutcome};
 use reth_primitives::{
     proofs::{calculate_receipt_root, calculate_transaction_root, calculate_withdrawals_root},
-    BlockBody, Header, Receipt, Receipts, SealedBlock, SealedBlockWithSenders, SealedHeader,
-    Transaction, TransactionSigned, TransactionSignedEcRecovered,
+    BlockBody, Receipt, Receipts, SealedBlock, SealedBlockWithSenders, SealedHeader, Transaction,
+    TransactionSigned, TransactionSignedEcRecovered,
 };
 use reth_trie::{root::state_root_unhashed, updates::TrieUpdates, HashedPostState};
 use revm::{db::BundleState, primitives::AccountInfo};

crates/chainspec/src/api.rs

@@ -1,12 +1,12 @@
 use crate::{ChainSpec, DepositContract};
 use alloc::{boxed::Box, vec::Vec};
 use alloy_chains::Chain;
+use alloy_consensus::Header;
 use alloy_eips::eip1559::BaseFeeParams;
 use alloy_genesis::Genesis;
 use alloy_primitives::B256;
 use core::fmt::{Debug, Display};
 use reth_network_peers::NodeRecord;
-use reth_primitives_traits::Header;
 
 /// Trait representing type configuring a chain spec.
 #[auto_impl::auto_impl(&, Arc)]

crates/chainspec/src/spec.rs

@@ -11,7 +11,10 @@ use alloy_genesis::Genesis;
 use alloy_primitives::{address, b256, Address, BlockNumber, B256, U256};
 use derive_more::From;
 
-use alloy_consensus::constants::{DEV_GENESIS_HASH, MAINNET_GENESIS_HASH, SEPOLIA_GENESIS_HASH};
+use alloy_consensus::{
+    constants::{DEV_GENESIS_HASH, MAINNET_GENESIS_HASH, SEPOLIA_GENESIS_HASH},
+    Header,
+};
 use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT;
 use reth_ethereum_forks::{
     ChainHardforks, DisplayHardforks, EthereumHardfork, EthereumHardforks, ForkCondition,
@@ -21,7 +24,7 @@ use reth_network_peers::{
     base_nodes, base_testnet_nodes, holesky_nodes, mainnet_nodes, op_nodes, op_testnet_nodes,
     sepolia_nodes, NodeRecord,
 };
-use reth_primitives_traits::{constants::HOLESKY_GENESIS_HASH, Header, SealedHeader};
+use reth_primitives_traits::{constants::HOLESKY_GENESIS_HASH, SealedHeader};
 use reth_trie_common::root::state_root_ref_unhashed;
 
 use crate::{constants::MAINNET_DEPOSIT_CONTRACT, once_cell_set, EthChainSpec, LazyLock, OnceLock};

crates/cli/commands/Cargo.toml

@@ -52,6 +52,7 @@ reth-trie-common = { workspace = true, optional = true }
 alloy-eips.workspace = true
 alloy-primitives.workspace = true
 alloy-rlp.workspace = true
+alloy-consensus.workspace = true
 
 itertools.workspace = true
 futures.workspace = true
@@ -94,22 +95,22 @@ reth-discv4.workspace = true
 [features]
 default = []
 arbitrary = [
-	"dep:proptest",
-	"dep:arbitrary",
-	"dep:proptest-arbitrary-interop",
-	"reth-primitives/arbitrary",
-	"reth-db-api/arbitrary",
-	"reth-eth-wire/arbitrary",
-	"reth-db/arbitrary",
-	"reth-chainspec/arbitrary",
-	"alloy-eips/arbitrary",
-	"alloy-primitives/arbitrary",
-	"reth-codecs/test-utils",
-	"reth-prune-types/test-utils",
-	"reth-stages-types/test-utils",
-	"reth-trie-common/test-utils",
-	"reth-codecs?/arbitrary",
-	"reth-prune-types?/arbitrary",
-	"reth-stages-types?/arbitrary",
-	"reth-trie-common?/arbitrary"
+    "dep:proptest",
+    "dep:arbitrary",
+    "dep:proptest-arbitrary-interop",
+    "reth-primitives/arbitrary",
+    "reth-db-api/arbitrary",
+    "reth-eth-wire/arbitrary",
+    "reth-db/arbitrary",
+    "reth-chainspec/arbitrary",
+    "alloy-eips/arbitrary",
+    "alloy-primitives/arbitrary",
+    "reth-codecs/test-utils",
+    "reth-prune-types/test-utils",
+    "reth-stages-types/test-utils",
+    "reth-trie-common/test-utils",
+    "reth-codecs?/arbitrary",
+    "reth-prune-types?/arbitrary",
+    "reth-stages-types?/arbitrary",
+    "reth-trie-common?/arbitrary",
 ]

crates/cli/commands/src/db/get.rs

@@ -1,3 +1,4 @@
+use alloy_consensus::Header;
 use alloy_primitives::{hex, BlockHash};
 use clap::Parser;
 use reth_db::{
@@ -7,7 +8,6 @@ use reth_db::{
 use reth_db_api::table::{Decompress, DupSort, Table};
 use reth_db_common::DbTool;
 use reth_node_builder::NodeTypesWithDB;
-use reth_primitives::Header;
 use reth_provider::{providers::ProviderNodeTypes, StaticFileProviderFactory};
 use reth_static_file_types::StaticFileSegment;
 use tracing::error;

crates/cli/commands/src/init_state/without_evm.rs

@@ -1,8 +1,9 @@
 use alloy_primitives::{BlockNumber, B256, U256};
 use alloy_rlp::Decodable;
 
+use alloy_consensus::Header;
 use reth_primitives::{
-    BlockBody, Header, SealedBlock, SealedBlockWithSenders, SealedHeader, StaticFileSegment,
+    BlockBody, SealedBlock, SealedBlockWithSenders, SealedHeader, StaticFileSegment,
 };
 use reth_provider::{
     providers::StaticFileProvider, BlockWriter, StageCheckpointWriter, StaticFileWriter,

crates/cli/commands/src/test_vectors/tables.rs

@@ -1,3 +1,4 @@
+use alloy_consensus::Header;
 use alloy_primitives::{hex, private::getrandom::getrandom};
 use arbitrary::Arbitrary;
 use eyre::Result;
@@ -10,7 +11,7 @@ use proptest_arbitrary_interop::arb;
 use reth_db::tables;
 use reth_db_api::table::{DupSort, Table, TableRow};
 use reth_fs_util as fs;
-use reth_primitives::{Header, TransactionSignedNoHash};
+use reth_primitives::TransactionSignedNoHash;
 use std::collections::HashSet;
 use tracing::error;
 

crates/consensus/beacon/Cargo.toml

@@ -34,6 +34,7 @@ reth-chainspec = { workspace = true, optional = true }
 alloy-primitives.workspace = true
 alloy-rpc-types-engine = { workspace = true, features = ["std"] }
 alloy-eips.workspace = true
+alloy-consensus.workspace = true
 
 # async
 tokio = { workspace = true, features = ["sync"] }
@@ -77,12 +78,12 @@ assert_matches.workspace = true
 
 [features]
 optimism = [
-	"reth-blockchain-tree/optimism",
-	"reth-chainspec",
-	"reth-db-api/optimism",
-	"reth-db/optimism",
-	"reth-downloaders/optimism",
-	"reth-primitives/optimism",
-	"reth-provider/optimism",
-	"reth-downloaders/optimism"
-]
+    "reth-blockchain-tree/optimism",
+    "reth-chainspec",
+    "reth-db-api/optimism",
+    "reth-db/optimism",
+    "reth-downloaders/optimism",
+    "reth-primitives/optimism",
+    "reth-provider/optimism",
+    "reth-downloaders/optimism",
+]

crates/consensus/beacon/src/engine/invalid_headers.rs

@@ -1,9 +1,10 @@
+use alloy_consensus::Header;
 use alloy_primitives::B256;
 use reth_metrics::{
     metrics::{Counter, Gauge},
     Metrics,
 };
-use reth_primitives::{Header, SealedHeader};
+use reth_primitives::SealedHeader;
 use schnellru::{ByLength, LruMap};
 use std::sync::Arc;
 use tracing::warn;

crates/consensus/beacon/src/engine/mod.rs

@@ -1,3 +1,4 @@
+use alloy_consensus::Header;
 use alloy_eips::{merge::EPOCH_SLOTS, BlockNumHash};
 use alloy_primitives::{BlockNumber, B256};
 use alloy_rpc_types_engine::{
@@ -20,7 +21,7 @@ use reth_node_types::NodeTypesWithEngine;
 use reth_payload_builder::PayloadBuilderHandle;
 use reth_payload_primitives::{PayloadAttributes, PayloadBuilder, PayloadBuilderAttributes};
 use reth_payload_validator::ExecutionPayloadValidator;
-use reth_primitives::{Head, Header, SealedBlock, SealedHeader};
+use reth_primitives::{Head, SealedBlock, SealedHeader};
 use reth_provider::{
     providers::ProviderNodeTypes, BlockIdReader, BlockReader, BlockSource, CanonChainTracker,
     ChainSpecProvider, ProviderError, StageCheckpointReader,

crates/consensus/beacon/src/engine/sync.rs

@@ -410,11 +410,12 @@ impl<N: ProviderNodeTypes> PipelineState<N> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use alloy_consensus::Header;
     use assert_matches::assert_matches;
     use futures::poll;
     use reth_chainspec::{ChainSpec, ChainSpecBuilder, MAINNET};
     use reth_network_p2p::{either::Either, test_utils::TestFullBlockClient};
-    use reth_primitives::{BlockBody, Header, SealedHeader};
+    use reth_primitives::{BlockBody, SealedHeader};
     use reth_provider::{
         test_utils::{create_test_provider_factory_with_chain_spec, MockNodeTypesWithDB},
         ExecutionOutcome,

crates/consensus/common/src/validation.rs

@@ -1,12 +1,10 @@
 //! Collection of methods for block validation.
 
-use alloy_consensus::constants::MAXIMUM_EXTRA_DATA_SIZE;
+use alloy_consensus::{constants::MAXIMUM_EXTRA_DATA_SIZE, Header};
 use alloy_eips::eip4844::{DATA_GAS_PER_BLOB, MAX_DATA_GAS_PER_BLOCK};
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_consensus::ConsensusError;
-use reth_primitives::{
-    BlockBody, EthereumHardfork, GotExpected, Header, SealedBlock, SealedHeader,
-};
+use reth_primitives::{BlockBody, EthereumHardfork, GotExpected, SealedBlock, SealedHeader};
 use revm_primitives::calc_excess_blob_gas;
 
 /// Gas used needs to be less than gas limit. Gas used is going to be checked after execution.