cli: replace reth-primitive imports with alloy-eips (#10994)

This commit is contained in:
Håvard Anda Estensen
2024-09-18 17:56:29 +02:00
committed by GitHub
parent 21232b0918
commit 2ee14164de
5 changed files with 5 additions and 3 deletions

1
Cargo.lock generated
View File

@ -6481,6 +6481,7 @@ name = "reth-cli-commands"
version = "1.0.7" version = "1.0.7"
dependencies = [ dependencies = [
"ahash", "ahash",
"alloy-eips",
"alloy-primitives", "alloy-primitives",
"arbitrary", "arbitrary",
"backon", "backon",

View File

@ -44,6 +44,7 @@ reth-trie = { workspace = true, features = ["metrics"] }
reth-trie-db = { workspace = true, features = ["metrics"] } reth-trie-db = { workspace = true, features = ["metrics"] }
# ethereum # ethereum
alloy-eips.workspace = true
alloy-primitives.workspace = true alloy-primitives.workspace = true
itertools.workspace = true itertools.workspace = true

View File

@ -2,6 +2,7 @@
use std::{path::PathBuf, sync::Arc}; use std::{path::PathBuf, sync::Arc};
use alloy_eips::BlockHashOrNumber;
use backon::{ConstantBuilder, Retryable}; use backon::{ConstantBuilder, Retryable};
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use reth_chainspec::ChainSpec; use reth_chainspec::ChainSpec;
@ -14,7 +15,6 @@ use reth_node_core::{
args::{DatabaseArgs, DatadirArgs, NetworkArgs}, args::{DatabaseArgs, DatadirArgs, NetworkArgs},
utils::get_single_header, utils::get_single_header,
}; };
use reth_primitives::BlockHashOrNumber;
mod rlpx; mod rlpx;

View File

@ -3,6 +3,7 @@
//! Stage debugging tool //! Stage debugging tool
use crate::common::{AccessRights, Environment, EnvironmentArgs}; use crate::common::{AccessRights, Environment, EnvironmentArgs};
use alloy_eips::BlockHashOrNumber;
use clap::Parser; use clap::Parser;
use reth_beacon_consensus::EthBeaconConsensus; use reth_beacon_consensus::EthBeaconConsensus;
use reth_chainspec::ChainSpec; use reth_chainspec::ChainSpec;
@ -21,7 +22,6 @@ use reth_network_p2p::HeadersClient;
use reth_node_builder::NodeTypesWithEngine; use reth_node_builder::NodeTypesWithEngine;
use reth_node_core::{ use reth_node_core::{
args::{NetworkArgs, StageEnum}, args::{NetworkArgs, StageEnum},
primitives::BlockHashOrNumber,
version::{ version::{
BUILD_PROFILE_NAME, CARGO_PKG_VERSION, VERGEN_BUILD_TIMESTAMP, VERGEN_CARGO_FEATURES, BUILD_PROFILE_NAME, CARGO_PKG_VERSION, VERGEN_BUILD_TIMESTAMP, VERGEN_CARGO_FEATURES,
VERGEN_CARGO_TARGET_TRIPLE, VERGEN_GIT_SHA, VERGEN_CARGO_TARGET_TRIPLE, VERGEN_GIT_SHA,

View File

@ -1,6 +1,7 @@
//! Unwinding a certain block range //! Unwinding a certain block range
use crate::common::{AccessRights, Environment, EnvironmentArgs}; use crate::common::{AccessRights, Environment, EnvironmentArgs};
use alloy_eips::BlockHashOrNumber;
use alloy_primitives::{BlockNumber, B256}; use alloy_primitives::{BlockNumber, B256};
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use reth_beacon_consensus::EthBeaconConsensus; use reth_beacon_consensus::EthBeaconConsensus;
@ -14,7 +15,6 @@ use reth_evm::noop::NoopBlockExecutorProvider;
use reth_exex::ExExManagerHandle; use reth_exex::ExExManagerHandle;
use reth_node_builder::{NodeTypesWithDB, NodeTypesWithEngine}; use reth_node_builder::{NodeTypesWithDB, NodeTypesWithEngine};
use reth_node_core::args::NetworkArgs; use reth_node_core::args::NetworkArgs;
use reth_primitives::BlockHashOrNumber;
use reth_provider::{ use reth_provider::{
BlockExecutionWriter, BlockNumReader, ChainSpecProvider, FinalizedBlockReader, BlockExecutionWriter, BlockNumReader, ChainSpecProvider, FinalizedBlockReader,
FinalizedBlockWriter, ProviderFactory, StaticFileProviderFactory, FinalizedBlockWriter, ProviderFactory, StaticFileProviderFactory,