y

Author: drahnr

crates/proto/src/domain/account.rs

@@ -3,7 +3,12 @@ use std::fmt::{Debug, Display, Formatter};
 use miden_node_utils::formatting::format_opt;
 use miden_objects::Word;
 use miden_objects::account::{
-    Account, AccountHeader, AccountId, AccountStorageHeader, StorageMap, StorageSlotType,
+    Account,
+    AccountHeader,
+    AccountId,
+    AccountStorageHeader,
+    StorageMap,
+    StorageSlotType,
 };
 use miden_objects::asset::{Asset, AssetVault};
 use miden_objects::block::{AccountWitness, BlockNumber};
@@ -375,7 +380,7 @@ impl AccountVaultDetails {
     /// 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.
+    /// 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, miden_objects::AssetError> {
@@ -449,7 +454,7 @@ impl AccountStorageMapDetails {
     pub fn new(slot_index: u8, slot_data: SlotData, storage_map: &StorageMap) -> Self {
         match slot_data {
             SlotData::All => Self::from_all_entries(slot_index, storage_map),
-            SlotData::MapKeys(keys) => Self::from_all_entries(slot_index, storage_map), // TODO use from_specific_keys
+            SlotData::MapKeys(_keys) => Self::from_all_entries(slot_index, storage_map), /* TODO use from_specific_keys */
         }
     }
 
@@ -468,17 +473,17 @@ impl AccountStorageMapDetails {
 
     // TODO this is
     #[allow(dead_code)]
-    fn from_specific_keys(slot_index: u8, keys: &[Word], storage_map: &StorageMap) -> Self {
+    fn from_specific_keys(slot_index: u8, keys: &[Word], _storage_map: &StorageMap) -> Self {
         if keys.len() > Self::MAX_RETURN_ENTRIES {
             Self::too_many_entries(slot_index)
         } else {
             todo!("construct a partial SMT / set of key values")
         }
     }
 
-    /// Creates an AccountStorageMapDetails from already-queried entries (e.g., from database).
+    /// Creates an `AccountStorageMapDetails` from already-queried entries (e.g., from database).
     /// This is useful when entries have been fetched directly rather than extracted from a
-    /// StorageMap.
+    /// `StorageMap`.
     pub fn from_entries(slot_index: u8, map_entries: Vec<(Word, Word)>) -> Self {
         let too_many_entries = map_entries.len() > Self::MAX_RETURN_ENTRIES;
         let map_entries = if too_many_entries { Vec::new() } else { map_entries };

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

@@ -19,8 +19,6 @@ use miden_lib::utils::{Deserializable, Serializable};
 use miden_node_proto as proto;
 use miden_node_proto::domain::account::{AccountInfo, AccountSummary};
 use miden_node_utils::limiter::{QueryParamAccountIdLimit, QueryParamLimiter};
-use miden_objects::Word;
-use miden_objects::{Felt, FieldElement};
 use miden_objects::account::delta::AccountUpdateDetails;
 use miden_objects::account::{
     Account,
@@ -35,6 +33,7 @@ use miden_objects::account::{
 };
 use miden_objects::asset::{Asset, AssetVault, AssetVaultKey, FungibleAsset};
 use miden_objects::block::{BlockAccountUpdate, BlockNumber};
+use miden_objects::{Felt, FieldElement, Word};
 
 use crate::constants::MAX_PAYLOAD_BYTES;
 use crate::db::models::conv::{
@@ -1398,13 +1397,9 @@ pub(crate) fn select_account_vault_at_block(
 /// The storage commitment as a `Word`
 fn compute_storage_commitment(slot_commitments: &[Word]) -> Word {
     use miden_objects::crypto::hash::rpo::Rpo256;
-    
-    let elements: Vec<Felt> = slot_commitments
-        .iter()
-        .flat_map(|w| w.iter())
-        .copied()
-        .collect();
-    
+
+    let elements: Vec<Felt> = slot_commitments.iter().flat_map(|w| w.iter()).copied().collect();
+
     Rpo256::hash_elements(&elements).into()
 }
 
@@ -1517,9 +1512,7 @@ pub(crate) fn select_account_header_at_block(
 
     let slot_commitments: Vec<Word> = storage_slots
         .into_iter()
-        .map(|(_slot_index, _slot_type, commitment_bytes)| {
-            Word::read_from_bytes(&commitment_bytes)
-        })
+        .map(|(_slot_index, _slot_type, commitment_bytes)| Word::read_from_bytes(&commitment_bytes))
         .collect::<Result<Vec<_>, _>>()?;
 
     let storage_commitment = compute_storage_commitment(&slot_commitments);
@@ -1529,9 +1522,7 @@ pub(crate) fn select_account_header_at_block(
         .transpose()?
         .unwrap_or(Word::default());
 
-    let nonce = nonce_raw
-        .map(raw_sql_to_nonce)
-        .unwrap_or(Felt::ZERO);
+    let nonce = nonce_raw.map_or(Felt::ZERO, raw_sql_to_nonce);
 
     let vault_root = vault_root_bytes
         .map(|bytes| Word::read_from_bytes(&bytes))

crates/store/src/db/tests.rs

@@ -1912,10 +1912,10 @@ fn test_select_account_code_at_block() {
         [],
         None,
     );
-    
+
     // Use the actual account ID from the created account
     let account_id = account.id();
-    
+
     // Get the code bytes before inserting
     let expected_code = account.code().to_bytes();
 
@@ -1938,13 +1938,13 @@ fn test_select_account_code_at_block() {
     assert_eq!(code_at_1, expected_code);
 
     // Query code at non-existent block - should return None
-    let code_at_2 = queries::select_account_code_at_block(&mut conn, account_id, block_num_2)
-        .unwrap();
+    let code_at_2 =
+        queries::select_account_code_at_block(&mut conn, account_id, block_num_2).unwrap();
     assert!(code_at_2.is_none(), "Code should not exist at block 2");
 
     // Query code for non-existent account - should return None
     let other_account_id = AccountId::try_from(ACCOUNT_ID_PRIVATE_SENDER).unwrap();
-    let code_other = queries::select_account_code_at_block(&mut conn, other_account_id, block_num_1)
-        .unwrap();
+    let code_other =
+        queries::select_account_code_at_block(&mut conn, other_account_id, block_num_1).unwrap();
     assert!(code_other.is_none(), "Code should not exist for non-existent account");
 }

crates/store/src/state.rs

@@ -9,8 +9,15 @@ use std::path::Path;
 use std::sync::Arc;
 
 use miden_node_proto::domain::account::{
-    AccountDetailRequest, AccountDetails, AccountInfo, AccountProofRequest, AccountProofResponse,
-    AccountStorageDetails, AccountStorageMapDetails, AccountVaultDetails, NetworkAccountPrefix,
+    AccountDetailRequest,
+    AccountDetails,
+    AccountInfo,
+    AccountProofRequest,
+    AccountProofResponse,
+    AccountStorageDetails,
+    AccountStorageMapDetails,
+    AccountVaultDetails,
+    NetworkAccountPrefix,
     StorageMapRequest,
 };
 use miden_node_proto::domain::batch::BatchInputs;
@@ -20,12 +27,26 @@ use miden_objects::account::{AccountId, StorageSlot};
 use miden_objects::block::account_tree::{AccountTree, account_id_to_smt_key};
 use miden_objects::block::nullifier_tree::NullifierTree;
 use miden_objects::block::{
-    AccountWitness, BlockHeader, BlockInputs, BlockNumber, Blockchain, NullifierWitness,
+    AccountWitness,
+    BlockHeader,
+    BlockInputs,
+    BlockNumber,
+    Blockchain,
+    NullifierWitness,
     ProvenBlock,
 };
 use miden_objects::crypto::merkle::{
-    Forest, LargeSmt, MemoryStorage, Mmr, MmrDelta, MmrPeaks, MmrProof, PartialMmr, SmtForest,
-    SmtProof, SmtStorage,
+    Forest,
+    LargeSmt,
+    MemoryStorage,
+    Mmr,
+    MmrDelta,
+    MmrPeaks,
+    MmrProof,
+    PartialMmr,
+    SmtForest,
+    SmtProof,
+    SmtStorage,
 };
 use miden_objects::note::{NoteDetails, NoteId, NoteScript, Nullifier};
 use miden_objects::transaction::{OutputNote, PartialBlockchain};
@@ -38,11 +59,23 @@ use crate::blocks::BlockStore;
 use crate::db::models::Page;
 use crate::db::models::queries::StorageMapValuesPage;
 use crate::db::{
-    AccountVaultValue, Db, NoteRecord, NoteSyncUpdate, NullifierInfo, StateSyncUpdate,
+    AccountVaultValue,
+    Db,
+    NoteRecord,
+    NoteSyncUpdate,
+    NullifierInfo,
+    StateSyncUpdate,
 };
 use crate::errors::{
-    ApplyBlockError, DatabaseError, GetBatchInputsError, GetBlockHeaderError, GetBlockInputsError,
-    GetCurrentBlockchainDataError, InvalidBlockError, NoteSyncError, StateInitializationError,
+    ApplyBlockError,
+    DatabaseError,
+    GetBatchInputsError,
+    GetBlockHeaderError,
+    GetBlockInputsError,
+    GetCurrentBlockchainDataError,
+    InvalidBlockError,
+    NoteSyncError,
+    StateInitializationError,
     StateSyncError,
 };
 use crate::{AccountTreeWithHistory, COMPONENT, DataDirectory};