chore(rpc): expose ethapi in node builder for op customisation

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

@@ -13,7 +13,8 @@ fn test_basic_setup() {
     let _builder = NodeBuilder::new(config)
         .with_database(db)
         .with_types::<EthereumNode>()
-        .with_components::<_, EthereumAddOns>(EthereumNode::components())
+        .with_components(EthereumNode::components())
+        .with_add_ons::<EthereumAddOns>()
         .on_component_initialized(move |ctx| {
             let _provider = ctx.provider();
             println!("{msg}");

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

@@ -32,7 +32,8 @@ fn basic_exex() {
     let _builder = NodeBuilder::new(config)
         .with_database(db)
         .with_types::<EthereumNode>()
-        .with_components::<_, EthereumAddOns>(EthereumNode::components())
+        .with_components(EthereumNode::components())
+        .with_add_ons::<EthereumAddOns>()
         .install_exex("dummy", move |ctx| future::ok(DummyExEx { _ctx: ctx }))
         .check_launch();
 }

crates/node/builder/src/builder/mod.rs

@@ -221,7 +221,7 @@ where
     where
         N: Node<RethFullAdapter<DB, N>>,
     {
-        self.with_types().with_components(node.components_builder())
+        self.with_types().with_components(node.components_builder()).with_add_ons::<N::AddOns>()
     }
 }
 
@@ -270,7 +270,7 @@ where
     where
         N: Node<RethFullAdapter<DB, N>>,
     {
-        self.with_types().with_components(node.components_builder())
+        self.with_types().with_components(node.components_builder()).with_add_ons::<N::AddOns>()
     }
 
     /// Launches a preconfigured [Node]
@@ -314,16 +314,37 @@ where
     T: NodeTypes,
 {
     /// Advances the state of the node builder to the next state where all components are configured
-    pub fn with_components<CB, AO>(
+    pub fn with_components<CB>(
         self,
         components_builder: CB,
+    ) -> WithLaunchContext<NodeBuilderWithComponents<RethFullAdapter<DB, T>, CB, ()>>
+    where
+        CB: NodeComponentsBuilder<RethFullAdapter<DB, T>>,
+    {
+        WithLaunchContext {
+            builder: self.builder.with_components(components_builder),
+            task_executor: self.task_executor,
+        }
+    }
+}
+
+impl<T, DB, CB> WithLaunchContext<NodeBuilderWithComponents<RethFullAdapter<DB, T>, CB, ()>>
+where
+    DB: Database + DatabaseMetrics + DatabaseMetadata + Clone + Unpin + 'static,
+    T: NodeTypes,
+    CB: NodeComponentsBuilder<RethFullAdapter<DB, T>>,
+{
+    /// Advances the state of the node builder to the next state where all customizable
+    /// [`NodeAddOns`] types are configured.
+    pub fn with_add_ons<AO>(
+        self,
     ) -> WithLaunchContext<NodeBuilderWithComponents<RethFullAdapter<DB, T>, CB, AO>>
     where
         CB: NodeComponentsBuilder<RethFullAdapter<DB, T>>,
         AO: NodeAddOns<NodeAdapter<RethFullAdapter<DB, T>, CB::Components>>,
     {
         WithLaunchContext {
-            builder: self.builder.with_components(components_builder),
+            builder: self.builder.with_add_ons::<AO>(),
             task_executor: self.task_executor,
         }
     }

crates/node/builder/src/builder/states.rs

@@ -40,13 +40,9 @@ impl<T: FullNodeTypes> NodeBuilderWithTypes<T> {
     }
 
     /// Advances the state of the node builder to the next state where all components are configured
-    pub fn with_components<CB, AO>(
-        self,
-        components_builder: CB,
-    ) -> NodeBuilderWithComponents<T, CB, AO>
+    pub fn with_components<CB>(self, components_builder: CB) -> NodeBuilderWithComponents<T, CB, ()>
     where
         CB: NodeComponentsBuilder<T>,
-        AO: NodeAddOns<NodeAdapter<T, CB::Components>>,
     {
         let Self { config, adapter } = self;
 
@@ -56,7 +52,7 @@ impl<T: FullNodeTypes> NodeBuilderWithTypes<T> {
             components_builder,
             add_ons: AddOns {
                 hooks: NodeHooks::default(),
-                rpc: RpcAddOns { _eth_api: PhantomData, hooks: RpcHooks::default() },
+                rpc: RpcAddOns { _eth_api: PhantomData::<()>, hooks: RpcHooks::default() },
                 exexs: Vec::new(),
             },
         }
@@ -165,6 +161,32 @@ pub struct NodeBuilderWithComponents<
     pub(crate) add_ons: AddOns<NodeAdapter<T, CB::Components>, AO>,
 }
 
+impl<T, CB> NodeBuilderWithComponents<T, CB, ()>
+where
+    T: FullNodeTypes,
+    CB: NodeComponentsBuilder<T>,
+{
+    /// Advances the state of the node builder to the next state where all customizable
+    /// [`NodeAddOns`] types are configured.
+    pub fn with_add_ons<AO>(self) -> NodeBuilderWithComponents<T, CB, AO>
+    where
+        AO: NodeAddOns<NodeAdapter<T, CB::Components>>,
+    {
+        let Self { config, adapter, components_builder, .. } = self;
+
+        NodeBuilderWithComponents {
+            config,
+            adapter,
+            components_builder,
+            add_ons: AddOns {
+                hooks: NodeHooks::default(),
+                rpc: RpcAddOns { _eth_api: PhantomData::<AO::EthApi>, hooks: RpcHooks::default() },
+                exexs: Vec::new(),
+            },
+        }
+    }
+}
+
 impl<T, CB, AO> NodeBuilderWithComponents<T, CB, AO>
 where
     T: FullNodeTypes,
@@ -247,8 +269,6 @@ where
     }
 }
 
-// TODO impl install hook functions.
-
 impl<T, CB, AO> NodeBuilderWithComponents<T, CB, AO>
 where
     T: FullNodeTypes,

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

@@ -13,7 +13,8 @@ fn test_basic_setup() {
     let _builder = NodeBuilder::new(config)
         .with_database(db)
         .with_types::<OptimismNode>()
-        .with_components::<_, OptimismAddOns>(OptimismNode::components(Default::default()))
+        .with_components(OptimismNode::components(Default::default()))
+        .with_add_ons::<OptimismAddOns>()
         .on_component_initialized(move |ctx| {
             let _provider = ctx.provider();
             Ok(())

examples/custom-evm/src/main.rs

@@ -179,9 +179,8 @@ async fn main() -> eyre::Result<()> {
         // configure the node with regular ethereum types
         .with_types::<EthereumNode>()
         // use default ethereum components but with our executor
-        .with_components::<_, EthereumAddOns>(
-            EthereumNode::components().executor(MyExecutorBuilder::default()),
-        )
+        .with_components(EthereumNode::components().executor(MyExecutorBuilder::default()))
+        .with_add_ons::<EthereumAddOns>()
         .launch()
         .await
         .unwrap();

examples/custom-node-components/src/main.rs

@@ -22,9 +22,8 @@ fn main() {
                 .with_types::<EthereumNode>()
                 // Configure the components of the node
                 // use default ethereum components but use our custom pool
-                .with_components::<_, EthereumAddOns>(
-                    EthereumNode::components().pool(CustomPoolBuilder::default()),
-                )
+                .with_components(EthereumNode::components().pool(CustomPoolBuilder::default()))
+                .with_add_ons::<EthereumAddOns>()
                 .launch()
                 .await?;
 

examples/custom-payload-builder/src/main.rs

@@ -75,9 +75,10 @@ fn main() {
                 .with_types::<EthereumNode>()
                 // Configure the components of the node
                 // use default ethereum components but use our custom payload builder
-                .with_components::<_, EthereumAddOns>(
+                .with_components(
                     EthereumNode::components().payload(CustomPayloadBuilder::default()),
                 )
+                .with_add_ons::<EthereumAddOns>()
                 .launch()
                 .await?;
 

examples/stateful-precompile/src/main.rs

@@ -243,9 +243,8 @@ async fn main() -> eyre::Result<()> {
         // configure the node with regular ethereum types
         .with_types::<EthereumNode>()
         // use default ethereum components but with our executor
-        .with_components::<_, EthereumAddOns>(
-            EthereumNode::components().executor(MyExecutorBuilder::default()),
-        )
+        .with_components(EthereumNode::components().executor(MyExecutorBuilder::default()))
+        .with_add_ons::<EthereumAddOns>()
         .launch()
         .await
         .unwrap();