paritytech · paritytech-processbot · May 10, 2022 · Aug 30, 2021 · Aug 30, 2021 · Sep 3, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,8 @@ members = [
 	"bin/node/executor",
 	"bin/node/primitives",
 	"bin/node/rpc",
-	"bin/node/rpc-client",
+	# TODO(niklasad1): bring back once rpsee macros is a thing.
+	# "bin/node/rpc-client",
 	"bin/node/runtime",
 	"bin/node/testing",
 	"bin/utils/chain-spec-builder",
@@ -199,7 +200,8 @@ members = [
 	"utils/frame/remote-externalities",
 	"utils/frame/frame-utilities-cli",
 	"utils/frame/try-runtime/cli",
-	"utils/frame/rpc/support",
+	# TODO(niklasad1): port this to jsonrpsee
+	# "utils/frame/rpc/support",
 	"utils/frame/rpc/system",
 	"utils/prometheus",
 	"utils/wasm-builder",

diff --git a/bin/node-template/node/Cargo.toml b/bin/node-template/node/Cargo.toml
@@ -39,7 +39,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
-jsonrpc-core = "15.1.0"
+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" }

diff --git a/bin/node-template/node/src/lib.rs b/bin/node-template/node/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod chain_spec;
-pub mod rpc;
+// TODO(niklasad1): port this back?!
+// pub mod rpc;
 pub mod service;
diff --git a/bin/node-template/node/src/main.rs b/bin/node-template/node/src/main.rs
@@ -6,7 +6,6 @@ mod chain_spec;
 mod service;
 mod cli;
 mod command;
-mod rpc;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()

diff --git a/bin/node-template/node/src/service.rs b/bin/node-template/node/src/service.rs
@@ -1,5 +1,6 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
+use jsonrpsee::RpcModule;
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_client_api::{ExecutorProvider, RemoteBackend};
 use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
@@ -126,6 +127,7 @@ pub fn new_partial(
 		keystore_container,
 		select_chain,
 		transaction_pool,
+		rpc_builder: Box::new(|_, _| RpcModule::new(())),
 		other: (grandpa_block_import, grandpa_link, telemetry),
 	})
 }
@@ -147,6 +149,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		mut keystore_container,
 		select_chain,
 		transaction_pool,
+		rpc_builder: _rpc_builder,
 		other: (block_import, grandpa_link, mut telemetry),
 	} = new_partial(&config)?;
 
@@ -195,25 +198,14 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 	let enable_grandpa = !config.disable_grandpa;
 	let prometheus_registry = config.prometheus_registry().cloned();
 
-	let rpc_extensions_builder = {
-		let client = client.clone();
-		let pool = transaction_pool.clone();
-
-		Box::new(move |deny_unsafe, _| {
-			let deps =
-				crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), deny_unsafe };
-
-			Ok(crate::rpc::create_full(deps))
-		})
-	};
-
 	let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 		network: network.clone(),
 		client: client.clone(),
 		keystore: keystore_container.sync_keystore(),
 		task_manager: &mut task_manager,
 		transaction_pool: transaction_pool.clone(),
-		rpc_extensions_builder,
+		// TODO: (dp) implement
+		rpc_builder: Box::new(|_, _| RpcModule::new(())),
 		on_demand: None,
 		remote_blockchain: None,
 		backend,
@@ -436,7 +428,8 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		transaction_pool,
 		task_manager: &mut task_manager,
 		on_demand: Some(on_demand),
-		rpc_extensions_builder: Box::new(|_, _| Ok(())),
+		// TODO: (dp) implement
+		rpc_builder: Box::new(|_, _| RpcModule::new(())),
 		config,
 		client,
 		keystore: keystore_container.sync_keystore(),

diff --git 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"
+jsonrpsee-types = { git = "https://github.com/paritytech/jsonrpsee" }
 serde = "1.0.126"
 serde_json = "1.0.48"
 wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] }

diff --git a/bin/node/browser-testing/src/lib.rs b/bin/node/browser-testing/src/lib.rs
@@ -24,11 +24,15 @@
 //! ```text
 //! CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner WASM_BINDGEN_TEST_TIMEOUT=60 cargo test --target wasm32-unknown-unknown
 //! ```
