mirror of https://github.com/zcash/halo2.git
Compare commits
2 Commits
2ce8e263ef
...
a9e987918d
Author | SHA1 | Date |
---|---|---|
str4d | a9e987918d | |
Jack Grigg | 2474bdb4f6 |
|
@ -4,3 +4,7 @@ members = [
|
||||||
"halo2_gadgets",
|
"halo2_gadgets",
|
||||||
"halo2_proofs",
|
"halo2_proofs",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[patch.crates-io]
|
||||||
|
group = { git = "https://github.com/zkcrypto/group.git", rev = "696c2128529b5a9e18eed46d1da531753695db04" }
|
||||||
|
pasta_curves = { git = "https://github.com/zcash/pasta_curves.git", rev = "fb643a4e5ea25e035af758595f903b4002b0b7a3" }
|
||||||
|
|
|
@ -578,7 +578,7 @@ impl<C: CurveAffine, EccChip: EccInstructions<C>> FixedPointShort<C, EccChip> {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
pub(crate) mod tests {
|
pub(crate) mod tests {
|
||||||
use ff::PrimeField;
|
use ff::PrimeField;
|
||||||
use group::{prime::PrimeCurveAffine, Curve, Group};
|
use group::{Curve, CurveAffine, Group};
|
||||||
|
|
||||||
use halo2_proofs::{
|
use halo2_proofs::{
|
||||||
circuit::{Layouter, SimpleFloorPlanner, Value},
|
circuit::{Layouter, SimpleFloorPlanner, Value},
|
||||||
|
|
|
@ -8,7 +8,7 @@ use crate::{
|
||||||
use arrayvec::ArrayVec;
|
use arrayvec::ArrayVec;
|
||||||
|
|
||||||
use ff::PrimeField;
|
use ff::PrimeField;
|
||||||
use group::prime::PrimeCurveAffine;
|
use group::CurveAffine as _;
|
||||||
use halo2_proofs::{
|
use halo2_proofs::{
|
||||||
circuit::{AssignedCell, Chip, Layouter, Value},
|
circuit::{AssignedCell, Chip, Layouter, Value},
|
||||||
plonk::{Advice, Assigned, Column, ConstraintSystem, Error, Fixed},
|
plonk::{Advice, Assigned, Column, ConstraintSystem, Error, Fixed},
|
||||||
|
|
|
@ -325,7 +325,7 @@ impl Config {
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
pub mod tests {
|
pub mod tests {
|
||||||
use group::{prime::PrimeCurveAffine, Curve};
|
use group::{Curve, CurveAffine};
|
||||||
use halo2_proofs::{
|
use halo2_proofs::{
|
||||||
circuit::{Layouter, Value},
|
circuit::{Layouter, Value},
|
||||||
plonk::Error,
|
plonk::Error,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use super::{EccPoint, NonIdentityEccPoint};
|
use super::{EccPoint, NonIdentityEccPoint};
|
||||||
|
|
||||||
use group::prime::PrimeCurveAffine;
|
use group::CurveAffine as _;
|
||||||
|
|
||||||
use halo2_proofs::{
|
use halo2_proofs::{
|
||||||
circuit::{AssignedCell, Region, Value},
|
circuit::{AssignedCell, Region, Value},
|
||||||
|
|
|
@ -127,7 +127,7 @@ where
|
||||||
{
|
{
|
||||||
use crate::sinsemilla::primitives::{K, S_PERSONALIZATION};
|
use crate::sinsemilla::primitives::{K, S_PERSONALIZATION};
|
||||||
|
|
||||||
use group::{prime::PrimeCurveAffine, Curve};
|
use group::{Curve, CurveAffine};
|
||||||
use pasta_curves::arithmetic::CurveExt;
|
use pasta_curves::arithmetic::CurveExt;
|
||||||
|
|
||||||
let field_elems: Value<Vec<_>> = message
|
let field_elems: Value<Vec<_>> = message
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use std::ops::Add;
|
use std::ops::Add;
|
||||||
|
|
||||||
use group::{cofactor::CofactorCurveAffine, Group};
|
use group::{CurveAffine, Group};
|
||||||
use pasta_curves::pallas;
|
use pasta_curves::pallas;
|
||||||
use subtle::{ConstantTimeEq, CtOption};
|
use subtle::{ConstantTimeEq, CtOption};
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ use crate::arithmetic::{best_fft, best_multiexp, parallelize, CurveAffine, Curve
|
||||||
use crate::helpers::CurveRead;
|
use crate::helpers::CurveRead;
|
||||||
|
|
||||||
use ff::{Field, PrimeField};
|
use ff::{Field, PrimeField};
|
||||||
use group::{prime::PrimeCurveAffine, Curve, Group};
|
use group::{Curve, Group};
|
||||||
use std::ops::{Add, AddAssign, Mul, MulAssign};
|
use std::ops::{Add, AddAssign, Mul, MulAssign};
|
||||||
|
|
||||||
mod msm;
|
mod msm;
|
||||||
|
@ -74,7 +74,7 @@ impl<C: CurveAffine> Params<C> {
|
||||||
|
|
||||||
// Let's evaluate all of the Lagrange basis polynomials
|
// Let's evaluate all of the Lagrange basis polynomials
|
||||||
// using an inverse FFT.
|
// using an inverse FFT.
|
||||||
let mut alpha_inv = <<C as PrimeCurveAffine>::Curve as Group>::Scalar::ROOT_OF_UNITY_INV;
|
let mut alpha_inv = <C::Curve as Group>::Scalar::ROOT_OF_UNITY_INV;
|
||||||
for _ in k..C::Scalar::S {
|
for _ in k..C::Scalar::S {
|
||||||
alpha_inv = alpha_inv.square();
|
alpha_inv = alpha_inv.square();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue