chore: rename Block*Provider for Block*Reader (paradigmxyz#3385)

bin/reth/src/args/rpc_server_args.rs

@@ -8,8 +8,7 @@ use clap::{
 use futures::{FutureExt, TryFutureExt};
 use reth_network_api::{NetworkInfo, Peers};
 use reth_provider::{
-    BlockProviderIdExt, CanonStateSubscriptions, EvmEnvProvider, HeaderProvider,
-    StateProviderFactory,
+    BlockReaderIdExt, CanonStateSubscriptions, EvmEnvProvider, HeaderProvider, StateProviderFactory,
 };
 use reth_rpc::{
     eth::{
@@ -248,7 +247,7 @@ impl RpcServerArgs {
         jwt_secret: JwtSecret,
     ) -> Result<(RpcServerHandle, AuthServerHandle), RpcError>
     where
-        Provider: BlockProviderIdExt
+        Provider: BlockReaderIdExt
             + HeaderProvider
             + StateProviderFactory
             + EvmEnvProvider
@@ -306,7 +305,7 @@ impl RpcServerArgs {
         events: Events,
     ) -> Result<RpcServerHandle, RpcError>
     where
-        Provider: BlockProviderIdExt
+        Provider: BlockReaderIdExt
             + HeaderProvider
             + StateProviderFactory
             + EvmEnvProvider
@@ -341,7 +340,7 @@ impl RpcServerArgs {
         jwt_secret: JwtSecret,
     ) -> Result<AuthServerHandle, RpcError>
     where
-        Provider: BlockProviderIdExt
+        Provider: BlockReaderIdExt
             + HeaderProvider
             + StateProviderFactory
             + EvmEnvProvider

bin/reth/src/node/mod.rs

@@ -41,7 +41,7 @@ use reth_network::{error::NetworkError, NetworkConfig, NetworkHandle, NetworkMan
 use reth_network_api::NetworkInfo;
 use reth_primitives::{stage::StageId, BlockHashOrNumber, ChainSpec, Head, SealedHeader, H256};
 use reth_provider::{
-    BlockHashProvider, BlockProvider, CanonStateSubscriptions, HeaderProvider, ProviderFactory,
+    BlockHashReader, BlockReader, CanonStateSubscriptions, HeaderProvider, ProviderFactory,
     StageCheckpointReader,
 };
 use reth_revm::Factory;
@@ -498,7 +498,7 @@ impl Command {
         default_peers_path: PathBuf,
     ) -> Result<NetworkHandle, NetworkError>
     where
-        C: BlockProvider + HeaderProvider + Clone + Unpin + 'static,
+        C: BlockReader + HeaderProvider + Clone + Unpin + 'static,
         Pool: TransactionPool + Unpin + 'static,
     {
         let client = config.client.clone();
@@ -725,7 +725,7 @@ async fn run_network_until_shutdown<C>(
     network: NetworkManager<C>,
     persistent_peers_file: Option<PathBuf>,
 ) where
-    C: BlockProvider + HeaderProvider + Clone + Unpin + 'static,
+    C: BlockReader + HeaderProvider + Clone + Unpin + 'static,
 {
     pin_mut!(network, shutdown);
 

crates/blockchain-tree/src/blockchain_tree.rs

@@ -22,9 +22,8 @@ use reth_primitives::{
 use reth_provider::{
     chain::{ChainSplit, SplitAt},
     post_state::PostState,
-    BlockNumProvider, CanonStateNotification, CanonStateNotificationSender,
-    CanonStateNotifications, Chain, DatabaseProvider, DisplayBlocksChain, ExecutorFactory,
-    HeaderProvider,
+    BlockNumReader, CanonStateNotification, CanonStateNotificationSender, CanonStateNotifications,
+    Chain, DatabaseProvider, DisplayBlocksChain, ExecutorFactory, HeaderProvider,
 };
 use std::{
     collections::{BTreeMap, HashMap},

crates/consensus/auto-seal/src/lib.rs

@@ -20,7 +20,7 @@ use reth_primitives::{
     BlockBody, BlockHash, BlockHashOrNumber, BlockNumber, ChainSpec, Header, SealedBlock,
     SealedHeader, H256, U256,
 };
-use reth_provider::{BlockProviderIdExt, CanonStateNotificationSender};
+use reth_provider::{BlockReaderIdExt, CanonStateNotificationSender};
 use reth_transaction_pool::TransactionPool;
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{mpsc::UnboundedSender, RwLock, RwLockReadGuard, RwLockWriteGuard};
@@ -90,7 +90,7 @@ pub struct AutoSealBuilder<Client, Pool> {
 
 impl<Client, Pool: TransactionPool> AutoSealBuilder<Client, Pool>
 where
-    Client: BlockProviderIdExt,
+    Client: BlockReaderIdExt,
 {
     /// Creates a new builder instance to configure all parts.
     pub fn new(

crates/consensus/beacon/src/engine/mod.rs

@@ -21,7 +21,7 @@ use reth_primitives::{
     H256, U256,
 };
 use reth_provider::{
-    BlockProvider, BlockSource, CanonChainTracker, ProviderError, StageCheckpointReader,
+    BlockReader, BlockSource, CanonChainTracker, ProviderError, StageCheckpointReader,
 };
 use reth_rpc_types::engine::{
     ExecutionPayload, ForkchoiceUpdated, PayloadAttributes, PayloadStatus, PayloadStatusEnum,
@@ -217,7 +217,7 @@ pub struct BeaconConsensusEngine<DB, BT, Client>
 where
     DB: Database,
     Client: HeadersClient + BodiesClient,
-    BT: BlockchainTreeEngine + BlockProvider + CanonChainTracker + StageCheckpointReader,
+    BT: BlockchainTreeEngine + BlockReader + CanonChainTracker + StageCheckpointReader,
 {
     /// Controls syncing triggered by engine updates.
     sync: EngineSyncController<DB, Client>,
@@ -257,7 +257,7 @@ where
 impl<DB, BT, Client> BeaconConsensusEngine<DB, BT, Client>
 where
     DB: Database + Unpin + 'static,
-    BT: BlockchainTreeEngine + BlockProvider + CanonChainTracker + StageCheckpointReader + 'static,
+    BT: BlockchainTreeEngine + BlockReader + CanonChainTracker + StageCheckpointReader + 'static,
     Client: HeadersClient + BodiesClient + Clone + Unpin + 'static,
 {
     /// Create a new instance of the [BeaconConsensusEngine].
@@ -1288,7 +1288,7 @@ where
     DB: Database + Unpin + 'static,
     Client: HeadersClient + BodiesClient + Clone + Unpin + 'static,
     BT: BlockchainTreeEngine
-        + BlockProvider
+        + BlockReader
         + CanonChainTracker
         + StageCheckpointReader
         + Unpin

crates/net/network/src/config.rs

@@ -12,7 +12,7 @@ use reth_dns_discovery::DnsDiscoveryConfig;
 use reth_ecies::util::pk2id;
 use reth_eth_wire::{HelloMessage, Status};
 use reth_primitives::{ChainSpec, ForkFilter, Head, NodeRecord, PeerId, MAINNET};
-use reth_provider::{BlockProvider, HeaderProvider};
+use reth_provider::{BlockReader, HeaderProvider};
 use reth_tasks::{TaskSpawner, TokioTaskExecutor};
 use secp256k1::SECP256K1;
 use std::{
@@ -97,7 +97,7 @@ impl<C> NetworkConfig<C> {
 
 impl<C> NetworkConfig<C>
 where
-    C: BlockProvider + HeaderProvider + Clone + Unpin + 'static,
+    C: BlockReader + HeaderProvider + Clone + Unpin + 'static,
 {
     /// Starts the networking stack given a [NetworkConfig] and returns a handle to the network.
     pub async fn start_network(self) -> Result<NetworkHandle, NetworkError> {

crates/net/network/src/eth_requests.rs

@@ -8,7 +8,7 @@ use reth_eth_wire::{
 };
 use reth_interfaces::p2p::error::RequestResult;
 use reth_primitives::{BlockBody, BlockHashOrNumber, Header, HeadersDirection, PeerId};
-use reth_provider::{BlockProvider, HeaderProvider};
+use reth_provider::{BlockReader, HeaderProvider};
 use std::{
     borrow::Borrow,
     future::Future,
@@ -70,7 +70,7 @@ impl<C> EthRequestHandler<C> {
 
 impl<C> EthRequestHandler<C>
 where
-    C: BlockProvider + HeaderProvider,
+    C: BlockReader + HeaderProvider,
 {
     /// Returns the list of requested headers
     fn get_headers_response(&self, request: GetBlockHeaders) -> Vec<Header> {
@@ -190,7 +190,7 @@ where
 /// This should be spawned or used as part of `tokio::select!`.
 impl<C> Future for EthRequestHandler<C>
 where
-    C: BlockProvider + HeaderProvider + Unpin,
+    C: BlockReader + HeaderProvider + Unpin,
 {
     type Output = ();
 

crates/net/network/src/lib.rs

@@ -50,7 +50,7 @@
 //! ### Configure and launch a standalone network
 //!
 //! The [`NetworkConfig`] is used to configure the network.
-//! It requires an instance of [`BlockProvider`](reth_provider::BlockProvider).
+//! It requires an instance of [`BlockReader`](reth_provider::BlockReader).
 //!
 //! ```
 //! # async fn launch() {

crates/net/network/src/manager.rs

@@ -42,7 +42,7 @@ use reth_metrics::common::mpsc::UnboundedMeteredSender;
 use reth_net_common::bandwidth_meter::BandwidthMeter;
 use reth_network_api::ReputationChangeKind;
 use reth_primitives::{listener::EventListeners, NodeRecord, PeerId, H256};
-use reth_provider::BlockProvider;
+use reth_provider::BlockReader;
 use reth_rpc_types::{EthProtocolInfo, NetworkStatus};
 use std::{
     net::SocketAddr,
@@ -156,7 +156,7 @@ impl<C> NetworkManager<C> {
 
 impl<C> NetworkManager<C>
 where
-    C: BlockProvider,
+    C: BlockReader,
 {
     /// Creates the manager of a new network.
     ///
@@ -586,7 +586,7 @@ where
 
 impl<C> Future for NetworkManager<C>
 where
-    C: BlockProvider + Unpin,
+    C: BlockReader + Unpin,
 {
     type Output = ();
 

crates/net/network/src/state.rs

@@ -16,7 +16,7 @@ use reth_eth_wire::{
 };
 use reth_network_api::PeerKind;
 use reth_primitives::{ForkId, PeerId, H256};
-use reth_provider::BlockProvider;
+use reth_provider::BlockReader;
 use std::{
     collections::{HashMap, VecDeque},
     net::{IpAddr, SocketAddr},
@@ -65,7 +65,7 @@ pub struct NetworkState<C> {
 
 impl<C> NetworkState<C>
 where
-    C: BlockProvider,
+    C: BlockReader,
 {
     /// Create a new state instance with the given params
     pub(crate) fn new(

crates/net/network/src/swarm.rs

@@ -12,7 +12,7 @@ use reth_eth_wire::{
     DisconnectReason, EthVersion, Status,
 };
 use reth_primitives::PeerId;
-use reth_provider::BlockProvider;
+use reth_provider::BlockReader;
 use std::{
     io,
     net::SocketAddr,
@@ -77,7 +77,7 @@ pub(crate) struct Swarm<C> {
 
 impl<C> Swarm<C>
 where
-    C: BlockProvider,
+    C: BlockReader,
 {
     /// Configures a new swarm instance.
     pub(crate) fn new(
@@ -291,7 +291,7 @@ where
 
 impl<C> Stream for Swarm<C>
 where
-    C: BlockProvider + Unpin,
+    C: BlockReader + Unpin,
 {
     type Item = SwarmEvent;
 

crates/net/network/src/test_utils/testnet.rs

@@ -8,7 +8,7 @@ use futures::{FutureExt, StreamExt};
 use pin_project::pin_project;
 use reth_eth_wire::{capability::Capability, DisconnectReason, HelloBuilder};
 use reth_primitives::PeerId;
-use reth_provider::{test_utils::NoopProvider, BlockProvider, HeaderProvider};
+use reth_provider::{test_utils::NoopProvider, BlockReader, HeaderProvider};
 use secp256k1::SecretKey;
 use std::{
     fmt,
@@ -34,7 +34,7 @@ pub struct Testnet<C> {
 
 impl<C> Testnet<C>
 where
-    C: BlockProvider + HeaderProvider + Clone,
+    C: BlockReader + HeaderProvider + Clone,
 {
     /// Same as [`Self::try_create_with`] but panics on error
     pub async fn create_with(num_peers: usize, provider: C) -> Self {
@@ -122,7 +122,7 @@ where
 
 impl<C> Testnet<C>
 where
-    C: BlockProvider + HeaderProvider + Unpin + 'static,
+    C: BlockReader + HeaderProvider + Unpin + 'static,
 {
     /// Spawns the testnet to a separate task
     pub fn spawn(self) -> TestnetHandle<C> {
@@ -176,7 +176,7 @@ impl<C> fmt::Debug for Testnet<C> {
 
 impl<C> Future for Testnet<C>
 where
-    C: BlockProvider + HeaderProvider + Unpin,
+    C: BlockReader + HeaderProvider + Unpin,
 {
     type Output = ();
 
@@ -220,7 +220,7 @@ pub struct Peer<C> {
 
 impl<C> Peer<C>
 where
-    C: BlockProvider + HeaderProvider + Clone,
+    C: BlockReader + HeaderProvider + Clone,
 {
     /// Returns the number of connected peers.
     pub fn num_peers(&self) -> usize {
@@ -249,7 +249,7 @@ where
 
 impl<C> Future for Peer<C>
 where
-    C: BlockProvider + HeaderProvider + Unpin,
+    C: BlockReader + HeaderProvider + Unpin,
 {
     type Output = ();
 
@@ -275,7 +275,7 @@ pub struct PeerConfig<C = NoopProvider> {
 
 impl<C> PeerConfig<C>
 where
-    C: BlockProvider + HeaderProvider + Clone,
+    C: BlockReader + HeaderProvider + Clone,
 {
     /// Launches the network and returns the [Peer] that manages it
     pub async fn launch(self) -> Result<Peer<C>, NetworkError> {

crates/payload/basic/src/lib.rs

@@ -23,7 +23,7 @@ use reth_primitives::{
     proofs, Block, BlockNumberOrTag, ChainSpec, Header, IntoRecoveredTransaction, Receipt,
     SealedBlock, Withdrawal, EMPTY_OMMER_ROOT, H256, U256,
 };
-use reth_provider::{BlockProviderIdExt, BlockSource, PostState, StateProviderFactory};
+use reth_provider::{BlockReaderIdExt, BlockSource, PostState, StateProviderFactory};
 use reth_revm::{
     database::{State, SubState},
     env::tx_env_with_recovered,
@@ -98,7 +98,7 @@ impl<Client, Pool, Tasks> BasicPayloadJobGenerator<Client, Pool, Tasks> {}
 
 impl<Client, Pool, Tasks> PayloadJobGenerator for BasicPayloadJobGenerator<Client, Pool, Tasks>
 where
-    Client: StateProviderFactory + BlockProviderIdExt + Clone + Unpin + 'static,
+    Client: StateProviderFactory + BlockReaderIdExt + Clone + Unpin + 'static,
     Pool: TransactionPool + Unpin + 'static,
     Tasks: TaskSpawner + Clone + Unpin + 'static,
 {

crates/revm/src/executor.rs

@@ -654,7 +654,7 @@ mod tests {
     };
     use reth_provider::{
         post_state::{AccountChanges, Storage, StorageTransition, StorageWipe},
-        AccountReader, BlockHashProvider, StateProvider, StateRootProvider,
+        AccountReader, BlockHashReader, StateProvider, StateRootProvider,
     };
     use reth_rlp::Decodable;
     use std::{collections::HashMap, str::FromStr};
@@ -700,7 +700,7 @@ mod tests {
         }
     }
 
-    impl BlockHashProvider for StateProviderTest {
+    impl BlockHashReader for StateProviderTest {
         fn block_hash(&self, number: u64) -> reth_interfaces::Result<Option<H256>> {
             Ok(self.block_hash.get(&number).cloned())
         }

crates/rpc/rpc-builder/src/auth.rs

@@ -11,7 +11,7 @@ use jsonrpsee::{
 };
 use reth_network_api::{NetworkInfo, Peers};
 use reth_provider::{
-    BlockProviderIdExt, EvmEnvProvider, HeaderProvider, ReceiptProviderIdExt, StateProviderFactory,
+    BlockReaderIdExt, EvmEnvProvider, HeaderProvider, ReceiptProviderIdExt, StateProviderFactory,
 };
 use reth_rpc::{
     eth::{cache::EthStateCache, gas_oracle::GasPriceOracle},
@@ -38,7 +38,7 @@ pub async fn launch<Provider, Pool, Network, Tasks, EngineApi>(
     secret: JwtSecret,
 ) -> Result<AuthServerHandle, RpcError>
 where
-    Provider: BlockProviderIdExt
+    Provider: BlockReaderIdExt
         + ReceiptProviderIdExt
         + HeaderProvider
         + StateProviderFactory
@@ -82,7 +82,7 @@ pub async fn launch_with_eth_api<Provider, Pool, Network, EngineApi>(
     secret: JwtSecret,
 ) -> Result<AuthServerHandle, RpcError>
 where
-    Provider: BlockProviderIdExt
+    Provider: BlockReaderIdExt
         + HeaderProvider
         + StateProviderFactory
         + EvmEnvProvider