Generate proof using the Halo2Prover trait

privacy-scaling-explorations · Jul 8, 2024 · 92cdeb4 · 92cdeb4
1 parent 0af9eaa
commit 92cdeb4
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 93 deletions.
diff --git a/examples/blake2f.rs b/examples/blake2f.rs
@@ -9,7 +9,7 @@ use chiquito::{
     plonkish::{
         backend::halo2::{
             chiquitoSuperCircuit2Halo2, halo2_verify, ChiquitoHalo2SuperCircuit, DummyRng,
-            PlonkishHalo2,
+            Halo2Prover, PlonkishHalo2,
         },
         compiler::{
             cell_manager::{MaxWidthCellManager, SingleRowCellManager},
@@ -1488,8 +1488,7 @@ fn main() {
 
     let halo2_prover = circuit.create_halo2_prover(9, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-    let (proof, instance) = halo2_prover.generate_proof(rng, witness);
+    let (proof, instance) = halo2_prover.generate_proof(witness);
 
     let result = halo2_verify(
         proof,

diff --git a/examples/factorial.rs b/examples/factorial.rs
@@ -5,7 +5,7 @@ use chiquito::{
     frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
                                                          * circuit */
     plonkish::{
-        backend::halo2::{halo2_verify, DummyRng, PlonkishHalo2},
+        backend::halo2::{halo2_verify, DummyRng, Halo2Prover, PlonkishHalo2},
         compiler::{
             cell_manager::SingleRowCellManager, // input for constructing the compiler
             compile,                            // input for constructing the compiler
@@ -140,10 +140,8 @@ fn main() {
 
     let halo2_prover = plonkish.create_halo2_prover(10, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-
     let (proof, instance) =
-        halo2_prover.generate_proof(rng, &plonkish.assignment_generator.unwrap().generate(0));
+        halo2_prover.generate_proof(plonkish.assignment_generator.unwrap().generate(0));
 
     let result = halo2_verify(
         proof,
@@ -163,10 +161,8 @@ fn main() {
 
     let halo2_prover = plonkish.create_halo2_prover(8, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-
     let (proof, instance) =
-        halo2_prover.generate_proof(rng, &plonkish.assignment_generator.unwrap().generate(7));
+        halo2_prover.generate_proof(plonkish.assignment_generator.unwrap().generate(7));
 
     let result = halo2_verify(
         proof,

diff --git a/examples/fibo_with_padding.rs b/examples/fibo_with_padding.rs
@@ -5,7 +5,7 @@ use chiquito::{
     frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
                                                          * circuit */
     plonkish::{
-        backend::halo2::{halo2_verify, DummyRng, PlonkishHalo2},
+        backend::halo2::{halo2_verify, DummyRng, Halo2Prover, PlonkishHalo2},
         compiler::{
             cell_manager::SingleRowCellManager, // input for constructing the compiler
             compile,                            // input for constructing the compiler
@@ -210,10 +210,8 @@ fn main() {
 
     let halo2_prover = plonkish.create_halo2_prover(7, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-
     let (proof, instance) =
-        halo2_prover.generate_proof(rng, &plonkish.assignment_generator.unwrap().generate(7));
+        halo2_prover.generate_proof(plonkish.assignment_generator.unwrap().generate(7));
 
     let result = halo2_verify(
         proof,

diff --git a/examples/fibonacci.rs b/examples/fibonacci.rs
@@ -6,7 +6,7 @@ use chiquito::{
                                                          * circuit */
     plonkish::{
         backend::{
-            halo2::{halo2_verify, DummyRng, PlonkishHalo2},
+            halo2::{halo2_verify, DummyRng, Halo2Prover, PlonkishHalo2},
             hyperplonk::ChiquitoHyperPlonkCircuit,
         },
         compiler::{
@@ -138,10 +138,8 @@ fn main() {
 
     let halo2_prover = chiquito.create_halo2_prover(7, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-
     let (proof, instance) =
-        halo2_prover.generate_proof(rng, &chiquito.assignment_generator.unwrap().generate(()));
+        halo2_prover.generate_proof(chiquito.assignment_generator.unwrap().generate(()));
 
     let result = halo2_verify(
         proof,

diff --git a/examples/keccak.rs b/examples/keccak.rs
@@ -5,7 +5,7 @@ use chiquito::{
     plonkish::{
         backend::halo2::{
             chiquitoSuperCircuit2Halo2, halo2_verify, ChiquitoHalo2SuperCircuit, DummyRng,
-            PlonkishHalo2,
+            Halo2Prover, PlonkishHalo2,
         },
         compiler::{
             cell_manager::{MaxWidthCellManager, SingleRowCellManager},
@@ -2267,8 +2267,7 @@ fn main() {
 
     let halo2_prover = circuit.create_halo2_prover(9, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-    let (proof, instance) = halo2_prover.generate_proof(rng, witness);
+    let (proof, instance) = halo2_prover.generate_proof(witness);
 
     let result = halo2_verify(
         proof,

diff --git a/examples/mimc7.rs b/examples/mimc7.rs
@@ -7,7 +7,7 @@ use chiquito::{
     plonkish::{
         backend::halo2::{
             chiquitoSuperCircuit2Halo2, halo2_verify, ChiquitoHalo2SuperCircuit, DummyRng,
-            PlonkishHalo2,
+            Halo2Prover, PlonkishHalo2,
         },
         compiler::{
             cell_manager::SingleRowCellManager, config, step_selector::SimpleStepSelectorBuilder,
@@ -213,8 +213,7 @@ fn main() {
 
     let halo2_prover = circuit.create_halo2_prover(10, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-    let (proof, instance) = halo2_prover.generate_proof(rng, witness);
+    let (proof, instance) = halo2_prover.generate_proof(witness);
 
     let result = halo2_verify(
         proof,

diff --git a/examples/poseidon.rs b/examples/poseidon.rs
@@ -3,7 +3,7 @@ use chiquito::{
     plonkish::{
         backend::halo2::{
             chiquitoSuperCircuit2Halo2, halo2_verify, ChiquitoHalo2SuperCircuit, DummyRng,
-            PlonkishHalo2,
+            Halo2Prover, PlonkishHalo2,
         },
         compiler::{
             cell_manager::{MaxWidthCellManager, SingleRowCellManager},
@@ -713,8 +713,7 @@ fn main() {
 
     let halo2_prover = circuit.create_halo2_prover(12, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-    let (proof, instance) = halo2_prover.generate_proof(rng, witness);
+    let (proof, instance) = halo2_prover.generate_proof(witness);
 
     let result = halo2_verify(
         proof,

diff --git a/src/frontend/python/mod.rs b/src/frontend/python/mod.rs
@@ -10,7 +10,7 @@ use crate::{
     plonkish::{
         backend::halo2::{
             chiquito2Halo2, chiquitoSuperCircuit2Halo2, halo2_verify, ChiquitoHalo2,
-            ChiquitoHalo2SuperCircuit, DummyRng, PlonkishHalo2,
+            ChiquitoHalo2SuperCircuit, DummyRng, Halo2Prover, PlonkishHalo2,
         },
         compiler::{
             cell_manager::SingleRowCellManager, compile, config,
@@ -157,8 +157,7 @@ pub fn chiquito_super_circuit_halo2_mock_prover(
 
     let halo2_prover = circuit.create_halo2_prover(k as u32, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-    let (proof, instance) = halo2_prover.generate_proof(rng, super_assignments);
+    let (proof, instance) = halo2_prover.generate_proof(super_assignments);
 
     let result = halo2_verify(
         proof,
@@ -199,11 +198,8 @@ pub fn chiquito_halo2_mock_prover(witness_json: &str, rust_id: UUID, k: usize) {
 
     let halo2_prover = plonkish.create_halo2_prover(k as u32, rng);
 
-    let rng = BlockRng::new(DummyRng {});
-
     let (proof, instance) = halo2_prover.generate_proof(
-        rng,
-        &plonkish
+        plonkish
             .assignment_generator
             .unwrap()
             .generate(trace_witness),

diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs
@@ -321,7 +321,7 @@ fn get_block_stmts(stmt: &Statement<BigInt, Identifier>) -> Vec<Statement<BigInt
 
 #[cfg(test)]
 mod test {
-    use crate::plonkish::backend::halo2::PlonkishHalo2;
+    use crate::plonkish::backend::halo2::{Halo2Prover, PlonkishHalo2};
     use halo2_proofs::halo2curves::bn256::Fr;
     use rand_chacha::rand_core::block::BlockRng;
     use std::collections::HashMap;
@@ -453,11 +453,8 @@ mod test {
 
         let halo2_prover = plonkish.create_halo2_prover(7, rng);
 
-        let rng = BlockRng::new(DummyRng {});
-
         let (proof, instance) = halo2_prover.generate_proof(
-            rng,
-            &plonkish
+            plonkish
                 .assignment_generator
                 .unwrap()
                 .generate(HashMap::from([("n".to_string(), Fr::from(12))])),
@@ -536,11 +533,8 @@ mod test {
 
         let halo2_prover = plonkish.create_halo2_prover(7, rng);
 
-        let rng = BlockRng::new(DummyRng {});
-
         let (proof, instance) = halo2_prover.generate_proof(
-            rng,
-            &plonkish
+            plonkish
                 .assignment_generator
                 .unwrap()
                 .generate(HashMap::from([("n".to_string(), Fr::from(12))])),