cleanup

Author: dylanlott

src/config.rs

@@ -70,8 +70,9 @@ pub struct BuilderConfig {
     /// NOTE: should not include the host_rpc_url value
     #[from_env(
         var = "TX_BROADCAST_URLS",
-        desc = "Additional RPC URLs to which to broadcast transactions",
-        infallible
+        desc = "Additional RPC URLs to which the builder broadcasts transactions",
+        infallible,
+        optional
     )]
     pub tx_broadcast_urls: Vec<Cow<'static, str>>,
     /// address of the Zenith contract on Host.

src/tasks/submit.rs

@@ -13,7 +13,7 @@ use alloy::{
     sol_types::{SolCall, SolError},
     transports::TransportError,
 };
-use eyre::{bail, eyre};
+use eyre::bail;
 use init4_bin_base::deps::{
     metrics::{counter, histogram},
     tracing::{self, Instrument, debug, debug_span, error, info, instrument, warn},
@@ -105,15 +105,7 @@ impl SubmitTask {
         Ok(TransactionRequest::default().with_blob_sidecar(sidecar).with_input(data))
     }
 
-    /// Returns the next host block height.
-    async fn next_host_block_height(&self) -> eyre::Result<u64> {
-        let result = self.provider().get_block_number().await?;
-        let next = result.checked_add(1).ok_or_else(|| eyre!("next host block height overflow"))?;
-        debug!(next, "next host block height");
-        Ok(next)
-    }
-
-    /// Prepares and then sends the EIP-4844 transaction with a sidecar encoded with a rollup block to the network.
+    /// Prepares and sends the EIP-4844 transaction with a sidecar encoded with a rollup block to the network.
     async fn submit_transaction(
         &self,
         retry_count: usize,
@@ -122,7 +114,7 @@ impl SubmitTask {
     ) -> eyre::Result<ControlFlow> {
         let tx = self.prepare_tx(retry_count, resp, block).await?;
 
-        self.send_transaction(retry_count, resp, tx).await
+        self.send_transaction(resp, tx).await
     }
 
     /// Prepares the transaction by extracting the signature components, creating the transaction
@@ -240,7 +232,6 @@ impl SubmitTask {
     /// and any additionally configured broadcast providers.
     async fn send_transaction(
         &self,
-        retry_count: usize,
         resp: &SignResponse,
         tx: TransactionRequest,
     ) -> Result<ControlFlow, eyre::Error> {
@@ -254,10 +245,8 @@ impl SubmitTask {
         let fut = spawn_provider_send!(self.provider(), &tx);
 
         // spawn send_tx futures on retry attempts for all additional broadcast host_providers
-        if retry_count > 0 {
-            for host_provider in self.config.connect_additional_broadcast() {
-                spawn_provider_send!(&host_provider, &tx);
-            }
+        for host_provider in self.config.connect_additional_broadcast() {
+            spawn_provider_send!(&host_provider, &tx);
         }
 
         // send the in-progress transaction over the outbound_tx_channel
@@ -393,6 +382,12 @@ impl SubmitTask {
         let now = std::time::SystemTime::now();
         now.duration_since(UNIX_EPOCH).unwrap().as_secs()
     }
+    
+    /// Returns the next host block height.
+    async fn next_host_block_height(&self) -> eyre::Result<u64> {
+        let block_num = self.provider().get_block_number().await?;
+        Ok(block_num + 1)
+    }
 
     /// Task future for the submit task
     /// NB: This task assumes that the simulator will only send it blocks for