chore: extract db commands (#9217)

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
paradigmxyz · Jul 1, 2024 · 6db598d · 6db598d
1 parent d2cf129
commit 6db598d
Show file tree

Hide file tree

Showing 31 changed files with 109 additions and 94 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/reth/Cargo.toml b/bin/reth/Cargo.toml
@@ -21,7 +21,7 @@ reth-fs-util.workspace = true
 reth-db = { workspace = true, features = ["mdbx"] }
 reth-db-api.workspace = true
 reth-exex.workspace = true
-reth-provider = { workspace = true }
+reth-provider.workspace = true
 reth-evm.workspace = true
 reth-revm.workspace = true
 reth-stages.workspace = true
@@ -30,6 +30,7 @@ reth-errors.workspace = true
 reth-transaction-pool.workspace = true
 reth-beacon-consensus.workspace = true
 reth-cli-runner.workspace = true
+reth-cli-commands.workspace = true
 reth-consensus-common.workspace = true
 reth-blockchain-tree.workspace = true
 reth-rpc-builder.workspace = true
@@ -41,34 +42,29 @@ reth-rpc-eth-types.workspace = true
 reth-rpc-server-types.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
 reth-network-p2p.workspace = true
-reth-net-banlist.workspace = true
 reth-network-api.workspace = true
 reth-downloaders.workspace = true
 reth-tracing.workspace = true
 reth-tasks.workspace = true
-reth-ethereum-payload-builder.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-primitives.workspace = true
 reth-payload-validator.workspace = true
 reth-basic-payload-builder.workspace = true
-reth-discv4.workspace = true
-reth-discv5.workspace = true
 reth-static-file.workspace = true
 reth-static-file-types = { workspace = true, features = ["clap"] }
 reth-trie = { workspace = true, features = ["metrics"] }
-reth-nippy-jar.workspace = true
 reth-node-api.workspace = true
-reth-node-ethereum.workspace = true
 reth-node-optimism = { workspace = true, optional = true, features = [
     "optimism",
 ] }
 reth-node-core.workspace = true
+reth-ethereum-payload-builder.workspace = true
 reth-db-common.workspace = true
+reth-node-ethereum.workspace = true
 reth-node-builder.workspace = true
 reth-node-events.workspace = true
 reth-consensus.workspace = true
 reth-optimism-primitives.workspace = true
-reth-prune-types.workspace = true
 reth-engine-util.workspace = true
 reth-prune.workspace = true
 
@@ -92,15 +88,7 @@ metrics-process.workspace = true
 proptest.workspace = true
 arbitrary.workspace = true
 proptest-arbitrary-interop.workspace = true
-rand.workspace = true
 
-# tui
-comfy-table = "7.1"
-crossterm = "0.27.0"
-ratatui = { version = "0.27", default-features = false, features = [
-    "crossterm",
-] }
-human_bytes = "0.4.1"
 
 # async
 tokio = { workspace = true, features = [
@@ -119,8 +107,6 @@ tempfile.workspace = true
 backon.workspace = true
 similar-asserts.workspace = true
 itertools.workspace = true
-rayon.workspace = true
-ahash = "0.8"
 
 # p2p
 discv5.workspace = true
@@ -130,8 +116,9 @@ tikv-jemallocator = { version = "0.5.0", optional = true }
 libc = "0.2"
 
 [dev-dependencies]
-jsonrpsee.workspace = true
-assert_matches = "1.5.0"
+reth-discv4.workspace = true
+
+
 
 [features]
 default = ["jemalloc"]

diff --git a/bin/reth/src/cli/mod.rs b/bin/reth/src/cli/mod.rs
@@ -6,14 +6,15 @@ use crate::{
         LogArgs,
     },
     commands::{
-        config_cmd, db, debug_cmd, dump_genesis, import, init_cmd, init_state,
+        config_cmd, debug_cmd, dump_genesis, import, init_cmd, init_state,
         node::{self, NoArgs},
         p2p, prune, recover, stage, test_vectors,
     },
     version::{LONG_VERSION, SHORT_VERSION},
 };
 use clap::{value_parser, Parser, Subcommand};
 use reth_chainspec::ChainSpec;
+use reth_cli_commands::db;
 use reth_cli_runner::CliRunner;
 use reth_db::DatabaseEnv;
 use reth_node_builder::{NodeBuilder, WithLaunchContext};

diff --git a/bin/reth/src/commands/debug_cmd/build_block.rs b/bin/reth/src/commands/debug_cmd/build_block.rs
@@ -1,9 +1,5 @@
 //! Command for debugging block building.
-
-use crate::{
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
-    macros::block_executor,
-};
+use crate::macros::block_executor;
 use alloy_rlp::Decodable;
 use clap::Parser;
 use eyre::Context;
@@ -14,6 +10,7 @@ use reth_beacon_consensus::EthBeaconConsensus;
 use reth_blockchain_tree::{
     BlockchainTree, BlockchainTreeConfig, ShareableBlockchainTree, TreeExternals,
 };
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_cli_runner::CliContext;
 use reth_consensus::Consensus;
 use reth_db::DatabaseEnv;

diff --git a/bin/reth/src/commands/debug_cmd/execution.rs b/bin/reth/src/commands/debug_cmd/execution.rs
@@ -2,13 +2,13 @@
 
 use crate::{
     args::{get_secret_key, NetworkArgs},
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
     macros::block_executor,
     utils::get_single_header,
 };
 use clap::Parser;
 use futures::{stream::select as stream_select, StreamExt};
 use reth_beacon_consensus::EthBeaconConsensus;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_cli_runner::CliContext;
 use reth_config::Config;
 use reth_consensus::Consensus;

diff --git a/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs b/bin/reth/src/commands/debug_cmd/in_memory_merkle.rs
@@ -2,12 +2,12 @@
 
 use crate::{
     args::{get_secret_key, NetworkArgs},
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
     macros::block_executor,
     utils::{get_single_body, get_single_header},
 };
 use backon::{ConstantBuilder, Retryable};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_cli_runner::CliContext;
 use reth_config::Config;
 use reth_db::DatabaseEnv;

diff --git a/bin/reth/src/commands/debug_cmd/merkle.rs b/bin/reth/src/commands/debug_cmd/merkle.rs
@@ -1,14 +1,13 @@
 //! Command for debugging merkle trie calculation.
-
 use crate::{
     args::{get_secret_key, NetworkArgs},
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
     macros::block_executor,
     utils::get_single_header,
 };
 use backon::{ConstantBuilder, Retryable};
 use clap::Parser;
 use reth_beacon_consensus::EthBeaconConsensus;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_cli_runner::CliContext;
 use reth_config::Config;
 use reth_consensus::Consensus;

diff --git a/bin/reth/src/commands/debug_cmd/replay_engine.rs b/bin/reth/src/commands/debug_cmd/replay_engine.rs
@@ -1,6 +1,5 @@
 use crate::{
     args::{get_secret_key, NetworkArgs},
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
     macros::block_executor,
 };
 use clap::Parser;
@@ -10,6 +9,7 @@ use reth_beacon_consensus::{hooks::EngineHooks, BeaconConsensusEngine, EthBeacon
 use reth_blockchain_tree::{
     BlockchainTree, BlockchainTreeConfig, ShareableBlockchainTree, TreeExternals,
 };
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_cli_runner::CliContext;
 use reth_config::Config;
 use reth_consensus::Consensus;

diff --git a/bin/reth/src/commands/import.rs b/bin/reth/src/commands/import.rs
@@ -1,13 +1,9 @@
 //! Command that initializes the node by importing a chain from a file.
-
-use crate::{
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
-    macros::block_executor,
-    version::SHORT_VERSION,
-};
+use crate::{macros::block_executor, version::SHORT_VERSION};
 use clap::Parser;
 use futures::{Stream, StreamExt};
 use reth_beacon_consensus::EthBeaconConsensus;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_config::Config;
 use reth_consensus::Consensus;
 use reth_db::tables;

diff --git a/bin/reth/src/commands/import_op.rs b/bin/reth/src/commands/import_op.rs
@@ -1,14 +1,8 @@
 //! Command that initializes the node by importing OP Mainnet chain segment below Bedrock, from a
 //! file.
-
-use crate::{
-    commands::{
-        common::{AccessRights, Environment, EnvironmentArgs},
-        import::build_import_pipeline,
-    },
-    version::SHORT_VERSION,
-};
+use crate::{commands::import::build_import_pipeline, version::SHORT_VERSION};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_consensus::noop::NoopConsensus;
 use reth_db::tables;
 use reth_db_api::transaction::DbTx;

diff --git a/bin/reth/src/commands/import_receipts_op.rs b/bin/reth/src/commands/import_receipts_op.rs
@@ -1,8 +1,8 @@
 //! Command that imports OP mainnet receipts from Bedrock datadir, exported via
 //! <https://github.com/testinprod-io/op-geth/pull/1>.
 
-use crate::commands::common::{AccessRights, Environment, EnvironmentArgs};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_db::tables;
 use reth_db_api::{database::Database, transaction::DbTx};
 use reth_downloaders::{

diff --git a/bin/reth/src/commands/init_cmd.rs b/bin/reth/src/commands/init_cmd.rs
@@ -1,7 +1,7 @@
 //! Command that initializes the node from a genesis file.
 
-use crate::commands::common::{AccessRights, Environment, EnvironmentArgs};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_provider::BlockHashReader;
 use tracing::info;
 

diff --git a/bin/reth/src/commands/init_state.rs b/bin/reth/src/commands/init_state.rs
@@ -1,7 +1,7 @@
 //! Command that initializes the node from a genesis file.
 
-use crate::commands::common::{AccessRights, Environment, EnvironmentArgs};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_config::config::EtlConfig;
 use reth_db_api::database::Database;
 use reth_db_common::init::init_from_state_dump;

diff --git a/bin/reth/src/commands/mod.rs b/bin/reth/src/commands/mod.rs
@@ -1,7 +1,6 @@
 //! This contains all of the `reth` commands
 
 pub mod config_cmd;
-pub mod db;
 pub mod debug_cmd;
 pub mod dump_genesis;
 pub mod import;
@@ -15,5 +14,3 @@ pub mod prune;
 pub mod recover;
 pub mod stage;
 pub mod test_vectors;
-
-pub mod common;
diff --git a/bin/reth/src/commands/prune.rs b/bin/reth/src/commands/prune.rs
@@ -1,7 +1,6 @@
 //! Command that runs pruning without any limits.
-
-use crate::commands::common::{AccessRights, Environment, EnvironmentArgs};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_prune::PrunerBuilder;
 use reth_static_file::StaticFileProducer;
 use tracing::info;

diff --git a/bin/reth/src/commands/recover/storage_tries.rs b/bin/reth/src/commands/recover/storage_tries.rs
@@ -1,5 +1,5 @@
-use crate::commands::common::{AccessRights, Environment, EnvironmentArgs};
 use clap::Parser;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_cli_runner::CliContext;
 use reth_db::tables;
 use reth_db_api::{

diff --git a/bin/reth/src/commands/stage/drop.rs b/bin/reth/src/commands/stage/drop.rs
@@ -1,11 +1,8 @@
 //! Database debugging tool
-
-use crate::{
-    args::StageEnum,
-    commands::common::{AccessRights, Environment, EnvironmentArgs},
-};
+use crate::args::StageEnum;
 use clap::Parser;
 use itertools::Itertools;
+use reth_cli_commands::common::{AccessRights, Environment, EnvironmentArgs};
 use reth_db::{static_file::iter_static_files, tables, DatabaseEnv};
 use reth_db_api::transaction::DbTxMut;
 use reth_db_common::{