feat: add proving systems to help (#492)

Author: NicolasRampoldi

batcher/aligned-batcher-lib/src/types/mod.rs

@@ -1,4 +1,3 @@
-use anyhow::anyhow;
 use ethers::types::Address;
 use lambdaworks_crypto::merkle_tree::{
     merkle::MerkleTree, proof::Proof, traits::IsMerkleTreeBackend,
@@ -130,19 +129,6 @@ impl BatchInclusionData {
     }
 }
 
-pub fn parse_proving_system(proving_system: &str) -> anyhow::Result<ProvingSystemId> {
-    match proving_system {
-        "GnarkPlonkBls12_381" => Ok(ProvingSystemId::GnarkPlonkBls12_381),
-        "GnarkPlonkBn254" => Ok(ProvingSystemId::GnarkPlonkBn254),
-        "Groth16Bn254" => Ok(ProvingSystemId::Groth16Bn254),
-        "SP1" => Ok(ProvingSystemId::SP1),
-        "Halo2IPA" => Ok(ProvingSystemId::Halo2IPA),
-        "Halo2KZG" => Ok(ProvingSystemId::Halo2KZG),
-        "Risc0" => Ok(ProvingSystemId::Risc0),
-        _ => Err(anyhow!("Invalid proving system: {}, Available proving systems are: [GnarkPlonkBls12_381, GnarkPlonkBn254, Groth16Bn254, SP1, Halo2KZG, Halo2IPA]", proving_system))
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

batcher/aligned/src/errors.rs

@@ -9,7 +9,6 @@ use ethers::signers::WalletError;
 pub enum BatcherClientError {
     MissingParameter(String),
     InvalidUrl(url::ParseError, String),
-    InvalidProvingSystem(String),
     ConnectionError(tokio_tungstenite::tungstenite::Error),
     IoError(PathBuf, io::Error),
     SerdeError(serde_json::Error),
@@ -57,9 +56,6 @@ impl fmt::Debug for BatcherClientError {
             BatcherClientError::InvalidUrl(err, url) => {
                 write!(f, "Invalid URL \"{}\", {}", url, err)
             }
-            BatcherClientError::InvalidProvingSystem(proving_system) => {
-                write!(f, "Invalid proving system: {}", proving_system)
-            }
             BatcherClientError::ConnectionError(e) => {
                 write!(f, "Web Socket Connection error: {}", e)
             }

batcher/aligned/src/main.rs

@@ -23,18 +23,16 @@ use tokio_tungstenite::connect_async;
 use tokio_tungstenite::tungstenite::Message;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 
-use aligned_batcher_lib::types::{
-    parse_proving_system, BatchInclusionData, ProvingSystemId, VerificationData,
-};
+use aligned_batcher_lib::types::{BatchInclusionData, ProvingSystemId, VerificationData};
 use clap::Subcommand;
 use ethers::utils::hex;
 use sha3::{Digest, Keccak256};
 
 use crate::errors::BatcherClientError;
 use crate::types::AlignedVerificationData;
+use crate::AlignedCommands::GetVerificationKeyCommitment;
 use crate::AlignedCommands::Submit;
 use crate::AlignedCommands::VerifyProofOnchain;
-use crate::AlignedCommands::GetVerificationKeyCommitment;
 
 use clap::{Parser, ValueEnum};
 
@@ -53,7 +51,10 @@ pub enum AlignedCommands {
     VerifyProofOnchain(VerifyProofOnchainArgs),
 
     // GetVericiationKey, command name is get-vk-commitment
-    #[clap(about = "Create verification key for proving system", name = "get-vk-commitment")]
+    #[clap(
+        about = "Create verification key for proving system",
+        name = "get-vk-commitment"
+    )]
     GetVerificationKeyCommitment(GetVerificationKeyCommitmentArgs),
 }
 
@@ -67,7 +68,7 @@ pub struct SubmitArgs {
     )]
     connect_addr: String,
     #[arg(name = "Proving system", long = "proving_system")]
-    proving_system_flag: String,
+    proving_system_flag: ProvingSystemArg,
     #[arg(name = "Proof file path", long = "proof")]
     proof_file_name: PathBuf,
     #[arg(name = "Public input file name", long = "public_input")]
@@ -130,6 +131,38 @@ pub enum Chain {
     Holesky,
 }
 
+#[derive(Debug, Clone, ValueEnum)]
+pub enum ProvingSystemArg {
+    #[clap(name = "GnarkPlonkBls12_381")]
+    GnarkPlonkBls12_381,
+    #[clap(name = "GnarkPlonkBn254")]
+    GnarkPlonkBn254,
+    #[clap(name = "Groth16Bn254")]
+    Groth16Bn254,
+    #[clap(name = "SP1")]
+    SP1,
+    #[clap(name = "Halo2KZG")]
+    Halo2KZG,
+    #[clap(name = "Halo2IPA")]
+    Halo2IPA,
+    #[clap(name = "Risc0")]
+    Risc0,
+}
+
+impl From<ProvingSystemArg> for ProvingSystemId {
+    fn from(proving_system: ProvingSystemArg) -> Self {
+        match proving_system {
+            ProvingSystemArg::GnarkPlonkBls12_381 => ProvingSystemId::GnarkPlonkBls12_381,
+            ProvingSystemArg::GnarkPlonkBn254 => ProvingSystemId::GnarkPlonkBn254,
+            ProvingSystemArg::Groth16Bn254 => ProvingSystemId::Groth16Bn254,
+            ProvingSystemArg::SP1 => ProvingSystemId::SP1,
+            ProvingSystemArg::Halo2KZG => ProvingSystemId::Halo2KZG,
+            ProvingSystemArg::Halo2IPA => ProvingSystemId::Halo2IPA,
+            ProvingSystemArg::Risc0 => ProvingSystemId::Risc0,
+        }
+    }
+}
+
 #[tokio::main]
 async fn main() -> Result<(), errors::BatcherClientError> {
     env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
@@ -324,8 +357,7 @@ async fn receive(
 }
 
 fn verification_data_from_args(args: SubmitArgs) -> Result<VerificationData, BatcherClientError> {
-    let proving_system = parse_proving_system(&args.proving_system_flag)
-        .map_err(|_| BatcherClientError::InvalidProvingSystem(args.proving_system_flag))?;
+    let proving_system = args.proving_system_flag.into();
 
     // Read proof file
     let proof = read_file(args.proof_file_name)?;