update to jsonrpsee master

bin/node-template/node/Cargo.toml

@@ -38,7 +38,7 @@ sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 sp-timestamp = { version = "4.0.0-dev", path = "../../../primitives/timestamp" }
 
 # These dependencies are used for the node template's RPCs
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" }
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" }

bin/node/cli/Cargo.toml

@@ -34,7 +34,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 # third-party dependencies
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 serde = { version = "1.0.126", features = ["derive"] }
 futures = "0.3.16"
 hex-literal = "0.3.1"

client/consensus/babe/rpc/Cargo.toml

@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 sc-consensus-babe = { version = "0.10.0-dev", path = "../" }
 sc-rpc-api = { version = "0.10.0-dev", path = "../../../rpc-api" }
 sp-consensus-babe = { version = "0.10.0-dev", path = "../../../../primitives/consensus/babe" }

client/consensus/manual-seal/Cargo.toml

@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 derive_more = "0.99.2"
 futures = "0.3.9"
 
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 log = "0.4.8"
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0", features = ["derive"] }

client/finality-grandpa/rpc/Cargo.toml

@@ -15,7 +15,7 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain"
 sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" }
 sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" }
 finality-grandpa = { version = "0.14.1", features = ["derive-codec"] }
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 futures = { version = "0.3.4", features = ["compat"] }
 serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0.50"

client/rpc-api/Cargo.toml

@@ -25,7 +25,7 @@ sc-chain-spec = { path = "../chain-spec", version = "4.0.0-dev" }
 serde = { version = "1.0.126", features = ["derive"] }
 serde_json = "1.0.41"
 
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["full"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["full"] }
 
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 sp-rpc = { version = "4.0.0-dev", path = "../../primitives/rpc" }

client/rpc-api/src/chain/mod.rs

@@ -36,25 +36,37 @@ pub trait ChainApi<Number, Hash, Header, SignedBlock> {
 	/// Get hash of the n-th block in the canon chain.
 	///
 	/// By default returns latest block hash.
-	#[method(name = "getBlockHash")]
+	#[method(name = "getBlockHash", aliases = "chain_getHead")]
 	fn block_hash(&self, hash: Option<ListOrValue<NumberOrHex>>) -> JsonRpcResult<ListOrValue<Option<Hash>>>;
 
 	/// Get hash of the last finalized block in the canon chain.
-	#[method(name = "getFinalizedHead")]
+	#[method(name = "getFinalizedHead", aliases = "chain_getFinalisedHead")]
 	fn finalized_head(&self) -> JsonRpcResult<Hash>;
 
-	/// All head subscription
-	// TODO(): support alias: subscribeAllHeads.
-	#[subscription(name = "allHead", unsub = "unsubscribeAllHeads", item = Header)]
+	/// All head subscription.
+	#[subscription(
+		name = "allHead",
+		aliases = "chain_subscribeAllHeads",
+		unsubscribe_aliases = "unsubscribeAllHeads",
+		item = Header
+	)]
 	fn subscribe_all_heads(&self);
 
-	/// New head subscription
-	// TODO(): support alias in jsonrpsee subscribeNewHeads.
-	#[subscription(name = "newHead", unsub = "unsubscribeNewHeads", item = Header)]
+	/// New head subscription.
+	#[subscription(
+		name = "newHead",
+		aliases = "subscribe_newHead, chain_subscribeNewHead, chain_subscribeNewHeads",
+		unsubscribe_aliases = "unsubscribe_newHead, chain_unsubscribeNewHead, chain_unsubscribeNewHeads",
+		item = Header
+	)]
 	fn subscribe_new_heads(&self);
 
-	/// Finalized head subscription
-	// TODO(): support alias in jsonrpsee subscribeFinalizedHeads/subscribeFinalisedHeads
-	#[subscription(name = "finalizedHead", unsub = "unsubscribeFinalizedHeads", item = Header)]
+	/// Finalized head subscription.
+	#[subscription(
+		name = "finalizedHead",
+		aliases = "chain_subscribeFinalisedHeads, chain_subscribeFinalizedHeads",
+		unsubscribe_aliases = "chain_unsubscribeFinalizedHeads, chain_unsubscribeFinalisedHeads",
+		item = Header
+	)]
 	fn subscribe_finalized_heads(&self);
 }

client/rpc-servers/Cargo.toml

@@ -19,5 +19,5 @@ serde_json = "1.0.41"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 futures-channel = "0.3"
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 tokio = { version = "1", features = ["full"] }

client/rpc/Cargo.toml

@@ -38,7 +38,7 @@ sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../transaction-pool/api" }
 
 [dev-dependencies]

client/service/Cargo.toml

@@ -22,7 +22,7 @@ wasmtime = ["sc-executor/wasmtime"]
 test-helpers = []
 
 [dependencies]
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 
 thiserror = "1.0.21"
 futures01 = { package = "futures", version = "0.1.29" }

client/sync-state-rpc/Cargo.toml

@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 thiserror = "1.0.21"
 anyhow = "1"
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 
 sc-chain-spec = { version = "4.0.0-dev", path = "../chain-spec" }
 sc-client-api = { version = "4.0.0-dev", path = "../api" }

frame/contracts/rpc/Cargo.toml

@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2" }
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 

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" }
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 serde_json = "1"
 serde = { version = "1.0.126", features = ["derive"] }
 

frame/transaction-payment/rpc/Cargo.toml

@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 
 sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }

test-utils/test-runner/Cargo.toml

@@ -52,5 +52,5 @@ tokio = { version = "1", features = ["full"] }
 
 # Calling RPC
 
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 num-traits = "0.2.14"

utils/frame/remote-externalities/Cargo.toml

@@ -17,11 +17,11 @@ jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features =
     "tokio02",
 ] }
 jsonrpsee-proc-macros = "0.3.0"
-# jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441" }
-# # jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", default-features = false, features = [
+# jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "master" }
+# # jsonrpsee-ws-client = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", default-features = false, features = [
 # #     "tokio02",
 # # ] }
-# jsonrpsee-proc-macros = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441" }
+# jsonrpsee-proc-macros = { git = "https://github.com/paritytech/jsonrpsee", branch = "master" }
 
 env_logger = "0.9"
 log = "0.4.11"

utils/frame/rpc/system/Cargo.toml

@@ -19,7 +19,7 @@ serde_json = "1"
 sc-client-api = { version = "4.0.0-dev", path = "../../../../client/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 futures = { version = "0.3.4", features = ["compat"] }
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "na-fix-441", features = ["server"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 log = "0.4.8"
 sp-runtime = { version = "4.0.0-dev", path = "../../../../primitives/runtime" }
 sp-api = { version = "4.0.0-dev", path = "../../../../primitives/api" }