arnaucube/Nova
1
0
Fork 0
mirror of https://github.com/arnaucube/Nova.git synced 2026-01-11 08:31:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix padding logic (#151)

Browse Source 
* fix padding

* update version
This commit is contained in:
Srinath Setty
2023-03-13 10:45:35 -07:00
committed by GitHub
parent cbbc1c6127
commit eb97499907
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "nova-snark" name = "nova-snark"
version = "0.18.1" version = "0.18.2"
authors = ["Srinath Setty <srinath@microsoft.com>"] authors = ["Srinath Setty <srinath@microsoft.com>"]
edition = "2021" edition = "2021"
description = "Recursive zkSNARKs without trusted setup" description = "Recursive zkSNARKs without trusted setup"

26
src/r1cs.rs
View File

@@ -364,28 +364,22 @@ impl<G: Group> R1CSShape<G> {
/// Pads the R1CSShape so that the number of variables is a power of two /// Pads the R1CSShape so that the number of variables is a power of two
/// Renumbers variables to accomodate padded variables /// Renumbers variables to accomodate padded variables
pub fn pad(&self) -> Self { pub fn pad(&self) -> Self {
// equalize the number of variables and constraints
let m = max(self.num_vars, self.num_cons).next_power_of_two();
// check if the provided R1CSShape is already as required // check if the provided R1CSShape is already as required
if self.num_vars.next_power_of_two() == self.num_vars if self.num_vars == m && self.num_cons == m {
&& self.num_cons.next_power_of_two() == self.num_cons
{
return self.clone(); return self.clone();
} }
// check if the number of variables are as expected, then // check if the number of variables are as expected, then
// we simply set the number of constraints to the next power of two // we simply set the number of constraints to the next power of two
if self.num_vars.next_power_of_two() == self.num_vars { if self.num_vars == m {
let digest = Self::compute_digest( let digest = Self::compute_digest(m, self.num_vars, self.num_io, &self.A, &self.B, &self.C);
self.num_cons.next_power_of_two(),
self.num_vars,
self.num_io,
&self.A,
&self.B,
&self.C,
);
return R1CSShape { return R1CSShape {
num_cons: self.num_cons.next_power_of_two(), num_cons: m,
num_vars: self.num_vars, num_vars: m,
num_io: self.num_io, num_io: self.num_io,
A: self.A.clone(), A: self.A.clone(),
B: self.B.clone(), B: self.B.clone(),
@@ -395,8 +389,8 @@ impl<G: Group> R1CSShape<G> {
} }
// otherwise, we need to pad the number of variables and renumber variable accesses // otherwise, we need to pad the number of variables and renumber variable accesses
let num_vars_padded = self.num_vars.next_power_of_two(); let num_vars_padded = m;
let num_cons_padded = self.num_cons.next_power_of_two(); let num_cons_padded = m;
let apply_pad = |M: &[(usize, usize, G::Scalar)]| -> Vec<(usize, usize, G::Scalar)> { let apply_pad = |M: &[(usize, usize, G::Scalar)]| -> Vec<(usize, usize, G::Scalar)> {
M.par_iter() M.par_iter()
.map(|(r, c, v)| { .map(|(r, c, v)| {