feat: writing account details on block applying

Cargo.toml

@@ -25,6 +25,7 @@ exclude = [".github/"]
 [workspace.dependencies]
 miden-air = { version = "0.8", default-features = false }
 miden-lib = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
+miden-mock = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
 miden-objects = { git = "https://github.com/0xPolygonMiden/miden-base.git", branch = "next" }
 miden-processor = { version = "0.8" }
 miden-stdlib = { version = "0.8", default-features = false }

block-producer/src/batch_builder/batch.rs

@@ -7,6 +7,7 @@ use miden_objects::{
         merkle::SimpleSmt,
     },
     notes::{NoteEnvelope, Nullifier},
+    transaction::AccountDetails,
     Digest, BATCH_OUTPUT_NOTES_TREE_DEPTH, MAX_NOTES_PER_BATCH,
 };
 use tracing::instrument;
@@ -55,6 +56,7 @@ impl TransactionBatch {
                     AccountStates {
                         initial_state: tx.initial_account_hash(),
                         final_state: tx.final_account_hash(),
+                        details: tx.account_details().cloned(),
                     },
                 )
             })
@@ -108,12 +110,14 @@ impl TransactionBatch {
             .map(|(account_id, account_states)| (*account_id, account_states.initial_state))
     }
 
-    /// Returns an iterator over (account_id, new_state_hash) tuples for accounts that were
+    /// Returns an iterator over (account_id, details, new_state_hash) tuples for accounts that were
     /// modified in this transaction batch.
-    pub fn updated_accounts(&self) -> impl Iterator<Item = (AccountId, Digest)> + '_ {
-        self.updated_accounts
-            .iter()
-            .map(|(account_id, account_states)| (*account_id, account_states.final_state))
+    pub fn updated_accounts(
+        &self
+    ) -> impl Iterator<Item = (AccountId, Option<AccountDetails>, Digest)> + '_ {
+        self.updated_accounts.iter().map(|(account_id, account_states)| {
+            (*account_id, account_states.details.clone(), account_states.final_state)
+        })
     }
 
     /// Returns an iterator over produced nullifiers for all consumed notes.
@@ -147,8 +151,9 @@ impl TransactionBatch {
 /// account.
 ///
 /// TODO: should this be moved into domain objects?
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 struct AccountStates {
     initial_state: Digest,
     final_state: Digest,
+    details: Option<AccountDetails>,
 }

block-producer/src/block.rs

@@ -9,6 +9,7 @@ use miden_objects::{
     accounts::AccountId,
     crypto::merkle::{MerklePath, MmrPeaks, SmtProof},
     notes::{NoteEnvelope, Nullifier},
+    transaction::AccountDetails,
     BlockHeader, Digest,
 };
 
@@ -17,11 +18,10 @@ use crate::store::BlockInputsError;
 #[derive(Debug, Clone)]
 pub struct Block {
     pub header: BlockHeader,
-    pub updated_accounts: Vec<(AccountId, Digest)>,
+    pub updated_accounts: Vec<(AccountId, Option<AccountDetails>, Digest)>,
     pub created_notes: BTreeMap<u64, NoteEnvelope>,
     pub produced_nullifiers: Vec<Nullifier>,
     // TODO:
-    // - full states for updated public accounts
     // - full states for created public notes
     // - zk proof
 }

block-producer/src/block_builder/mod.rs

@@ -2,7 +2,9 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use miden_node_utils::formatting::{format_array, format_blake3_digest};
-use miden_objects::{accounts::AccountId, notes::Nullifier, Digest, MAX_NOTES_PER_BATCH};
+use miden_objects::{
+    accounts::AccountId, notes::Nullifier, transaction::AccountDetails, Digest, MAX_NOTES_PER_BATCH,
+};
 use tracing::{debug, info, instrument};
 
 use crate::{
@@ -77,7 +79,7 @@ where
             batches = %format_array(batches.iter().map(|batch| format_blake3_digest(batch.id()))),
         );
 
-        let updated_accounts: Vec<(AccountId, Digest)> =
+        let updated_accounts: Vec<(AccountId, Option<AccountDetails>, Digest)> =
             batches.iter().flat_map(TransactionBatch::updated_accounts).collect();
         let created_notes = batches
             .iter()
@@ -95,7 +97,7 @@ where
         let block_inputs = self
             .store
             .get_block_inputs(
-                updated_accounts.iter().map(|(account_id, _)| account_id),
+                updated_accounts.iter().map(|(account_id, _, _)| account_id),
                 produced_nullifiers.iter(),
             )
             .await?;

block-producer/src/block_builder/prover/block_witness.rs

@@ -37,7 +37,7 @@ impl BlockWitness {
 
         let updated_accounts = {
             let mut account_initial_states: BTreeMap<AccountId, Digest> =
-                batches.iter().flat_map(|batch| batch.account_initial_states()).collect();
+                batches.iter().flat_map(TransactionBatch::account_initial_states).collect();
 
             let mut account_merkle_proofs: BTreeMap<AccountId, MerklePath> = block_inputs
                 .accounts
@@ -47,8 +47,8 @@ impl BlockWitness {
 
             batches
                 .iter()
-                .flat_map(|batch| batch.updated_accounts())
-                .map(|(account_id, final_state_hash)| {
+                .flat_map(TransactionBatch::updated_accounts)
+                .map(|(account_id, _details, final_state_hash)| {
                     let initial_state_hash = account_initial_states
                         .remove(&account_id)
                         .expect("already validated that key exists");

block-producer/src/block_builder/prover/tests.rs

@@ -235,7 +235,7 @@ async fn test_compute_account_root_success() {
             account_ids
                 .iter()
                 .zip(account_final_states.iter())
-                .map(|(&account_id, &account_hash)| (account_id, account_hash.into()))
+                .map(|(&account_id, &account_hash)| (account_id, None, account_hash.into()))
                 .collect(),
         )
         .build();