From 041aeb7be3f277e4edc13f081aabee1b0a2fa7d1 Mon Sep 17 00:00:00 2001 From: Alexandru Vasile Date: Fri, 23 Jun 2023 14:57:57 +0300 Subject: [PATCH] Fix jsonrpsee web features Signed-off-by: Alexandru Vasile --- examples/wasm-example/Cargo.lock | 106 +++++++++---------------------- examples/wasm-example/Cargo.toml | 2 +- testing/wasm-tests/Cargo.lock | 4 +- testing/wasm-tests/Cargo.toml | 2 +- 4 files changed, 35 insertions(+), 79 deletions(-) diff --git a/examples/wasm-example/Cargo.lock b/examples/wasm-example/Cargo.lock index 21f400604e..795141f57c 100644 --- a/examples/wasm-example/Cargo.lock +++ b/examples/wasm-example/Cargo.lock @@ -999,16 +999,6 @@ version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.17" @@ -1090,29 +1080,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.45.0", -] - [[package]] name = "percent-encoding" version = "2.2.0" @@ -1227,9 +1194,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" dependencies = [ "unicode-ident", ] @@ -1296,15 +1263,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - [[package]] name = "ring" version = "0.16.20" @@ -1390,23 +1348,24 @@ dependencies = [ [[package]] name = "scale-decode" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e5527e4b3bf079d4c0b2f253418598c380722ba37ef20fac9088081407f2b6" +checksum = "f0459d00b0dbd2e765009924a78ef36b2ff7ba116292d732f00eb0ed8e465d15" dependencies = [ "parity-scale-codec", "primitive-types", "scale-bits", "scale-decode-derive", "scale-info", + "smallvec", "thiserror", ] [[package]] name = "scale-decode-derive" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b38741b2f78e4391b94eac6b102af0f6ea2b0f7fe65adb55d7f4004f507854db" +checksum = "4391f0dfbb6690f035f6d2a15d6a12f88cc5395c36bcc056db07ffa2a90870ec" dependencies = [ "darling 0.14.4", "proc-macro-crate", @@ -1417,23 +1376,24 @@ dependencies = [ [[package]] name = "scale-encode" -version = "0.1.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15546e5efbb45f0fc2291f7e202dee8623274c5d8bbfdf9c6886cc8b44a7ced3" +checksum = "b0401b7cdae8b8aa33725f3611a051358d5b32887ecaa0fda5953a775b2d4d76" dependencies = [ "parity-scale-codec", "primitive-types", "scale-bits", "scale-encode-derive", "scale-info", + "smallvec", "thiserror", ] [[package]] name = "scale-encode-derive" -version = "0.1.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd983cf0a9effd76138554ead18a6de542d1af175ac12fd5e91836c5c0268082" +checksum = "316e0fb10ec0fee266822bd641bab5e332a4ab80ef8c5b5ff35e5401a394f5a6" dependencies = [ "darling 0.14.4", "proc-macro-crate", @@ -1470,10 +1430,12 @@ dependencies = [ [[package]] name = "scale-value" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f549769261561e6764218f847e500588f9a79a289de49ce92f9e26642a3574" +checksum = "f2096d36e94ce9bf87d8addb752423b6b19730dc88edd7cc452bb2b90573f7a7" dependencies = [ + "base58", + "blake2", "either", "frame-metadata", "parity-scale-codec", @@ -1495,12 +1457,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "sct" version = "0.7.0" @@ -1542,9 +1498,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] @@ -1562,9 +1518,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", @@ -1573,9 +1529,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", @@ -1670,9 +1626,9 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "8.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27449abdfbe41b473e625bce8113745e81d65777dd1d5a8462cf24137930dad8" +checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68" dependencies = [ "blake2b_simd", "byteorder", @@ -1685,9 +1641,9 @@ dependencies = [ [[package]] name = "sp-std" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de8eef39962b5b97478719c493bed2926cf70cb621005bbf68ebe58252ff986" +checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" [[package]] name = "spin" @@ -1715,7 +1671,7 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "subxt" -version = "0.28.0" +version = "0.29.0" dependencies = [ "base58", "blake2", @@ -1728,7 +1684,6 @@ dependencies = [ "impl-serde", "jsonrpsee", "parity-scale-codec", - "parking_lot", "primitive-types", "scale-bits", "scale-decode", @@ -1746,7 +1701,7 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.28.0" +version = "0.29.0" dependencies = [ "frame-metadata", "heck", @@ -1764,7 +1719,7 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.28.0" +version = "0.29.0" dependencies = [ "darling 0.20.1", "proc-macro-error", @@ -1774,12 +1729,13 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.28.0" +version = "0.29.0" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", "sp-core-hashing", + "thiserror", ] [[package]] diff --git a/examples/wasm-example/Cargo.toml b/examples/wasm-example/Cargo.toml index 5f1cc148ae..a09f1e7451 100644 --- a/examples/wasm-example/Cargo.toml +++ b/examples/wasm-example/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] futures = "0.3.28" -subxt = { path = "../../subxt", default-features = false, features = ["jsonrpsee-web"], target_arch = "wasm32" } +subxt = { path = "../../subxt", default-features = false, features = ["jsonrpsee", "web"], target_arch = "wasm32" } yew = {version = "0.20.0", features = ["csr"] } web-sys = "0.3.63" hex = "0.4.3" diff --git a/testing/wasm-tests/Cargo.lock b/testing/wasm-tests/Cargo.lock index d0036ffd49..492063fbed 100644 --- a/testing/wasm-tests/Cargo.lock +++ b/testing/wasm-tests/Cargo.lock @@ -1295,9 +1295,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", diff --git a/testing/wasm-tests/Cargo.toml b/testing/wasm-tests/Cargo.toml index 396e5be816..5c0b13f3b2 100644 --- a/testing/wasm-tests/Cargo.toml +++ b/testing/wasm-tests/Cargo.toml @@ -11,6 +11,6 @@ console_error_panic_hook = "0.1.7" serde_json = "1" # This crate is not a part of the workspace, because it -# requires the "jsonrpsee-web" feature to be enabled, which we don't +# requires the "jsonrpsee web" features to be enabled, which we don't # want enabled for workspace builds in general. subxt = { path = "../../subxt", default-features = false, features = ["web", "jsonrpsee"] }