refactor: use auction strategy by default (#2388)

Author: ctian1

crates/core/executor/src/profiler.rs

@@ -162,6 +162,7 @@ impl Profiler {
         pb.set_style(
             ProgressStyle::default_bar()
                 .template(
+                    #[allow(clippy::literal_string_with_formatting_args)]
                     "{msg} \n {spinner:.green} [{elapsed_precise}] [{bar:40.cyan/blue}] {pos}/{len} ({eta})",
                 )
                 .unwrap()

crates/prover/src/gas/mod.rs

@@ -53,7 +53,6 @@ pub fn final_transform(raw_gas: f64) -> Result<u64, GasError> {
 }
 
 /// Calculates core, precompile, mem records. Does not implement packed or last shard logic.
-#[allow(clippy::manual_repeat_n)]
 pub fn estimated_records<'a>(
     split_opts: &SplitOpts,
     estimator: &'a RecordEstimator,
@@ -108,14 +107,12 @@ pub fn estimated_records<'a>(
             ])
         }
 
-        std::iter::repeat(Cow::Owned(memory_air(threshold, threshold)))
-            .take(full_airs as usize)
-            .chain(
-                remainders
-                    .iter()
-                    .any(|x| *x > 0)
-                    .then(|| Cow::Owned(memory_air(remainders[0], remainders[1]))),
-            )
+        std::iter::repeat_n(Cow::Owned(memory_air(threshold, threshold)), full_airs as usize).chain(
+            remainders
+                .iter()
+                .any(|x| *x > 0)
+                .then(|| Cow::Owned(memory_air(remainders[0], remainders[1]))),
+        )
     };
 
     core_records.chain(global_memory_records).chain(precompile_records)

crates/recursion/core/src/air/builder.rs

@@ -1,4 +1,4 @@
-use core::iter::{once, repeat};
+use core::iter::{once, repeat_n};
 use p3_air::{AirBuilder, AirBuilderWithPublicValues};
 use p3_field::AbstractField;
 use sp1_stark::{
@@ -58,7 +58,6 @@ pub trait RecursionMemoryAirBuilder: RecursionInteractionAirBuilder {
         );
     }
 
