refactor: move PNT down

Author: prestwich

crates/journaler/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "signet-journaler"
+description = "Manager replayable journals for signet"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+authors.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+trevm.workspace = true

crates/journaler/src/lib.rs

@@ -0,0 +1 @@
+

crates/node-types/src/lib.rs

@@ -11,6 +11,9 @@
 #![deny(unused_must_use, rust_2018_idioms)]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
+mod utils;
+pub use utils::{NodeTypesDbTrait, Pnt};
+
 use reth::{
     primitives::EthPrimitives,
     providers::{
@@ -96,21 +99,6 @@ where
     type DB = Db;
 }
 
-/// Convenience trait to aggregate the DB requirements
-pub trait NodeTypesDbTrait:
-    reth_db::database::Database + reth_db::database_metrics::DatabaseMetrics + Clone + Unpin + 'static
-{
-}
-
-impl<T> NodeTypesDbTrait for T where
-    T: reth_db::database::Database
-        + reth_db::database_metrics::DatabaseMetrics
-        + Clone
-        + Unpin
-        + 'static
-{
-}
-
 /// Shim to impl [`CanonStateSubscriptions`]
 #[derive(Debug, Clone)]
 pub struct SharedCanonState<Db> {
@@ -172,3 +160,15 @@ where
         self.sender.subscribe()
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[allow(dead_code)]
+    fn compile_check() {
+        fn inner<P: Pnt>() {}
+
+        inner::<SignetNodeTypes<std::sync::Arc<reth_db::mdbx::DatabaseEnv>>>();
+    }
+}

crates/node-types/src/utils.rs

@@ -0,0 +1,36 @@
+use reth::{primitives::EthPrimitives, providers::providers::ProviderNodeTypes};
+use reth_chainspec::ChainSpec;
+use reth_db::mdbx;
+use std::sync::Arc;
+
+/// Convenience trait for specifying the [`ProviderNodeTypes`] implementation
+/// required for Signet functionality. This is used to condense many trait
+/// bounds.
+pub trait Pnt:
+    ProviderNodeTypes<ChainSpec = ChainSpec, Primitives = EthPrimitives, DB = Arc<mdbx::DatabaseEnv>>
+{
+}
+
+impl<T> Pnt for T where
+    T: ProviderNodeTypes<
+            ChainSpec = ChainSpec,
+            Primitives = EthPrimitives,
+            DB = Arc<mdbx::DatabaseEnv>,
+        >
+{
+}
+
+/// Convenience trait to aggregate the DB requirements
+pub trait NodeTypesDbTrait:
+    reth_db::database::Database + reth_db::database_metrics::DatabaseMetrics + Clone + Unpin + 'static
+{
+}
+
+impl<T> NodeTypesDbTrait for T where
+    T: reth_db::database::Database
+        + reth_db::database_metrics::DatabaseMetrics
+        + Clone
+        + Unpin
+        + 'static
+{
+}

crates/rpc/Cargo.toml

@@ -38,6 +38,7 @@ tokio-util = "0.7.13"
 tower-http = { version = "0.6.2", features = ["cors"] }
 tracing.workspace = true
 serde_json.workspace = true
+signet-node-types.workspace = true
 
 [dev-dependencies]
 signet-zenith.workspace = true

crates/rpc/src/config.rs

@@ -1,10 +1,9 @@
+use crate::utils::{serve_axum, serve_ipc, serve_ws};
 use ajj::{Router, pubsub::ServerShutdown};
 use reth::{args::RpcServerArgs, tasks::TaskExecutor};
 use std::net::SocketAddr;
 use tokio::task::JoinHandle;
 
-use crate::util::{serve_axum, serve_ipc, serve_ws};
-
 /// Guard to shutdown the RPC servers. When dropped, this will shutdown all
 /// running servers
 #[derive(Default)]

crates/rpc/src/ctx.rs

@@ -1,9 +1,8 @@
 use crate::{
-    Pnt,
     eth::EthError,
     interest::{ActiveFilter, FilterManager, FilterOutput, SubscriptionManager},
     receipts::build_signet_receipt,
-    util::BlockRangeInclusiveIter,
+    utils::BlockRangeInclusiveIter,
 };
 use alloy::{
     consensus::{BlockHeader, Header, Signed, Transaction, TxEnvelope},
@@ -39,6 +38,7 @@ use reth_chainspec::{BaseFeeParams, ChainSpec, ChainSpecProvider};
 use reth_node_api::{BlockBody, FullNodeComponents};
 use reth_rpc_eth_api::{RpcBlock, RpcConvert, RpcReceipt, RpcTransaction};
 use signet_evm::EvmNeedsTx;
+use signet_node_types::Pnt;
 use signet_tx_cache::client::TxCache;
 use signet_types::{MagicSig, constants::SignetSystemConstants};
 use std::{marker::PhantomData, sync::Arc};

crates/rpc/src/eth/endpoints.rs

@@ -1,10 +1,9 @@
 use crate::{
-    Pnt,
     ctx::RpcCtx,
     eth::{CallErrorData, EthError},
     interest::{FilterOutput, InterestKind},
     receipts::build_signet_receipt,
-    util::{await_jh_option, await_jh_option_response, response_tri},
+    utils::{await_jh_option, await_jh_option_response, response_tri},
 };
 use ajj::{HandlerCtx, ResponsePayload};
 use alloy::{
@@ -28,6 +27,7 @@ use reth_node_api::FullNodeComponents;
 use reth_rpc_eth_api::{RpcBlock, RpcHeader, RpcReceipt, RpcTransaction};
 use serde::Deserialize;
 use signet_evm::EvmErrored;
+use signet_node_types::Pnt;
 use std::borrow::Cow;
 use tracing::{Instrument, debug, trace_span};
 use trevm::revm::context::result::ExecutionResult;

crates/rpc/src/eth/mod.rs

@@ -7,9 +7,10 @@ pub use error::EthError;
 mod helpers;
 pub use helpers::CallErrorData;
 
-use crate::{Pnt, ctx::RpcCtx};
+use crate::ctx::RpcCtx;
 use alloy::{eips::BlockNumberOrTag, primitives::B256};
 use reth_node_api::FullNodeComponents;
+use signet_node_types::Pnt;
 
 /// Instantiate the `eth` API router.
 pub fn eth<Host, Signet>() -> ajj::Router<RpcCtx<Host, Signet>>

crates/rpc/src/inspect/db.rs

@@ -1,9 +1,10 @@
-use crate::Pnt;
 use ajj::serde_json;
+use core::borrow::Borrow;
 use eyre::WrapErr;
 use reth::providers::ProviderFactory;
 use reth_db::{Database, TableViewer, table::Table};
 use reth_db_common::{DbTool, ListFilter};
+use signet_node_types::Pnt;
 use std::sync::OnceLock;
 use tracing::instrument;
 
@@ -103,9 +104,13 @@ impl<N: Pnt> TableViewer<()> for ListTableViewer<'_, '_, N> {
         let tool = DbTool { provider_factory: self.factory.clone() };
 
         self.factory.db_ref().view(|tx| {
-            let table_db =
-                tx.inner.open_db(Some(self.args.table_name())).wrap_err("Could not open db.")?;
+            let table_db = tx
+                .borrow()
+                .inner
+                .open_db(Some(self.args.table_name()))
+                .wrap_err("Could not open db.")?;
             let stats = tx
+                .borrow()
                 .inner
                 .db_stat(&table_db)
                 .wrap_err(format!("Could not find table: {}", stringify!($table)))?;