diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock index 6960044196..906cefd5e5 100644 --- a/cumulus/Cargo.lock +++ b/cumulus/Cargo.lock @@ -2097,7 +2097,7 @@ dependencies = [ "cumulus-primitives-core", "derive_more", "futures 0.3.21", - "jsonrpsee-core 0.9.0", + "jsonrpsee-core", "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", @@ -2122,7 +2122,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "jsonrpsee 0.9.0", + "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.0", "polkadot-service", @@ -3961,49 +3961,17 @@ dependencies = [ "slab", ] -[[package]] -name = "jsonrpsee" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d0b8cc1959f8c05256ace093b2317482da9127f1d9227564f47e7e6bf9bda8" -dependencies = [ - "jsonrpsee-core 0.9.0", - "jsonrpsee-http-client", - "jsonrpsee-types 0.9.0", - "jsonrpsee-ws-client 0.9.0", -] - [[package]] name = "jsonrpsee" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91dc760c341fa81173f9a434931aaf32baad5552b0230cc6c93e8fb7eaad4c19" dependencies = [ - "jsonrpsee-core 0.10.1", + "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", - "jsonrpsee-types 0.10.1", - "jsonrpsee-ws-client 0.10.1", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa370c2c717d798c3c0a315ae3f0a707a388c6963c11f9da7dbbe1d3f7392f5f" -dependencies = [ - "futures 0.3.21", - "http", - "jsonrpsee-core 0.9.0", - "jsonrpsee-types 0.9.0", - "pin-project 1.0.10", - "rustls-native-certs 0.6.1", - "soketto", - "thiserror", - "tokio", - "tokio-rustls 0.23.2", - "tokio-util 0.6.9", - "tracing", - "webpki-roots 0.22.2", + "jsonrpsee-types", + "jsonrpsee-ws-client", ] [[package]] @@ -4014,8 +3982,8 @@ checksum = "765f7a36d5087f74e3b3b47805c2188fef8eb54afcb587b078d9f8ebfe9c7220" dependencies = [ "futures 0.3.21", "http", - "jsonrpsee-core 0.10.1", - "jsonrpsee-types 0.10.1", + "jsonrpsee-core", + "jsonrpsee-types", "pin-project 1.0.10", "rustls-native-certs 0.6.1", "soketto", @@ -4027,29 +3995,6 @@ dependencies = [ "webpki-roots 0.22.2", ] -[[package]] -name = "jsonrpsee-core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22abc3274b265dcefe2e26c4beecf9fda4fffa48cf94930443a6c73678f020d5" -dependencies = [ - "anyhow", - "arrayvec 0.7.2", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "jsonrpsee-types 0.9.0", - "rustc-hash", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "jsonrpsee-core" version = "0.10.1" @@ -4063,7 +4008,7 @@ dependencies = [ "futures-channel", "futures-util", "hyper", - "jsonrpsee-types 0.10.1", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", @@ -4075,15 +4020,15 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d31b837273d09dd80051eefa57d337769dff6c3266108c43a3544ac7ffed9d68" +checksum = "92709e0b8255691f4df954a0176b1cbc3312f151e7ed2e643812e8bd121f1d1c" dependencies = [ "async-trait", "hyper", "hyper-rustls 0.23.0", - "jsonrpsee-core 0.9.0", - "jsonrpsee-types 0.9.0", + "jsonrpsee-core", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", @@ -4104,20 +4049,6 @@ dependencies = [ "syn", ] -[[package]] -name = "jsonrpsee-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f4c45d2e2aa1db4c7d7d7dbaabc10a5b5258d99cd9d42fbfd5260b76f80c324" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "jsonrpsee-types" version = "0.10.1" @@ -4132,26 +4063,15 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-ws-client" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b58983485b2b626c276f1eb367d62dae82132451b281072a7bfa536a33ddf3" -dependencies = [ - "jsonrpsee-client-transport 0.9.0", - "jsonrpsee-core 0.9.0", - "jsonrpsee-types 0.9.0", -] - [[package]] name = "jsonrpsee-ws-client" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd66d18bab78d956df24dd0d2e41e4c00afbb818fda94a98264bdd12ce8506ac" dependencies = [ - "jsonrpsee-client-transport 0.10.1", - "jsonrpsee-core 0.10.1", - "jsonrpsee-types 0.10.1", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] @@ -9069,7 +8989,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#32af9fc9f18fc7ffff6bd6af08924b1bb0d3f185" dependencies = [ "env_logger 0.9.0", - "jsonrpsee 0.10.1", + "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -12350,7 +12270,6 @@ checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes 1.1.0", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite 0.2.7", @@ -12573,7 +12492,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#32af9fc9f18fc7ffff6bd6af08924b1bb0d3f185" dependencies = [ "clap 3.1.8", - "jsonrpsee 0.10.1", + "jsonrpsee", "log", "parity-scale-codec", "remote-externalities", @@ -12604,9 +12523,9 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "digest 0.10.3", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml index 9559c0e45a..daacbbd905 100644 --- a/cumulus/client/relay-chain-interface/Cargo.toml +++ b/cumulus/client/relay-chain-interface/Cargo.toml @@ -23,5 +23,5 @@ parking_lot = "0.12.0" derive_more = "0.99.2" async-trait = "0.1.53" thiserror = "1.0.30" -jsonrpsee-core = "0.9.0" +jsonrpsee-core = "0.10.1" parity-scale-codec = "3.1.2" diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml index 1869683f8e..7d07ace63e 100644 --- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml +++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml @@ -23,7 +23,7 @@ futures = "0.3.21" futures-timer = "3.0.2" parity-scale-codec = "3.1.2" parking_lot = "0.12.0" -jsonrpsee = { version = "0.9.0", features = ["client"] } +jsonrpsee = { version = "0.10.1", features = ["client"] } tracing = "0.1.33" async-trait = "0.1.53" url = "2.2.2"