diff --git a/Cargo.lock b/Cargo.lock index 1b3300a37..a6c97e41a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1134,16 +1134,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "build-helper" version = "0.1.1" @@ -2430,7 +2420,7 @@ dependencies = [ "async-trait", "cumulus-primitives-core", "futures 0.3.30", - "jsonrpsee-core 0.20.3", + "jsonrpsee-core", "parity-scale-codec", "polkadot-overseer", "sc-client-api", @@ -2492,7 +2482,7 @@ dependencies = [ "either", "futures 0.3.30", "futures-timer", - "jsonrpsee 0.20.3", + "jsonrpsee", "parity-scale-codec", "pin-project", "polkadot-overseer", @@ -2662,7 +2652,7 @@ dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", "futures 0.3.30", - "jsonrpsee 0.16.3", + "jsonrpsee", "koi-runtime", "log", "moonbeam-primitives-ext", @@ -3913,7 +3903,7 @@ dependencies = [ "fp-storage", "futures 0.3.30", "hex", - "jsonrpsee 0.20.3", + "jsonrpsee", "libsecp256k1", "log", "pallet-evm", @@ -3958,7 +3948,7 @@ source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c dependencies = [ "ethereum", "ethereum-types", - "jsonrpsee 0.20.3", + "jsonrpsee", "rlp", "rustc-hex", "serde", @@ -4421,7 +4411,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "futures 0.3.30", "indicatif", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -4868,19 +4858,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr 1.9.1", - "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - [[package]] name = "group" version = "0.13.0" @@ -5722,28 +5699,17 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpsee" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" -dependencies = [ - "jsonrpsee-core 0.16.3", - "jsonrpsee-server 0.16.3", - "jsonrpsee-types 0.16.3", -] - [[package]] name = "jsonrpsee" version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ - "jsonrpsee-core 0.20.3", + "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-proc-macros", - "jsonrpsee-server 0.20.3", - "jsonrpsee-types 0.20.3", + "jsonrpsee-server", + "jsonrpsee-types", "jsonrpsee-ws-client", "tokio", "tracing", @@ -5757,7 +5723,7 @@ checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-util", "http 0.2.12", - "jsonrpsee-core 0.20.3", + "jsonrpsee-core", "pin-project", "rustls-native-certs", "soketto", @@ -5769,32 +5735,6 @@ dependencies = [ "url", ] -[[package]] -name = "jsonrpsee-core" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" -dependencies = [ - "anyhow", - "arrayvec 0.7.4", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "globset", - "hyper 0.14.29", - "jsonrpsee-types 0.16.3", - "parking_lot 0.12.3", - "rand", - "rustc-hash", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "jsonrpsee-core" version = "0.20.3" @@ -5808,7 +5748,7 @@ dependencies = [ "futures-timer", "futures-util", "hyper 0.14.29", - "jsonrpsee-types 0.20.3", + "jsonrpsee-types", "parking_lot 0.12.3", "rand", "rustc-hash", @@ -5829,8 +5769,8 @@ dependencies = [ "async-trait", "hyper 0.14.29", "hyper-rustls", - "jsonrpsee-core 0.20.3", - "jsonrpsee-types 0.20.3", + "jsonrpsee-core", + "jsonrpsee-types", "serde", "serde_json", "thiserror", @@ -5853,28 +5793,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "jsonrpsee-server" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" -dependencies = [ - "futures-channel", - "futures-util", - "http 0.2.12", - "hyper 0.14.29", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", - "serde", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tracing", -] - [[package]] name = "jsonrpsee-server" version = "0.20.3" @@ -5884,8 +5802,8 @@ dependencies = [ "futures-util", "http 0.2.12", "hyper 0.14.29", - "jsonrpsee-core 0.20.3", - "jsonrpsee-types 0.20.3", + "jsonrpsee-core", + "jsonrpsee-types", "route-recognizer", "serde", "serde_json", @@ -5898,20 +5816,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-types" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "jsonrpsee-types" version = "0.20.3" @@ -5934,8 +5838,8 @@ checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ "http 0.2.12", "jsonrpsee-client-transport", - "jsonrpsee-core 0.20.3", - "jsonrpsee-types 0.20.3", + "jsonrpsee-core", + "jsonrpsee-types", "url", ] @@ -7032,7 +6936,7 @@ name = "mmr-rpc" version = "28.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee", "parity-scale-codec", "serde", "sp-api", @@ -7127,7 +7031,7 @@ dependencies = [ "ethereum-types", "fc-rpc-core", "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-types", "serde", @@ -7142,7 +7046,7 @@ source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7. dependencies = [ "ethereum-types", "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-types", "serde", @@ -7175,7 +7079,7 @@ dependencies = [ "fp-rpc", "futures 0.3.30", "hex-literal 0.3.4", - "jsonrpsee 0.20.3", + "jsonrpsee", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-debug", "moonbeam-rpc-core-types", @@ -7222,7 +7126,7 @@ dependencies = [ "fc-storage", "fp-rpc", "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "moonbeam-client-evm-tracing", "moonbeam-rpc-core-trace", @@ -9161,7 +9065,7 @@ name = "pallet-transaction-payment-rpc" version = "30.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -10377,7 +10281,7 @@ name = "polkadot-rpc" version = "7.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee", "mmr-rpc", "pallet-transaction-payment-rpc", "polkadot-primitives", @@ -12330,7 +12234,7 @@ version = "0.34.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -12388,7 +12292,7 @@ version = "13.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.3", @@ -12464,7 +12368,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "finality-grandpa", "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "sc-client-api", @@ -12836,7 +12740,7 @@ version = "29.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.3", @@ -12867,7 +12771,7 @@ name = "sc-rpc-api" version = "0.33.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-mixnet", @@ -12888,7 +12792,7 @@ version = "11.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ "http 0.2.12", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", @@ -12906,7 +12810,7 @@ dependencies = [ "futures 0.3.30", "futures-util", "hex", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.3", @@ -12937,7 +12841,7 @@ dependencies = [ "exit-future", "futures 0.3.30", "futures-timer", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.3", @@ -13019,7 +12923,7 @@ name = "sc-sync-state-rpc" version = "0.34.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -13544,7 +13448,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" dependencies = [ - "bstr 0.2.17", + "bstr", "unicode-segmentation", ] @@ -15059,7 +14963,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.30", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "parity-scale-codec", "sc-rpc-api", @@ -15089,7 +14993,7 @@ version = "0.33.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ "async-trait", - "jsonrpsee 0.20.3", + "jsonrpsee", "log", "sc-rpc-api", "serde", @@ -15101,7 +15005,7 @@ name = "substrate-state-trie-migration-rpc" version = "27.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89" dependencies = [ - "jsonrpsee 0.20.3", + "jsonrpsee", "parity-scale-codec", "sc-client-api", "sc-rpc-api", diff --git a/node/Cargo.toml b/node/Cargo.toml index 57c46fdff..8247cfd57 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -15,7 +15,7 @@ array-bytes = { workspace = true } async-trait = { version = "0.1" } clap = { version = "4.4", features = ["derive"] } futures = { version = "0.3" } -jsonrpsee = { version = "0.16", features = ["server"] } +jsonrpsee = { version = "0.20", features = ["server"] } log = { version = "0.4" } serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" }