feat: change subgraph constructor to use full urls

crates/autopilot/src/run.rs

@@ -334,8 +334,7 @@ pub async fn run(args: Arguments) {
             .unwrap_or_else(|| BalancerFactoryKind::for_chain(chain_id));
         let contracts = BalancerContracts::new(&web3, factories).await.unwrap();
         match BalancerPoolFetcher::new(
-            &args.shared.graph_api_base_url,
-            chain_id,
+            &args.shared.graph_api_url,
             block_retriever.clone(),
             token_info_fetcher.clone(),
             cache_config,
@@ -363,8 +362,7 @@ pub async fn run(args: Arguments) {
     };
     let uniswap_v3_pool_fetcher = if baseline_sources.contains(&BaselineSource::UniswapV3) {
         match UniswapV3PoolFetcher::new(
-            &args.shared.graph_api_base_url,
-            chain_id,
+            &args.shared.graph_api_url,
             web3.clone(),
             http_factory.create(),
             block_retriever,

crates/driver/src/boundary/liquidity/balancer/v2/mod.rs

@@ -179,7 +179,6 @@ async fn init_liquidity(
     let balancer_pool_fetcher = Arc::new(
         BalancerPoolFetcher::new(
             &config.graph_api_base_url,
-            eth.network().chain.into(),
             block_retriever.clone(),
             token_info_fetcher.clone(),
             boundary::liquidity::cache_config(),

crates/driver/src/boundary/liquidity/uniswap/v3.rs

@@ -136,7 +136,6 @@ async fn init_liquidity(
     let pool_fetcher = Arc::new(
         UniswapV3PoolFetcher::new(
             &config.graph_api_base_url,
-            eth.network().chain.into(),
             web3.clone(),
             boundary::liquidity::http_client(),
             block_retriever,

crates/driver/src/infra/config/file/mod.rs

@@ -301,7 +301,7 @@ struct LiquidityConfig {
     #[serde(default)]
     zeroex: Option<ZeroExConfig>,
 
-    /// The base URL used to connect to subgraph clients.
+    /// The URL used to connect to subgraph clients.
     graph_api_base_url: Option<Url>,
 }
 

crates/orderbook/src/run.rs

@@ -290,8 +290,7 @@ pub async fn run(args: Arguments) {
             .unwrap_or_else(|| BalancerFactoryKind::for_chain(chain_id));
         let contracts = BalancerContracts::new(&web3, factories).await.unwrap();
         match BalancerPoolFetcher::new(
-            &args.shared.graph_api_base_url,
-            chain_id,
+            &args.shared.graph_api_url,
             block_retriever.clone(),
             token_info_fetcher.clone(),
             cache_config,
@@ -319,8 +318,7 @@ pub async fn run(args: Arguments) {
     };
     let uniswap_v3_pool_fetcher = if baseline_sources.contains(&BaselineSource::UniswapV3) {
         match UniswapV3PoolFetcher::new(
-            &args.shared.graph_api_base_url,
-            chain_id,
+            &args.shared.graph_api_url,
             web3.clone(),
             http_factory.create(),
             block_retriever,

crates/shared/src/arguments.rs

@@ -176,7 +176,7 @@ pub struct Arguments {
 
     /// The base URL used to connect to subgraph clients.
     #[clap(long, env, default_value = "https://api.thegraph.com/subgraphs/name/")]
-    pub graph_api_base_url: Url,
+    pub graph_api_url: Url,
 
     /// An Ethereum node URL that supports `eth_call`s with state overrides to
     /// be used for simulations.
@@ -432,7 +432,7 @@ impl Display for Arguments {
             tenderly,
             logging,
             node_url,
-            graph_api_base_url,
+            graph_api_url: graph_api_base_url,
             chain_id,
             simulation_node_url,
             gas_estimators,

crates/shared/src/price_estimation/http.rs

@@ -735,7 +735,6 @@ mod tests {
             "main".into(),
         );
         let web3 = Web3::new(DynTransport::new(transport));
-        let chain_id = web3.eth().chain_id().await.unwrap().as_u64();
         let version = web3.net().version().await.unwrap();
 
         let pools = Arc::new(
@@ -766,11 +765,10 @@ mod tests {
             current_block_stream(Arc::new(web3.clone()), Duration::from_secs(10))
                 .await
                 .unwrap();
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
         let balancer_pool_fetcher = Arc::new(
             BalancerPoolFetcher::new(
-                &base_url,
-                chain_id,
+                &subgraph_url,
                 block_retriever.clone(),
                 token_info.clone(),
                 Default::default(),
@@ -785,8 +783,7 @@ mod tests {
         );
         let uniswap_v3_pool_fetcher = Arc::new(
             UniswapV3PoolFetcher::new(
-                &base_url,
-                chain_id,
+                &subgraph_url,
                 web3.clone(),
                 client.clone(),
                 block_retriever.clone(),

crates/shared/src/sources/balancer_v2/graph_api.rs

@@ -11,7 +11,7 @@
 use {
     super::swap::fixed_point::Bfp,
     crate::{event_handling::MAX_REORG_BLOCK_COUNT, subgraph::SubgraphClient},
-    anyhow::{bail, Result},
+    anyhow::Result,
     ethcontract::{H160, H256},
     reqwest::{Client, Url},
     serde::Deserialize,
@@ -33,18 +33,10 @@ const QUERY_PAGE_SIZE: usize = 10;
 pub struct BalancerSubgraphClient(SubgraphClient);
 
 impl BalancerSubgraphClient {
-    /// Creates a new Balancer subgraph client for the specified chain ID.
-    pub fn for_chain(base_url: &Url, chain_id: u64, client: Client) -> Result<Self> {
-        let subgraph_name = match chain_id {
-            1 => "balancer-v2",
-            5 => "balancer-goerli-v2",
-            100 => "balancer-gnosis-chain-v2",
-            _ => bail!("unsupported chain {}", chain_id),
-        };
+    /// Creates a new Balancer subgraph client with full subgraph URL.
+    pub fn from_subgraph_url(subgraph_url: &Url, client: Client) -> Result<Self> {
         Ok(Self(SubgraphClient::new(
-            base_url,
-            "balancer-labs",
-            subgraph_name,
+            subgraph_url.clone(),
             client,
         )?))
     }
@@ -256,9 +248,9 @@ mod tests {
         std::collections::HashMap,
     };
 
-    pub fn default_for_chain(chain_id: u64, client: Client) -> Result<BalancerSubgraphClient> {
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
-        BalancerSubgraphClient::for_chain(&base_url, chain_id, client)
+    pub fn default_for_chain(client: Client) -> Result<BalancerSubgraphClient> {
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        BalancerSubgraphClient::from_subgraph_url(&subgraph_url, client)
     }
 
     #[test]
@@ -490,9 +482,9 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn balancer_subgraph_query() {
-        for (network_name, chain_id) in [("Mainnet", 1), ("Goerli", 5)] {
+        for network_name  in ["Mainnet", "Goerli"] {
             println!("### {network_name}");
-            let client = default_for_chain(chain_id, Client::new()).unwrap();
+            let client = default_for_chain(Client::new()).unwrap();
             let result = client.get_registered_pools().await.unwrap();
             println!(
                 "Retrieved {} total pools at block {}",

crates/shared/src/sources/balancer_v2/pool_fetching.rs

@@ -285,8 +285,7 @@ impl BalancerContracts {
 impl BalancerPoolFetcher {
     #[allow(clippy::too_many_arguments)]
     pub async fn new(
-        base_url: &Url,
-        chain_id: u64,
+        subgraph_url: &Url,
         block_retriever: Arc<dyn BlockRetrieving>,
         token_infos: Arc<dyn TokenInfoFetching>,
         config: CacheConfig,
@@ -296,7 +295,7 @@ impl BalancerPoolFetcher {
         contracts: &BalancerContracts,
         deny_listed_pool_ids: Vec<H256>,
     ) -> Result<Self> {
-        let pool_initializer = BalancerSubgraphClient::for_chain(base_url, chain_id, client)?;
+        let pool_initializer = BalancerSubgraphClient::from_subgraph_url(subgraph_url, client)?;
         let fetcher = Arc::new(Cache::new(
             create_aggregate_pool_fetcher(
                 web3,
@@ -520,7 +519,6 @@ mod tests {
     async fn balancer_pool_fetcher_print() {
         let transport = ethrpc::create_env_test_transport();
         let web3 = Web3::new(transport);
-        let chain_id = web3.eth().chain_id().await.unwrap().as_u64();
         let contracts =
             BalancerContracts::new(&web3, BalancerFactoryKind::value_variants().to_vec())
                 .await
@@ -539,10 +537,9 @@ mod tests {
             "072f14b85add63488ddad88f855fda4a99d6ac9b000200000000000000000027"
         ))];
         // let deny_list = vec![];
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
         let pool_fetcher = BalancerPoolFetcher::new(
-            &base_url,
-            chain_id,
+            &subgraph_url,
             Arc::new(web3.clone()),
             token_info_fetcher,
             Default::default(),
@@ -599,9 +596,9 @@ mod tests {
             ),
             pool_id_deny_list: Default::default(),
         };
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
         // see what the subgraph says.
-        let client = BalancerSubgraphClient::for_chain(&base_url, chain_id, Client::new()).unwrap();
+        let client = BalancerSubgraphClient::from_subgraph_url(&subgraph_url, Client::new()).unwrap();
         let subgraph_pools = client.get_registered_pools().await.unwrap();
         let subgraph_token_pairs = subgraph_pools_token_pairs(&subgraph_pools.pools).collect();
 

crates/shared/src/sources/uniswap_v3/graph_api.rs

@@ -6,7 +6,7 @@ use {
         event_handling::MAX_REORG_BLOCK_COUNT,
         subgraph::{ContainsId, SubgraphClient},
     },
-    anyhow::{bail, Result},
+    anyhow::Result,
     ethcontract::{H160, U256},
     num::BigInt,
     number::serialization::HexOrDecimalU256,
@@ -106,16 +106,10 @@ const TICKS_BY_POOL_IDS_QUERY: &str = r#"
 pub struct UniV3SubgraphClient(SubgraphClient);
 
 impl UniV3SubgraphClient {
-    /// Creates a new Uniswap V3 subgraph client for the specified chain ID.
-    pub fn for_chain(base_url: &Url, chain_id: u64, client: Client) -> Result<Self> {
-        let subgraph_name = match chain_id {
-            1 => "uniswap-v3",
-            _ => bail!("unsupported chain {}", chain_id),
-        };
+    /// Creates a new Uniswap V3 subgraph client from the specified URL.
+    pub fn from_subgraph_url(subgraph_url: &Url, client: Client) -> Result<Self> {
         Ok(Self(SubgraphClient::new(
-            base_url,
-            "uniswap",
-            subgraph_name,
+            subgraph_url.clone(),
             client,
         )?))
     }
@@ -323,13 +317,16 @@ mod tests {
         std::str::FromStr,
     };
 
-    pub fn default_for_chain(chain_id: u64, client: Client) -> Result<UniV3SubgraphClient> {
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
-        UniV3SubgraphClient::for_chain(&base_url, chain_id, client)
+    pub fn default_for_chain(client: Client) -> Result<UniV3SubgraphClient> {
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        UniV3SubgraphClient::from_subgraph_url(
+           &subgraph_url, 
+           client
+        )
     }
 
     #[test]
-    fn decode_pools_data() {
+    fn decode_pools_data(){
         assert_eq!(
             serde_json::from_value::<Data<PoolData>>(json!({
                 "pools": [
@@ -482,7 +479,7 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn get_registered_pools_test() {
-        let client = default_for_chain(1, Client::new()).unwrap();
+        let client = default_for_chain(Client::new()).unwrap();
         let result = client.get_registered_pools().await.unwrap();
         println!(
             "Retrieved {} total pools at block {}",
@@ -494,7 +491,7 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn get_pools_by_pool_ids_test() {
-        let client = default_for_chain(1, Client::new()).unwrap();
+        let client = default_for_chain(Client::new()).unwrap();
         let registered_pools = client.get_registered_pools().await.unwrap();
         let pool_ids = registered_pools
             .pools
@@ -515,7 +512,7 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn get_ticks_by_pools_ids_test() {
-        let client = default_for_chain(1, Client::new()).unwrap();
+        let client = default_for_chain(Client::new()).unwrap();
         let block_number = client.get_safe_block().await.unwrap();
         let pool_ids = vec![
             H160::from_str("0x9db9e0e53058c89e5b94e29621a205198648425b").unwrap(),
@@ -531,7 +528,7 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn get_pools_with_ticks_by_ids_test() {
-        let client = default_for_chain(1, Client::new()).unwrap();
+        let client = default_for_chain(Client::new()).unwrap();
         let block_number = client.get_safe_block().await.unwrap();
         let pool_ids = vec![
             H160::from_str("0x9db9e0e53058c89e5b94e29621a205198648425b").unwrap(),

crates/shared/src/sources/uniswap_v3/pool_fetching.rs

@@ -131,12 +131,11 @@ impl PoolsCheckpointHandler {
     /// state/ticks). Then fetches state/ticks for the most deepest pools
     /// (subset of all existing pools)
     pub async fn new(
-        base_url: &Url,
-        chain_id: u64,
+        subgraph_url: &Url,
         client: Client,
         max_pools_to_initialize_cache: usize,
     ) -> Result<Self> {
-        let graph_api = UniV3SubgraphClient::for_chain(base_url, chain_id, client)?;
+        let graph_api = UniV3SubgraphClient::from_subgraph_url(subgraph_url, client)?;
         let mut registered_pools = graph_api.get_registered_pools().await?;
         tracing::debug!(
             block = %registered_pools.fetched_block_number, pools = %registered_pools.pools.len(),
@@ -266,15 +265,14 @@ pub struct UniswapV3PoolFetcher {
 
 impl UniswapV3PoolFetcher {
     pub async fn new(
-        base_url: &Url,
-        chain_id: u64,
+        subgraph_url: &Url,
         web3: Web3,
         client: Client,
         block_retriever: Arc<dyn BlockRetrieving>,
         max_pools_to_initialize: usize,
     ) -> Result<Self> {
         let checkpoint =
-            PoolsCheckpointHandler::new(base_url, chain_id, client, max_pools_to_initialize)
+            PoolsCheckpointHandler::new(subgraph_url,  client, max_pools_to_initialize)
                 .await?;
 
         let init_block = checkpoint.pools_checkpoint.lock().unwrap().block_number;
@@ -726,9 +724,10 @@ mod tests {
         let transport = ethrpc::create_env_test_transport();
         let web3 = Web3::new(transport);
         let block_retriever = Arc::new(web3.clone());
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+
         let fetcher =
-            UniswapV3PoolFetcher::new(&base_url, 1, web3, Client::new(), block_retriever, 100)
+            UniswapV3PoolFetcher::new( &subgraph_url, web3, Client::new(), block_retriever, 100)
                 .await
                 .unwrap();
 
@@ -748,10 +747,9 @@ mod tests {
         let transport = ethrpc::create_env_test_transport();
         let web3 = Web3::new(transport);
         let block_retriever = Arc::new(web3.clone());
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
         let fetcher = UniswapV3PoolFetcher::new(
-            &base_url,
-            1,
+            &subgraph_url,
             web3.clone(),
             Client::new(),
             block_retriever,
@@ -781,9 +779,10 @@ mod tests {
             .unwrap();
         pools.sort_by(|a, b| a.address.cmp(&b.address));
 
-        let base_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+
         // get the same pools using direct call to subgraph
-        let graph_api = UniV3SubgraphClient::for_chain(&base_url, 1, Client::new()).unwrap();
+        let subgraph_url = Url::parse("https://api.thegraph.com/subgraphs/name/").expect("invalid url");
+        let graph_api = UniV3SubgraphClient::from_subgraph_url(&subgraph_url, Client::new()).unwrap();
         let pool_ids = pools.iter().map(|pool| pool.address).collect::<Vec<_>>();
 
         // first get at the block in history