rpc timeout

src/bin/relayer.rs

@@ -1,7 +1,8 @@
 mod importer_online;
 
 use stratus::config::ExternalRelayerConfig;
-use stratus::{GlobalServices, GlobalState};
+use stratus::GlobalServices;
+use stratus::GlobalState;
 
 const TASK_NAME: &str = "relayer";
 
@@ -35,7 +36,7 @@ async fn run(config: ExternalRelayerConfig) -> anyhow::Result<()> {
             None => {
                 tracing::info!("no pending block found");
                 tokio::time::sleep(backoff).await
-            },
+            }
         };
     }
 }

src/config.rs

@@ -362,16 +362,29 @@ impl ExternalRelayerClientConfig {
 
 #[derive(Parser, DebugAsJson, Clone, serde::Serialize)]
 pub struct ExternalRelayerServerConfig {
-    #[arg(long = "relayer-db-url", env = "RELAYER_DB_URL")]
+    /// Postgresql url.
+    #[arg(long = "db-url", env = "DB_URL")]
     pub url: String,
-    #[arg(long = "relayer-db-connections", env = "RELAYER_DB_CONNECTIONS", default_value = "5")]
+
+    /// Connections to database.
+    #[arg(long = "db-connections", env = "DB_CONNECTIONS", default_value = "5")]
     pub connections: u32,
-    #[arg(long = "relayer-db-timeout", value_parser=parse_duration, env = "RELAYER_DB_TIMEOUT", default_value = "1s")]
+
+    /// Timeout to acquire connections to the database.
+    #[arg(long = "db-timeout", value_parser=parse_duration, env = "DB_TIMEOUT", default_value = "1s")]
     pub acquire_timeout: Duration,
-    #[arg(long = "relayer-forward-to", env = "RELAYER_FORWARD_TO")]
+
+    /// RPC to forward to.
+    #[arg(long = "forward-to", env = "RELAYER_FORWARD_TO")]
     pub forward_to: String,
-    #[arg(long = "relayer-db-backoff", value_parser=parse_duration, env = "RELAYER_DB_BACKOFF", default_value = "10ms")]
+
+    /// Backoff.
+    #[arg(long = "backoff", value_parser=parse_duration, env = "BACKOFF", default_value = "10ms")]
     pub backoff: Duration,
+
+    /// RPC response timeout.
+    #[arg(long = "rpc-timeout", value_parser=parse_duration, env = "RPC_TIMEOUT", default_value = "2s")]
+    pub rpc_timeout: Duration,
 }
 
 impl ExternalRelayerServerConfig {

src/eth/transaction_relayer.rs

@@ -111,7 +111,7 @@ impl ExternalRelayer {
             .expect("should not fail to create pgpool");
 
         Ok(Self {
-            substrate_chain: BlockchainClient::new_http(&config.forward_to).await?,
+            substrate_chain: BlockchainClient::new_http(&config.forward_to, config.rpc_timeout).await?,
             pool,
         })
     }

src/globals.rs

@@ -56,7 +56,10 @@ where
         runtime.block_on(spawn_signal_handler())?;
 
         // init tracing
-        runtime.block_on(infra::init_tracing(config.common().tracing_url.as_ref(), !config.common().disable_tokio_console));
+        runtime.block_on(infra::init_tracing(
+            config.common().tracing_url.as_ref(),
+            !config.common().disable_tokio_console,
+        ));
 
         Ok(Self {
             config,