Don't skip fallback builder when solver fails

crates/examples/infra/mod.rs

@@ -404,8 +404,8 @@ pub trait RunDa<
 
         let marketplace_config = MarketplaceConfig {
             auction_results_provider: TestAuctionResultsProvider::<TYPES>::default().into(),
-            // TODO: we need to pass a valid generic builder url here somehow
-            generic_builder_url: url::Url::parse("http://localhost").unwrap(),
+            // TODO: we need to pass a valid fallback builder url here somehow
+            fallback_builder_url: url::Url::parse("http://localhost").unwrap(),
         };
 
         SystemContext::init(

crates/hotshot/src/lib.rs

@@ -83,8 +83,8 @@ pub const H_256: usize = 32;
 pub struct MarketplaceConfig<TYPES: NodeType, I: NodeImplementation<TYPES>> {
     /// auction results provider
     pub auction_results_provider: Arc<I::AuctionResultsProvider>,
-    /// generic builder
-    pub generic_builder_url: Url,
+    /// fallback builder
+    pub fallback_builder_url: Url,
 }
 
 /// Bundle of all the memberships a consensus instance uses

crates/hotshot/src/tasks/task_state.rs

@@ -213,10 +213,10 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> CreateTaskState<TYPES, I>
             auction_results_provider: Arc::clone(
                 &handle.hotshot.marketplace_config.auction_results_provider,
             ),
-            generic_builder_url: handle
+            fallback_builder_url: handle
                 .hotshot
                 .marketplace_config
-                .generic_builder_url
+                .fallback_builder_url
                 .clone(),
         }
     }

crates/task-impls/src/transactions.rs

@@ -110,8 +110,8 @@ pub struct TransactionTaskState<TYPES: NodeType, I: NodeImplementation<TYPES>> {
     pub decided_upgrade_certificate: Arc<RwLock<Option<UpgradeCertificate<TYPES>>>>,
     /// auction results provider
     pub auction_results_provider: Arc<I::AuctionResultsProvider>,
-    /// generic builder url
-    pub generic_builder_url: Url,
+    /// fallback builder url
+    pub fallback_builder_url: Url,
 }
 
 impl<TYPES: NodeType, I: NodeImplementation<TYPES>> TransactionTaskState<TYPES, I> {
@@ -276,17 +276,21 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> TransactionTaskState<TYPES,
         {
             let start = Instant::now();
 
-            if let Ok(Ok(auction_result)) = async_timeout(
+            if let Ok(maybe_auction_result) = async_timeout(
                 self.builder_timeout,
                 self.auction_results_provider
                     .fetch_auction_result(block_view),
             )
             .await
             {
+                let auction_result = maybe_auction_result
+                    .map_err(|e| warn!("Failed to get auction results: {e:#}"))
+                    .unwrap_or_default(); // We continue here, as we still have fallback builder URL
+
                 let mut futures = Vec::new();
 
                 let mut builder_urls = auction_result.clone().urls();
-                builder_urls.push(self.generic_builder_url.clone());
+                builder_urls.push(self.fallback_builder_url.clone());
 
                 for url in builder_urls {
                     futures.push(async_timeout(
@@ -343,10 +347,12 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> TransactionTaskState<TYPES,
 
                     return None;
                 }
+            } else {
+                warn!("Timeout while getting auction results");
             }
         }
 
-        // If we couldn't get any bundles (due to either the builders or solver failing to return a result), send an empty block
+        // If we couldn't get any bundles (due to either all of the builders or solver failing to return a result), send an empty block
         warn!(
             "Failed to get a block for view {:?}, proposing empty block",
             block_view

crates/testing/src/test_builder.rs

@@ -490,8 +490,7 @@ where
                 config,
                 marketplace_config: Box::new(|_| MarketplaceConfig::<TYPES, I> {
                     auction_results_provider: TestAuctionResultsProvider::<TYPES>::default().into(),
-                    // TODO: we need to pass a valid generic builder url here somehow
-                    generic_builder_url: Url::parse("http://localhost").unwrap(),
+                    fallback_builder_url: Url::parse("http://localhost").unwrap(),
                 }),
             },
             metadata: self,