From 3ced18fb70c5af5fd91f88ad06eaee5ae7f446d0 Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Fri, 6 Feb 2026 16:52:31 +0200 Subject: [PATCH 1/2] chore: update `miden-crypto` (with unified `Felt` type) --- Cargo.lock | 25 +++++++++++++++++++------ Cargo.toml | 3 ++- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53ad0f59ee..43a9680df7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1300,8 +1300,7 @@ dependencies = [ [[package]] name = "miden-crypto" version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8072201571ec2a69f6ed786929b6e6d185418cdde20cb1b224f6deafe0ca2724" +source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "blake3", "cc", @@ -1314,6 +1313,7 @@ dependencies = [ "hkdf", "k256", "miden-crypto-derive", + "miden-field", "miden-serde-utils", "num", "num-complex", @@ -1349,8 +1349,7 @@ dependencies = [ [[package]] name = "miden-crypto-derive" version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d245d64fcb3d146afefab0e825a67d3de3eb49fca43cc7e4d94c897d5415a8f8" +source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "quote", "syn 2.0.114", @@ -1372,6 +1371,21 @@ dependencies = [ "thiserror", ] +[[package]] +name = "miden-field" +version = "0.22.2" +source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" +dependencies = [ + "miden-serde-utils", + "num-bigint", + "p3-challenger", + "p3-field", + "p3-goldilocks", + "paste", + "rand", + "serde", +] + [[package]] name = "miden-formatting" version = "0.1.1" @@ -1473,8 +1487,7 @@ dependencies = [ [[package]] name = "miden-serde-utils" version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc82405e71b675c810673239ce891ad19ddbd59a99df629e177e8561408dba0" +source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "p3-field", "p3-goldilocks", diff --git a/Cargo.toml b/Cargo.toml index cce810d253..4db2530192 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,8 @@ miden-utils-testing = { path = "./crates/test-utils", package = "miden-test-util miden-verifier = { path = "./verifier", version = "0.21", default-features = false } # Miden crates -miden-crypto = { version = "0.22", default-features = false } +# miden-crypto = { path = "../crypto/miden-crypto", version = "0.22", default-features = false } +miden-crypto = { git = "https://github.com/0xMiden/crypto", rev = "ba5aa2b78923b40b50d8170fd287b36808b11ec5", version = "0.22", default-features = false } miden-formatting = { version = "0.1", default-features = false } midenc-hir-type = { version = "0.4", default-features = false } From 31082f6ddde505c5aa13541da47f026428058371 Mon Sep 17 00:00:00 2001 From: Denys Zadorozhnyi Date: Mon, 16 Feb 2026 09:35:17 +0200 Subject: [PATCH 2/2] fix: import for `LexicographicWord` --- Cargo.lock | 5 +---- Cargo.toml | 4 ++-- core/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 43a9680df7..78985282fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1300,7 +1300,6 @@ dependencies = [ [[package]] name = "miden-crypto" version = "0.22.2" -source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "blake3", "cc", @@ -1349,7 +1348,6 @@ dependencies = [ [[package]] name = "miden-crypto-derive" version = "0.22.2" -source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "quote", "syn 2.0.114", @@ -1374,7 +1372,6 @@ dependencies = [ [[package]] name = "miden-field" version = "0.22.2" -source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "miden-serde-utils", "num-bigint", @@ -1384,6 +1381,7 @@ dependencies = [ "paste", "rand", "serde", + "thiserror", ] [[package]] @@ -1487,7 +1485,6 @@ dependencies = [ [[package]] name = "miden-serde-utils" version = "0.22.2" -source = "git+https://github.com/0xMiden/crypto?rev=ba5aa2b78923b40b50d8170fd287b36808b11ec5#ba5aa2b78923b40b50d8170fd287b36808b11ec5" dependencies = [ "p3-field", "p3-goldilocks", diff --git a/Cargo.toml b/Cargo.toml index 4db2530192..9920b2e3ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,8 +63,8 @@ miden-utils-testing = { path = "./crates/test-utils", package = "miden-test-util miden-verifier = { path = "./verifier", version = "0.21", default-features = false } # Miden crates -# miden-crypto = { path = "../crypto/miden-crypto", version = "0.22", default-features = false } -miden-crypto = { git = "https://github.com/0xMiden/crypto", rev = "ba5aa2b78923b40b50d8170fd287b36808b11ec5", version = "0.22", default-features = false } +miden-crypto = { path = "../crypto/miden-crypto", version = "0.22", default-features = false } +# miden-crypto = { git = "https://github.com/0xMiden/crypto", rev = "ba5aa2b78923b40b50d8170fd287b36808b11ec5", version = "0.22", default-features = false } miden-formatting = { version = "0.1", default-features = false } midenc-hir-type = { version = "0.4", default-features = false } diff --git a/core/src/lib.rs b/core/src/lib.rs index fb96d4b153..b21fa0934f 100644 --- a/core/src/lib.rs +++ b/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;