diff --git a/Cargo.lock b/Cargo.lock index 89ff2b9c669..1e3e978cdc0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -502,7 +502,7 @@ dependencies = [ "beefy-gadget", "beefy-primitives", "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -1964,7 +1964,7 @@ dependencies = [ "async-trait", "cumulus-primitives-core", "futures", - "jsonrpsee-core", + "jsonrpsee-core 0.15.1", "parity-scale-codec", "polkadot-overseer", "polkadot-service", @@ -2028,7 +2028,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.16.1", "parity-scale-codec", "polkadot-service", "sc-client-api", @@ -2150,7 +2150,7 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures", - "jsonrpsee", + "jsonrpsee 0.16.1", "pallet-transaction-payment", "parachains-common", "parity-scale-codec", @@ -3799,15 +3799,27 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.15.1", "jsonrpsee-http-server", "jsonrpsee-proc-macros", - "jsonrpsee-types", - "jsonrpsee-ws-client", + "jsonrpsee-types 0.15.1", + "jsonrpsee-ws-client 0.15.1", "jsonrpsee-ws-server", "tracing", ] +[[package]] +name = "jsonrpsee" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5af9646e616e37c61093ef85e25bd883ae0c22e2fa1e6eedfe590048247116e3" +dependencies = [ + "jsonrpsee-core 0.16.1", + "jsonrpsee-server", + "jsonrpsee-types 0.16.1", + "jsonrpsee-ws-client 0.16.1", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.15.1" @@ -3816,8 +3828,29 @@ checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" dependencies = [ "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", + "pin-project", + "rustls-native-certs", + "soketto", + "thiserror", + "tokio", + "tokio-rustls", + "tokio-util 0.7.1", + "tracing", + "webpki-roots", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e85cfc9c2f17eab237fdfa2efe5c1608fd06a90e1e0d7fd7b10f2d0e153f375" +dependencies = [ + "futures-util", + "http", + "jsonrpsee-core 0.16.1", + "jsonrpsee-types 0.16.1", "pin-project", "rustls-native-certs", "soketto", @@ -3846,7 +3879,7 @@ dependencies = [ "globset", "http", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.15.1", "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", @@ -3861,6 +3894,34 @@ dependencies = [ "unicase", ] +[[package]] +name = "jsonrpsee-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673d68136e2f0f67323bab95b3a7177df26ac21ddbf395fc32d60f30fe5a1364" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-lock", + "async-trait", + "beef", + "futures-channel", + "futures-timer", + "futures-util", + "globset", + "hyper", + "jsonrpsee-types 0.16.1", + "parking_lot 0.12.1", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "jsonrpsee-http-server" version = "0.15.1" @@ -3870,8 +3931,8 @@ dependencies = [ "futures-channel", "futures-util", "hyper", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", "serde", "serde_json", "tokio", @@ -3891,6 +3952,28 @@ dependencies = [ "syn", ] +[[package]] +name = "jsonrpsee-server" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78f34520019321bd466d00620606db2f40827362d0185b3b95040328eb502f6" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "hyper", + "jsonrpsee-core 0.16.1", + "jsonrpsee-types 0.16.1", + "serde", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util 0.7.1", + "tower", + "tracing", +] + [[package]] name = "jsonrpsee-types" version = "0.15.1" @@ -3905,6 +3988,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7985a27ee315c7c8c5c5033ac133e9472aec881edfd947780f5a9970efb7cbbf" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.15.1" @@ -3912,9 +4009,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ee5feddd5188e62ac08fcf0e56478138e581509d4730f3f7be9b57dd402a4ff" dependencies = [ "http", - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-client-transport 0.15.1", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", +] + +[[package]] +name = "jsonrpsee-ws-client" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480fc9922f10b8fca3f07c07c51e137ddcf13fd60a304f117cfaa9e9bf41c60b" +dependencies = [ + "http", + "jsonrpsee-client-transport 0.16.1", + "jsonrpsee-core 0.16.1", + "jsonrpsee-types 0.16.1", ] [[package]] @@ -3926,8 +4035,8 @@ dependencies = [ "futures-channel", "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", "serde_json", "soketto", "tokio", @@ -5805,7 +5914,7 @@ version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ "anyhow", - "jsonrpsee", + "jsonrpsee 0.15.1", "parity-scale-codec", "serde", "sp-api", @@ -6229,7 +6338,7 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -6394,7 +6503,7 @@ dependencies = [ "cumulus-relay-chain-rpc-interface", "frame-benchmarking", "frame-benchmarking-cli", - "jsonrpsee", + "jsonrpsee 0.16.1", "log", "pallet-transaction-payment-rpc", "parachain-template-runtime", @@ -7651,7 +7760,7 @@ dependencies = [ "frame-benchmarking-cli", "futures", "hex-literal", - "jsonrpsee", + "jsonrpsee 0.16.1", "log", "nix 0.25.0", "pallet-transaction-payment-rpc", @@ -7757,7 +7866,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=master#80651592e85ef dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpsee", + "jsonrpsee 0.15.1", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -9450,7 +9559,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -9628,7 +9737,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917 dependencies = [ "finality-grandpa", "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "sc-client-api", @@ -9914,7 +10023,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917 dependencies = [ "futures", "hash-db", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9943,7 +10052,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9966,7 +10075,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "serde_json", "substrate-prometheus-endpoint", @@ -9980,7 +10089,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917 dependencies = [ "futures", "hex", - "jsonrpsee", + "jsonrpsee 0.15.1", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", @@ -10003,7 +10112,7 @@ dependencies = [ "futures", "futures-timer", "hash-db", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parity-util-mem", @@ -10082,7 +10191,7 @@ name = "sc-sync-state-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -10711,6 +10820,7 @@ dependencies = [ "bytes", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -11743,7 +11853,7 @@ source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917 dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "sc-client-api", @@ -11776,7 +11886,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ "async-trait", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "sc-rpc-api", "serde", @@ -11788,7 +11898,7 @@ name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=master#a73a35eaf917f26612f56395325017576ac7ce0f" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "sc-client-api", @@ -12190,6 +12300,23 @@ dependencies = [ "serde", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.1" @@ -12203,6 +12330,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", diff --git a/client/relay-chain-rpc-interface/Cargo.toml b/client/relay-chain-rpc-interface/Cargo.toml index f7077458a18..fd198f2df25 100644 --- a/client/relay-chain-rpc-interface/Cargo.toml +++ b/client/relay-chain-rpc-interface/Cargo.toml @@ -25,7 +25,7 @@ tokio = { version = "1.21.2", features = ["sync"] } futures = "0.3.25" futures-timer = "3.0.2" parity-scale-codec = "3.2.1" -jsonrpsee = { version = "0.15.1", features = ["ws-client"] } +jsonrpsee = { version = "0.16.1", features = ["ws-client"] } tracing = "0.1.37" async-trait = "0.1.58" url = "2.3.1" diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml index 74a659f27c1..7ca519282dd 100644 --- a/parachain-template/node/Cargo.toml +++ b/parachain-template/node/Cargo.toml @@ -14,7 +14,7 @@ clap = { version = "4.0.25", features = ["derive"] } log = "0.4.17" codec = { package = "parity-scale-codec", version = "3.0.0" } serde = { version = "1.0.145", features = ["derive"] } -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.1", features = ["server"] } # Local parachain-template-runtime = { path = "../runtime" } diff --git a/polkadot-parachain/Cargo.toml b/polkadot-parachain/Cargo.toml index 9748defb8bf..3b098b63ba1 100644 --- a/polkadot-parachain/Cargo.toml +++ b/polkadot-parachain/Cargo.toml @@ -29,7 +29,7 @@ westmint-runtime = { path = "../parachains/runtimes/assets/westmint" } collectives-polkadot-runtime = { path = "../parachains/runtimes/collectives/collectives-polkadot" } contracts-rococo-runtime = { path = "../parachains/runtimes/contracts/contracts-rococo" } penpal-runtime = { path = "../parachains/runtimes/testing/penpal" } -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.1", features = ["server"] } parachains-common = { path = "../parachains/common" } # Substrate diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index c1b36c3206c..fdc60bcdafd 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -13,7 +13,7 @@ async-trait = "0.1.58" clap = { version = "4.0.25", features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.0.0" } criterion = { version = "0.4.0", features = [ "async_tokio" ] } -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.1", features = ["server"] } rand = "0.8.5" serde = { version = "1.0.145", features = ["derive"] } tokio = { version = "1.21.2", features = ["macros"] }