diff --git a/halo2_backend/Cargo.toml b/halo2_backend/Cargo.toml index 7b24994c3..1c47e39a3 100644 --- a/halo2_backend/Cargo.toml +++ b/halo2_backend/Cargo.toml @@ -28,7 +28,7 @@ rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"] backtrace = { version = "0.3", optional = true } ff = "0.13" group = "0.13" -halo2curves = { version = "0.6.1", default-features = false } +halo2curves = { version = "0.7.0", default-features = false } rand_core = { version = "0.6", default-features = false } tracing = "0.1" blake2b_simd = "1" # MSRV 1.66.0 diff --git a/halo2_debug/Cargo.toml b/halo2_debug/Cargo.toml index 3af6c761d..28b4467f3 100644 --- a/halo2_debug/Cargo.toml +++ b/halo2_debug/Cargo.toml @@ -22,7 +22,7 @@ rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"] [dependencies] ff = "0.13" -halo2curves = { version = "0.6.1", default-features = false } +halo2curves = { version = "0.7.0", default-features = false } num-bigint = "0.4.5" halo2_middleware = { path = "../halo2_middleware" } tiny-keccak = { version = "2.0.2", features=["keccak"] } diff --git a/halo2_frontend/Cargo.toml b/halo2_frontend/Cargo.toml index 1dd4a2a2d..0fbf33e12 100644 --- a/halo2_frontend/Cargo.toml +++ b/halo2_frontend/Cargo.toml @@ -28,7 +28,7 @@ rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"] backtrace = { version = "0.3", optional = true } ff = "0.13" group = "0.13" -halo2curves = { version = "0.6.1", default-features = false } +halo2curves = { version = "0.7.0", default-features = false } tracing = "0.1" blake2b_simd = "1" # MSRV 1.66.0 serde = { version = "1", optional = true, features = ["derive"] } diff --git a/halo2_middleware/Cargo.toml b/halo2_middleware/Cargo.toml index 1c24c77c6..f37aceefc 100644 --- a/halo2_middleware/Cargo.toml +++ b/halo2_middleware/Cargo.toml @@ -26,7 +26,7 @@ rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "katex-header.html"] [dependencies] ff = "0.13" -halo2curves = { version = "0.6.1", default-features = false } +halo2curves = { version = "0.7.0", default-features = false } serde = { version = "1", optional = true, features = ["derive"] } serde_derive = { version = "1", optional = true} rayon = "1.8" diff --git a/halo2_middleware/src/zal.rs b/halo2_middleware/src/zal.rs index 5d376e3e5..b6cf37229 100644 --- a/halo2_middleware/src/zal.rs +++ b/halo2_middleware/src/zal.rs @@ -110,7 +110,7 @@ pub mod impls { use std::marker::PhantomData; use crate::zal::traits::MsmAccel; - use halo2curves::msm::best_multiexp; + use halo2curves::msm::msm_best; use halo2curves::CurveAffine; // Halo2curve Backend @@ -134,7 +134,7 @@ pub mod impls { impl MsmAccel for H2cEngine { fn msm(&self, coeffs: &[C::Scalar], bases: &[C]) -> C::Curve { - best_multiexp(coeffs, bases) + msm_best(coeffs, bases) } // Caching API @@ -156,7 +156,7 @@ pub mod impls { coeffs: &Self::CoeffsDescriptor<'_>, base: &[C], ) -> C::Curve { - best_multiexp(coeffs.raw, base) + msm_best(coeffs.raw, base) } fn msm_with_cached_base( @@ -164,7 +164,7 @@ pub mod impls { coeffs: &[C::Scalar], base: &Self::BaseDescriptor<'_>, ) -> C::Curve { - best_multiexp(coeffs, base.raw) + msm_best(coeffs, base.raw) } fn msm_with_cached_inputs( @@ -172,7 +172,7 @@ pub mod impls { coeffs: &Self::CoeffsDescriptor<'_>, base: &Self::BaseDescriptor<'_>, ) -> C::Curve { - best_multiexp(coeffs.raw, base.raw) + msm_best(coeffs.raw, base.raw) } } @@ -251,7 +251,7 @@ mod test { use crate::zal::impls::{H2cEngine, PlonkEngineConfig}; use crate::zal::traits::MsmAccel; use halo2curves::bn256::G1Affine; - use halo2curves::msm::best_multiexp; + use halo2curves::msm::msm_best; use halo2curves::CurveAffine; use ark_std::{end_timer, start_timer}; @@ -282,7 +282,7 @@ mod test { let scalars = &scalars[..1 << k]; let t0 = start_timer!(|| format!("freestanding msm k={}", k)); - let e0 = best_multiexp(scalars, points); + let e0 = msm_best(scalars, points); end_timer!(t0); let engine = PlonkEngineConfig::build_default::(); @@ -323,7 +323,7 @@ mod test { let scalars = &scalars[..1 << k]; let t0 = start_timer!(|| format!("freestanding msm k={}", k)); - let e0 = best_multiexp(scalars, points); + let e0 = msm_best(scalars, points); end_timer!(t0); let engine = PlonkEngineConfig::new() diff --git a/halo2_proofs/Cargo.toml b/halo2_proofs/Cargo.toml index e5607f6b9..80cb6ec27 100644 --- a/halo2_proofs/Cargo.toml +++ b/halo2_proofs/Cargo.toml @@ -44,7 +44,7 @@ harness = false halo2_middleware = { path = "../halo2_middleware" } halo2_backend = { path = "../halo2_backend", default-features = false } halo2_frontend = { path = "../halo2_frontend", default-features = false } -halo2curves = { version = "0.6.1", default-features = false } +halo2curves = { version = "0.7.0", default-features = false } rand_core = { version = "0.6", default-features = false, features = ["getrandom"] } plotters = { version = "0.3.0", default-features = false, optional = true } group = "0.13" diff --git a/p3_frontend/Cargo.toml b/p3_frontend/Cargo.toml index 7a7e1972c..ffd2b4290 100644 --- a/p3_frontend/Cargo.toml +++ b/p3_frontend/Cargo.toml @@ -28,7 +28,7 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo num-bigint = { version = "0.4.3", default-features = false } [dev-dependencies] -halo2curves = { version = "0.6.0", default-features = false } +halo2curves = { version = "0.7.0", default-features = false } rand_core = { version = "0.6", default-features = false, features = ["getrandom"] } halo2_backend = { path = "../halo2_backend" } serde_test = { version = "1.0" }