chore(rpc): build rpc as OnComponentsInitializedHook

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

@@ -8,9 +8,8 @@ use reth_db_api::database::Database;
 use reth_engine_primitives::EngineTypes;
 use reth_errors::{BlockValidationError, ProviderResult, RethError, RethResult};
 use reth_network_p2p::{
-    bodies::client::BodiesClient,
-    headers::client::HeadersClient,
     sync::{NetworkSyncUpdater, SyncState},
+    BodiesClient, HeadersClient,
 };
 use reth_payload_builder::PayloadBuilderHandle;
 use reth_payload_primitives::{PayloadAttributes, PayloadBuilderAttributes};
@@ -20,8 +19,8 @@ use reth_primitives::{
     B256,
 };
 use reth_provider::{
-    BlockIdReader, BlockReader, BlockSource, CanonChainTracker, ChainSpecProvider, ProviderError,
-    StageCheckpointReader,
+    BlockIdReader, BlockReader, BlockSource, CanonChainTracker, ChainSpecProvider, EvmEnvProvider,
+    ProviderError, StageCheckpointReader, StateProviderFactory,
 };
 use reth_rpc_types::engine::{
     CancunPayloadFields, ExecutionPayload, ForkchoiceState, PayloadStatus, PayloadStatusEnum,
@@ -89,6 +88,33 @@ const MAX_INVALID_HEADERS: u32 = 512u32;
 /// If the distance exceeds this threshold, the pipeline will be used for sync.
 pub const MIN_BLOCKS_FOR_PIPELINE_RUN: u64 = EPOCH_SLOTS;
 
+/// Helper trait, unifies data access from blockchain tree and database.
+pub trait FullBlockchainTreeEngine:
+    BlockchainTreeEngine
+    + BlockReader
+    + BlockIdReader
+    + CanonChainTracker
+    + StageCheckpointReader
+    + ChainSpecProvider
+    + StateProviderFactory
+    + EvmEnvProvider
+    + Unpin
+{
+}
+
+impl<T> FullBlockchainTreeEngine for T where
+    T: BlockchainTreeEngine
+        + BlockReader
+        + BlockIdReader
+        + CanonChainTracker
+        + StageCheckpointReader
+        + ChainSpecProvider
+        + StateProviderFactory
+        + EvmEnvProvider
+        + Unpin
+{
+}
+
 /// The beacon consensus engine is the driver that switches between historical and live sync.
 ///
 /// The beacon consensus engine is itself driven by messages from the Consensus Layer, which are
@@ -221,13 +247,7 @@ where
 impl<DB, BT, Client, EngineT> BeaconConsensusEngine<DB, BT, Client, EngineT>
 where
     DB: Database + Unpin + 'static,
-    BT: BlockchainTreeEngine
-        + BlockReader
-        + BlockIdReader
-        + CanonChainTracker
-        + StageCheckpointReader
-        + ChainSpecProvider
-        + 'static,
+    BT: FullBlockchainTreeEngine + ChainSpecProvider + 'static,
     Client: HeadersClient + BodiesClient + Clone + Unpin + 'static,
     EngineT: EngineTypes + Unpin + 'static,
 {
@@ -1787,14 +1807,7 @@ impl<DB, BT, Client, EngineT> Future for BeaconConsensusEngine<DB, BT, Client, E
 where
     DB: Database + Unpin + 'static,
     Client: HeadersClient + BodiesClient + Clone + Unpin + 'static,
-    BT: BlockchainTreeEngine
-        + BlockReader
-        + BlockIdReader
-        + CanonChainTracker
-        + StageCheckpointReader
-        + ChainSpecProvider
-        + Unpin
-        + 'static,
+    BT: FullBlockchainTreeEngine + ChainSpecProvider + Unpin + 'static,
     EngineT: EngineTypes + Unpin + 'static,
 {
     type Output = Result<(), BeaconConsensusEngineError>;

crates/e2e-test-utils/src/node.rs

@@ -25,9 +25,9 @@ where
     Node: FullNodeComponents,
 {
     pub inner: FullNode<Node>,
-    pub payload: PayloadTestContext<Node::Engine>,
+    pub payload: PayloadTestContext<Node::EngineTypes>,
     pub network: NetworkTestContext,
-    pub engine_api: EngineApiTestContext<Node::Engine>,
+    pub engine_api: EngineApiTestContext<Node::EngineTypes>,
     pub rpc: RpcTestContext<Node>,
 }
 
@@ -46,7 +46,7 @@ where
             engine_api: EngineApiTestContext {
                 engine_api_client: node.auth_server_handle().http_client(),
                 canonical_stream: node.provider.canonical_state_stream(),
-                _marker: PhantomData::<Node::Engine>,
+                _marker: PhantomData::<Node::EngineTypes>,
             },
             rpc: RpcTestContext { inner: node.rpc_registry },
         })
@@ -66,17 +66,17 @@ where
         &mut self,
         length: u64,
         tx_generator: impl Fn(u64) -> Pin<Box<dyn Future<Output = Bytes>>>,
-        attributes_generator: impl Fn(u64) -> <Node::Engine as PayloadTypes>::PayloadBuilderAttributes
+        attributes_generator: impl Fn(u64) -> <Node::EngineTypes as PayloadTypes>::PayloadBuilderAttributes
             + Copy,
     ) -> eyre::Result<
         Vec<(
-            <Node::Engine as PayloadTypes>::BuiltPayload,
-            <Node::Engine as PayloadTypes>::PayloadBuilderAttributes,
+            <Node::EngineTypes as PayloadTypes>::BuiltPayload,
+            <Node::EngineTypes as PayloadTypes>::PayloadBuilderAttributes,
         )>,
     >
     where