-//! For debug infomation, such as the informant, run without the `--headless`
+//! For debug information, such as the informant, run without the `--headless`
 //! flag and open a browser to the url that `wasm-pack test` outputs.
-//! For more infomation see <https://rustwasm.github.io/docs/wasm-pack/>.
+//! For more information see <https://rustwasm.github.io/docs/wasm-pack/>.
 
-use jsonrpc_core::types::{Id, MethodCall, Params, Success, Version};
+use jsonrpsee_types::v2::{
+	params::{Id, JsonRpcParams},
+	request::JsonRpcCallSer,
+	response::JsonRpcResponse,
+};
 use serde::de::DeserializeOwned;
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::JsFuture;
@@ -37,21 +41,14 @@ use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 wasm_bindgen_test_configure!(run_in_browser);
 
 fn rpc_call(method: &str) -> String {
-	serde_json::to_string(&MethodCall {
-		jsonrpc: Some(Version::V2),
-		method: method.into(),
-		params: Params::None,
-		id: Id::Num(1),
-	})
-	.unwrap()
+	serde_json::to_string(&JsonRpcCallSer::new(Id::Number(1), method, JsonRpcParams::NoParams))
+		.unwrap()
 }
 
 fn deserialize_rpc_result<T: DeserializeOwned>(js_value: JsValue) -> T {
 	let string = js_value.as_string().unwrap();
-	let value = serde_json::from_str::<Success>(&string).unwrap().result;
-	// We need to convert a `Value::Object` into a proper type.
-	let value_string = serde_json::to_string(&value).unwrap();
-	serde_json::from_str(&value_string).unwrap()
+	let val = serde_json::from_str::<JsonRpcResponse<T>>(&string).unwrap().result;
+	val
 }
 
 #[wasm_bindgen_test]

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -34,14 +34,13 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 # third-party dependencies
-codec = { package = "parity-scale-codec", version = "2.0.0" }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server"] }
 serde = { version = "1.0.126", features = ["derive"] }
 futures = { version = "0.3.9", features = ["compat"] }
 hex-literal = "0.3.1"
 log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
-parking_lot = "0.11.1"
 
 # primitives
 sp-authority-discovery = { version = "4.0.0-dev",  path = "../../../primitives/authority-discovery" }
@@ -60,6 +59,14 @@ sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/trans
 sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../../primitives/transaction-storage-proof" }
 
 # client dependencies
+sc-consensus-babe-rpc = { version = "0.10.0-dev", path = "../../../client/consensus/babe/rpc" }
+sc-finality-grandpa-rpc = { version = "0.10.0-dev", path = "../../../client/finality-grandpa/rpc" }
+sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
+pallet-transaction-payment-rpc = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/rpc/" }
+substrate-frame-rpc-system = { version = "4.0.0-dev", path = "../../../utils/frame/rpc/system/" }
+pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" }
+pallet-contracts-rpc = { version = "4.0.0-dev", path = "../../../frame/contracts/rpc/" }
+
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
 sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
 sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
@@ -78,7 +85,6 @@ sc-service = { version = "0.10.0-dev", default-features = false, path = "../../.
 sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" }
 sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" }
 sc-authority-discovery = { version = "0.10.0-dev",  path = "../../../client/authority-discovery" }
-sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" }
 
 # frame dependencies
 pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" }

diff --git a/bin/node/cli/src/browser.rs b/bin/node/cli/src/browser.rs
@@ -49,9 +49,9 @@ fn start_inner(
 	info!("👤 Role: {:?}", config.role);
 
 	// Create the service. This is the most heavy initialization step.
-	let (task_manager, rpc_handlers) = crate::service::new_light_base(config)
-		.map(|(components, rpc_handlers, _, _, _)| (components, rpc_handlers))
+	let task_manager = crate::service::new_light_base(config)
+		.map(|(task_manager, _, _, _)| task_manager)
 		.map_err(|e| format!("{:?}", e))?;
 
-	Ok(browser_utils::start_client(task_manager, rpc_handlers))
+	Ok(browser_utils::start_client(task_manager))
 }