feat: break payload building

crates/derivation-pipeline/src/lib.rs

@@ -209,6 +209,7 @@ pub async fn derive<L1P: L1Provider + Sync + Send, L2P: BlockDataProvider + Sync
         // query the appropriate amount of l1 messages.
         let mut txs = Vec::with_capacity(block.context.num_transactions as usize);
         for _ in 0..block.context.num_l1_messages {
+            // TODO: fetch L1 messages range.
             let l1_message = l1_provider
                 .next_l1_message()
                 .await

crates/engine/src/driver.rs

@@ -207,7 +207,7 @@ where
                 }
             }
             EngineDriverFutureResult::PayloadBuildingJob(result) => {
-                tracing::info!(target: "scroll::engine", ?result, "handling payload building result");
+                tracing::info!(target: "scroll::engine", result = ?result.as_ref().map(|b| b.header.as_ref()), "handling payload building result");
 
                 match result {
                     Ok(block) => {

crates/manager/src/consensus.rs

@@ -76,11 +76,10 @@ impl Consensus for SystemContractConsensus {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use alloy_consensus::TxEip1559;
+    use alloy_consensus::{Signed, TxEip1559};
     use alloy_primitives::{address, b256, bloom, bytes, TxKind, B64, U256};
     use reth_primitives_traits::Header;
-    use reth_scroll_primitives::{ScrollBlockBody, ScrollTransactionSigned};
-    use scroll_alloy_consensus::ScrollTypedTransaction;
+    use reth_scroll_primitives::ScrollBlockBody;
     use std::{str::FromStr, sync::OnceLock};
 
     #[test]
@@ -119,11 +118,8 @@ mod tests {
                 requests_hash: None,
             },
             body: ScrollBlockBody {
-                transactions: vec![ScrollTransactionSigned {
-                    hash: tx_hash,
-                    signature:
-                    Signature::new(U256::from_str("12217337930795921874768983252881296563512928283585900928219483692173266513447").unwrap(), U256::from_str("37490897792770890087946325233571758133021734266092518377537449521790010698782").unwrap(), true) ,
-                    transaction: ScrollTypedTransaction::Eip1559(TxEip1559{
+                transactions: vec![
+                    Signed::new_unhashed(TxEip1559 {
                         chain_id: 534352,
                         nonce: 145014,
                         gas_limit: 600000,
@@ -133,13 +129,11 @@ mod tests {
                         value: U256::ZERO,
                         access_list: Default::default(),
                         input: bytes!("a00597a00000000000000000000000000000000000000000000000000000000001826cbe0000000000000000000000000000000000005eb6831c1aa0faf2055c7d53270e00000000000000000000000006efdbff2a14a7c8e15944d1f4a48f9f95f663a40000000000000000000000000000000000000000000000000000000000000001000000000000000000000000813df550a32d4a9d42010d057386429ad2328ed9000000000000000000000000000000000000000000000000000000006807befd"),
-                    }) ,
-                }],
+                    }, Signature::new(U256::from_str("12217337930795921874768983252881296563512928283585900928219483692173266513447").unwrap(), U256::from_str("37490897792770890087946325233571758133021734266092518377537449521790010698782").unwrap(), true)).into()],
                 ommers: vec![],
                 withdrawals: None,
             },
         };
-
         consensus.validate_new_block(&block, &signature).unwrap()
     }
 }

crates/network/Cargo.toml

@@ -44,4 +44,5 @@ serde = [
     "reth-scroll-primitives/serde",
     "scroll-wire/serde",
     "reth-primitives-traits/serde",
+    "reth-storage-api/serde",
 ]

crates/node/src/add_ons/mod.rs

@@ -85,7 +85,7 @@ where
     ) -> eyre::Result<Self::Handle> {
         let Self { rpc_add_ons, rollup_manager_addon: rollup_node_manager_addon } = self;
         let rpc_handle: RpcHandle<N, ScrollEthApi<N>> =
-            rpc_add_ons.launch_add_ons_with(ctx.clone(), |_, _, _| Ok(())).await?;
+            rpc_add_ons.launch_add_ons_with(ctx.clone(), |_| Ok(())).await?;
         let (rollup_manager_handle, l1_watcher_tx) =
             rollup_node_manager_addon.launch(ctx.clone(), rpc_handle.clone()).await?;
         Ok(ScrollAddOnsHandle {

crates/node/src/lib.rs

@@ -2,7 +2,6 @@
 
 pub mod add_ons;
 mod args;
-mod bridge;
 mod constants;
 mod node;
 #[cfg(feature = "test-utils")]

crates/node/src/node.rs

@@ -1,6 +1,7 @@
 //! Node specific implementations for Scroll rollup node.
 
 use crate::args::ScrollRollupNodeConfig;
+use std::time::Duration;
 
 use super::add_ons::ScrollRollupNodeAddOns;
 use reth_node_api::NodeTypes;
@@ -10,7 +11,7 @@ use reth_node_builder::{
 };
 use reth_scroll_node::{
     ScrollConsensusBuilder, ScrollExecutorBuilder, ScrollNetworkBuilder, ScrollNode,
-    ScrollPayloadBuilder, ScrollPoolBuilder,
+    ScrollPayloadBuilderBuilder, ScrollPoolBuilder,
 };
 
 /// The Scroll node implementation.
@@ -37,7 +38,7 @@ where
     type ComponentsBuilder = ComponentsBuilder<
         N,
         ScrollPoolBuilder,
-        BasicPayloadServiceBuilder<ScrollPayloadBuilder>,
+        BasicPayloadServiceBuilder<ScrollPayloadBuilderBuilder>,
         ScrollNetworkBuilder,
         ScrollExecutorBuilder,
         ScrollConsensusBuilder,
@@ -48,7 +49,14 @@ where
     >;
 
     fn components_builder(&self) -> Self::ComponentsBuilder {
-        ScrollNode::components()
+        ScrollNode::components().payload(BasicPayloadServiceBuilder::new(
+            ScrollPayloadBuilderBuilder {
+                payload_building_time_limit: Duration::from_millis(
+                    self.config.sequencer_args.payload_building_duration,
+                ),
+                best_transactions: (),
+            },
+        ))
     }
 
     fn add_ons(&self) -> Self::AddOns {

crates/node/src/test_utils.rs

@@ -137,7 +137,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
         database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) },
         l1_provider_args: L1ProviderArgs::default(),
         engine_driver_args: EngineDriverArgs { en_sync_trigger: 100 },
-        sequencer_args: SequencerArgs::default(),
+        sequencer_args: SequencerArgs { payload_building_duration: 1000, ..Default::default() },
         beacon_provider_args: BeaconProviderArgs::default(),
         signer_args: Default::default(),
     }

crates/node/tests/e2e.rs

@@ -76,7 +76,7 @@ async fn can_bridge_l1_messages() -> eyre::Result<()> {
     rnm_handle.build_block().await;
     if let Some(RollupManagerEvent::BlockSequenced(block)) = rnm_events.next().await {
         assert_eq!(block.body.transactions.len(), 1);
-        assert_eq!(block.body.transactions[0].transaction.l1_message().unwrap(), &l1_message,);
+        assert_eq!(block.body.transactions[0].as_l1_message().unwrap().inner(), &l1_message,);
     } else {
         panic!("Failed to receive block from rollup node");
     }
@@ -104,6 +104,7 @@ async fn can_sequence_and_gossip_blocks() {
             block_time: 0,
             max_l1_messages_per_block: 4,
             l1_message_inclusion_mode: L1MessageInclusionMode::BlockDepth(0),
+            payload_building_duration: 1000,
             ..SequencerArgs::default()
         },
         beacon_provider_args: BeaconProviderArgs::default(),

crates/providers/src/execution_payload.rs

@@ -58,8 +58,14 @@ mod tests {
         let chain_spec = (*SCROLL_MAINNET).clone();
 
         // Get a test node.
-        let (mut node, _tasks, _wallet) =
-            setup_engine::<ScrollNode>(1, chain_spec, false, scroll_payload_attributes).await?;
+        let (mut node, _tasks, _wallet) = setup_engine::<ScrollNode>(
+            1,
+            chain_spec,
+            false,
+            Default::default(),
+            scroll_payload_attributes,
+        )
+        .await?;
         let node = node.pop().unwrap();
 
         // Get a provider to the node.