use BlockchainProviderFactory on node

bin/reth/src/main.rs

@@ -13,7 +13,7 @@ use reth_node_builder::{
     EngineNodeLauncher,
 };
 use reth_node_ethereum::{node::EthereumAddOns, EthereumNode};
-use reth_provider::providers::BlockchainProvider2;
+use reth_provider::providers::BlockchainProviderFactory;
 use reth_tracing::tracing::warn;
 use tracing::info;
 
@@ -73,7 +73,7 @@ fn main() {
                         .with_persistence_threshold(engine_args.persistence_threshold)
                         .with_memory_block_buffer_target(engine_args.memory_block_buffer_target);
                     let handle = builder
-                        .with_types_and_provider::<EthereumNode, BlockchainProvider2<_>>()
+                        .with_types_and_provider::<EthereumNode, BlockchainProviderFactory<_>>()
                         .with_components(EthereumNode::components())
                         .with_add_ons(EthereumAddOns::default())
                         .launch_with_fn(|builder| {

crates/engine/service/src/service.rs

@@ -19,7 +19,7 @@ use reth_network_p2p::BlockClient;
 use reth_node_types::NodeTypesWithEngine;
 use reth_payload_builder::PayloadBuilderHandle;
 use reth_payload_validator::ExecutionPayloadValidator;
-use reth_provider::{providers::BlockchainProvider2, ProviderFactory};
+use reth_provider::{providers::BlockchainProviderFactory, ProviderFactory};
 use reth_prune::PrunerWithFactory;
 use reth_stages_api::{MetricEventsSender, Pipeline};
 use reth_tasks::TaskSpawner;
@@ -73,7 +73,7 @@ where
         pipeline: Pipeline<N>,
         pipeline_task_spawner: Box<dyn TaskSpawner>,
         provider: ProviderFactory<N>,
-        blockchain_db: BlockchainProvider2<N>,
+        blockchain_db: BlockchainProviderFactory<N>,
         pruner: PrunerWithFactory<ProviderFactory<N>>,
         payload_builder: PayloadBuilderHandle<N::Engine>,
         tree_config: TreeConfig,
@@ -151,7 +151,10 @@ mod tests {
     use reth_exex_types::FinishedExExHeight;
     use reth_network_p2p::test_utils::TestFullBlockClient;
     use reth_primitives::SealedHeader;
-    use reth_provider::test_utils::create_test_provider_factory_with_chain_spec;
+    use reth_provider::{
+        providers::BlockchainProviderFactory,
+        test_utils::create_test_provider_factory_with_chain_spec,
+    };
     use reth_prune::Pruner;
     use reth_tasks::TokioTaskExecutor;
     use std::sync::Arc;
@@ -179,9 +182,11 @@ mod tests {
         let provider_factory = create_test_provider_factory_with_chain_spec(chain_spec.clone());
 
         let executor_factory = EthExecutorProvider::ethereum(chain_spec.clone());
-        let blockchain_db =
-            BlockchainProvider2::with_latest(provider_factory.clone(), SealedHeader::default())
-                .unwrap();
+        let blockchain_db = BlockchainProviderFactory::with_latest(
+            provider_factory.clone(),
+            SealedHeader::default(),
+        )
+        .unwrap();
 
         let (_tx, rx) = watch::channel(FinishedExExHeight::NoExExs);
         let pruner = Pruner::new_with_factory(provider_factory.clone(), vec![], 0, 0, None, rx);

crates/ethereum/node/tests/it/builder.rs

@@ -9,7 +9,7 @@ use reth_db::{
 use reth_node_api::NodeTypesWithDBAdapter;
 use reth_node_builder::{EngineNodeLauncher, FullNodeComponents, NodeBuilder, NodeConfig};
 use reth_node_ethereum::node::{EthereumAddOns, EthereumNode};
-use reth_provider::providers::BlockchainProvider2;
+use reth_provider::providers::BlockchainProviderFactory;
 use reth_tasks::TaskManager;
 
 #[test]
@@ -47,22 +47,21 @@ async fn test_eth_launcher() {
     let tasks = TaskManager::current();
     let config = NodeConfig::test();
     let db = create_test_rw_db();
-    let _builder =
-        NodeBuilder::new(config)
-            .with_database(db)
-            .with_types_and_provider::<EthereumNode, BlockchainProvider2<
-                NodeTypesWithDBAdapter<EthereumNode, Arc<TempDatabase<DatabaseEnv>>>,
-            >>()
-            .with_components(EthereumNode::components())
-            .with_add_ons(EthereumAddOns::default())
-            .launch_with_fn(|builder| {
-                let launcher = EngineNodeLauncher::new(
-                    tasks.executor(),
-                    builder.config.datadir(),
-                    Default::default(),
-                );
-                builder.launch_with(launcher)
-            });
+    let _builder = NodeBuilder::new(config)
+        .with_database(db)
+        .with_types_and_provider::<EthereumNode, BlockchainProviderFactory<
+            NodeTypesWithDBAdapter<EthereumNode, Arc<TempDatabase<DatabaseEnv>>>,
+        >>()
+        .with_components(EthereumNode::components())
+        .with_add_ons(EthereumAddOns::default())
+        .launch_with_fn(|builder| {
+            let launcher = EngineNodeLauncher::new(
+                tasks.executor(),
+                builder.config.datadir(),
+                Default::default(),
+            );
+            builder.launch_with(launcher)
+        });
 }
 
 #[test]

crates/exex/exex/src/manager.rs

@@ -642,8 +642,8 @@ mod tests {
     use reth_evm_ethereum::execute::EthExecutorProvider;
     use reth_primitives::SealedBlockWithSenders;
     use reth_provider::{
-        providers::BlockchainProvider2, test_utils::create_test_provider_factory, BlockReader,
-        BlockWriter, Chain, DatabaseProviderFactory, TransactionVariant,
+        providers::BlockchainProviderFactory, test_utils::create_test_provider_factory,
+        BlockReader, BlockWriter, Chain, DatabaseProviderFactory, TransactionVariant,
     };
     use reth_testing_utils::generators::{self, random_block, BlockParams};
 
@@ -1019,7 +1019,7 @@ mod tests {
     async fn exex_handle_new() {
         let provider_factory = create_test_provider_factory();
         init_genesis(&provider_factory).unwrap();
-        let provider = BlockchainProvider2::new(provider_factory).unwrap();
+        let provider = BlockchainProviderFactory::new(provider_factory).unwrap();
 
         let temp_dir = tempfile::tempdir().unwrap();
         let wal = Wal::new(temp_dir.path()).unwrap();
@@ -1074,7 +1074,7 @@ mod tests {
     async fn test_notification_if_finished_height_gt_chain_tip() {
         let provider_factory = create_test_provider_factory();
         init_genesis(&provider_factory).unwrap();
-        let provider = BlockchainProvider2::new(provider_factory).unwrap();
+        let provider = BlockchainProviderFactory::new(provider_factory).unwrap();
 
         let temp_dir = tempfile::tempdir().unwrap();
         let wal = Wal::new(temp_dir.path()).unwrap();
@@ -1124,7 +1124,7 @@ mod tests {
     async fn test_sends_chain_reorged_notification() {
         let provider_factory = create_test_provider_factory();
         init_genesis(&provider_factory).unwrap();
-        let provider = BlockchainProvider2::new(provider_factory).unwrap();
+        let provider = BlockchainProviderFactory::new(provider_factory).unwrap();
 
         let temp_dir = tempfile::tempdir().unwrap();
         let wal = Wal::new(temp_dir.path()).unwrap();
@@ -1167,7 +1167,7 @@ mod tests {
     async fn test_sends_chain_reverted_notification() {
         let provider_factory = create_test_provider_factory();
         init_genesis(&provider_factory).unwrap();
-        let provider = BlockchainProvider2::new(provider_factory).unwrap();
+        let provider = BlockchainProviderFactory::new(provider_factory).unwrap();
 
         let temp_dir = tempfile::tempdir().unwrap();
         let wal = Wal::new(temp_dir.path()).unwrap();
@@ -1227,7 +1227,7 @@ mod tests {
         provider_rw.insert_block(block.clone()).unwrap();
         provider_rw.commit().unwrap();
 
-        let provider = BlockchainProvider2::new(provider_factory).unwrap();
+        let provider = BlockchainProviderFactory::new(provider_factory).unwrap();
 
         let temp_dir = tempfile::tempdir().unwrap();
         let wal = Wal::new(temp_dir.path()).unwrap();

crates/exex/exex/src/notifications.rs

@@ -378,8 +378,8 @@ mod tests {
     use reth_evm_ethereum::execute::EthExecutorProvider;
     use reth_primitives::Block;
     use reth_provider::{
-        providers::BlockchainProvider2, test_utils::create_test_provider_factory, BlockWriter,
-        Chain, DatabaseProviderFactory,
+        providers::BlockchainProviderFactory, test_utils::create_test_provider_factory,
+        BlockWriter, Chain, DatabaseProviderFactory,
     };
     use reth_testing_utils::generators::{self, random_block, BlockParams};
     use tokio::sync::mpsc;
@@ -397,7 +397,7 @@ mod tests {
             .block(genesis_hash.into())?
             .ok_or_else(|| eyre::eyre!("genesis block not found"))?;
 
-        let provider = BlockchainProvider2::new(provider_factory.clone())?;
+        let provider = BlockchainProviderFactory::new(provider_factory.clone())?;
 
         let node_head_block = random_block(
             &mut rng,
@@ -478,7 +478,7 @@ mod tests {
             .block(genesis_hash.into())?
             .ok_or_else(|| eyre::eyre!("genesis block not found"))?;
 
-        let provider = BlockchainProvider2::new(provider_factory)?;
+        let provider = BlockchainProviderFactory::new(provider_factory)?;
 
         let node_head =
             Head { number: genesis_block.number, hash: genesis_hash, ..Default::default() };
@@ -535,7 +535,7 @@ mod tests {
             .block(genesis_hash.into())?
             .ok_or_else(|| eyre::eyre!("genesis block not found"))?;
 
-        let provider = BlockchainProvider2::new(provider_factory)?;
+        let provider = BlockchainProviderFactory::new(provider_factory)?;
 
         let node_head_block = random_block(
             &mut rng,
@@ -635,7 +635,7 @@ mod tests {
             .block(genesis_hash.into())?
             .ok_or_else(|| eyre::eyre!("genesis block not found"))?;
 
-        let provider = BlockchainProvider2::new(provider_factory)?;
+        let provider = BlockchainProviderFactory::new(provider_factory)?;
 
         let exex_head_block = random_block(
             &mut rng,

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

@@ -39,7 +39,9 @@ use reth_node_metrics::{
 };
 use reth_primitives::Head;
 use reth_provider::{
-    providers::{BlockchainProvider, BlockchainProvider2, ProviderNodeTypes, StaticFileProvider},
+    providers::{
+        BlockchainProvider, BlockchainProviderFactory, ProviderNodeTypes, StaticFileProvider,
+    },
     BlockHashReader, CanonStateNotificationSender, ChainSpecProvider, ProviderFactory,
     ProviderResult, StageCheckpointReader, StateProviderFactory, StaticFileProviderFactory,
     TreeViewer,
@@ -78,7 +80,7 @@ impl<N: NodeTypesWithDB> WithTree for BlockchainProvider<N> {
     }
 }
 
-impl<N: NodeTypesWithDB> WithTree for BlockchainProvider2<N> {
+impl<N: NodeTypesWithDB> WithTree for BlockchainProviderFactory<N> {
     fn set_tree(self, _tree: Arc<dyn TreeViewer>) -> Self {
         self
     }

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

@@ -29,7 +29,7 @@ use reth_node_core::{
 use reth_node_events::{cl::ConsensusLayerHealthEvents, node};
 use reth_payload_primitives::PayloadBuilder;
 use reth_primitives::EthereumHardforks;
-use reth_provider::providers::{BlockchainProvider2, ProviderNodeTypes};
+use reth_provider::providers::{BlockchainProviderFactory, ProviderNodeTypes};
 use reth_rpc_engine_api::{capabilities::EngineCapabilities, EngineApi};
 use reth_tasks::TaskExecutor;
 use reth_tokio_util::EventSender;
@@ -72,7 +72,7 @@ impl EngineNodeLauncher {
 impl<Types, T, CB, AO> LaunchNode<NodeBuilderWithComponents<T, CB, AO>> for EngineNodeLauncher
 where
     Types: ProviderNodeTypes + NodeTypesWithEngine,
-    T: FullNodeTypes<Types = Types, Provider = BlockchainProvider2<Types>>,
+    T: FullNodeTypes<Types = Types, Provider = BlockchainProviderFactory<Types>>,
     CB: NodeComponentsBuilder<T>,
     AO: NodeAddOns<
         NodeAdapter<T, CB::Components>,
@@ -133,7 +133,7 @@ where
             // passing FullNodeTypes as type parameter here so that we can build
             // later the components.
             .with_blockchain_db::<T, _>(move |provider_factory| {
-                Ok(BlockchainProvider2::new(provider_factory)?)
+                Ok(BlockchainProviderFactory::new(provider_factory)?)
             }, tree_config, canon_state_notification_sender)?
             .with_components(components_builder, on_component_initialized).await?;
 

crates/optimism/bin/src/main.rs

@@ -7,7 +7,7 @@ use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};
 use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli};
 use reth_optimism_node::{args::RollupArgs, node::OptimismAddOns, OptimismNode};
 use reth_optimism_rpc::SequencerClient;
-use reth_provider::providers::BlockchainProvider2;
+use reth_provider::providers::{BlockchainProviderFactory};
 
 use tracing as _;
 
@@ -32,7 +32,7 @@ fn main() {
                         .with_persistence_threshold(rollup_args.persistence_threshold)
                         .with_memory_block_buffer_target(rollup_args.memory_block_buffer_target);
                     let handle = builder
-                        .with_types_and_provider::<OptimismNode, BlockchainProvider2<_>>()
+                        .with_types_and_provider::<OptimismNode, BlockchainProviderFactory<_>>()
                         .with_components(OptimismNode::components(rollup_args))
                         .with_add_ons(OptimismAddOns::new(sequencer_http_arg.clone()))
                         .extend_rpc_modules(move |ctx| {