mirror of https://github.com/zcash/halo2.git
Merge pull request #110 from nuttycom/remove_cs_rotations
Remove rotations from ConstraintSystem & use Rotation instead of i32 for circuit methods.
This commit is contained in:
commit
e56373fa33
|
@ -5,7 +5,7 @@ extern crate halo2;
|
||||||
use halo2::arithmetic::FieldExt;
|
use halo2::arithmetic::FieldExt;
|
||||||
use halo2::pasta::{EqAffine, Fp, Fq};
|
use halo2::pasta::{EqAffine, Fp, Fq};
|
||||||
use halo2::plonk::*;
|
use halo2::plonk::*;
|
||||||
use halo2::poly::commitment::Params;
|
use halo2::poly::{commitment::Params, Rotation};
|
||||||
use halo2::transcript::{DummyHashRead, DummyHashWrite};
|
use halo2::transcript::{DummyHashRead, DummyHashWrite};
|
||||||
|
|
||||||
use std::marker::PhantomData;
|
use std::marker::PhantomData;
|
||||||
|
@ -166,14 +166,14 @@ fn bench_with_k(name: &str, k: u32, c: &mut Criterion) {
|
||||||
let sc = meta.fixed_column();
|
let sc = meta.fixed_column();
|
||||||
|
|
||||||
meta.create_gate(|meta| {
|
meta.create_gate(|meta| {
|
||||||
let a = meta.query_advice(a, 0);
|
let a = meta.query_advice(a, Rotation::cur());
|
||||||
let b = meta.query_advice(b, 0);
|
let b = meta.query_advice(b, Rotation::cur());
|
||||||
let c = meta.query_advice(c, 0);
|
let c = meta.query_advice(c, Rotation::cur());
|
||||||
|
|
||||||
let sa = meta.query_fixed(sa, 0);
|
let sa = meta.query_fixed(sa, Rotation::cur());
|
||||||
let sb = meta.query_fixed(sb, 0);
|
let sb = meta.query_fixed(sb, Rotation::cur());
|
||||||
let sc = meta.query_fixed(sc, 0);
|
let sc = meta.query_fixed(sc, Rotation::cur());
|
||||||
let sm = meta.query_fixed(sm, 0);
|
let sm = meta.query_fixed(sm, Rotation::cur());
|
||||||
|
|
||||||
a.clone() * sa + b.clone() * sb + a * b * sm + (c * sc * (-F::one()))
|
a.clone() * sa + b.clone() * sb + a * b * sm + (c * sc * (-F::one()))
|
||||||
});
|
});
|
||||||
|
|
|
@ -3,7 +3,10 @@ use halo2::{
|
||||||
model::ModelRecorder,
|
model::ModelRecorder,
|
||||||
pasta::{EqAffine, Fp, Fq},
|
pasta::{EqAffine, Fp, Fq},
|
||||||
plonk::*,
|
plonk::*,
|
||||||
poly::commitment::{Blind, Params},
|
poly::{
|
||||||
|
commitment::{Blind, Params},
|
||||||
|
Rotation,
|
||||||
|
},
|
||||||
transcript::{DummyHashRead, DummyHashWrite},
|
transcript::{DummyHashRead, DummyHashWrite},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -177,22 +180,22 @@ impl<F: FieldExt> Circuit<F> for MyCircuit<F> {
|
||||||
let sp = meta.fixed_column();
|
let sp = meta.fixed_column();
|
||||||
|
|
||||||
meta.create_gate(|meta| {
|
meta.create_gate(|meta| {
|
||||||
let a = meta.query_advice(a, 0);
|
let a = meta.query_advice(a, Rotation::cur());
|
||||||
let b = meta.query_advice(b, 0);
|
let b = meta.query_advice(b, Rotation::cur());
|
||||||
let c = meta.query_advice(c, 0);
|
let c = meta.query_advice(c, Rotation::cur());
|
||||||
|
|
||||||
let sa = meta.query_fixed(sa, 0);
|
let sa = meta.query_fixed(sa, Rotation::cur());
|
||||||
let sb = meta.query_fixed(sb, 0);
|
let sb = meta.query_fixed(sb, Rotation::cur());
|
||||||
let sc = meta.query_fixed(sc, 0);
|
let sc = meta.query_fixed(sc, Rotation::cur());
|
||||||
let sm = meta.query_fixed(sm, 0);
|
let sm = meta.query_fixed(sm, Rotation::cur());
|
||||||
|
|
||||||
a.clone() * sa + b.clone() * sb + a * b * sm + (c * sc * (-F::one()))
|
a.clone() * sa + b.clone() * sb + a * b * sm + (c * sc * (-F::one()))
|
||||||
});
|
});
|
||||||
|
|
||||||
meta.create_gate(|meta| {
|
meta.create_gate(|meta| {
|
||||||
let a = meta.query_advice(a, 0);
|
let a = meta.query_advice(a, Rotation::cur());
|
||||||
let p = meta.query_aux(p, 0);
|
let p = meta.query_aux(p, Rotation::cur());
|
||||||
let sp = meta.query_fixed(sp, 0);
|
let sp = meta.query_fixed(sp, Rotation::cur());
|
||||||
|
|
||||||
sp * (a + p * (-F::one()))
|
sp * (a + p * (-F::one()))
|
||||||
});
|
});
|
||||||
|
|
|
@ -58,6 +58,7 @@ pub enum VerifyFailure {
|
||||||
/// dev::{MockProver, VerifyFailure},
|
/// dev::{MockProver, VerifyFailure},
|
||||||
/// pasta::Fp,
|
/// pasta::Fp,
|
||||||
/// plonk::{Advice, Assignment, Circuit, Column, ConstraintSystem, Error},
|
/// plonk::{Advice, Assignment, Circuit, Column, ConstraintSystem, Error},
|
||||||
|
/// poly::Rotation,
|
||||||
/// };
|
/// };
|
||||||
/// const K: u32 = 5;
|
/// const K: u32 = 5;
|
||||||
///
|
///
|
||||||
|
@ -81,9 +82,9 @@ pub enum VerifyFailure {
|
||||||
/// let c = meta.advice_column();
|
/// let c = meta.advice_column();
|
||||||
///
|
///
|
||||||
/// meta.create_gate(|meta| {
|
/// meta.create_gate(|meta| {
|
||||||
/// let a = meta.query_advice(a, 0);
|
/// let a = meta.query_advice(a, Rotation::cur());
|
||||||
/// let b = meta.query_advice(b, 0);
|
/// let b = meta.query_advice(b, Rotation::cur());
|
||||||
/// let c = meta.query_advice(c, 0);
|
/// let c = meta.query_advice(c, Rotation::cur());
|
||||||
///
|
///
|
||||||
/// // BUG: Should be a * b - c
|
/// // BUG: Should be a * b - c
|
||||||
/// a * b + c
|
/// a * b + c
|
||||||
|
|
31
src/plonk.rs
31
src/plonk.rs
|
@ -105,7 +105,10 @@ fn test_proving() {
|
||||||
use crate::arithmetic::{Curve, FieldExt};
|
use crate::arithmetic::{Curve, FieldExt};
|
||||||
use crate::dev::MockProver;
|
use crate::dev::MockProver;
|
||||||
use crate::pasta::{EqAffine, Fp, Fq};
|
use crate::pasta::{EqAffine, Fp, Fq};
|
||||||
use crate::poly::commitment::{Blind, Params};
|
use crate::poly::{
|
||||||
|
commitment::{Blind, Params},
|
||||||
|
Rotation,
|
||||||
|
};
|
||||||
use crate::transcript::{DummyHashRead, DummyHashWrite};
|
use crate::transcript::{DummyHashRead, DummyHashWrite};
|
||||||
use circuit::{Advice, Column, Fixed};
|
use circuit::{Advice, Column, Fixed};
|
||||||
use std::marker::PhantomData;
|
use std::marker::PhantomData;
|
||||||
|
@ -344,25 +347,25 @@ fn test_proving() {
|
||||||
meta.lookup(&[a.into(), b.into()], &[sl.into(), sl2.into()]);
|
meta.lookup(&[a.into(), b.into()], &[sl.into(), sl2.into()]);
|
||||||
|
|
||||||
meta.create_gate(|meta| {
|
meta.create_gate(|meta| {
|
||||||
let d = meta.query_advice(d, 1);
|
let d = meta.query_advice(d, Rotation::next());
|
||||||
let a = meta.query_advice(a, 0);
|
let a = meta.query_advice(a, Rotation::cur());
|
||||||
let sf = meta.query_fixed(sf, 0);
|
let sf = meta.query_fixed(sf, Rotation::cur());
|
||||||
let e = meta.query_advice(e, -1);
|
let e = meta.query_advice(e, Rotation::prev());
|
||||||
let b = meta.query_advice(b, 0);
|
let b = meta.query_advice(b, Rotation::cur());
|
||||||
let c = meta.query_advice(c, 0);
|
let c = meta.query_advice(c, Rotation::cur());
|
||||||
|
|
||||||
let sa = meta.query_fixed(sa, 0);
|
let sa = meta.query_fixed(sa, Rotation::cur());
|
||||||
let sb = meta.query_fixed(sb, 0);
|
let sb = meta.query_fixed(sb, Rotation::cur());
|
||||||
let sc = meta.query_fixed(sc, 0);
|
let sc = meta.query_fixed(sc, Rotation::cur());
|
||||||
let sm = meta.query_fixed(sm, 0);
|
let sm = meta.query_fixed(sm, Rotation::cur());
|
||||||
|
|
||||||
a.clone() * sa + b.clone() * sb + a * b * sm + (c * sc * (-F::one())) + sf * (d * e)
|
a.clone() * sa + b.clone() * sb + a * b * sm + (c * sc * (-F::one())) + sf * (d * e)
|
||||||
});
|
});
|
||||||
|
|
||||||
meta.create_gate(|meta| {
|
meta.create_gate(|meta| {
|
||||||
let a = meta.query_advice(a, 0);
|
let a = meta.query_advice(a, Rotation::cur());
|
||||||
let p = meta.query_aux(p, 0);
|
let p = meta.query_aux(p, Rotation::cur());
|
||||||
let sp = meta.query_fixed(sp, 0);
|
let sp = meta.query_fixed(sp, Rotation::cur());
|
||||||
|
|
||||||
sp * (a + p * (-F::one()))
|
sp * (a + p * (-F::one()))
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
use core::cmp::max;
|
use core::cmp::max;
|
||||||
use core::ops::{Add, Mul};
|
use core::ops::{Add, Mul};
|
||||||
use ff::Field;
|
use ff::Field;
|
||||||
use std::collections::BTreeMap;
|
|
||||||
use std::convert::TryFrom;
|
use std::convert::TryFrom;
|
||||||
|
|
||||||
use super::{lookup, permutation, Error};
|
use super::{lookup, permutation, Error};
|
||||||
|
@ -307,9 +306,6 @@ pub struct ConstraintSystem<F> {
|
||||||
pub(crate) aux_queries: Vec<(Column<Aux>, Rotation)>,
|
pub(crate) aux_queries: Vec<(Column<Aux>, Rotation)>,
|
||||||
pub(crate) fixed_queries: Vec<(Column<Fixed>, Rotation)>,
|
pub(crate) fixed_queries: Vec<(Column<Fixed>, Rotation)>,
|
||||||
|
|
||||||
// Mapping from a witness vector rotation to the index in the point vector.
|
|
||||||
pub(crate) rotations: BTreeMap<Rotation, PointIndex>,
|
|
||||||
|
|
||||||
// Vector of permutation arguments, where each corresponds to a sequence of columns
|
// Vector of permutation arguments, where each corresponds to a sequence of columns
|
||||||
// that are involved in a permutation argument.
|
// that are involved in a permutation argument.
|
||||||
pub(crate) permutations: Vec<permutation::Argument>,
|
pub(crate) permutations: Vec<permutation::Argument>,
|
||||||
|
@ -321,9 +317,6 @@ pub struct ConstraintSystem<F> {
|
||||||
|
|
||||||
impl<F: Field> Default for ConstraintSystem<F> {
|
impl<F: Field> Default for ConstraintSystem<F> {
|
||||||
fn default() -> ConstraintSystem<F> {
|
fn default() -> ConstraintSystem<F> {
|
||||||
let mut rotations = BTreeMap::new();
|
|
||||||
rotations.insert(Rotation::default(), PointIndex(0));
|
|
||||||
|
|
||||||
ConstraintSystem {
|
ConstraintSystem {
|
||||||
num_fixed_columns: 0,
|
num_fixed_columns: 0,
|
||||||
num_advice_columns: 0,
|
num_advice_columns: 0,
|
||||||
|
@ -332,7 +325,6 @@ impl<F: Field> Default for ConstraintSystem<F> {
|
||||||
fixed_queries: Vec::new(),
|
fixed_queries: Vec::new(),
|
||||||
advice_queries: Vec::new(),
|
advice_queries: Vec::new(),
|
||||||
aux_queries: Vec::new(),
|
aux_queries: Vec::new(),
|
||||||
rotations,
|
|
||||||
permutations: Vec::new(),
|
permutations: Vec::new(),
|
||||||
lookups: Vec::new(),
|
lookups: Vec::new(),
|
||||||
}
|
}
|
||||||
|
@ -343,12 +335,9 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
/// Add a permutation argument for some advice columns
|
/// Add a permutation argument for some advice columns
|
||||||
pub fn permutation(&mut self, columns: &[Column<Advice>]) -> usize {
|
pub fn permutation(&mut self, columns: &[Column<Advice>]) -> usize {
|
||||||
let index = self.permutations.len();
|
let index = self.permutations.len();
|
||||||
if self.permutations.is_empty() {
|
|
||||||
self.add_rotation(Rotation(-1));
|
|
||||||
}
|
|
||||||
|
|
||||||
for column in columns {
|
for column in columns {
|
||||||
self.query_advice_index(*column, 0);
|
self.query_advice_index(*column, Rotation::cur());
|
||||||
}
|
}
|
||||||
self.permutations
|
self.permutations
|
||||||
.push(permutation::Argument::new(columns.to_vec()));
|
.push(permutation::Argument::new(columns.to_vec()));
|
||||||
|
@ -367,15 +356,12 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
assert_eq!(input_columns.len(), table_columns.len());
|
assert_eq!(input_columns.len(), table_columns.len());
|
||||||
|
|
||||||
let index = self.lookups.len();
|
let index = self.lookups.len();
|
||||||
if self.lookups.is_empty() {
|
|
||||||
self.add_rotation(Rotation(-1));
|
|
||||||
}
|
|
||||||
|
|
||||||
for input in input_columns {
|
for input in input_columns {
|
||||||
self.query_any_index(*input, 0);
|
self.query_any_index(*input, Rotation::cur());
|
||||||
}
|
}
|
||||||
for table in table_columns {
|
for table in table_columns {
|
||||||
self.query_any_index(*table, 0);
|
self.query_any_index(*table, Rotation::cur());
|
||||||
}
|
}
|
||||||
self.lookups
|
self.lookups
|
||||||
.push(lookup::Argument::new(input_columns, table_columns));
|
.push(lookup::Argument::new(input_columns, table_columns));
|
||||||
|
@ -383,10 +369,7 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
index
|
index
|
||||||
}
|
}
|
||||||
|
|
||||||
fn query_fixed_index(&mut self, column: Column<Fixed>, at: i32) -> usize {
|
fn query_fixed_index(&mut self, column: Column<Fixed>, at: Rotation) -> usize {
|
||||||
let at = Rotation(at);
|
|
||||||
self.add_rotation(at);
|
|
||||||
|
|
||||||
// Return existing query, if it exists
|
// Return existing query, if it exists
|
||||||
for (index, fixed_query) in self.fixed_queries.iter().enumerate() {
|
for (index, fixed_query) in self.fixed_queries.iter().enumerate() {
|
||||||
if fixed_query == &(column, at) {
|
if fixed_query == &(column, at) {
|
||||||
|
@ -402,14 +385,11 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Query a fixed column at a relative position
|
/// Query a fixed column at a relative position
|
||||||
pub fn query_fixed(&mut self, column: Column<Fixed>, at: i32) -> Expression<F> {
|
pub fn query_fixed(&mut self, column: Column<Fixed>, at: Rotation) -> Expression<F> {
|
||||||
Expression::Fixed(self.query_fixed_index(column, at))
|
Expression::Fixed(self.query_fixed_index(column, at))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn query_advice_index(&mut self, column: Column<Advice>, at: i32) -> usize {
|
pub(crate) fn query_advice_index(&mut self, column: Column<Advice>, at: Rotation) -> usize {
|
||||||
let at = Rotation(at);
|
|
||||||
self.add_rotation(at);
|
|
||||||
|
|
||||||
// Return existing query, if it exists
|
// Return existing query, if it exists
|
||||||
for (index, advice_query) in self.advice_queries.iter().enumerate() {
|
for (index, advice_query) in self.advice_queries.iter().enumerate() {
|
||||||
if advice_query == &(column, at) {
|
if advice_query == &(column, at) {
|
||||||
|
@ -425,14 +405,11 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Query an advice column at a relative position
|
/// Query an advice column at a relative position
|
||||||
pub fn query_advice(&mut self, column: Column<Advice>, at: i32) -> Expression<F> {
|
pub fn query_advice(&mut self, column: Column<Advice>, at: Rotation) -> Expression<F> {
|
||||||
Expression::Advice(self.query_advice_index(column, at))
|
Expression::Advice(self.query_advice_index(column, at))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn query_aux_index(&mut self, column: Column<Aux>, at: i32) -> usize {
|
fn query_aux_index(&mut self, column: Column<Aux>, at: Rotation) -> usize {
|
||||||
let at = Rotation(at);
|
|
||||||
self.add_rotation(at);
|
|
||||||
|
|
||||||
// Return existing query, if it exists
|
// Return existing query, if it exists
|
||||||
for (index, aux_query) in self.aux_queries.iter().enumerate() {
|
for (index, aux_query) in self.aux_queries.iter().enumerate() {
|
||||||
if aux_query == &(column, at) {
|
if aux_query == &(column, at) {
|
||||||
|
@ -448,11 +425,11 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Query an auxiliary column at a relative position
|
/// Query an auxiliary column at a relative position
|
||||||
pub fn query_aux(&mut self, column: Column<Aux>, at: i32) -> Expression<F> {
|
pub fn query_aux(&mut self, column: Column<Aux>, at: Rotation) -> Expression<F> {
|
||||||
Expression::Aux(self.query_aux_index(column, at))
|
Expression::Aux(self.query_aux_index(column, at))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn query_any_index(&mut self, column: Column<Any>, at: i32) -> usize {
|
fn query_any_index(&mut self, column: Column<Any>, at: Rotation) -> usize {
|
||||||
match column.column_type() {
|
match column.column_type() {
|
||||||
Any::Advice => self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
|
Any::Advice => self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
|
||||||
Any::Fixed => self.query_fixed_index(Column::<Fixed>::try_from(column).unwrap(), at),
|
Any::Fixed => self.query_fixed_index(Column::<Fixed>::try_from(column).unwrap(), at),
|
||||||
|
@ -461,7 +438,7 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Query an Any column at a relative position
|
/// Query an Any column at a relative position
|
||||||
pub fn query_any(&mut self, column: Column<Any>, at: i32) -> Expression<F> {
|
pub fn query_any(&mut self, column: Column<Any>, at: Rotation) -> Expression<F> {
|
||||||
match column.column_type() {
|
match column.column_type() {
|
||||||
Any::Advice => Expression::Advice(
|
Any::Advice => Expression::Advice(
|
||||||
self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
|
self.query_advice_index(Column::<Advice>::try_from(column).unwrap(), at),
|
||||||
|
@ -475,8 +452,7 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn get_advice_query_index(&self, column: Column<Advice>, at: i32) -> usize {
|
pub(crate) fn get_advice_query_index(&self, column: Column<Advice>, at: Rotation) -> usize {
|
||||||
let at = Rotation(at);
|
|
||||||
for (index, advice_query) in self.advice_queries.iter().enumerate() {
|
for (index, advice_query) in self.advice_queries.iter().enumerate() {
|
||||||
if advice_query == &(column, at) {
|
if advice_query == &(column, at) {
|
||||||
return index;
|
return index;
|
||||||
|
@ -486,8 +462,7 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
panic!("get_advice_query_index called for non-existent query");
|
panic!("get_advice_query_index called for non-existent query");
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn get_fixed_query_index(&self, column: Column<Fixed>, at: i32) -> usize {
|
pub(crate) fn get_fixed_query_index(&self, column: Column<Fixed>, at: Rotation) -> usize {
|
||||||
let at = Rotation(at);
|
|
||||||
for (index, fixed_query) in self.fixed_queries.iter().enumerate() {
|
for (index, fixed_query) in self.fixed_queries.iter().enumerate() {
|
||||||
if fixed_query == &(column, at) {
|
if fixed_query == &(column, at) {
|
||||||
return index;
|
return index;
|
||||||
|
@ -497,8 +472,7 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
panic!("get_fixed_query_index called for non-existent query");
|
panic!("get_fixed_query_index called for non-existent query");
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn get_aux_query_index(&self, column: Column<Aux>, at: i32) -> usize {
|
pub(crate) fn get_aux_query_index(&self, column: Column<Aux>, at: Rotation) -> usize {
|
||||||
let at = Rotation(at);
|
|
||||||
for (index, aux_query) in self.aux_queries.iter().enumerate() {
|
for (index, aux_query) in self.aux_queries.iter().enumerate() {
|
||||||
if aux_query == &(column, at) {
|
if aux_query == &(column, at) {
|
||||||
return index;
|
return index;
|
||||||
|
@ -508,7 +482,7 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
panic!("get_aux_query_index called for non-existent query");
|
panic!("get_aux_query_index called for non-existent query");
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn get_any_query_index(&self, column: Column<Any>, at: i32) -> usize {
|
pub(crate) fn get_any_query_index(&self, column: Column<Any>, at: Rotation) -> usize {
|
||||||
match column.column_type() {
|
match column.column_type() {
|
||||||
Any::Advice => {
|
Any::Advice => {
|
||||||
self.get_advice_query_index(Column::<Advice>::try_from(column).unwrap(), at)
|
self.get_advice_query_index(Column::<Advice>::try_from(column).unwrap(), at)
|
||||||
|
@ -555,9 +529,4 @@ impl<F: Field> ConstraintSystem<F> {
|
||||||
self.num_aux_columns += 1;
|
self.num_aux_columns += 1;
|
||||||
tmp
|
tmp
|
||||||
}
|
}
|
||||||
|
|
||||||
fn add_rotation(&mut self, at: Rotation) {
|
|
||||||
let len = self.rotations.len();
|
|
||||||
self.rotations.entry(at).or_insert(PointIndex(len));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,7 +147,7 @@ where
|
||||||
let mut l0 = domain.empty_lagrange();
|
let mut l0 = domain.empty_lagrange();
|
||||||
l0[0] = C::Scalar::one();
|
l0[0] = C::Scalar::one();
|
||||||
let l0 = domain.lagrange_to_coeff(l0);
|
let l0 = domain.lagrange_to_coeff(l0);
|
||||||
let l0 = domain.coeff_to_extended(l0, Rotation::default());
|
let l0 = domain.coeff_to_extended(l0, Rotation::cur());
|
||||||
|
|
||||||
Ok(ProvingKey {
|
Ok(ProvingKey {
|
||||||
vk: VerifyingKey {
|
vk: VerifyingKey {
|
||||||
|
|
|
@ -94,7 +94,7 @@ impl Argument {
|
||||||
};
|
};
|
||||||
(
|
(
|
||||||
&values[column.index()],
|
&values[column.index()],
|
||||||
&cosets[pk.vk.cs.get_any_query_index(column, 0)],
|
&cosets[pk.vk.cs.get_any_query_index(column, Rotation::cur())],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unzip();
|
.unzip();
|
||||||
|
@ -148,7 +148,7 @@ impl Argument {
|
||||||
let permuted_input_coset = pk
|
let permuted_input_coset = pk
|
||||||
.vk
|
.vk
|
||||||
.domain
|
.domain
|
||||||
.coeff_to_extended(permuted_input_poly.clone(), Rotation::default());
|
.coeff_to_extended(permuted_input_poly.clone(), Rotation::cur());
|
||||||
let permuted_input_inv_coset = pk
|
let permuted_input_inv_coset = pk
|
||||||
.vk
|
.vk
|
||||||
.domain
|
.domain
|
||||||
|
@ -156,7 +156,7 @@ impl Argument {
|
||||||
let permuted_table_coset = pk
|
let permuted_table_coset = pk
|
||||||
.vk
|
.vk
|
||||||
.domain
|
.domain
|
||||||
.coeff_to_extended(permuted_table_poly.clone(), Rotation::default());
|
.coeff_to_extended(permuted_table_poly.clone(), Rotation::cur());
|
||||||
|
|
||||||
Ok(Permuted {
|
Ok(Permuted {
|
||||||
unpermuted_input_columns,
|
unpermuted_input_columns,
|
||||||
|
@ -310,11 +310,8 @@ impl<'a, C: CurveAffine> Permuted<'a, C> {
|
||||||
let product_blind = Blind(C::Scalar::rand());
|
let product_blind = Blind(C::Scalar::rand());
|
||||||
let product_commitment = params.commit_lagrange(&z, product_blind).to_affine();
|
let product_commitment = params.commit_lagrange(&z, product_blind).to_affine();
|
||||||
let z = pk.vk.domain.lagrange_to_coeff(z);
|
let z = pk.vk.domain.lagrange_to_coeff(z);
|
||||||
let product_coset = pk
|
let product_coset = pk.vk.domain.coeff_to_extended(z.clone(), Rotation::cur());
|
||||||
.vk
|
let product_inv_coset = pk.vk.domain.coeff_to_extended(z.clone(), Rotation::prev());
|
||||||
.domain
|
|
||||||
.coeff_to_extended(z.clone(), Rotation::default());
|
|
||||||
let product_inv_coset = pk.vk.domain.coeff_to_extended(z.clone(), Rotation(-1));
|
|
||||||
|
|
||||||
// Hash product commitment
|
// Hash product commitment
|
||||||
transcript
|
transcript
|
||||||
|
|
|
@ -120,7 +120,7 @@ impl<C: CurveAffine> Evaluated<C> {
|
||||||
columns
|
columns
|
||||||
.iter()
|
.iter()
|
||||||
.map(|column| {
|
.map(|column| {
|
||||||
let index = vk.cs.get_any_query_index(*column, 0);
|
let index = vk.cs.get_any_query_index(*column, Rotation::cur());
|
||||||
match column.column_type() {
|
match column.column_type() {
|
||||||
Any::Advice => advice_evals[index],
|
Any::Advice => advice_evals[index],
|
||||||
Any::Fixed => fixed_evals[index],
|
Any::Fixed => fixed_evals[index],
|
||||||
|
|
|
@ -164,7 +164,7 @@ impl Assembly {
|
||||||
permutations.push(permutation_poly.clone());
|
permutations.push(permutation_poly.clone());
|
||||||
let poly = domain.lagrange_to_coeff(permutation_poly);
|
let poly = domain.lagrange_to_coeff(permutation_poly);
|
||||||
polys.push(poly.clone());
|
polys.push(poly.clone());
|
||||||
cosets.push(domain.coeff_to_extended(poly, Rotation::default()));
|
cosets.push(domain.coeff_to_extended(poly, Rotation::cur()));
|
||||||
}
|
}
|
||||||
(
|
(
|
||||||
ProvingKey {
|
ProvingKey {
|
||||||
|
|
|
@ -113,8 +113,8 @@ impl Argument {
|
||||||
let permutation_product_blind = blind;
|
let permutation_product_blind = blind;
|
||||||
let z = domain.lagrange_to_coeff(z);
|
let z = domain.lagrange_to_coeff(z);
|
||||||
let permutation_product_poly = z.clone();
|
let permutation_product_poly = z.clone();
|
||||||
let permutation_product_coset = domain.coeff_to_extended(z.clone(), Rotation::default());
|
let permutation_product_coset = domain.coeff_to_extended(z.clone(), Rotation::cur());
|
||||||
let permutation_product_coset_inv = domain.coeff_to_extended(z, Rotation(-1));
|
let permutation_product_coset_inv = domain.coeff_to_extended(z, Rotation::prev());
|
||||||
|
|
||||||
let permutation_product_commitment = permutation_product_commitment_projective.to_affine();
|
let permutation_product_commitment = permutation_product_commitment_projective.to_affine();
|
||||||
|
|
||||||
|
@ -158,7 +158,9 @@ impl<C: CurveAffine> Committed<C> {
|
||||||
for (advice, permutation) in p
|
for (advice, permutation) in p
|
||||||
.columns
|
.columns
|
||||||
.iter()
|
.iter()
|
||||||
.map(|&column| &advice_cosets[pk.vk.cs.get_advice_query_index(column, 0)])
|
.map(|&column| {
|
||||||
|
&advice_cosets[pk.vk.cs.get_advice_query_index(column, Rotation::cur())]
|
||||||
|
})
|
||||||
.zip(pkey.cosets.iter())
|
.zip(pkey.cosets.iter())
|
||||||
{
|
{
|
||||||
parallelize(&mut left, |left, start| {
|
parallelize(&mut left, |left, start| {
|
||||||
|
@ -175,11 +177,9 @@ impl<C: CurveAffine> Committed<C> {
|
||||||
let mut right = self.permutation_product_coset_inv.clone();
|
let mut right = self.permutation_product_coset_inv.clone();
|
||||||
let mut current_delta = *beta * &C::Scalar::ZETA;
|
let mut current_delta = *beta * &C::Scalar::ZETA;
|
||||||
let step = domain.get_extended_omega();
|
let step = domain.get_extended_omega();
|
||||||
for advice in p
|
for advice in p.columns.iter().map(|&column| {
|
||||||
.columns
|
&advice_cosets[pk.vk.cs.get_advice_query_index(column, Rotation::cur())]
|
||||||
.iter()
|
}) {
|
||||||
.map(|&column| &advice_cosets[pk.vk.cs.get_advice_query_index(column, 0)])
|
|
||||||
{
|
|
||||||
parallelize(&mut right, move |right, start| {
|
parallelize(&mut right, move |right, start| {
|
||||||
let mut beta_term =
|
let mut beta_term =
|
||||||
current_delta * &step.pow_vartime(&[start as u64, 0, 0, 0]);
|
current_delta * &step.pow_vartime(&[start as u64, 0, 0, 0]);
|
||||||
|
|
|
@ -88,7 +88,9 @@ impl<C: CurveAffine> Evaluated<C> {
|
||||||
for (advice_eval, permutation_eval) in p
|
for (advice_eval, permutation_eval) in p
|
||||||
.columns
|
.columns
|
||||||
.iter()
|
.iter()
|
||||||
.map(|&column| advice_evals[vk.cs.get_advice_query_index(column, 0)])
|
.map(|&column| {
|
||||||
|
advice_evals[vk.cs.get_advice_query_index(column, Rotation::cur())]
|
||||||
|
})
|
||||||
.zip(self.permutation_evals.iter())
|
.zip(self.permutation_evals.iter())
|
||||||
{
|
{
|
||||||
left *= &(advice_eval + &(*beta * permutation_eval) + &*gamma);
|
left *= &(advice_eval + &(*beta * permutation_eval) + &*gamma);
|
||||||
|
@ -96,11 +98,9 @@ impl<C: CurveAffine> Evaluated<C> {
|
||||||
|
|
||||||
let mut right = self.permutation_product_inv_eval;
|
let mut right = self.permutation_product_inv_eval;
|
||||||
let mut current_delta = *beta * &*x;
|
let mut current_delta = *beta * &*x;
|
||||||
for advice_eval in p
|
for advice_eval in p.columns.iter().map(|&column| {
|
||||||
.columns
|
advice_evals[vk.cs.get_advice_query_index(column, Rotation::cur())]
|
||||||
.iter()
|
}) {
|
||||||
.map(|&column| advice_evals[vk.cs.get_advice_query_index(column, 0)])
|
|
||||||
{
|
|
||||||
right *= &(advice_eval + ¤t_delta + &*gamma);
|
right *= &(advice_eval + ¤t_delta + &*gamma);
|
||||||
current_delta *= &C::Scalar::DELTA;
|
current_delta *= &C::Scalar::DELTA;
|
||||||
}
|
}
|
||||||
|
|
29
src/poly.rs
29
src/poly.rs
|
@ -200,3 +200,32 @@ impl<'a, F: Field, B: Basis> Mul<F> for Polynomial<F, B> {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Describes the relative rotation of a vector. Negative numbers represent
|
||||||
|
/// reverse (leftmost) rotations and positive numbers represent forward (rightmost)
|
||||||
|
/// rotations. Zero represents no rotation.
|
||||||
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
||||||
|
pub struct Rotation(pub i32);
|
||||||
|
|
||||||
|
impl Default for Rotation {
|
||||||
|
fn default() -> Rotation {
|
||||||
|
Rotation(0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Rotation {
|
||||||
|
/// The current location in the evaluation domain
|
||||||
|
pub fn cur() -> Rotation {
|
||||||
|
Rotation(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The previous location in the evaluation domain
|
||||||
|
pub fn prev() -> Rotation {
|
||||||
|
Rotation(-1)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The next location in the evaluation domain
|
||||||
|
pub fn next() -> Rotation {
|
||||||
|
Rotation(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -3,22 +3,11 @@
|
||||||
|
|
||||||
use crate::arithmetic::{best_fft, parallelize, BatchInvert, FieldExt, Group};
|
use crate::arithmetic::{best_fft, parallelize, BatchInvert, FieldExt, Group};
|
||||||
|
|
||||||
use super::{Coeff, ExtendedLagrangeCoeff, LagrangeCoeff, Polynomial};
|
use super::{Coeff, ExtendedLagrangeCoeff, LagrangeCoeff, Polynomial, Rotation};
|
||||||
|
|
||||||
use ff::{Field, PrimeField};
|
use ff::{Field, PrimeField};
|
||||||
use std::marker::PhantomData;
|
use std::marker::PhantomData;
|
||||||
|
|
||||||
/// Describes a relative location in the evaluation domain; applying a rotation
|
|
||||||
/// by i will rotate the vector in the evaluation domain by i.
|
|
||||||
#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, Ord, PartialOrd)]
|
|
||||||
pub struct Rotation(pub i32);
|
|
||||||
|
|
||||||
impl Default for Rotation {
|
|
||||||
fn default() -> Rotation {
|
|
||||||
Rotation(0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// This structure contains precomputed constants and other details needed for
|
/// This structure contains precomputed constants and other details needed for
|
||||||
/// performing operations on an evaluation domain of size $2^k$ and an extended
|
/// performing operations on an evaluation domain of size $2^k$ and an extended
|
||||||
/// domain of size $2^{k} * j$ with $j \neq 0$.
|
/// domain of size $2^{k} * j$ with $j \neq 0$.
|
||||||
|
|
Loading…
Reference in New Issue