From bcd435e23a602fa94ee2080380c9c661d02e0dac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 13:34:17 +0000 Subject: [PATCH] Bump subxt from 0.35.3 to 0.36.0 Bumps [subxt](https://github.com/paritytech/subxt) from 0.35.3 to 0.36.0. - [Release notes](https://github.com/paritytech/subxt/releases) - [Changelog](https://github.com/paritytech/subxt/blob/master/CHANGELOG.md) - [Commits](https://github.com/paritytech/subxt/compare/v0.35.3...v0.36.0) --- updated-dependencies: - dependency-name: subxt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 336 +++++++++++++++++++++++++++++-- crates/cargo-contract/Cargo.toml | 2 +- crates/extrinsics/Cargo.toml | 2 +- 3 files changed, 320 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba3d2de4d..384153cef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -762,7 +762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbe5b10e214954177fb1dc9fbd20a1a2608fe99e6c832033bdc7cea287a20d77" dependencies = [ "borsh-derive", - "cfg_aliases", + "cfg_aliases 0.1.1", ] [[package]] @@ -910,7 +910,7 @@ dependencies = [ "sp-core", "sp-weights", "substrate-build-script-utils", - "subxt", + "subxt 0.36.0", "tempfile", "tokio", "tracing", @@ -965,6 +965,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha20" version = "0.9.1" @@ -1225,7 +1231,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-weights", - "subxt", + "subxt 0.36.0", "subxt-signer", "tempfile", "tokio", @@ -1617,6 +1623,17 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "derive-where" +version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -1983,6 +2000,16 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +[[package]] +name = "finito" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2384245d85162258a14b43567a9ee3598f5ae746a1581fb5d3d2cb780f0dbf95" +dependencies = [ + "futures-timer", + "pin-project", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -2972,6 +2999,7 @@ dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-types", + "jsonrpsee-ws-client", ] [[package]] @@ -3051,6 +3079,19 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" +dependencies = [ + "http 0.2.12", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", + "url", +] + [[package]] name = "jsonschema" version = "0.18.0" @@ -4073,6 +4114,22 @@ dependencies = [ "getrandom", ] +[[package]] +name = "reconnecting-jsonrpsee-ws-client" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89cc4a6f1e641017e300c050f0c4c46a198627fb39ec03e7a028d20256b5e54" +dependencies = [ + "cfg_aliases 0.2.1", + "finito", + "futures", + "jsonrpsee", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "redox_syscall" version = "0.5.1" @@ -4468,7 +4525,19 @@ checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" dependencies = [ "parity-scale-codec", "scale-info", - "scale-type-resolver", + "scale-type-resolver 0.1.1", + "serde", +] + +[[package]] +name = "scale-bits" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" +dependencies = [ + "parity-scale-codec", + "scale-info", + "scale-type-resolver 0.2.0", "serde", ] @@ -4497,7 +4566,22 @@ dependencies = [ "primitive-types", "scale-bits 0.5.0", "scale-decode-derive 0.11.1", - "scale-type-resolver", + "scale-type-resolver 0.1.1", + "smallvec", +] + +[[package]] +name = "scale-decode" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12ebca36cec2a3f983c46295b282b35e5f8496346fb859a8776dad5389e5389" +dependencies = [ + "derive_more", + "parity-scale-codec", + "primitive-types", + "scale-bits 0.6.0", + "scale-decode-derive 0.13.0", + "scale-type-resolver 0.2.0", "smallvec", ] @@ -4526,6 +4610,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-decode-derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06a387a62a2be6ec532eb4f9e1fc800f26d462c06b335d9c3ee54559a355b9fb" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "scale-encode" version = "0.5.0" @@ -4550,7 +4646,22 @@ dependencies = [ "primitive-types", "scale-bits 0.5.0", "scale-encode-derive 0.6.0", - "scale-type-resolver", + "scale-type-resolver 0.1.1", + "smallvec", +] + +[[package]] +name = "scale-encode" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac89c68dd1142f71a5b97850b9031e9a0d3ce708f5de5e7234cddb3b6fc7c8db" +dependencies = [ + "derive_more", + "parity-scale-codec", + "primitive-types", + "scale-bits 0.6.0", + "scale-encode-derive 0.7.0", + "scale-type-resolver 0.2.0", "smallvec", ] @@ -4580,6 +4691,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-encode-derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a4ad472c7c16e4091a08f2f9901a1c117ee865a535b3bfb019e8e53de84ddce" +dependencies = [ + "darling 0.14.4", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "scale-info" version = "2.11.3" @@ -4617,6 +4741,16 @@ dependencies = [ "smallvec", ] +[[package]] +name = "scale-type-resolver" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" +dependencies = [ + "scale-info", + "smallvec", +] + [[package]] name = "scale-typegen" version = "0.2.1" @@ -4630,6 +4764,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "scale-typegen" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9abba3c40137e1244c0f29ed648199bc8ec32569ee349673828e7a060c8e0298" +dependencies = [ + "proc-macro2", + "quote", + "scale-info", + "smallvec", + "syn 2.0.61", + "thiserror", +] + [[package]] name = "scale-value" version = "0.14.1" @@ -4646,7 +4794,28 @@ dependencies = [ "scale-decode 0.11.1", "scale-encode 0.6.0", "scale-info", - "scale-type-resolver", + "scale-type-resolver 0.1.1", + "serde", + "yap", +] + +[[package]] +name = "scale-value" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cf9738c263c665144177201126bdad39d3d62512152f178f35002228026976" +dependencies = [ + "base58", + "blake2", + "derive_more", + "either", + "frame-metadata 15.1.0", + "parity-scale-codec", + "scale-bits 0.6.0", + "scale-decode 0.13.0", + "scale-encode 0.7.0", + "scale-info", + "scale-type-resolver 0.2.0", "serde", "yap", ] @@ -5688,15 +5857,49 @@ dependencies = [ "scale-decode 0.11.1", "scale-encode 0.6.0", "scale-info", - "scale-value", + "scale-value 0.14.1", "serde", "serde_json", - "sp-core", "sp-crypto-hashing", - "sp-runtime", - "subxt-lightclient", - "subxt-macro", - "subxt-metadata", + "subxt-lightclient 0.35.3", + "subxt-macro 0.35.3", + "subxt-metadata 0.35.3", + "thiserror", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "subxt" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22787ce2d2522e96347ca1abf872fb22490c8b0564aeb4258cefc757b9bb0dfb" +dependencies = [ + "async-trait", + "derive-where", + "either", + "frame-metadata 16.0.0", + "futures", + "hex", + "impl-serde", + "instant", + "jsonrpsee", + "parity-scale-codec", + "primitive-types", + "reconnecting-jsonrpsee-ws-client", + "scale-bits 0.6.0", + "scale-decode 0.13.0", + "scale-encode 0.7.0", + "scale-info", + "scale-value 0.16.0", + "serde", + "serde_json", + "sp-crypto-hashing", + "subxt-core", + "subxt-lightclient 0.36.0", + "subxt-macro 0.36.0", + "subxt-metadata 0.36.0", "thiserror", "tokio-util", "tracing", @@ -5717,13 +5920,64 @@ dependencies = [ "proc-macro2", "quote", "scale-info", - "scale-typegen", - "subxt-metadata", + "scale-typegen 0.2.1", + "subxt-metadata 0.35.3", + "syn 2.0.61", + "thiserror", + "tokio", +] + +[[package]] +name = "subxt-codegen" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf00684c4f7290ff2c157c1e8e67d83a71228ba0727209bc393a248efcaf204d" +dependencies = [ + "frame-metadata 16.0.0", + "heck 0.5.0", + "hex", + "jsonrpsee", + "parity-scale-codec", + "proc-macro2", + "quote", + "scale-info", + "scale-typegen 0.7.0", + "subxt-metadata 0.36.0", "syn 2.0.61", "thiserror", "tokio", ] +[[package]] +name = "subxt-core" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5edb118b430ac8df59ad45ee203da2ac6966c7d888099d00b36f7ed4118c1ce" +dependencies = [ + "base58", + "blake2", + "derive-where", + "derive_more", + "frame-metadata 16.0.0", + "hashbrown 0.14.5", + "hex", + "impl-serde", + "parity-scale-codec", + "primitive-types", + "scale-bits 0.6.0", + "scale-decode 0.13.0", + "scale-encode 0.7.0", + "scale-info", + "scale-value 0.16.0", + "serde", + "serde_json", + "sp-core", + "sp-crypto-hashing", + "sp-runtime", + "subxt-metadata 0.36.0", + "tracing", +] + [[package]] name = "subxt-lightclient" version = "0.35.3" @@ -5741,6 +5995,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "subxt-lightclient" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d409b4a868de2dd2fef881f20e67338814a069bc22910a79a6e8240d2038930a" +dependencies = [ + "futures", + "futures-util", + "serde", + "serde_json", + "smoldot-light", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + [[package]] name = "subxt-macro" version = "0.35.3" @@ -5751,8 +6022,23 @@ dependencies = [ "parity-scale-codec", "proc-macro-error", "quote", - "scale-typegen", - "subxt-codegen", + "scale-typegen 0.2.1", + "subxt-codegen 0.35.3", + "syn 2.0.61", +] + +[[package]] +name = "subxt-macro" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd670d2aa05e748a78f72f5166a701c7077fe34d0a6260e37810c507f843735" +dependencies = [ + "darling 0.20.8", + "parity-scale-codec", + "proc-macro-error", + "quote", + "scale-typegen 0.7.0", + "subxt-codegen 0.36.0", "syn 2.0.61", ] @@ -5770,6 +6056,20 @@ dependencies = [ "sp-crypto-hashing", ] +[[package]] +name = "subxt-metadata" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c330ab8e89ac8be228871b4c17211c8e181b49500df519408c108d7f74e607a2" +dependencies = [ + "derive_more", + "frame-metadata 16.0.0", + "hashbrown 0.14.5", + "parity-scale-codec", + "scale-info", + "sp-crypto-hashing", +] + [[package]] name = "subxt-signer" version = "0.35.3" @@ -5789,7 +6089,7 @@ dependencies = [ "secrecy", "sha2 0.10.8", "sp-crypto-hashing", - "subxt", + "subxt 0.35.3", "zeroize", ] diff --git a/crates/cargo-contract/Cargo.toml b/crates/cargo-contract/Cargo.toml index 5db3d3990..c71a78441 100644 --- a/crates/cargo-contract/Cargo.toml +++ b/crates/cargo-contract/Cargo.toml @@ -43,7 +43,7 @@ comfy-table = "7.1.1" # dependencies for extrinsics (deploying and calling a contract) tokio = { version = "1", features = ["macros", "rt-multi-thread"] } -subxt = { version = "0.35.3", features = ["substrate-compat"] } +subxt = { version = "0.36.0", features = ["substrate-compat"] } sp-core = "31.0.0" sp-weights = "30.0.0" hex = "0.4.3" diff --git a/crates/extrinsics/Cargo.toml b/crates/extrinsics/Cargo.toml index 391c0c1ac..b242cf96f 100644 --- a/crates/extrinsics/Cargo.toml +++ b/crates/extrinsics/Cargo.toml @@ -36,7 +36,7 @@ sp-runtime = "34.0.0" sp-weights = "30.0.0" pallet-contracts-uapi = { package = "pallet-contracts-uapi-next", version = "=6.0.3", features = ["scale"] } scale-info = "2.11.3" -subxt = "0.35.3" +subxt = "0.36.0" hex = "0.4.3" derivative = "2.2.0" ink_metadata = "5.0.0"