fix: remove vestigial non-Flashbots things from config (#172)

* fix: mark Flashbots URL non-optional, spawn Flashbots task directly in main

* fix: remove vestigial URLs to broadcast txs directly (not via Flashbots

Author: anna-carroll

bin/builder.rs

@@ -1,7 +1,10 @@
 use builder::{
     config::BuilderConfig,
     service::serve_builder,
-    tasks::{block::sim::Simulator, cache::CacheTasks, env::EnvTask, metrics::MetricsTask},
+    tasks::{
+        block::sim::Simulator, cache::CacheTasks, env::EnvTask, metrics::MetricsTask,
+        submit::FlashbotsTask,
+    },
 };
 use init4_bin_base::{
     deps::tracing::{info, info_span},
@@ -33,13 +36,12 @@ async fn main() -> eyre::Result<()> {
     let cache_system = cache_tasks.spawn();
 
     // Set up the metrics task
-    let metrics = MetricsTask { host_provider };
+    let metrics = MetricsTask::new(host_provider.clone());
     let (tx_channel, metrics_jh) = metrics.spawn();
 
-    // Set up the submit task. This will be either a Flashbots task or a
-    // BuilderHelper task depending on whether a Flashbots endpoint is
-    // configured.
-    let (submit_channel, submit_jh) = config.spawn_submit_task(tx_channel).await?;
+    // Spawn the Flashbots task
+    let submit = FlashbotsTask::new(config.clone(), tx_channel).await?;
+    let (submit_channel, submit_jh) = submit.spawn();
 
     // Set up the simulator
     let sim = Simulator::new(&config, ru_provider.clone(), block_env);

src/config.rs

@@ -1,13 +1,7 @@
-use crate::{
-    quincey::Quincey,
-    tasks::{
-        block::{cfg::SignetCfgEnv, sim::SimResult},
-        submit::FlashbotsTask,
-    },
-};
+use crate::{quincey::Quincey, tasks::block::cfg::SignetCfgEnv};
 use alloy::{
     network::{Ethereum, EthereumWallet},
-    primitives::{Address, TxHash},
+    primitives::Address,
     providers::{
         self, Identity, ProviderBuilder, RootProvider,
         fillers::{
@@ -29,8 +23,7 @@ use init4_bin_base::{
 use signet_constants::SignetSystemConstants;
 use signet_zenith::Zenith;
 use std::borrow::Cow;
-use tokio::{join, sync::mpsc::UnboundedSender, task::JoinHandle};
-use tracing::info;
+use tokio::join;
 
 /// Type alias for the provider used to simulate against rollup state.
 pub type RuProvider = RootProvider<Ethereum>;
@@ -99,25 +92,12 @@ pub struct BuilderConfig {
     #[from_env(var = "TX_POOL_URL", desc = "URL of the tx pool to poll for incoming transactions")]
     pub tx_pool_url: url::Url,
 
-    /// Additional RPC URLs to which the builder should broadcast transactions.
-    /// * Should not include the `HOST_RPC_URL` value, as that is already sent to by default.
-    /// * Setting this can incur `already known` errors.
-    #[from_env(
-        var = "TX_BROADCAST_URLS",
-        desc = "Additional RPC URLs to which the builder broadcasts transactions",
-        optional
-    )]
-    pub tx_broadcast_urls: Vec<Cow<'static, str>>,
-
-    /// Configuration for the Flashbots provider.
-    /// * If set, the builder will submit blocks as MEV bundles to Flashbots instead of
-    ///   submitting them directly to the Host chain.
-    /// * If not set, the builder defaults to submitting blocks directly to the Host chain
-    ///   using the Builder Helper contract.
+    /// Configuration for the Flashbots provider to submit
+    /// SignetBundles and Rollup blocks to the Host chain
+    /// as private MEV bundles via Flashbots.
     #[from_env(
         var = "FLASHBOTS_ENDPOINT",
-        desc = "Flashbots endpoint for privately submitting rollup blocks",
-        optional
+        desc = "Flashbots endpoint for privately submitting Signet bundles"
     )]
     pub flashbots_endpoint: Option<url::Url>,
 
@@ -258,17 +238,6 @@ impl BuilderConfig {
         Ok(flashbots)
     }
 
-    /// Connect additional broadcast providers.
-    pub fn connect_additional_broadcast(&self) -> Vec<RootProvider> {
-        self.tx_broadcast_urls
-            .iter()
-            .map(|url| {
-                let url = url.parse::<url::Url>().expect("Invalid URL in tx_broadcast_urls");
-                RootProvider::new_http(url)
-            })
-            .collect::<Vec<_>>()
-    }
-
     /// Connect to the Zenith instance, using the specified provider.
     pub const fn connect_zenith(&self, provider: HostProvider) -> ZenithInstance {
         Zenith::new(self.zenith_address, provider)
@@ -323,17 +292,4 @@ impl BuilderConfig {
                 .unwrap_or(DEFAULT_CONCURRENCY_LIMIT)
         })
     }
-
-    /// Spawn a submit task, either Flashbots or BuilderHelper depending on
-    /// configuration.
-    pub async fn spawn_submit_task(
-        &self,
-        tx_channel: UnboundedSender<TxHash>,
-    ) -> eyre::Result<(UnboundedSender<SimResult>, JoinHandle<()>)> {
-        let url = self.flashbots_endpoint.as_ref().expect("flashbots endpoint must be configured");
-        info!(url = url.as_str(), "spawning flashbots submit task");
-        let submit = FlashbotsTask::new(self.clone(), tx_channel).await?;
-        let (submit_channel, submit_jh) = submit.spawn();
-        Ok((submit_channel, submit_jh))
-    }
 }

src/test_utils.rs

@@ -34,7 +34,6 @@ pub fn setup_test_config() -> Result<BuilderConfig> {
             .unwrap()
             .try_into()
             .unwrap(),
-        tx_broadcast_urls: vec!["http://localhost:9000".into()],
         flashbots_endpoint: Some("https://relay-sepolia.flashbots.net:443".parse().unwrap()),
         zenith_address: Address::default(),
         quincey_url: "http://localhost:8080".into(),