diff --git a/Cargo.lock b/Cargo.lock index a0b8c5b7..64a0d7dc 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", @@ -3690,7 +3690,7 @@ dependencies = [ "hex-literal", "jsonrpc-core", "jsonrpc-pubsub", - "jsonrpsee", + "jsonrpsee 0.14.0", "log", "pallet-base-fee", "pallet-contracts-rpc", @@ -3987,15 +3987,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.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" +dependencies = [ + "jsonrpsee-core 0.14.0", + "jsonrpsee-http-server 0.14.0", + "jsonrpsee-types 0.14.0", + "jsonrpsee-ws-server 0.14.0", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.13.1" @@ -4004,8 +4016,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", @@ -4032,7 +4044,34 @@ dependencies = [ "futures-timer", "futures-util", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.13.1", + "parking_lot 0.12.0", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16efcd4477de857d4a2195a45769b2fe9ebb54f3ef5a4221d3b014a4fe33ec0b" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "futures-util", + "globset", + "hyper", + "jsonrpsee-types 0.14.0", + "lazy_static", "parking_lot 0.12.0", "rand 0.8.5", "rustc-hash", @@ -4042,6 +4081,7 @@ dependencies = [ "thiserror", "tokio", "tracing", + "unicase", ] [[package]] @@ -4054,8 +4094,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", @@ -4063,6 +4103,23 @@ dependencies = [ "unicase", ] +[[package]] +name = "jsonrpsee-http-server" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd69efeb3ce2cba767f126872f4eeb4624038a29098e75d77608b2b4345ad03" +dependencies = [ + "futures-channel", + "futures-util", + "hyper", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "serde", + "serde_json", + "tokio", + "tracing", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.13.1" @@ -4089,6 +4146,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcf76cd316f5d3ad48138085af1f45e2c58c98e02f0779783dbb034d43f7c86" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.13.1" @@ -4096,8 +4167,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]] @@ -4108,8 +4179,8 @@ 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", @@ -4117,6 +4188,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-ws-server" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd2e4d266774a671f8def3794255b28eddd09b18d76e0b913fa439f34588c0a" +dependencies = [ + "futures-channel", + "futures-util", + "jsonrpsee-core 0.14.0", + "jsonrpsee-types 0.14.0", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + [[package]] name = "k256" version = "0.10.4" @@ -6064,7 +6153,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", @@ -6401,7 +6490,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", @@ -6774,7 +6863,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", @@ -7951,7 +8040,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", @@ -8868,7 +8957,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", @@ -9527,7 +9616,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", @@ -9564,7 +9653,7 @@ dependencies = [ "assert_matches", "async-trait", "futures 0.3.21", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -9750,7 +9839,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", @@ -9984,7 +10073,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", @@ -10013,7 +10102,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", @@ -10036,7 +10125,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", @@ -10054,7 +10143,7 @@ dependencies = [ "futures 0.3.21", "futures-timer", "hash-db", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parity-util-mem", @@ -10127,7 +10216,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", @@ -11599,7 +11688,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", @@ -11631,7 +11720,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", @@ -11927,6 +12016,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" @@ -12156,7 +12256,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 3db2ffd0..8a423fab 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.14.0", features = ["server"] } futures = "0.3" log = "0.4.8" serde_json = "1.0"