Skip to content

Commit 74ca316

Browse files
authored
chore!: updates near-* dependencies to 0.29 release (#407)
1 parent d47db86 commit 74ca316

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
[workspace]
2-
members = [
3-
"workspaces",
4-
"examples",
5-
]
2+
members = ["workspaces", "examples"]

examples/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ anyhow = "1.0"
99
maplit = "1.0"
1010
near-units = "0.2.0"
1111
near-gas = { version = "0.3", features = ["serde", "borsh", "schemars"] }
12-
near-jsonrpc-primitives = "0.28"
13-
near-primitives = "0.28"
12+
near-jsonrpc-primitives = "0.29"
13+
near-primitives = "0.29"
1414
serde = "1.0"
1515
serde_with = "3.4"
1616
serde_json = { version = "1.0" }

workspaces/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,23 @@ near-gas = { version = "0.3", features = ["serde", "borsh", "schemars"] }
3434
near-token = { version = "0.3", features = ["serde"] }
3535
near-sdk = { version = "5.7", optional = true }
3636
near-account-id = "1.0.0"
37-
near-crypto = "0.28"
38-
near-primitives = "0.28"
39-
near-jsonrpc-primitives = "0.28"
40-
near-jsonrpc-client = { version = "0.15", features = ["sandbox"] }
41-
near-sandbox-utils = "0.13"
42-
near-chain-configs = { version = "0.28", optional = true }
37+
near-crypto = "0.29"
38+
near-primitives = "0.29"
39+
near-jsonrpc-primitives = "0.29"
40+
near-jsonrpc-client = { version = "0.16", features = ["sandbox"] }
41+
near-sandbox-utils = "0.14"
42+
near-chain-configs = { version = "0.29", optional = true }
4343

4444
[build-dependencies]
45-
near-sandbox-utils = "0.13"
45+
near-sandbox-utils = "0.14"
4646

4747
[target.'cfg(unix)'.dependencies]
4848
libc = "0.2"
4949

5050
[dev-dependencies]
5151
anyhow = "1.0"
5252
futures = "0.3"
53-
near-sdk = "5.7"
53+
near-sdk = "5.9"
5454
test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
5555
tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }
5656

workspaces/src/types/mod.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,17 +291,20 @@ impl InMemorySigner {
291291
pub fn from_file(path: &Path) -> Result<Self> {
292292
let signer = near_crypto::InMemorySigner::from_file(path)
293293
.map_err(|err| ErrorKind::Io.custom(err))?;
294-
Ok(Self::from_secret_key(
295-
signer.account_id,
296-
SecretKey(signer.secret_key),
297-
))
294+
let account_id = signer.get_account_id();
295+
let secret_key = match signer {
296+
near_crypto::Signer::Empty(_) => return Err(ErrorKind::Io.custom("Empty signer")),
297+
near_crypto::Signer::InMemory(signer) => signer.secret_key,
298+
};
299+
300+
Ok(Self::from_secret_key(account_id, SecretKey(secret_key)))
298301
}
299302

300303
pub(crate) fn inner(&self) -> Signer {
301-
Signer::InMemory(near_crypto::InMemorySigner::from_secret_key(
304+
near_crypto::InMemorySigner::from_secret_key(
302305
self.account_id.clone(),
303306
self.secret_key.0.clone(),
304-
))
307+
)
305308
}
306309
}
307310

0 commit comments

Comments
 (0)