jsonrpsee integration

bin/node/cli/src/service.rs

@@ -580,14 +580,14 @@ pub fn new_light_base(
  telemetry: telemetry.as_mut(),
  })?;
 
- network_starter.start_network();
- Ok((
-  task_manager,
-  rpc_handlers,
-  client,
-  network,
-  transaction_pool,
- ))
+ todo!();
+ // Ok((
+ // task_manager,
+ // rpc_handlers,
+ // client,
+ // network,
+ // transaction_pool,
+ // ))
 }
 
 /// Builds a new service for a light client.

client/rpc-api/Cargo.toml

@@ -31,3 +31,4 @@ serde_json = "1.0.41"
 sp-transaction-pool = { version = "3.0.0", path = "../../primitives/transaction-pool" }
 sp-rpc = { version = "3.0.0", path = "../../primitives/rpc" }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+jsonrpsee-types = { git = "https:/paritytech/jsonrpsee", branch = "master" }

client/rpc-api/src/author/error.rs

@@ -20,6 +20,7 @@
 
 use crate::errors;
 use jsonrpc_core as rpc;
+use jsonrpsee_types::error::CallError;
 use sp_runtime::transaction_validity::InvalidTransaction;
 
 /// Author RPC Result type.
@@ -34,14 +35,14 @@ pub enum Error {
  /// Client error.
  #[display(fmt="Client error: {}", _0)]
  #[from(ignore)]
- Client(Box<dyn std::error::Error + Send>),
+ Client(Box<dyn std::error::Error + Send + Sync>),
  /// Transaction pool error,
  #[display(fmt="Transaction pool error: {}", _0)]
  Pool(sp_transaction_pool::error::Error),
  /// Verification error
  #[display(fmt="Extrinsic verification error: {}", _0)]
  #[from(ignore)]
- Verification(Box<dyn std::error::Error + Send>),
+ Verification(Box<dyn std::error::Error + Send + Sync>),
  /// Incorrect extrinsic format.
  #[display(fmt="Invalid extrinsic format: {}", _0)]
  BadFormat(codec::Error),
@@ -182,3 +183,9 @@ impl From<Error> for rpc::Error {
  }
  }
 }
+
+impl From<Error> for CallError {
+ fn from(e: Error) -> Self {
+ Self::Failed(Box::new(e))
+ }
+}

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

@@ -32,7 +32,7 @@ pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error>
 pub enum Error {
  /// Client error.
  #[display(fmt="Client error: {}", _0)]
- Client(Box<dyn std::error::Error + Send>),
+ Client(Box<dyn std::error::Error + Send + Sync>),
  /// Other error type.
  Other(String),
 }

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

@@ -110,4 +110,4 @@ pub trait ChainApi<Number, Hash, Header, SignedBlock> {
  metadata: Option<Self::Metadata>,
  id: SubscriptionId,
  ) -> RpcResult<bool>;
-}
+}

client/rpc-api/src/policy.rs

@@ -22,6 +22,7 @@
 //! RPC when accessed externally.
 
 use jsonrpc_core as rpc;
+use jsonrpsee_types::error as rpsee;
 
 /// Signifies whether a potentially unsafe RPC should be denied.
 #[derive(Clone, Copy, Debug)]
@@ -60,3 +61,9 @@ impl From<UnsafeRpcError> for rpc::Error {
  rpc::Error::method_not_found()
  }
 }
+
+impl From<UnsafeRpcError> for rpsee::CallError {
+ fn from(e: UnsafeRpcError) -> rpsee::CallError {
+ rpsee::CallError::Failed(Box::new(e))
+ }
+}

client/rpc-api/src/state/error.rs

@@ -32,7 +32,7 @@ pub type FutureResult<T> = Box<dyn rpc::futures::Future<Item = T, Error = Error>
 pub enum Error {
  /// Client error.
  #[display(fmt="Client error: {}", _0)]
- Client(Box<dyn std::error::Error + Send>),
+ Client(Box<dyn std::error::Error + Send + Sync>),
  /// Provided block range couldn't be resolved to a list of blocks.
  #[display(fmt = "Cannot resolve a block range ['{:?}' ... '{:?}]. {}", from, to, details)]
  InvalidBlockRange {

client/rpc-api/src/system/error.rs

@@ -20,12 +20,13 @@
 
 use crate::system::helpers::Health;
 use jsonrpc_core as rpc;
+use serde::Serialize;
 
 /// System RPC Result type.
 pub type Result<T> = std::result::Result<T, Error>;
 
 /// System RPC errors.
-#[derive(Debug, derive_more::Display, derive_more::From)]
+#[derive(Debug, derive_more::Display, derive_more::From, Serialize)]
 pub enum Error {
  /// Provided block range couldn't be resolved to a list of blocks.
  #[display(fmt = "Node is not fully functional: {}", _0)]

client/rpc/Cargo.toml

@@ -13,6 +13,8 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+async-trait = "0.1"
+anyhow = "1"
 sc-rpc-api = { version = "0.9.0", path = "../rpc-api" }
 sc-client-api = { version = "3.0.0", path = "../api" }
 sp-api = { version = "3.0.0", path = "../../primitives/api" }
@@ -42,6 +44,8 @@ hash-db = { version = "0.15.2", default-features = false }
 parking_lot = "0.11.1"
 lazy_static = { version = "1.4.0", optional = true }
 sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
+jsonrpsee-ws-server = { git = "https:/paritytech/jsonrpsee", branch = "master" }
+jsonrpsee-types = { git = "https:/paritytech/jsonrpsee", branch = "master" }
 
 [dev-dependencies]
 assert_matches = "1.3.0"