minimize

Author: tac0turtle

bin/lumen/src/consensus_builder.rs

@@ -7,7 +7,6 @@
 
 pub mod attributes;
 pub mod builder;
-pub mod consensus_builder;
 pub mod error;
 pub mod validator;
 
@@ -18,6 +17,7 @@ use alloy_rpc_types::engine::{
 use clap::Parser;
 use lumen_rollkit::{
     config::RollkitConfig,
+    consensus::RollkitConsensusBuilder,
     rpc::txpool::{RollkitTxpoolApiImpl, RollkitTxpoolApiServer},
 };
 use reth_ethereum::{
@@ -43,7 +43,6 @@ use tracing::info;
 use crate::{
     attributes::{RollkitEnginePayloadAttributes, RollkitEnginePayloadBuilderAttributes},
     builder::{RollkitArgs, RollkitPayloadBuilderBuilder},
-    consensus_builder::RollkitConsensusBuilder,
     validator::RollkitEngineValidatorBuilder,
 };
 
@@ -141,7 +140,7 @@ where
                 RollkitPayloadBuilderBuilder::new(&self.args),
             ))
             .network(EthereumNetworkBuilder::default())
-            .consensus(RollkitConsensusBuilder)
+            .consensus(RollkitConsensusBuilder::default())
     }
 
     fn add_ons(&self) -> Self::AddOns {

bin/lumen/src/main.rs

@@ -3,12 +3,43 @@
 use reth_chainspec::ChainSpec;
 use reth_consensus::{Consensus, ConsensusError, FullConsensus, HeaderValidator};
 use reth_consensus_common::validation::validate_body_against_header;
+use reth_ethereum::node::builder::{components::ConsensusBuilder, BuilderContext};
 use reth_ethereum_consensus::EthBeaconConsensus;
 use reth_ethereum_primitives::{Block, BlockBody, EthPrimitives, Receipt};
 use reth_execution_types::BlockExecutionResult;
+use reth_node_api::{FullNodeTypes, NodeTypes};
 use reth_primitives::{GotExpected, GotExpectedBoxed, RecoveredBlock, SealedBlock, SealedHeader};
 use std::sync::Arc;
 
+/// Builder for `RollkitConsensus`
+#[derive(Debug, Default, Clone)]
+#[non_exhaustive]
+pub struct RollkitConsensusBuilder;
+
+impl RollkitConsensusBuilder {
+    /// Create a new `RollkitConsensusBuilder`
+    pub const fn new() -> Self {
+        Self
+    }
+
+    /// Build the consensus implementation
+    pub fn build(chain_spec: Arc<ChainSpec>) -> Arc<RollkitConsensus> {
+        Arc::new(RollkitConsensus::new(chain_spec))
+    }
+}
+
+impl<Node> ConsensusBuilder<Node> for RollkitConsensusBuilder
+where
+    Node: FullNodeTypes,
+    Node::Types: NodeTypes<ChainSpec = ChainSpec, Primitives = EthPrimitives>,
+{
+    type Consensus = Arc<dyn FullConsensus<EthPrimitives, Error = ConsensusError>>;
+
+    async fn build_consensus(self, ctx: &BuilderContext<Node>) -> eyre::Result<Self::Consensus> {
+        Ok(Arc::new(RollkitConsensus::new(ctx.chain_spec())) as Self::Consensus)
+    }
+}
+
 /// Rollkit consensus implementation that allows blocks with the same timestamp.
 ///
 /// This consensus implementation wraps the standard Ethereum beacon consensus
@@ -111,24 +142,3 @@ impl FullConsensus<EthPrimitives> for RollkitConsensus {
         <EthBeaconConsensus<ChainSpec> as FullConsensus<EthPrimitives>>::validate_block_post_execution(&self.inner, block, result)
     }
 }
-
-/// Builder for `RollkitConsensus`
-#[derive(Debug, Default, Clone)]
-#[non_exhaustive]
-pub struct RollkitConsensusBuilder;
-
-impl RollkitConsensusBuilder {
-    /// Create a new `RollkitConsensusBuilder`
-    pub const fn new() -> Self {
-        Self
-    }
-}
-
-// Instead of implementing the generic ConsensusBuilder trait,
-// we'll use a direct approach that works with the node builder
-impl RollkitConsensusBuilder {
-    /// Build the consensus implementation
-    pub fn build(chain_spec: Arc<ChainSpec>) -> Arc<RollkitConsensus> {
-        Arc::new(RollkitConsensus::new(chain_spec))
-    }
-}