feat: use AccountTree type wrapper (#783)

Author: PhilippGackstatter

CHANGELOG.md

@@ -8,6 +8,7 @@
   - Database is now created during bootstrap process instead of on first startup.
   - Data directory is no longer created but is instead expected to exist.
   - The genesis block can no longer be configured which also removes the `store dump-genesis` command.
+- [BREAKING] Use `AccountTree` and update account witness proto definitions (#783).
 
 ## Unreleased
 

Cargo.lock

@@ -309,21 +309,14 @@ impl TelemetryInjectorExt for ProposedBlock {
             u32::try_from(self.created_nullifiers().len())
                 .expect("should have less than u32::MAX created nullifiers"),
         );
-        let num_block_created_notes = self
-            .output_note_batches()
-            .iter()
-            .fold(0, |acc, output_notes| acc + output_notes.len());
+        let num_block_created_notes = self.batches().num_created_notes();
         span.set_attribute(
             "block.output_notes.count",
             u32::try_from(num_block_created_notes)
                 .expect("should have less than u32::MAX output notes"),
         );
 
-        let num_batch_created_notes = self
-            .batches()
-            .as_slice()
-            .iter()
-            .fold(0, |acc, batch| acc + batch.output_notes().len());
+        let num_batch_created_notes = self.batches().num_created_notes();
         span.set_attribute(
             "block.batches.output_notes.count",
             u32::try_from(num_batch_created_notes)

crates/block-producer/src/block_builder/mod.rs

@@ -1,11 +1,11 @@
 use miden_objects::{
-    ACCOUNT_TREE_DEPTH, Digest,
+    Digest,
     batch::ProvenBatch,
     block::{
-        BlockAccountUpdate, BlockHeader, BlockNoteIndex, BlockNoteTree, OutputNoteBatch,
-        ProvenBlock,
+        AccountTree, BlockAccountUpdate, BlockHeader, BlockNoteIndex, BlockNoteTree,
+        OutputNoteBatch, ProvenBlock,
     },
-    crypto::merkle::{Mmr, SimpleSmt},
+    crypto::merkle::Mmr,
     note::Nullifier,
     transaction::{OrderedTransactionHeaders, OutputNote},
 };
@@ -34,7 +34,9 @@ pub async fn build_expected_block_header(
     let new_account_root = {
         let mut store_accounts = store.accounts.read().await.clone();
         for (&account_id, update) in updated_accounts {
-            store_accounts.insert(account_id.into(), update.final_state_commitment().into());
+            store_accounts
+                .insert(account_id, update.final_state_commitment())
+                .expect("account IDs should be unique");
         }
 
         store_accounts.root()
@@ -71,7 +73,7 @@ pub async fn build_expected_block_header(
 
 #[derive(Debug)]
 pub struct MockBlockBuilder {
-    store_accounts: SimpleSmt<ACCOUNT_TREE_DEPTH>,
+    store_accounts: AccountTree,
     store_chain_mmr: Mmr,
     last_block_header: BlockHeader,
 
@@ -105,7 +107,8 @@ impl MockBlockBuilder {
     pub fn account_updates(mut self, updated_accounts: Vec<BlockAccountUpdate>) -> Self {
         for update in &updated_accounts {
             self.store_accounts
-                .insert(update.account_id().into(), update.final_state_commitment().into());
+                .insert(update.account_id(), update.final_state_commitment())
+                .expect("account IDs should be unique");
         }
 
         self.updated_accounts = Some(updated_accounts);