wrap api result to struct

massa-api-exports/src/address.rs

@@ -180,7 +180,7 @@ impl std::fmt::Display for AddressFilter {
 
 /// Datastore keys entry query input structure
 #[derive(Clone, Debug, Deserialize)]
-pub struct GetAddressDatastoreKeys {
+pub struct GetAddressDatastoreKeysRequest {
     /// The address for which to get the datastore keys
     pub address: Address,
     /// The prefix to filter the keys
@@ -194,3 +194,14 @@ pub struct GetAddressDatastoreKeys {
     /// The count of keys to return
     pub count: Option<u32>,
 }
+
+/// Response object for datastore keys query
+#[derive(Clone, Debug, Serialize)]
+pub struct GetAddressDatastoreKeysResponse {
+    /// The address for which to get the datastore keys
+    pub address: Address,
+    /// final true means final
+    pub is_final: bool,
+    /// keys list
+    pub keys: Vec<Vec<u8>>,
+}

massa-api/src/lib.rs

@@ -11,12 +11,13 @@ use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::server::middleware::http::HostFilterLayer;
 use jsonrpsee::server::{BatchRequestConfig, PingConfig, ServerBuilder, ServerHandle};
 use jsonrpsee::RpcModule;
+use massa_api_exports::address::GetAddressDatastoreKeysResponse;
 use massa_api_exports::execution::{
     DeferredCallResponse, DeferredCallsQuoteRequest, DeferredCallsQuoteResponse,
     DeferredCallsSlotResponse, Transfer,
 };
 use massa_api_exports::{
-    address::{AddressFilter, AddressInfo, GetAddressDatastoreKeys},
+    address::{AddressFilter, AddressInfo, GetAddressDatastoreKeysRequest},
     block::{BlockInfo, BlockSummary},
     config::APIConfig,
     datastore::{DatastoreEntryInput, DatastoreEntryOutput},
@@ -430,8 +431,8 @@ pub trait MassaRpc {
     #[method(name = "get_address_datastore_keys")]
     async fn get_address_datastore_keys(
         &self,
-        arg: Vec<GetAddressDatastoreKeys>,
-    ) -> RpcResult<Vec<Vec<Vec<u8>>>>;
+        arg: Vec<GetAddressDatastoreKeysRequest>,
+    ) -> RpcResult<Vec<GetAddressDatastoreKeysResponse>>;
 }
 
 fn wrong_api<T>() -> RpcResult<T> {

massa-api/src/private.rs

@@ -5,7 +5,9 @@ use crate::{MassaRpcServer, Private, RpcServer, StopHandle, Value, API};
 use async_trait::async_trait;
 use jsonrpsee::core::{client::Error as JsonRpseeError, RpcResult};
 use massa_api_exports::{
-    address::{AddressFilter, AddressInfo, GetAddressDatastoreKeys},
+    address::{
+        AddressFilter, AddressInfo, GetAddressDatastoreKeysRequest, GetAddressDatastoreKeysResponse,
+    },
     block::{BlockInfo, BlockSummary},
     config::APIConfig,
     datastore::{DatastoreEntryInput, DatastoreEntryOutput},
@@ -381,8 +383,8 @@ impl MassaRpcServer for API<Private> {
 
     async fn get_address_datastore_keys(
         &self,
-        _arg: Vec<GetAddressDatastoreKeys>,
-    ) -> RpcResult<Vec<Vec<Vec<u8>>>> {
+        _arg: Vec<GetAddressDatastoreKeysRequest>,
+    ) -> RpcResult<Vec<GetAddressDatastoreKeysResponse>> {
         crate::wrong_api::<Vec<_>>()
     }
 }

massa-api/src/public.rs

@@ -6,7 +6,9 @@ use async_trait::async_trait;
 use itertools::{izip, Itertools};
 use jsonrpsee::core::{client::Error as JsonRpseeError, RpcResult};
 use massa_api_exports::{
-    address::{AddressFilter, AddressInfo, GetAddressDatastoreKeys},
+    address::{
+        AddressFilter, AddressInfo, GetAddressDatastoreKeysRequest, GetAddressDatastoreKeysResponse,
+    },
     block::{BlockInfo, BlockInfoContent, BlockSummary},
     config::APIConfig,
     datastore::{DatastoreEntryInput, DatastoreEntryOutput},
@@ -957,8 +959,8 @@ impl MassaRpcServer for API<Public> {
 
     async fn get_address_datastore_keys(
         &self,
-        arg: Vec<GetAddressDatastoreKeys>,
-    ) -> RpcResult<Vec<Vec<Vec<u8>>>> {
+        arg: Vec<GetAddressDatastoreKeysRequest>,
+    ) -> RpcResult<Vec<GetAddressDatastoreKeysResponse>> {
         let requests: Vec<ExecutionQueryRequestItem> = arg
             .into_iter()
             .map(|request| {
@@ -968,7 +970,9 @@ impl MassaRpcServer for API<Public> {
                 )
             })
             .collect();
-        let mut result: Vec<Vec<Vec<u8>>> = Vec::with_capacity(requests.len());
+        // let mut result: Vec<Vec<Vec<u8>>> = Vec::with_capacity(requests.len());
+        let mut result2: Vec<GetAddressDatastoreKeysResponse> = Vec::with_capacity(requests.len());
+
         let response = self
             .0
             .execution_controller
@@ -977,8 +981,13 @@ impl MassaRpcServer for API<Public> {
         for response_item in response.responses {
             match response_item {
                 Ok(item) => match item {
-                    ExecutionQueryResponseItem::KeyList(keys) => {
-                        result.push(keys.into_iter().collect());
+                    ExecutionQueryResponseItem::AddressDatastoreKeys(keys, address, is_final) => {
+                        result2.push(GetAddressDatastoreKeysResponse {
+                            address,
+                            is_final,
+                            keys: keys.into_iter().collect(),
+                        });
+                        // result.push(keys.into_iter().collect());
                     }
                     _ => {
                         return Err(
@@ -992,7 +1001,7 @@ impl MassaRpcServer for API<Public> {
             }
         }
 
-        Ok(result)
+        Ok(result2)
     }
 
     /// get addresses
@@ -1558,7 +1567,7 @@ fn check_input_operation(
 
 /// Convert GetAddressDatastoreKeys to ExecutionQueryRequestItem
 fn from_get_address_datastore_keys(
-    value: GetAddressDatastoreKeys,
+    value: GetAddressDatastoreKeysRequest,
     max_datastore_query_config: Option<u32>,
 ) -> ExecutionQueryRequestItem {
     // take the minimum of the limit and the max_datastore_query_config if it is set

massa-execution-exports/src/mapping_grpc.rs

@@ -283,7 +283,7 @@ fn to_execution_query_result(
         ExecutionQueryResponseItem::DatastoreValue(result) => {
             grpc_api::execution_query_response_item::ResponseItem::Bytes(result)
         }
-        ExecutionQueryResponseItem::KeyList(result) => {
+        ExecutionQueryResponseItem::AddressDatastoreKeys(result, _address, _is_final) => {
             grpc_api::execution_query_response_item::ResponseItem::VecBytes(
                 grpc_model::ArrayOfBytesWrapper {
                     items: result.into_iter().collect(),

massa-execution-exports/src/types.rs

@@ -69,7 +69,7 @@ pub enum ExecutionQueryRequestItem {
     AddressBytecodeCandidate(Address),
     /// gets the bytecode (final) of an address, returns ExecutionQueryResponseItem::Bytecode(bytecode) or an error if the address is not found
     AddressBytecodeFinal(Address),
-    /// gets the datastore keys (candidate) of an address, returns ExecutionQueryResponseItem::KeyList(keys) or an error if the address is not found
+    /// gets the datastore keys (candidate) of an address, returns ExecutionQueryResponseItem::AddressDatastoreKeys(keys, addr, is_final) or an error if the address is not found
     AddressDatastoreKeysCandidate {
         /// Address for which to query the datastore
         address: Address,
@@ -80,7 +80,7 @@ pub enum ExecutionQueryRequestItem {
         /// Maximum number of keys to return
         count: Option<u32>,
     },
-    /// gets the datastore keys (final) of an address, returns ExecutionQueryResponseItem::KeyList(keys) or an error if the address is not found
+    /// gets the datastore keys (final) of an address, returns ExecutionQueryResponseItem::AddressDatastoreKeys(keys, addr, is_final) or an error if the address is not found
     AddressDatastoreKeysFinal {
         /// Address for which to query the datastore
         address: Address,
@@ -163,8 +163,8 @@ pub enum ExecutionQueryResponseItem {
     Bytecode(Bytecode),
     /// datastore value
     DatastoreValue(Vec<u8>),
-    /// list of keys
-    KeyList(BTreeSet<Vec<u8>>),
+    /// list of keys (keys, address, is_final)
+    AddressDatastoreKeys(BTreeSet<Vec<u8>>, Address, bool),
     /// deferred call quote (target_slot, gas_request, available, price)
     DeferredCallQuote(Slot, u64, bool, Amount),
     /// deferred call info value

massa-execution-worker/src/controller.rs

@@ -206,7 +206,9 @@ impl ExecutionController for ExecutionControllerImpl {
                             &address, &prefix, start_key, count,
                         );
                     match speculative_v {
-                        Some(keys) => Ok(ExecutionQueryResponseItem::KeyList(keys)),
+                        Some(keys) => Ok(ExecutionQueryResponseItem::AddressDatastoreKeys(
+                            keys, address, false,
+                        )),
                         None => Err(ExecutionQueryError::NotFound(format!(
                             "Account {}",
                             address
@@ -222,7 +224,9 @@ impl ExecutionController for ExecutionControllerImpl {
                     let final_v = execution_lock
                         .get_final_datastore_keys(&address, &prefix, start_key, count);
                     match final_v {
-                        Some(keys) => Ok(ExecutionQueryResponseItem::KeyList(keys)),
+                        Some(keys) => Ok(ExecutionQueryResponseItem::AddressDatastoreKeys(
+                            keys, address, true,
+                        )),
                         None => Err(ExecutionQueryError::NotFound(format!(
                             "Account {}",
                             address