fix: support notifications, configs, watchers

suchapalaver · suchapalaver · commit 2fe81a30b436 · 2025-06-27T17:02:03.000-04:00
Signed-off-by: Joseph Livesey &lt;joseph@semiotic.ai&gt;
diff --git a/contrib/indexer-service/config.toml b/contrib/indexer-service/config.toml
@@ -51,8 +51,9 @@ trigger_value_divisor = 500_000
 "ACCOUNT0_ADDRESS_PLACEHOLDER" = "http://tap-aggregator:7610"
 
 [horizon]
-# Horizon migration mode: legacy | transition | full
-# - legacy: Only v1 TAP receipts supported (pre-migration)
-# - transition: Both v1 and v2 TAP receipts supported (during migration)  
-# - full: Only v2 TAP receipts supported (post-migration)
-mode = "transition"
+# Enable Horizon migration support and detection
+# When enabled: Check if Horizon contracts are active in the network
+#   - If Horizon contracts detected: Hybrid migration mode (new V2 receipts only, process existing V1 receipts)
+#   - If Horizon contracts not detected: Remain in legacy mode (V1 receipts only)
+# When disabled: Pure legacy mode, no Horizon detection performed
+enabled = true
diff --git a/contrib/tap-agent/config.toml b/contrib/tap-agent/config.toml
@@ -51,8 +51,9 @@ trigger_value_divisor = 500_000
 "ACCOUNT0_ADDRESS_PLACEHOLDER" = "http://tap-aggregator:7610"
 
 [horizon]
-# Horizon migration mode: legacy | transition | full
-# - legacy: Only v1 TAP receipts supported (pre-migration)
-# - transition: Both v1 and v2 TAP receipts supported (during migration)  
-# - full: Only v2 TAP receipts supported (post-migration)
-mode = "transition"
+# Enable Horizon migration support and detection
+# When enabled: Check if Horizon contracts are active in the network
+#   - If Horizon contracts detected: Hybrid migration mode (new V2 receipts only, process existing V1 receipts)
+#   - If Horizon contracts not detected: Remain in legacy mode (V1 receipts only)
+# When disabled: Pure legacy mode, no Horizon detection performed
+enabled = true
diff --git a/crates/config/default_values.toml b/crates/config/default_values.toml
@@ -34,4 +34,4 @@ max_receipts_per_request = 10000
 0xDD6a6f76eb36B873C1C184e8b9b9e762FE216490 = "https://tap-aggregator-arbitrum-one.graphops.xyz"
 
 [horizon]
-enabled = false
+enabled = true
diff --git a/crates/config/maximal-config-example.toml b/crates/config/maximal-config-example.toml
@@ -78,13 +78,7 @@ deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 # Refreshing interval for the Escrow contracts information from the Escrow subgraph.
 syncing_interval_secs = 60
 
-[subgraphs.escrow_v2]
-# Query URL for the Escrow v2 subgraph (Horizon).
-query_url = "http://example.com/escrow-v2-subgraph"
-# Optional, Auth token will used a "bearer auth"
-# query_auth_token = "super-secret"
-# Refreshing interval for the Escrow v2 contracts information.
-syncing_interval_secs = 30
+# NOTE: V2 escrow accounts are now in the network subgraph, not a separate escrow_v2 subgraph
 
 [blockchain]
 # The chain ID of the network that the graph network is running on
@@ -178,4 +172,9 @@ hardhat = "100"
 "eip155:1337" = "hardhat"
 
 [horizon]
-mode = "transition"
+# Enable Horizon migration support and detection
+# When enabled: Check if Horizon contracts are active in the network
+#   - If Horizon contracts detected: Hybrid migration mode (new V2 receipts only, process existing V1 receipts)
+#   - If Horizon contracts not detected: Remain in legacy mode (V1 receipts only)
+# When disabled: Pure legacy mode, no Horizon detection performed
+enabled = true
diff --git a/crates/config/minimal-config-example.toml b/crates/config/minimal-config-example.toml
@@ -49,11 +49,6 @@ query_url = "http://example.com/escrow-subgraph"
 # NOTE: Use `query_url` or `deployment_id` only
 deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 
-[subgraphs.escrow_v2]
-# Query URL for the Escrow v2 subgraph (Horizon).
-query_url = "http://example.com/escrow-v2-subgraph"
-syncing_interval_secs = 30
-
 [blockchain]
 # The chain ID of the network that the graph network is running on
 chain_id = 1337
@@ -70,4 +65,9 @@ receipts_verifier_address = "0x2222222222222222222222222222222222222222"
 0xDD6a6f76eb36B873C1C184e8b9b9e762FE216490 = "https://tap-aggregator-arbitrum-one.graphops.xyz"
 
 [horizon]
-mode = "transition"
+# Enable Horizon migration support and detection
+# When enabled: Check if Horizon contracts are active in the network
+#   - If Horizon contracts detected: Hybrid migration mode (new V2 receipts only, process existing V1 receipts)
+#   - If Horizon contracts not detected: Remain in legacy mode (V1 receipts only)
+# When disabled: Pure legacy mode, no Horizon detection performed
+enabled = true
diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs
@@ -447,26 +447,25 @@ pub struct RavRequestConfig {
     pub max_receipts_per_request: u64,
 }
 
