refactor: keep only domain object changes

Cargo.toml

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

block-producer/src/block.rs

@@ -9,7 +9,6 @@ use miden_objects::{
     accounts::AccountId,
     crypto::merkle::{MerklePath, MmrPeaks, SmtProof},
     notes::{NoteEnvelope, Nullifier},
-    transaction::AccountDetails,
     BlockHeader, Digest,
 };
 
@@ -18,10 +17,11 @@ use crate::store::BlockInputsError;
 #[derive(Debug, Clone)]
 pub struct Block {
     pub header: BlockHeader,
-    pub updated_accounts: Vec<(AccountId, Option<AccountDetails>, Digest)>,
+    pub updated_accounts: Vec<(AccountId, 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,9 +2,7 @@ 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, transaction::AccountDetails, Digest, MAX_NOTES_PER_BATCH,
-};
+use miden_objects::{accounts::AccountId, notes::Nullifier, Digest, MAX_NOTES_PER_BATCH};
 use tracing::{debug, info, instrument};
 
 use crate::{
@@ -79,7 +77,7 @@ where
             batches = %format_array(batches.iter().map(|batch| format_blake3_digest(batch.id()))),
         );
 
-        let updated_accounts: Vec<(AccountId, Option<AccountDetails>, Digest)> =
+        let updated_accounts: Vec<(AccountId, Digest)> =
             batches.iter().flat_map(TransactionBatch::updated_accounts).collect();
         let created_notes = batches
             .iter()
@@ -97,7 +95,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?;