diff --git a/Cargo.lock b/Cargo.lock index 4ab13d36..660c03b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -575,7 +575,7 @@ dependencies = [ "beefy-gadget", "beefy-primitives", "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -1958,7 +1958,7 @@ dependencies = [ "cumulus-primitives-core", "derive_more", "futures 0.3.25", - "jsonrpsee-core", + "jsonrpsee-core 0.13.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-overseer", @@ -1984,7 +1984,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.25", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.13.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-service", @@ -2627,7 +2627,7 @@ dependencies = [ "fp-storage", "futures 0.3.25", "hex", - "jsonrpsee", + "jsonrpsee 0.13.1", "libsecp256k1", "log", "lru 0.7.8", @@ -2659,7 +2659,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", @@ -3723,7 +3723,7 @@ dependencies = [ "hex-literal", "jsonrpc-core", "jsonrpc-pubsub", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "pallet-base-fee", "pallet-contracts-rpc", @@ -4220,15 +4220,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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" +dependencies = [ + "jsonrpsee-core 0.15.1", + "jsonrpsee-http-server 0.15.1", + "jsonrpsee-types 0.15.1", + "jsonrpsee-ws-server 0.15.1", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.13.1" @@ -4237,8 +4249,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.12", "rustls-native-certs", "soketto", @@ -4265,7 +4277,7 @@ dependencies = [ "futures-timer", "futures-util", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.13.1", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -4277,6 +4289,35 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-core" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" +dependencies = [ + "anyhow", + "arrayvec 0.7.2", + "async-trait", + "beef", + "futures-channel", + "futures-util", + "globset", + "http", + "hyper", + "jsonrpsee-types 0.15.1", + "lazy_static", + "parking_lot 0.12.1", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", + "unicase", +] + [[package]] name = "jsonrpsee-http-server" version = "0.13.1" @@ -4287,8 +4328,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", @@ -4296,6 +4337,24 @@ dependencies = [ "unicase", ] +[[package]] +name = "jsonrpsee-http-server" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" +dependencies = [ + "futures-channel", + "futures-util", + "hyper", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-futures", +] + [[package]] name = "jsonrpsee-proc-macros" version = "0.13.1" @@ -4322,6 +4381,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.13.1" @@ -4329,8 +4402,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]] @@ -4341,8 +4414,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", @@ -4350,6 +4423,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-ws-server" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "tracing-futures", +] + [[package]] name = "k256" version = "0.10.4" @@ -6410,7 +6503,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", @@ -6747,7 +6840,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", @@ -7120,7 +7213,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", @@ -8298,7 +8391,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", @@ -9209,7 +9302,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", @@ -9874,7 +9967,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -9911,7 +10004,7 @@ dependencies = [ "assert_matches", "async-trait", "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -10097,7 +10190,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#81 dependencies = [ "finality-grandpa", "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -10331,7 +10424,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#81 dependencies = [ "futures 0.3.25", "hash-db", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -10360,7 +10453,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -10383,7 +10476,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "serde_json", "substrate-prometheus-endpoint", @@ -10401,7 +10494,7 @@ dependencies = [ "futures 0.3.25", "futures-timer", "hash-db", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "parity-util-mem", @@ -10474,7 +10567,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", @@ -12072,7 +12165,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#81 dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.25", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "sc-client-api", @@ -12104,7 +12197,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", @@ -12401,6 +12494,17 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.9", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.3" @@ -12630,7 +12734,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.24#814752f60ab8cce7e2ece3ce0c1b10799b4eab28" dependencies = [ "clap 3.2.20", - "jsonrpsee", + "jsonrpsee 0.13.1", "log", "parity-scale-codec", "remote-externalities", diff --git a/node/Cargo.toml b/node/Cargo.toml index 80305cdb..6a9e9edb 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.1", features = ["server"] } futures = "0.3" log = "0.4.8" serde_json = "1.0"