feat(config): add new subgraph_service field to config.horizon

feat(sender_account): Propagate new subgraph_service_address to receipt layers

fix(horizon): use subgraph_service in query for V2 receipts

Author: neithanmo

crates/config/src/config.rs

@@ -226,6 +226,14 @@ impl Config {
             );
         }
 
+        // Horizon configuration validation
+        if self.horizon.enabled && self.horizon.subgraph_service_address.is_none() {
+            return Err(
+                "Missing required 'horizon.subgraph_service_address' when horizon.enabled = true. \
+Set it in the config file under [horizon] or via env var TAP_AGENT__HORIZON__SUBGRAPH_SERVICE_ADDRESS.".to_string(),
+            );
+        }
+
         Ok(())
     }
 }
@@ -470,6 +478,11 @@ pub struct HorizonConfig {
     /// - Only V1 TAP receipts are supported
     #[serde(default)]
     pub enabled: bool,
+
+    // Address of the SubgraphService contract used for Horizon (V2)
+    // Required when `enabled = true`. Optional otherwise.
+    #[serde(default)]
+    pub subgraph_service_address: Option<Address>,
 }
 
 #[cfg(test)]

crates/tap-agent/src/agent/sender_account.rs

@@ -412,6 +412,9 @@ pub struct SenderAccountConfig {
 
     #[doc(hidden)]
     pub horizon_enabled: bool,
+
+    /// SubgraphService address used for Horizon (V2) receipts
+    pub subgraph_service_address: Address,
 }
 
 impl SenderAccountConfig {
@@ -428,6 +431,10 @@ impl SenderAccountConfig {
             tap_sender_timeout: config.tap.sender_timeout_secs,
             trusted_senders: config.tap.trusted_senders.clone(),
             horizon_enabled: config.horizon.enabled,
+            subgraph_service_address: config
+                .horizon
+                .subgraph_service_address
+                .unwrap_or(config.indexer.indexer_address),
         }
     }
 }

crates/tap-agent/src/agent/sender_allocation.rs

@@ -181,6 +181,8 @@ pub struct AllocationConfig {
     pub indexer_address: Address,
     /// Polling interval for escrow subgraph
     pub escrow_polling_interval: Duration,
+    /// SubgraphService address for Horizon (V2)
+    pub subgraph_service_address: Address,
 }
 
 impl AllocationConfig {
@@ -191,6 +193,7 @@ impl AllocationConfig {
             rav_request_receipt_limit: config.rav_request_receipt_limit,
             indexer_address: config.indexer_address,
             escrow_polling_interval: config.escrow_polling_interval,
+            subgraph_service_address: config.subgraph_service_address,
         }
     }
 }
@@ -484,6 +487,7 @@ where
             .pgpool(pgpool.clone())
             .allocation_id(T::allocation_id_to_address(&allocation_id))
             .indexer_address(config.indexer_address)
+            .subgraph_service_address(config.subgraph_service_address)
             .sender(sender)
             .escrow_accounts(escrow_accounts.clone())
             .build();

crates/tap-agent/src/tap/context.rs

@@ -200,6 +200,9 @@ pub struct TapAgentContext<T> {
     sender: Address,
     #[cfg_attr(test, builder(default = crate::test::INDEXER.1))]
     indexer_address: Address,
+    /// SubgraphService address (used by Horizon V2 queries)
+    #[cfg_attr(test, builder(default = crate::test::INDEXER.1))]
+    subgraph_service_address: Address,
     escrow_accounts: Receiver<EscrowAccounts>,
     /// We use phantom data as a marker since it's
     /// only used to define what methods are available

crates/tap-agent/src/tap/context/receipt.rs

@@ -257,7 +257,7 @@ impl ReceiptRead<TapReceipt> for TapAgentContext<Horizon> {
             "#,
             CollectionId::from(self.allocation_id).encode_hex(),
             self.sender.encode_hex(),
-            self.indexer_address.encode_hex(),
+            self.subgraph_service_address.encode_hex(),
             self.indexer_address.encode_hex(),
             &signers,
             rangebounds_to_pgrange(timestamp_range_ns),
@@ -379,7 +379,7 @@ impl ReceiptDelete for TapAgentContext<Horizon> {
             &signers,
             rangebounds_to_pgrange(timestamp_ns),
             self.sender.encode_hex(),
-            self.indexer_address.encode_hex(),
+            self.subgraph_service_address.encode_hex(),
             self.indexer_address.encode_hex(),
         )
         .execute(&self.pgpool)