Pub (microsoft#14)

limit public APIs

Cargo.toml

@@ -29,31 +29,19 @@ name = "libspartan"
 path = "src/lib.rs"
 
 [[bin]]
-name = "profiler"
-path = "src/profiler.rs"
+name = "snark"
+path = "profiler/snark.rs"
 
-[[bench]]
-name = "commitments"
-harness = false
-
-[[bench]]
-name = "dotproduct"
-harness = false
-
-[[bench]]
-name = "polycommit"
-harness = false
-
-[[bench]]
-name = "r1csproof"
-harness = false
+[[bin]]
+name = "nizk"
+path = "profiler/nizk.rs"
 
 [[bench]]
-name = "spartan"
+name = "snark"
 harness = false
 
 [[bench]]
-name = "sumcheck"
+name = "nizk"
 harness = false
 
 [features]

NOTICE.md

@@ -1,6 +1,6 @@
 This repository includes the following third-party open-source code.
 
-* The code in scalar_25519.rs is derived from [bls12-381](https://github.com/zkcrypto/bls12_381). 
+* The code in src/scalar/ristretto255.rs is derived from [bls12-381](https://github.com/zkcrypto/bls12_381). 
 Specifically, from [src/bls12_381/scalar.rs](https://github.com/zkcrypto/bls12_381/blob/master/src/scalar.rs) and [src/bls12_381/util.rs](https://github.com/zkcrypto/bls12_381/blob/master/src/util.rs), which has the following copyright and license.
 
 Permission is hereby granted, free of charge, to any
@@ -28,7 +28,7 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 
-* The invert and batch_invert methods in src/scalar_25519.rs is from [curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek), which has the following copyright and license.
+* The invert and batch_invert methods in src/scalar/ristretto255.rs is from [curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek), which has the following copyright and license.
 
 Copyright (c) 2016-2019 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
 
@@ -96,7 +96,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-* The bullet.rs is derived from [bulletproofs](https://github.com/dalek-cryptography/bulletproofs/), which has the following license:
+* The src/nizk/bullet.rs is derived from [bulletproofs](https://github.com/dalek-cryptography/bulletproofs/), which has the following license:
 
 MIT License
 

benches/r1csproof.rs → benches/nizk.rs

@@ -7,89 +7,70 @@ extern crate merlin;
 extern crate rand;
 extern crate sha3;
 
-use libspartan::dense_mlpoly::EqPolynomial;
-use libspartan::math::Math;
 use libspartan::r1csinstance::R1CSInstance;
-use libspartan::r1csproof::{R1CSGens, R1CSProof};
-use libspartan::random::RandomTape;
-use libspartan::scalar::Scalar;
-use libspartan::transcript::ProofTranscript;
+use libspartan::spartan::{NIZKGens, NIZK};
 use merlin::Transcript;
-use rand::rngs::OsRng;
 
 use criterion::*;
 
-fn prove_benchmark(c: &mut Criterion) {
+fn nizk_prove_benchmark(c: &mut Criterion) {
   for &s in [10, 12, 16].iter() {
     let plot_config = PlotConfiguration::default().summary_scale(AxisScale::Logarithmic);
-    let mut group = c.benchmark_group("r1cs_prove_benchmark");
+    let mut group = c.benchmark_group("NIZK_prove_benchmark");
     group.plot_config(plot_config);
 
-    let num_vars = s.pow2();
+    let num_vars = (2 as usize).pow(s as u32);
     let num_cons = num_vars;
     let num_inputs = 10;
+
     let (inst, vars, input) = R1CSInstance::produce_synthetic_r1cs(num_cons, num_vars, num_inputs);
     let n = inst.get_num_vars();
 
-    let gens = R1CSGens::new(num_cons, num_vars, b"test-m");
+    let gens = NIZKGens::new(num_cons, num_vars);
 
-    let name = format!("r1cs_prove_{}", n);
+    let name = format!("NIZK_prove_{}", n);
     group.bench_function(&name, move |b| {
       b.iter(|| {
-        let mut random_tape = RandomTape::new(b"proof");
         let mut prover_transcript = Transcript::new(b"example");
-        R1CSProof::prove(
+        NIZK::prove(
           black_box(&inst),
           black_box(vars.clone()),
           black_box(&input),
           black_box(&gens),
           black_box(&mut prover_transcript),
-          black_box(&mut random_tape),
-        )
+        );
       });
     });
     group.finish();
   }
 }
 
-fn verify_benchmark(c: &mut Criterion) {
-  for &s in [10, 12, 16, 20].iter() {
+fn nizk_verify_benchmark(c: &mut Criterion) {
+  for &s in [10, 12, 16].iter() {
     let plot_config = PlotConfiguration::default().summary_scale(AxisScale::Logarithmic);
-    let mut group = c.benchmark_group("r1cs_verify_benchmark");
+    let mut group = c.benchmark_group("NIZK_verify_benchmark");
     group.plot_config(plot_config);
 
-    let num_vars = s.pow2();
+    let num_vars = (2 as usize).pow(s as u32);
     let num_cons = num_vars;
     let num_inputs = 10;
     let (inst, vars, input) = R1CSInstance::produce_synthetic_r1cs(num_cons, num_vars, num_inputs);
     let n = inst.get_num_vars();
-    let gens = R1CSGens::new(num_cons, num_vars, b"test-m");
 
-    let mut random_tape = RandomTape::new(b"proof");
-    let mut prover_transcript = Transcript::new(b"example");
-    let (proof, rx, ry) = R1CSProof::prove(
-      &inst,
-      vars,
-      &input,
-      &gens,
-      &mut prover_transcript,
-      &mut random_tape,
-    );
+    let gens = NIZKGens::new(num_cons, num_vars);
 
-    let eval_table_rx = EqPolynomial::new(rx.clone()).evals();
-    let eval_table_ry = EqPolynomial::new(ry.clone()).evals();
-    let inst_evals = inst.evaluate_with_tables(&eval_table_rx, &eval_table_ry);
+    // produce a proof of satisfiability
+    let mut prover_transcript = Transcript::new(b"example");
+    let proof = NIZK::prove(&inst, vars, &input, &gens, &mut prover_transcript);
 
-    let name = format!("r1cs_verify_{}", n);
+    let name = format!("NIZK_verify_{}", n);
     group.bench_function(&name, move |b| {
       b.iter(|| {
         let mut verifier_transcript = Transcript::new(b"example");
         assert!(proof
           .verify(
-            black_box(num_vars),
-            black_box(num_cons),
+            black_box(&inst),
             black_box(&input),
-            black_box(&inst_evals),
             black_box(&mut verifier_transcript),
             black_box(&gens)
           )
@@ -102,13 +83,12 @@ fn verify_benchmark(c: &mut Criterion) {
 
 fn set_duration() -> Criterion {
   Criterion::default().sample_size(10)
-  // .measurement_time(Duration::new(0, 50000000))
 }
 
 criterion_group! {
-name = benches_r1cs;
+name = benches_nizk;
 config = set_duration();
-targets = prove_benchmark, verify_benchmark
+targets = nizk_prove_benchmark, nizk_verify_benchmark
 }
 
-criterion_main!(benches_r1cs);
+criterion_main!(benches_nizk);