Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,129 changes: 1,117 additions & 12 deletions circ_blocks/Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
# TODO: find a mechanism to keep this in sync with ceno's version.
channel = "nightly-2024-10-03"
channel = "nightly-2024-12-18"
6 changes: 6 additions & 0 deletions spartan_parallel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ colored = { version = "2", default-features = false, optional = true }
flate2 = { version = "1" }
goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks" }
ff = "0.13.0"
multilinear_extensions = { path = "../../ceno/multilinear_extensions" }
sumcheck = { path = "../../ceno/sumcheck" }
ff_ext = { path = "../../ceno/ff_ext" }
transcript = { path = "../../ceno/transcript" }
ceno_zkvm = { path = "../../ceno/ceno_zkvm" }
halo2curves = "0.1.0"

[dev-dependencies]
criterion = "0.5"
Expand Down
4 changes: 3 additions & 1 deletion spartan_parallel/src/dense_mlpoly.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use rayon::prelude::*;
pub struct DensePolynomial<S: SpartanExtensionField> {
num_vars: usize, // the number of variables in the multilinear polynomial
len: usize,
Z: Vec<S>, // evaluations of the polynomial in all the 2^num_vars Boolean inputs
pub Z: Vec<S>, // evaluations of the polynomial in all the 2^num_vars Boolean inputs
}

pub struct EqPolynomial<S: SpartanExtensionField> {
Expand Down Expand Up @@ -449,6 +449,7 @@ impl<S: SpartanExtensionField> PolyEvalProof<S> {
}
}

/*
#[cfg(test)]
mod tests {
use super::*;
Expand Down Expand Up @@ -610,3 +611,4 @@ mod tests {
assert_eq!(R, R2);
}
}
*/
4 changes: 2 additions & 2 deletions spartan_parallel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ impl VerifierWitnessSecInfo {
}

/// `SNARK` holds a proof produced by Spartan SNARK
#[derive(Serialize, Deserialize, Debug)]
#[derive(Serialize, Debug)]
pub struct SNARK<S: SpartanExtensionField> {
block_r1cs_sat_proof: R1CSProof<S>,
block_inst_evals_bound_rp: [S; 3],
Expand Down Expand Up @@ -642,7 +642,7 @@ impl PartialEq for InstanceSortHelper {
}
impl Eq for InstanceSortHelper {}

impl<S: SpartanExtensionField + Send + Sync> SNARK<S> {
impl<'a, S: SpartanExtensionField + Send + Sync> SNARK<S> {
fn protocol_name() -> &'static [u8] {
b"Spartan SNARK proof"
}
Expand Down
Loading
Loading