smt: add SparseMerklePath
This commit is contained in:
parent
dcf66efb56
commit
33e414b32a
3 changed files with 132 additions and 0 deletions
|
@ -16,6 +16,7 @@
|
|||
- Optimized duplicate key detection in `Smt::with_entries_concurrent` (#395).
|
||||
- [BREAKING] Moved `rand` to version `0.9` removing the `try_fill_bytes` method (#398).
|
||||
- [BREAKING] Increment minimum supported Rust version to 1.85 (#399).
|
||||
- Added `SparseMerklePath`, a compact representation of `MerklePath` which compacts empty nodes into a bitmask (#389).
|
||||
|
||||
## 0.13.3 (2025-02-18)
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@ pub use merkle_tree::{MerkleTree, path_to_text, tree_to_text};
|
|||
mod path;
|
||||
pub use path::{MerklePath, RootPath, ValuePath};
|
||||
|
||||
mod sparse_path;
|
||||
pub use sparse_path::SparseMerklePath;
|
||||
|
||||
mod smt;
|
||||
pub use smt::{
|
||||
InnerNode, LeafIndex, MutationSet, NodeMutation, PartialSmt, SMT_DEPTH, SMT_MAX_DEPTH,
|
||||
|
|
128
miden-crypto/src/merkle/sparse_path.rs
Normal file
128
miden-crypto/src/merkle/sparse_path.rs
Normal file
|
@ -0,0 +1,128 @@
|
|||
use alloc::vec::Vec;
|
||||
use core::iter;
|
||||
|
||||
use super::{EmptySubtreeRoots, MerklePath, RpoDigest, SMT_MAX_DEPTH};
|
||||
|
||||
/// A different representation of [`MerklePath`] designed for memory efficiency for Merkle paths
|
||||
/// with empty nodes.
|
||||
///
|
||||
/// Empty nodes in the path are stored only as their position, represented with a bitmask. A
|
||||
/// maximum of 64 nodes in the path can be empty. The number of empty nodes has no effect on memory
|
||||
/// usage by this struct, but will incur overhead during iteration or conversion to a
|
||||
/// [`MerklePath`], for each empty node.
|
||||
///
|
||||
/// NOTE: This type assumes that Merkle paths always span from the root of the tree to a leaf.
|
||||
/// Partial paths are not supported.
|
||||
#[derive(Clone, Debug, Default, PartialEq, Eq)]
|
||||
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
|
||||
pub struct SparseMerklePath {
|
||||
/// A bitmask representing empty nodes. The set bit corresponds to the depth of an empty node.
|
||||
empty_nodes: u64,
|
||||
/// The non-empty nodes, stored in depth-order, but not contiguous across depth.
|
||||
nodes: Vec<RpoDigest>,
|
||||
}
|
||||
|
||||
impl SparseMerklePath {
|
||||
/// Constructs a sparse Merkle path from any iterator which knows its exact size.
|
||||
///
|
||||
/// Knowing the size is necessary to calculate the depth of the tree, which is needed to detect
|
||||
/// which nodes are empty nodes.
|
||||
pub fn from_sized_iter(iter: impl ExactSizeIterator<Item = RpoDigest>) -> Option<Self> {
|
||||
let tree_depth: u8 = iter.len() as u8;
|
||||
if tree_depth > SMT_MAX_DEPTH {
|
||||
return None;
|
||||
}
|
||||
|
||||
let mut nodes: Vec<RpoDigest> = Default::default();
|
||||
let mut empty_nodes: u64 = 0;
|
||||
|
||||
for (depth, node) in iter::zip(0..tree_depth, iter) {
|
||||
let &equivalent_empty_node = EmptySubtreeRoots::entry(tree_depth, depth);
|
||||
if node == equivalent_empty_node {
|
||||
// FIXME: should we just fallback to the Vec if we're out of bits?
|
||||
assert!(depth < 64, "SparseMerklePath may have at most 64 empty nodes");
|
||||
empty_nodes |= u64::checked_shl(1, depth.into()).unwrap();
|
||||
} else {
|
||||
nodes.push(node);
|
||||
}
|
||||
}
|
||||
|
||||
Some(Self { empty_nodes, nodes })
|
||||
}
|
||||
|
||||
/// Converts a Merkle path to a sparse representation.
|
||||
///
|
||||
/// Returns `None` if `path` contains more elements than we can represent ([`SMT_MAX_DEPTH`]).
|
||||
pub fn from_path(path: MerklePath) -> Option<Self> {
|
||||
// Note that the path does not include the node itself that it is a path to.
|
||||
// That is to say, the path is not inclusive of its ending.
|
||||
|
||||
Self::from_sized_iter(path.into_iter())
|
||||
}
|
||||
|
||||
/// Converts this sparse representation back to a normal [`MerklePath`].
|
||||
pub fn into_path(mut self) -> MerklePath {
|
||||
let tree_depth = self.depth();
|
||||
let mut nodes: Vec<RpoDigest> = Default::default();
|
||||
let mut sparse_nodes = self.nodes.drain(..);
|
||||
|
||||
for depth in 0..tree_depth {
|
||||
let empty_bit = u64::checked_shl(1, depth.into()).unwrap();
|
||||
let is_empty = (self.empty_nodes & empty_bit) != 0;
|
||||
if is_empty {
|
||||
let &equivalent_empty_node = EmptySubtreeRoots::entry(tree_depth, depth);
|
||||
nodes.push(equivalent_empty_node);
|
||||
} else {
|
||||
nodes.push(sparse_nodes.next().unwrap());
|
||||
}
|
||||
}
|
||||
|
||||
debug_assert_eq!(sparse_nodes.next(), None);
|
||||
drop(sparse_nodes);
|
||||
|
||||
debug_assert!(self.nodes.is_empty());
|
||||
|
||||
MerklePath::from(nodes)
|
||||
}
|
||||
|
||||
/// Returns the total depth of this path, i.e., the number of nodes this path represents.
|
||||
pub fn depth(&self) -> u8 {
|
||||
(self.nodes.len() + self.empty_nodes.count_ones() as usize) as u8
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use alloc::vec::Vec;
|
||||
|
||||
use super::SparseMerklePath;
|
||||
use crate::{
|
||||
Felt, ONE, Word,
|
||||
hash::rpo::RpoDigest,
|
||||
merkle::{SMT_DEPTH, Smt, smt::SparseMerkleTree},
|
||||
};
|
||||
|
||||
#[test]
|
||||
fn roundtrip() {
|
||||
let pair_count: u64 = 8192;
|
||||
let entries: Vec<(RpoDigest, Word)> = (0..pair_count)
|
||||
.map(|n| {
|
||||
let leaf_index = ((n as f64 / pair_count as f64) * 255.0) as u64;
|
||||
let key = RpoDigest::new([ONE, ONE, Felt::new(n), Felt::new(leaf_index)]);
|
||||
let value = [ONE, ONE, ONE, ONE];
|
||||
(key, value)
|
||||
})
|
||||
.collect();
|
||||
let tree = Smt::with_entries(entries).unwrap();
|
||||
|
||||
for (key, _value) in tree.entries() {
|
||||
let control_path = tree.get_path(key);
|
||||
let sparse_path = SparseMerklePath::from_path(control_path.clone()).unwrap();
|
||||
assert_eq!(control_path.depth(), sparse_path.depth());
|
||||
assert_eq!(sparse_path.depth(), SMT_DEPTH);
|
||||
let test_path = sparse_path.into_path();
|
||||
|
||||
assert_eq!(control_path, test_path);
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue