use separte halo2curves with halo2-pse feature

Cargo.toml

@@ -40,8 +40,5 @@ debug = true
 halo2-base = { path = "../halo2-lib/halo2-base" }
 halo2-ecc = { path = "../halo2-lib/halo2-ecc" }
 
-[patch."https://github.com/privacy-scaling-explorations/halo2curves"]
-halo2curves = { git = "https://github.com/timoftime/halo2curves", branch = "support_bls12-381" }
-
 [patch."https://github.com/axiom-crypto/halo2curves"]
 halo2curves = { git = "https://github.com/timoftime/halo2curves", branch = "support_bls12-381" }

halo2-base/src/utils/mod.rs

@@ -150,7 +150,7 @@ pub trait ScalarField: PrimeField + FromUniformBytes<64> + From<bool> + Hash + O
 
 /// [ScalarField] that is ~256 bits long
 #[cfg(feature = "halo2-pse")]
-pub trait BigPrimeField = PrimeField<Repr = [u8; 32]> + ScalarField;
+pub trait BigPrimeField = PrimeField + ScalarField;
 
 /// Converts an [Iterator] of u64 digits into `number_of_limbs` limbs of `bit_len` bits returned as a [Vec].
 ///

halo2-ecc/Cargo.toml

@@ -17,6 +17,9 @@ rayon="1.6.1"
 test-case="3.1.0"
 
 halo2-base={ path="../halo2-base", default-features=false }
+# Use additiona axiom-crypto halo2curves for BLS12-381 chips when feature = "halo2-pse" is on,
+# because the PSE halo2curves does not support BLS12-381 chips and Halo2 depnds on lower major version so patchign it is not possible
+halo2curves = { git = "https://github.com/axiom-crypto/halo2curves", optional=true }
 
 [dev-dependencies]
 ark-std={ version="0.3.0", features=["print-trace"] }
@@ -33,7 +36,7 @@ default=["jemallocator", "halo2-axiom", "display"]
 dev-graph=["halo2-base/dev-graph"]
 display=["halo2-base/display"]
 asm=["halo2-base/asm"]
-halo2-pse=["halo2-base/halo2-pse"]
+halo2-pse=["halo2-base/halo2-pse", "halo2curves"]
 halo2-axiom=["halo2-base/halo2-axiom"]
 jemallocator=["halo2-base/jemallocator"]
 mimalloc=["halo2-base/mimalloc"]

halo2-ecc/src/bls12_381/final_exp.rs

@@ -1,6 +1,6 @@
 use super::XI_0;
 use super::{Fp12Chip, Fp2Chip, FpChip, FqPoint};
