Leverage new dictionary request (#267)

* Leverage dictionary request in the node * Fix compilation errors * Update git ref * Fix lint
casper-network · Apr 4, 2024 · 3cf155e · 3cf155e
1 parent b24b905
commit 3cf155e
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 89 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/resources/test/rpc_schema.json b/resources/test/rpc_schema.json
@@ -6348,6 +6348,38 @@
             },
             "additionalProperties": false
           },
+          {
+            "description": "Lookup a dictionary item via an entities named keys.",
+            "type": "object",
+            "required": [
+              "EntityNamedKey"
+            ],
+            "properties": {
+              "EntityNamedKey": {
+                "type": "object",
+                "required": [
+                  "dictionary_item_key",
+                  "dictionary_name",
+                  "key"
+                ],
+                "properties": {
+                  "key": {
+                    "description": "The entity address formatted as a string.",
+                    "type": "string"
+                  },
+                  "dictionary_name": {
+                    "description": "The named key under which the dictionary seed URef is stored.",
+                    "type": "string"
+                  },
+                  "dictionary_item_key": {
+                    "description": "The dictionary item key formatted as a string.",
+                    "type": "string"
+                  }
+                }
+              }
+            },
+            "additionalProperties": false
+          },
           {
             "description": "Lookup a dictionary item via its seed URef.",
             "type": "object",

diff --git a/rpc_sidecar/src/node_client.rs b/rpc_sidecar/src/node_client.rs
@@ -4,9 +4,10 @@ use async_trait::async_trait;
 use casper_types::{
     binary_port::{
         BinaryRequest, BinaryRequestHeader, BinaryResponse, BinaryResponseAndRequest,
-        ConsensusValidatorChanges, ErrorCode as BinaryPortError, GetRequest, GetTrieFullResult,
-        GlobalStateQueryResult, GlobalStateRequest, InformationRequest, NodeStatus, PayloadEntity,
-        RecordId, SpeculativeExecutionResult, TransactionWithExecutionInfo,
+        ConsensusValidatorChanges, DictionaryItemIdentifier, DictionaryQueryResult,
+        ErrorCode as BinaryPortError, GetRequest, GetTrieFullResult, GlobalStateQueryResult,
+        GlobalStateRequest, InformationRequest, NodeStatus, PayloadEntity, RecordId,
+        SpeculativeExecutionResult, TransactionWithExecutionInfo,
     },
     bytesrepr::{self, FromBytes, ToBytes},
     AvailableBlockRange, BlockHash, BlockHeader, BlockIdentifier, ChainspecRawBytes, Digest,
@@ -100,6 +101,21 @@ pub trait NodeClient: Send + Sync {
         Ok(res.into_inner().map(<Vec<u8>>::from))
     }
 
+    async fn query_dictionary_item(
+        &self,
+        state_identifier: Option<GlobalStateIdentifier>,
+        identifier: DictionaryItemIdentifier,
+    ) -> Result<Option<DictionaryQueryResult>, Error> {
+        let get = GlobalStateRequest::DictionaryItem {
+            state_identifier,
+            identifier,
+        };
+        let resp = self
+            .send_request(BinaryRequest::Get(GetRequest::State(get)))
+            .await?;
+        parse_response::<DictionaryQueryResult>(&resp.into())
+    }
+
     async fn try_accept_transaction(&self, transaction: Transaction) -> Result<(), Error> {
         let request = BinaryRequest::TryAcceptTransaction { transaction };
         let response = self.send_request(request).await?;

diff --git a/rpc_sidecar/src/rpcs/error.rs b/rpc_sidecar/src/rpcs/error.rs
@@ -1,8 +1,8 @@
 use crate::node_client::Error as NodeClientError;
 use casper_json_rpc::{Error as RpcError, ReservedErrorCode};
 use casper_types::{
-    bytesrepr, AvailableBlockRange, BlockIdentifier, DeployHash, KeyFromStrError, KeyTag,
-    TransactionHash, URefFromStrError,
+    bytesrepr, AvailableBlockRange, BlockIdentifier, DeployHash, KeyTag, TransactionHash,
+    URefFromStrError,
 };
 
 use super::{ErrorCode, ErrorData};
@@ -24,7 +24,7 @@ pub enum Error {
     #[error("the requested purse URef was invalid: {0}")]
     InvalidPurseURef(URefFromStrError),
     #[error("the provided dictionary key was invalid: {0}")]
-    InvalidDictionaryKey(KeyFromStrError),
+    InvalidDictionaryKey(String),
     #[error("the provided dictionary key points at an unexpected type: {0}")]
     InvalidTypeUnderDictionaryKey(String),
     #[error("the provided dictionary key doesn't exist")]