chore(deps): use thegraph dependency types and subgraph client (#439)

This PR moves the gateway from using the `thegraph` types instead of the
`toolshed::thegraph`.

Cargo.toml

@@ -28,5 +28,6 @@ tokio = { version = "1.24", features = [
     "sync",
     "time",
 ] }
-toolshed = { git = "https://github.com/edgeandnode/toolshed", tag = "v0.3.0" }
+toolshed = { git = "https://github.com/edgeandnode/toolshed", tag = "v0.4.0" }
+thegraph = { git = "https://github.com/edgeandnode/toolshed", tag = "thegraph-v0.1.1" }
 tracing = { version = "0.1", default-features = false }

graph-gateway/Cargo.toml

@@ -45,6 +45,7 @@ serde_with = "3.1"
 serde_yaml = "0.9"
 simple-rate-limiter = "1.0"
 tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "e55ea03" }
+thegraph = { workspace = true, features = ["subgraph-client"] }
 thiserror = "1.0.40"
 tokio.workspace = true
 toolshed.workspace = true

graph-gateway/src/auth.rs

@@ -8,8 +8,8 @@ use anyhow::{anyhow, bail, ensure, Result};
 use eventuals::{Eventual, EventualExt, Ptr};
 use graph_subscriptions::TicketPayload;
 use prelude::USD;
+use thegraph::types::{DeploymentId, SubgraphId};
 use tokio::sync::RwLock;
-use toolshed::thegraph::{DeploymentId, SubgraphId};
 
 use crate::subgraph_studio::{APIKey, QueryStatus};
 use crate::subscriptions::Subscription;

graph-gateway/src/block_constraints.rs

@@ -9,7 +9,7 @@ use graphql::{IntoStaticValue as _, StaticValue};
 use indexer_selection::UnresolvedBlock;
 use itertools::Itertools as _;
 use serde_json::{self, json};
