feat: add prover_type (#838)

succinctlabs · May 30, 2024 · 5f46fb0 · 5f46fb0
2 parents 3cc3cc6 + d1ca91f
commit 5f46fb0
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -37,6 +37,8 @@ tempfile = "3.10.1"
 num-bigint = "0.4.5"
 cfg-if = "1.0"
 ethers = { version = "2", default-features = false }
+strum_macros = "0.26.2"
+strum = "0.26.2"
 
 [features]
 neon = ["sp1-core/neon"]

diff --git a/sdk/src/provers/local.rs b/sdk/src/provers/local.rs
@@ -7,6 +7,8 @@ use crate::{
     SP1ProvingKey, SP1VerifyingKey,
 };
 
+use super::ProverType;
+
 /// An implementation of [crate::ProverClient] that can generate end-to-end proofs locally.
 pub struct LocalProver {
     prover: SP1Prover,
@@ -21,8 +23,8 @@ impl LocalProver {
 }
 
 impl Prover for LocalProver {
-    fn id(&self) -> String {
-        "local".to_string()
+    fn id(&self) -> ProverType {
+        ProverType::Local
     }
 
     fn setup(&self, elf: &[u8]) -> (SP1ProvingKey, SP1VerifyingKey) {

diff --git a/sdk/src/provers/mock.rs b/sdk/src/provers/mock.rs
@@ -9,6 +9,8 @@ use sp1_prover::{
     verify::verify_plonk_bn254_public_inputs, HashableKey, PlonkBn254Proof, SP1Prover, SP1Stdin,
 };
 
+use super::ProverType;
+
 /// An implementation of [crate::ProverClient] that can generate mock proofs.
 pub struct MockProver {
     pub(crate) prover: SP1Prover,
@@ -23,8 +25,8 @@ impl MockProver {
 }
 
 impl Prover for MockProver {
-    fn id(&self) -> String {
-        "mock".to_string()
+    fn id(&self) -> ProverType {
+        ProverType::Mock
     }
 
     fn setup(&self, elf: &[u8]) -> (SP1ProvingKey, SP1VerifyingKey) {

diff --git a/sdk/src/provers/mod.rs b/sdk/src/provers/mod.rs
@@ -13,10 +13,19 @@ use sp1_prover::SP1CoreProofData;
 use sp1_prover::SP1Prover;
 use sp1_prover::SP1ReduceProof;
 use sp1_prover::{SP1ProvingKey, SP1Stdin, SP1VerifyingKey};
+use strum_macros::EnumString;
+
+/// The type of prover.
+#[derive(Debug, PartialEq, EnumString)]
+pub enum ProverType {
+    Local,
+    Mock,
+    Network,
+}
 
 /// An implementation of [crate::ProverClient].
 pub trait Prover: Send + Sync {
-    fn id(&self) -> String;
+    fn id(&self) -> ProverType;
 
     fn sp1_prover(&self) -> &SP1Prover;
 

diff --git a/sdk/src/provers/network.rs b/sdk/src/provers/network.rs
@@ -15,7 +15,7 @@ use sp1_prover::utils::block_on;
 use sp1_prover::{SP1Prover, SP1Stdin};
 use tokio::{runtime, time::sleep};
 
-use super::LocalProver;
+use super::{LocalProver, ProverType};
 
 /// An implementation of [crate::ProverClient] that can generate proofs on a remote RPC server.
 pub struct NetworkProver {
@@ -151,8 +151,8 @@ impl NetworkProver {
 }
 
 impl Prover for NetworkProver {
-    fn id(&self) -> String {
-        "remote".to_string()
+    fn id(&self) -> ProverType {
+        ProverType::Network
     }
 
     fn setup(&self, elf: &[u8]) -> (SP1ProvingKey, SP1VerifyingKey) {