migrate API to jsonrpsee

massa-api/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2021"
 
 [dependencies]
 displaydoc = "0.2"
-jsonrpc-core = { git = "https://github.com/massalabs/jsonrpc" }
-jsonrpc-derive = { git = "https://github.com/massalabs/jsonrpc" }
-jsonrpc-http-server = { git = "https://github.com/massalabs/jsonrpc" }
+jsonrpsee = { version = "0.16.1", features = ["server", "macros"] }
+async-trait = "0.1.58"
 serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.87"
 thiserror = "1.0"
 tokio = { version = "1.21", features = ["full"] }
 tracing = "0.1"

massa-api/src/config.rs

@@ -1,10 +1,11 @@
 // Copyright (c) 2022 MASSA LABS <[email protected]>
 
-use jsonrpc_core::serde::Deserialize;
 use massa_time::MassaTime;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
+use serde::Deserialize;
+
 /// API settings.
 /// the API settings
 #[derive(Debug, Deserialize, Clone)]
@@ -19,6 +20,26 @@ pub struct APIConfig {
     pub max_arguments: u64,
     /// openrpc specification path
     pub openrpc_spec_path: PathBuf,
+    /// maximum size in bytes of a request.
+    pub max_request_body_size: u32,
+    /// maximum size in bytes of a response.
+    pub max_response_body_size: u32,
+    /// maximum number of incoming connections allowed.
+    pub max_connections: u32,
+    /// maximum number of subscriptions per connection.
+    pub max_subscriptions_per_connection: u32,
+    /// max length for logging for requests and responses. Logs bigger than this limit will be truncated.
+    pub max_log_length: u32,
+    /// host filtering.
+    pub allow_hosts: Vec<String>,
+    /// whether batch requests are supported by this server or not.
+    pub batch_requests_supported: bool,
+    /// the interval at which `Ping` frames are submitted.
+    pub ping_interval: MassaTime,
+    /// whether to enable HTTP.
+    pub enable_http: bool,
+    /// whether to enable WS.
+    pub enable_ws: bool,
     /// max datastore value length
     pub max_datastore_value_length: u64,
     /// max op datastore entry

massa-api/src/error.rs

@@ -1,6 +1,10 @@
 // Copyright (c) 2022 MASSA LABS <[email protected]>
 
 use displaydoc::Display;
+use jsonrpsee::{
+    core::Error as JsonRpseeError,
+    types::error::{CallError, ErrorObject},
+};
 use massa_consensus_exports::error::ConsensusError;
 use massa_execution_exports::ExecutionError;
 use massa_hash::MassaHashError;
@@ -50,7 +54,7 @@ pub enum ApiError {
     InternalServerError(String),
 }
 
-impl From<ApiError> for jsonrpc_core::Error {
+impl From<ApiError> for JsonRpseeError {
     fn from(err: ApiError) -> Self {
         // JSON-RPC Server errors codes must be between -32099 to -32000
         let code = match err {
@@ -72,10 +76,7 @@ impl From<ApiError> for jsonrpc_core::Error {
             ApiError::MissingConfig(_) => -32018,
             ApiError::WrongAPI => -32019,
         };
-        jsonrpc_core::Error {
-            code: jsonrpc_core::ErrorCode::ServerError(code),
-            message: err.to_string(),
-            data: None,
-        }
+
+        CallError::Custom(ErrorObject::owned(code, err.to_string(), None::<()>)).into()
     }
 }