-    #[allow(clippy::manual_repeat_n)]
     fn recursion_eval_memory_access_single<E: Into<Self::Expr> + Clone>(
         &mut self,
         timestamp: impl Into<Self::Expr>,
@@ -79,12 +78,12 @@ pub trait RecursionMemoryAirBuilder: RecursionInteractionAirBuilder {
         let prev_values = once(prev_timestamp)
             .chain(once(addr.clone()))
             .chain(once(memory_access.prev_value().clone().into()))
-            .chain(repeat(Self::Expr::zero()).take(3))
+            .chain(repeat_n(Self::Expr::zero(), 3))
             .collect();
         let current_values = once(timestamp)
             .chain(once(addr.clone()))
             .chain(once(memory_access.value().clone().into()))
-            .chain(repeat(Self::Expr::zero()).take(3))
+            .chain(repeat_n(Self::Expr::zero(), 3))
             .collect();
 
         self.receive(

crates/recursion/core/src/chips/mem/constant.rs

@@ -102,7 +102,6 @@ impl<F: PrimeField32> MachineAir<F> for MemoryChip<F> {
         // This is a no-op.
     }
 
-    #[allow(clippy::manual_repeat_n)]
     fn generate_trace(&self, input: &Self::Record, _: &mut Self::Record) -> RowMajorMatrix<F> {
         // Match number of rows generated by the `.chunks` call in `generate_preprocessed_trace`.
         let num_rows = input
@@ -111,7 +110,7 @@ impl<F: PrimeField32> MachineAir<F> for MemoryChip<F> {
             .map(|x| x / NUM_CONST_MEM_ENTRIES_PER_ROW + 1)
             .unwrap_or_default();
         let mut rows =
-            std::iter::repeat([F::zero(); NUM_MEM_INIT_COLS]).take(num_rows).collect::<Vec<_>>();
+            std::iter::repeat_n([F::zero(); NUM_MEM_INIT_COLS], num_rows).collect::<Vec<_>>();
 
         // Pad the rows to the next power of two.
         pad_rows_fixed(&mut rows, || [F::zero(); NUM_MEM_INIT_COLS], input.fixed_log2_rows(self));

crates/sdk/Cargo.toml

@@ -48,7 +48,7 @@ sp1-stark = { workspace = true }
 sp1-primitives = { workspace = true }
 itertools = { workspace = true }
 tonic = { version = "0.12", features = ["tls", "tls-roots"], optional = true }
-alloy-sol-types = { version = "1.0", default-features = false, optional = true }
+alloy-sol-types = { version = "1.0", default-features = false }
 alloy-primitives = { version = "1.0", default-features = false, optional = true, features = ["k256", "serde"] }
 backoff = { version = "0.4", features = ["tokio"], optional = true }
 
@@ -76,9 +76,8 @@ network = [
   "dep:backoff",
 ]
 tee-2fa = []
-sepolia = [
+reserved-capacity = [
   "network",
-  "dep:alloy-sol-types",
 ]
 cuda = []
 bigint-rug = ["sp1-core-machine/bigint-rug"]

crates/sdk/src/network/client.rs

@@ -36,7 +36,7 @@ use crate::network::proto::{
     },
 };
 
-#[cfg(feature = "sepolia")]
+#[cfg(not(feature = "reserved-capacity"))]
 use crate::network::proto::types::{
     GetProofRequestParamsRequest, GetProofRequestParamsResponse, GetProversByUptimeRequest,
     TransactionVariant,
@@ -226,7 +226,7 @@ impl NetworkClient {
     }
 
     /// Gets the proof request parameters from the network.
-    #[cfg(feature = "sepolia")]
+    #[cfg(not(feature = "reserved-capacity"))]
     pub async fn get_proof_request_params(
         &self,
         mode: ProofMode,
@@ -427,7 +427,7 @@ impl NetworkClient {
                 let nonce = self.get_nonce().await?;
 
                 cfg_if::cfg_if! {
-                    if #[cfg(feature = "sepolia")] {
+                    if #[cfg(not(feature = "reserved-capacity"))] {
                         let whitelist = if let Some(whitelist) = &whitelist {
                             whitelist.iter().map(|addr| addr.to_vec()).collect()
                         } else {

crates/sdk/src/network/mod.rs

@@ -25,7 +25,7 @@ pub use alloy_primitives::{Address, B256};
 pub use error::*;
 
 cfg_if::cfg_if! {
-    if #[cfg(feature = "sepolia")] {
+    if #[cfg(not(feature = "reserved-capacity"))] {
         pub(crate) const PUBLIC_EXPLORER_URL: &str = "https://explorer.sepolia.succinct.xyz";
         pub(crate) const DEFAULT_NETWORK_RPC_URL: &str = "https://rpc.sepolia.succinct.xyz";
     } else {

crates/sdk/src/network/proto/mod.rs

@@ -6,7 +6,7 @@
 pub mod artifact;
 
 cfg_if::cfg_if! {
-    if #[cfg(feature = "sepolia")] {
+    if #[cfg(not(feature = "reserved-capacity"))] {
         mod sepolia {
             #[rustfmt::skip]
             pub mod network;
@@ -27,4 +27,4 @@ cfg_if::cfg_if! {
         #[rustfmt::skip]
         pub use self::base::{network, types};
     }
-}
+}

crates/sdk/src/network/prover.rs

@@ -24,7 +24,7 @@ use crate::{
     SP1VerifyingKey,
 };
 
-#[cfg(feature = "sepolia")]
+#[cfg(not(feature = "reserved-capacity"))]
 use crate::network::proto::types::GetProofRequestParamsResponse;
 
 use alloy_primitives::{Address, B256, U256};
@@ -43,6 +43,12 @@ pub struct NetworkProver {
     pub(crate) tee_signers: Vec<Address>,
 }
 
+#[cfg(feature = "reserved-capacity")]
+const DEFAULT_FULFILLMENT_STRATEGY: FulfillmentStrategy = FulfillmentStrategy::Reserved;
+
+#[cfg(not(feature = "reserved-capacity"))]
+const DEFAULT_FULFILLMENT_STRATEGY: FulfillmentStrategy = FulfillmentStrategy::Auction;
+
 impl NetworkProver {
     /// Creates a new [`NetworkProver`] with the given private key.
     ///
@@ -139,7 +145,7 @@ impl NetworkProver {
             pk,
             stdin: stdin.clone(),
             timeout: None,
-            strategy: FulfillmentStrategy::Hosted,
+            strategy: DEFAULT_FULFILLMENT_STRATEGY,
             skip_simulation: false,
             cycle_limit: None,
             gas_limit: None,
@@ -190,7 +196,7 @@ impl NetworkProver {
     ///     let params = client.get_proof_request_params(SP1ProofMode::Compressed).await.unwrap();
     /// })
     /// ```
-    #[cfg(feature = "sepolia")]
+    #[cfg(not(feature = "reserved-capacity"))]
     pub async fn get_proof_request_params(
         &self,
         mode: SP1ProofMode,
@@ -347,16 +353,16 @@ impl NetworkProver {
     ) -> Result<B256> {
         // Ensure the strategy is supported in the network.
         cfg_if::cfg_if! {
-            if #[cfg(feature = "sepolia")] {
+            if #[cfg(not(feature = "reserved-capacity"))] {
                 if strategy != FulfillmentStrategy::Auction {
                     return Err(anyhow::anyhow!(
-                        "Strategy not supported with \"sepolia\" feature. Use FulfillmentStrategy::Auction."
+                        "This fulfillment strategy requires the \"reserved-capacity\" feature on sp1-sdk. Use FulfillmentStrategy::Auction or enable the feature."
                     ));
                 }
             } else {
                 if strategy == FulfillmentStrategy::Auction {
                     return Err(anyhow::anyhow!(
-                        "FulfillmentStrategy::Auction requires the \"sepolia\" feature."
+                        "FulfillmentStrategy::Auction is not available with the \"reserved-capacity\" feature on sp1-sdk. Use a different strategy or disable the feature."
                     ));
                 }
             }
@@ -568,6 +574,7 @@ impl NetworkProver {
         let mut whitelist = whitelist.clone();
 
         // Attempt to get proof, with retry logic for failed auction requests.
+        #[allow(clippy::never_loop)]
         loop {
             let request_id = self
                 .request_proof_impl(
@@ -612,7 +619,7 @@ impl NetworkProver {
             let mut proof = match self.wait_proof(request_id, timeout, auction_timeout).await {
                 Ok(proof) => proof,
                 Err(e) => {
-                    #[cfg(feature = "sepolia")]
+                    #[cfg(not(feature = "reserved-capacity"))]
                     // Check if this is an auction request that we can retry.
                     if let Some(network_error) = e.downcast_ref::<Error>() {
                         if matches!(
@@ -747,7 +754,7 @@ impl NetworkProver {
         max_price_per_pgu: Option<u64>,
     ) -> Result<(Address, Address, Address, u64, u64, Vec<u8>)> {
         cfg_if::cfg_if! {
-            if #[cfg(feature = "sepolia")] {
+            if #[cfg(not(feature = "reserved-capacity"))] {
                 let params = self.get_proof_request_params(mode).await?;
                 let auctioneer_value = if let Some(auctioneer) = auctioneer {
                     auctioneer
@@ -811,7 +818,7 @@ impl Prover<CpuProverComponents> for NetworkProver {
             pk,
             stdin,
             mode,
-            FulfillmentStrategy::Hosted,
+            DEFAULT_FULFILLMENT_STRATEGY,
             None,
             false,
             None,

crates/sdk/src/network/utils.rs

@@ -4,7 +4,7 @@
 
 #![allow(deprecated)]
 
-use std::cmp::max;
+use std::cmp::{max, min};
 
 use prost::Message;
 
@@ -31,9 +31,10 @@ pub(crate) fn sign_raw(message: &[u8], signer: &SigningKey) -> (Signature, Recov
 
 /// Calculate the timeout for a proof request based on gas limit.
 ///
-/// Uses a base timeout of 5 minutes plus 1 second per 2000000 prover gas.
+/// Uses a base timeout of 5 minutes plus 1 second per 2000000 prover gas. The timeout is capped at
+/// 4 hours.
 pub(crate) fn calculate_timeout_from_gas_limit(gas_limit: u64) -> u64 {
     let base_timeout = 300; // 5 minutes
     let gas_based_timeout = gas_limit / 2_000_000;
-    max(base_timeout, gas_based_timeout)
+    min(max(base_timeout, gas_based_timeout), 14400)
 }