BM-245: Add timeout to set-verifier module (github#69)

This PR addresses a bug where the txn_timeout was not applied to the
set-verifier module. Additionally I refactored the default TXN_TIMEOUT
to be shared and increased from 30 -> 45s defaults

Author: mothran

crates/boundless-market/src/contracts/mod.rs

@@ -19,12 +19,15 @@ use alloy_primitives::{
 };
 use alloy_sol_types::{eip712_domain, Eip712Domain};
 use serde::{Deserialize, Serialize};
+use std::time::Duration;
 #[cfg(not(target_os = "zkvm"))]
 use thiserror::Error;
 use url::Url;
 
 use risc0_zkvm::sha::Digest;
 
+const TXN_CONFIRM_TIMEOUT: Duration = Duration::from_secs(45);
+
 // proof_market.rs is a copy of IProofMarket.sol with alloy derive statements added.
 // See the build.rs script in this crate for more details.
 include!(concat!(env!("OUT_DIR"), "/proof_market.rs"));

crates/boundless-market/src/contracts/proof_market.rs

@@ -18,7 +18,7 @@ use thiserror::Error;
 use super::{
     request_id, Fulfillment,
     IProofMarket::{self, IProofMarketErrors, IProofMarketInstance},
-    Offer, ProofStatus, ProvingRequest, TxnErr,
+    Offer, ProofStatus, ProvingRequest, TxnErr, TXN_CONFIRM_TIMEOUT,
 };
 
 /// Proof market errors.
@@ -97,7 +97,7 @@ where
         Self {
             instance,
             caller,
-            timeout: Duration::from_secs(30),
+            timeout: TXN_CONFIRM_TIMEOUT,
             event_query_config: EventQueryConfig::default(),
         }
     }

crates/boundless-market/src/contracts/set_verifier.rs

@@ -12,7 +12,10 @@ use alloy::{
 };
 use anyhow::{Context, Result};
 
-use super::IRiscZeroSetVerifier::{self, IRiscZeroSetVerifierErrors, IRiscZeroSetVerifierInstance};
+use super::{
+    IRiscZeroSetVerifier::{self, IRiscZeroSetVerifierErrors, IRiscZeroSetVerifierInstance},
+    TXN_CONFIRM_TIMEOUT,
+};
 
 #[derive(Clone)]
 pub struct SetVerifierService<T, P> {
@@ -26,12 +29,10 @@ where
     T: Transport + Clone,
     P: Provider<T, Ethereum> + 'static + Clone,
 {
-    const TX_TIMEOUT: Duration = Duration::from_secs(30);
-
     pub fn new(address: Address, provider: P, caller: Address) -> Self {
         let instance = IRiscZeroSetVerifier::new(address, provider);
 
-        Self { instance, caller, tx_timeout: Self::TX_TIMEOUT }
+        Self { instance, caller, tx_timeout: TXN_CONFIRM_TIMEOUT }
     }
 
     pub fn instance(&self) -> &IRiscZeroSetVerifierInstance<T, P, Ethereum> {

crates/broker/src/submitter.rs

@@ -67,11 +67,14 @@ where
             market = market.with_timeout(Duration::from_secs(txn_timeout));
         }
 
-        let set_verifier = SetVerifierService::new(
+        let mut set_verifier = SetVerifierService::new(
             set_verifier_addr,
             provider.clone(),
             provider.default_signer_address(),
         );
+        if let Some(txn_timeout) = txn_timeout_opt {
+            set_verifier.with_timeout(Duration::from_secs(txn_timeout));
+        }
 
         Ok(Self { db, prover, market, set_verifier, set_builder_img_id })
     }