-/// Horizon upgrade mode configuration
-#[derive(Debug, Clone, Deserialize, PartialEq, Default)]
-#[serde(rename_all = "lowercase")]
-pub enum HorizonMode {
-    /// Legacy mode: Only v1 TAP receipts supported
-    #[default]
-    Legacy,
-    /// Transition mode: Both v1 and v2 TAP receipts supported (for migration)
-    Transition,
-    /// Full mode: Only v2 TAP receipts supported (post-migration)
-    Full,
-}
-
-/// Configuration for the horizon
-/// standard
+/// Configuration for the horizon migration
 #[derive(Debug, Default, Deserialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct HorizonConfig {
-    /// Horizon upgrade mode
-    pub mode: HorizonMode,
+    /// Enable Horizon migration support and detection
+    ///
+    /// When enabled (true):
+    /// - System will check if Horizon contracts are active in the network
+    /// - If Horizon contracts are detected: Enable hybrid migration mode
+    ///   * Accept new V2 TAP receipts only  
+    ///   * Continue processing existing V1 receipts for RAV generation
+    ///   * Reject new V1 receipt submissions
+    /// - If Horizon contracts are not detected: Remain in legacy mode
+    ///
+    /// When disabled (false):
+    /// - Pure legacy mode, no Horizon detection performed
+    /// - Only V1 TAP receipts are supported
+    #[serde(default)]
+    pub enabled: bool,
 }
 
 #[cfg(test)]
diff --git a/crates/monitor/src/horizon_detection.rs b/crates/monitor/src/horizon_detection.rs
@@ -0,0 +1,48 @@
+// Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
+// SPDX-License-Identifier: Apache-2.0
+
+//! Horizon (V2) contract detection utilities
+//!
+//! This module provides functionality to detect if Horizon (V2) contracts are active
+//! in the network by querying the network subgraph for PaymentsEscrow accounts.
+
+use anyhow::Result;
+use indexer_query::horizon_detection::{self, HorizonDetectionQuery};
+
+use crate::client::SubgraphClient;
+
+/// Detects if Horizon (V2) contracts are active in the network.
+///
+/// This function queries the network subgraph to check if any PaymentsEscrow accounts exist.
+/// If they do, it indicates that Horizon contracts are deployed and active.
+///
+/// # Arguments
+/// * `network_subgraph` - The network subgraph client to query
+///
+/// # Returns
+/// * `Ok(true)` if Horizon contracts are active
+/// * `Ok(false)` if only legacy (V1) contracts are active
+/// * `Err(...)` if there was an error querying the subgraph
+pub async fn is_horizon_active(network_subgraph: &SubgraphClient) -> Result<bool> {
+    tracing::debug!("Checking if Horizon (V2) contracts are active in the network");
+
+    let response = network_subgraph
+        .query::<HorizonDetectionQuery, _>(horizon_detection::Variables {})
+        .await?;
+
+    let response = response?;
+
+    // If we find any PaymentsEscrow accounts, Horizon is active
+    let horizon_active = !response.payments_escrow_accounts.is_empty();
+
+    if horizon_active {
+        tracing::info!(
+            "Horizon (V2) contracts detected - found {} PaymentsEscrow accounts",
+            response.payments_escrow_accounts.len()
+        );
+    } else {
+        tracing::info!("No Horizon (V2) contracts found - using legacy (V1) mode");
+    }
+
+    Ok(horizon_active)
+}
diff --git a/crates/monitor/src/lib.rs b/crates/monitor/src/lib.rs
@@ -7,6 +7,7 @@ mod client;
 mod deployment_to_allocation;
 mod dispute_manager;
 mod escrow_accounts;
+mod horizon_detection;
 
 pub use crate::{
     allocations::{indexer_allocations, AllocationWatcher},
@@ -18,4 +19,5 @@ pub use crate::{
         empty_escrow_accounts_watcher, escrow_accounts_v1, escrow_accounts_v2, EscrowAccounts,
         EscrowAccountsError, EscrowAccountsWatcher,
     },
+    horizon_detection::is_horizon_active,
 };
diff --git a/crates/query/graphql/horizon_detection.query.graphql b/crates/query/graphql/horizon_detection.query.graphql
@@ -0,0 +1,8 @@
+# Query to detect if Horizon (V2) contracts are active in the network
+# This query checks for the existence of PaymentsEscrow accounts which indicate V2 is active
+
+query HorizonDetectionQuery {
+    paymentsEscrowAccounts(first: 1) {
+        id
+    }
+}
diff --git a/crates/query/src/lib.rs b/crates/query/src/lib.rs
@@ -174,3 +174,19 @@ pub mod network_escrow_account_v2 {
 
     pub use network_escrow_account_query_v2::Variables;
 }
+
+pub mod horizon_detection {
+    use graphql_client::GraphQLQuery;
+    type Bytes = String;
+
+    #[derive(GraphQLQuery)]
+    #[graphql(
+        schema_path = "graphql/network.schema.graphql",
+        query_path = "graphql/horizon_detection.query.graphql",
+        response_derives = "Debug",
+        variables_derives = "Clone"
+    )]
+    pub struct HorizonDetectionQuery;
+
+    pub use horizon_detection_query::*;
+}
diff --git a/crates/service/src/service.rs b/crates/service/src/service.rs
diff --git a/crates/tap-agent/src/agent.rs b/crates/tap-agent/src/agent.rs
diff --git a/crates/tap-agent/src/agent/sender_account.rs b/crates/tap-agent/src/agent/sender_account.rs
diff --git a/crates/tap-agent/src/agent/sender_accounts_manager.rs b/crates/tap-agent/src/agent/sender_accounts_manager.rs
diff --git a/crates/tap-agent/src/agent/sender_allocation.rs b/crates/tap-agent/src/agent/sender_allocation.rs
