chore: compile time errors for conflicting flags, clean up flags in sdk

crates/prover/Cargo.toml

@@ -82,6 +82,8 @@ required-features = ["export-tests"]
 
 
 [features]
+cuda = []
+network = []
 native-gnark = ["sp1-recursion-gnark-ffi/native"]
 export-tests = ["dep:test-artifacts"]
 debug = ["sp1-core-machine/debug"]

crates/prover/src/types.rs

@@ -188,7 +188,9 @@ impl SP1Bn254ProofData {
 pub enum ProverMode {
     #[default]
     Cpu,
+    #[cfg(feature = "cuda")]
     Cuda,
+    #[cfg(feature = "network")]
     Network,
     #[value(skip)]
     Mock,

crates/sdk/Cargo.toml

@@ -52,6 +52,7 @@ alloy-signer = { version = "0.5", optional = true }
 alloy-signer-local = { version = "0.5", optional = true }
 alloy-primitives = { version = "0.8", optional = true }
 backoff = { version = "0.4", features = ["tokio"], optional = true }
+conflicting = "0.1.0"
 
 [dev-dependencies]
 test-artifacts = { workspace = true }
@@ -62,6 +63,7 @@ native-gnark = ["sp1-prover/native-gnark"]
 # TODO: Once alloy has a 1.* release, we can likely remove this feature flag, as there will be less 
 # dependency resolution issues.
 network = [
+  "sp1-prover/network",
   "dep:prost",
   "dep:alloy-sol-types",
   "dep:tokio",
@@ -71,7 +73,9 @@ network = [
   "dep:twirp",
   "dep:reqwest-middleware",
 ]
+
 network-v2 = [
+  "sp1-prover/network",
   "dep:prost",
   "dep:alloy-sol-types",
   "dep:alloy-signer",
@@ -85,7 +89,7 @@ network-v2 = [
   "dep:tonic",
   "dep:backoff",
 ]
-cuda = ["sp1-cuda"]
+cuda = ["sp1-cuda", "sp1-prover/cuda"]
 
 [build-dependencies]
 vergen = { version = "8", default-features = false, features = [

crates/sdk/src/install.rs

@@ -1,4 +1,3 @@
-use cfg_if::cfg_if;
 use std::path::PathBuf;
 
 #[cfg(any(feature = "network", feature = "network-v2"))]
@@ -42,18 +41,18 @@ pub fn try_install_circuit_artifacts(artifacts_type: &str) -> PathBuf {
             build_dir.display()
         );
     } else {
-        cfg_if! {
-            if #[cfg(any(feature = "network", feature = "network-v2"))] {
-                println!(
-                    "[sp1] {} circuit artifacts for version {} do not exist at {}. downloading...",
-                    artifacts_type,
-                    SP1_CIRCUIT_VERSION,
-                    build_dir.display()
-                );
-                install_circuit_artifacts(build_dir.clone(), artifacts_type);
-            }
-        }
+        #[cfg(any(feature = "network", feature = "network-v2"))]
+        {
+            println!(
+                "[sp1] {} circuit artifacts for version {} do not exist at {}. downloading...",
+                artifacts_type,
+                SP1_CIRCUIT_VERSION,
+                build_dir.display()
+            );
+            install_circuit_artifacts(build_dir.clone(), artifacts_type);
+        };
     }
+
     build_dir
 }
 

crates/sdk/src/lib.rs

@@ -48,6 +48,9 @@
     SP1VerifyingKey,
 };
 
+#[cfg(any(feature = "network", feature = "network-v2"))]
+use conflicting::conflicting;
+
 /// A client for interacting with SP1.
 pub struct ProverClient {
     /// The underlying prover implementation.
@@ -71,6 +74,7 @@
     /// std::env::set_var("SP1_PROVER", "local");
     /// let client = ProverClient::new();
     /// ```
+    #[deprecated = "Use `ProverClient::builder` instead"]
     pub fn new() -> Self {
         #[allow(unreachable_code)]
         match env::var("SP1_PROVER").unwrap_or("local".to_string()).to_lowercase().as_str() {
@@ -185,18 +189,18 @@
     ///
     /// let client = ProverClient::network(private_key, rpc_url, skip_simulation);
     /// ```
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     pub fn network(private_key: String, rpc_url: Option<String>, skip_simulation: bool) -> Self {
-        cfg_if! {
-            if #[cfg(feature = "network-v2")] {
+        conflicting! {
+            "network" => {
                 Self {
-                    prover: Box::new(NetworkProverV2::new(&private_key, rpc_url, skip_simulation)),
+                    prover: Box::new(NetworkProverV1::new(&private_key, rpc_url, skip_simulation)),
                 }
-            } else if #[cfg(feature = "network")] {
+            },
+            "network-v2" => {
                 Self {
-                    prover: Box::new(NetworkProverV1::new(&private_key, rpc_url, skip_simulation)),
+                    prover: Box::new(NetworkProverV2::new(&private_key, rpc_url, skip_simulation)),
                 }
-            } else {
-                panic!("network feature is not enabled")
             }
         }
     }
@@ -315,16 +319,19 @@
 
 impl Default for ProverClient {
     fn default() -> Self {
-        Self::new()
+        Self::cpu()
     }
 }
 
 /// Builder type for [`ProverClient`].
 #[derive(Debug, Default)]
 pub struct ProverClientBuilder {
     mode: Option<ProverMode>,
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     private_key: Option<String>,
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     rpc_url: Option<String>,
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     skip_simulation: bool,
 }
 
@@ -336,18 +343,21 @@
     }
 
     ///  Sets the private key.
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     pub fn private_key(mut self, private_key: String) -> Self {
         self.private_key = Some(private_key);
         self
     }
 
     /// Sets the RPC URL.
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     pub fn rpc_url(mut self, rpc_url: String) -> Self {
         self.rpc_url = Some(rpc_url);
         self
     }
 
     /// Skips simulation.
+    #[cfg(any(feature = "network", feature = "network-v2"))]
     pub fn skip_simulation(mut self) -> Self {
         self.skip_simulation = true;
         self
@@ -357,29 +367,22 @@
     pub fn build(self) -> ProverClient {
         match self.mode.expect("The prover mode is required") {
             ProverMode::Cpu => ProverClient::cpu(),
-            ProverMode::Cuda => {
-                cfg_if! {
-                    if #[cfg(feature = "cuda")] {
-                        ProverClient::cuda()
-                    } else {
-                        panic!("cuda feature is not enabled")
-                    }
-                }
-            }
+            #[cfg(feature = "cuda")]
+            ProverMode::Cuda => ProverClient::cuda(),
+            #[cfg(any(feature = "network", feature = "network-v2"))]
             ProverMode::Network => {
                 let private_key = self.private_key.expect("The private key is required");
 
-                cfg_if! {
-                    if #[cfg(feature = "network-v2")] {
+                conflicting! {
+                    "network" => {
                         ProverClient {
-                            prover: Box::new(NetworkProverV2::new(&private_key, self.rpc_url, self.skip_simulation)),
+                            prover: Box::new(NetworkProverV1::new(&private_key, self.rpc_url, self.skip_simulation)),
                         }
-                    } else if #[cfg(feature = "network")] {
+                    },
+                    "network-v2" => {
                         ProverClient {
-                            prover: Box::new(NetworkProverV1::new(&private_key, self.rpc_url, self.skip_simulation)),
+                            prover: Box::new(NetworkProverV2::new(&private_key, self.rpc_url, self.skip_simulation)),
                         }
-                    } else {
-                        panic!("network feature is not enabled")
                     }
                 }
             }
@@ -388,51 +391,6 @@
     }
 }
 
-/// Builder type for network prover.
-#[cfg(any(feature = "network", feature = "network-v2"))]
-#[derive(Debug, Default)]
-pub struct NetworkProverBuilder {
-    private_key: Option<String>,
-    rpc_url: Option<String>,
-    skip_simulation: bool,
-}
-
-impl NetworkProverBuilder {
-    ///  Sets the private key.
-    pub fn private_key(mut self, private_key: String) -> Self {
-        self.private_key = Some(private_key);
-        self
-    }
-
-    /// Sets the RPC URL.
-    pub fn rpc_url(mut self, rpc_url: String) -> Self {
-        self.rpc_url = Some(rpc_url);
-        self
-    }
-
-    /// Skips simulation.
-    pub fn skip_simulation(mut self) -> Self {
-        self.skip_simulation = true;
-        self
-    }
-
-    /// Creates a new [NetworkProverV1].
-    #[cfg(feature = "network")]
-    pub fn build(self) -> NetworkProverV1 {
-        let private_key = self.private_key.expect("The private key is required");
-
-        NetworkProverV1::new(&private_key, self.rpc_url, self.skip_simulation)
-    }
-
-    /// Creates a new [NetworkProverV2].
-    #[cfg(feature = "network-v2")]
-    pub fn build_v2(self) -> NetworkProverV2 {
-        let private_key = self.private_key.expect("The private key is required");
-
-        NetworkProverV2::new(&private_key, self.rpc_url, self.skip_simulation)
-    }
-}
-
 /// Utility method for blocking on an async function.
 ///
 /// If we're already in a tokio runtime, we'll block in place. Otherwise, we'll create a new

crates/sdk/src/network-v2/prover.rs

@@ -3,8 +3,7 @@ use std::time::{Duration, Instant};
 use crate::{
     network_v2::client::NetworkClient,
     network_v2::proto::network::{ProofMode, ProofStatus, ProofStrategy},
-    NetworkProverBuilder, Prover, SP1Context, SP1ProofKind, SP1ProofWithPublicValues,
-    SP1ProvingKey, SP1VerifyingKey,
+    Prover, SP1Context, SP1ProofKind, SP1ProofWithPublicValues, SP1ProvingKey, SP1VerifyingKey,
 };
 use anyhow::Result;
 use backoff::{future::retry, ExponentialBackoff};
@@ -41,11 +40,6 @@ impl NetworkProver {
         Self { client, local_prover, skip_simulation }
     }
 
-    /// Creates a new network prover builder. See [`NetworkProverBuilder`] for more details.
-    pub fn builder() -> NetworkProverBuilder {
-        NetworkProverBuilder::default()
-    }
-
     /// Requests a proof from the prover network, returning the request ID.
     pub async fn request_proof(
         &self,

crates/sdk/src/network/prover.rs

@@ -5,8 +5,7 @@ use crate::{
         client::NetworkClient,
         proto::network::{ProofMode, ProofStatus},
     },
-    NetworkProverBuilder, Prover, SP1Context, SP1ProofKind, SP1ProofWithPublicValues,
-    SP1ProvingKey, SP1VerifyingKey,
+    Prover, SP1Context, SP1ProofKind, SP1ProofWithPublicValues, SP1ProvingKey, SP1VerifyingKey,
 };
 use anyhow::Result;
 use sp1_core_machine::io::SP1Stdin;
@@ -39,11 +38,6 @@ impl NetworkProver {
         Self { client: NetworkClient::new(private_key, rpc_url), local_prover, skip_simulation }
     }
 
-    /// Creates a new network prover builder. See [`NetworkProverBuilder`] for more details.
-    pub fn builder() -> NetworkProverBuilder {
-        NetworkProverBuilder::default()
-    }
-
     /// Requests a proof from the prover network, returning the proof ID.
     pub async fn request_proof(
         &self,