Fix build after SimpleSmt change in miden-crypto

core/Cargo.toml

@@ -23,7 +23,7 @@ std = ["miden-crypto/std", "math/std", "winter-utils/std"]
 [dependencies]
 math = { package = "winter-math", version = "0.7", default-features = false }
 # miden-crypto = { package = "miden-crypto", version = "0.8", default-features = false }
-miden-crypto = { package = "miden-crypto", git = "https://github.com/0xPolygonMiden/crypto", branch= "next", default-features = false }
+miden-crypto = { package = "miden-crypto", git = "https://github.com/0xPolygonMiden/crypto", branch= "plafer-smt-trait", default-features = false }
 winter-utils = { package = "winter-utils", version = "0.7", default-features = false }
 
 [dev-dependencies]

core/src/lib.rs

@@ -1,7 +1,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(not(feature = "std"))]
 #[macro_use]
 extern crate alloc;
 
 pub mod chiplets;
@@ -11,8 +11,8 @@
 pub mod crypto {
     pub mod merkle {
         pub use miden_crypto::merkle::{
-            DefaultMerkleStore, EmptySubtreeRoots, InnerNodeInfo, MerkleError, MerklePath,
-            MerkleStore, MerkleTree, Mmr, MmrPeaks, NodeIndex, PartialMerkleTree,
+            DefaultMerkleStore, EmptySubtreeRoots, InnerNodeInfo, LeafIndex, MerkleError,
+            MerklePath, MerkleStore, MerkleTree, Mmr, MmrPeaks, NodeIndex, PartialMerkleTree,
             RecordingMerkleStore, SimpleSmt, StoreNode, TieredSmt,
         };
     }

miden/src/cli/data.rs

@@ -14,8 +14,12 @@
     path::{Path, PathBuf},
 };
 use stdlib::StdLibrary;
 pub use tracing::{event, info_span, instrument, trace_span, Level};
 
+// CONSTANTS
+// ================================================================================================
+const SIMPLE_SMT_DEPTH: u8 = u64::BITS as u8;
+
 // HELPERS
 // ================================================================================================
 
@@ -206,7 +210,7 @@
                 }
                 MerkleData::SparseMerkleTree(data) => {
                     let entries = Self::parse_sparse_merkle_tree(data)?;
-                    let tree = SimpleSmt::with_leaves(u64::BITS as u8, entries)
+                    let tree = SimpleSmt::<SIMPLE_SMT_DEPTH>::with_leaves(entries)
                         .map_err(|e| format!("failed to parse a Sparse Merkle Tree: {e}"))?;
                     merkle_store.extend(tree.inner_nodes());
                     event!(

stdlib/tests/collections/mod.rs

@@ -1,5 +1,5 @@
 use test_utils::{
-    crypto::{MerkleStore, SimpleSmt},
+    crypto::{LeafIndex, MerkleStore, SimpleSmt},
     Felt, StarkField, TestError, Word, EMPTY_WORD, ONE, ZERO,
 };
 

stdlib/tests/collections/smt64.rs

@@ -1,9 +1,13 @@
-use super::{Felt, MerkleStore, SimpleSmt, StarkField, TestError, Word, EMPTY_WORD, ONE, ZERO};
+use super::{
+    Felt, LeafIndex, MerkleStore, SimpleSmt, StarkField, TestError, Word, EMPTY_WORD, ONE, ZERO,
+};
 use crate::build_test;
 
 // TEST DATA
 // ================================================================================================
 
+const DEPTH: u8 = 64;
+
 const LEAVES: [(u64, Word); 5] = [
     (
         0b00000000_00000000_11111111_11111111_11111111_11111111_11111111_11111111_u64,
@@ -36,7 +40,7 @@ const LEAVES: [(u64, Word); 5] = [
 
 #[test]
 fn get() {
-    let smt = SimpleSmt::with_leaves(64, LEAVES).unwrap();
+    let smt = SimpleSmt::<DEPTH>::with_leaves(LEAVES).unwrap();
 
     let source = "
     use.std::collections::smt64
@@ -58,7 +62,7 @@ fn get() {
 
 #[test]
 fn insert() {
-    let mut smt = SimpleSmt::new(64).unwrap();
+    let mut smt = SimpleSmt::<DEPTH>::new().unwrap();
 
     let source = "
     use.std::collections::smt64
@@ -88,7 +92,7 @@ fn insert() {
 
 #[test]
 fn set() {
-    let mut smt = SimpleSmt::new(64).unwrap();
+    let mut smt = SimpleSmt::<DEPTH>::new().unwrap();
     let empty_tree_root = smt.root();
 
     let source = "
@@ -133,17 +137,19 @@ fn set() {
 fn prepare_insert_or_set(
     index: u64,
     value: Word,
-    smt: &mut SimpleSmt,
+    smt: &mut SimpleSmt<DEPTH>,
 ) -> (Vec<u64>, Vec<u64>, MerkleStore) {
+    let index = LeafIndex::new_max_depth(index);
+
     // set initial state of the stack to be [VALUE, key, ROOT, ...]
     let mut initial_stack = Vec::new();
     append_word_to_vec(&mut initial_stack, smt.root().into());
-    initial_stack.push(index);
+    initial_stack.push(index.value());
     append_word_to_vec(&mut initial_stack, value);
 
     // build a Merkle store for the test before the tree is updated, and then update the tree
     let store: MerkleStore = (&*smt).into();
-    let old_value = smt.update_leaf(index, value).unwrap();
+    let old_value = smt.insert(index, value);
 
     // after insert or set, the stack should be [OLD_VALUE, ROOT, ...]
     let expected_output = build_expected_stack(old_value, smt.root().into());

test-utils/src/crypto.rs

@@ -7,8 +7,8 @@ pub use vm_core::crypto::{
     dsa::*,
     hash::{Rpo256, RpoDigest},
     merkle::{
-        EmptySubtreeRoots, MerkleError, MerklePath, MerkleStore, MerkleTree, Mmr, MmrPeaks,
-        NodeIndex, PartialMerkleTree, SimpleSmt, TieredSmt,
+        EmptySubtreeRoots, LeafIndex, MerkleError, MerklePath, MerkleStore, MerkleTree, Mmr,
+        MmrPeaks, NodeIndex, PartialMerkleTree, SimpleSmt, TieredSmt,
     },
 };