chore: update miden-crypto (with unified Felt type)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.21.2 (TBD)
+
+#### Changes
+
+- Update `miden-crypto` to v0.22.3 (with unified `Felt` type) ([#2649](https://github.com/0xMiden/miden-vm/pull/2649))
+
 ## 0.21.1 (2026-02-17)
 
 #### Changes

air/src/trace/rows.rs

@@ -4,7 +4,7 @@ use core::{
     ops::{Add, AddAssign, Bound, Index, IndexMut, Mul, RangeBounds, Sub, SubAssign},
 };
 
-use miden_core::{Felt, field::PrimeCharacteristicRing};
+use miden_core::Felt;
 
 // ROW INDEX
 // ================================================================================================

core/src/advice/map.rs

@@ -188,7 +188,6 @@ impl Deserializable for AdviceMap {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::field::PrimeCharacteristicRing;
 
     #[test]
     fn test_advice_map_serialization() {

core/src/advice/stack.rs

@@ -1,7 +1,7 @@
 use alloc::{collections::VecDeque, vec::Vec};
 
 use super::{AdviceInputs, AdviceMap};
-use crate::{Felt, Word, crypto::merkle::MerkleStore, field::PrimeField64};
+use crate::{Felt, Word, crypto::merkle::MerkleStore};
 
 // ADVICE STACK BUILDER
 // ================================================================================================

core/src/chiplets/hasher.rs

@@ -9,7 +9,7 @@
 //! a consistent interface for the Miden VM's hashing needs. For higher-level hasher chiplet
 //! functionality, see the trace and processor modules.
 
-use miden_crypto::{Word as Digest, field::PrimeCharacteristicRing};
+use miden_crypto::Word as Digest;
 
 use super::Felt;
 pub use crate::crypto::hash::Poseidon2 as Hasher;

core/src/lib.rs

@@ -55,7 +55,7 @@ assertion failed: `(left matches right)`
 // EXPORTS
 // ================================================================================================
 
-pub use miden_crypto::{EMPTY_WORD, Felt, ONE, WORD_SIZE, Word, ZERO, word::LexicographicWord};
+pub use miden_crypto::{EMPTY_WORD, Felt, LexicographicWord, ONE, WORD_SIZE, Word, ZERO};
 
 pub mod advice;
 pub mod chiplets;

core/src/mast/mod.rs

@@ -56,7 +56,6 @@ pub use node::{
 use crate::{
     Felt, LexicographicWord, Word,
     advice::AdviceMap,
-    field::PrimeField64,
     operations::{AssemblyOp, DebugVarInfo, Decorator},
     serde::{
         BudgetedReader, ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,

core/src/mast/node/basic_block_node/mod.rs

@@ -5,7 +5,6 @@ use crate::{
     Felt, Word, ZERO,
     chiplets::hasher,
     crypto::hash::Blake3_256,
-    field::PrimeField64,
     mast::{
         DecoratedLinksIter, DecoratedOpLink, DecoratorId, DecoratorStore, MastForest,
         MastForestError, MastNode, MastNodeFingerprint, MastNodeId,

core/src/mast/serialization/tests.rs

@@ -3,7 +3,6 @@ use std::string::ToString;
 use super::*;
 use crate::{
     Felt, ONE, Word,
-    field::PrimeCharacteristicRing,
     mast::{
         BasicBlockNodeBuilder, CallNodeBuilder, DynNodeBuilder, ExternalNodeBuilder,
         JoinNodeBuilder, LoopNodeBuilder, MastForestContributor, MastForestError, MastNodeExt,

core/src/mast/tests.rs

@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 
-use miden_crypto::{WORD_SIZE, field::PrimeCharacteristicRing, rand::test_utils::prng_array};
+use miden_crypto::{WORD_SIZE, rand::test_utils::prng_array};
 use proptest::prelude::*;
 
 use crate::{

core/src/operations/decorators/debug_var.rs

@@ -1,7 +1,6 @@
 use alloc::{string::String, sync::Arc, vec::Vec};
 use core::{fmt, num::NonZeroU32};
 
-use miden_crypto::field::PrimeField64;
 use miden_debug_types::FileLineCol;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};

core/src/operations/mod.rs

@@ -1,6 +1,5 @@
 use core::fmt;
 
-use miden_crypto::field::PrimeField64;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 

core/src/program/mod.rs

@@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Felt, WORD_SIZE, Word,
     advice::AdviceMap,
-    field::PrimeCharacteristicRing,
     mast::{MastForest, MastNode, MastNodeExt, MastNodeId},
     serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
     utils::ToElements,

core/src/program/stack/mod.rs

@@ -1,4 +1,4 @@
-use crate::{Felt, field::PrimeField64};
+use crate::Felt;
 
 mod inputs;
 pub use inputs::{InputError, StackInputs};

core/src/program/stack/outputs.rs

@@ -101,8 +101,6 @@ impl StackOutputs {
     /// Converts the [`StackOutputs`] into the vector of `u64` values.
     #[cfg(any(test, feature = "testing"))]
     pub fn as_int_vec(&self) -> Vec<u64> {
-        use miden_crypto::field::PrimeField64;
-
         self.elements.iter().map(|e| (*e).as_canonical_u64()).collect()
     }
 }

core/src/utils/mod.rs

@@ -1,11 +1,7 @@
 use alloc::vec::Vec;
 use core::ops::{Bound, Range};
 
-use crate::{
-    Felt, Word,
-    crypto::hash::Blake3_256,
-    field::{PrimeCharacteristicRing, PrimeField64},
-};
+use crate::{Felt, Word, crypto::hash::Blake3_256, field::PrimeCharacteristicRing};
 
 // RE-EXPORTS
 // ================================================================================================
@@ -183,7 +179,6 @@ mod tests {
     use proptest::prelude::*;
 
     use super::*;
-    use crate::field::PrimeCharacteristicRing;
 
     proptest! {
         #[test]

crates/assembly-syntax/src/ast/constants/expr.rs

@@ -1,9 +1,8 @@
 use alloc::{boxed::Box, sync::Arc, vec::Vec};
 use core::fmt;
 
-use miden_core::{
-    field::PrimeCharacteristicRing,
-    serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
+use miden_core::serde::{
+    ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable,
 };
 use miden_debug_types::{SourceSpan, Span, Spanned};
 #[cfg(feature = "serde")]

crates/assembly-syntax/src/parser/grammar.lalrpop

@@ -9,7 +9,7 @@ use core::{marker::PhantomData, ops::Range};
 
 use miden_debug_types::{SourceId, SourceSpan, Span, Spanned};
 use smallvec::smallvec;
-use miden_core::{Felt, field::{PrimeCharacteristicRing, PrimeField64}};
+use miden_core::{Felt, field::PrimeField64};
 
 use crate::{ast::{*, types::{AddressSpace, Type}}, Word};
 use super::{

crates/assembly-syntax/src/parser/lexer.rs

@@ -1,7 +1,6 @@
 use alloc::{borrow::Cow, string::String};
 use core::{num::IntErrorKind, ops::Range};
 
-use miden_core::field::PrimeCharacteristicRing;
 use miden_debug_types::{ByteOffset, SourceId, SourceSpan};
 
 use super::{

crates/assembly-syntax/src/parser/token.rs

@@ -3,7 +3,7 @@ use core::fmt;
 
 use miden_core::{
     Felt,
-    field::{PrimeCharacteristicRing, PrimeField64},
+    field::PrimeField64,
     serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
 };
 #[cfg(feature = "serde")]

crates/assembly/src/fmp.rs

@@ -1,9 +1,6 @@
 use alloc::vec::Vec;
 
-use miden_core::{
-    FMP_ADDR, FMP_INIT_VALUE, Felt, WORD_SIZE, field::PrimeCharacteristicRing,
-    operations::Operation,
-};
+use miden_core::{FMP_ADDR, FMP_INIT_VALUE, Felt, WORD_SIZE, operations::Operation};
 
 use crate::push_value_ops;
 

crates/assembly/src/instruction/crypto_ops.rs

@@ -1,6 +1,4 @@
-use miden_core::{
-    Felt, ZERO, events::SystemEvent, field::PrimeCharacteristicRing, operations::Operation::*,
-};
+use miden_core::{Felt, ZERO, events::SystemEvent, operations::Operation::*};
 
 use super::BasicBlockBuilder;
 use crate::Report;

crates/assembly/src/instruction/field_ops.rs

@@ -3,11 +3,7 @@ use miden_assembly_syntax::{
     debuginfo::{SourceSpan, Span},
     diagnostics::{RelatedError, RelatedLabel, Report},
 };
-use miden_core::{
-    events::SystemEvent,
-    field::{Field, PrimeCharacteristicRing, PrimeField64},
-    operations::Operation::*,
-};
+use miden_core::{events::SystemEvent, field::Field, operations::Operation::*};
 
 use super::BasicBlockBuilder;
 use crate::{MAX_EXP_BITS, ONE, ProcedureContext, ZERO};

crates/assembly/src/instruction/mem_ops.rs

@@ -2,7 +2,7 @@ use miden_assembly_syntax::{
     debuginfo::{SourceSpan, Spanned},
     diagnostics::{RelatedLabel, Report},
 };
-use miden_core::{Felt, WORD_SIZE, field::PrimeCharacteristicRing, operations::Operation::*};
+use miden_core::{Felt, WORD_SIZE, operations::Operation::*};
 
 use super::{BasicBlockBuilder, push_u32_value};
 use crate::{ProcedureContext, fmp::push_offset_fmp_sequence};

crates/assembly/src/instruction/mod.rs

@@ -8,7 +8,6 @@ use miden_assembly_syntax::{
 };
 use miden_core::{
     Felt, WORD_SIZE, ZERO,
-    field::PrimeCharacteristicRing,
     mast::MastNodeId,
     operations::{Decorator, Operation},
 };

crates/assembly/src/instruction/u32_ops.rs

@@ -6,7 +6,6 @@ use miden_assembly_syntax::{
 use miden_core::{
     Felt, ZERO,
     events::SystemEvent,
-    field::PrimeCharacteristicRing,
     operations::Operation::{self, *},
 };
 

crates/assembly/src/tests.rs

@@ -9,7 +9,6 @@ use miden_assembly_syntax::{ast::Path, diagnostics::WrapErr, library::LibraryExp
 use miden_core::{
     Felt, Word, assert_matches,
     events::EventId,
-    field::PrimeCharacteristicRing,
     mast::{MastNodeExt, MastNodeId},
     operations::Operation,
     program::Program,

crates/lib/core/src/handlers/aead_decrypt.rs

@@ -7,7 +7,7 @@
 
 use alloc::{vec, vec::Vec};
 
-use miden_core::{events::EventName, field::PrimeField64};
+use miden_core::events::EventName;
 use miden_crypto::aead::{
     DataType, EncryptionError,
     aead_poseidon2::{AuthTag, EncryptedData, Nonce, SecretKey},

crates/lib/core/src/handlers/ecdsa.rs

@@ -35,7 +35,7 @@ use alloc::{vec, vec::Vec};
 use miden_core::{
     Felt,
     events::EventName,
-    field::{PrimeCharacteristicRing, PrimeField64},
+    field::PrimeCharacteristicRing,
     precompile::{PrecompileCommitment, PrecompileError, PrecompileRequest, PrecompileVerifier},
     serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
     utils::bytes_to_packed_u32_elements,

crates/lib/core/src/handlers/eddsa_ed25519.rs

@@ -13,7 +13,7 @@ use core::convert::TryInto;
 use miden_core::{
     Felt,
     events::EventName,
-    field::{PrimeCharacteristicRing, PrimeField64},
+    field::PrimeCharacteristicRing,
     precompile::{PrecompileCommitment, PrecompileError, PrecompileRequest, PrecompileVerifier},
     serde::{ByteReader, ByteWriter, Deserializable, DeserializationError, Serializable},
     utils::bytes_to_packed_u32_elements,

crates/lib/core/src/handlers/falcon_div.rs

@@ -5,7 +5,7 @@
 
 use alloc::{vec, vec::Vec};
 
-use miden_core::{ZERO, events::EventName, field::PrimeField64};
+use miden_core::{ZERO, events::EventName};
 use miden_processor::{ProcessorState, advice::AdviceMutation, event::EventError};
 
 use crate::handlers::u64_to_u32_elements;

crates/lib/core/src/handlers/keccak256.rs

@@ -30,7 +30,6 @@ use miden_core::{
     Felt, Word, ZERO,
     crypto::hash::{Keccak256, Poseidon2},
     events::EventName,
-    field::{PrimeCharacteristicRing, PrimeField64},
     precompile::{PrecompileCommitment, PrecompileError, PrecompileRequest, PrecompileVerifier},
     utils::bytes_to_packed_u32_elements,
 };
@@ -235,8 +234,6 @@ impl AsRef<[Felt]> for KeccakFeltDigest {
 
 #[cfg(test)]
 mod tests {
-    use miden_core::field::PrimeCharacteristicRing;
-
     use super::*;
 
     // KECCAK FELT DIGEST TESTS

crates/lib/core/src/handlers/mod.rs

@@ -1,7 +1,4 @@
-use miden_core::{
-    Felt, WORD_SIZE,
-    field::{PrimeCharacteristicRing, PrimeField64},
-};
+use miden_core::{Felt, WORD_SIZE};
 use miden_processor::ProcessorState;
 
 pub mod aead_decrypt;

crates/lib/core/src/handlers/sha512.rs

@@ -12,7 +12,6 @@ use miden_core::{
     Felt, Word, ZERO,
     crypto::hash::{Poseidon2, Sha512},
     events::EventName,
-    field::{PrimeCharacteristicRing, PrimeField64},
     precompile::{PrecompileCommitment, PrecompileError, PrecompileRequest, PrecompileVerifier},
     utils::bytes_to_packed_u32_elements,
 };

crates/lib/core/src/handlers/sorted_array.rs

@@ -1,9 +1,7 @@
 use alloc::{vec, vec::Vec};
 
 use miden_core::{
-    Felt, LexicographicWord, Word,
-    events::EventName,
-    field::{PrimeCharacteristicRing, PrimeField64},
+    Felt, LexicographicWord, Word, events::EventName, field::PrimeCharacteristicRing,
 };
 use miden_processor::{MemoryError, ProcessorState, advice::AdviceMutation, event::EventError};