-use crate::halo2_proofs::halo2curves::bls12_381::{Fq, Fq12, Fq2, BLS_X, FROBENIUS_COEFF_FQ12_C1};
+use super::{Fq, Fq12, Fq2, BLS_X, FROBENIUS_COEFF_FQ12_C1};
 use crate::{
     ecc::get_naf,
     fields::{fp12::mul_no_carry_w6, vector::FieldVector, FieldChip},

halo2-ecc/src/bls12_381/mod.rs

@@ -1,11 +1,19 @@
 use crate::bigint::ProperCrtUint;
 use crate::fields::vector::FieldVector;
 use crate::fields::{fp, fp12, fp2};
-use crate::halo2_proofs::halo2curves::bls12_381::{Fq, Fq12, Fq2};
 
 pub mod final_exp;
 pub mod pairing;
 
+#[cfg(feature = "halo2-axiom")]
+pub(crate) use crate::halo2_proofs::halo2curves::bls12_381::{
+    Fq, Fq12, Fq2, G1Affine, G2Affine, BLS_X, BLS_X_IS_NEGATIVE, FROBENIUS_COEFF_FQ12_C1,
+};
+#[cfg(feature = "halo2-pse")]
+pub(crate) use halo2curves::bls12_381::{
+    Fq, Fq12, Fq2, G1Affine, G2Affine, BLS_X, BLS_X_IS_NEGATIVE, FROBENIUS_COEFF_FQ12_C1,
+};
+
 pub(crate) const XI_0: i64 = 1;
 
 pub type FpChip<'range, F> = fp::FpChip<'range, F, Fq>;

halo2-ecc/src/bls12_381/pairing.rs

@@ -1,13 +1,13 @@
 #![allow(non_snake_case)]
 use super::{Fp12Chip, Fp2Chip, FpChip, FpPoint, Fq, FqPoint, XI_0};
+use super::{Fq12, G1Affine, G2Affine, BLS_X, BLS_X_IS_NEGATIVE};
 use crate::fields::vector::FieldVector;
-use crate::halo2_proofs::halo2curves::bls12_381::{Fq12, G1Affine, G2Affine, BLS_X};
 use crate::{
     ecc::{EcPoint, EccChip},
     fields::fp12::mul_no_carry_w6,
     fields::FieldChip,
 };
-use halo2_base::halo2_proofs::halo2curves::bls12_381::BLS_X_IS_NEGATIVE;
+
 use halo2_base::utils::BigPrimeField;
 use halo2_base::Context;
 

halo2-ecc/src/bls12_381/tests/ec_add.rs

@@ -4,7 +4,6 @@ use std::io::{BufRead, BufReader};
 
 use super::*;
 use crate::fields::{FieldChip, FpStrategy};
-use crate::halo2_proofs::halo2curves::bls12_381::G2Affine;
 use halo2_base::gates::RangeChip;
 use halo2_base::utils::testing::base_test;
 use halo2_base::utils::BigPrimeField;

halo2-ecc/src/bls12_381/tests/mod.rs

@@ -2,16 +2,18 @@
 use super::pairing::PairingChip;
 use super::*;
 use crate::ecc::EccChip;
+use crate::fields::FpStrategy;
 use crate::group::Curve;
-use crate::{
-    fields::FpStrategy,
-    halo2_proofs::halo2curves::bls12_381::{pairing, Fr as Scalar, G1Affine},
-};
 use halo2_base::utils::testing::base_test;
 use rand::rngs::StdRng;
 use rand_core::SeedableRng;
 use serde::{Deserialize, Serialize};
 use std::io::Write;
 
+#[cfg(feature = "halo2-axiom")]
+pub(crate) use crate::halo2_proofs::halo2curves::bls12_381::{pairing, Fr as Scalar};
+#[cfg(feature = "halo2-pse")]
+pub(crate) use halo2curves::bls12_381::{pairing, Fr as Scalar};
+
 pub mod ec_add;
 pub mod pairing;

halo2-ecc/src/bls12_381/tests/pairing.rs

@@ -7,10 +7,7 @@ use crate::fields::FieldChip;
 
 use super::*;
 use halo2_base::{
-    gates::RangeChip,
-    halo2_proofs::{arithmetic::Field, halo2curves::bls12_381::G2Affine},
-    utils::BigPrimeField,
-    Context,
+    gates::RangeChip, halo2_proofs::arithmetic::Field, utils::BigPrimeField, Context,
 };
 use serde::{Deserialize, Serialize};
 

halo2-ecc/src/bn254/tests/bls_signature.rs

@@ -10,12 +10,12 @@ use crate::{
 };
 use halo2_base::{
     gates::RangeChip,
-    halo2_proofs::halo2curves::bn256::{multi_miller_loop, G2Prepared, Gt},
+    halo2_proofs::halo2curves::{bn256::{multi_miller_loop, G2Prepared, Gt}, pairing::MillerLoopResult},
     utils::BigPrimeField,
     Context,
 };
 extern crate pairing;
-use pairing::{group::ff::Field, MillerLoopResult};
+use crate::group::ff::Field;
 use rand_core::OsRng;
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize)]

halo2-ecc/src/fields/fp12.rs

@@ -1,5 +1,6 @@
 use std::marker::PhantomData;
 
+#[cfg(feature = "halo2-axiom")]
 use crate::ff::PrimeField as _;
 use crate::impl_field_ext_chip_common;
 
@@ -252,7 +253,10 @@ mod bn254 {
 
 mod bls12_381 {
     use crate::fields::FieldExtConstructor;
+    #[cfg(feature = "halo2-axiom")]
     use crate::halo2_proofs::halo2curves::bls12_381::{Fq, Fq12, Fq2, Fq6};
+    #[cfg(feature = "halo2-pse")]
+    use halo2curves::bls12_381::{Fq, Fq12, Fq2, Fq6};
     // This means we store an Fp12 point as `\sum_{i = 0}^6 (a_{i0} + a_{i1} * u) * w^i`
     // This is encoded in an FqPoint of degree 12 as `(a_{00}, ..., a_{50}, a_{01}, ..., a_{51})`
     impl FieldExtConstructor<Fq, 12> for Fq12 {

halo2-ecc/src/fields/fp2.rs

@@ -1,6 +1,7 @@
 use std::fmt::Debug;
 use std::marker::PhantomData;
 
+#[cfg(feature = "halo2-axiom")]
 use crate::ff::PrimeField as _;
 use crate::impl_field_ext_chip_common;
 
@@ -133,7 +134,11 @@ mod bn254 {
 
 mod bls12_381 {
     use crate::fields::FieldExtConstructor;
+    #[cfg(feature = "halo2-axiom")]
     use crate::halo2_proofs::halo2curves::bls12_381::{Fq, Fq2};
+    #[cfg(feature = "halo2-pse")]
+    use halo2curves::bls12_381::{Fq, Fq2};
+
     impl FieldExtConstructor<Fq, 2> for Fq2 {
         fn new(c: [Fq; 2]) -> Self {
             Fq2 { c0: c[0], c1: c[1] }