-use toolshed::thegraph::BlockPointer;
+use thegraph::types::BlockPointer;
 
 #[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
 pub enum BlockConstraint {

graph-gateway/src/chains/ethereum.rs

@@ -4,9 +4,10 @@ use alloy_primitives::BlockHash;
 use indexer_selection::UnresolvedBlock;
 use serde::{de::Error, Deserialize, Deserializer};
 use serde_json::{json, Value as JSON};
+use thegraph::types::BlockPointer;
 use tokio::sync::mpsc;
 use tokio::time::interval;
-use toolshed::{thegraph::BlockPointer, url::Url};
+use toolshed::url::Url;
 use tracing::Instrument;
 
 use super::{BlockHead, ClientMsg};

graph-gateway/src/chains/mod.rs

@@ -5,9 +5,9 @@ use alloy_primitives::{BlockHash, BlockNumber};
 use eventuals::{Eventual, EventualWriter};
 use indexer_selection::UnresolvedBlock;
 use prelude::epoch_cache::EpochCache;
+use thegraph::types::BlockPointer;
 use tokio::sync::{mpsc, oneshot};
 use tokio::time::interval;
-use toolshed::thegraph::BlockPointer;
 use tracing::Instrument;
 
 use crate::{block_constraints::*, metrics::*};

graph-gateway/src/chains/test.rs

@@ -1,8 +1,8 @@
 use std::time::Duration;
 
 use indexer_selection::UnresolvedBlock;
+use thegraph::types::BlockPointer;
 use tokio::sync::mpsc;
-use toolshed::thegraph::BlockPointer;
 
 use crate::chains::BlockHead;
 

graph-gateway/src/client_query.rs

@@ -34,8 +34,8 @@ use rand::{rngs::SmallRng, SeedableRng as _};
 use serde::Deserialize;
 use serde_json::json;
 use serde_json::value::RawValue;
+use thegraph::types::{attestation, BlockPointer, DeploymentId, SubgraphId};
 use tokio::sync::mpsc;
-use toolshed::thegraph::{attestation, BlockPointer, DeploymentId, SubgraphId};
 use toolshed::url::Url;
 use tracing::Instrument;
 use uuid::Uuid;

graph-gateway/src/indexer_client.rs

@@ -4,7 +4,7 @@ use alloy_primitives::BlockNumber;
 use axum::http::StatusCode;
 use indexer_selection::Selection;
 use serde::Deserialize;
-use toolshed::thegraph::attestation::Attestation;
+use thegraph::types::attestation::Attestation;
 
 use crate::receipts::{ReceiptSigner, ReceiptStatus, ScalarReceipt};
 

graph-gateway/src/indexers_status/cost_models/query.rs

@@ -2,7 +2,7 @@ use graphql_http::graphql::{Document, IntoDocument, IntoDocumentWithVariables};
 use indoc::indoc;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
-use toolshed::thegraph::DeploymentId;
+use thegraph::types::DeploymentId;
 
 pub(super) const COST_MODEL_QUERY_DOCUMENT: &str = indoc! {
     r#"query ($deployments: [String!]!) {

graph-gateway/src/indexers_status/indexing_statuses/query.rs

@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use alloy_primitives::BlockHash;
 use indoc::indoc;
 use serde::{Deserialize, Deserializer};
-use toolshed::thegraph::DeploymentId;
+use thegraph::types::DeploymentId;
 
 pub(super) const INDEXING_STATUSES_QUERY_DOCUMENT: &str = indoc! {
     r#"{

graph-gateway/src/indexers_status/public_poi/client.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use alloy_primitives::BlockNumber;
 use graphql_http::http_client::ReqwestExt;
 use itertools::Itertools;
-use toolshed::thegraph::DeploymentId;
+use thegraph::types::DeploymentId;
 use toolshed::url::Url;
 
 use crate::indexers_status::public_poi::query;

graph-gateway/src/indexers_status/public_poi/query.rs

@@ -3,7 +3,7 @@ use graphql_http::graphql::{Document, IntoDocument, IntoDocumentWithVariables};
 use indoc::indoc;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
-use toolshed::thegraph::DeploymentId;
+use thegraph::types::DeploymentId;
 
 pub const MAX_REQUESTS_PER_QUERY: usize = 10;
 

graph-gateway/src/indexing.rs

@@ -7,8 +7,8 @@ use futures::future::join_all;
 use indexer_selection::Indexing;
 use prelude::epoch_cache::EpochCache;
 use semver::Version;
+use thegraph::types::{BlockPointer, DeploymentId};
 use tokio::sync::Mutex;
-use toolshed::thegraph::{BlockPointer, DeploymentId};
 use toolshed::url::{url::Host, Url};
 use trust_dns_resolver::TokioAsyncResolver as DNSResolver;
 

graph-gateway/src/indexings_blocklist.rs

@@ -5,8 +5,8 @@ use std::time::Duration;
 
 use alloy_primitives::Address;
 use itertools::Itertools;
+use thegraph::types::DeploymentId;
 use tokio::sync::Mutex;
-use toolshed::thegraph::DeploymentId;
 use toolshed::url::Url;
 
 use indexer_selection::Indexing;

graph-gateway/src/lib.rs

@@ -20,7 +20,6 @@ pub mod network_subgraph;
 pub mod poi;
 pub mod receipts;
 pub mod reports;
-pub mod subgraph_client;
 pub mod subgraph_studio;
 pub mod subscriptions;
 pub mod subscriptions_subgraph;

graph-gateway/src/main.rs

@@ -18,18 +18,20 @@ use axum::{
     routing, Router, Server,
 };
 use eventuals::{Eventual, EventualExt as _, Ptr};
-use graph_gateway::budgets::Budgeter;
 use graph_subscriptions::subscription_tier::SubscriptionTiers;
 use prometheus::{self, Encoder as _};
+use secp256k1::SecretKey;
 use serde_json::json;
 use simple_rate_limiter::RateLimiter;
+use thegraph::client as subgraph_client;
+use thegraph::types::{attestation, DeploymentId};
 use tokio::spawn;
-use toolshed::thegraph::{attestation, DeploymentId};
 use tower_http::cors::{self, CorsLayer};
 
 use graph_gateway::indexings_blocklist::indexings_blocklist;
 use graph_gateway::{
     auth::AuthHandler,
+    budgets::Budgeter,
     chains::{ethereum, BlockCache},
     client_query,
     config::{Config, ExchangeRateProvider},
@@ -40,13 +42,12 @@ use graph_gateway::{
     receipts::ReceiptSigner,
     reports,
     reports::KafkaClient,
-    subgraph_client, subgraph_studio, subscriptions_subgraph,
+    subgraph_studio, subscriptions_subgraph,
     topology::{Deployment, GraphNetwork},
     vouchers, JsonResponse,
 };
 use indexer_selection::{actor::Update, BlockStatus, Indexing};
 use prelude::{buffer_queue::QueueWriter, *};
-use secp256k1::SecretKey;
 
 // Moving the `exchange_rate` module to `lib.rs` makes the doctests to fail during the compilation
 // step. This module is only used here, so let's keep it here for now.

graph-gateway/src/network_subgraph.rs

@@ -6,10 +6,9 @@ use anyhow::anyhow;
 use eventuals::{self, Eventual, EventualExt as _, EventualWriter, Ptr};
 use prelude::*;
 use serde::Deserialize;
+use thegraph::client as subgraph_client;
+use thegraph::types::{DeploymentId, SubgraphId};
 use tokio::sync::Mutex;
-use toolshed::thegraph::{DeploymentId, SubgraphId};
-
-use crate::subgraph_client;
 
 pub struct Data {
     pub network_params: NetworkParams,

graph-gateway/src/poi.rs

@@ -1,5 +1,5 @@
 use alloy_primitives::{BlockNumber, B256};
-use toolshed::thegraph::DeploymentId;
+use thegraph::types::DeploymentId;
 
 pub type ProofOfIndexing = B256;
 

graph-gateway/src/reports.rs

@@ -6,7 +6,8 @@ use prost::Message as _;
 use rdkafka::error::KafkaResult;
 use serde::Deserialize;
 use serde_json::{json, Map};
-use toolshed::{concat_bytes, thegraph::attestation::Attestation};
+use thegraph::types::attestation::Attestation;
+use toolshed::concat_bytes;
 use tracing::span;
 use tracing_subscriber::{filter::FilterFn, layer, prelude::*, registry, EnvFilter, Layer};