From 098510902693da86dbd87cf129ccf7d8ae1f9fd4 Mon Sep 17 00:00:00 2001 From: Aleksey Proshutinskiy Date: Tue, 21 Nov 2023 20:58:27 +0200 Subject: [PATCH] chore: bump toolchain and test sdk (#291) --- distro/Cargo.lock | 152 +------------------------------------------- distro/Cargo.toml | 2 +- rust-toolchain.toml | 2 +- service/Cargo.lock | 56 +++++++++++----- service/Cargo.toml | 6 +- 5 files changed, 48 insertions(+), 170 deletions(-) diff --git a/distro/Cargo.lock b/distro/Cargo.lock index ce34726..ac20d70 100644 --- a/distro/Cargo.lock +++ b/distro/Cargo.lock @@ -4,43 +4,9 @@ version = 3 [[package]] name = "built" -version = "0.5.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9c056b9ed43aee5e064b683aa1ec783e19c6acec7559e3ae931b7490472fbe" -dependencies = [ - "cargo-lock", -] - -[[package]] -name = "cargo-lock" -version = "8.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" -dependencies = [ - "semver", - "serde", - "toml", - "url", -] - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] +checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" [[package]] name = "itoa" @@ -54,30 +20,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - [[package]] name = "registry-distro" version = "0.8.7" @@ -93,34 +35,11 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde", -] - [[package]] name = "serde" version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] [[package]] name = "serde_json" @@ -132,70 +51,3 @@ dependencies = [ "ryu", "serde", ] - -[[package]] -name = "syn" -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] diff --git a/distro/Cargo.toml b/distro/Cargo.toml index 89106e7..7d4c03f 100644 --- a/distro/Cargo.toml +++ b/distro/Cargo.toml @@ -13,4 +13,4 @@ maplit = "1.0.2" serde_json = "1.0.96" [build-dependencies] -built = "0.5.2" +built = "0.7.1" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f0539b7..8547d8f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2023-06-27" +channel = "nightly-2023-08-27" components = [ "rustfmt", "clippy" ] targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "wasm32-wasi" ] profile = "minimal" diff --git a/service/Cargo.lock b/service/Cargo.lock index 6e4800b..ce566ca 100644 --- a/service/Cargo.lock +++ b/service/Cargo.lock @@ -911,7 +911,7 @@ dependencies = [ "libsecp256k1", "multihash 0.18.1", "rand 0.8.5", - "ring", + "ring 0.16.20", "serde", "serde_bytes", "sha2 0.10.8", @@ -1369,22 +1369,22 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libp2p-identity" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd6317441f361babc74c2989c6484eb0726045399b6648de039e1805ea96972" +checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "asn1_der 0.7.6", "bs58", "ed25519-dalek 2.1.0", "hkdf", "libsecp256k1", - "log", "multihash 0.19.1", "quick-protobuf", "rand 0.8.5", - "ring", + "ring 0.17.5", "sha2 0.10.8", "thiserror", + "tracing", "zeroize", ] @@ -1508,9 +1508,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "marine-build-rs-generator" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4170c2285f9cc8679823406d90dfc3f76ffd863e31f9eb7f6ca762a41443d99d" +checksum = "1738043e66221cae31e0e064c3bc968cae60e0dce932c990b03497a837e029b5" dependencies = [ "marine-test-macro-impl", ] @@ -1706,9 +1706,9 @@ dependencies = [ [[package]] name = "marine-rs-sdk-test" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18ed5315a63bdbd0d88b3e4c2245235d72a81842235ca57e3438c5281b1cda7e" +checksum = "9ea0e38de2397d58e02f8b90e7c0fc027b22f3cf178c7371a939c0b7887dcac7" dependencies = [ "fluence-app-service", "marine-build-rs-generator", @@ -1759,9 +1759,9 @@ dependencies = [ [[package]] name = "marine-test-macro" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b8bcd14e70bc8fe64e51241de42fb01538aff923e8cacc34ad1420a5e2e177" +checksum = "528fdaa3ddef2fa6a5734f7947ca9944a2d1727c862688901fa1625651100853" dependencies = [ "marine-test-macro-impl", "proc-macro-error", @@ -1772,9 +1772,9 @@ dependencies = [ [[package]] name = "marine-test-macro-impl" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f78dfe398150fc719bbb6a1994ebbccf03f4abb50d058a13b16373b5f38799" +checksum = "08d6abfc2595d5144f2faf96a73bd7a710109a1b17a9b8f1cfca901a105c8bc2" dependencies = [ "darling", "fluence-app-service", @@ -2305,12 +2305,26 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.11", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rusqlite" version = "0.30.0" @@ -2560,6 +2574,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.7.2" @@ -2855,6 +2875,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" diff --git a/service/Cargo.toml b/service/Cargo.toml index 9d71aed..f2bdc0a 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -20,11 +20,11 @@ serde = { version = "1.0.188", features = ["derive"] } thiserror = "=1.0.50" sha2 = "=0.10.8" fluence-keypair = "=0.10.3" -libp2p-identity = "=0.2.7" +libp2p-identity = "=0.2.8" [dev-dependencies] -marine-rs-sdk-test = "=0.11.0" +marine-rs-sdk-test = "=0.11.1" rusqlite = "=0.30.0" [build-dependencies] -marine-rs-sdk-test = "=0.11.0" +marine-rs-sdk-test = "=0.11.1"