refactor: strip ctx from hazmat and remove factory from rpc ctx (#22)

Author: prestwich

crates/rpc/src/ctx/full.rs

@@ -1,7 +1,7 @@
 use crate::{RuRevmState, SignetCtx};
 use alloy::{consensus::Header, eips::BlockId};
 use reth::{
-    providers::{ProviderFactory, ProviderResult, providers::BlockchainProvider},
+    providers::{ProviderResult, providers::BlockchainProvider},
     rpc::server_types::eth::{EthApiError, EthConfig},
     rpc::types::BlockNumberOrTag,
     tasks::{TaskExecutor, TaskSpawner},
@@ -102,7 +102,6 @@ where
     pub fn new<Tasks>(
         host: Host,
         constants: SignetSystemConstants,
-        factory: ProviderFactory<Signet>,
         provider: BlockchainProvider<Signet>,
         eth_config: EthConfig,
         tx_cache: Option<TxCache>,
@@ -111,7 +110,7 @@ where
     where
         Tasks: TaskSpawner + Clone + 'static,
     {
-        RpcCtxInner::new(host, constants, factory, provider, eth_config, tx_cache, spawner)
+        RpcCtxInner::new(host, constants, provider, eth_config, tx_cache, spawner)
             .map(|inner| Self { inner: Arc::new(inner) })
     }
 }
@@ -177,7 +176,6 @@ where
     pub fn new<Tasks>(
         host: Host,
         constants: SignetSystemConstants,
-        factory: ProviderFactory<Signet>,
         provider: BlockchainProvider<Signet>,
         eth_config: EthConfig,
         tx_cache: Option<TxCache>,
@@ -186,14 +184,12 @@ where
     where
         Tasks: TaskSpawner + Clone + 'static,
     {
-        SignetCtx::new(constants, factory, provider, eth_config, tx_cache, spawner).map(|signet| {
-            Self {
-                host,
-                signet,
-                shared: SharedContext {
-                    tracing_semaphores: Semaphore::new(eth_config.max_tracing_requests).into(),
-                },
-            }
+        SignetCtx::new(constants, provider, eth_config, tx_cache, spawner).map(|signet| Self {
+            host,
+            signet,
+            shared: SharedContext {
+                tracing_semaphores: Semaphore::new(eth_config.max_tracing_requests).into(),
+            },
         })
     }
 

crates/rpc/src/ctx/signet.rs

@@ -19,8 +19,8 @@ use reth::{
     primitives::{Block, Receipt, Recovered, RecoveredBlock, TransactionSigned},
     providers::{
         BlockHashReader, BlockIdReader, BlockNumReader, CanonStateSubscriptions, HeaderProvider,
-        ProviderBlock, ProviderError, ProviderFactory, ProviderReceipt, ProviderResult,
-        ReceiptProvider, StateProviderFactory, TransactionsProvider, providers::BlockchainProvider,
+        ProviderBlock, ProviderError, ProviderReceipt, ProviderResult, ReceiptProvider,
+        StateProviderFactory, TransactionsProvider, providers::BlockchainProvider,
     },
     revm::{database::StateProviderDatabase, primitives::hardfork::SpecId},
     rpc::{
@@ -65,7 +65,6 @@ where
     eth_config: EthConfig,
 
     // State stuff
-    factory: ProviderFactory<Inner>,
     provider: BlockchainProvider<Inner>,
     cache: EthStateCache<
         ProviderBlock<BlockchainProvider<Inner>>,
@@ -106,7 +105,6 @@ where
     /// [`CanonChainTracker`]: reth::providers::CanonChainTracker
     pub fn new<Tasks>(
         constants: SignetSystemConstants,
-        factory: ProviderFactory<Inner>,
         provider: BlockchainProvider<Inner>,
         eth_config: EthConfig,
         tx_cache: Option<TxCache>,
@@ -138,7 +136,6 @@ where
 
         Ok(Self {
             constants,
-            factory,
             provider,
             eth_config,
             cache,
@@ -156,11 +153,6 @@ where
         &self.constants
     }
 
-    /// Access the signet [`ProviderFactory`].
-    pub const fn factory(&self) -> &ProviderFactory<Inner> {
-        &self.factory
-    }
-
     /// Access the signet DB
     pub const fn provider(&self) -> &BlockchainProvider<Inner> {
         &self.provider

crates/rpc/src/inspect/endpoints.rs

@@ -1,30 +1,26 @@
-use std::sync::Arc;
-
 use crate::{
-    RpcCtx,
     inspect::db::{DbArgs, ListTableViewer},
     utils::{await_handler, response_tri},
 };
 use ajj::{HandlerCtx, ResponsePayload};
-use reth::providers::providers::ProviderNodeTypes;
+use reth::providers::{ProviderFactory, providers::ProviderNodeTypes};
 use reth_db::mdbx;
-use reth_node_api::FullNodeComponents;
 use signet_node_types::Pnt;
+use std::sync::Arc;
 
 /// Handler for the `db` endpoint in the `inspect` module.
-pub(super) async fn db<Host, Signet>(
+pub(super) async fn db<Signet>(
     hctx: HandlerCtx,
     args: DbArgs,
-    ctx: RpcCtx<Host, Signet>,
+    ctx: ProviderFactory<Signet>,
 ) -> ResponsePayload<Box<serde_json::value::RawValue>, String>
 where
-    Host: FullNodeComponents,
     Signet: Pnt + ProviderNodeTypes<DB = Arc<mdbx::DatabaseEnv>>,
 {
     let task = async move {
         let table: reth_db::Tables = response_tri!(args.table(), "invalid table name");
 
-        let viewer = ListTableViewer::new(ctx.signet().factory(), &args);
+        let viewer = ListTableViewer::new(&ctx, &args);
 
         response_tri!(table.view(&viewer), "Failed to view table");
 

crates/rpc/src/inspect/mod.rs

@@ -2,19 +2,15 @@ pub(crate) mod db;
 
 mod endpoints;
 
-use std::sync::Arc;
-
-use crate::RpcCtx;
-use reth::providers::providers::ProviderNodeTypes;
+use reth::providers::{ProviderFactory, providers::ProviderNodeTypes};
 use reth_db::mdbx;
-use reth_node_api::FullNodeComponents;
 use signet_node_types::Pnt;
+use std::sync::Arc;
 
 /// Instantiate the `inspect` API router.
-pub fn inspect<Host, Signet>() -> ajj::Router<RpcCtx<Host, Signet>>
+pub fn inspect<Signet>() -> ajj::Router<ProviderFactory<Signet>>
 where
-    Host: FullNodeComponents,
     Signet: Pnt + ProviderNodeTypes<DB = Arc<mdbx::DatabaseEnv>>,
 {
-    ajj::Router::new().route("db", endpoints::db::<Host, Signet>)
+    ajj::Router::new().route("db", endpoints::db::<Signet>)
 }

crates/rpc/src/lib.rs

@@ -79,7 +79,7 @@ pub mod utils;
 pub use ::ajj;
 
 use ajj::Router;
-use reth::providers::providers::ProviderNodeTypes;
+use reth::providers::{ProviderFactory, providers::ProviderNodeTypes};
 use reth_db::mdbx::DatabaseEnv;
 use reth_node_api::FullNodeComponents;
 use signet_node_types::Pnt;
@@ -98,10 +98,9 @@ where
 }
 
 /// Create a new hazmat router that exposes the `inspect` API.
-pub fn hazmat_router<Host, Signet>() -> Router<ctx::RpcCtx<Host, Signet>>
+pub fn hazmat_router<Signet>() -> Router<ProviderFactory<Signet>>
 where
-    Host: FullNodeComponents,
     Signet: Pnt + ProviderNodeTypes<DB = Arc<DatabaseEnv>>,
 {
-    ajj::Router::new().nest("inspect", inspect::inspect::<Host, Signet>())
+    ajj::Router::new().nest("inspect", inspect::inspect::<Signet>())
 }