node: replace reth-primitive imports (#10791)

Cargo.lock

@@ -7610,6 +7610,7 @@ name = "reth-node-builder"
 version = "1.0.6"
 dependencies = [
  "alloy-network",
+ "alloy-primitives",
  "aquamarine",
  "eyre",
  "fdlimit",
@@ -7670,6 +7671,7 @@ name = "reth-node-core"
 version = "1.0.6"
 dependencies = [
  "alloy-genesis",
+ "alloy-primitives",
  "alloy-rpc-types-engine",
  "clap",
  "const_format",
@@ -7760,6 +7762,7 @@ dependencies = [
 name = "reth-node-events"
 version = "1.0.6"
 dependencies = [
+ "alloy-primitives",
  "alloy-rpc-types-engine",
  "futures",
  "humantime",

crates/node/builder/Cargo.toml

@@ -59,6 +59,7 @@ reth-transaction-pool.workspace = true
 
 ## ethereum
 alloy-network.workspace = true
+alloy-primitives.workspace = true
 
 ## async
 futures.workspace = true

crates/node/builder/src/launch/common.rs

@@ -2,6 +2,7 @@
 
 use std::{sync::Arc, thread::available_parallelism};
 
+use alloy_primitives::{BlockNumber, B256};
 use eyre::Context;
 use rayon::ThreadPoolBuilder;
 use reth_auto_seal_consensus::MiningMode;
@@ -34,7 +35,7 @@ use reth_node_metrics::{
     server::{MetricServer, MetricServerConfig},
     version::VersionInfo,
 };
-use reth_primitives::{BlockNumber, Head, B256};
+use reth_primitives::Head;
 use reth_provider::{
     providers::{BlockchainProvider, BlockchainProvider2, StaticFileProvider},
     BlockHashReader, CanonStateNotificationSender, ChainSpecProvider, ProviderFactory,

crates/node/core/Cargo.toml

@@ -43,9 +43,9 @@ reth-node-types.workspace = true
 
 # ethereum
 alloy-genesis.workspace = true
+alloy-primitives.workspace = true
 alloy-rpc-types-engine.workspace = true
 
-
 # misc
 eyre.workspace = true
 clap = { workspace = true, features = ["derive"] }
@@ -63,8 +63,6 @@ dirs-next = "2.0.0"
 shellexpand.workspace = true
 serde_json.workspace = true
 
-
-
 # tracing
 tracing.workspace = true
 
@@ -78,7 +76,6 @@ secp256k1 = { workspace = true, features = [
 # async
 futures.workspace = true
 
-
 [dev-dependencies]
 # test vectors generation
 proptest.workspace = true

crates/node/core/src/args/debug.rs

@@ -1,10 +1,10 @@
 //! clap [Args](clap::Args) for debugging purposes
 
+use alloy_primitives::B256;
 use clap::{
     builder::{PossibleValue, TypedValueParser},
     Arg, Args, Command,
 };
-use reth_primitives::B256;
 use std::{collections::HashSet, ffi::OsStr, fmt, path::PathBuf, str::FromStr};
 use strum::{AsRefStr, EnumIter, IntoStaticStr, ParseError, VariantArray, VariantNames};
 

crates/node/core/src/args/pruning.rs

@@ -1,10 +1,10 @@
 //! Pruning and full node arguments
 
 use crate::args::error::ReceiptsLogError;
+use alloy_primitives::{Address, BlockNumber};
 use clap::Args;
 use reth_chainspec::ChainSpec;
 use reth_config::config::PruneConfig;
-use reth_primitives::{Address, BlockNumber};
 use reth_prune_types::{PruneMode, PruneModes, ReceiptsLogPruneConfig, MINIMUM_PRUNING_DISTANCE};
 use std::collections::BTreeMap;
 

crates/node/core/src/args/txpool.rs

@@ -1,8 +1,8 @@
 //! Transaction pool arguments
 
 use crate::cli::config::RethTransactionPoolConfig;
+use alloy_primitives::Address;
 use clap::Args;
-use reth_primitives::Address;
 use reth_transaction_pool::{
     blobstore::disk::DEFAULT_MAX_CACHED_BLOBS,
     pool::{NEW_TX_LISTENER_BUFFER_SIZE, PENDING_TX_LISTENER_BUFFER_SIZE},

crates/node/core/src/cli/config.rs

@@ -1,7 +1,7 @@
 //! Config traits for various node components.
 
+use alloy_primitives::Bytes;
 use reth_network::protocol::IntoRlpxSubProtocol;
-use reth_primitives::Bytes;
 use reth_transaction_pool::PoolConfig;
 use std::{borrow::Cow, time::Duration};
 

crates/node/core/src/node_config.rs

@@ -15,10 +15,9 @@ use reth_network_p2p::headers::client::HeadersClient;
 use serde::{de::DeserializeOwned, Serialize};
 use std::{fs, path::Path};
 
+use alloy_primitives::{BlockNumber, B256};
 use reth_node_types::NodeTypesWithDB;
-use reth_primitives::{
-    revm_primitives::EnvKzgSettings, BlockHashOrNumber, BlockNumber, Head, SealedHeader, B256,
-};
+use reth_primitives::{revm_primitives::EnvKzgSettings, BlockHashOrNumber, Head, SealedHeader};
 use reth_provider::{BlockHashReader, HeaderProvider, ProviderFactory, StageCheckpointReader};
 use reth_stages_types::StageId;
 use reth_storage_errors::provider::ProviderResult;

crates/node/events/Cargo.toml

@@ -11,6 +11,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+# reth
 reth-provider.workspace = true
 reth-beacon-consensus.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
@@ -21,7 +22,8 @@ reth-static-file.workspace = true
 reth-primitives.workspace = true
 reth-primitives-traits.workspace = true
 
-# alloy
+# ethereum
+alloy-primitives.workspace = true
 alloy-rpc-types-engine.workspace = true
 
 # async
@@ -32,6 +34,6 @@ futures.workspace = true
 
 tracing.workspace = true
 
-#misc
+# misc
 pin-project.workspace = true
 humantime.workspace = true

crates/node/events/src/node.rs

@@ -1,6 +1,7 @@
 //! Support for handling events emitted by node components.
 
 use crate::cl::ConsensusLayerHealthEvent;
+use alloy_primitives::{BlockNumber, B256};
 use alloy_rpc_types_engine::ForkchoiceState;
 use futures::Stream;
 use reth_beacon_consensus::{
@@ -8,7 +9,7 @@ use reth_beacon_consensus::{
 };
 use reth_network::NetworkEvent;
 use reth_network_api::PeersInfo;
-use reth_primitives::{constants, BlockNumber, B256};
+use reth_primitives::constants;
 use reth_primitives_traits::{format_gas, format_gas_throughput};
 use reth_prune::PrunerEvent;
 use reth_stages::{EntitiesCheckpoint, ExecOutput, PipelineEvent, StageCheckpoint, StageId};