Adds SPARK

.github/workflows/end-to-end.yml

@@ -57,48 +57,77 @@ jobs:
       - name: Clean stale benchmark artifacts
         working-directory: noir-examples/noir-passport/merkle_age_check
         run: |
-          rm -f ./benchmark-inputs/*.pkp ./benchmark-inputs/*.pkv ./benchmark-inputs/*.np
+          rm -f ./benchmark-inputs/*.pkp ./benchmark-inputs/*.pkv ./benchmark-inputs/*.np ./benchmark-inputs/*.sp ./benchmark-inputs/*.spc
+          rm -rf ./benchmark-inputs/*-spark
           echo "Cleaned stale benchmark artifacts"
 
-      - name: Prepare circuits 
+      - name: Prepare circuits
         working-directory: noir-examples/noir-passport/merkle_age_check
         run: |
           for circuit in t_add_dsc_720 t_add_id_data_720 t_add_integrity_commit t_attest; do
             echo "Preparing $circuit"
-            cargo run --release --bin provekit-cli prepare ./target/$circuit.json \
-              --pkp ./benchmark-inputs/$circuit-prover.pkp \
-              --pkv ./benchmark-inputs/$circuit-verifier.pkv
+            ../../../target/release/provekit-cli prepare \
+              ./target/$circuit.json \
+              --pkp ./benchmark-inputs/$circuit.pkp \
+              --pkv ./benchmark-inputs/$circuit.pkv \
+              --spark \
+              --spc ./benchmark-inputs/$circuit.spc
             echo "Prepared $circuit"
           done
 
-      - name: Generate proofs for all circuits
+      - name: Prove all circuits
         working-directory: noir-examples/noir-passport/merkle_age_check
         run: |
           for circuit in t_add_dsc_720 t_add_id_data_720 t_add_integrity_commit t_attest; do
             echo "Proving $circuit"
-            cargo run --release --bin provekit-cli prove \
-              ./benchmark-inputs/$circuit-prover.pkp \
+            ../../../target/release/provekit-cli prove \
+              ./benchmark-inputs/$circuit.pkp \
               ./benchmark-inputs/tbs_720/$circuit.toml \
-              -o ./benchmark-inputs/$circuit-proof.np
+              -o ./benchmark-inputs/$circuit-proof.np \
+              --spark-queries-dir ./benchmark-inputs/$circuit-spark \
+              --produce-spark-query
             echo "Proved $circuit"
           done
 
-      - name: Verify proofs for all circuits
+      - name: Generate SPARK proofs for all circuits
+        working-directory: noir-examples/noir-passport/merkle_age_check
+        run: |
+          for circuit in t_add_dsc_720 t_add_id_data_720 t_add_integrity_commit t_attest; do
+            echo "SPARK proving $circuit"
+            ../../../target/release/provekit-cli prove-spark \
+              ./benchmark-inputs/$circuit.pkp \
+              --spark-dir ./benchmark-inputs/$circuit-spark
+            echo "SPARK proved $circuit"
+          done
+
+      - name: Natively verify Noir proofs for all circuits
         working-directory: noir-examples/noir-passport/merkle_age_check
         run: |
           for circuit in t_add_dsc_720 t_add_id_data_720 t_add_integrity_commit t_attest; do
             echo "Verifying $circuit"
-            cargo run --release --bin provekit-cli verify \
-              ./benchmark-inputs/$circuit-verifier.pkv \
+            ../../../target/release/provekit-cli verify \
+              ./benchmark-inputs/$circuit.pkv \
               ./benchmark-inputs/$circuit-proof.np
             echo "Verified $circuit"
           done
 
+      - name: Verify SPARK proofs for all circuits
+        working-directory: noir-examples/noir-passport/merkle_age_check
+        run: |
+          for circuit in t_add_dsc_720 t_add_id_data_720 t_add_integrity_commit t_attest; do
+            echo "SPARK verifying $circuit"
+            ../../../target/release/provekit-cli verify-spark \
+              ./benchmark-inputs/$circuit-spark/spark_proof.sp \
+              ./benchmark-inputs/$circuit.spc \
+              ./benchmark-inputs/$circuit-spark/spark_query_*.json
+            echo "SPARK verified $circuit"
+          done
+
       - name: Generate Gnark inputs
         working-directory: noir-examples/noir-passport/merkle_age_check
         run: |
-          cargo run --release --bin provekit-cli generate-gnark-inputs \
-            ./benchmark-inputs/t_attest-verifier.pkv \
+          ../../../target/release/provekit-cli generate-gnark-inputs \
+            ./benchmark-inputs/t_attest.pkv \
             ./benchmark-inputs/t_attest-proof.np
 
 

.gitignore

@@ -14,11 +14,15 @@
 *.pkp
 *.pkv
 *.np
+*.sp
+*.spc
+spark_proofs/
 params_for_recursive_verifier
 params
 artifacts/
 spartan_vm_debug/
 mavros_debug/
+mavros/
 
 # Don't ignore benchmarking artifacts
 !tooling/provekit-bench/benches/*

Cargo.toml

@@ -17,6 +17,7 @@ members = [
   "tooling/provekit-wasm",
   "tooling/verifier-server",
   "ntt",
+  "provekit/spark",
   "poseidon2",
   "playground/passport-input-gen",
 ]
@@ -102,6 +103,7 @@ provekit-ffi = { path = "tooling/provekit-ffi" }
 provekit-gnark = { path = "tooling/provekit-gnark" }
 provekit-prover = { path = "provekit/prover", default-features = false }
 provekit-r1cs-compiler = { path = "provekit/r1cs-compiler" }
+provekit-spark = { path = "provekit/spark" }
 provekit-verifier = { path = "provekit/verifier" }
 provekit-verifier-server = { path = "tooling/verifier-server" }
 provekit-wasm = { path = "tooling/provekit-wasm" }

noir-examples/power/Nargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "basic"
+name = "power"
 type = "bin"
 authors = [""]
 compiler_version = ">=0.22.0"

noir-examples/power/src/main.nr

@@ -1,6 +1,6 @@
 fn main(mut x: Field, y: pub Field) {
   let mut r = 1;
-  for i in 0..10 {
+  for _ in 0..1000 {
     r *= x;
   }
   assert(r == y);

playground/passport-input-gen/src/bin/passport_cli/main.rs

@@ -267,7 +267,7 @@ fn prove_circuit<T: serde::Serialize>(
         .map_err(|e| anyhow::anyhow!("ABI parse error for {circuit_name}: {e}"))?;
 
     tee_println!("  [{circuit_name}] Generating proof...");
-    let proof = prover
+    let (proof, _) = prover
         .prove(input_map)
         .with_context(|| format!("Proving {circuit_name}"))?;
 

provekit/common/src/file/binary_format.rs

@@ -24,4 +24,10 @@ pub const NOIR_PROOF_SCHEME_FORMAT: [u8; 8] = *b"NrProScm";
 pub const NOIR_PROOF_SCHEME_VERSION: (u16, u16) = (1, 2);
 
 pub const NOIR_PROOF_FORMAT: [u8; 8] = *b"NPSProof";
-pub const NOIR_PROOF_VERSION: (u16, u16) = (1, 1);
+pub const NOIR_PROOF_VERSION: (u16, u16) = (1, 2);
+
+pub const SPARK_PROOF_FORMAT: [u8; 8] = *b"SparkPrf";
+pub const SPARK_PROOF_VERSION: (u16, u16) = (1, 0);
+
+pub const SPARK_SETUP_FORMAT: [u8; 8] = *b"SparkStp";
+pub const SPARK_SETUP_VERSION: (u16, u16) = (1, 0);

provekit/common/src/file/io/mod.rs

@@ -3,11 +3,12 @@ mod buf_ext;
 mod counting_writer;
 mod json;
 
+pub use self::bin::Compression;
 use {
     self::{
         bin::{
             deserialize_from_bytes, read_bin, read_hash_config as read_hash_config_bin,
-            serialize_to_bytes, write_bin, Compression,
+            serialize_to_bytes, write_bin,
         },
         buf_ext::BufExt,
         counting_writer::CountingWriter,
@@ -29,7 +30,7 @@ pub trait FileFormat: Serialize + for<'a> Deserialize<'a> {
 }
 
 /// Helper trait to optionally extract hash config.
-pub(crate) trait MaybeHashAware {
+pub trait MaybeHashAware {
     fn maybe_hash_config(&self) -> Option<HashConfig>;
 }
 

provekit/common/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod file;
 pub use file::binary_format;
 pub mod hash_config;
-mod interner;
+pub mod interner;
 mod mavros;
 mod noir_proof_scheme;
 pub mod ntt;
@@ -11,6 +11,7 @@ pub mod prefix_covector;
 mod prover;
 mod r1cs;
 pub mod skyscraper;
+pub mod spark;
 pub mod sparse_matrix;
 mod transcript_sponge;
 pub mod u256_arith;

provekit/common/src/mavros.rs

@@ -11,14 +11,16 @@ use {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct MavrosProver {
     #[serde(with = "crate::utils::serde_jsonify")]
-    pub abi:                Abi,
-    pub num_public_inputs:  usize,
-    pub whir_for_witness:   WhirR1CSScheme,
-    pub witgen_binary:      Vec<u64>,
-    pub ad_binary:          Vec<u64>,
-    pub constraints_layout: ConstraintsLayout,
-    pub witness_layout:     WitnessLayout,
-    pub hash_config:        HashConfig,
+    pub abi:                 Abi,
+    pub num_public_inputs:   usize,
+    pub whir_for_witness:    WhirR1CSScheme,
+    pub witgen_binary:       Vec<u64>,
+    pub ad_binary:           Vec<u64>,
+    pub constraints_layout:  ConstraintsLayout,
+    pub witness_layout:      WitnessLayout,
+    pub hash_config:         HashConfig,
+    #[serde(skip, default)]
+    pub produce_spark_query: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

provekit/common/src/prover.rs

@@ -18,6 +18,8 @@ pub struct NoirProver {
     pub split_witness_builders: SplitWitnessBuilders,
     pub witness_generator:      NoirWitnessGenerator,
     pub whir_for_witness:       WhirR1CSScheme,
+    #[serde(skip, default)]
+    pub produce_spark_query:    bool,
 }
 
 // INVARIANT: Variant order is wire-format-critical (postcard uses positional
@@ -40,20 +42,29 @@ impl Prover {
                 split_witness_builders: d.split_witness_builders,
                 witness_generator:      d.witness_generator,
                 whir_for_witness:       d.whir_for_witness,
+                produce_spark_query:    false,
             }),
             NoirProofScheme::Mavros(d) => Prover::Mavros(MavrosProver {
-                abi:                d.abi,
-                num_public_inputs:  d.num_public_inputs,
-                whir_for_witness:   d.whir_for_witness,
-                witgen_binary:      d.witgen_binary,
-                ad_binary:          d.ad_binary,
-                constraints_layout: d.constraints_layout,
-                witness_layout:     d.witness_layout,
-                hash_config:        d.hash_config,
+                abi:                 d.abi,
+                num_public_inputs:   d.num_public_inputs,
+                whir_for_witness:    d.whir_for_witness,
+                witgen_binary:       d.witgen_binary,
+                ad_binary:           d.ad_binary,
+                constraints_layout:  d.constraints_layout,
+                witness_layout:      d.witness_layout,
+                hash_config:         d.hash_config,
+                produce_spark_query: false,
             }),
         }
     }
 
+    pub fn set_produce_spark_query(&mut self, value: bool) {
+        match self {
+            Prover::Noir(p) => p.produce_spark_query = value,
+            Prover::Mavros(p) => p.produce_spark_query = value,
+        }
+    }
+
     pub fn abi(&self) -> &Abi {
         match self {
             Prover::Noir(p) => p.witness_generator.abi(),

provekit/common/src/spark.rs

@@ -0,0 +1,35 @@
+use {
+    crate::{utils::serde_ark, FieldElement},
+    serde::{Deserialize, Serialize},
+    sha3::{Digest, Sha3_256},
+};
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Point {
+    #[serde(with = "serde_ark")]
+    pub row: Vec<FieldElement>,
+    #[serde(with = "serde_ark")]
+    pub col: Vec<FieldElement>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct R1CSSparkQuery {
+    pub point_to_evaluate: Point,
+    #[serde(with = "serde_ark")]
+    pub claimed_a:         FieldElement,
+    #[serde(with = "serde_ark")]
+    pub claimed_b:         FieldElement,
+    #[serde(with = "serde_ark")]
+    pub claimed_c:         FieldElement,
+}
+
+impl R1CSSparkQuery {
+    pub fn hash_bytes(&self) -> [u8; 32] {
+        hash_query_set(std::slice::from_ref(self))
+    }
+}
+
+pub fn hash_query_set(queries: &[R1CSSparkQuery]) -> [u8; 32] {
+    let bytes = postcard::to_allocvec(queries).expect("serializing R1CSSparkQuery set");
+    Sha3_256::digest(&bytes).into()
+}

provekit/common/src/utils/sumcheck.rs

@@ -152,6 +152,11 @@ fn eval_eq(
     }
 }
 
+/// Evaluates a quadratic polynomial on a value
+pub fn eval_quadratic_poly(poly: [FieldElement; 3], point: FieldElement) -> FieldElement {
+    poly[0] + point * (poly[1] + point * poly[2])
+}
+
 /// Evaluates a cubic polynomial on a value
 pub fn eval_cubic_poly(poly: [FieldElement; 4], point: FieldElement) -> FieldElement {
     poly[0] + point * (poly[1] + point * (poly[2] + point * poly[3]))