[fix] FieldChip::range_check should take FieldPoint instead of `U…

…nsafeFieldPoint` (#209) * fix: `FieldChip::range_check` should take `FieldPoint` instead of `UnsafeFieldPoint` * chore: fix audit-check CI * chore: toggle CI on release branches
axiom-crypto · Nov 2, 2023 · d4bf2fa · d4bf2fa
1 parent 4ba2efc
commit d4bf2fa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: ["main"]
   pull_request:
-    branches: ["main", "develop", "community-edition"]
+    branches: ["main", "develop", "community-edition", "release-*"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -64,5 +64,10 @@ jobs:
       - name: Run clippy
         run: cargo clippy --all -- -D warnings
 
+      - name: Generate Cargo.lock
+        run: cargo generate-lockfile
+
       - name: Run cargo audit
         uses: actions-rs/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/halo2-ecc/src/fields/fp.rs b/halo2-ecc/src/fields/fp.rs
@@ -304,17 +304,17 @@ impl<'range, F: BigPrimeField, Fp: BigPrimeField> FieldChip<F> for FpChip<'range
     fn range_check(
         &self,
         ctx: &mut Context<F>,
-        a: impl Into<CRTInteger<F>>,
+        a: impl Into<ProperCrtUint<F>>,
         max_bits: usize, // the maximum bits that a.value could take
     ) {
         let n = self.limb_bits;
         let a = a.into();
         let mut remaining_bits = max_bits;
 
-        debug_assert!(a.value.bits() as usize <= max_bits);
+        debug_assert!(a.0.value.bits() as usize <= max_bits);
 
         // range check limbs of `a` are in [0, 2^n) except last limb should be in [0, 2^last_limb_bits)
-        for cell in a.truncation.limbs {
+        for cell in a.0.truncation.limbs {
             let limb_bits = cmp::min(n, remaining_bits);
             remaining_bits -= limb_bits;
             self.range.range_check(ctx, cell, limb_bits);

diff --git a/halo2-ecc/src/fields/mod.rs b/halo2-ecc/src/fields/mod.rs
@@ -125,12 +125,7 @@ pub trait FieldChip<F: BigPrimeField>: Clone + Send + Sync {
 
     fn carry_mod(&self, ctx: &mut Context<F>, a: Self::UnsafeFieldPoint) -> Self::FieldPoint;
 
-    fn range_check(
-        &self,
-        ctx: &mut Context<F>,
-        a: impl Into<Self::UnsafeFieldPoint>,
-        max_bits: usize,
-    );
+    fn range_check(&self, ctx: &mut Context<F>, a: impl Into<Self::FieldPoint>, max_bits: usize);
 
     /// Constrains that `a` is a reduced representation and returns the wrapped `a`.
     fn enforce_less_than(

diff --git a/halo2-ecc/src/fields/vector.rs b/halo2-ecc/src/fields/vector.rs
@@ -251,7 +251,7 @@ where
         a: impl IntoIterator<Item = A>,
         max_bits: usize,
     ) where
-        A: Into<FpChip::UnsafeFieldPoint>,
+        A: Into<FpChip::FieldPoint>,
     {
         for coeff in a {
             self.fp_chip.range_check(ctx, coeff, max_bits);
@@ -435,7 +435,7 @@ macro_rules! impl_field_ext_chip_common {
         fn range_check(
             &self,
             ctx: &mut Context<F>,
-            a: impl Into<Self::UnsafeFieldPoint>,
+            a: impl Into<Self::FieldPoint>,
             max_bits: usize,
         ) {
             self.0.range_check(ctx, a.into(), max_bits)