Merge pull request #262 from graphprotocol/pcv/timeouts-everywhere

fix: add a timeout to json RPC transport and subgraph requests

Author: pcarranzav

crates/oracle/src/main.rs

@@ -8,7 +8,9 @@ pub mod subgraph;
 use clap::Parser;
 use contracts::Contracts;
 use json_oracle_encoder::{print_encoded_json_messages, OutputKind};
+use reqwest::Client;
 use std::path::PathBuf;
+use std::time::Duration;
 use web3::transports::Http;
 
 pub use config::Config;
@@ -104,7 +106,11 @@ async fn print_current_epoch(config: Config) -> anyhow::Result<()> {
 }
 
 fn init_contracts(config: Config) -> anyhow::Result<Contracts<Http>> {
-    let transport = Http::new(config.protocol_chain.jrpc_url.as_str())?;
+    let client = Client::builder()
+        .timeout(Duration::from_secs(60))
+        .build()
+        .unwrap();
+    let transport = Http::with_client(client, config.protocol_chain.jrpc_url);
     let protocol_chain = JrpcProviderForChain::new(config.protocol_chain.id, transport);
     Contracts::new(
         protocol_chain.web3,

crates/oracle/src/runner/jrpc_utils.rs

@@ -8,6 +8,7 @@ use futures::{
     FutureExt,
 };
 use jsonrpc_core::{Call, Value};
+use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::ops::RangeInclusive;
@@ -43,9 +44,12 @@ impl<T> JrpcExpBackoff<T> {
 
 impl JrpcExpBackoff {
     pub fn http(jrpc_url: Url, network: Caip2ChainId, max_wait: Duration) -> Self {
-        // Unwrap: URLs were already parsed and are valid.
-        let client = Http::new(jrpc_url.as_str()).expect("failed to create HTTP transport");
-        Self::new(client, network, max_wait)
+        let client = Client::builder()
+            .timeout(Duration::from_secs(60))
+            .build()
+            .unwrap();
+        let transport = Http::with_client(client, jrpc_url);
+        Self::new(transport, network, max_wait)
     }
 }
 

crates/oracle/src/subgraph.rs

@@ -5,6 +5,7 @@ use anyhow::ensure;
 use graphql_client::{GraphQLQuery, Response};
 use itertools::Itertools;
 use reqwest::Url;
+use std::time::Duration;
 use tracing::{error, info, warn};
 
 #[derive(Debug, thiserror::Error)]
@@ -41,6 +42,7 @@ pub async fn query_subgraph(
     info!("Fetching latest subgraph state");
 
     let client = reqwest::Client::builder()
+        .timeout(Duration::from_secs(60))
         .user_agent("block-oracle")
         .build()
         .unwrap();