0xMiden · zhenfeizhang · Apr 20, 2025 · Apr 29, 2025 · Apr 29, 2025 · Apr 29, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -54,7 +54,10 @@ miden-utils-testing = { path = "./crates/test-utils", package = "miden-test-util
 miden-verifier = { path = "./verifier", version = "0.20", default-features = false }
 
 # Miden crates
-miden-crypto = { version = "0.19", default-features = false }
+# miden-crypto = { version = "0.17", default-features = false }
+
+miden-crypto = { git = "https://github.com/0xMiden/crypto", branch = "zz/migrate-plonky3" }
+
 miden-formatting = { version = "0.1", default-features = false }
 midenc-hir-type = { version = "0.4", default-features = false }
 
@@ -89,3 +92,26 @@ winter-prover = { version = "0.13", default-features = false }
 winter-rand-utils = "0.13"
 winter-utils = { version = "0.13", default-features = false }
 winter-verifier = { version = "0.13", default-features = false }
+
+# Plonky3 dependencies
+p3-air        = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-blake3= { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-challenger = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-commit     = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-dft= { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-field      = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-fri = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-goldilocks = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-keccak = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-matrix= { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-maybe-rayon= { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-merkle-tree = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-poseidon2 = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-symmetric  = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-uni-stark =  { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+p3-util = { branch = "zz/migrate-plonky3", default-features = false, git = "https://github.com/0xMiden/Plonky3/" }
+
+
+rand = { version = "0.9", default-features = false }
+# [patch.crates-io]
+# miden-crypto = { git = "https://github.com/0xMiden/crypto", branch = "zz/migrate-plonky3" }
diff --git a/air/Cargo.toml b/air/Cargo.toml
@@ -37,6 +37,15 @@ winter-air.workspace = true
 winter-prover.workspace = true
 miden-utils-indexing.workspace = true
 
+p3-air.workspace = true
+p3-commit.workspace = true
+p3-field.workspace = true
+p3-matrix.workspace = true
+p3-uni-stark.workspace = true
+
+serde = { version = "1.0", features = ["derive"] }
+bincode = "1.3"
+
 [dev-dependencies]
 criterion.workspace = true
 proptest.workspace = true

diff --git a/air/benches/enforce_stack_constraint.rs b/air/benches/enforce_stack_constraint.rs
@@ -2,14 +2,14 @@ use std::time::Duration;
 
 use criterion::{Criterion, criterion_group, criterion_main};
 use miden_air::{
-    Felt, FieldElement,
+    Felt,
     stack::{
         NUM_GENERAL_CONSTRAINTS, enforce_constraints, field_ops, io_ops,
         op_flags::generate_evaluation_frame, overflow, stack_manipulation, system_ops, u32_ops,
     },
     trace::STACK_TRACE_OFFSET,
 };
-use miden_core::{Operation, ZERO};
+use miden_core::{Operation, PrimeCharacteristicRing, ZERO};
 
 fn enforce_stack_constraint(c: &mut Criterion) {
     let mut group = c.benchmark_group("enforce_stack_constraint");
@@ -25,8 +25,8 @@ fn enforce_stack_constraint(c: &mut Criterion) {
             + NUM_GENERAL_CONSTRAINTS;
 
         let mut frame = generate_evaluation_frame(Operation::Inv.op_code() as usize);
-        frame.current_mut()[STACK_TRACE_OFFSET] = Felt::new(89u64);
-        frame.next_mut()[STACK_TRACE_OFFSET] = Felt::new(89u64).inv();
+        frame.current_mut()[STACK_TRACE_OFFSET] = Felt::from_u64(89u64);
+        frame.next_mut()[STACK_TRACE_OFFSET] = Felt::from_u64(89u64).inverse_unwrap_zero();
 
         let mut result = [ZERO; NUM_CONSTRAINTS];
 

diff --git a/air/src/constraints/chiplets/bitwise/mod.rs b/air/src/constraints/chiplets/bitwise/mod.rs
@@ -14,7 +14,7 @@ use crate::{
 };
 
 #[cfg(test)]
-pub mod tests;
+//pub mod tests;
 
 // CONSTANTS
 // ================================================================================================

diff --git a/air/src/constraints/chiplets/hasher/mod.rs b/air/src/constraints/chiplets/hasher/mod.rs
@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 
-use super::{EvaluationFrame, Felt, FieldElement, TransitionConstraintDegree};
+use super::{EvaluationFrame, Felt,  TransitionConstraintDegree};
 use crate::{
     ONE, ZERO,
     trace::chiplets::{
@@ -14,7 +14,7 @@ use crate::{
 };
 
 #[cfg(test)]
-mod tests;
+//mod tests;
 
 // CONSTANTs
 // ================================================================================================
@@ -105,7 +105,7 @@ pub fn get_transition_constraint_count() -> usize {
 ///   by the caller and set to `Felt::ONE`
 /// - The `transition_flag` indicates whether this is the last row this chiplet's execution trace,
 ///   and therefore the constraints should not be enforced.
-pub fn enforce_constraints<E: FieldElement<BaseField = Felt>>(
+pub fn enforce_constraints<E: ExtensionField<Felt>>(
     frame: &EvaluationFrame<E>,
     periodic_values: &[E],
     result: &mut [E],

diff --git a/air/src/constraints/chiplets/memory/mod.rs b/air/src/constraints/chiplets/memory/mod.rs
@@ -14,7 +14,7 @@ use crate::{
 };
 
 #[cfg(test)]
-mod tests;
+//mod tests;
 
 // CONSTANTS
 // ================================================================================================

diff --git a/air/src/constraints/chiplets/memory/tests.rs b/air/src/constraints/chiplets/memory/tests.rs
@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 
-use miden_core::{Felt, FieldElement, WORD_SIZE};
+use miden_core::{Felt,  WORD_SIZE};
 use winter_rand_utils::rand_value;
 
 use super::{
@@ -171,7 +171,7 @@ fn get_test_frame(
     };
     next[MEMORY_D0_COL_IDX] = Felt::new(delta as u16 as u64);
     next[MEMORY_D1_COL_IDX] = Felt::new(delta >> 16);
-    next[MEMORY_D_INV_COL_IDX] = (Felt::new(delta)).inv();
+    next[MEMORY_D_INV_COL_IDX] = (Felt::new(delta)).inverse_unwrap_zero();
 
     // since we're always writing a word, the idx0 and idx1 columns should be zero
     next[MEMORY_IDX0_COL_IDX] = ZERO;

diff --git a/air/src/constraints/chiplets/mod.rs b/air/src/constraints/chiplets/mod.rs
@@ -3,7 +3,7 @@ use alloc::vec::Vec;
 use miden_core::{Word, precompile::PrecompileTranscriptState};
 
 use super::super::{
-    CHIPLETS_OFFSET, EvaluationFrame, Felt, FieldElement, TransitionConstraintDegree,
+    CHIPLETS_OFFSET, EvaluationFrame, Felt,  TransitionConstraintDegree,
 };
 use crate::{
     Assertion, AuxRandElements,
@@ -50,13 +50,13 @@ pub fn get_aux_assertions_first_step<E>(
     aux_rand_elements: &AuxRandElements<E>,
     pc_transcript_state: PrecompileTranscriptState,
 ) where
-    E: FieldElement<BaseField = Felt>,
+    E: ExtensionField<Felt>,
 {
     let reduced_kernel_digests = reduce_kernel_digests(kernel_digests, aux_rand_elements);
     result.push(Assertion::single(
         CHIPLETS_BUS_AUX_TRACE_OFFSET,
         0,
-        reduced_kernel_digests.inv(),
+        reduced_kernel_digests.inverse_unwrap_zero(),
     ));
 
     // Anchor hasher vtable init against PI-provided transcript state (empty/final).
@@ -100,7 +100,7 @@ pub fn get_transition_constraint_count() -> usize {
 }
 
 /// Enforces constraints for the chiplets module and all chiplet components.
-pub fn enforce_constraints<E: FieldElement<BaseField = Felt>>(
+pub fn enforce_constraints<E: ExtensionField<Felt>>(
     frame: &EvaluationFrame<E>,
     periodic_values: &[E],
     result: &mut [E],
@@ -274,7 +274,7 @@ impl<E: FieldElement> ChipletsFrameExt<E> for &EvaluationFrame<E> {
 /// Reduces kernel procedures digests using auxiliary randomness.
 fn reduce_kernel_digests<E>(kernel_digests: &[Word], aux_rand_elements: &AuxRandElements<E>) -> E
 where
-    E: FieldElement<BaseField = Felt>,
+    E: ExtensionField<Felt>,
 {
     let alphas = aux_rand_elements.rand_elements();
     kernel_digests.iter().fold(E::ONE, |acc, digest: &Word| {
@@ -284,7 +284,7 @@ where
             .iter()
             .skip(2)
             .zip(digest.iter())
-            .map(|(alpha, coef)| alpha.mul_base(*coef))
+            .map(|(alpha, coef)| alpha.mul(*coef))
             .fold(affine_term, |acc, term| acc + term);
 
         acc * cur

diff --git a/air/src/constraints/mod.rs b/air/src/constraints/mod.rs
@@ -1,3 +1,4 @@
+/*
 use super::{EvaluationFrame, ExtensionOf, Felt, FieldElement};
 use crate::{
     trace::{
@@ -17,8 +18,8 @@ pub mod stack;
 /// calculations.
 pub trait MainFrameExt<F, E>
 where
-    F: FieldElement<BaseField = Felt>,
-    E: FieldElement<BaseField = Felt> + ExtensionOf<F>,
+    F: ExtensionField<Felt>,
+    E: ExtensionField<Felt> + ExtensionOf<F>,
 {
     /// Returns true when a u32 stack operation that requires range checks is being performed.
     fn u32_rc_op(&self) -> F;
@@ -61,8 +62,8 @@ where
 
 impl<F, E> MainFrameExt<F, E> for EvaluationFrame<F>
 where
-    F: FieldElement<BaseField = Felt>,
-    E: FieldElement<BaseField = Felt> + ExtensionOf<F>,
+    F: ExtensionField<Felt>,
+    E: ExtensionField<Felt> + ExtensionOf<F>,
 {
     /// Returns true when the stack operation is a u32 operation that requires range checks.
     /// TODO: this is also defined in the op flags. It's redefined here to avoid computing all of
@@ -106,3 +107,4 @@ where
         alpha + self.current()[DECODER_USER_OP_HELPERS_OFFSET + 3].into()
     }
 }
+ */
diff --git a/air/src/constraints/range.rs b/air/src/constraints/range.rs
@@ -1,9 +1,9 @@
 use alloc::vec::Vec;
-
+/*
 use miden_core::{ExtensionOf, ZERO};
 
 use crate::{
-    Assertion, EvaluationFrame, Felt, FieldElement, TransitionConstraintDegree,
+    Assertion, EvaluationFrame, Felt,  TransitionConstraintDegree,
     chiplets::ChipletsFrameExt,
     constraints::MainFrameExt,
     trace::range::{B_RANGE_COL_IDX, M_COL_IDX, V_COL_IDX},
@@ -113,8 +113,8 @@ pub fn enforce_aux_constraints<F, E>(
     aux_rand_elements: &[E],
     result: &mut [E],
 ) where
-    F: FieldElement<BaseField = Felt>,
-    E: FieldElement<BaseField = Felt> + ExtensionOf<F>,
+    F: ExtensionField<Felt>,
+    E: ExtensionField<Felt> + ExtensionOf<F>,
 {
     // Get the first random element for this segment.
     let alpha = aux_rand_elements[0];
@@ -159,8 +159,8 @@ fn enforce_b_range<E, F>(
     alpha: E,
     result: &mut [E],
 ) where
-    F: FieldElement<BaseField = Felt>,
-    E: FieldElement<BaseField = Felt> + ExtensionOf<F>,
+    F: ExtensionField<Felt>,
+    E: ExtensionField<Felt> + ExtensionOf<F>,
 {
     // The denominator values for the LogUp lookup.
     let mv0: E = main_frame.lookup_mv0(alpha);
@@ -178,16 +178,16 @@ fn enforce_b_range<E, F>(
     // operation with range checks. This value has degree 6.
     let sflag_rc_mem: E = range_check
         .mul(memory_lookups)
-        .mul_base(<EvaluationFrame<F> as MainFrameExt<F, E>>::u32_rc_op(main_frame));
+        .mul(<EvaluationFrame<F> as MainFrameExt<F, E>>::u32_rc_op(main_frame));
     // An intermediate value required by all memory terms that includes the flag indicating the
     // memory portion of the chiplets trace. This value has degree 8.
     let mflag_rc_stack: E =
-        range_check.mul(stack_lookups).mul_base(main_frame.chiplets_memory_flag());
+        range_check.mul(stack_lookups).mul(main_frame.chiplets_memory_flag());
 
     // The terms for the LogUp check after all denominators have been multiplied in.
     let b_next_term = aux_frame.b_range_next().mul(lookups); // degree 8
     let b_term = aux_frame.b_range().mul(lookups); // degree 8
-    let rc_term = stack_lookups.mul(memory_lookups).mul_base(main_frame.multiplicity()); // degree 7
+    let rc_term = stack_lookups.mul(memory_lookups).mul(main_frame.multiplicity()); // degree 7
     let s0_term = sflag_rc_mem.mul(sv1).mul(sv2).mul(sv3); // degree 9
     let s1_term = sflag_rc_mem.mul(sv0).mul(sv2).mul(sv3); // degree 9
     let s2_term = sflag_rc_mem.mul(sv0).mul(sv1).mul(sv3); // degree 9
@@ -255,3 +255,4 @@ impl<E: FieldElement> EvaluationFrameExt<E> for &EvaluationFrame<E> {
         self.next()[column] - self.current()[column]
     }
 }
+ */
diff --git a/air/src/constraints/stack/field_ops/mod.rs b/air/src/constraints/stack/field_ops/mod.rs
@@ -1,13 +1,13 @@
 use alloc::vec::Vec;
 
-use super::{EvaluationFrame, FieldElement, TransitionConstraintDegree, op_flags::OpFlags};
+use super::{EvaluationFrame,  TransitionConstraintDegree, op_flags::OpFlags};
 use crate::{
     stack::EvaluationFrameExt,
     utils::{are_equal, is_binary},
 };
 
 #[cfg(test)]
-pub mod tests;
+//pub mod tests;
 
 // CONSTANTS
 // ================================================================================================
@@ -67,7 +67,7 @@ pub fn enforce_constraints<E: FieldElement>(
     index += enforce_mul_constraints(frame, &mut result[index..], op_flag.mul());
 
     // Enforce constaints of the INV operation.
-    index += enforce_inv_constraints(frame, &mut result[index..], op_flag.inv());
+    index += enforce_inv_constraints(frame, &mut result[index..], op_flag.inverse_unwrap_zero());
 
     // Enforce constaints of the INCR operation.
     index += enforce_incr_constraints(frame, &mut result[index..], op_flag.incr());

diff --git a/air/src/constraints/stack/field_ops/tests.rs b/air/src/constraints/stack/field_ops/tests.rs
@@ -1,6 +1,6 @@
 use core::ops::Neg;
 
-use miden_core::{Felt, FieldElement, ONE, Operation, ZERO};
+use miden_core::{Felt,  ONE, Operation, ZERO};
 use proptest::prelude::*;
 use winter_rand_utils::rand_value;
 
@@ -260,7 +260,7 @@ pub fn get_eqz_test_frame(a: u64) -> EvaluationFrame<Felt> {
         },
         _ => {
             frame.current_mut()[STACK_TRACE_OFFSET] = Felt::new(a);
-            frame.current_mut()[DECODER_TRACE_OFFSET + USER_OP_HELPERS_OFFSET] = Felt::new(a).inv();
+            frame.current_mut()[DECODER_TRACE_OFFSET + USER_OP_HELPERS_OFFSET] = Felt::new(a).inverse_unwrap_zero();
             frame.next_mut()[STACK_TRACE_OFFSET] = ZERO;
         },
     }
@@ -291,7 +291,7 @@ pub fn get_inv_test_frame(a: u64) -> EvaluationFrame<Felt> {
     // Set the output. First element in the next frame should be the inverse of
     // the first element of the current frame.
     frame.current_mut()[STACK_TRACE_OFFSET] = Felt::new(a);
-    frame.next_mut()[STACK_TRACE_OFFSET] = Felt::new(a).inv();
+    frame.next_mut()[STACK_TRACE_OFFSET] = Felt::new(a).inverse_unwrap_zero();
 
     frame
 }
@@ -360,7 +360,7 @@ pub fn get_eq_test_frame(a: u64, b: u64) -> EvaluationFrame<Felt> {
         frame.current_mut()[STACK_TRACE_OFFSET] = Felt::new(a);
         frame.current_mut()[STACK_TRACE_OFFSET + 1] = Felt::new(b);
         frame.current_mut()[DECODER_TRACE_OFFSET + USER_OP_HELPERS_OFFSET] =
-            (Felt::new(a) - Felt::new(b)).inv();
+            (Felt::new(a) - Felt::new(b)).inverse_unwrap_zero();
         frame.next_mut()[STACK_TRACE_OFFSET] = ZERO;
     }
 

diff --git a/air/src/constraints/stack/io_ops/mod.rs b/air/src/constraints/stack/io_ops/mod.rs
@@ -1,10 +1,10 @@
 use alloc::vec::Vec;
 
-use super::{EvaluationFrame, FieldElement, TransitionConstraintDegree, op_flags::OpFlags};
+use super::{EvaluationFrame,  TransitionConstraintDegree, op_flags::OpFlags};
 use crate::{stack::EvaluationFrameExt, utils::are_equal};
 
 #[cfg(test)]
-pub mod tests;
+//pub mod tests;
 
 // CONSTANTS
 // ================================================================================================