Merge pull request #28 from ICME-Lab/feat/frontend-improvements

Feat/frontend improvements

Author: wyattbenno777

src/tests.rs

@@ -140,11 +140,8 @@ fn test_bulk_ops() -> Result<(), ZKWASMError> {
     .file_path(PathBuf::from("wasm/misc/bulk-ops.wat"))?
     .func_args(vec!["200".to_string()])
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size)?;
-
   Ok(())
 }
 
@@ -157,9 +154,7 @@ fn test_kth_factor() -> Result<(), ZKWASMError> {
     .func_args(vec!["250".to_string(), "15".to_string()])
     .invoke("kth_factor")
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size)?;
   Ok(())
 }
@@ -174,9 +169,7 @@ fn test_integer_hash() {
     .func_args(vec!["100".to_string()])
     .invoke("integer_hash")
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -189,7 +182,6 @@ fn test_gradient_boosting() {
     .unwrap()
     .invoke("_start")
     .build();
-
   let wasm_ctx = WasiWASMCtx::new(wasm_args);
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
@@ -198,7 +190,6 @@ fn test_gradient_boosting() {
 fn test_uni_poly_eval() {
   let x = "1";
   let size = "10";
-
   let step_size = StepSize::new(2_500).set_memory_step_size(50_000);
   init_logger();
   let wasm_args = WASMArgsBuilder::default()
@@ -207,7 +198,6 @@ fn test_uni_poly_eval() {
     .invoke("eval")
     .func_args(vec![String::from(x), String::from(size)])
     .build();
-
   let wasm_ctx = WasiWASMCtx::new(wasm_args);
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
@@ -237,10 +227,8 @@ fn test_fib_large() -> Result<(), ZKWASMError> {
     .invoke("fib")
     .func_args(vec![String::from("1000")])
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
   test_wasm_snark_with(wasm_ctx, step_size)?;
-
   Ok(())
 }
 
@@ -253,10 +241,8 @@ fn test_fib_small() -> Result<(), ZKWASMError> {
     .invoke("fib")
     .func_args(vec![String::from("16")])
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
   test_wasm_snark_with(wasm_ctx, step_size)?;
-
   Ok(())
 }
 
@@ -283,9 +269,7 @@ fn test_defi_transaction() {
     ])
     .invoke("main")
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -311,9 +295,7 @@ fn test_energy_consumption() {
     ])
     .invoke("main")
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -342,7 +324,6 @@ fn test_toy_rsa() {
     .build();
 
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -367,9 +348,7 @@ fn test_financial_protocol() {
     ])
     .invoke("main")
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -395,9 +374,7 @@ fn test_game_logic() {
     ])
     .invoke("main")
     .build();
-
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -425,7 +402,6 @@ fn test_data_provenance() {
     .build();
 
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -453,7 +429,6 @@ fn test_regulatory_compliance() {
     .build();
 
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }
 
@@ -480,6 +455,5 @@ fn test_smart_contract_audit() {
     .build();
 
   let wasm_ctx = WASMCtx::new(wasm_args);
-
   test_wasm_snark_with(wasm_ctx, step_size).unwrap();
 }

src/utils/tracing.rs

@@ -39,7 +39,6 @@ mod test {
   /// Count how many time an opcode gets used. Uses the J index of the opcode
   fn count_opcodes(vms: &[WitnessVM]) -> HashMap<u64, usize> {
     let capacity = wasmi::Instruction::MAX_J + 1;
-
     let mut opcodes_count = HashMap::with_capacity(capacity as usize);
 
     for c in 0..capacity {
@@ -103,6 +102,19 @@ mod test {
       wasmi::Instruction::MemoryGrow,
       wasmi::Instruction::MemoryFill,
       wasmi::Instruction::MemoryCopy,
+      // locals
+      wasmi::Instruction::LocalGet(0.into()),
+      wasmi::Instruction::LocalSet(0.into()),
+      wasmi::Instruction::LocalTee(0.into()),
+      // Br's
+      wasmi::Instruction::Br(0.into()),
+      wasmi::Instruction::BrIfEqz(0.into()),
+      wasmi::Instruction::BrIfNez(0.into()),
+      wasmi::Instruction::BrTable(0.try_into().unwrap()),
+      wasmi::Instruction::BrAdjust(0.into()),
+      // store/load
+      wasmi::Instruction::I64Store(0.into()),
+      wasmi::Instruction::I64Load(0.into()),
     ];
 
     for instr_to_count in instrs_to_count.iter() {
@@ -235,9 +247,7 @@ mod test {
       ])
       .invoke("main")
       .build();
-
     let wasm_ctx = WASMCtx::new(wasm_args);
-
     test_count_with(&wasm_ctx);
   }
 
@@ -260,9 +270,7 @@ mod test {
       ])
       .invoke("main")
       .build();
-
     let wasm_ctx = WASMCtx::new(wasm_args);
-
     test_count_with(&wasm_ctx);
   }
 
@@ -285,9 +293,7 @@ mod test {
       ])
       .invoke("main")
       .build();
-
     let wasm_ctx = WASMCtx::new(wasm_args);
-
     test_count_with(&wasm_ctx);
   }
 
@@ -309,9 +315,7 @@ mod test {
       ])
       .invoke("main")
       .build();
