fix: support notifications, configs, watchers

Signed-off-by: Joseph Livesey <[email protected]>

Author: suchapalaver

contrib/indexer-service/config.toml

@@ -51,8 +51,8 @@ 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 contracts support for hybrid migration mode
+# When enabled: Accept new V2 receipts only, continue processing existing V1 receipts
+# When disabled: V1 receipts only (legacy mode)
+# If not set, auto-detection from network subgraph will be used
+enabled = true

contrib/tap-agent/config.toml

@@ -51,8 +51,8 @@ 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 contracts support for hybrid migration mode
+# When enabled: Accept new V2 receipts only, continue processing existing V1 receipts
+# When disabled: V1 receipts only (legacy mode)
+# If not set, auto-detection from network subgraph will be used
+enabled = true

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

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,8 @@ hardhat = "100"
 "eip155:1337" = "hardhat"
 
 [horizon]
-mode = "transition"
+# Enable Horizon contracts support for hybrid migration mode
+# When enabled: Accept new V2 receipts only, continue processing existing V1 receipts
+# When disabled: V1 receipts only (legacy mode)
+# If not set, auto-detection from network subgraph will be used
+enabled = true

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,8 @@ receipts_verifier_address = "0x2222222222222222222222222222222222222222"
 0xDD6a6f76eb36B873C1C184e8b9b9e762FE216490 = "https://tap-aggregator-arbitrum-one.graphops.xyz"
 
 [horizon]
-mode = "transition"
+# Enable Horizon contracts support for hybrid migration mode
+# When enabled: Accept new V2 receipts only, continue processing existing V1 receipts
+# When disabled: V1 receipts only (legacy mode)
+# If not set, auto-detection from network subgraph will be used
+enabled = true

crates/config/src/config.rs

@@ -447,26 +447,17 @@ 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 contracts support
+    /// When enabled, the system will:
+    /// - Accept new V2 TAP receipts only
+    /// - Continue processing existing V1 receipts for RAV generation
+    /// - Reject new V1 receipt submissions
+    #[serde(default)]
+    pub enabled: bool,
 }
 
 #[cfg(test)]

crates/monitor/src/horizon_detection.rs

@@ -0,0 +1,84 @@
+// 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 calling the HorizonStaking contract directly.
+
+use alloy::{
+    contract::{Contract, Interface},
+    primitives::{Address, U256},
+    providers::{Provider, ProviderBuilder},
+    rpc::types::TransactionRequest,
+    sol,
+    transports::http::{Client, Http},
+};
+use anyhow::Result;
+
+sol! {
+    #[sol(rpc)]
+    interface HorizonStaking {
+        function getMaxThawingPeriod() external view returns (uint64);
+    }
+}
+
+/// Detects if Horizon (V2) contracts are active in the network.
+///
+/// This function calls the `getMaxThawingPeriod()` method on the HorizonStaking contract.
+/// If the method returns a value greater than 0, the network is considered to have upgraded to Horizon.
+/// If the call fails or returns 0, the network is considered to be in legacy mode.
+///
+/// This approach matches the proven TypeScript implementation and is more reliable than
+/// subgraph queries as it directly queries the source of truth (the contracts).
+///
+/// # Arguments
+/// * `rpc_url` - The RPC endpoint to connect to
+/// * `horizon_staking_address` - The address of the HorizonStaking contract
+///
+/// # Returns
+/// * `Ok(true)` if Horizon contracts are active (getMaxThawingPeriod() > 0)
+/// * `Ok(false)` if only legacy (V1) contracts are active
+/// * `Err(...)` if there was an error calling the contract
+pub async fn is_horizon_active(rpc_url: &str, horizon_staking_address: Address) -> Result<bool> {
+    tracing::debug!(
+        "Checking if Horizon (V2) contracts are active by calling HorizonStaking.getMaxThawingPeriod() at {}",
+        horizon_staking_address
+    );
+
+    // Create HTTP provider using alloy
+    let provider = ProviderBuilder::new().on_http(rpc_url.parse()?);
+
+    // Create contract instance
+    let contract = HorizonStaking::new(horizon_staking_address, &provider);
+
+    // Call getMaxThawingPeriod()
+    match contract.getMaxThawingPeriod().call().await {
+        Ok(max_thawing_period) => {
+            let max_thawing_period = max_thawing_period._0;
+            let horizon_active = max_thawing_period > 0;
+
+            if horizon_active {
+                tracing::info!(
+                    "Horizon (V2) contracts detected - HorizonStaking.getMaxThawingPeriod() returned {}",
+                    max_thawing_period
+                );
+            } else {
+                tracing::info!(
+                    "No Horizon (V2) contracts found - getMaxThawingPeriod() returned 0"
+                );
+            }
+
+            Ok(horizon_active)
+        }
+        Err(e) => {
+            tracing::warn!(
+                "Failed to call HorizonStaking.getMaxThawingPeriod() at {}: {}. Assuming legacy mode.",
+                horizon_staking_address,
+                e
+            );
+            // On error, assume legacy mode (similar to TypeScript implementation)
+            Ok(false)
+        }
+    }
+}

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,
 };

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
+    }
+}

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::*;
+}