Merge pull request zkcrypto#94 from zkcrypto/ff-0.13

Migrate to `ff 0.13`
openex-network · Mar 20, 2023 · f709d9f · f709d9f
2 parents 3c44bfe + 29c82c7
commit f709d9f
Show file tree

Hide file tree

Showing 20 changed files with 230 additions and 227 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       - name: cargo fetch
         uses: actions-rs/cargo@v1
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       - name: Add target
         run: rustup target add ${{ matrix.target }}
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       # Build benchmarks to prevent bitrot
       - name: Build benchmarks
@@ -105,7 +105,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1

diff --git a/.github/workflows/lints-stable.yml b/.github/workflows/lints-stable.yml
@@ -5,20 +5,20 @@ on: pull_request
 
 jobs:
   clippy:
-    name: Clippy (1.56.0)
+    name: Clippy (1.60.0)
     timeout-minutes: 30
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           components: clippy
           override: true
       - name: Run clippy
         uses: actions-rs/clippy-check@v1
         with:
-          name: Clippy (1.56.0)
+          name: Clippy (1.60.0)
           token: ${{ secrets.GITHUB_TOKEN }}
           args: --all-features --all-targets -- -D warnings
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to Rust's notion of
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- MSRV bumped to `1.60.0`
+- Bumped dependencies to `ff 0.13`, `group 0.13`, `pairing 0.23`.
 
 ## [0.13.1] - 2022-07-05
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -11,13 +11,14 @@ name = "bellman"
 repository = "https://github.com/zkcrypto/bellman"
 version = "0.13.1"
 edition = "2021"
+rust-version = "1.60"
 
 [dependencies]
 bitvec = "1"
 blake2s_simd = "1"
-ff = "0.12"
-group = "0.12"
-pairing = { version = "0.22", optional = true }
+ff = "0.13"
+group = "0.13"
+pairing = { version = "0.23", optional = true }
 rand_core = "0.6"
 byteorder = "1"
 subtle = "2.2.1"
@@ -30,8 +31,8 @@ num_cpus = { version = "1", optional = true }
 rayon = { version = "1.5.1", optional = true }
 
 [dev-dependencies]
-bls12_381 = "0.7"
-criterion = "0.3"
+bls12_381 = "0.8"
+criterion = "0.4"
 hex-literal = "0.3"
 rand = "0.8"
 rand_xorshift = "0.3"

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.56.0
+1.60.0
diff --git a/src/domain.rs b/src/domain.rs
@@ -60,7 +60,7 @@ impl<S: PrimeField, G: Group<S>> EvaluationDomain<S, G> {
         }
 
         // Compute omega, the 2^exp primitive root of unity
-        let mut omega = S::root_of_unity();
+        let mut omega = S::ROOT_OF_UNITY;
         for _ in exp..S::S {
             omega = omega.square();
         }
@@ -73,7 +73,7 @@ impl<S: PrimeField, G: Group<S>> EvaluationDomain<S, G> {
             exp,
             omega,
             omegainv: omega.invert().unwrap(),
-            geninv: S::multiplicative_generator().invert().unwrap(),
+            geninv: S::MULTIPLICATIVE_GENERATOR.invert().unwrap(),
             minv: S::from(m as u64).invert().unwrap(),
         })
     }
@@ -113,7 +113,7 @@ impl<S: PrimeField, G: Group<S>> EvaluationDomain<S, G> {
     }
 
     pub fn coset_fft(&mut self, worker: &Worker) {
-        self.distribute_powers(worker, S::multiplicative_generator());
+        self.distribute_powers(worker, S::MULTIPLICATIVE_GENERATOR);
         self.fft(worker);
     }
 
@@ -128,7 +128,7 @@ impl<S: PrimeField, G: Group<S>> EvaluationDomain<S, G> {
     /// tau^m - 1 for these radix-2 domains.
     pub fn z(&self, tau: &S) -> S {
         let mut tmp = tau.pow_vartime(&[self.coeffs.len() as u64]);
-        tmp.sub_assign(&S::one());
+        tmp.sub_assign(&S::ONE);
 
         tmp
     }
@@ -137,7 +137,7 @@ impl<S: PrimeField, G: Group<S>> EvaluationDomain<S, G> {
     /// evaluation domain, so we must perform division over
     /// a coset.
     pub fn divide_by_z_on_coset(&mut self, worker: &Worker) {
-        let i = self.z(&S::multiplicative_generator()).invert().unwrap();
+        let i = self.z(&S::MULTIPLICATIVE_GENERATOR).invert().unwrap();
 
         worker.scope(self.coeffs.len(), |scope, chunk| {
             for v in self.coeffs.chunks_mut(chunk) {
@@ -245,7 +245,7 @@ impl<S: PrimeField> Clone for Scalar<S> {
 
 impl<S: PrimeField> Group<S> for Scalar<S> {
     fn group_zero() -> Self {
-        Scalar(S::zero())
+        Scalar(S::ZERO)
     }
     fn group_mul_assign(&mut self, by: &S) {
         self.0.mul_assign(by);
@@ -295,7 +295,7 @@ fn serial_fft<S: PrimeField, T: Group<S>>(a: &mut [T], omega: &S, log_n: u32) {
 
         let mut k = 0;
         while k < n {
-            let mut w = S::one();
+            let mut w = S::ONE;
             for j in 0..m {
                 let mut t = a[(k + j + m) as usize];
                 t.group_mul_assign(&w);
@@ -336,7 +336,7 @@ fn parallel_fft<S: PrimeField, T: Group<S>>(
                 let omega_j = omega.pow_vartime(&[j as u64]);
                 let omega_step = omega.pow_vartime(&[(j as u64) << log_new_n]);
 
-                let mut elt = S::one();
+                let mut elt = S::ONE;
                 for (i, tmp) in tmp.iter_mut().enumerate() {
                     for s in 0..num_cpus {
                         let idx = (i + (s << log_new_n)) % (1 << log_n);
@@ -392,7 +392,7 @@ fn polynomial_arith() {
                     .collect();
 
                 // naive evaluation
-                let mut naive = vec![Scalar(S::zero()); coeffs_a + coeffs_b];
+                let mut naive = vec![Scalar(S::ZERO); coeffs_a + coeffs_b];
                 for (i1, a) in a.iter().enumerate() {
                     for (i2, b) in b.iter().enumerate() {
                         let mut prod = *a;
@@ -401,8 +401,8 @@ fn polynomial_arith() {
                     }
                 }
 
-                a.resize(coeffs_a + coeffs_b, Scalar(S::zero()));
-                b.resize(coeffs_a + coeffs_b, Scalar(S::zero()));
+                a.resize(coeffs_a + coeffs_b, Scalar(S::ZERO));
+                b.resize(coeffs_a + coeffs_b, Scalar(S::ZERO));
 
                 let mut a = EvaluationDomain::from_coeffs(a).unwrap();
                 let mut b = EvaluationDomain::from_coeffs(b).unwrap();