github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

zk/gadget: Remove unused code from cond_select.

Browse Source
This commit is contained in:
parazyd
2023-07-07 21:47:52 +02:00
parent 17415a3d21
commit a32b718d0d
1 changed files with 9 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
src/zk/gadget/cond_select.rs
View File

@@ -22,7 +22,7 @@
use core::marker::PhantomData;
use halo2_proofs::{
circuit::{AssignedCell, Chip, Layouter, Region, Value},
circuit::{AssignedCell, Chip, Layouter, Region},
pasta::group::ff::WithSmallOrderMulGroup,
plonk::{Advice, Column, ConstraintSystem, Error, Expression, Selector},
poly::Rotation,
@@ -109,12 +109,14 @@ impl<F: WithSmallOrderMulGroup<3> + Ord> ConditionalSelectChip<F> {
let cond = cond.copy_advice(|| "copy cond", &mut region, config.advices[3], 0)?;
let selected =
if cond.value().copied().to_field() == Value::known(F::ONE).to_field() {
a.value().copied()
} else {
b.value().copied()
};
let selected = cond
.value()
.copied()
.to_field()
.zip(a.value())
.zip(b.value())
.map(|((cond, a), b)| if cond == F::ONE.into() { a } else { b })
.copied();
let cell =
region.assign_advice(|| "select result", config.advices[2], 0, || selected)?;
@@ -124,181 +126,3 @@ impl<F: WithSmallOrderMulGroup<3> + Ord> ConditionalSelectChip<F> {
Ok(out)
}
}
#[derive(Clone, Debug)]
pub struct IsEqualConfig<F: WithSmallOrderMulGroup<3> + Ord> {
s_is_eq: Selector,
advices: [Column<Advice>; NUM_OF_UTILITY_ADVICE_COLUMNS],
_marker: PhantomData<F>,
}
pub struct IsEqualChip<F: WithSmallOrderMulGroup<3> + Ord> {
config: IsEqualConfig<F>,
_marker: PhantomData<F>,
}
impl<F: WithSmallOrderMulGroup<3> + Ord> Chip<F> for IsEqualChip<F> {
type Config = IsEqualConfig<F>;
type Loaded = ();
fn config(&self) -> &Self::Config {
&self.config
}
fn loaded(&self) -> &Self::Loaded {
&()
}
}
impl<F: WithSmallOrderMulGroup<3> + Ord> IsEqualChip<F> {
pub fn construct(
config: <Self as Chip<F>>::Config,
_loaded: <Self as Chip<F>>::Loaded,
) -> Self {
Self { config, _marker: PhantomData }
}
pub fn configure(
meta: &mut ConstraintSystem<F>,
advices: [Column<Advice>; NUM_OF_UTILITY_ADVICE_COLUMNS],
) -> <Self as Chip<F>>::Config {
let s_is_eq = meta.selector();
meta.create_gate("is_eq", |meta| {
let lhs = meta.query_advice(advices[0], Rotation::cur());
let rhs = meta.query_advice(advices[1], Rotation::cur());
let out = meta.query_advice(advices[2], Rotation::cur());
let delta_invert = meta.query_advice(advices[3], Rotation::cur());
let s_is_eq = meta.query_selector(s_is_eq);
let one = Expression::Constant(F::ONE);
vec![
// out is 0 or 1
s_is_eq.clone() * (out.clone() * (one.clone() - out.clone())),
// if a != b then (a - b) * inverse(a - b) == 1 - out
// if a == b then (a - b) * 1 == 1 - out
s_is_eq.clone() *
((lhs.clone() - rhs.clone()) * delta_invert.clone() + (out - one.clone())),
// constrain delta_invert: (a - b) * inverse(a - b) must be 1 or 0
s_is_eq * (lhs.clone() - rhs.clone()) * ((lhs - rhs) * delta_invert - one),
]
});
IsEqualConfig { s_is_eq, advices, _marker: PhantomData }
}
pub fn is_eq_with_output(
&self,
layouter: &mut impl Layouter<F>,
a: AssignedCell<F, F>,
b: AssignedCell<F, F>,
) -> Result<AssignedCell<F, F>, Error> {
let config = self.config();
let out = layouter.assign_region(
|| "is_eq",
|mut region: Region<'_, F>| {
config.s_is_eq.enable(&mut region, 0)?;
let a_field = a.value().copied().to_field();
let b_field = b.value().copied().to_field();
a.copy_advice(|| "copy a", &mut region, config.advices[0], 0)?;
b.copy_advice(|| "copy b", &mut region, config.advices[1], 0)?;
region.assign_advice(
|| "delta invert",
config.advices[3],
0,
|| {
if a_field == b_field {
Value::known(F::ONE)
} else {
let delta = a_field - b_field;
delta.invert().evaluate()
}
},
)?;
let is_eq =
if a_field == b_field { Value::known(F::ONE) } else { Value::known(F::ZERO) };
let cell = region.assign_advice(|| "is_eq", config.advices[2], 0, || is_eq)?;
Ok(cell)
},
)?;
Ok(out)
}
}
#[derive(Clone, Debug)]
pub struct AssertEqualConfig<F: WithSmallOrderMulGroup<3> + Ord> {
s_eq: Selector,
advices: [Column<Advice>; 2],
_marker: PhantomData<F>,
}
pub struct AssertEqualChip<F: WithSmallOrderMulGroup<3> + Ord> {
config: AssertEqualConfig<F>,
_marker: PhantomData<F>,
}
impl<F: WithSmallOrderMulGroup<3> + Ord> Chip<F> for AssertEqualChip<F> {
type Config = AssertEqualConfig<F>;
type Loaded = ();
fn config(&self) -> &Self::Config {
&self.config
}
fn loaded(&self) -> &Self::Loaded {
&()
}
}
impl<F: WithSmallOrderMulGroup<3> + Ord> AssertEqualChip<F> {
pub fn construct(
config: <Self as Chip<F>>::Config,
_loaded: <Self as Chip<F>>::Loaded,
) -> Self {
Self { config, _marker: PhantomData }
}
pub fn configure(
meta: &mut ConstraintSystem<F>,
advices: [Column<Advice>; 2],
) -> <Self as Chip<F>>::Config {
let s_eq = meta.selector();
meta.create_gate("asset_eq", |meta| {
let lhs = meta.query_advice(advices[0], Rotation::cur());
let rhs = meta.query_advice(advices[1], Rotation::cur());
let s_eq = meta.query_selector(s_eq);
vec![s_eq * (lhs - rhs)]
});
AssertEqualConfig { s_eq, advices, _marker: PhantomData }
}
pub fn assert_equal(
&self,
layouter: &mut impl Layouter<F>,
a: AssignedCell<F, F>,
b: AssignedCell<F, F>,
) -> Result<(), Error> {
let config = self.config();
layouter.assign_region(
|| "asset_eq",
|mut region: Region<'_, F>| {
config.s_eq.enable(&mut region, 0)?;
a.copy_advice(|| "copy a", &mut region, config.advices[0], 0)?;
b.copy_advice(|| "copy b", &mut region, config.advices[1], 0)?;
Ok(())
},
)?;
Ok(())
}
}