feat: Sequencer rnm integration (#63)

* test: move calldata to files

* feat: batch header decoding

* feat: improve codec interface

* chore: manifests fixes

* feat: revert some codec changes

* feat: wip derivation pipeline

* feat: batch header v7

* feat: add batch abstraction

* feat: basic derivation pipeline

* feat: implement batch data hash

* feat: move PayloadData

* feat: improve batch data hash computation

* test: derivation

* chore: cleaning

* fix: lints

* fix: lints

* fix: skip wasm for derivation pipeline

* fix: data hash computation for batch

* fix: lint

* fix: lint

* fix: lints

* fix: answer comments

* fix: lints

* feat: wip

* feat: changes to the data model

* fix: codec issue

* feat: modify derivation pipeline to fetch blob

* test: move test data to file

* fix: lints

* fix: answer comments

* test: fix migration

* fix: comments

* feat: providers crate

* feat: l1 providers crate

* feat: l1 provider implementation

* feat: l1 message provider

* feat: pipeline modifications

* fix: avoid iterating the cache

* chore: simplify derivation pipeline interface

* fix: lints

* fix: rebasing

* fix: answer comments

* feat: add sequencer

* sequencer initial implementation

* sequencer implementation

* sequencer implementation

* refactor sequencer provider

* sequencer implementation

* lint

* lint deps

* address comments

* feat: sequencer integration

* remove redundant file

* add std feature for scroll-reth-primitives

* comments and clean up

* address feedback

---------

Co-authored-by: Gregory Edison <[email protected]>

Author: frisitano

Cargo.lock

@@ -10,6 +10,7 @@ exclude.workspace = true
 # alloy
 alloy-chains.workspace = true
 alloy-provider.workspace = true
+alloy-primitives.workspace = true
 alloy-rpc-types-engine.workspace = true
 alloy-rpc-client.workspace = true
 alloy-transport.workspace = true
@@ -50,6 +51,7 @@ scroll-wire.workspace = true
 # rollup-node
 rollup-node-manager.workspace = true
 rollup-node-providers.workspace = true
+rollup-node-sequencer.workspace = true
 rollup-node-watcher.workspace = true
 
 # misc

bin/rollup/Cargo.toml

@@ -1,4 +1,5 @@
 use crate::constants;
+use alloy_primitives::Address;
 use std::path::PathBuf;
 
 /// A struct that represents the arguments for the rollup node.
@@ -20,6 +21,9 @@ pub struct ScrollRollupNodeArgs {
     /// The provider arguments
     #[command(flatten)]
     pub l1_provider_args: L1ProviderArgs,
+    /// The sequencer arguments
+    #[command(flatten)]
+    pub sequencer_args: Option<SequencerArgs>,
 }
 
 #[derive(Debug, clap::Args)]
@@ -40,3 +44,19 @@ pub struct L1ProviderArgs {
     #[arg(long, default_value_t = constants::PROVIDER_INITIAL_BACKOFF)]
     pub initial_backoff: u64,
 }
+
+#[derive(Debug, clap::Args)]
+pub struct SequencerArgs {
+    /// The block time for the sequencer.
+    #[arg(long)]
+    pub block_time: u64,
+    /// The payload building duration for the sequencer (milliseconds)
+    #[arg(long)]
+    pub payload_building_duration: u64,
+    /// The max L1 messages per block for the sequencer.
+    #[arg(long)]
+    pub max_l1_messages_per_block: u64,
+    /// The fee recipient for the sequencer.
+    #[arg(long)]
+    pub fee_recipient: Option<Address>,
+}

bin/rollup/src/args.rs

@@ -1,7 +1,7 @@
 //! Scroll Network Bridge Components.
 
 mod args;
-pub use args::{L1ProviderArgs, ScrollRollupNodeArgs};
+pub use args::{L1ProviderArgs, ScrollRollupNodeArgs, SequencerArgs};
 
 mod constants;
 pub use constants::{PROVIDER_INITIAL_BACKOFF, PROVIDER_MAX_RETRIES, WATCHER_START_BLOCK_NUMBER};

bin/rollup/src/lib.rs

@@ -12,21 +12,22 @@ use reth_scroll_primitives::ScrollPrimitives;
 use reth_transaction_pool::{PoolTransaction, TransactionPool};
 use rollup_node_manager::{PoAConsensus, RollupNodeManager};
 use rollup_node_providers::{beacon_provider, DatabaseL1MessageProvider, OnlineL1Provider};
+use rollup_node_sequencer::Sequencer;
 use rollup_node_watcher::L1Watcher;
 use scroll_alloy_provider::ScrollAuthEngineApiProvider;
 use scroll_db::{Database, DatabaseConnectionProvider};
 use scroll_engine::{test_utils::NoopExecutionPayloadProvider, EngineDriver, ForkchoiceState};
 use scroll_network::NetworkManager as ScrollNetworkManager;
 use scroll_wire::{ProtocolHandler, ScrollWireConfig};
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 use tracing::info;
 
 use crate::{
     constants::PROVIDER_BLOB_CACHE_SIZE, L1ProviderArgs, ScrollRollupNodeArgs,
     WATCHER_START_BLOCK_NUMBER,
 };
 
-/// The network builder for the eth-wire to scroll-wire bridge.
+/// The network builder for the scroll rollup.
 #[derive(Debug)]
 pub struct ScrollRollupNetworkBuilder {
     config: ScrollRollupNodeArgs,
@@ -100,7 +101,20 @@ where
             auth_secret,
             self.config.engine_api_url.unwrap_or(format!("http://localhost:{auth_port}").parse()?),
         );
-        let engine = EngineDriver::new(engine_api, payload_provider);
+        let fcs =
+            ForkchoiceState::head_from_genesis(ctx.config().chain.genesis_header().hash_slow());
+        let engine = EngineDriver::new(
+            Arc::new(engine_api),
+            Arc::new(payload_provider),
+            fcs,
+            Duration::from_millis(
+                self.config
+                    .sequencer_args
+                    .as_ref()
+                    .map(|args| args.payload_building_duration)
+                    .unwrap_or(0),
+            ),
+        );
 
         // Instantiate the database
         let database_path = if let Some(db_path) = self.config.database_path {
@@ -144,18 +158,30 @@ where
             OnlineL1Provider::new(beacon_provider, PROVIDER_BLOB_CACHE_SIZE, l1_messages_provider)
                 .await;
 
+        // Construct the Sequencer.
+        let (sequencer, block_time) = if let Some(args) = self.config.sequencer_args {
+            let message_provider = DatabaseL1MessageProvider::new(db.clone(), 0);
+            let sequencer = Sequencer::new(
+                Arc::new(message_provider),
+                args.fee_recipient.unwrap_or_default(),
+                args.max_l1_messages_per_block,
+            );
+            (Some(sequencer), Some(args.block_time))
+        } else {
+            (None, None)
+        };
+
         // Spawn the rollup node manager
         let rollup_node_manager = RollupNodeManager::new(
             scroll_network_manager,
             engine,
             l1_provider,
             db,
             l1_notification_rx,
-            // initiating the safe and finalized block info with a null hash triggers a backfill
-            // using the unsafe head at the EN.
-            ForkchoiceState::default(),
             consensus,
             block_rx,
+            sequencer,
+            block_time,
         );
 
         ctx.task_executor().spawn(rollup_node_manager);

bin/rollup/src/network.rs

@@ -145,6 +145,7 @@ pub async fn build_bridge_node(
             initial_backoff: 100,
         },
         engine_api_url: None,
+        sequencer_args: None,
     };
     let node = ScrollNode;
     let NodeHandle { node, node_exit_future: _ } = NodeBuilder::new(node_config.clone())

bin/rollup/tests/e2e.rs

@@ -22,6 +22,7 @@ scroll-alloy-provider.workspace = true
 scroll-alloy-rpc-types-engine.workspace = true
 
 # reth
+reth-network-api.workspace = true
 reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git" }
 reth-primitives = { workspace = true }
 
@@ -34,9 +35,13 @@ reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git
 rollup-node-primitives.workspace = true
 rollup-node-providers.workspace = true
 
+# scroll
+scroll-network.workspace = true
+
 # misc
 async-trait.workspace = true
 eyre.workspace = true
+futures.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true
@@ -71,4 +76,6 @@ serde = [
     "reth-scroll-primitives/serde",
     "scroll-alloy-rpc-types-engine/serde",
     "alloy-chains/serde",
+    "reth-network-api/serde",
+    "scroll-network/serde",
 ]