Merge pull request #3332 from Pana/feat/rpcConfig

add configuration options for espace rpcs

Author: Pana

Cargo.lock

@@ -421,8 +421,8 @@ pub async fn launch_async_rpc_servers(
                         .with_ws(apis.clone());
 
                 let server_config =
-                    RpcServerConfig::http(ServerBuilder::default())
-                        .with_ws(ServerBuilder::default())
+                    RpcServerConfig::http(conf.jsonrpsee_server_builder())
+                        .with_ws(conf.jsonrpsee_server_builder())
                         .with_http_address(http_config.address)
                         .with_ws_address(ws_config.address);
                 (transport_rpc_module_config, server_config)
@@ -431,15 +431,15 @@ pub async fn launch_async_rpc_servers(
                 let transport_rpc_module_config =
                     TransportRpcModuleConfig::set_http(apis.clone());
                 let server_config =
-                    RpcServerConfig::http(ServerBuilder::default())
+                    RpcServerConfig::http(conf.jsonrpsee_server_builder())
                         .with_http_address(http_config.address);
                 (transport_rpc_module_config, server_config)
             }
             (false, true) => {
                 let transport_rpc_module_config =
                     TransportRpcModuleConfig::set_ws(apis.clone());
                 let server_config =
-                    RpcServerConfig::ws(ServerBuilder::default())
+                    RpcServerConfig::ws(conf.jsonrpsee_server_builder())
                         .with_ws_address(ws_config.address);
                 (transport_rpc_module_config, server_config)
             }

crates/client/src/rpc/mod.rs

@@ -35,4 +35,6 @@ db = { workspace = true }
 clap = { workspace = true }
 kvdb-rocksdb = { workspace = true }
 toml = { workspace = true }
-jsonrpc-http-server = { workspace = true }
+jsonrpc-http-server = { workspace = true }
+jsonrpsee = { workspace = true }
+tower = { workspace = true }

crates/config/Cargo.toml

@@ -50,9 +50,11 @@ use diem_types::term_state::{
     pos_state_config::PosStateConfig, IN_QUEUE_LOCKED_VIEWS,
     OUT_QUEUE_LOCKED_VIEWS, ROUND_PER_TERM, TERM_ELECTED_SIZE, TERM_MAX_SIZE,
 };
+use jsonrpsee::server::ServerBuilder;
 use metrics::MetricsConfiguration;
 use network::DiscoveryConfiguration;
 use primitives::block_header::CIP112_TRANSITION_HEIGHT;
+use tower::layer::util::Identity;
 use txgen::TransactionGeneratorConfig;
 
 use crate::{HttpConfiguration, TcpConfiguration, WsConfiguration};
@@ -222,6 +224,11 @@ build_config! {
         (jsonrpc_ws_max_payload_bytes, (usize), 30 * 1024 * 1024)
         (jsonrpc_http_eth_port, (Option<u16>), None)
         (jsonrpc_ws_eth_port, (Option<u16>), None)
+        (jsonrpc_max_request_body_size, (u32), 10 * 1024 * 1024)
+        (jsonrpc_max_response_body_size, (u32), 10 * 1024 * 1024)
+        (jsonrpc_max_connections, (u32), 100)
+        (jsonrpc_max_subscriptions_per_connection, (u32), 1024)
+        (jsonrpc_message_buffer_capacity, (u32), 1024)
         // The network_id, if unset, defaults to the chain_id.
         // Only override the network_id for local experiments,
         // when user would like to keep the existing blockchain data
@@ -1178,6 +1185,25 @@ impl Configuration {
         TcpConfiguration::new(None, self.raw_conf.jsonrpc_tcp_port)
     }
 
+    pub fn jsonrpsee_server_builder(
+        &self,
+    ) -> ServerBuilder<Identity, Identity> {
+        let builder = ServerBuilder::default()
+            .max_request_body_size(self.raw_conf.jsonrpc_max_request_body_size)
+            .max_response_body_size(
+                self.raw_conf.jsonrpc_max_response_body_size,
+            )
+            .max_connections(self.raw_conf.jsonrpc_max_connections)
+            .max_subscriptions_per_connection(
+                self.raw_conf.jsonrpc_max_subscriptions_per_connection,
+            )
+            .set_message_buffer_capacity(
+                self.raw_conf.jsonrpc_message_buffer_capacity,
+            );
+
+        builder
+    }
+
     pub fn local_ws_config(&self) -> WsConfiguration {
         WsConfiguration::new(
             Some((127, 0, 0, 1)),

crates/config/src/configuration.rs

@@ -122,6 +122,8 @@ log_conf="log.yaml"
 #
 # udp_port=32323
 
+# -------------- JSON-RPC Configuration -------------
+
 # `jsonrpc_http_threads` is used to control how many threads to process HTTP rpc requests.
 #
 # jsonrpc_http_threads=1
@@ -130,6 +132,9 @@ log_conf="log.yaml"
 #
 # jsonrpc_http_keep_alive=false
 
+# core space max payload size for ws server
+# jsonrpc_ws_max_payload_bytes=30 * 1024 * 1024
+
 # `jsonrpc_cors` is used to control the rpc domain validation policies.
 # The value should be "none", "all", or a list string split by commas without space.
 # If not set, domain validation is disabled.
@@ -175,6 +180,17 @@ jsonrpc_local_http_port=12539
 #
 # max_estimation_gas_limit = 30_000_000
 
+# Below are espace RPC configurations
+# Set the maximum size of a request body in bytes. Default is 10 MiB.
+# jsonrpc_max_request_body_size=10 * 1024 * 1024
+# Set the maximum size of a response body in bytes. Default is 10 MiB.
+# jsonrpc_max_response_body_size=10 * 1024 * 1024
+# Set the maximum number of connections allowed. Default is 100.
+# jsonrpc_max_connections=100
+# Set the maximum number of connections allowed. Default is 1024.
+# jsonrpc_max_subscriptions_per_connection=1024
+# Number of messages that server is allowed to `buffer` until backpressure kicks in. Default is 1024.
+# jsonrpc_message_buffer_capacity=1024
 # --------------- Performance-related Network Parameters ----------------------
 
 # Timeout for block-related requests (GetBlock, GetCmpctBlock, GetBlockTxn)