chore: merge v0.12.0 release from 0xPolygonMiden/next

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.0 (2024-10-30)
+
+- [BREAKING] Updated Winterfell dependency to v0.10 (#338).
+
 ## 0.11.0 (2024-10-17)
 
 - [BREAKING]: renamed `Mmr::open()` into `Mmr::open_at()` and `Mmr::peaks()` into `Mmr::peaks_at()` (#234).

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "miden-crypto"
-version = "0.11.0"
+version = "0.12.0"
 description = "Miden Cryptographic primitives"
 authors = ["miden contributors"]
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/0xPolygonMiden/crypto"
-documentation = "https://docs.rs/miden-crypto/0.11.0"
+documentation = "https://docs.rs/miden-crypto/0.12.0"
 categories = ["cryptography", "no-std"]
 keywords = ["miden", "crypto", "hash", "merkle"]
 edition = "2021"
@@ -52,20 +52,20 @@ num = { version = "0.4", default-features = false, features = ["alloc", "libm"]
 num-complex = { version = "0.4", default-features = false }
 rand = { version = "0.8", default-features = false }
 rand_core = { version = "0.6", default-features = false }
-rand-utils = { version = "0.9", package = "winter-rand-utils", optional = true }
+rand-utils = { version = "0.10", package = "winter-rand-utils", optional = true }
 serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] }
 sha3 = { version = "0.10", default-features = false }
-winter-crypto = { version = "0.9", default-features = false }
-winter-math = { version = "0.9", default-features = false }
-winter-utils = { version = "0.9", default-features = false }
+winter-crypto = { version = "0.10", default-features = false }
+winter-math = { version = "0.10", default-features = false }
+winter-utils = { version = "0.10", default-features = false }
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }
 getrandom = { version = "0.2", features = ["js"] }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 proptest = "1.5"
 rand_chacha = { version = "0.3", default-features = false }
-rand-utils = { version = "0.9", package = "winter-rand-utils" }
+rand-utils = { version = "0.10", package = "winter-rand-utils" }
 seq-macro = { version = "0.3" }
 
 [build-dependencies]

src/hash/blake/mod.rs

@@ -1,8 +1,8 @@
-use alloc::string::String;
+use alloc::{string::String, vec::Vec};
 use core::{
     mem::{size_of, transmute, transmute_copy},
     ops::Deref,
-    slice::from_raw_parts,
+    slice::{self, from_raw_parts},
 };
 
 use super::{Digest, ElementHasher, Felt, FieldElement, Hasher};
@@ -33,6 +33,14 @@ const DIGEST20_BYTES: usize = 20;
 #[cfg_attr(feature = "serde", serde(into = "String", try_from = "&str"))]
 pub struct Blake3Digest<const N: usize>([u8; N]);
 
+impl<const N: usize> Blake3Digest<N> {
+    pub fn digests_as_bytes(digests: &[Blake3Digest<N>]) -> &[u8] {
+        let p = digests.as_ptr();
+        let len = digests.len() * N;
+        unsafe { slice::from_raw_parts(p as *const u8, len) }
+    }
+}
+
 impl<const N: usize> Default for Blake3Digest<N> {
     fn default() -> Self {
         Self([0; N])
@@ -114,6 +122,10 @@ impl Hasher for Blake3_256 {
         Self::hash(prepare_merge(values))
     }
 
+    fn merge_many(values: &[Self::Digest]) -> Self::Digest {
+        Blake3Digest(blake3::hash(Blake3Digest::digests_as_bytes(values)).into())
+    }
+
     fn merge_with_int(seed: Self::Digest, value: u64) -> Self::Digest {
         let mut hasher = blake3::Hasher::new();
         hasher.update(&seed.0);
@@ -174,6 +186,11 @@ impl Hasher for Blake3_192 {
         Blake3Digest(*shrink_bytes(&blake3::hash(bytes).into()))
     }
 
+    fn merge_many(values: &[Self::Digest]) -> Self::Digest {
+        let bytes: Vec<u8> = values.iter().flat_map(|v| v.as_bytes()).collect();
+        Blake3Digest(*shrink_bytes(&blake3::hash(&bytes).into()))
+    }
+
     fn merge(values: &[Self::Digest; 2]) -> Self::Digest {
         Self::hash(prepare_merge(values))
     }
@@ -242,6 +259,11 @@ impl Hasher for Blake3_160 {
         Self::hash(prepare_merge(values))
     }
 
+    fn merge_many(values: &[Self::Digest]) -> Self::Digest {
+        let bytes: Vec<u8> = values.iter().flat_map(|v| v.as_bytes()).collect();
+        Blake3Digest(*shrink_bytes(&blake3::hash(&bytes).into()))
+    }
+
     fn merge_with_int(seed: Self::Digest, value: u64) -> Self::Digest {
         let mut hasher = blake3::Hasher::new();
         hasher.update(&seed.0);

src/hash/rescue/rpo/digest.rs

@@ -1,5 +1,5 @@
 use alloc::string::String;
-use core::{cmp::Ordering, fmt::Display, ops::Deref};
+use core::{cmp::Ordering, fmt::Display, ops::Deref, slice};
 
 use super::{Digest, Felt, StarkField, DIGEST_BYTES, DIGEST_SIZE, ZERO};
 use crate::{
@@ -34,13 +34,19 @@ impl RpoDigest {
         <Self as Digest>::as_bytes(self)
     }
 
-    pub fn digests_as_elements<'a, I>(digests: I) -> impl Iterator<Item = &'a Felt>
+    pub fn digests_as_elements_iter<'a, I>(digests: I) -> impl Iterator<Item = &'a Felt>
     where
         I: Iterator<Item = &'a Self>,
     {
         digests.flat_map(|d| d.0.iter())
     }
 
+    pub fn digests_as_elements(digests: &[Self]) -> &[Felt] {
+        let p = digests.as_ptr();
+        let len = digests.len() * DIGEST_SIZE;
+        unsafe { slice::from_raw_parts(p as *const Felt, len) }
+    }
+
     /// Returns hexadecimal representation of this digest prefixed with `0x`.
     pub fn to_hex(&self) -> String {
         bytes_to_hex_string(self.as_bytes())