BM-221: Multiple small broker fixes (github#54)

This PR:
* Adds the timeout config to the lockin txns
* Increases the configured timeout for txns to 45 seconds to wait for
confirmations to try and help improve order finalization success
* Fixes the docker build that were failing for broker
* Makes `assumption_price` optional and notes its not used
* bring back priority gas settings for `lockin`
* Fixed the bonsai zkvm version for Bonsai proving backends

closes BM-221

Author: mothran

broker.toml

@@ -8,10 +8,11 @@ max_stake = "0.5"
 skip_preflight_ids = []
 max_file_size = 50_000_000
 # allow_client_addresses = []
+# lockin_priority_gas = 100
 
 [prover]
 status_poll_ms = 1000
-bonsai_r0_zkvm_ver = "1.1"
+bonsai_r0_zkvm_ver = "1.1.1"
 req_retry_count = 3
 # set_builder_guest_path = "./target/riscv-guest/riscv32im-risc0-zkvm-elf/release/set-builder-guest"
 # assessor_set_guest_path = "./target/riscv-guest/riscv32im-risc0-zkvm-elf/release/assessor-guest"
@@ -20,4 +21,4 @@ req_retry_count = 3
 batch_max_time = 1000
 batch_size = 1
 block_deadline_buffer_secs = 120
-# txn_timeout = 30
+txn_timeout = 45

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

@@ -214,7 +214,7 @@ where
         &self,
         request: &ProvingRequest,
         client_sig: &Bytes,
-        _priority_gas: Option<u128>,
+        priority_gas: Option<u128>,
     ) -> Result<u64, MarketError> {
         tracing::debug!("Calling requestIsLocked({:x})", request.id);
         let is_locked_in: bool =
@@ -225,23 +225,22 @@ where
 
         tracing::debug!("Calling lockin({:?}, {:?})", request, client_sig);
 
-        let call = self.instance.lockin(request.clone(), client_sig.clone()).from(self.caller);
+        let mut call = self.instance.lockin(request.clone(), client_sig.clone()).from(self.caller);
 
-        // if let Some(gas) = priority_gas {
-        //     let priority_fee = self
-        //         .instance
-        //         .provider()
-        //         .estimate_eip1559_fees(None)
-        //         .await
-        //         .context("Failed to get priority gas fee")?;
+        if let Some(gas) = priority_gas {
+            let priority_fee = self
+                .instance
+                .provider()
+                .estimate_eip1559_fees(None)
+                .await
+                .context("Failed to get priority gas fee")?;
 
-        //     call = call
-        //         .max_fee_per_gas(priority_fee.max_fee_per_gas + gas)
-        //         .max_priority_fee_per_gas(priority_fee.max_priority_fee_per_gas + gas);
-        // }
+            call = call
+                .max_fee_per_gas(priority_fee.max_fee_per_gas + gas)
+                .max_priority_fee_per_gas(priority_fee.max_priority_fee_per_gas + gas);
+        }
 
-        // let pending_tx = call.send().await.map_err(IProofMarketErrors::decode_error)?;
-        let pending_tx = call.send().await.context("Failed to lock")?;
+        let pending_tx = call.send().await.map_err(IProofMarketErrors::decode_error)?;
 
         tracing::debug!("Broadcasting tx {}", pending_tx.tx_hash());
 

crates/broker/src/config.rs

@@ -24,7 +24,9 @@ pub struct MarketConf {
     /// Mega Cycle price (in native token)
     pub mcycle_price: String,
     /// Assumption price (in native token)
-    pub assumption_price: String,
+    ///
+    /// UNUSED CURRENTLY
+    pub assumption_price: Option<String>,
     /// Peak single proof performance in kHz
     ///
     /// Used for sanity checking bids to prevent slashing
@@ -57,7 +59,7 @@ impl Default for MarketConf {
     fn default() -> Self {
         Self {
             mcycle_price: "0.1".to_string(),
-            assumption_price: "0.1".to_string(),
+            assumption_price: None,
             peak_prove_khz: None,
             min_deadline: 150, // ~300 seconds aka 5 mins
             lookback_blocks: 100,
@@ -295,7 +297,6 @@ mod tests {
     const CONFIG_TEMPL: &str = r#"
 [market]
 mcycle_price = "0.1"
-assumption_price = "0.1"
 peak_prove_khz = 500
 min_deadline = 150
 lookback_blocks = 100
@@ -353,7 +354,7 @@ error = ?"#;
         let config = Config::load(config_temp.path()).await.unwrap();
 
         assert_eq!(config.market.mcycle_price, "0.1");
-        assert_eq!(config.market.assumption_price, "0.1");
+        assert_eq!(config.market.assumption_price, None);
         assert_eq!(config.market.peak_prove_khz, Some(500));
         assert_eq!(config.market.min_deadline, 150);
         assert_eq!(config.market.lookback_blocks, 100);
@@ -397,7 +398,7 @@ error = ?"#;
         {
             let config = config_mgnr.config.lock_all().unwrap();
             assert_eq!(config.market.mcycle_price, "0.1");
-            assert_eq!(config.market.assumption_price, "0.1");
+            assert_eq!(config.market.assumption_price, None);
             assert_eq!(config.market.peak_prove_khz, Some(500));
             assert_eq!(config.market.min_deadline, 150);
             assert_eq!(config.market.lookback_blocks, 100);
@@ -411,7 +412,7 @@ error = ?"#;
             tracing::debug!("Locking config for reading...");
             let config = config_mgnr.config.lock_all().unwrap();
             assert_eq!(config.market.mcycle_price, "0.1");
-            assert_eq!(config.market.assumption_price, "0.1");
+            assert_eq!(config.market.assumption_price, Some("0.1".into()));
             assert_eq!(config.market.peak_prove_khz, Some(10000));
             assert_eq!(config.market.min_deadline, 150);
             assert_eq!(config.market.lookback_blocks, 100);

crates/broker/src/lib.rs

@@ -461,7 +461,7 @@ where
             self.config_watcher.config.clone(),
             block_times,
             self.args.proof_market_addr,
-        ));
+        )?);
         supervisor_tasks.spawn(async move {
             task::supervisor(1, order_monitor).await.context("Failed to start order monitor")?;
             Ok(())

crates/broker/src/order_monitor.rs

@@ -17,6 +17,7 @@ use alloy::{
 use anyhow::{bail, Context, Result};
 use boundless_market::contracts::{proof_market::ProofMarketService, ProofStatus};
 use std::sync::Arc;
+use std::time::Duration;
 
 #[derive(Clone)]
 pub struct OrderMonitor<T, P> {
@@ -38,14 +39,22 @@ where
         config: ConfigLock,
         block_time: u64,
         market_addr: Address,
-    ) -> Self {
-        let market = ProofMarketService::new(
+    ) -> Result<Self> {
+        let txn_timeout_opt = {
+            let config = config.lock_all().context("Failed to read config")?;
+            config.batcher.txn_timeout
+        };
+
+        let mut market = ProofMarketService::new(
             market_addr,
             provider.clone(),
             provider.default_signer_address(),
         );
+        if let Some(txn_timeout) = txn_timeout_opt {
+            market = market.with_timeout(Duration::from_secs(txn_timeout));
+        }
 
-        Self { db, provider, block_time, config, market }
+        Ok(Self { db, provider, block_time, config, market })
     }
 
     async fn lock_order(&self, order_id: U256, order: &Order) -> Result<()> {
@@ -312,7 +321,8 @@ mod tests {
             config.clone(),
             block_time,
             contract_address,
-        );
+        )
+        .unwrap();
 
         let orders = monitor.back_scan_locks().await.unwrap();
         assert_eq!(orders, 1);
@@ -409,7 +419,8 @@ mod tests {
             config.clone(),
             block_time,
             contract_address,
-        );
+        )
+        .unwrap();
 
         monitor.start_monitor(Some(4)).await.unwrap();
 

crates/broker/src/order_picker.rs

@@ -171,6 +171,17 @@ where
             .try_into()
             .context("Failed to convert U256 exec limit to u64")?;
 
+        if exec_limit == 0 {
+            tracing::warn!(
+                "Removing order {order_id:x} because it's mcycle price limit is below 0 mcycles"
+            );
+            self.db
+                .skip_order(order_id)
+                .await
+                .context("Order max price below min mcycle price, limit 0")?;
+            return Ok(());
+        }
+
         tracing::debug!(
             "Starting preflight execution of {order_id:x} exec limit {exec_limit} mcycles"
         );

dockerfiles/broker.dockerfile

@@ -14,10 +14,10 @@ RUN curl -L https://foundry.paradigm.xyz | bash && \
 
 # RUN curl -L https://risczero.com/install | bash
 RUN \
-    # --mount=type=cache,target=/root/.cache/sccache/ \
+    # --mount=type=cache,target=/root/.cache/sccache/,id=bndlss_broker_sccache \
     # --mount=type=cache,target=/usr/local/cargo/git/db \
     # --mount=type=cache,target=/usr/local/cargo/registry/ \
-    source ./sccache-config.sh && \
+    # source ./sccache-config.sh && \
     cargo install --version 1.6.9 cargo-binstall && \
     cargo binstall -y --force cargo-risczero --version 1.1 && \
     cargo risczero install
@@ -39,10 +39,6 @@ ENV PATH="$PATH:/root/.foundry/bin"
 RUN forge build
 
 RUN \
-    # --mount=type=cache,target=target,rw,id=spear_broker \
-    # --mount=type=cache,target=/root/.cargo/,rw,id=spear_broker_cargo \
-    # --mount=type=cache,target=/root/.cache/sccache/,rw,id=spear_broker_sccache \
-    # source ./sccache-config.sh && \
     cargo build --release --bin broker && \
     cp /src/target/release/broker /src/broker