[Horizon] Phase 3 gateway

src/client_query.rs

@@ -303,7 +303,11 @@ async fn run_indexer_queries(
                     let start_time = Instant::now();
                     // URL checked: ref df8e647b-1e6e-422a-8846-dc9ee7e0dcc2
                     let deployment_url = url.join(&format!("subgraphs/id/{deployment}")).unwrap();
-                    let auth = IndexerAuth::Paid(&receipt, ctx.attestation_domain);
+                    let auth = IndexerAuth::Paid(
+                        &receipt,
+                        ctx.attestation_domain,
+                        ctx.legacy_attestation_domain,
+                    );
                     let result = indexer_client
                         .query_indexer(deployment_url, auth, &indexer_query)
                         .in_current_span()
@@ -695,7 +699,11 @@ pub async fn handle_indexer_query(
         .url
         .join(&format!("subgraphs/id/{deployment}"))
         .unwrap();
-    let indexer_auth = IndexerAuth::Paid(&receipt, ctx.attestation_domain);
+    let indexer_auth = IndexerAuth::Paid(
+        &receipt,
+        ctx.attestation_domain,
+        ctx.legacy_attestation_domain,
+    );
 
     let indexer_start_time = Instant::now();
     let result = ctx

src/client_query/context.rs

@@ -18,5 +18,6 @@ pub struct Context {
     pub network: NetworkService,
     pub indexing_perf: IndexingPerformance,
     pub attestation_domain: &'static Eip712Domain,
+    pub legacy_attestation_domain: &'static Eip712Domain,
     pub reporter: mpsc::UnboundedSender<reports::ClientRequest>,
 }

src/config.rs

@@ -128,6 +128,7 @@ pub enum BlocklistEntry {
 pub struct AttestationConfig {
     pub chain_id: String,
     pub dispute_manager: Address,
+    pub legacy_dispute_manager: Address,
 }
 
 /// The exchange rate provider.

src/indexer_client.rs

@@ -35,7 +35,7 @@ pub struct IndexerClient {
 }
 
 pub enum IndexerAuth<'a> {
-    Paid(&'a Receipt, &'a Eip712Domain),
+    Paid(&'a Receipt, &'a Eip712Domain, &'a Eip712Domain),
     Free(&'a str),
 }
 
@@ -47,7 +47,7 @@ impl IndexerClient {
         query: &str,
     ) -> Result<IndexerResponse, IndexerError> {
         let (auth_key, auth_value) = match auth {
-            IndexerAuth::Paid(receipt, _) => ("Tap-Receipt", receipt.serialize()),
+            IndexerAuth::Paid(receipt, _, _) => ("Tap-Receipt", receipt.serialize()),
             IndexerAuth::Free(token) => (AUTHORIZATION.as_str(), format!("Bearer {token}")),
         };
 
@@ -113,18 +113,26 @@ impl IndexerClient {
             return Err(BadResponse(format!("unattestable response: {error}")));
         }
 
-        if let IndexerAuth::Paid(receipt, attestation_domain) = auth {
+        if let IndexerAuth::Paid(receipt, attestation_domain, legacy_attestation_domain) = auth {
             match &payload.attestation {
                 Some(attestation) => {
                     let allocation = receipt.allocation();
-                    if let Err(err) = attestation::verify(
+                    if let Err(legacy_err) = attestation::verify(
+                        legacy_attestation_domain,
+                        attestation,
+                        &allocation,
+                        query,
+                        &original_response,
+                    ) && let Err(err) = attestation::verify(
                         attestation_domain,
                         attestation,
                         &allocation,
                         query,
                         &original_response,
                     ) {
-                        return Err(BadResponse(format!("bad attestation: {err}")));
+                        return Err(BadResponse(format!(
+                            "bad attestation: {legacy_err} - {err}"
+                        )));
                     }
                 }
                 None => {

src/main.rs

@@ -104,6 +104,15 @@ async fn main() {
             conf.attestations.dispute_manager,
         )));
 
+    let legacy_attestation_domain: &'static Eip712Domain =
+        Box::leak(Box::new(attestation::eip712_domain(
+            conf.attestations
+                .chain_id
+                .parse::<ChainId>()
+                .expect("failed to parse attestation domain chain_id"),
+            conf.attestations.legacy_dispute_manager,
+        )));
+
     let indexer_client = IndexerClient {
         client: http_client.clone(),
     };
@@ -171,6 +180,7 @@ async fn main() {
         indexing_perf,
         network,
         attestation_domain,
+        legacy_attestation_domain,
         reporter,
     };