Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r1cs replaced with gr1cs #378

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

alireza-shirzad
Copy link

Description

This is a major refactor for migrating to GR1CS infrastructure


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against correct branch (master)
  • Linked to Github issue with discussion and accepted design OR have an explanation in the PR that describes this work.
  • Wrote unit tests
  • Updated relevant documentation in the code
  • Added a relevant changelog entry to the Pending section in CHANGELOG.md
  • Re-reviewed Files changed in the Github PR explorer

Copy link
Member

@Pratyush Pratyush left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some changes


///////////////////////////////////////////////////////////////////////////////////////

/// An Rank-One `ConstraintSystem`. Enforces constraints of the form
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// An Rank-One `ConstraintSystem`. Enforces constraints of the form
/// A Rank-1 `ConstraintSystem`. Enforces constraints of the form

/// An Rank-One `ConstraintSystem`. Enforces constraints of the form
/// `L_i(⟨M_{i,1}, z⟩ , ⟨M_{i,2}, z⟩ , ..., ⟨M_{i,t_i}, z⟩)=0`, where L_i is a
/// local predicate, and `M_{i,j}`s are linear combinations over variables, and
/// `z` is the concrete assignment to these variables. refer to //TODO: Paper Url
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix url

)?;
}
self.enforce_constraint(R1CS_PREDICATE_LABEL, vec![a, b, c])
// if self.should_construct_matrices() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

todo fix tracing

/// Add a new vector of linear combinations to the constraint system.
pub fn new_lc_vec(
&mut self,
lc_vec: Vec<LinearCombination<F>>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
lc_vec: Vec<LinearCombination<F>>,
lc_vec: impl IntoIterator<Item = LinearCombination<F>>,

I can pass in [lc_1, lc_2, lc_3], or I can pass in vec![lc_1, lc_2, lc_3]. The benefit is that this avoids allocations

Comment on lines +199 to +206
let mut constraints: Constraint = Vec::new();
for lc in lc_vec {
let var = self.new_lc(lc)?;
match var {
Variable::SymbolicLc(index) => constraints.push(index),
_ => return Err(SynthesisError::UnexpectedVariable),
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let mut constraints: Constraint = Vec::new();
for lc in lc_vec {
let var = self.new_lc(lc)?;
match var {
Variable::SymbolicLc(index) => constraints.push(index),
_ => return Err(SynthesisError::UnexpectedVariable),
}
}
let constraints: Vec<_> = lc_vec.into_iter().map(|lc| {
let var = self.new_lc(lc)?;
match var {
Variable::SymbolicLc(index) => constraints.push(index),
_ => return Err(SynthesisError::UnexpectedVariable),
}
}).collect();

Comment on lines +368 to +373
.predicate_traces
.get(label)
.unwrap()
.get(unsatisfied_constraint)
.unwrap()
.as_ref()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.predicate_traces
.get(label)
.unwrap()
.get(unsatisfied_constraint)
.unwrap()
.as_ref()
.predicate_traces[&label][unsatisfied_constraint]
.as_ref()

Comment on lines +379 to +381
format!("{} - {}", label.clone(), unsatisfied_constraint)
},
|t| format!("{}", t),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
format!("{} - {}", label.clone(), unsatisfied_constraint)
},
|t| format!("{}", t),
format!("{} - {unsatisfied_constraint}", &label)
},
|t| format!("{t}"),

use lookup_constraint::LookupConstraint;
use polynomial_constraint::PolynomialConstraint;

// use crate::{gr1cs::ConstraintSystemRef, utils::Result};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// use crate::{gr1cs::ConstraintSystemRef, utils::Result};

Comment on lines +23 to +25
where
PolynomialConstraint<F>: Evaluatable<F>,
LookupConstraint<F>: Evaluatable<F>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
where
PolynomialConstraint<F>: Evaluatable<F>,
LookupConstraint<F>: Evaluatable<F>,

Comment on lines +17 to +19
pub trait Evaluatable<F> {
fn evaluate(&self, point: Vec<F>) -> F;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add documentation for trait, and change point to variables

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants