Switch jsonrpsee to workspace dep

# Conflicts: # Cargo.toml # cumulus/client/relay-chain-rpc-interface/Cargo.toml # cumulus/test/service/Cargo.toml # substrate/client/merkle-mountain-range/rpc/Cargo.toml # substrate/client/sync-state-rpc/Cargo.toml # substrate/frame/transaction-payment/rpc/Cargo.toml # substrate/utils/frame/remote-externalities/Cargo.toml # substrate/utils/frame/rpc/support/Cargo.toml # substrate/utils/frame/rpc/system/Cargo.toml
paritytech · May 6, 2024 · 11faf04 · 11faf04
1 parent 86704a7
commit 11faf04
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 27 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -564,6 +564,8 @@ bitflags =  "1.3.2"
 bs58 = { version = "0.5.0", default-features = false }
 criterion = { version = "0.5.1", default-features = false }
 itertools = "0.11.0"
+jsonrpsee = "0.22.5"
+jsonrpsee-core = "0.22.5"
 nix = "0.27.1"
 polkavm = "0.9.3"
 polkavm-linker = "0.9.2"

diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml
@@ -15,7 +15,7 @@ async-std = { version = "1.9.0", features = ["attributes"] }
 async-trait = "0.1.79"
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.30"
-jsonrpsee = { version = "0.22", features = ["macros", "ws-client"] }
+jsonrpsee = { workspace = true, features = ["macros", "ws-client"] }
 log = { workspace = true }
 num-traits = "0.2"
 rand = { workspace = true, default-features = true }

diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -22,5 +22,5 @@ sc-client-api = { path = "../../../substrate/client/api" }
 futures = "0.3.28"
 async-trait = "0.1.79"
 thiserror = { workspace = true }
-jsonrpsee-core = "0.22"
+jsonrpsee-core = { workspace = true }
 parity-scale-codec = "3.6.4"
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -33,7 +33,7 @@ tokio-util = { workspace = true, features = ["compat"] }
 futures = "0.3.28"
 futures-timer = "3.0.2"
 parity-scale-codec = "3.6.4"
-jsonrpsee = { version = "0.22", features = ["ws-client"] }
+jsonrpsee = { workspace = true, features = ["ws-client"] }
 tracing = { workspace = true, default-features = true }
 async-trait = "0.1.79"
 url = "2.4.0"

diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
@@ -38,7 +38,7 @@ coretime-rococo-runtime = { path = "../parachains/runtimes/coretime/coretime-roc
 coretime-westend-runtime = { path = "../parachains/runtimes/coretime/coretime-westend" }
 bridge-hub-westend-runtime = { path = "../parachains/runtimes/bridge-hubs/bridge-hub-westend" }
 penpal-runtime = { path = "../parachains/runtimes/testing/penpal" }
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 people-rococo-runtime = { path = "../parachains/runtimes/people/people-rococo" }
 people-westend-runtime = { path = "../parachains/runtimes/people/people-westend" }
 parachains-common = { path = "../parachains/common" }

diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
@@ -17,7 +17,7 @@ async-trait = "0.1.79"
 clap = { version = "4.5.3", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 criterion = { workspace = true, default-features = true, features = ["async_tokio"] }
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 rand = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }

diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
@@ -10,7 +10,7 @@ description = "Polkadot specific RPC functionality."
 workspace = true
 
 [dependencies]
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 polkadot-primitives = { path = "../primitives" }
 sc-client-api = { path = "../../substrate/client/api" }
 sp-blockchain = { path = "../../substrate/primitives/blockchain" }

diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
@@ -44,7 +44,7 @@ array-bytes = { workspace = true, default-features = true }
 clap = { version = "4.5.3", features = ["derive"], optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 serde = { features = ["derive"], workspace = true, default-features = true }
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 futures = "0.3.30"
 log = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }

diff --git a/substrate/bin/node/rpc/Cargo.toml b/substrate/bin/node/rpc/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 node-primitives = { path = "../primitives" }
 pallet-transaction-payment-rpc = { path = "../../../frame/transaction-payment/rpc" }
 mmr-rpc = { path = "../../../client/merkle-mountain-range/rpc" }

diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 futures = "0.3.30"
 serde = { features = ["derive"], workspace = true, default-features = true }
 thiserror = { workspace = true }

diff --git a/substrate/client/consensus/beefy/rpc/Cargo.toml b/substrate/client/consensus/beefy/rpc/Cargo.toml
@@ -14,7 +14,7 @@ workspace = true
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
 futures = "0.3.30"
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 serde = { features = ["derive"], workspace = true, default-features = true }

diff --git a/substrate/client/consensus/grandpa/rpc/Cargo.toml b/substrate/client/consensus/grandpa/rpc/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 [dependencies]
 finality-grandpa = { version = "0.16.2", features = ["derive-codec"] }
 futures = "0.3.30"
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 log = { workspace = true, default-features = true }
 parity-scale-codec = { version = "3.6.1", features = ["derive"] }
 serde = { features = ["derive"], workspace = true, default-features = true }

diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 assert_matches = "1.3.0"
 async-trait = "0.1.79"
 codec = { package = "parity-scale-codec", version = "3.6.1" }

diff --git a/substrate/client/merkle-mountain-range/rpc/Cargo.toml b/substrate/client/merkle-mountain-range/rpc/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }

diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
@@ -28,4 +28,4 @@ sp-core = { path = "../../primitives/core" }
 sp-rpc = { path = "../../primitives/rpc" }
 sp-runtime = { path = "../../primitives/runtime" }
 sp-version = { path = "../../primitives/version" }
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
diff --git a/substrate/client/rpc-servers/Cargo.toml b/substrate/client/rpc-servers/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 log = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 tokio = { workspace = true, default-features = true, features = ["parking_lot"] }

diff --git a/substrate/client/rpc-spec-v2/Cargo.toml b/substrate/client/rpc-spec-v2/Cargo.toml
@@ -16,7 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 # Internal chain structures for "chain_spec".
 sc-chain-spec = { path = "../chain-spec" }
 # Pool for submitting extrinsics required by "transaction"
@@ -45,7 +45,7 @@ rand = { workspace = true, default-features = true }
 schnellru = "0.2.1"
 
 [dev-dependencies]
-jsonrpsee = { version = "0.22", features = ["server", "ws-client"] }
+jsonrpsee = { workspace = true, features = ["server", "ws-client"] }
 serde_json = { workspace = true, default-features = true }
 tokio = { workspace = true, default-features = true, features = ["macros"] }
 substrate-test-runtime-client = { path = "../../test-utils/runtime/client" }

diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 futures = "0.3.30"
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 log = { workspace = true, default-features = true }
 parking_lot = "0.12.1"
 serde_json = { workspace = true, default-features = true }

diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
@@ -28,7 +28,7 @@ runtime-benchmarks = [
 ]
 
 [dependencies]
-jsonrpsee = { version = "0.22", features = ["server"] }
+jsonrpsee = { workspace = true, features = ["server"] }
 thiserror = { workspace = true }
 futures = "0.3.30"
 rand = { workspace = true, default-features = true }

diff --git a/substrate/client/sync-state-rpc/Cargo.toml b/substrate/client/sync-state-rpc/Cargo.toml
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }

diff --git a/substrate/frame/transaction-payment/rpc/Cargo.toml b/substrate/frame/transaction-payment/rpc/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 pallet-transaction-payment-rpc-runtime-api = { path = "runtime-api" }
 sp-api = { path = "../../../primitives/api" }
 sp-blockchain = { path = "../../../primitives/blockchain" }

diff --git a/substrate/utils/frame/remote-externalities/Cargo.toml b/substrate/utils/frame/remote-externalities/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22", features = ["http-client"] }
+jsonrpsee = { workspace = true, features = ["http-client"] }
 codec = { package = "parity-scale-codec", version = "3.6.1" }
 log = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }

diff --git a/substrate/utils/frame/rpc/client/Cargo.toml b/substrate/utils/frame/rpc/client/Cargo.toml
@@ -15,7 +15,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { version = "0.22", features = ["ws-client"] }
+jsonrpsee = { workspace = true, features = ["ws-client"] }
 sc-rpc-api = { path = "../../../../client/rpc-api" }
 async-trait = "0.1.79"
 serde = { workspace = true, default-features = true }

diff --git a/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml b/substrate/utils/frame/rpc/state-trie-migration-rpc/Cargo.toml
@@ -24,7 +24,7 @@ sp-state-machine = { path = "../../../../primitives/state-machine" }
 sp-trie = { path = "../../../../primitives/trie" }
 trie-db = "0.29.0"
 
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 
 # Substrate Dependencies
 sc-client-api = { path = "../../../../client/api" }

diff --git a/substrate/utils/frame/rpc/support/Cargo.toml b/substrate/utils/frame/rpc/support/Cargo.toml
@@ -16,15 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.22", features = ["jsonrpsee-types"] }
+jsonrpsee = { workspace = true, features = ["jsonrpsee-types"] }
 serde = { workspace = true, default-features = true }
 frame-support = { path = "../../../../frame/support" }
 sc-rpc-api = { path = "../../../../client/rpc-api" }
 sp-storage = { path = "../../../../primitives/storage" }
 
 [dev-dependencies]
 scale-info = "2.11.1"
-jsonrpsee = { version = "0.22", features = ["jsonrpsee-types", "ws-client"] }
+jsonrpsee = { workspace = true, features = ["jsonrpsee-types", "ws-client"] }
 tokio = { workspace = true, default-features = true }
 sp-core = { path = "../../../../primitives/core" }
 sp-runtime = { path = "../../../../primitives/runtime" }

diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1" }
-jsonrpsee = { version = "0.22.5", features = ["client-core", "macros", "server-core"] }
+jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-core"] }
 futures = "0.3.30"
 log = { workspace = true, default-features = true }
 frame-system-rpc-runtime-api = { path = "../../../../frame/system/rpc/runtime-api" }