feat: add TableSet generic to the node builder pattern

bin/reth/src/cli/mod.rs

@@ -152,9 +152,8 @@ impl<C: ChainSpecParser<ChainSpec = ChainSpec>, Ext: clap::Args + fmt::Debug> Cl
 
         let runner = CliRunner::default();
         match self.command {
-            Commands::Node(command) => {
-                runner.run_command_until_exit(|ctx| command.execute(ctx, launcher))
-            }
+            Commands::Node(command) => runner
+                .run_command_until_exit(|ctx| command.execute::<EthereumNode, _, _>(ctx, launcher)),
             Commands::Init(command) => {
                 runner.run_blocking_until_ctrl_c(command.execute::<EthereumNode>())
             }

crates/cli/commands/src/common.rs

@@ -6,7 +6,7 @@ use reth_chainspec::EthChainSpec;
 use reth_cli::chainspec::ChainSpecParser;
 use reth_config::{config::EtlConfig, Config};
 use reth_consensus::noop::NoopConsensus;
-use reth_db::{init_db, open_db_read_only, DatabaseEnv};
+use reth_db::{mdbx::init_db_for, open_db_read_only, DatabaseEnv};
 use reth_db_common::init::init_genesis;
 use reth_downloaders::{bodies::noop::NoopBodiesDownloader, headers::noop::NoopHeaderDownloader};
 use reth_evm::noop::NoopBlockExecutorProvider;
@@ -86,7 +86,7 @@ impl<C: ChainSpecParser> EnvironmentArgs<C> {
         info!(target: "reth::cli", ?db_path, ?sf_path, "Opening storage");
         let (db, sfp) = match access {
             AccessRights::RW => (
-                Arc::new(init_db(db_path, self.db.database_args())?),
+                Arc::new(init_db_for::<_, N::Storage>(db_path, self.db.database_args())?),
                 StaticFileProvider::read_write(sf_path)?,
             ),
             AccessRights::RO => (

crates/cli/commands/src/node.rs

@@ -5,7 +5,7 @@ use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_cli::chainspec::ChainSpecParser;
 use reth_cli_runner::CliContext;
 use reth_cli_util::parse_socket_address;
-use reth_db::{init_db, DatabaseEnv};
+use reth_db::{mdbx::init_db_for, DatabaseEnv};
 use reth_ethereum_cli::chainspec::EthereumChainSpecParser;
 use reth_node_builder::{NodeBuilder, WithLaunchContext};
 use reth_node_core::{
@@ -18,6 +18,8 @@ use reth_node_core::{
 };
 use std::{ffi::OsString, fmt, future::Future, net::SocketAddr, path::PathBuf, sync::Arc};
 
+use crate::common::CliNodeTypes;
+
 /// Start the node
 #[derive(Debug, Parser)]
 pub struct NodeCommand<
@@ -137,7 +139,11 @@ impl<
     ///
     /// This transforms the node command into a node config and launches the node using the given
     /// closure.
-    pub async fn execute<L, Fut>(self, ctx: CliContext, launcher: L) -> eyre::Result<()>
+    pub async fn execute<N: CliNodeTypes<ChainSpec = C::ChainSpec>, L, Fut>(
+        self,
+        ctx: CliContext,
+        launcher: L,
+    ) -> eyre::Result<()>
     where
         L: FnOnce(WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, C::ChainSpec>>, Ext) -> Fut,
         Fut: Future<Output = eyre::Result<()>>,
@@ -183,7 +189,9 @@ impl<
         let db_path = data_dir.db();
 
         tracing::info!(target: "reth::cli", path = ?db_path, "Opening database");
-        let database = Arc::new(init_db(db_path.clone(), self.db.database_args())?.with_metrics());
+        let database = Arc::new(
+            init_db_for::<_, N::Storage>(db_path.clone(), self.db.database_args())?.with_metrics(),
+        );
 
         if with_unused_ports {
             node_config = node_config.with_unused_ports();

crates/cli/commands/src/stage/dump/mod.rs

@@ -3,7 +3,10 @@ use crate::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
 use clap::Parser;
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_cli::chainspec::ChainSpecParser;
-use reth_db::{init_db, mdbx::DatabaseArguments, tables, DatabaseEnv};
+use reth_db::{
+    mdbx::{init_db_for, DatabaseArguments},
+    tables, DatabaseEnv,
+};
 use reth_db_api::{
     cursor::DbCursorRO, database::Database, models::ClientVersion, table::TableImporter,
     transaction::DbTx,
@@ -125,7 +128,8 @@ pub(crate) fn setup<N: NodeTypesWithDB>(
 
     info!(target: "reth::cli", ?output_db, "Creating separate db");
 
-    let output_datadir = init_db(output_db, DatabaseArguments::new(ClientVersion::default()))?;
+    let output_datadir =
+        init_db_for::<_, N::Storage>(output_db, DatabaseArguments::new(ClientVersion::default()))?;
 
     output_datadir.update(|tx| {
         tx.import_table_with_range::<tables::BlockBodyIndices, _>(

crates/node/types/Cargo.toml

@@ -17,6 +17,7 @@ reth-db-api.workspace = true
 reth-engine-primitives.workspace = true
 reth-primitives-traits.workspace = true
 reth-trie-db.workspace = true
+reth-db.workspace = true
 
 [features]
 default = ["std"]

crates/node/types/src/lib.rs

@@ -10,6 +10,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use core::{fmt::Debug, marker::PhantomData};
+use reth_db::TableSet;
 pub use reth_primitives_traits::{
     Block, BlockBody, FullBlock, FullNodePrimitives, FullReceipt, FullSignedTx, NodePrimitives,
 };
@@ -35,7 +36,7 @@ pub trait NodeTypes: Send + Sync + Unpin + 'static {
     /// The type used to perform state commitment operations.
     type StateCommitment: StateCommitment;
     /// The type responsible for writing chain primitives to storage.
-    type Storage: Default + Send + Sync + Unpin + Debug + 'static;
+    type Storage: TableSet + Default + Send + Sync + Unpin + Debug + 'static;
 }
 
 /// The type that configures an Ethereum-like node with an engine for consensus.
@@ -153,7 +154,7 @@ where
     P: NodePrimitives + Send + Sync + Unpin + 'static,
     C: EthChainSpec<Header = P::BlockHeader> + 'static,
     SC: StateCommitment,
-    S: Default + Send + Sync + Unpin + Debug + 'static,
+    S: TableSet + Default + Send + Sync + Unpin + Debug + 'static,
 {
     type Primitives = P;
     type ChainSpec = C;
@@ -214,7 +215,7 @@ where
     E: EngineTypes + Send + Sync + Unpin,
     C: EthChainSpec<Header = P::BlockHeader> + 'static,
     SC: StateCommitment,
-    S: Default + Send + Sync + Unpin + Debug + 'static,
+    S: TableSet + Default + Send + Sync + Unpin + Debug + 'static,
 {
     type Primitives = P;
     type ChainSpec = C;
@@ -228,7 +229,7 @@ where
     E: EngineTypes + Send + Sync + Unpin,
     C: EthChainSpec<Header = P::BlockHeader> + 'static,
     SC: StateCommitment,
-    S: Default + Send + Sync + Unpin + Debug + 'static,
+    S: TableSet + Default + Send + Sync + Unpin + Debug + 'static,
 {
     type Engine = E;
 }

crates/optimism/cli/src/lib.rs

@@ -147,7 +147,7 @@ where
         let runner = CliRunner::default();
         match self.command {
             Commands::Node(command) => {
-                runner.run_command_until_exit(|ctx| command.execute(ctx, launcher))
+                runner.run_command_until_exit(|ctx| command.execute::<OpNode, _, _>(ctx, launcher))
             }
             Commands::Init(command) => {
                 runner.run_blocking_until_ctrl_c(command.execute::<OpNode>())

crates/optimism/node/src/node.rs

@@ -9,7 +9,11 @@ use crate::{
 use alloy_consensus::Header;
 use reth_basic_payload_builder::{BasicPayloadJobGenerator, BasicPayloadJobGeneratorConfig};
 use reth_chainspec::{EthChainSpec, EthereumHardforks, Hardforks};
-use reth_db::transaction::{DbTx, DbTxMut};
+use reth_db::{
+    table::TableInfo,
+    transaction::{DbTx, DbTxMut},
+    TableSet, Tables,
+};
 use reth_evm::{execute::BasicBlockExecutorProvider, ConfigureEvm};
 use reth_network::{NetworkConfig, NetworkHandle, NetworkManager, PeersInfo};
 use reth_node_api::{AddOnsContext, EngineValidator, FullNodeComponents, NodeAddOns, TxTy};
@@ -105,6 +109,12 @@ impl ChainStorage<OpPrimitives> for OpStorage {
     }
 }
 
+impl TableSet for OpStorage {
+    fn tables() -> Box<dyn Iterator<Item = Box<dyn TableInfo>>> {
+        Tables::tables()
+    }
+}
+
 /// Type configuration for a regular Optimism node.
 #[derive(Debug, Default, Clone)]
 #[non_exhaustive]

crates/storage/provider/src/providers/database/mod.rs

@@ -14,7 +14,10 @@ use alloy_eips::{
 use alloy_primitives::{Address, BlockHash, BlockNumber, TxHash, TxNumber, B256, U256};
 use core::fmt;
 use reth_chainspec::{ChainInfo, EthereumHardforks};
-use reth_db::{init_db, mdbx::DatabaseArguments, DatabaseEnv};
+use reth_db::{
+    mdbx::{init_db_for, DatabaseArguments},
+    DatabaseEnv,
+};
 use reth_db_api::{database::Database, models::StoredBlockBodyIndices};
 use reth_errors::{RethError, RethResult};
 use reth_evm::ConfigureEvmEnv;
@@ -135,7 +138,7 @@ impl<N: NodeTypesWithDB<DB = Arc<DatabaseEnv>>> ProviderFactory<N> {
         static_file_provider: StaticFileProvider<N::Primitives>,
     ) -> RethResult<Self> {
         Ok(Self {
-            db: Arc::new(init_db(path, args).map_err(RethError::msg)?),
+            db: Arc::new(init_db_for::<_, N::Storage>(path, args).map_err(RethError::msg)?),
             chain_spec,
             static_file_provider,
             prune_modes: PruneModes::none(),

crates/storage/storage-api/src/chain.rs

@@ -4,9 +4,10 @@ use reth_chainspec::{ChainSpecProvider, EthereumHardforks};
 use reth_db::{
     cursor::{DbCursorRO, DbCursorRW},
     models::{StoredBlockOmmers, StoredBlockWithdrawals},
+    table::TableInfo,
     tables,
     transaction::{DbTx, DbTxMut},
-    DbTxUnwindExt,
+    DbTxUnwindExt, TableSet, Tables,
 };
 use reth_primitives_traits::{Block, BlockBody, FullNodePrimitives};
 use reth_storage_errors::provider::ProviderResult;
@@ -167,3 +168,9 @@ where
         Ok(bodies)
     }
 }
+
+impl TableSet for EthStorage {
+    fn tables() -> Box<dyn Iterator<Item = Box<dyn TableInfo>>> {
+        Tables::tables()
+    }
+}