Merge pull request #92 from aurora-is-near/aurora-typed-requests

General improvements, fixes, adjustments

Author: Qjawko

Cargo.lock

@@ -30,6 +30,7 @@ near-chain-configs = "0.30"
 near-contract-standards = "5"
 near-crypto = "0.30"
 near-gas = "0.3"
+near-sdk = "5"
 near-token = { version = "0.3", features = ["borsh", "serde"] }
 near-jsonrpc-client = "0.17"
 near-jsonrpc-primitives = "0.30"

Cargo.toml

@@ -17,6 +17,7 @@ borsh.workspace = true
 near-gas.workspace = true
 near-token.workspace = true
 near-primitives.workspace = true
+near-sdk.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 serde.workspace = true
 serde_json.workspace = true

sdk/Cargo.toml

@@ -19,18 +19,13 @@ async fn main() -> anyhow::Result<()> {
     Ok(())
 }
 
-fn signer() -> anyhow::Result<InMemorySigner> {
-    let signer = std::env::var("NEAR_KEY_PATH")
+fn signer() -> anyhow::Result<Signer> {
+    std::env::var("NEAR_KEY_PATH")
         .ok()
         .as_ref()
         .map(std::path::Path::new)
         .ok_or_else(|| {
             anyhow::anyhow!("Path to the key file must be provided to use this functionality")
         })
-        .and_then(|path| InMemorySigner::from_file(path).map_err(Into::into))?;
-
-    match signer {
-        Signer::Empty(_) => panic!("Signer must not be empty"),
-        Signer::InMemory(signer) => Ok(signer),
-    }
+        .and_then(|path| InMemorySigner::from_file(path).map_err(Into::into))
 }