diff --git a/Cargo.lock b/Cargo.lock index efe523e279..700411246c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -586,7 +586,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c dependencies = [ "beefy-gadget", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -1907,7 +1907,7 @@ dependencies = [ "async-trait", "cumulus-primitives-core", "futures 0.3.28", - "jsonrpsee-core", + "jsonrpsee-core 0.16.2", "parity-scale-codec", "polkadot-overseer", "polkadot-service", @@ -1969,7 +1969,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures 0.3.28", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.16.2", "lru 0.9.0", "parity-scale-codec", "polkadot-service", @@ -2867,7 +2867,7 @@ dependencies = [ "fp-storage", "futures 0.3.28", "hex", - "jsonrpsee", + "jsonrpsee 0.16.2", "libsecp256k1", "log", "lru 0.8.1", @@ -2900,7 +2900,7 @@ source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.39#329 dependencies = [ "ethereum", "ethereum-types", - "jsonrpsee", + "jsonrpsee 0.16.2", "rustc-hex", "serde", "serde_json", @@ -4235,14 +4235,26 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ - "jsonrpsee-core", + "jsonrpsee-core 0.16.2", "jsonrpsee-proc-macros", - "jsonrpsee-server", - "jsonrpsee-types", + "jsonrpsee-server 0.16.2", + "jsonrpsee-types 0.16.2", "jsonrpsee-ws-client", "tracing", ] +[[package]] +name = "jsonrpsee" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de902baa44bf34a58b1a4906f8b840d7d60dcec5f41fe08b4dbc14cf9efa821c" +dependencies = [ + "jsonrpsee-core 0.20.2", + "jsonrpsee-server 0.20.2", + "jsonrpsee-types 0.20.2", + "tokio", +] + [[package]] name = "jsonrpsee-client-transport" version = "0.16.2" @@ -4251,8 +4263,8 @@ checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "pin-project", "rustls-native-certs", "soketto", @@ -4280,7 +4292,30 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.16.2", + "parking_lot 0.12.1", + "rand 0.8.5", + "rustc-hash", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f45d37af23707750136379f6799e76ebfcf2d425ec4e36d0deb7921da5e65c" +dependencies = [ + "anyhow", + "async-trait", + "beef", + "futures-util", + "hyper", + "jsonrpsee-types 0.20.2", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -4315,8 +4350,8 @@ dependencies = [ "futures-util", "http", "hyper", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "serde", "serde_json", "soketto", @@ -4327,6 +4362,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-server" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ed2bec9c76cee118c27138cc1c877938bcaa01207a5d902b80dbfc60466bc9c" +dependencies = [ + "futures-util", + "http", + "hyper", + "jsonrpsee-core 0.20.2", + "jsonrpsee-types 0.20.2", + "route-recognizer", + "serde", + "serde_json", + "soketto", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + [[package]] name = "jsonrpsee-types" version = "0.16.2" @@ -4341,6 +4399,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05eaff23af19f10ba6fbb76519bed6da4d3b9bbaef13d39b7c2b6c14e532d27e" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-client" version = "0.16.2" @@ -4349,8 +4421,8 @@ checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" dependencies = [ "http", "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", ] [[package]] @@ -5164,7 +5236,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.20.2", "litentry-parachain-runtime", "litmus-parachain-runtime", "log", @@ -5638,7 +5710,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ "anyhow", - "jsonrpsee", + "jsonrpsee 0.16.2", "parity-scale-codec", "serde", "sp-api", @@ -5730,7 +5802,7 @@ source = "git+https://github.com/litentry/astar-frame?branch=polkadot-v0.9.39#e8 dependencies = [ "ethereum-types", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-types", "serde", @@ -5745,7 +5817,7 @@ source = "git+https://github.com/litentry/astar-frame?branch=polkadot-v0.9.39#e8 dependencies = [ "ethereum-types", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-types", "serde", @@ -5760,7 +5832,7 @@ dependencies = [ "ethereum", "ethereum-types", "fc-rpc-core", - "jsonrpsee", + "jsonrpsee 0.16.2", "serde", "serde_json", ] @@ -5789,7 +5861,7 @@ dependencies = [ "fp-rpc", "futures 0.3.28", "hex-literal 0.3.4", - "jsonrpsee", + "jsonrpsee 0.16.2", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-debug", "moonbeam-rpc-core-types", @@ -5850,7 +5922,7 @@ dependencies = [ "fc-storage", "fp-rpc", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-trace", "moonbeam-rpc-core-types", @@ -5879,7 +5951,7 @@ dependencies = [ "ethereum-types", "fc-rpc", "frame-system", - "jsonrpsee", + "jsonrpsee 0.16.2", "moonbeam-rpc-core-txpool", "moonbeam-rpc-primitives-txpool", "rlp", @@ -7652,7 +7724,7 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.2", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -8872,7 +8944,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.39#c22e dependencies = [ "beefy-gadget", "beefy-gadget-rpc", - "jsonrpsee", + "jsonrpsee 0.16.2", "mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -10173,6 +10245,12 @@ dependencies = [ "sp-weights", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rpassword" version = "7.2.0" @@ -10738,7 +10816,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -10905,7 +10983,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c dependencies = [ "finality-grandpa", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", @@ -11184,7 +11262,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11213,7 +11291,7 @@ name = "sc-rpc-api" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", @@ -11233,7 +11311,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ "http", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "serde_json", "substrate-prometheus-endpoint", @@ -11251,7 +11329,7 @@ dependencies = [ "futures 0.3.28", "futures-util", "hex", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11278,7 +11356,7 @@ dependencies = [ "exit-future", "futures 0.3.28", "futures-timer", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11366,7 +11444,7 @@ name = "sc-sync-state-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -12936,7 +13014,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.28", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-rpc-api", @@ -12966,7 +13044,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ "async-trait", - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "sc-rpc-api", "serde", @@ -12978,7 +13056,7 @@ name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", diff --git a/node/Cargo.toml b/node/Cargo.toml index 61ccdf68c6..1eff537de8 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -57,7 +57,7 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate # RPC related dependencies frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } -jsonrpsee = { version = "0.16.2", features = ["server"] } +jsonrpsee = { version = "0.20.2", features = ["server"] } pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" } sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39" }