adapters/sovereign: configurable timeout

Makes it possible to configure a timeout from the rollup_config.toml. At the same time
increased the timeout for the sovereign demo.

Author: pepyakin

adapters/sovereign/src/service.rs

@@ -5,6 +5,7 @@ use crate::{
 };
 use async_trait::async_trait;
 use sov_rollup_interface::da::DaSpec;
+use std::time::Duration;
 use sugondat_shim_common_sovereign::SovereignRPCClient;
 
 mod client;
@@ -15,11 +16,17 @@ fn default_rpc_addr() -> String {
     "ws://localhost:10995/".into()
 }
 
+fn default_rpc_timeout_seconds() -> u64 {
+    60
+}
+
 /// Runtime configuration for the DA service
 #[derive(Default, Debug, Clone, PartialEq, serde::Deserialize, serde::Serialize)]
 pub struct DaServiceConfig {
     #[serde(default = "default_rpc_addr")]
     pub sugondat_rpc: String,
+    #[serde(default = "default_rpc_timeout_seconds")]
+    pub rpc_timeout_seconds: u64,
 }
 
 /// Implementation of the DA provider that uses sugondat.
@@ -32,7 +39,8 @@ pub struct DaProvider {
 impl DaProvider {
     /// Creates new instance of the service.
     pub fn new(config: DaServiceConfig, chain_params: ChainParams) -> Self {
-        let client = Client::new(config.sugondat_rpc);
+        let request_timeout = Duration::from_secs(config.rpc_timeout_seconds);
+        let client = Client::new(config.sugondat_rpc, request_timeout);
         Self {
             namespace: sugondat_nmt::Namespace::from_raw_bytes(chain_params.namespace_id),
             client,

adapters/sovereign/src/service/client.rs

@@ -1,6 +1,7 @@
 //! A subxt client that is sync to initialize, but provides async interface.
 
 use std::sync::Arc;
+use std::time::Duration;
 use tokio::sync::Mutex;
 
 #[derive(Clone)]
@@ -10,6 +11,7 @@ pub struct Client {
 
 struct Inner {
     url: String,
+    request_timeout: Duration,
     client: Option<ClientRef>,
 }
 
@@ -27,9 +29,13 @@ impl std::ops::Deref for ClientRef {
 }
 
 impl Client {
-    pub fn new(url: String) -> Self {
+    pub fn new(url: String, request_timeout: Duration) -> Self {
         Self {
-            inner: Arc::new(Mutex::new(Inner { url, client: None })),
+            inner: Arc::new(Mutex::new(Inner {
+                url,
+                request_timeout,
+                client: None,
+            })),
         }
     }
 
@@ -40,6 +46,7 @@ impl Client {
         }
 
         let client = jsonrpsee::ws_client::WsClientBuilder::new()
+            .request_timeout(inner.request_timeout)
             .build(inner.url.clone())
             .await?;
         let client = ClientRef {

demo/sovereign/docker/rollup_config.docker.toml

@@ -1,6 +1,6 @@
 [da]
 sugondat_rpc = "ws://localhost:10995/"
-
+rpc_timeout_seconds = 180
 
 [storage]
 # The path to the rollup's data directory. Paths that do not begin with `/` are interpreted as relative paths.