Merge pull request #63 from Relayz-io/silvestr/use-workspaces-from-git

Start using workspaces directly from git.

near-client/Cargo.toml

@@ -15,8 +15,8 @@ bs58 = "0.4"
 borsh = "0.9"
 ed25519-dalek = "1"
 itertools = "0.10"
-near-account-id = "0.14"
-near-primitives = { version = "0.14", package = "near-primitives-core" }
+near-account-id = "0.15"
+near-primitives = { version = "0.15", package = "near-primitives-core" }
 near-units = "0.2"
 reqwest = { version = "0.11", features = ["json"] }
 serde = { version = "1", default-features = false, features = ["derive"] }
@@ -31,4 +31,4 @@ reqwest = { version = "0.11", features = ["json"] }
 rand = "0.8.5"
 rand_chacha = "0.3"
 tokio = { version = "1.2.1", features = ["full"] }
-workspaces = { version = "0.5", features = ["unstable"] }
+workspaces = { git = "https://github.com/near/workspaces-rs.git", features = ["unstable"] }

near-client/src/types/near.rs

@@ -7,7 +7,7 @@ use near_primitives::{
     account::{AccessKey, AccessKeyPermission},
     hash::{hash, CryptoHash},
     logging,
-    serialize::{base64_format, u128_dec_format_compatible},
+    serialize::{base64_format, dec_format},
     types::{Balance, BlockHeight, Gas, Nonce},
 };
 use serde::{
@@ -120,7 +120,7 @@ pub struct FunctionCallAction {
     #[serde(with = "base64_format")]
     pub args: Vec<u8>,
     pub gas: Gas,
-    #[serde(with = "u128_dec_format_compatible")]
+    #[serde(with = "dec_format")]
     pub deposit: Balance,
 }
 
@@ -146,7 +146,7 @@ impl fmt::Debug for FunctionCallAction {
 
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct TransferAction {
-    #[serde(with = "u128_dec_format_compatible")]
+    #[serde(with = "dec_format")]
     pub deposit: Balance,
 }
 
@@ -160,7 +160,7 @@ impl From<TransferAction> for Action {
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct StakeAction {
     /// Amount of tokens to stake.
-    #[serde(with = "u128_dec_format_compatible")]
+    #[serde(with = "dec_format")]
     pub stake: Balance,
     /// Validator key which will be used to sign transactions on behalf of singer_id
     pub public_key: ED25519PublicKey,
@@ -377,15 +377,15 @@ pub enum ActionView {
         #[serde(with = "base64_format")]
         args: Vec<u8>,
         gas: Gas,
-        #[serde(with = "u128_dec_format_compatible")]
+        #[serde(with = "dec_format")]
         deposit: Balance,
     },
     Transfer {
-        #[serde(with = "u128_dec_format_compatible")]
+        #[serde(with = "dec_format")]
         deposit: Balance,
     },
     Stake {
-        #[serde(with = "u128_dec_format_compatible")]
+        #[serde(with = "dec_format")]
         stake: Balance,
         public_key: ED25519PublicKey,
     },

web-client/Cargo.toml

@@ -18,8 +18,8 @@ js-sys = "0.3"
 wasm-bindgen-test = "0.3"
 wasm-bindgen-futures = "0.4.32"
 web-sys = { version = "0.3", features = ["console", "WebSocket", "WebSocketDict", "WebSocketElement", "Window"] }
-near-account-id = "0.14.0"
-near-primitives = { version = "0.14.0", package = "near-primitives-core" }
+near-account-id = "0.15.0"
+near-primitives = { version = "0.15.0", package = "near-primitives-core" }
 near-units = "0.2"
 near-client = { path = "../near-client" }
 common-api = { path = "../common-api" }