fix(common): attestation for free query (#297)

Author: gusinacio

common/src/indexer_service/http/indexer_service.rs

@@ -53,7 +53,12 @@ pub trait IndexerServiceResponse {
 
     fn is_attestable(&self) -> bool;
     fn as_str(&self) -> Result<&str, Self::Error>;
-    fn finalize(self, attestation: Option<Attestation>) -> Self::Data;
+    fn finalize(self, attestation: AttestationOutput) -> Self::Data;
+}
+
+pub enum AttestationOutput {
+    Attestation(Option<Attestation>),
+    Attestable,
 }
 
 #[async_trait]
@@ -81,8 +86,6 @@ where
     ServiceNotReady,
     #[error("No attestation signer found for allocation `{0}`")]
     NoSignerForAllocation(Address),
-    #[error("No attestation signer found for manifest `{0}`")]
-    NoSignerForManifest(DeploymentId),
     #[error("Invalid request body: {0}")]
     InvalidRequest(anyhow::Error),
     #[error("Error while processing the request: {0}")]
@@ -114,9 +117,7 @@ where
 
             Unauthorized => StatusCode::UNAUTHORIZED,
 
-            NoSignerForAllocation(_) | NoSignerForManifest(_) | FailedToSignAttestation => {
-                StatusCode::INTERNAL_SERVER_ERROR
-            }
+            NoSignerForAllocation(_) | FailedToSignAttestation => StatusCode::INTERNAL_SERVER_ERROR,
 
             ReceiptError(_)
             | InvalidRequest(_)

common/src/indexer_service/http/mod.rs

@@ -13,6 +13,6 @@ pub use config::{
     ServerConfig, SubgraphConfig, TapConfig,
 };
 pub use indexer_service::{
-    IndexerService, IndexerServiceImpl, IndexerServiceOptions, IndexerServiceRelease,
-    IndexerServiceResponse,
+    AttestationOutput, IndexerService, IndexerServiceImpl, IndexerServiceOptions,
+    IndexerServiceRelease, IndexerServiceResponse,
 };

common/src/indexer_service/http/request_handler.rs

@@ -14,10 +14,10 @@ use reqwest::StatusCode;
 use thegraph_core::DeploymentId;
 use tracing::trace;
 
-use crate::{indexer_service::http::IndexerServiceResponse, prelude::AttestationSigner};
+use crate::indexer_service::http::IndexerServiceResponse;
 
 use super::{
-    indexer_service::{IndexerServiceError, IndexerServiceState},
+    indexer_service::{AttestationOutput, IndexerServiceError, IndexerServiceState},
     tap_receipt_header::TapReceipt,
     IndexerServiceImpl,
 };
@@ -44,9 +44,7 @@ where
     let request =
         serde_json::from_slice(&body).map_err(|e| IndexerServiceError::InvalidRequest(e.into()))?;
 
-    let mut attestation_signer: Option<AttestationSigner> = None;
-
-    if let Some(receipt) = receipt.into_signed_receipt() {
+    let attestation_signer = if let Some(receipt) = receipt.into_signed_receipt() {
         let allocation_id = receipt.message.allocation_id;
 
         // Verify the receipt and store it in the database
@@ -63,12 +61,12 @@ where
             .value_immediate()
             .ok_or_else(|| IndexerServiceError::ServiceNotReady)?;
 
-        attestation_signer = Some(
+        Some(
             signers
                 .get(&allocation_id)
                 .cloned()
                 .ok_or_else(|| (IndexerServiceError::NoSignerForAllocation(allocation_id)))?,
-        );
+        )
     } else {
         match headers
             .get("authorization")
@@ -83,25 +81,29 @@ where
                 }
             }
         }
-    }
+        None
+    };
 
     let (request, response) = state
         .service_impl
         .process_request(manifest_id, request)
         .await
         .map_err(IndexerServiceError::ProcessingError)?;
 
-    let attestation = match (response.is_attestable(), attestation_signer) {
-        (false, _) => None,
-        (true, None) => return Err(IndexerServiceError::NoSignerForManifest(manifest_id)),
-        (true, Some(signer)) => {
+    let attestation = match attestation_signer {
+        Some(signer) => {
             let req = serde_json::to_string(&request)
                 .map_err(|_| IndexerServiceError::FailedToSignAttestation)?;
             let res = response
                 .as_str()
                 .map_err(|_| IndexerServiceError::FailedToSignAttestation)?;
-            Some(signer.create_attestation(&req, res))
+            AttestationOutput::Attestation(
+                response
+                    .is_attestable()
+                    .then(|| signer.create_attestation(&req, res)),
+            )
         }
+        None => AttestationOutput::Attestable,
     };
 
     let response = response.finalize(attestation);

service/src/service.rs

@@ -7,12 +7,14 @@ use std::time::Duration;
 use super::{config::Config, error::SubgraphServiceError, routes};
 use anyhow::anyhow;
 use axum::{async_trait, routing::post, Json, Router};
-use indexer_common::indexer_service::http::{IndexerServiceImpl, IndexerServiceResponse};
+use indexer_common::indexer_service::http::{
+    AttestationOutput, IndexerServiceImpl, IndexerServiceResponse,
+};
 use indexer_config::Config as MainConfig;
 use reqwest::Url;
 use serde_json::{json, Value};
 use sqlx::PgPool;
-use thegraph_core::{Attestation, DeploymentId};
+use thegraph_core::DeploymentId;
 
 use crate::{cli::Cli, database};
 
@@ -46,10 +48,14 @@ impl IndexerServiceResponse for SubgraphServiceResponse {
         Ok(self.inner.as_str())
     }
 
-    fn finalize(self, attestation: Option<Attestation>) -> Self::Data {
+    fn finalize(self, attestation: AttestationOutput) -> Self::Data {
+        let (attestation_key, attestation_value) = match attestation {
+            AttestationOutput::Attestation(attestation) => ("attestation", json!(attestation)),
+            AttestationOutput::Attestable => ("attestable", json!(self.is_attestable())),
+        };
         Json(json!({
             "graphQLResponse": self.inner,
-            "attestation": attestation
+            attestation_key: attestation_value,
         }))
     }
 }