feat: execution payload provider (#90)

* chore: refactor providers test utils

* feat: wip execution payload provider

* feat: alloy execution payload provider

* chore: renaming

* feat: improve args layout

* test: build_node helper

* test: execution payload provider

* fix: lints

* fix: address comments

Author: greged93

Cargo.lock

@@ -145,9 +145,13 @@ reth-eth-wire-types = { git = "https://github.com/scroll-tech/reth.git", default
 reth-network = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-network-api = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-network-peers = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-node-core = { git = "https://github.com/scroll-tech/reth.git" }
+reth-payload-primitives = { git = "https://github.com/scroll-tech/reth.git" }
 reth-primitives = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-primitives-traits = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 reth-provider = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
+reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git" }
 reth-tasks = { git = "https://github.com/scroll-tech/reth.git" }
 reth-tokio-util = { git = "https://github.com/scroll-tech/reth.git", default-features = false }
 
@@ -191,4 +195,3 @@ thiserror = "2.0"
 tokio = { version = "1.39", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
 tracing = "0.1.0"
-jsonrpsee = "0.24.9"

Cargo.toml

@@ -28,8 +28,8 @@ reth-eth-wire-types.workspace = true
 reth-network.workspace = true
 reth-network-peers.workspace = true
 reth-node-api = { git = "https://github.com/scroll-tech/reth.git" }
-reth-node-builder = { git = "https://github.com/scroll-tech/reth.git", features = ["skip-state-root-validation"] }
-reth-node-core = { git = "https://github.com/scroll-tech/reth.git" }
+reth-node-builder = { workspace = true, features = ["skip-state-root-validation"] }
+reth-node-core.workspace = true
 reth-node-types = { git = "https://github.com/scroll-tech/reth.git" }
 reth-primitives.workspace = true
 reth-provider = { workspace = true, features = ["skip-state-root-validation"] }
@@ -43,14 +43,14 @@ reth-scroll-engine-primitives = { git = "https://github.com/scroll-tech/reth.git
 reth-scroll-node = { workspace = true, features = ["skip-state-root-validation"] }
 reth-scroll-primitives = { workspace = true }
 scroll-db = { workspace = true }
-scroll-engine = { workspace = true, features = ["test-utils"] }
+scroll-engine.workspace = true
 scroll-migration.workspace = true
 scroll-network.workspace = true
 scroll-wire.workspace = true
 
 # rollup-node
 rollup-node-manager.workspace = true
-rollup-node-providers.workspace = true
+rollup-node-providers = { workspace = true, features = ["test-utils"] }
 rollup-node-sequencer.workspace = true
 rollup-node-watcher.workspace = true
 
@@ -60,6 +60,7 @@ eyre.workspace = true
 reqwest = { version = "0.12", default-features = false }
 tokio = { workspace = true, features = ["full"] }
 tracing.workspace = true
+url = "2.5.4"
 
 [dev-dependencies]
 # alloy
@@ -69,7 +70,7 @@ alloy-rpc-types-engine.workspace = true
 # reth
 reth-e2e-test-utils.workspace = true
 reth-payload-builder = { git = "https://github.com/scroll-tech/reth.git" }
-reth-rpc-server-types = { git = "https://github.com/scroll-tech/reth.git" }
+reth-rpc-server-types.workspace = true
 reth-tasks.workspace = true
 reth-tracing = { git = "https://github.com/scroll-tech/reth.git" }
 
@@ -87,7 +88,6 @@ test-utils = [
     "reth-primitives/test-utils",
     "reth-provider/test-utils",
     "reth-transaction-pool/test-utils",
-    "scroll-engine/test-utils",
     "reth-payload-builder/test-utils",
     "reth-payload-builder/test-utils",
     "reth-scroll-node/test-utils",
@@ -97,6 +97,7 @@ test-utils = [
     "reth-scroll-node/test-utils",
     "reth-scroll-node/test-utils",
     "rollup-node-providers/test-utils",
+    "scroll-engine/test-utils",
 ]
 serde = [
     "alloy-primitives/serde",
@@ -112,6 +113,7 @@ serde = [
     "rollup-node-manager/serde",
     "alloy-chains/serde",
     "reth-transaction-pool/serde",
+    "url/serde",
 ]
 
 [[bin]]

bin/rollup/Cargo.toml

@@ -22,30 +22,62 @@ pub struct ScrollRollupNodeArgs {
     /// The EngineAPI URL.
     #[arg(long)]
     pub engine_api_url: Option<reqwest::Url>,
-    /// The provider arguments
+    /// The beacon provider arguments.
+    #[command(flatten)]
+    pub beacon_provider_args: BeaconProviderArgs,
+    /// The L1 provider arguments
     #[command(flatten)]
     pub l1_provider_args: L1ProviderArgs,
+    /// The L2 provider arguments
+    #[command(flatten)]
+    pub l2_provider_args: L2ProviderArgs,
     /// The sequencer arguments
     #[command(flatten)]
     pub sequencer_args: SequencerArgs,
 }
 
-#[derive(Debug, clap::Args)]
+#[derive(Debug, Default, clap::Args)]
 pub struct L1ProviderArgs {
-    /// The URL for the L1 RPC URL.
-    #[arg(long)]
-    pub l1_rpc_url: Option<reqwest::Url>,
-    /// The URL for the Beacon RPC URL.
-    #[arg(long)]
-    pub beacon_rpc_url: Option<reqwest::Url>,
+    /// The URL for the L1 RPC.
+    #[arg(long = "l1.url", id = "l1_url", value_name = "L1_URL")]
+    pub url: Option<reqwest::Url>,
+    /// The compute units per second for the provider.
+    #[arg(long = "l1.cups", id = "l1_compute_units_per_second", value_name = "L1_COMPUTE_UNITS_PER_SECOND", default_value_t = constants::PROVIDER_COMPUTE_UNITS_PER_SECOND)]
+    pub compute_units_per_second: u64,
+    /// The max amount of retries for the provider.
+    #[arg(long = "l1.max-retries", id = "l1_max_retries", value_name = "L1_MAX_RETRIES", default_value_t = constants::PROVIDER_MAX_RETRIES)]
+    pub max_retries: u32,
+    /// The initial backoff for the provider.
+    #[arg(long = "l1.initial-backoff", id = "l1_initial_backoff", value_name = "L1_INITIAL_BACKOFF", default_value_t = constants::PROVIDER_INITIAL_BACKOFF)]
+    pub initial_backoff: u64,
+}
+
+#[derive(Debug, Default, clap::Args)]
+pub struct BeaconProviderArgs {
+    /// The URL for the Beacon chain.
+    #[arg(long = "beacon.url", id = "beacon_url", value_name = "BEACON_URL")]
+    pub url: Option<reqwest::Url>,
+    /// The compute units per second for the provider.
+    #[arg(long = "beacon.cups", id = "beacon_compute_units_per_second", value_name = "BEACON_COMPUTE_UNITS_PER_SECOND", default_value_t = constants::PROVIDER_COMPUTE_UNITS_PER_SECOND)]
+    pub compute_units_per_second: u64,
+    /// The max amount of retries for the provider.
+    #[arg(long = "beacon.max-retries", id = "beacon_max_retries", value_name = "BEACON_MAX_RETRIES", default_value_t = constants::PROVIDER_MAX_RETRIES)]
+    pub max_retries: u32,
+    /// The initial backoff for the provider.
+    #[arg(long = "beacon.initial-backoff", id = "beacon_initial_backoff", value_name = "BEACON_INITIAL_BACKOFF", default_value_t = constants::PROVIDER_INITIAL_BACKOFF)]
+    pub initial_backoff: u64,
+}
+
+#[derive(Debug, Default, clap::Args)]
+pub struct L2ProviderArgs {
     /// The compute units per second for the provider.
-    #[arg(long, default_value_t = constants::PROVIDER_COMPUTE_UNITS_PER_SECOND)]
+    #[arg(long = "l2.cups",  id = "l2_compute_units_per_second", value_name = "L2_COMPUTE_UNITS_PER_SECOND", default_value_t = constants::PROVIDER_COMPUTE_UNITS_PER_SECOND)]
     pub compute_units_per_second: u64,
     /// The max amount of retries for the provider.
-    #[arg(long, default_value_t = constants::PROVIDER_MAX_RETRIES)]
+    #[arg(long = "l2.max-retries", id = "l2_max_retries", value_name = "L2_MAX_RETRIES", default_value_t = constants::PROVIDER_MAX_RETRIES)]
     pub max_retries: u32,
     /// The initial backoff for the provider.
-    #[arg(long, default_value_t = constants::PROVIDER_INITIAL_BACKOFF)]
+    #[arg(long = "l2.initial-backoff", id = "l2_initial_back_off", value_name = "L2_INITIAL_BACKOFF", default_value_t = constants::PROVIDER_INITIAL_BACKOFF)]
     pub initial_backoff: u64,
 }
 

bin/rollup/src/args.rs

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

bin/rollup/src/lib.rs

@@ -1,3 +1,9 @@
+use crate::{
+    constants::PROVIDER_BLOB_CACHE_SIZE, L1ProviderArgs, ScrollRollupNodeArgs,
+    WATCHER_START_BLOCK_NUMBER,
+};
+use std::{sync::Arc, time::Duration};
+
 use alloy_provider::ProviderBuilder;
 use alloy_rpc_client::RpcClient;
 use alloy_transport::layers::RetryBackoffLayer;
@@ -11,21 +17,18 @@ use reth_scroll_chainspec::ScrollChainSpec;
 use reth_scroll_primitives::ScrollPrimitives;
 use reth_transaction_pool::{PoolTransaction, TransactionPool};
 use rollup_node_manager::{Consensus, NoopConsensus, PoAConsensus, RollupNodeManager};
-use rollup_node_providers::{beacon_provider, DatabaseL1MessageProvider, OnlineL1Provider};
+use rollup_node_providers::{
+    beacon_provider, AlloyExecutionPayloadProvider, 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_engine::{EngineDriver, ForkchoiceState};
 use scroll_network::NetworkManager as ScrollNetworkManager;
 use scroll_wire::{ProtocolHandler, ScrollWireConfig};
-use std::{sync::Arc, time::Duration};
 use tracing::info;
-
-use crate::{
-    constants::PROVIDER_BLOB_CACHE_SIZE, L1ProviderArgs, ScrollRollupNodeArgs,
-    WATCHER_START_BLOCK_NUMBER,
-};
+use url::Url;
 
 /// The network builder for the scroll rollup.
 #[derive(Debug)]
@@ -98,7 +101,39 @@ where
             auth_secret,
             self.config.engine_api_url.unwrap_or(format!("http://localhost:{auth_port}").parse()?),
         );
-        let payload_provider = NoopExecutionPayloadProvider;
+
+        // Get a provider
+        let provider = if let Some(url) = self.config.l1_provider_args.url {
+            let L1ProviderArgs { max_retries, initial_backoff, compute_units_per_second, .. } =
+                self.config.l1_provider_args;
+            let client = RpcClient::builder()
+                .layer(RetryBackoffLayer::new(
+                    max_retries,
+                    initial_backoff,
+                    compute_units_per_second,
+                ))
+                .http(url);
+            Some(ProviderBuilder::new().on_client(client))
+        } else {
+            None
+        };
+
+        // Get a payload provider
+        let payload_provider = if self.config.test || !ctx.config().rpc.http {
+            None
+        } else {
+            let l2_provider_url =
+                format!("http://{}:{}", ctx.config().rpc.http_addr, ctx.config().rpc.http_port);
+            let client = RpcClient::builder()
+                .layer(RetryBackoffLayer::new(
+                    self.config.l2_provider_args.max_retries,
+                    self.config.l2_provider_args.initial_backoff,
+                    self.config.l2_provider_args.compute_units_per_second,
+                ))
+                .http(Url::parse(&l2_provider_url)?);
+            let provider = ProviderBuilder::new().on_client(client);
+            Some(AlloyExecutionPayloadProvider::new(provider))
+        };
 
         let fcs = if let Some(named) = ctx.config().chain.chain.named() {
             ForkchoiceState::head_from_named_chain(named)
@@ -107,7 +142,7 @@ where
         };
         let engine = EngineDriver::new(
             Arc::new(engine_api),
-            Arc::new(payload_provider),
+            payload_provider,
             fcs,
             Duration::from_millis(self.config.sequencer_args.payload_building_duration),
         );
@@ -132,22 +167,6 @@ where
         // Get the chain specification
         let chain_spec = ctx.chain_spec();
 
-        // Spawn the L1Watcher
-        let provider = if let Some(url) = self.config.l1_provider_args.l1_rpc_url {
-            let L1ProviderArgs { max_retries, initial_backoff, compute_units_per_second, .. } =
-                self.config.l1_provider_args;
-            let client = RpcClient::builder()
-                .layer(RetryBackoffLayer::new(
-                    max_retries,
-                    initial_backoff,
-                    compute_units_per_second,
-                ))
-                .http(url);
-            Some(ProviderBuilder::new().on_client(client))
-        } else {
-            None
-        };
-
         // Create the consensus.
         let consensus: Box<dyn Consensus> = if self.config.test {
             Box::new(NoopConsensus::default())
@@ -173,7 +192,7 @@ where
 
         // Construct the l1 provider.
         let l1_messages_provider = DatabaseL1MessageProvider::new(db.clone(), 0);
-        let l1_provider = if let Some(url) = self.config.l1_provider_args.beacon_rpc_url {
+        let l1_provider = if let Some(url) = self.config.beacon_provider_args.url {
             let beacon_provider = beacon_provider(url.to_string());
             let l1_provider = OnlineL1Provider::new(
                 beacon_provider,