chore: use thegraph-headers graph-attestation http header (#1007)

Signed-off-by: Lorenzo Delgado <[email protected]>

Cargo.toml

@@ -55,6 +55,7 @@ thegraph-core = { version = "0.9.0", features = [
     "serde",
 ] }
 thegraph-graphql-http = { version = "0.3.2", features = ["reqwest"] }
+thegraph-headers = { version = "0.1.0", features = ["attestation"] }
 thiserror = "2.0.2"
 tokio = { version = "1.38.0", features = [
     "macros",

src/client_query.rs

@@ -21,17 +21,17 @@ use rand::{thread_rng, Rng as _};
 use serde::Deserialize;
 use serde_json::value::RawValue;
 use thegraph_core::{alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId};
+use thegraph_headers::{graph_attestation::GraphAttestation, HttpBuilderExt as _};
 use tokio::sync::mpsc;
 use tracing::{info_span, Instrument as _};
 use url::Url;
 
-use self::{attestation_header::GraphAttestation, context::Context, query_selector::QuerySelector};
+use self::{context::Context, query_selector::QuerySelector};
 use crate::{
     auth::AuthSettings,
     block_constraints::{resolve_block_requirements, rewrite_query, BlockRequirements},
     budgets::USD,
     errors::{Error, IndexerError, IndexerErrors, MissingBlockError, UnavailableReason},
-    http_ext::HttpBuilderExt as _,
     indexer_client::{IndexerAuth, IndexerResponse},
     indexing_performance,
     metrics::{with_metric, METRICS},
@@ -40,7 +40,6 @@ use crate::{
     reports,
 };
 
-mod attestation_header;
 pub mod context;
 mod query_selector;
 
@@ -104,12 +103,16 @@ pub async fn handle_query(
              attestation,
              ..
          }| {
-            Response::builder()
+            let mut builder = Response::builder()
                 .status(StatusCode::OK)
-                .header_typed(ContentType::json())
-                .header_typed(GraphAttestation(attestation))
-                .body(client_response)
-                .unwrap()
+                .header_typed(ContentType::json());
+
+            // Add attestation header if present
+            if let Some(attestation) = attestation {
+                builder = builder.header_typed(GraphAttestation(attestation));
+            }
+
+            builder.body(client_response).expect("valid response")
         },
     )
 }
@@ -769,12 +772,16 @@ pub async fn handle_indexer_query(
              attestation,
              ..
          }| {
-            Response::builder()
+            let mut builder = Response::builder()
                 .status(StatusCode::OK)
-                .header_typed(ContentType::json())
-                .header_typed(GraphAttestation(attestation))
-                .body(client_response)
-                .unwrap()
+                .header_typed(ContentType::json());
+
+            // Add attestation header if present
+            if let Some(attestation) = attestation {
+                builder = builder.header_typed(GraphAttestation(attestation));
+            }
+
+            builder.body(client_response).expect("valid response")
         },
     )
 }

src/graphql.rs

@@ -1,8 +1,7 @@
 use axum::http::{Response, StatusCode};
 use headers::ContentType;
 use thegraph_graphql_http::http::response::{IntoError as IntoGraphqlResponseError, ResponseBody};
-
-use crate::http_ext::HttpBuilderExt as _;
+use thegraph_headers::HttpBuilderExt as _;
 
 /// Serialize an error into a GraphQL error response.
 ///

src/main.rs

@@ -10,7 +10,6 @@ mod config;
 mod errors;
 mod exchange_rate;
 mod graphql;
-mod http_ext;
 mod indexer_client;
 mod indexing_performance;
 mod metrics;