zec
/
sapling-crypto
mirror of https://github.com/zcash/sapling-crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Abstract away the boolean conversion of field witnessing.

This commit is contained in:
Sean Bowe 2018-03-05 10:52:56 -07:00
parent 543f5cd49c
commit 3971ecd375
No known key found for this signature in database
GPG Key ID: 95684257D8F8B031
2 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/circuit/boolean.rs
View File

@ -301,6 +301,16 @@ pub fn u64_into_boolean_vec_le<E: Engine, CS: ConstraintSystem<E>>(
Ok(bits)
}
pub fn field_into_boolean_vec_le<E: Engine, CS: ConstraintSystem<E>, F: PrimeField>(
cs: CS,
value: Option<F>
) -> Result<Vec<Boolean>, SynthesisError>
{
let v = field_into_allocated_bits_le::<E, CS, F>(cs, value)?;
Ok(v.into_iter().map(|e| Boolean::from(e)).collect())
}
pub fn field_into_allocated_bits_le<E: Engine, CS: ConstraintSystem<E>, F: PrimeField>(
mut cs: CS,
value: Option<F>

49
src/circuit/mod.rs
View File

@ -81,13 +81,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Spend<'a, E> {
)?;
// Booleanize the randomness
let hr = boolean::field_into_allocated_bits_le(
let hr = boolean::field_into_boolean_vec_le(
cs.namespace(|| "hr"),
self.value_randomness
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
let hr = ecc::fixed_base_multiplication(
cs.namespace(|| "computation of randomization for value commitment"),
@ -109,13 +106,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Spend<'a, E> {
let rk;
{
// Witness rsk as bits
let rsk = boolean::field_into_allocated_bits_le(
let rsk = boolean::field_into_boolean_vec_le(
cs.namespace(|| "rsk"),
self.rsk
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
// NB: We don't ensure that the bit representation of rsk
// is "in the field" (Fs) because it's not used except to
@ -205,13 +199,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Spend<'a, E> {
{
// Booleanize the randomness
let cmr = boolean::field_into_allocated_bits_le(
let cmr = boolean::field_into_boolean_vec_le(
cs.namespace(|| "cmr"),
self.commitment_randomness
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
let cmr = ecc::fixed_base_multiplication(
cs.namespace(|| "computation of commitment randomness"),
@ -356,13 +347,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Output<'a, E> {
)?;
// Booleanize the randomness
let hr = boolean::field_into_allocated_bits_le(
let hr = boolean::field_into_boolean_vec_le(
cs.namespace(|| "hr"),
self.value_randomness
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
let hr = ecc::fixed_base_multiplication(
cs.namespace(|| "computation of randomization for value commitment"),
@ -419,13 +407,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Output<'a, E> {
);
// Compute epk from esk
let esk = boolean::field_into_allocated_bits_le(
let esk = boolean::field_into_boolean_vec_le(
cs.namespace(|| "esk"),
self.esk
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
let epk = g_d.mul(
cs.namespace(|| "epk computation"),
@ -442,13 +427,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Output<'a, E> {
{
let p_d = self.p_d.map(|e| e.into_xy());
let y_contents = boolean::field_into_allocated_bits_le(
let y_contents = boolean::field_into_boolean_vec_le(
cs.namespace(|| "p_d bits of y"),
p_d.map(|e| e.1)
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
let sign_bit = boolean::Boolean::from(boolean::AllocatedBit::alloc(
cs.namespace(|| "p_d bit of x"),
@ -476,13 +458,10 @@ impl<'a, E: JubjubEngine> Circuit<E> for Output<'a, E> {
{
// Booleanize the randomness
let cmr = boolean::field_into_allocated_bits_le(
let cmr = boolean::field_into_boolean_vec_le(
cs.namespace(|| "cmr"),
self.commitment_randomness
)?
.into_iter()
.map(|e| boolean::Boolean::from(e))
.collect::<Vec<_>>();
)?;
let cmr = ecc::fixed_base_multiplication(
cs.namespace(|| "computation of commitment randomness"),