merge with master

Author: hero78119

Cargo.toml

@@ -37,6 +37,7 @@ itertools = "0.13"
 num-bigint = { version = "0.4.6" }
 num-derive = "0.4"
 num-traits = "0.2"
+p3-baby-bear = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 p3-challenger = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 p3-field = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 p3-goldilocks = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
@@ -46,7 +47,6 @@ p3-mds = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 p3-poseidon = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 p3-poseidon2 = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 p3-symmetric = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
-p3-baby-bear = { git = "https://github.com/scroll-tech/plonky3", rev = "8d2be81" }
 paste = "1"
 plonky2 = "0.2"
 poseidon = { path = "./poseidon" }

ff_ext/src/babybear.rs

@@ -94,7 +94,7 @@ pub mod impl_babybear {
     impl PoseidonField for BabyBear {
         type P = Poseidon2BabyBear<POSEIDON2_BABYBEAR_WIDTH>;
         type T = DuplexChallenger<Self, Self::P, POSEIDON2_BABYBEAR_WIDTH, POSEIDON2_BABYBEAR_RATE>;
-        fn get_perm() -> Self::T {
+        fn get_default_challenger() -> Self::T {
             let p = Poseidon2BabyBear::new(
                 ExternalLayerConstants::new(
                     BABYBEAR_RC16_EXTERNAL_INITIAL.to_vec(),

ff_ext/src/goldilock.rs

@@ -46,7 +46,7 @@ pub mod impl_goldilocks {
         type P = Poseidon2GoldilocksHL<POSEIDON2_GOLDILICK_WIDTH>;
         type T =
             DuplexChallenger<Self, Self::P, POSEIDON2_GOLDILICK_WIDTH, POSEIDON2_GOLDILICK_RATE>;
-        fn get_perm() -> Self::T {
+        fn get_default_challenger() -> Self::T {
             let perm = Poseidon2GoldilocksHL::new(
                 ExternalLayerConstants::<Goldilocks, POSEIDON2_GOLDILICK_WIDTH>::new_from_saved_array(
                     HL_GOLDILOCKS_8_EXTERNAL_ROUND_CONSTANTS,

ff_ext/src/poseidon.rs

@@ -16,7 +16,7 @@ pub trait FieldChallengerExt<F: PoseidonField>: FieldChallenger<F> {
 pub trait PoseidonField: PrimeField + SmallField {
     type P: Clone;
     type T: FieldChallenger<Self> + Clone;
-    fn get_perm() -> Self::T;
+    fn get_default_challenger() -> Self::T;
 }
 
 pub(crate) fn new_array<const N: usize, F: PrimeField>(input: [u64; N]) -> [F; N] {

p3/Cargo.toml

@@ -10,6 +10,7 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
+p3-baby-bear.workspace = true
 p3-challenger.workspace = true
 p3-field.workspace = true
 p3-goldilocks.workspace = true
@@ -18,4 +19,3 @@ p3-mds.workspace = true
 p3-poseidon.workspace = true
 p3-poseidon2.workspace = true
 p3-symmetric.workspace = true
-p3-baby-bear.workspace = true

poseidon/src/challenger.rs

@@ -25,7 +25,7 @@ where
 
 impl<F: PoseidonField> DefaultChallenger<F> {
     pub fn new_poseidon_default() -> Self {
-        DefaultChallenger::new(F::get_perm())
+        DefaultChallenger::new(F::get_default_challenger())
     }
 }