This commit is contained in:
wborgeaud 2022-03-03 04:19:17 +01:00
parent f6525ed11a
commit 90df0d9d3a
2 changed files with 6 additions and 6 deletions

View File

@ -18,8 +18,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
base: &AffinePoint<C>,
scalar: &NonNativeTarget<C::ScalarField>,
) -> AffinePointTarget<C> {
let doubled_base = (0..scalar.value.limbs.len() * 8).scan(base.clone(), |acc, _| {
let tmp = acc.clone();
let doubled_base = (0..scalar.value.limbs.len() * 8).scan(*base, |acc, _| {
let tmp = *acc;
for _ in 0..4 {
*acc = acc.double();
}
@ -34,11 +34,11 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
));
let rando = (CurveScalar(hash_0_scalar) * C::GENERATOR_PROJECTIVE).to_affine();
let zero = self.zero();
let mut result = self.constant_affine_point(rando.clone());
let mut result = self.constant_affine_point(rando);
for (limb, point) in bits.into_iter().zip(doubled_base) {
let mul_point = (0..16)
.scan(AffinePoint::ZERO, |acc, _| {
let tmp = acc.clone();
let tmp = *acc;
*acc = (point + *acc).to_affine();
Some(tmp)
})

View File

@ -49,7 +49,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
let s = self.constant_nonnative(GLV_S);
let mut should_be_k = self.mul_nonnative(&s, &k2_raw);
should_be_k = self.add_nonnative(&should_be_k, &k1_raw);
self.connect_nonnative(&should_be_k, &k);
self.connect_nonnative(&should_be_k, k);
(k1, k2, k1_neg, k2_neg)
}
@ -68,7 +68,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
y: p.y.clone(),
};
let p_neg = self.curve_conditional_neg(&p, k1_neg);
let p_neg = self.curve_conditional_neg(p, k1_neg);
let sp_neg = self.curve_conditional_neg(&sp, k2_neg);
self.curve_msm(&p_neg, &sp_neg, &k1.value, &k2.value)
}