diff --git a/Cargo.lock b/Cargo.lock index 04f3b854e9..cf91db2148 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8067,6 +8067,7 @@ dependencies = [ "reth-db", "reth-discv4", "reth-discv5", + "reth-ethereum-forks", "reth-net-nat", "reth-network", "reth-network-p2p", diff --git a/crates/node/core/Cargo.toml b/crates/node/core/Cargo.toml index c667a56293..0ede9fe80c 100644 --- a/crates/node/core/Cargo.toml +++ b/crates/node/core/Cargo.toml @@ -34,6 +34,7 @@ reth-net-nat.workspace = true reth-network-peers.workspace = true reth-prune-types.workspace = true reth-stages-types.workspace = true +reth-ethereum-forks.workspace = true # ethereum alloy-primitives.workspace = true diff --git a/crates/node/core/src/lib.rs b/crates/node/core/src/lib.rs index a69a255a3c..aa4f72bd6a 100644 --- a/crates/node/core/src/lib.rs +++ b/crates/node/core/src/lib.rs @@ -15,9 +15,11 @@ pub mod exit; pub mod node_config; pub mod utils; pub mod version; -/// Re-exported from `reth_primitives`. + +/// Re-exported primitive types pub mod primitives { - pub use reth_primitives::*; + pub use reth_ethereum_forks::*; + pub use reth_primitives_traits::*; } /// Re-export of `reth_rpc_*` crates. diff --git a/crates/node/core/src/node_config.rs b/crates/node/core/src/node_config.rs index 24d5588b68..2fd39bde82 100644 --- a/crates/node/core/src/node_config.rs +++ b/crates/node/core/src/node_config.rs @@ -9,22 +9,26 @@ use crate::{ utils::get_single_header, }; use alloy_consensus::BlockHeader; +use alloy_eips::BlockHashOrNumber; +use alloy_primitives::{BlockNumber, B256}; use eyre::eyre; use reth_chainspec::{ChainSpec, EthChainSpec, MAINNET}; use reth_config::config::PruneConfig; +use reth_ethereum_forks::Head; use reth_network_p2p::headers::client::HeadersClient; -use serde::{de::DeserializeOwned, Serialize}; -use std::{fs, path::Path}; - -use alloy_eips::BlockHashOrNumber; -use alloy_primitives::{BlockNumber, B256}; -use reth_primitives::{Head, SealedHeader}; +use reth_primitives_traits::SealedHeader; use reth_stages_types::StageId; use reth_storage_api::{ BlockHashReader, DatabaseProviderFactory, HeaderProvider, StageCheckpointReader, }; use reth_storage_errors::provider::ProviderResult; -use std::{net::SocketAddr, path::PathBuf, sync::Arc}; +use serde::{de::DeserializeOwned, Serialize}; +use std::{ + fs, + net::SocketAddr, + path::{Path, PathBuf}, + sync::Arc, +}; use tracing::*; /// This includes all necessary configuration to launch the node. diff --git a/crates/node/core/src/utils.rs b/crates/node/core/src/utils.rs index e52af4b46f..65f90f27eb 100644 --- a/crates/node/core/src/utils.rs +++ b/crates/node/core/src/utils.rs @@ -9,7 +9,8 @@ use reth_consensus::Consensus; use reth_network_p2p::{ bodies::client::BodiesClient, headers::client::HeadersClient, priority::Priority, }; -use reth_primitives::{SealedBlock, SealedHeader}; +use reth_primitives::SealedBlock; +use reth_primitives_traits::SealedHeader; use std::{ env::VarError, path::{Path, PathBuf},