From d0b4f93209ec4741c4ad54b0f4b96f05ea8075ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dj8yf0=CE=BCl?= Date: Thu, 19 Dec 2024 16:03:08 +0200 Subject: [PATCH] bump: near-* crates to 0.28 --- Cargo.lock | 126 ++++++++++-------- cargo-near/Cargo.toml | 4 +- .../new-project-template/Cargo.template.toml | 6 +- integration-tests/Cargo.toml | 2 +- integration-tests/src/lib.rs | 6 +- 5 files changed, 82 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d32878d..2ef43aa4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -618,7 +618,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2260,7 +2260,7 @@ dependencies = [ "jsonptr", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2350,7 +2350,7 @@ dependencies = [ "ledger-transport", "libc", "log", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2662,9 +2662,9 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa23b4799779931ac810dc95a834cf6832448462161431f65f2f0bd16f1a3b54" +checksum = "4c1f312b5e1cdb6d6eb8a753de5798fe70fc2aa048b37d9a08a8d63f5623707d" dependencies = [ "anyhow", "bytesize", @@ -2686,9 +2686,9 @@ dependencies = [ [[package]] name = "near-cli-rs" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7961d3f890e0823a1737f1732a8019c6f74ac4cf7549b76722ad9c80c6769d1c" +checksum = "f85651950010529886d21ed22d8a196c81e7d8aac1a4c7c713797d9e1be1313c" dependencies = [ "bip39", "bs58 0.5.1", @@ -2732,7 +2732,7 @@ dependencies = [ "strum", "strum_macros", "textwrap", - "thiserror", + "thiserror 2.0.8", "tokio", "toml", "tracing", @@ -2745,21 +2745,21 @@ dependencies = [ [[package]] name = "near-config-utils" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7b41110a20f1d82bb06f06e4800068c5ade6d8ff844787f8753bc2ce7b16f7" +checksum = "bedc768765dd8229a1d960c94f517317f40771a003e78916124784c7d6ea9d74" dependencies = [ "anyhow", "json_comments", - "thiserror", + "thiserror 2.0.8", "tracing", ] [[package]] name = "near-crypto" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b17944c8d0f274c684227d79fcd46d583b1e36064b597c53a9ebec187a86f3" +checksum = "4374804fdd45ac84c9e7cc3183312c98560c5518d81e6d8e2d92b77587e5a9f3" dependencies = [ "blake2", "borsh", @@ -2778,14 +2778,14 @@ dependencies = [ "serde", "serde_json", "subtle", - "thiserror", + "thiserror 2.0.8", ] [[package]] name = "near-fmt" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eff0731995774d1498f017c968a3ebbfdadad84f556afea4b83679f6706ac9" +checksum = "f14f36eee2dcb0ecd8febb9f198e0e1fa768c834db9e1982ad2acfcd04b45acf" dependencies = [ "near-primitives-core", ] @@ -2804,9 +2804,9 @@ dependencies = [ [[package]] name = "near-jsonrpc-client" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942dfa1269d14ea33454a0e9bc39b0d14ab5c6057b21e23e80753239879c5e54" +checksum = "e66a0c4c47f2fbbfa11ea8317fce2288d70d4aa8231e77fd213721ffcc1c334f" dependencies = [ "borsh", "lazy_static", @@ -2818,14 +2818,14 @@ dependencies = [ "reqwest", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", ] [[package]] name = "near-jsonrpc-primitives" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c89197294a74af70fd5d06b4876dc2a400ffbdff6131e640e75fcb4fd194649" +checksum = "90f445f809d1f227f0f61f38c14271635c0bc9a28a8f74a803a4fb25292d5ea7" dependencies = [ "arbitrary", "near-chain-configs", @@ -2834,7 +2834,7 @@ dependencies = [ "near-schema-checker-lib", "serde", "serde_json", - "thiserror", + "thiserror 2.0.8", "time", ] @@ -2856,9 +2856,9 @@ dependencies = [ [[package]] name = "near-parameters" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4b4d014ac9f46baf0eeac7214567a08db97d5fd26157ea13edfbb8ffc5fd8c" +checksum = "1279baa276725971d5e2b80c524d1aa42d5ad8bccf8901466fd579374cf58a14" dependencies = [ "borsh", "enum-map", @@ -2870,14 +2870,14 @@ dependencies = [ "serde_repr", "serde_yaml", "strum", - "thiserror", + "thiserror 2.0.8", ] [[package]] name = "near-primitives" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45b4742a1817ff7d80dcf51c6facb8134478f8c4a6d717825cca2e4b834b17f" +checksum = "6ab6ecc354e61c40b044c8b553c187383a587a1679d2e594f0b98ca58dbfb6e3" dependencies = [ "arbitrary", "base64 0.21.7", @@ -2910,16 +2910,16 @@ dependencies = [ "sha3", "smart-default 0.6.0", "strum", - "thiserror", + "thiserror 2.0.8", "tracing", "zstd 0.13.2", ] [[package]] name = "near-primitives-core" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2c9da5de096b5cd4786a270900ff32a49d267e442a2e7f271fb23eb925c87" +checksum = "d597af103bb7881d1fb9031fb126cfe6c1acb9c9a6c8296dca45b5b3beb0893d" dependencies = [ "arbitrary", "base64 0.21.7", @@ -2933,14 +2933,14 @@ dependencies = [ "serde", "serde_repr", "sha2 0.10.8", - "thiserror", + "thiserror 2.0.8", ] [[package]] name = "near-sandbox-utils" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fab5bbcdca923963f65dc0ffb630135b9858a0cc5dc8136e746a10094d84e9a6" +checksum = "51b918c05ec1ac6bf36f5f78e286befa987b17773b9fe4e80958d6350a494c98" dependencies = [ "anyhow", "binary-install", @@ -2951,15 +2951,15 @@ dependencies = [ [[package]] name = "near-schema-checker-core" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03541d1dadd0b5dd0a2e1ae1fbe5735fdab79332ed556af36cdcbe50d4b8cf04" +checksum = "a48405425eca34de98e680416310df33fdb75768a78481cc75b43172b2748613" [[package]] name = "near-schema-checker-lib" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9050b0822d2c0dbd90d8c523fd74634f77c5be4ed3337e7010c0d986121982" +checksum = "dfb720bf5cc256af687a9eb7a6e05baf3668dc75cfd43098e83ba1b3d3900f08" dependencies = [ "near-schema-checker-core", "near-schema-checker-macro", @@ -2967,15 +2967,15 @@ dependencies = [ [[package]] name = "near-schema-checker-macro" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1bca8c93ff0ad17138c147323a07f036d11c9e1602e3bc2ac9d29c3cf78b89d" +checksum = "b41a159cbf732acc0279febdde046d9036330a32a951796bce42f9529bce799d" [[package]] name = "near-socialdb-client" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd06eda493540f1b342dadd7bd001dc32cfdc5ed3160818e01af356f1862e4b0" +checksum = "7d8e81d873d7663b24d2df9facc7b38d09aa1c88632cd31d88c3a602e787ec67" dependencies = [ "color-eyre", "near-crypto", @@ -2990,15 +2990,15 @@ dependencies = [ [[package]] name = "near-stdx" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427b4e4af5e32f682064772da8b1a7558b3f090e6151c8804cff24ee6c5c4966" +checksum = "7a91674768828a593f4bac4aeca9334c4b56fe19344a2ccf7bd795b2325f0b5e" [[package]] name = "near-time" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66ade805f0ca8211f0ca2e6ea130f8ddd03bf70c9c93ebeabdddf37314e3f30b" +checksum = "c92bf9dffb11126e8db9a6a51bcb330c8584d0bab0d6d14c20cf2ff1f16d684d" dependencies = [ "serde", "time", @@ -3017,9 +3017,9 @@ dependencies = [ [[package]] name = "near-workspaces" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed9db2b896d14a0d040a73d9dbb93c5bb3450b01f7dd21325a362f9aeddef59" +checksum = "7e5804591268264c4e308cc84a54f4c7416da6ad34f8ea5c5a4b1842bc5462de" dependencies = [ "async-trait", "base64 0.22.1", @@ -3043,7 +3043,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-retry", "tracing", @@ -3690,7 +3690,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4516,7 +4516,7 @@ dependencies = [ "serde_json", "smallvec", "symbolic-common", - "thiserror", + "thiserror 1.0.69", "wasmparser 0.83.0", "zip 0.5.13", ] @@ -4651,7 +4651,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +dependencies = [ + "thiserror-impl 2.0.8", ] [[package]] @@ -4665,6 +4674,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -5267,7 +5287,7 @@ dependencies = [ "strum", "strum_macros", "tempfile", - "thiserror", + "thiserror 1.0.69", "wasm-opt-cxx-sys", "wasm-opt-sys", ] @@ -5713,7 +5733,7 @@ dependencies = [ "byteorder", "crc32fast", "flate2", - "thiserror", + "thiserror 1.0.69", ] [[package]] diff --git a/cargo-near/Cargo.toml b/cargo-near/Cargo.toml index 4c56b4af..b97173eb 100644 --- a/cargo-near/Cargo.toml +++ b/cargo-near/Cargo.toml @@ -3,7 +3,7 @@ name = "cargo-near" version = "0.13.1" authors = ["Near Inc "] edition = "2021" -rust-version = "1.80.0" +rust-version = "1.81.0" description = "Cargo extension for building Rust smart contracts on NEAR" readme = "README.md" repository = "https://github.com/near/cargo-near" @@ -39,7 +39,7 @@ names = { version = "0.14.0", default-features = false } derive_more = "0.99.9" shell-words = "1.0.0" interactive-clap = "0.3.1" -near-cli-rs = { version = "0.16.0", default-features = false } +near-cli-rs = { version = "0.17.0", default-features = false } reqwest = "0.12.5" indicatif = "0.17.8" indenter = "0.3" diff --git a/cargo-near/src/commands/new/new-project-template/Cargo.template.toml b/cargo-near/src/commands/new/new-project-template/Cargo.template.toml index de60b2a2..ba3b064f 100644 --- a/cargo-near/src/commands/new/new-project-template/Cargo.template.toml +++ b/cargo-near/src/commands/new/new-project-template/Cargo.template.toml @@ -30,11 +30,11 @@ container_build_command = ["cargo", "near", "build", "non-reproducible-wasm", "- # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -near-sdk = "5.6" +near-sdk = "5.7" [dev-dependencies] -near-sdk = { version = "5.6", features = ["unit-testing"] } -near-workspaces = { version = "0.15", features = ["unstable"] } +near-sdk = { version = "5.7", features = ["unit-testing"] } +near-workspaces = { version = "0.16", features = ["unstable"] } tokio = { version = "1.12.0", features = ["full"] } serde_json = "1" diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 62369889..7db0a7ea 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -33,6 +33,6 @@ syn = "2" tempfile = "3.3" tokio = { version = "1.12.0", features = ["full"] } quote = "1.0" -near-workspaces = "0.15" +near-workspaces = "0.16" zstd = "0.13" toml = "0.8.19" diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs index 4b65405b..9acc9c55 100644 --- a/integration-tests/src/lib.rs +++ b/integration-tests/src/lib.rs @@ -6,7 +6,7 @@ use cargo_near_build::camino; pub mod from_crates_io { use const_format::formatcp; - pub const SDK_VERSION: &str = "5.6.0"; + pub const SDK_VERSION: &str = "5.7.0"; pub const SDK_VERSION_TOML: &str = formatcp!(r#"version = "{SDK_VERSION}""#); } @@ -18,8 +18,8 @@ pub fn setup_tracing() { pub mod from_git { use const_format::formatcp; - pub const SDK_VERSION: &str = "5.6.0"; - pub const SDK_REVISION: &str = "7a8dd794c7d336e138bffa3eb8a5d34f14bf8310"; + pub const SDK_VERSION: &str = "5.7.0"; + pub const SDK_REVISION: &str = "ea5fe8ab67c630d5afeda1437057b11e39fe69c4"; pub const SDK_SHORT_VERSION_TOML: &str = formatcp!(r#"version = "{SDK_VERSION}""#); pub const SDK_REPO: &str = "https://github.com/near/near-sdk-rs.git"; pub const SDK_VERSION_TOML: &str =