Browse Source

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

Start using workspaces directly from git.
develop
Predko Silvestr 3 years ago
parent
commit
0fe2455b14
No account linked to committer's email address
3 changed files with 12 additions and 12 deletions
  1. 3
    3
      near-client/Cargo.toml
  2. 7
    7
      near-client/src/types/near.rs
  3. 2
    2
      web-client/Cargo.toml

+ 3
- 3
near-client/Cargo.toml View File

15
 borsh = "0.9"
15
 borsh = "0.9"
16
 ed25519-dalek = "1"
16
 ed25519-dalek = "1"
17
 itertools = "0.10"
17
 itertools = "0.10"
18
-near-account-id = "0.14"
19
-near-primitives = { version = "0.14", package = "near-primitives-core" }
18
+near-account-id = "0.15"
19
+near-primitives = { version = "0.15", package = "near-primitives-core" }
20
 near-units = "0.2"
20
 near-units = "0.2"
21
 reqwest = { version = "0.11", features = ["json"] }
21
 reqwest = { version = "0.11", features = ["json"] }
22
 serde = { version = "1", default-features = false, features = ["derive"] }
22
 serde = { version = "1", default-features = false, features = ["derive"] }
31
 rand = "0.8.5"
31
 rand = "0.8.5"
32
 rand_chacha = "0.3"
32
 rand_chacha = "0.3"
33
 tokio = { version = "1.2.1", features = ["full"] }
33
 tokio = { version = "1.2.1", features = ["full"] }
34
-workspaces = { version = "0.5", features = ["unstable"] }
34
+workspaces = { git = "https://github.com/near/workspaces-rs.git", features = ["unstable"] }

+ 7
- 7
near-client/src/types/near.rs View File

7
     account::{AccessKey, AccessKeyPermission},
7
     account::{AccessKey, AccessKeyPermission},
8
     hash::{hash, CryptoHash},
8
     hash::{hash, CryptoHash},
9
     logging,
9
     logging,
10
-    serialize::{base64_format, u128_dec_format_compatible},
10
+    serialize::{base64_format, dec_format},
11
     types::{Balance, BlockHeight, Gas, Nonce},
11
     types::{Balance, BlockHeight, Gas, Nonce},
12
 };
12
 };
13
 use serde::{
13
 use serde::{
120
     #[serde(with = "base64_format")]
120
     #[serde(with = "base64_format")]
121
     pub args: Vec<u8>,
121
     pub args: Vec<u8>,
122
     pub gas: Gas,
122
     pub gas: Gas,
123
-    #[serde(with = "u128_dec_format_compatible")]
123
+    #[serde(with = "dec_format")]
124
     pub deposit: Balance,
124
     pub deposit: Balance,
125
 }
125
 }
126
 
126
 
146
 
146
 
147
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
147
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
148
 pub struct TransferAction {
148
 pub struct TransferAction {
149
-    #[serde(with = "u128_dec_format_compatible")]
149
+    #[serde(with = "dec_format")]
150
     pub deposit: Balance,
150
     pub deposit: Balance,
151
 }
151
 }
152
 
152
 
160
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
160
 #[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
161
 pub struct StakeAction {
161
 pub struct StakeAction {
162
     /// Amount of tokens to stake.
162
     /// Amount of tokens to stake.
163
-    #[serde(with = "u128_dec_format_compatible")]
163
+    #[serde(with = "dec_format")]
164
     pub stake: Balance,
164
     pub stake: Balance,
165
     /// Validator key which will be used to sign transactions on behalf of singer_id
165
     /// Validator key which will be used to sign transactions on behalf of singer_id
166
     pub public_key: ED25519PublicKey,
166
     pub public_key: ED25519PublicKey,
377
         #[serde(with = "base64_format")]
377
         #[serde(with = "base64_format")]
378
         args: Vec<u8>,
378
         args: Vec<u8>,
379
         gas: Gas,
379
         gas: Gas,
380
-        #[serde(with = "u128_dec_format_compatible")]
380
+        #[serde(with = "dec_format")]
381
         deposit: Balance,
381
         deposit: Balance,
382
     },
382
     },
383
     Transfer {
383
     Transfer {
384
-        #[serde(with = "u128_dec_format_compatible")]
384
+        #[serde(with = "dec_format")]
385
         deposit: Balance,
385
         deposit: Balance,
386
     },
386
     },
387
     Stake {
387
     Stake {
388
-        #[serde(with = "u128_dec_format_compatible")]
388
+        #[serde(with = "dec_format")]
389
         stake: Balance,
389
         stake: Balance,
390
         public_key: ED25519PublicKey,
390
         public_key: ED25519PublicKey,
391
     },
391
     },

+ 2
- 2
web-client/Cargo.toml View File

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

Loading…
Cancel
Save