diff --git a/Cargo.lock b/Cargo.lock index eda24333..49d9d120 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -561,7 +561,7 @@ dependencies = [ "beefy-gadget", "beefy-primitives", "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parking_lot 0.12.0", @@ -1936,7 +1936,7 @@ dependencies = [ "cumulus-primitives-core", "derive_more", "futures 0.3.21", - "jsonrpsee-core", + "jsonrpsee-core 0.13.1", "parity-scale-codec", "parking_lot 0.12.0", "polkadot-overseer", @@ -1962,7 +1962,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.21", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.13.1", "parity-scale-codec", "parking_lot 0.12.0", "polkadot-service", @@ -2605,7 +2605,7 @@ dependencies = [ "fp-storage", "futures 0.3.21", "hex", - "jsonrpsee", + "jsonrpsee 0.13.1", "libsecp256k1", "log", "lru 0.7.7", @@ -2637,7 +2637,7 @@ source = "git+https://github.com/web3labs/frontier?branch=polkadot-v0.9.24#82d14 dependencies = [ "ethereum", "ethereum-types", - "jsonrpsee", + "jsonrpsee 0.13.1", "rlp", "rustc-hex", "serde", @@ -3579,9 +3579,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", @@ -3690,7 +3690,7 @@ dependencies = [ "hex-literal", "jsonrpc-core", "jsonrpc-pubsub", - "jsonrpsee", + "jsonrpsee 0.15.0", "log", "pallet-base-fee", "pallet-contracts-rpc", @@ -3991,15 +3991,27 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" dependencies = [ - "jsonrpsee-core", - "jsonrpsee-http-server", + "jsonrpsee-core 0.13.1", + "jsonrpsee-http-server 0.13.1", "jsonrpsee-proc-macros", - "jsonrpsee-types", + "jsonrpsee-types 0.13.1", "jsonrpsee-ws-client", - "jsonrpsee-ws-server", + "jsonrpsee-ws-server 0.13.1", "tracing", ] +[[package]] +name = "jsonrpsee" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d966710cd10f992b87107c3b54f9301738892cf5692a5730a362957cc927e3c" +dependencies = [ + "jsonrpsee-core 0.15.0", + "jsonrpsee-http-server 0.15.0", + "jsonrpsee-types 0.15.0", + "jsonrpsee-ws-server 0.15.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.13.1" @@ -4008,8 +4020,8 @@ checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" dependencies = [ "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", "pin-project 1.0.10", "rustls-native-certs", "soketto", @@ -4036,7 +4048,7 @@ dependencies = [ "futures-timer", "futures-util", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.13.1", "parking_lot 0.12.0", "rand 0.8.5", "rustc-hash", @@ -4048,6 +4060,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-core" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411236b4379b4d9e252b557ba3a9137c7fad5fdc944f2a29347db7c9edc929ee" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "futures-util", + "globset", + "http", + "hyper", + "jsonrpsee-types 0.15.0", + "lazy_static", + "parking_lot 0.12.0", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", + "unicase", +] + [[package]] name = "jsonrpsee-http-server" version = "0.13.1" @@ -4058,8 +4099,8 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", "lazy_static", "serde_json", "tokio", @@ -4067,6 +4108,24 @@ dependencies = [ "unicase", ] +[[package]] +name = "jsonrpsee-http-server" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80722337131d5a6b3e3928bf70944176ee6af6c31429c18483cad933962d7003" +dependencies = [ + "futures-channel", + "futures-util", + "hyper", + "jsonrpsee-core 0.15.0", + "jsonrpsee-types 0.15.0", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-futures", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.13.1" @@ -4093,6 +4152,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e88f208ac5004389f0063e87bd7463f5e864ff1ac40484f80e8432976ffa0a" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.13.1" @@ -4100,8 +4173,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", ] [[package]] @@ -4112,13 +4185,33 @@ checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" dependencies = [ "futures-channel", "futures-util", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.13.1", + "jsonrpsee-types 0.13.1", + "serde_json", + "soketto", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "jsonrpsee-ws-server" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637e02fdb87d2c5b5c518e1a4abc1a664768a2ca0797e5c06f5454ce7e4efe5" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "jsonrpsee-core 0.15.0", + "jsonrpsee-types 0.15.0", "serde_json", "soketto", "tokio", + "tokio-stream", "tokio-util", "tracing", + "tracing-futures", ] [[package]] @@ -6068,7 +6161,7 @@ name = "pallet-contracts-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.13.1", "pallet-contracts-primitives", "pallet-contracts-rpc-runtime-api", "parity-scale-codec", @@ -6405,7 +6498,7 @@ name = "pallet-mmr-rpc" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.13.1", "parity-scale-codec", "serde", "sp-api", @@ -6778,7 +6871,7 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.13.1", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -7955,7 +8048,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.24#2283 dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpsee", + "jsonrpsee 0.13.1", "pallet-mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -8872,7 +8965,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "env_logger", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "serde", @@ -9531,7 +9624,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -9568,7 +9661,7 @@ dependencies = [ "assert_matches", "async-trait", "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -9754,7 +9847,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#81 dependencies = [ "finality-grandpa", "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -9988,7 +10081,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#81 dependencies = [ "futures 0.3.21", "hash-db", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parking_lot 0.12.0", @@ -10017,7 +10110,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parking_lot 0.12.0", @@ -10040,7 +10133,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "serde_json", "substrate-prometheus-endpoint", @@ -10058,7 +10151,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "hash-db", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parity-util-mem", @@ -10131,7 +10224,7 @@ name = "sc-sync-state-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.13.1", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -11695,7 +11788,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#81 dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -11727,7 +11820,7 @@ name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -12023,6 +12116,17 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.8", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.1" @@ -12252,7 +12356,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "clap 3.2.8", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "remote-externalities", diff --git a/node/Cargo.toml b/node/Cargo.toml index ea53debc..fa52a2d3 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -20,7 +20,7 @@ async-trait = "0.1" serde = { version = "1.0", features = [ "derive" ] } clap = { version = "3.2", features = ["derive"] } jsonrpc-pubsub = "18.0.0" -jsonrpsee = { version = "0.13.0", features = ["server"] } +jsonrpsee = { version = "0.15.0", features = ["server"] } futures = "0.3" log = "0.4.8" serde_json = "1.0"