diff --git a/Cargo.lock b/Cargo.lock index 679aaafcc2596..3f3528a2a3e0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2786,7 +2786,7 @@ dependencies = [ "failure", "futures 0.1.31", "hyper 0.12.36", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-pubsub", "log", "serde", @@ -2807,6 +2807,19 @@ dependencies = [ "serde_json", ] +[[package]] +name = "jsonrpc-core" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07569945133257ff557eb37b015497104cea61a2c9edaf126c1cbd6e8332397f" +dependencies = [ + "futures 0.3.13", + "log", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "jsonrpc-core-client" version = "15.1.0" @@ -2835,7 +2848,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" dependencies = [ "hyper 0.12.36", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log", "net2", @@ -2849,7 +2862,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf50e53e4eea8f421a7316c5f63e395f7bc7c4e786a6dc54d76fab6ff7aa7ce7" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log", "parity-tokio-ipc", @@ -2863,7 +2876,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "639558e0604013be9787ae52f798506ae42bf4220fe587bdc5625871cc8b9c77" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "log", "parking_lot 0.10.2", "rand 0.7.3", @@ -2878,7 +2891,7 @@ checksum = "72f1f3990650c033bd8f6bd46deac76d990f9bbfb5f8dc8c4767bf0a00392176" dependencies = [ "bytes 0.4.12", "globset", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "lazy_static", "log", "tokio 0.1.22", @@ -2892,7 +2905,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6596fe75209b73a2a75ebe1dce4e60e03b88a2b25e8807b667597f6315150d22" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log", "parity-ws", @@ -4058,7 +4071,7 @@ version = "2.0.0" dependencies = [ "futures 0.3.13", "futures-timer 3.0.2", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "libp2p", "node-cli", "sc-rpc-api", @@ -4219,7 +4232,7 @@ dependencies = [ name = "node-rpc" version = "2.0.0" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 17.0.0", "node-primitives", "pallet-contracts-rpc", "pallet-mmr-rpc", @@ -4341,7 +4354,7 @@ version = "3.0.0" dependencies = [ "frame-benchmarking", "frame-benchmarking-cli", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "node-template-runtime", "pallet-transaction-payment-rpc", "sc-basic-authorship", @@ -4814,7 +4827,7 @@ dependencies = [ name = "pallet-contracts-rpc" version = "3.0.0" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "pallet-contracts-primitives", @@ -5133,7 +5146,7 @@ dependencies = [ name = "pallet-mmr-rpc" version = "3.0.0" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "pallet-mmr-primitives", @@ -5504,7 +5517,7 @@ dependencies = [ name = "pallet-transaction-payment-rpc" version = "3.0.0" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "pallet-transaction-payment-rpc-runtime-api", @@ -7175,7 +7188,7 @@ version = "0.9.0" dependencies = [ "derive_more", "futures 0.3.13", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "sc-consensus", @@ -7218,7 +7231,7 @@ dependencies = [ "async-trait", "derive_more", "futures 0.3.13", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "log", @@ -7457,7 +7470,7 @@ dependencies = [ "derive_more", "finality-grandpa", "futures 0.3.13", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", @@ -7734,7 +7747,7 @@ dependencies = [ "futures 0.1.31", "futures 0.3.13", "hash-db", - "jsonrpc-core", + "jsonrpc-core 15.1.0", "jsonrpc-pubsub", "lazy_static", "log", @@ -7774,7 +7787,7 @@ version = "0.9.0" dependencies = [ "derive_more", "futures 0.3.13", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", @@ -7796,7 +7809,7 @@ name = "sc-rpc-server" version = "3.0.0" dependencies = [ "futures 0.1.31", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-http-server", "jsonrpc-ipc-server", "jsonrpc-pubsub", @@ -7834,7 +7847,7 @@ dependencies = [ "futures 0.3.13", "futures-timer 3.0.2", "hash-db", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-pubsub", "lazy_static", "log", @@ -7946,7 +7959,7 @@ dependencies = [ name = "sc-sync-state-rpc" version = "0.9.0" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "sc-chain-spec", @@ -9417,7 +9430,7 @@ dependencies = [ "frame-system", "futures 0.3.13", "jsonrpc-client-transports", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "parity-scale-codec", "sc-rpc-api", "serde", @@ -9431,7 +9444,7 @@ version = "3.0.0" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.13", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "jsonrpc-core-client", "jsonrpc-derive", "log", @@ -9697,7 +9710,7 @@ dependencies = [ "env_logger 0.7.1", "frame-system", "futures 0.3.13", - "jsonrpc-core", + "jsonrpc-core 17.0.0", "log", "sc-basic-authorship", "sc-cli", diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml index e53320c940510..cb33600107a38 100644 --- a/bin/node-template/node/Cargo.toml +++ b/bin/node-template/node/Cargo.toml @@ -37,7 +37,7 @@ sc-client-api = { version = "3.0.0", path = "../../../client/api" } sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" } # These dependencies are used for the node template's RPCs -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" sc-rpc = { version = "3.0.0", path = "../../../client/rpc" } sp-api = { version = "3.0.0", path = "../../../primitives/api" } sc-rpc-api = { version = "0.9.0", path = "../../../client/rpc-api" } diff --git a/bin/node/browser-testing/Cargo.toml b/bin/node/browser-testing/Cargo.toml index 93bf8f5131e3f..41e679553c0a3 100644 --- a/bin/node/browser-testing/Cargo.toml +++ b/bin/node/browser-testing/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" [dependencies] futures-timer = "3.0.2" libp2p = { version = "0.37.1", default-features = false } -jsonrpc-core = "15.0.0" +jsonrpc-core = "17.0.0" serde = "1.0.106" serde_json = "1.0.48" wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] } diff --git a/bin/node/rpc/Cargo.toml b/bin/node/rpc/Cargo.toml index fc1701d1856f8..fe11e7a487617 100644 --- a/bin/node/rpc/Cargo.toml +++ b/bin/node/rpc/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/paritytech/substrate/" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" node-primitives = { version = "2.0.0", path = "../primitives" } pallet-contracts-rpc = { version = "3.0.0", path = "../../../frame/contracts/rpc/" } pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" } diff --git a/client/consensus/babe/rpc/Cargo.toml b/client/consensus/babe/rpc/Cargo.toml index 71a1205e3c7aa..d20e63cc0472c 100644 --- a/client/consensus/babe/rpc/Cargo.toml +++ b/client/consensus/babe/rpc/Cargo.toml @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] sc-consensus-babe = { version = "0.9.0", path = "../" } sc-rpc-api = { version = "0.9.0", path = "../../../rpc-api" } -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" jsonrpc-core-client = "15.1.0" jsonrpc-derive = "15.1.0" sp-consensus-babe = { version = "0.9.0", path = "../../../../primitives/consensus/babe" } diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml index 32cc89034fb1d..747541b711a32 100644 --- a/client/consensus/manual-seal/Cargo.toml +++ b/client/consensus/manual-seal/Cargo.toml @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] derive_more = "0.99.2" futures = "0.3.9" -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" jsonrpc-core-client = "15.1.0" jsonrpc-derive = "15.1.0" log = "0.4.8" diff --git a/client/rpc-api/Cargo.toml b/client/rpc-api/Cargo.toml index d213decdbc779..dda691e05b0d6 100644 --- a/client/rpc-api/Cargo.toml +++ b/client/rpc-api/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "2.0.0" } derive_more = "0.99.2" futures = { version = "0.3.1", features = ["compat"] } -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" jsonrpc-core-client = "15.1.0" jsonrpc-derive = "15.1.0" jsonrpc-pubsub = "15.1.0" diff --git a/client/rpc-servers/Cargo.toml b/client/rpc-servers/Cargo.toml index 95c3e4194cd51..872c366379e66 100644 --- a/client/rpc-servers/Cargo.toml +++ b/client/rpc-servers/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] futures = "0.1.6" -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" pubsub = { package = "jsonrpc-pubsub", version = "15.1.0" } log = "0.4.8" prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.9.0"} diff --git a/client/service/Cargo.toml b/client/service/Cargo.toml index cff05390d7874..6d3a61044db99 100644 --- a/client/service/Cargo.toml +++ b/client/service/Cargo.toml @@ -28,7 +28,7 @@ thiserror = "1.0.21" futures01 = { package = "futures", version = "0.1.29" } futures = { version = "0.3.4", features = ["compat"] } jsonrpc-pubsub = "15.1" -jsonrpc-core = "15.1" +jsonrpc-core = "17.0" rand = "0.7.3" parking_lot = "0.11.1" lazy_static = "1.4.0" diff --git a/client/sync-state-rpc/Cargo.toml b/client/sync-state-rpc/Cargo.toml index 3ec48ac9ec570..0498248397740 100644 --- a/client/sync-state-rpc/Cargo.toml +++ b/client/sync-state-rpc/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] thiserror = "1.0.21" -jsonrpc-core = "15.0" +jsonrpc-core = "17.0" jsonrpc-core-client = "15.0" jsonrpc-derive = "15.0" sc-chain-spec = { version = "3.0.0", path = "../chain-spec" } diff --git a/frame/contracts/rpc/Cargo.toml b/frame/contracts/rpc/Cargo.toml index dbd4356acc4a9..509f67d6175dd 100644 --- a/frame/contracts/rpc/Cargo.toml +++ b/frame/contracts/rpc/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2" } -jsonrpc-core = "15" +jsonrpc-core = "17" jsonrpc-core-client = "15" jsonrpc-derive = "15" serde = { version = "1", features = ["derive"] } diff --git a/frame/merkle-mountain-range/rpc/Cargo.toml b/frame/merkle-mountain-range/rpc/Cargo.toml index 4730dbc7ea42e..1637f7bf0ddee 100644 --- a/frame/merkle-mountain-range/rpc/Cargo.toml +++ b/frame/merkle-mountain-range/rpc/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" jsonrpc-core-client = "15.1.0" jsonrpc-derive = "15.1.0" pallet-mmr-primitives = { version = "3.0.0", path = "../primitives" } diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml index 102f91dcc2c08..75004d56aa1e2 100644 --- a/frame/transaction-payment/rpc/Cargo.toml +++ b/frame/transaction-payment/rpc/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" jsonrpc-core-client = "15.1.0" jsonrpc-derive = "15.1.0" sp-core = { version = "3.0.0", path = "../../../primitives/core" } diff --git a/test-utils/test-runner/Cargo.toml b/test-utils/test-runner/Cargo.toml index 9e1f9fee02189..fb4438a3458cc 100644 --- a/test-utils/test-runner/Cargo.toml +++ b/test-utils/test-runner/Cargo.toml @@ -49,4 +49,4 @@ futures = { package = "futures", version = "0.3", features = ["compat"] } tokio = { version = "0.2", features = ["full"] } # Calling RPC -jsonrpc-core = "15.1" +jsonrpc-core = "17.0" diff --git a/utils/frame/rpc/support/Cargo.toml b/utils/frame/rpc/support/Cargo.toml index ca3705b499a22..3c57180a670ed 100644 --- a/utils/frame/rpc/support/Cargo.toml +++ b/utils/frame/rpc/support/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] futures = { version = "0.3.0", features = ["compat"] } jsonrpc-client-transports = { version = "15.1.0", default-features = false, features = ["http"] } -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" codec = { package = "parity-scale-codec", version = "2.0.0" } serde = "1" frame-support = { version = "3.0.0", path = "../../../../frame/support" } diff --git a/utils/frame/rpc/system/Cargo.toml b/utils/frame/rpc/system/Cargo.toml index ea8d97a82ad34..c327a0f9a11f2 100644 --- a/utils/frame/rpc/system/Cargo.toml +++ b/utils/frame/rpc/system/Cargo.toml @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"] sc-client-api = { version = "3.0.0", path = "../../../../client/api" } codec = { package = "parity-scale-codec", version = "2.0.0" } futures = { version = "0.3.4", features = ["compat"] } -jsonrpc-core = "15.1.0" +jsonrpc-core = "17.0.0" jsonrpc-core-client = "15.1.0" jsonrpc-derive = "15.1.0" log = "0.4.8"