feat: decouple constraints from witness solver (#2)

Author: Autoparallel

bin/src/main.nr

@@ -1,7 +1,5 @@
 use http::parse;
 
-pub fn main(item: pub [Field; 1], data: str<1024>) -> pub Field {
+pub fn main(data: str<1024>) {
     parse(data);
-    item[0]
 }
-

constraint_counter/mock/mock.json

@@ -0,0 +1 @@
+{"noir_version":"1.0.0-beta.1+03b58fa2dfcc8acc8cf5198b1b23b55676fbdb02","hash":2759475469106495053,"abi":{"parameters":[{"name":"x0","type":{"kind":"field"},"visibility":"public"},{"name":"w0","type":{"kind":"field"},"visibility":"private"},{"name":"w1","type":{"kind":"field"},"visibility":"private"}],"return_type":null,"error_types":{}},"bytecode":"H4sIAAAAAAAA/62QQQoAIAgEVXpQ9YL+/6qKWhTBkw6IexqWZXrIOSYFef3fcww4q71S55q3WzN7oLPfJmIDlIN1nEwBAAA=","debug_symbols":"TYxLCsMwDAXvonUWTVuy8FVKCf7IQWBsI9uFYnL3KCGB7DRv0HRwaNoyU/SpgPp0CMnqSikKdXgcU8k67lSq5gpqfI8DYHRyTc91AE8BQU2v9StgmEKgZb5nZP5pJm0CnuhbtDdb//ky13/mZNE1xr10OMlv","file_map":{"63":{"source":"use http::parse;\n\n// pub fn main(data: str<1024>)  {\n//     parse(data);\n// }\n\npub fn main(x0: pub Field, w0: Field, w1: Field) {\n    assert(x0 * w0 + w1 + 2 == 0);\n}","path":"/Users/autoparallel/Code/noir-web-prover-circuits/bin/src/main.nr"}},"names":["main"],"brillig_names":[]}

constraint_counter/src/bridge.rs

@@ -2,13 +2,14 @@ use std::{cell::RefCell, path::Path, rc::Rc};
 
 use ark_bn254::Fr;
 use ark_ff::AdditiveGroup;
-use ark_r1cs_std::{alloc::AllocVar, fields::fp::FpVar};
-use ark_relations::r1cs::{ConstraintSystem, ConstraintSystemRef, SynthesisMode};
+use ark_relations::r1cs::{
+    ConstraintSynthesizer, ConstraintSystem, ConstraintSystemRef, OptimizationGoal, SynthesisMode,
+};
 
 use clap::Parser;
-use noir::NoirFCircuit;
 
-pub mod bridge;
+use noir::NoirProgram;
+
 pub mod noir;
 
 #[derive(Parser)]
@@ -18,14 +19,6 @@ struct Args {
     /// Path to the circuit JSON file
     #[arg(short, long)]
     circuit: String,
-
-    /// Length of public IO
-    #[arg(long)]
-    public_io_length: usize,
-
-    /// Length of private input
-    #[arg(long)]
-    private_input_length: usize,
 }
 
 pub fn main() {
@@ -40,28 +33,63 @@ pub fn main() {
         }
     };
 
-    let circuit = NoirFCircuit::new(&noir_json);
-
     let mut cs = ConstraintSystem::<Fr>::new();
-    cs.mode = SynthesisMode::Prove {
-        construct_matrices: false,
-    };
+    cs.mode = SynthesisMode::Setup;
+    cs.optimization_goal = OptimizationGoal::Constraints;
     let cs = ConstraintSystemRef::<Fr>::CS(Rc::new(RefCell::new(cs)));
+    dbg!(cs.num_instance_variables());
+    dbg!(cs.num_witness_variables());
 
-    // Use array directly for public inputs
-    let pub_inputs = vec![Fr::ZERO; args.public_io_length];
-    let z_i = Vec::<FpVar<Fr>>::new_witness(cs.clone(), || Ok(pub_inputs)).unwrap();
+    let program = NoirProgram::new(&noir_json);
+    program.generate_constraints(cs.clone());
+    cs.finalize();
+    dbg!(cs.num_constraints());
+}
 
-    // Use array directly for external inputs
-    let external_inputs = vec![Fr::ZERO; args.private_input_length];
-    let external_inputs =
-        Vec::<FpVar<Fr>>::new_witness(cs.clone(), || Ok(external_inputs)).unwrap();
+#[cfg(test)]
+mod tests {
+    use super::*;
 
-    let start = std::time::Instant::now();
-    circuit
-        .generate_step_constraints(cs.clone(), &z_i, &external_inputs)
-        .unwrap();
-    println!("Duration for witness solving: {:?}", start.elapsed());
+    #[test]
+    fn test_mock_noir_circuit() {
+        // Circuit definition:
+        // x_0 * w_0 + w_1 + 2 == 0
+        let json_path = Path::new("./mock").join(format!("mock.json"));
+        let noir_json = std::fs::read(&json_path).unwrap();
 
-    dbg!(cs.num_constraints());
+        let mut cs = ConstraintSystem::<Fr>::new();
+        cs.mode = SynthesisMode::Setup;
+        cs.optimization_goal = OptimizationGoal::Constraints;
+        let cs = ConstraintSystemRef::<Fr>::CS(Rc::new(RefCell::new(cs)));
+
+        let program = NoirProgram::new(&noir_json);
+        program.generate_constraints(cs.clone());
+        cs.finalize();
+
+        cs.set_mode(SynthesisMode::Prove {
+            construct_matrices: true,
+        });
+
+        dbg!(cs.to_matrices());
+        dbg!(cs.num_instance_variables());
+        dbg!(cs.num_witness_variables());
+        // NOTE, the 0th instance assignment is the constant term enabler.
+        // This example is:
+        // 2 * 3 + (-8) + 2 == 0
+        cs.borrow_mut().unwrap().instance_assignment = vec![Fr::ONE, Fr::from(2)];
+        cs.borrow_mut().unwrap().witness_assignment = vec![Fr::from(3), -Fr::from(8)];
+        assert!(cs.is_satisfied().unwrap());
+    }
+
+    #[test]
+    fn test_mock_noir_solve() {
+        // Circuit definition:
+        // x_0 * w_0 + w_1 + 2 == 0
+        let json_path = Path::new("./mock").join(format!("mock.json"));
+        let noir_json = std::fs::read(&json_path).unwrap();
+
+        let program = NoirProgram::new(&noir_json);
+        // NOTE: Don't need to have the instance assignment set to 1 here, so we need a method to handle this if we were sticking with this CS.
+        program.solve(&[Fr::from(2)], &[Fr::from(3), -Fr::from(8)]);
+    }
 }