From 36fa20cdde1c24586e92f66c63f24fc3db823f81 Mon Sep 17 00:00:00 2001 From: Vlad Frolov Date: Fri, 23 Feb 2024 00:48:56 +0100 Subject: [PATCH] bumped dependencies to the latest stable --- near-sdk-macros/Cargo.toml | 14 +++++++------- near-sdk/Cargo.toml | 6 +++--- near-sdk/src/json_types/hash.rs | 2 +- near-sdk/src/json_types/vector.rs | 5 +++-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml index 86094e4e6..f09bcec78 100644 --- a/near-sdk-macros/Cargo.toml +++ b/near-sdk-macros/Cargo.toml @@ -15,14 +15,14 @@ Main macro of the library for writing NEAR smart contracts. proc-macro = true [dependencies] -proc-macro2 = "1" -syn = { version = "2", features = ["full", "fold", "extra-traits", "visit"] } -strum = "0.24" -strum_macros = "0.24" -quote = "1.0" +proc-macro2 = { version = "1", default-features = false } +syn = { version = "2", default-features = false } +strum = { version = "0.26", default-features = false } +strum_macros = "0.26" +quote = { version = "1.0", default-features = false } Inflector = { version = "0.11.4", default-features = false, features = [] } -darling = { version = "0.20.3" } -serde = { version = "1", features = ["derive"] } +darling = { version = "0.20.3", default-features = false } +serde = { version = "1", default-features = false, features = ["serde_derive"] } serde_json = "1" [dev-dependencies] diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml index 76e5bd82c..eac50d59a 100644 --- a/near-sdk/Cargo.toml +++ b/near-sdk/Cargo.toml @@ -23,9 +23,9 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" near-sdk-macros = { path = "../near-sdk-macros", version = "~5.0.0-alpha.3" } near-sys = { path = "../near-sys", version = "0.2.1" } -base64 = "0.13" +base64 = "0.21" borsh = { version = "1.0.0", features = ["derive"] } -bs58 = "0.4" +bs58 = "0.5" # Used for caching, might be worth porting only functionality needed. once_cell = { version = "1.17", default-features = false } @@ -60,7 +60,7 @@ getrandom = { version = "0.2", features = ["js"] } rand_chacha = "0.3.1" near-rng = "0.1.1" near-abi = { version = "0.4.0", features = ["__chunked-entries"] } -symbolic-debuginfo = "8.8" +symbolic-debuginfo = "12" [features] default = ["wee_alloc"] diff --git a/near-sdk/src/json_types/hash.rs b/near-sdk/src/json_types/hash.rs index 242640a13..bb76b93d6 100644 --- a/near-sdk/src/json_types/hash.rs +++ b/near-sdk/src/json_types/hash.rs @@ -82,7 +82,7 @@ impl std::str::FromStr for Base58CryptoHash { fn from_str(value: &str) -> Result { let mut crypto_hash: CryptoHash = CryptoHash::default(); - let size = bs58::decode(value).into(&mut crypto_hash)?; + let size = bs58::decode(value).onto(&mut crypto_hash)?; if size != std::mem::size_of::() { return Err(ParseCryptoHashError { kind: ParseCryptoHashErrorKind::InvalidLength(size), diff --git a/near-sdk/src/json_types/vector.rs b/near-sdk/src/json_types/vector.rs index 9b98538cf..0f31b55c6 100644 --- a/near-sdk/src/json_types/vector.rs +++ b/near-sdk/src/json_types/vector.rs @@ -47,13 +47,14 @@ impl schemars::JsonSchema for Base64VecU8 { /// ``` mod base64_bytes { use super::*; + use base64::Engine; use serde::de; pub fn serialize(bytes: &[u8], serializer: S) -> Result where S: Serializer, { - serializer.serialize_str(&base64::encode(bytes)) + serializer.serialize_str(&base64::engine::general_purpose::STANDARD.encode(bytes)) } pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error> @@ -61,7 +62,7 @@ mod base64_bytes { D: Deserializer<'de>, { let s: String = Deserialize::deserialize(deserializer)?; - base64::decode(s.as_str()).map_err(de::Error::custom) + base64::engine::general_purpose::STANDARD.decode(s.as_str()).map_err(de::Error::custom) } }