Merge branch 'bernhard-db-schema-queries' into bernhard-integrate-smtforest

Author: drahnr

CHANGELOG.md

@@ -35,6 +35,7 @@
 - Increased retained account tree history from 33 to 100 blocks to account for the reduced block interval ([#1438](https://github.com/0xMiden/miden-node/pull/1438)).
 - Increased the maximum query limit for the store ([#1443](https://github.com/0xMiden/miden-node/pull/1443)).
 - [BREAKING] Migrated to version `v0.20` of the VM ([#1476](https://github.com/0xMiden/miden-node/pull/1476)).
+- [BREAKING] Change account in database representation ([#1481](https://github.com/0xMiden/miden-node/pull/1481)).
 
 ### Fixes
 

crates/proto/src/domain/account.rs

@@ -17,7 +17,7 @@ use miden_protocol::block::account_tree::AccountWitness;
 use miden_protocol::crypto::merkle::SparseMerklePath;
 use miden_protocol::note::{NoteExecutionMode, NoteTag};
 use miden_protocol::utils::{Deserializable, DeserializationError, Serializable};
-use miden_protocol::{AssetError, Word};
+use miden_protocol::Word;
 use thiserror::Error;
 
 use super::try_convert;
@@ -72,7 +72,6 @@ impl From<AccountId> for proto::account::AccountId {
 // ACCOUNT UPDATE
 // ================================================================================================
 
-// TODO should be called `AccountStateRef` or so
 #[derive(Debug, PartialEq)]
 pub struct AccountSummary {
     pub account_id: AccountId,
@@ -389,24 +388,6 @@ impl AccountVaultDetails {
             Self::Assets(assets)
         }
     }
-
-    /// Creates `AccountVaultDetails` from vault entries (key-value pairs).
-    ///
-    /// This is useful when entries have been fetched directly from the database
-    /// rather than extracted from an `AssetVault`.
-    ///
-    /// The entries are `(vault_key, asset)` pairs where `asset` is a Word representation.
-    pub fn from_entries(entries: Vec<(Word, Word)>) -> Result<Self, AssetError> {
-        if entries.len() > Self::MAX_RETURN_ENTRIES {
-            return Ok(Self::LimitExceeded);
-        }
-
-        let assets = Result::<Vec<_>, _>::from_iter(
-            entries.into_iter().map(|(_key, asset_word)| Asset::try_from(asset_word)),
-        )?;
-
-        Ok(Self::Assets(assets))
-    }
 }
 
 impl TryFrom<proto::rpc::AccountVaultDetails> for AccountVaultDetails {

crates/store/src/db/models/queries/accounts.rs

@@ -56,6 +56,9 @@ pub(crate) use at_block::{
     select_account_vault_at_block,
 };
 
+#[cfg(test)]
+mod tests;
+
 type StorageMapValueRow = (i64, String, Vec<u8>, Vec<u8>);
 
 // ACCOUNT RETRIEVAL
@@ -447,14 +450,17 @@ pub(crate) fn select_all_accounts(
         .order_by(schema::accounts::block_num.asc())
         .load::<AccountSummaryRaw>(conn)?;
 
-    let summaries: Vec<AccountSummary> = vec_raw_try_into(raw).unwrap();
+    let summaries: Vec<AccountSummary> = vec_raw_try_into(raw)?;
 
     // Backfill account details from database
-    let account_infos = Vec::from_iter(summaries.into_iter().map(|summary| {
-        let account_id = summary.account_id;
-        let details = select_full_account(conn, account_id).ok();
-        AccountInfo { summary, details }
-    }));
+    let account_infos = summaries
+        .into_iter()
+        .map(|summary| {
+            let account_id = summary.account_id;
+            let details = select_full_account(conn, account_id).ok();
+            AccountInfo { summary, details }
+        })
+        .collect();
 
     Ok(account_infos)
 }

crates/store/src/db/models/queries/accounts/at_block.rs

@@ -279,12 +279,11 @@ pub(crate) fn select_account_storage_at_block(
             DatabaseError::DataCorrupted(format!("Invalid slot name: {slot_name_str}"))
         })?;
         let key = Word::read_from_bytes(&key_bytes)?;
+        let value = Word::read_from_bytes(&value_bytes)?;
 
         // Only insert if we haven't seen this (slot_name, key) yet
         // (since results are ordered by block_num desc, first one is latest)
-        latest_map_entries
-            .entry((slot_name, key))
-            .or_insert_with(|| Word::read_from_bytes(&value_bytes).unwrap_or_default());
+        latest_map_entries.entry((slot_name, key)).or_insert(value);
     }
 
     // Group entries by slot name