Test/adding testing fo witnesscalc (#343)

* refine rust_witness testing

* unify the witness type to String

* test: adding a witnesscalc test case

* cleanup

* upload testing data

* toml: adding feature to control circom features

* fix inputs type

* fix udl

* fix the input type of generateCircomProof in swift and kt files

* cleanup and adding comment

* define features in mopro-ffi codebase to avoid unexpected compliation error

* using witnesscalc_adapter::build_and_link

* fix: review feedback

* rename cfg features

* removed un-necessary deps. in test-e2e

Author: KimiWu123

Cargo.lock

@@ -11,7 +11,7 @@ exclude = ["test-vectors/*"]
 
 [lib]
 name = "circom_prover"
-
+ 
 [features]
 default = ["rustwitness", "arkworks", "ethereum"]
 
@@ -34,7 +34,6 @@ arkworks = [
 ]
 rapidsnark = [
     "rust-rapidsnark",
-    "serde_json",
     "ark-bn254",
     "ark-ec",
     "ark-groth16",
@@ -55,6 +54,7 @@ anyhow = "1.0.95"
 rust-witness = { version = "0.1", optional = true }
 byteorder = { version = "1.0.0" }
 uuid = { version = "1.9.1", features = ["v4"] }
+serde_json = "1.0.94"
 
 # arkworks
 ark-ec = { version = "=0.4.1", default-features = false, features = [
@@ -85,7 +85,7 @@ witnesscalc-adapter = { version = "0.1.0", optional = true }
 
 # rapidsnark
 rust-rapidsnark = { version = "0.1.0", optional = true }
-serde_json = { version = "1.0.94", optional = true }
+
 
 # ethereum
 rayon = { version = "1.10.0" }
@@ -100,5 +100,4 @@ witnesscalc-adapter = { version = "0.1.0", optional = true }
 rust-rapidsnark = { version = "0.1.0", optional = true }
 
 [dev-dependencies]
-serde_json = "1.0.94"
 hex-literal = "0.4.1"

circom-prover/Cargo.toml

@@ -3,7 +3,6 @@ pub mod witness;
 
 use anyhow::Result;
 use prover::{CircomProof, ProofLib};
-use std::collections::HashMap;
 
 #[cfg(feature = "rapidsnark")]
 pub use prover::rapidsnark;
@@ -20,10 +19,10 @@ impl CircomProver {
     pub fn prove(
         proof_lib: ProofLib,
         wit_fn: WitnessFn,
-        inputs: HashMap<String, Vec<String>>,
+        json_input_str: String,
         zkey_path: String,
     ) -> Result<CircomProof> {
-        let wit_thread = witness::generate_witness(wit_fn, inputs);
+        let wit_thread = witness::generate_witness(wit_fn, json_input_str);
         prover::prove(proof_lib, zkey_path.clone(), wit_thread)
     }
 
@@ -39,6 +38,8 @@ impl CircomProver {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
     use super::*;
     const ZKEY_PATH: &str = "./test-vectors/multiplier2_final.zkey";
 
@@ -47,7 +48,8 @@ mod tests {
             ("a".to_string(), vec!["1".to_string()]),
             ("b".to_string(), vec!["2".to_string()]),
         ]);
-        CircomProver::prove(proof_lib, witness_fn, inputs, ZKEY_PATH.to_string()).unwrap()
+        let input_str = serde_json::to_string(&inputs).unwrap();
+        CircomProver::prove(proof_lib, witness_fn, input_str, ZKEY_PATH.to_string()).unwrap()
     }
 
     fn verify_proof(proof: Vec<u8>, public_inputs: Vec<u8>, proof_lib: ProofLib) -> bool {
@@ -69,21 +71,9 @@ mod tests {
     #[cfg(all(feature = "witnesscalc", feature = "arkworks"))]
     #[test]
     fn test_witnesscalc_arkworks_prove_and_verify() {
-        use num_bigint::BigInt;
         witnesscalc_adapter::witness!(multiplier2);
-        // TODO: The conversion should be exported in witness.rs https://github.com/zkmopro/mopro/issues/331
-        fn create_multiplier2_witness(inputs: HashMap<String, Vec<BigInt>>) -> Vec<BigInt> {
-            let inputs_str: HashMap<String, Vec<String>> = inputs
-                .into_iter()
-                .map(|(k, v)| (k, v.into_iter().map(|i| i.to_string()).collect()))
-                .collect();
-            let wtns =
-                multiplier2_witness(&witnesscalc_adapter::convert_inputs_to_json(inputs_str))
-                    .unwrap();
-            witnesscalc_adapter::parse_witness_to_bigints(&wtns).unwrap()
-        }
         let res = generate_proof(
-            WitnessFn::WitnessCalc(create_multiplier2_witness),
+            WitnessFn::WitnessCalc(multiplier2_witness),
             ProofLib::Arkworks,
         );
         let res = verify_proof(res.proof, res.pub_inputs, ProofLib::Arkworks);

circom-prover/src/lib.rs

@@ -1,12 +1,15 @@
 use num::{BigInt, BigUint};
 use std::{collections::HashMap, str::FromStr, thread::JoinHandle};
 
+#[cfg(feature = "witnesscalc")]
+use witnesscalc_adapter::parse_witness_to_bigints;
+
 /// Witness function signature for rust_witness (inputs) -> witness
 #[cfg(feature = "rustwitness")]
 type RustWitnessWtnsFn = fn(HashMap<String, Vec<BigInt>>) -> Vec<BigInt>;
 /// Witness function signature for witnesscalc_adapter (inputs) -> witness
 #[cfg(feature = "witnesscalc")]
-type WitnesscalcWtnsFn = fn(HashMap<String, Vec<BigInt>>) -> Vec<BigInt>;
+type WitnesscalcWtnsFn = fn(&str) -> anyhow::Result<Vec<u8>>;
 
 #[derive(Debug, Clone, Copy)]
 pub enum WitnessFn {
@@ -16,32 +19,59 @@ pub enum WitnessFn {
     RustWitness(RustWitnessWtnsFn),
 }
 
-pub fn generate_witness(
-    witness_fn: WitnessFn,
-    inputs: HashMap<String, Vec<String>>,
-) -> JoinHandle<Vec<BigUint>> {
-    std::thread::spawn(move || {
-        let bigint_inputs = inputs
-            .into_iter()
-            .map(|(k, v)| {
-                (
-                    k,
-                    v.into_iter()
-                        .map(|i| BigInt::from_str(&i).unwrap())
-                        .collect(),
-                )
-            })
-            .collect();
+pub fn generate_witness(witness_fn: WitnessFn, json_input_str: String) -> JoinHandle<Vec<BigUint>> {
+    #[cfg(feature = "rustwitness")]
+    let witness_map = json_to_hashmap(json_input_str.as_str()).unwrap();
 
+    std::thread::spawn(move || {
         let witness = match witness_fn {
             #[cfg(feature = "witnesscalc")]
-            WitnessFn::WitnessCalc(wit_fn) => wit_fn(bigint_inputs),
+            WitnessFn::WitnessCalc(wit_fn) => {
+                let witness = wit_fn(json_input_str.as_str()).unwrap();
+                parse_witness_to_bigints(&witness).unwrap()
+            }
             #[cfg(feature = "rustwitness")]
-            WitnessFn::RustWitness(wit_fn) => wit_fn(bigint_inputs),
+            WitnessFn::RustWitness(wit_fn) => {
+                let bigint_inputs = witness_map
+                    .into_iter()
+                    .map(|(k, v)| {
+                        (
+                            k,
+                            v.into_iter()
+                                .map(|i| BigInt::from_str(&i).unwrap())
+                                .collect(),
+                        )
+                    })
+                    .collect();
+                wit_fn(bigint_inputs)
+            }
         };
         witness
             .into_iter()
             .map(|w| w.to_biguint().unwrap())
             .collect::<Vec<_>>()
     })
 }
+
+#[cfg(feature = "rustwitness")]
+pub fn json_to_hashmap(json_str: &str) -> Result<HashMap<String, Vec<String>>, serde_json::Error> {
+    use serde_json::Value;
+
+    let value: Value = serde_json::from_str(json_str)?;
+
+    let mut hashmap = HashMap::new();
+
+    if let Value::Object(map) = value {
+        for (key, val) in map {
+            if let Value::Array(arr) = val {
+                let vec: Vec<String> = arr
+                    .into_iter()
+                    .filter_map(|v| v.as_str().map(|s| s.to_string()))
+                    .collect();
+                hashmap.insert(key, vec);
+            }
+        }
+    }
+
+    Ok(hashmap)
+}

circom-prover/src/witness.rs

@@ -39,7 +39,7 @@ fun MultiplierComponent() {
                 Thread(
                     Runnable {
                         val startTime = System.currentTimeMillis()
-                        res = generateCircomProof(zkeyPath, inputs)
+                        res = generateCircomProof(zkeyPath, inputs.toString())
                         val endTime = System.currentTimeMillis()
                         provingTime = "proving time: " + (endTime - startTime).toString() + " ms"
                     }

cli/src/template/android/app/src/main/java/com/example/moproapp/MultiplierComponent.kt

@@ -72,21 +72,19 @@ extension ContentView {
         textViewText += "Generating Circom proof... "
         do {
             // Prepare inputs
-            var inputs = [String: [String]]()
             let a = 3
             let b = 5
             let c = a*b
-            inputs["a"] = [String(a)]
-            inputs["b"] = [String(b)]
-            
+            let input_str: String = "{\"b\":[\"5\"],\"a\":[\"3\"]}"
+
             // Expected outputs
             let outputs: [String] = [String(c), String(a)]
             let expectedOutput: [UInt8] = serializeOutputs(outputs)
 
             let start = CFAbsoluteTimeGetCurrent()
 
             // Generate Proof
-            let generateProofResult = try generateCircomProof(zkeyPath: zkeyPath, circuitInputs: inputs)
+            let generateProofResult = try generateCircomProof(zkeyPath: zkeyPath, circuitInputs: input_str)
             assert(!generateProofResult.proof.isEmpty, "Proof should not be empty")
             assert(Data(expectedOutput) == generateProofResult.inputs, "Circuit outputs mismatch the expected outputs")
 

cli/src/template/ios/MoproApp/ContentView.swift

@@ -17,13 +17,25 @@ default = []
 
 halo2 = []
 circom = [
-    "circom-prover",
-    "rust-witness",
+    "rustwitness",
+    "arkworks",
     "ark-bn254",
     "ark-bls12-381",
     "ark-ff",
 ]
 
+# circom features
+## witness
+rustwitness = ["circom-prover/rustwitness", "rust-witness"]
+witnesscalc = ["circom-prover/witnesscalc", "witnesscalc-adapter"]
+## proof
+arkworks = ["circom-prover/arkworks"]
+rapidsnark = ["circom-prover/rapidsnark"]
+## include all circom features
+circom-all = ["rustwitness", "witnesscalc", "arkworks", "rapidsnark"]
+
+
+
 [dependencies]
 uniffi = { version = "=0.28.0", features = ["cli", "build"] }
 serde = { version = "1.0", features = ["derive"] }
@@ -39,8 +51,9 @@ color-eyre = "=0.6.2"
 
 # circom deps
 rust-witness = { version = "0.1", optional = true }
+witnesscalc-adapter = { version = "0.1", optional = true }
 ark-ff = { version = "0.4.0", optional = true }
-circom-prover = { path = "../circom-prover", optional = true }
+circom-prover = { path = "../circom-prover", optional = true}
 
 # ZKP generation
 ark-bn254 = { version = "=0.4.0", optional = true }
@@ -49,12 +62,14 @@ ark-bls12-381 = { version = "0.4.0", optional = true }
 
 [build-dependencies]
 rust-witness = { version = "0.1", optional = true }
+witnesscalc-adapter = { version = "0.1", optional = true }
 uniffi = { version = "=0.28.0", features = ["build"] }
 
 [dev-dependencies]
 color-eyre = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
+serde_json = "1.0.94"
 
 # Halo2 dependencies
 plonk-fibonacci = { workspace = true }

mopro-ffi/Cargo.toml

@@ -1,6 +1,12 @@
 fn main() {
     #[cfg(feature = "circom")]
-    if std::env::var("MOPRO_FFI_LINK_TEST_WITNESS").unwrap_or_default() != "" {
-        rust_witness::transpile::transpile_wasm("../test-vectors/circom".to_string());
+    {
+        if std::env::var("MOPRO_FFI_LINK_TEST_WITNESS").unwrap_or_default() != "" {
+            #[cfg(feature = "rustwitness")]
+            rust_witness::transpile::transpile_wasm("../test-vectors/circom".to_string());
+
+            #[cfg(feature = "witnesscalc")]
+            witnesscalc_adapter::build_and_link("../test-vectors/circom/witnesscalc");
+        }
     }
 }