-
     let wasm_ctx = WASMCtx::new(wasm_args);
-
     test_count_with(&wasm_ctx);
   }
 
@@ -323,9 +327,7 @@ mod test {
       .func_args(vec!["100".to_string()])
       .invoke("integer_hash")
       .build();
-
     let wasm_ctx = WASMCtx::new(wasm_args);
-
     test_count_with(&wasm_ctx);
   }
 
@@ -336,9 +338,31 @@ mod test {
       .unwrap()
       .invoke("_start")
       .build();
+    let wasm_ctx = WasiWASMCtx::new(wasm_args);
+    test_count_with(&wasm_ctx);
+  }
 
+  #[test]
+  fn test_count_eq_func() {
+    let wasm_args = WASMArgsBuilder::default()
+      .file_path(PathBuf::from("wasm/nebula/eq_func.wat"))
+      .unwrap()
+      .invoke("eq_func")
+      .func_args(vec!["255".to_string(), "255".to_string()])
+      .build();
     let wasm_ctx = WasiWASMCtx::new(wasm_args);
+    test_count_with(&wasm_ctx);
+  }
 
+  #[test]
+  fn test_count_kth_factor() {
+    let wasm_args = WASMArgsBuilder::default()
+      .file_path(PathBuf::from("wasm/nebula/kth_factor.wat"))
+      .unwrap()
+      .func_args(vec!["250".to_string(), "15".to_string()])
+      .invoke("kth_factor")
+      .build();
+    let wasm_ctx = WASMCtx::new(wasm_args);
     test_count_with(&wasm_ctx);
   }
 }

src/wasm_snark/gadgets/int.rs

@@ -1,9 +1,5 @@
 use bellpepper::gadgets::Assignment;
-use bellpepper_core::{
-  boolean::{AllocatedBit, Boolean},
-  num::AllocatedNum,
-  ConstraintSystem, SynthesisError,
-};
+use bellpepper_core::{num::AllocatedNum, ConstraintSystem, SynthesisError};
 use ff::PrimeField;
 
 pub fn add<F: PrimeField, CS: ConstraintSystem<F>>(
@@ -181,53 +177,3 @@ pub fn alloc_negate<F: PrimeField, CS: ConstraintSystem<F>>(
 
   Ok(b)
 }
-
-/// Checks if AllocatedNum is zero
-pub fn eqz_bit<F, CS>(mut cs: CS, a: &AllocatedNum<F>) -> Result<Boolean, SynthesisError>
-where
-  F: PrimeField,
-  CS: ConstraintSystem<F>,
-{
-  let a_val = a.get_value();
-  let is_zero = a_val.map(|val| val == F::ZERO);
-
-  // result = (a == 0)
-  let result = AllocatedBit::alloc(cs.namespace(|| "a == 0"), is_zero)?;
-
-  // result * a = 0
-  // This means that at least one of result or a is zero.
-  cs.enforce(
-    || "result or a is 0",
-    |lc| lc + result.get_variable(),
-    |lc| lc + a.get_variable(),
-    |lc| lc,
-  );
-
-  // Inverse of `a`, if it exists, otherwise one.
-  let a_fe = a_val.unwrap_or(F::ZERO);
-  let q = cs.alloc(
-    || "q",
-    || {
-      let tmp = a_fe.invert();
-      if tmp.is_some().into() {
-        Ok(tmp.unwrap())
-      } else {
-        Ok(F::ONE)
-      }
-    },
-  )?;
-
-  // (a + result) * q = 1.
-  // This enforces that a and result are not both 0.
-  cs.enforce(
-    || "(a + result) * q = 1",
-    |lc| lc + a.get_variable() + result.get_variable(),
-    |lc| lc + q,
-    |lc| lc + CS::one(),
-  );
-
-  // Taken together, these constraints enforce that exactly one of `a` and `result` is 0.
-  // Since result is constrained to be boolean, that means `result` is true iff `a` is 0.
-
-  Ok(Boolean::Is(result))
-}