feat: update public account retrieval

CHANGELOG.md

@@ -26,6 +26,7 @@
 * Fixed MMR reconstruction code and fixed how block authentication paths are adjusted ([#1633](https://github.com/0xMiden/miden-client/pull/1633)).
 * Added WebClient bindings and RPC helpers for additional account, note, and validation workflows ([#1638](https://github.com/0xMiden/miden-client/pull/1638)).
 * [BREAKING] Modified JS binding for `AccountComponent::compile` which now takes an `AccountComponentCode` built with the newly added binding `CodeBuilder::compile_account_component_code` ([#1627](https://github.com/0xMiden/miden-client/pull/1627)).
+* Expanded the `GrpcClient` API with methods to fetch account proofs and rebuild the slots for an account ([#1591](https://github.com/0xMiden/miden-client/pull/1591)).
 * [BREAKING] `WebClient.addAccountSecretKeyToWebStore` now takes an additional parameter: an account ID. This will link the ID with the secret key in the WebStore. Added `WebClient.getPublicKeyCommitmentsOfAccount` method that will return a list of related public key commitments for the given account ID ([#1608](https://github.com/0xMiden/miden-client/pull/1608)).
 * [BREAKING] Added naming to `IndexedDB` store to allow multiple WebClient instances to run in the same browser; `WebClient.createClient` now takes an optional DB name (otherwise defaults to name based on the endpoint/network) ([#1645](https://github.com/0xMiden/miden-client/pull/1645)).
 * [BREAKING] Simplified the `NoteScreener` API, removing `NoteRelevance` in favor of `NoteConsumptionStatus`; exposed JS bindings for consumption check results ([#1630](https://github.com/0xMiden/miden-client/pull/1630)).

crates/rust-client/src/rpc/domain/account.rs

@@ -94,12 +94,12 @@ pub struct AccountUpdateSummary {
     /// Commitment of the account, that represents a commitment to its updated state.
     pub commitment: Word,
     /// Block number of last account update.
-    pub last_block_num: u32,
+    pub last_block_num: BlockNumber,
 }
 
 impl AccountUpdateSummary {
     /// Creates a new [`AccountUpdateSummary`].
-    pub fn new(commitment: Word, last_block_num: u32) -> Self {
+    pub fn new(commitment: Word, last_block_num: BlockNumber) -> Self {
         Self { commitment, last_block_num }
     }
 }
@@ -327,6 +327,15 @@ pub struct AccountStorageDetails {
     pub map_details: Vec<AccountStorageMapDetails>,
 }
 
+impl AccountStorageDetails {
+    /// Find the matching details for a map, given its storage slot name.
+    //  This linear search should be good enough since there can be
+    //  only up to 256 slots, so locality probably wins here.
+    pub fn find_map_details(&self, target: &StorageSlotName) -> Option<&AccountStorageMapDetails> {
+        self.map_details.iter().find(|map_detail| map_detail.slot_name == *target)
+    }
+}
+
 impl TryFrom<proto::rpc::AccountStorageDetails> for AccountStorageDetails {
     type Error = RpcError;
 
@@ -544,6 +553,27 @@ impl AccountProof {
     }
 }
 
+#[cfg(feature = "tonic")]
+impl TryFrom<proto::rpc::AccountProofResponse> for AccountProof {
+    type Error = RpcError;
+    fn try_from(account_proof: proto::rpc::AccountProofResponse) -> Result<Self, Self::Error> {
+        let Some(witness) = account_proof.witness else {
+            return Err(RpcError::ExpectedDataMissing(
+                "GetAccountProof returned an account without witness".to_owned(),
+            ));
+        };
+
+        let details: Option<AccountDetails> = {
+            match account_proof.details {
+                None => None,
+                Some(details) => Some(details.into_domain(&BTreeMap::new())?),
+            }
+        };
+        AccountProof::new(witness.try_into()?, details)
+            .map_err(|err| RpcError::InvalidResponse(format!("{err}")))
+    }
+}
+
 // ACCOUNT WITNESS
 // ================================================================================================
 

crates/rust-client/src/rpc/generated/nostd/rpc_store.rs

@@ -14,7 +14,7 @@ pub struct StoreStatus {
 }
 /// Returns the latest state proof of the specified account.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProofRequest {
+pub struct AccountRequest {
     /// ID of the account for which we want to get data
     #[prost(message, optional, tag = "1")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
@@ -25,10 +25,10 @@ pub struct AccountProofRequest {
     pub block_num: ::core::option::Option<super::blockchain::BlockNumber>,
     /// Request for additional account details; valid only for public accounts.
     #[prost(message, optional, tag = "3")]
-    pub details: ::core::option::Option<account_proof_request::AccountDetailRequest>,
+    pub details: ::core::option::Option<account_request::AccountDetailRequest>,
 }
-/// Nested message and enum types in `AccountProofRequest`.
-pub mod account_proof_request {
+/// Nested message and enum types in `AccountRequest`.
+pub mod account_request {
     /// Request the details for a public account.
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct AccountDetailRequest {
@@ -90,7 +90,7 @@ pub mod account_proof_request {
 }
 /// Represents the result of getting account proof.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProofResponse {
+pub struct AccountResponse {
     /// The block number at which the account witness was created and the account details were observed.
     #[prost(message, optional, tag = "1")]
     pub block_num: ::core::option::Option<super::blockchain::BlockNumber>,
@@ -99,10 +99,10 @@ pub struct AccountProofResponse {
     pub witness: ::core::option::Option<super::account::AccountWitness>,
     /// Additional details for public accounts.
     #[prost(message, optional, tag = "3")]
-    pub details: ::core::option::Option<account_proof_response::AccountDetails>,
+    pub details: ::core::option::Option<account_response::AccountDetails>,
 }
-/// Nested message and enum types in `AccountProofResponse`.
-pub mod account_proof_response {
+/// Nested message and enum types in `AccountResponse`.
+pub mod account_response {
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct AccountDetails {
         /// Account header.
@@ -120,7 +120,7 @@ pub mod account_proof_response {
         pub vault_details: ::core::option::Option<super::AccountVaultDetails>,
     }
 }
-/// Account vault details for AccountProofResponse
+/// Account vault details for AccountResponse
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountVaultDetails {
     /// A flag that is set to true if the account contains too many assets. This indicates
@@ -133,7 +133,7 @@ pub struct AccountVaultDetails {
     #[prost(message, repeated, tag = "2")]
     pub assets: ::prost::alloc::vec::Vec<super::primitives::Asset>,
 }
-/// Account storage details for AccountProofResponse
+/// Account storage details for AccountResponse
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountStorageDetails {
     /// Account storage header (storage slot info for up to 256 slots)
@@ -587,37 +587,12 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "CheckNullifiers"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns the latest state of an account with the specified ID.
-        pub async fn get_account_details(
-            &mut self,
-            request: impl tonic::IntoRequest<super::super::account::AccountId>,
-        ) -> core::result::Result<
-            tonic::Response<super::super::account::AccountDetails>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic_prost::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/rpc_store.Rpc/GetAccountDetails",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountDetails"));
-            self.inner.unary(req, path, codec).await
-        }
         /// Returns the latest state proof of the specified account.
-        pub async fn get_account_proof(
+        pub async fn get_account(
             &mut self,
-            request: impl tonic::IntoRequest<super::AccountProofRequest>,
+            request: impl tonic::IntoRequest<super::AccountRequest>,
         ) -> core::result::Result<
-            tonic::Response<super::AccountProofResponse>,
+            tonic::Response<super::AccountResponse>,
             tonic::Status,
         > {
             self.inner
@@ -629,12 +604,9 @@ pub mod rpc_client {
                     )
                 })?;
             let codec = tonic_prost::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/rpc_store.Rpc/GetAccountProof",
-            );
+            let path = http::uri::PathAndQuery::from_static("/rpc_store.Rpc/GetAccount");
             let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountProof"));
+            req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "GetAccount"));
             self.inner.unary(req, path, codec).await
         }
         /// Returns raw block data for the specified block number.

crates/rust-client/src/rpc/generated/std/rpc_store.rs

@@ -14,7 +14,7 @@ pub struct StoreStatus {
 }
 /// Returns the latest state proof of the specified account.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProofRequest {
+pub struct AccountRequest {
     /// ID of the account for which we want to get data
     #[prost(message, optional, tag = "1")]
     pub account_id: ::core::option::Option<super::account::AccountId>,
@@ -25,10 +25,10 @@ pub struct AccountProofRequest {
     pub block_num: ::core::option::Option<super::blockchain::BlockNumber>,
     /// Request for additional account details; valid only for public accounts.
     #[prost(message, optional, tag = "3")]
-    pub details: ::core::option::Option<account_proof_request::AccountDetailRequest>,
+    pub details: ::core::option::Option<account_request::AccountDetailRequest>,
 }
-/// Nested message and enum types in `AccountProofRequest`.
-pub mod account_proof_request {
+/// Nested message and enum types in `AccountRequest`.
+pub mod account_request {
     /// Request the details for a public account.
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct AccountDetailRequest {
@@ -90,7 +90,7 @@ pub mod account_proof_request {
 }
 /// Represents the result of getting account proof.
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AccountProofResponse {
+pub struct AccountResponse {
     /// The block number at which the account witness was created and the account details were observed.
     #[prost(message, optional, tag = "1")]
     pub block_num: ::core::option::Option<super::blockchain::BlockNumber>,
@@ -99,10 +99,10 @@ pub struct AccountProofResponse {
     pub witness: ::core::option::Option<super::account::AccountWitness>,
     /// Additional details for public accounts.
     #[prost(message, optional, tag = "3")]
-    pub details: ::core::option::Option<account_proof_response::AccountDetails>,
+    pub details: ::core::option::Option<account_response::AccountDetails>,
 }
-/// Nested message and enum types in `AccountProofResponse`.
-pub mod account_proof_response {
+/// Nested message and enum types in `AccountResponse`.
+pub mod account_response {
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct AccountDetails {
         /// Account header.
@@ -120,7 +120,7 @@ pub mod account_proof_response {
         pub vault_details: ::core::option::Option<super::AccountVaultDetails>,
     }
 }
-/// Account vault details for AccountProofResponse
+/// Account vault details for AccountResponse
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountVaultDetails {
     /// A flag that is set to true if the account contains too many assets. This indicates
@@ -133,7 +133,7 @@ pub struct AccountVaultDetails {
     #[prost(message, repeated, tag = "2")]
     pub assets: ::prost::alloc::vec::Vec<super::primitives::Asset>,
 }
-/// Account storage details for AccountProofResponse
+/// Account storage details for AccountResponse
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AccountStorageDetails {
     /// Account storage header (storage slot info for up to 256 slots)
@@ -598,37 +598,12 @@ pub mod rpc_client {
                 .insert(GrpcMethod::new("rpc_store.Rpc", "CheckNullifiers"));
             self.inner.unary(req, path, codec).await
         }
-        /// Returns the latest state of an account with the specified ID.
-        pub async fn get_account_details(
-            &mut self,
-            request: impl tonic::IntoRequest<super::super::account::AccountId>,
-        ) -> std::result::Result<
-            tonic::Response<super::super::account::AccountDetails>,
-            tonic::Status,
-        > {
-            self.inner
-                .ready()
-                .await
-                .map_err(|e| {
-                    tonic::Status::unknown(
-                        format!("Service was not ready: {}", e.into()),
-                    )
-                })?;
-            let codec = tonic_prost::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/rpc_store.Rpc/GetAccountDetails",
-            );
-            let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountDetails"));
-            self.inner.unary(req, path, codec).await
-        }
         /// Returns the latest state proof of the specified account.
-        pub async fn get_account_proof(
+        pub async fn get_account(
             &mut self,
-            request: impl tonic::IntoRequest<super::AccountProofRequest>,
+            request: impl tonic::IntoRequest<super::AccountRequest>,
         ) -> std::result::Result<
-            tonic::Response<super::AccountProofResponse>,
+            tonic::Response<super::AccountResponse>,
             tonic::Status,
         > {
             self.inner
@@ -640,12 +615,9 @@ pub mod rpc_client {
                     )
                 })?;
             let codec = tonic_prost::ProstCodec::default();
-            let path = http::uri::PathAndQuery::from_static(
-                "/rpc_store.Rpc/GetAccountProof",
-            );
+            let path = http::uri::PathAndQuery::from_static("/rpc_store.Rpc/GetAccount");
             let mut req = request.into_request();
-            req.extensions_mut()
-                .insert(GrpcMethod::new("rpc_store.Rpc", "GetAccountProof"));
+            req.extensions_mut().insert(GrpcMethod::new("rpc_store.Rpc", "GetAccount"));
             self.inner.unary(req, path, codec).await
         }
         /// Returns raw block data for the specified block number.

crates/rust-client/src/rpc/mod.rs

@@ -400,7 +400,7 @@ pub trait NodeRpcClient: Send + Sync {
 pub enum NodeRpcClientEndpoint {
     CheckNullifiers,
     SyncNullifiers,
-    GetAccountDetails,
+    GetAccount,
     GetAccountStateDelta,
     GetAccountProofs,
     GetBlockByNumber,
@@ -422,7 +422,7 @@ impl fmt::Display for NodeRpcClientEndpoint {
             NodeRpcClientEndpoint::SyncNullifiers => {
                 write!(f, "sync_nullifiers")
             },
-            NodeRpcClientEndpoint::GetAccountDetails => write!(f, "get_account_details"),
+            NodeRpcClientEndpoint::GetAccount => write!(f, "get_account_details"),
             NodeRpcClientEndpoint::GetAccountStateDelta => write!(f, "get_account_state_delta"),
             NodeRpcClientEndpoint::GetAccountProofs => write!(f, "get_account_proofs"),
             NodeRpcClientEndpoint::GetBlockByNumber => write!(f, "get_block_by_number"),