-        <Node::Engine as EngineTypes>::ExecutionPayloadV3:
-            From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
+        <Node::EngineTypes as EngineTypes>::ExecutionPayloadV3:
+            From<<Node::EngineTypes as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
     {
         let mut chain = Vec::with_capacity(length as usize);
         for i in 0..length {
@@ -97,14 +97,17 @@ where
     /// It triggers the resolve payload via engine api and expects the built payload event.
     pub async fn new_payload(
         &mut self,
-        attributes_generator: impl Fn(u64) -> <Node::Engine as PayloadTypes>::PayloadBuilderAttributes,
+        attributes_generator: impl Fn(
+            u64,
+        )
+            -> <Node::EngineTypes as PayloadTypes>::PayloadBuilderAttributes,
     ) -> eyre::Result<(
-        <<Node as NodeTypes>::Engine as PayloadTypes>::BuiltPayload,
-        <<Node as NodeTypes>::Engine as PayloadTypes>::PayloadBuilderAttributes,
+        <<Node as NodeTypes>::EngineTypes as PayloadTypes>::BuiltPayload,
+        <<Node as NodeTypes>::EngineTypes as PayloadTypes>::PayloadBuilderAttributes,
     )>
     where
-        <Node::Engine as EngineTypes>::ExecutionPayloadV3:
-            From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
+        <Node::EngineTypes as EngineTypes>::ExecutionPayloadV3:
+            From<<Node::EngineTypes as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
     {
         // trigger new payload building draining the pool
         let eth_attr = self.payload.new_payload(attributes_generator).await.unwrap();
@@ -122,14 +125,17 @@ where
     pub async fn advance_block(
         &mut self,
         versioned_hashes: Vec<B256>,
-        attributes_generator: impl Fn(u64) -> <Node::Engine as PayloadTypes>::PayloadBuilderAttributes,
+        attributes_generator: impl Fn(
+            u64,
+        )
+            -> <Node::EngineTypes as PayloadTypes>::PayloadBuilderAttributes,
     ) -> eyre::Result<(
-        <Node::Engine as PayloadTypes>::BuiltPayload,
-        <<Node as NodeTypes>::Engine as PayloadTypes>::PayloadBuilderAttributes,
+        <Node::EngineTypes as PayloadTypes>::BuiltPayload,
+        <<Node as NodeTypes>::EngineTypes as PayloadTypes>::PayloadBuilderAttributes,
     )>
     where
-        <Node::Engine as EngineTypes>::ExecutionPayloadV3:
-            From<<Node::Engine as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
+        <Node::EngineTypes as EngineTypes>::ExecutionPayloadV3:
+            From<<Node::EngineTypes as PayloadTypes>::BuiltPayload> + PayloadEnvelopeExt,
     {
         let (payload, eth_attr) = self.new_payload(attributes_generator).await?;
 

crates/ethereum/node/src/node.rs

@@ -43,7 +43,7 @@ impl EthereumNode {
     >
     where
         Node: FullNodeTypes,
-        <Node as NodeTypes>::Engine: PayloadTypes<
+        <Node as NodeTypes>::EngineTypes: PayloadTypes<
             BuiltPayload = EthBuiltPayload,
             PayloadAttributes = EthPayloadAttributes,
             PayloadBuilderAttributes = EthPayloadBuilderAttributes,
@@ -61,12 +61,12 @@ impl EthereumNode {
 
 impl NodeTypes for EthereumNode {
     type Primitives = ();
-    type Engine = EthEngineTypes;
+    type EngineTypes = EthEngineTypes;
 }
 
 impl<N> Node<N> for EthereumNode
 where
-    N: FullNodeTypes<Engine = EthEngineTypes>,
+    N: FullNodeTypes<EngineTypes = EthEngineTypes>,
 {
     type ComponentsBuilder = ComponentsBuilder<
         N,
@@ -188,7 +188,7 @@ impl<Node, Pool> PayloadServiceBuilder<Node, Pool> for EthereumPayloadBuilder
 where
     Pool: TransactionPool + Unpin + 'static,
     Node: FullNodeTypes,
-    <Node as NodeTypes>::Engine: PayloadTypes<
+    <Node as NodeTypes>::EngineTypes: PayloadTypes<
         BuiltPayload = EthBuiltPayload,
         PayloadAttributes = EthPayloadAttributes,
         PayloadBuilderAttributes = EthPayloadBuilderAttributes,
@@ -198,7 +198,7 @@ where
         self,
         ctx: &BuilderContext<Node>,
         pool: Pool,
-    ) -> eyre::Result<PayloadBuilderHandle<Node::Engine>> {
+    ) -> eyre::Result<PayloadBuilderHandle<Node::EngineTypes>> {
         let payload_builder = reth_ethereum_payload_builder::EthereumPayloadBuilder::default();
         let conf = ctx.payload_builder_config();
 

crates/ethereum/node/tests/e2e/dev.rs

@@ -19,7 +19,7 @@ async fn can_run_dev_node() -> eyre::Result<()> {
     Ok(())
 }
 
-async fn assert_chain_advances(mut node: EthNode) {
+async fn assert_chain_advances(node: EthNode) {
     let mut notifications = node.inner.provider.canonical_state_stream();
 
     // submit tx through rpc

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

@@ -15,7 +15,7 @@ fn test_basic_setup() {
         .with_database(db)
         .with_types::<EthereumNode>()
         .with_components(EthereumNode::components())
-        .on_component_initialized(move |ctx| {
+        .on_components_initialized(move |ctx| {
             let _provider = ctx.provider();
             println!("{msg}");
             Ok(())

crates/exex/exex/src/context.rs

@@ -74,7 +74,9 @@ impl<Node: FullNodeComponents> ExExContext<Node> {
     }
 
     /// Returns the handle to the payload builder service.
-    pub fn payload_builder(&self) -> &reth_payload_builder::PayloadBuilderHandle<Node::Engine> {
+    pub fn payload_builder(
+        &self,
+    ) -> &reth_payload_builder::PayloadBuilderHandle<Node::EngineTypes> {
         self.components.payload_builder()
     }
 

crates/exex/test-utils/src/lib.rs

@@ -110,12 +110,12 @@ pub struct TestNode;
 
 impl NodeTypes for TestNode {
     type Primitives = ();
-    type Engine = EthEngineTypes;
+    type EngineTypes = EthEngineTypes;
 }
 
 impl<N> Node<N> for TestNode
 where
-    N: FullNodeTypes<Engine = EthEngineTypes>,
+    N: FullNodeTypes<EngineTypes = EthEngineTypes>,
 {
     type ComponentsBuilder = ComponentsBuilder<
         N,

crates/net/network/src/lib.rs

@@ -151,4 +151,5 @@ pub use session::{
 pub use transactions::{FilterAnnouncement, MessageFilter, ValidateTx68};
 
 pub use reth_eth_wire::{DisconnectReason, HelloMessageWithProtocols};
+pub use reth_network_p2p::{BodiesClient, FullClient, HeadersClient};
 pub use reth_network_types::{PeersConfig, SessionsConfig};

crates/net/p2p/src/lib.rs

@@ -44,3 +44,10 @@ pub mod sync;
 /// Common test helpers for mocking out Consensus, Downloaders and Header Clients.
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;
+
+pub use bodies::client::BodiesClient;
+pub use headers::client::HeadersClient;
+
+pub trait FullClient: HeadersClient + BodiesClient + Unpin {}
+
+impl<T> FullClient for T where T: HeadersClient + BodiesClient + Unpin {}

crates/node/api/Cargo.toml

@@ -21,3 +21,6 @@ reth-network.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-primitives.workspace = true
 reth-tasks.workspace = true
+
+# misc
+auto_impl.workspace = true