Merge pull request #12 from Relayz-io/silvestr/implement-view-call

Add view RPC implementation for NearClient

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
       - main
       - develop
   pull_request:
-    types: [opened, reopened, edited]
+    types: [opened, reopened, edited, synchronize]
     branches:    
       - main
       - develop

near-client/Cargo.toml

@@ -10,7 +10,6 @@ description = """
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-async-trait = "0.1"
 base64 = { version = "0.13" }
 bs58 = "0.4"
 borsh = "0.9"

near-client/src/client.rs

@@ -10,12 +10,13 @@ use crate::{
         crypto::{ED25519PublicKey, ED25519Signature, Keypair},
         near::{
             Action, Chunks, FinalExecutionOutcomeView, FinalExecutionStatus, FunctionCallAction,
-            SignedTransaction, Transaction,
+            SignedTransaction, Transaction, ViewResult,
         },
     },
     Error,
 };
 
+use serde::de::DeserializeOwned;
 use serde_json::{json, Value};
 use url::Url;
 
@@ -85,6 +86,38 @@ impl NearClient {
             .prev_block_hash)
     }
 
+    pub async fn view<'a, T: DeserializeOwned>(
+        &'a self,
+        contract_id: &'a AccountId,
+        method: &'static str,
+        args: Option<Value>,
+    ) -> Result<T> {
+        let view_result = self
+            .rpc_client
+            .request::<ViewResult>(
+                "query",
+                Some(json!({
+                    "request_type": "call_function",
+                    "finality": "optimistic",
+                    "account_id": contract_id,
+                    "method_name": method,
+                    "args_base64": args
+                        .map(|value| serde_json::to_vec(&value))
+                        .transpose()
+                        .map_err(Error::ArgsSerialize)?
+                        .map(base64::encode)
+                        .unwrap_or_default()
+                })),
+            )
+            .await
+            .map_err(|error| Error::Rpc {
+                error,
+                method: "query",
+            })?;
+
+        serde_json::from_slice(&view_result.result).map_err(Error::DeserializeTxResp)
+    }
+
     pub fn call<'a>(
         &'a self,
         signer: &'a mut Signer,
@@ -93,17 +126,12 @@ impl NearClient {
     ) -> TransactionBuilder {
         TransactionBuilder::new(self, signer, method, contract_id)
     }
-
-    pub fn view<'a>(&'a self, _contract_id: &'a AccountId, _method: &'static str) {}
 }
 
 pub struct Call<'a>(TransactionBuilder<'a>);
 
 impl<'a> Call<'a> {
-    pub async fn commit<T>(self) -> Result<T>
-    where
-        T: serde::de::DeserializeOwned,
-    {
+    pub async fn commit<T: DeserializeOwned>(self) -> Result<T> {
         let transaction_bytes = serialize_transaction(&self.0).await?;
 
         let execution_outcome = self

near-client/src/types/crypto.rs

@@ -244,14 +244,6 @@ impl Keypair {
 
 macro_rules! util_impl {
     ($key_type: ty) => {
-        impl TryFrom<&[u8]> for $key_type {
-            type Error = Error;
-
-            fn try_from(data: &[u8]) -> Result<Self> {
-                Self::from_bytes(data)
-            }
-        }
-
         impl From<$key_type> for String {
             fn from(key: $key_type) -> Self {
                 Key::to_string(&key)

near-client/src/types/near.rs

@@ -352,12 +352,3 @@ pub struct ViewResult {
     pub result: Vec<u8>,
     pub logs: Vec<String>,
 }
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct View {
-    pub request_type: String,
-    pub finality: String,
-    pub method_name: String,
-    #[serde(with = "base64_format")]
-    pub args_base64: Vec<u8>,
-}

wasm-client/Cargo.toml

@@ -10,7 +10,7 @@ description = """
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-vodozemac = { version = "0.2.0", features = ["js"] }
+vodozemac = { version = "0.2", features = ["js"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
 serde_json = { version = "1", default-features = false }
 wasm-bindgen = "0.2"