refactor: configure system for transition mode

suchapalaver · suchapalaver · commit 796c4bdc96ba · 2025-06-25T14:25:39.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
@@ -46,4 +46,8 @@ trigger_value_divisor = 500_000
 "ACCOUNT0_ADDRESS_PLACEHOLDER" = "http://tap-aggregator:7610"
 
 [horizon]
-enabled = true
+# 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"
diff --git a/contrib/tap-agent/config.toml b/contrib/tap-agent/config.toml
@@ -46,4 +46,8 @@ trigger_value_divisor = 500_000
 "ACCOUNT0_ADDRESS_PLACEHOLDER" = "http://tap-aggregator:7610"
 
 [horizon]
-enabled = true
+# 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"
diff --git a/crates/config/maximal-config-example.toml b/crates/config/maximal-config-example.toml
@@ -170,4 +170,4 @@ hardhat = "100"
 "eip155:1337" = "hardhat"
 
 [horizon]
-enabled = false
+mode = "legacy"
diff --git a/crates/config/minimal-config-example.toml b/crates/config/minimal-config-example.toml
@@ -63,3 +63,6 @@ receipts_verifier_address = "0x2222222222222222222222222222222222222222"
 # Key-Value of all senders and their aggregator endpoints
 0xDDE4cfFd3D9052A9cb618fC05a1Cd02be1f2F467 = "https://tap-aggregator.network.thegraph.com"
 0xDD6a6f76eb36B873C1C184e8b9b9e762FE216490 = "https://tap-aggregator-arbitrum-one.graphops.xyz"
+
+[horizon]
+mode = "legacy"
diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs
@@ -446,13 +446,26 @@ 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
 #[derive(Debug, Default, Deserialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct HorizonConfig {
-    /// Whether the horizon is enabled or not
-    pub enabled: bool,
+    /// Horizon upgrade mode
+    pub mode: HorizonMode,
 }
 
 #[cfg(test)]
diff --git a/crates/service/src/service.rs b/crates/service/src/service.rs
@@ -105,57 +105,97 @@ pub async fn run() -> anyhow::Result<()> {
     let indexer_address = config.indexer.indexer_address;
     let ipfs_url = config.service.ipfs_url.clone();
 
-    // Configure router with escrow watchers based on Horizon setting
-    let router = if config.horizon.enabled {
-        tracing::info!("Horizon support enabled - using escrow accounts v2");
-        // Only create v2 watcher when Horizon is enabled
-        let v2_watcher = indexer_monitor::escrow_accounts_v2(
-            escrow_subgraph,
-            indexer_address,
-            config.subgraphs.escrow.config.syncing_interval_secs,
-            true, // Reject thawing signers eagerly
-        )
-        .await
-        .expect("Error creating escrow_accounts_v2 channel");
-
-        ServiceRouter::builder()
-            .database(database.clone())
-            .domain_separator(domain_separator.clone())
-            .graph_node(config.graph_node)
-            .http_client(http_client)
-            .release(release)
-            .indexer(config.indexer)
-            .service(config.service)
-            .blockchain(config.blockchain)
-            .timestamp_buffer_secs(config.tap.rav_request.timestamp_buffer_secs)
-            .network_subgraph(network_subgraph, config.subgraphs.network)
-            .escrow_accounts_v2(v2_watcher)
-            .build()
-    } else {
-        tracing::info!("Horizon support disabled - using escrow accounts v1");
-        // Only create v1 watcher when Horizon is disabled
-        let v1_watcher = indexer_monitor::escrow_accounts_v1(
-            escrow_subgraph,
-            indexer_address,
-            config.subgraphs.escrow.config.syncing_interval_secs,
-            true, // Reject thawing signers eagerly
-        )
-        .await
-        .expect("Error creating escrow_accounts_v1 channel");
-
-        ServiceRouter::builder()
-            .database(database.clone())
-            .domain_separator(domain_separator.clone())
-            .graph_node(config.graph_node)
-            .http_client(http_client)
-            .release(release)
-            .indexer(config.indexer)
-            .service(config.service)
-            .blockchain(config.blockchain)
-            .timestamp_buffer_secs(config.tap.rav_request.timestamp_buffer_secs)
-            .network_subgraph(network_subgraph, config.subgraphs.network)
-            .escrow_accounts_v1(v1_watcher)
-            .build()
+    // Configure router with escrow watchers based on Horizon mode
+    use indexer_config::HorizonMode;
+    let router = match config.horizon.mode {
+        HorizonMode::Legacy => {
+            tracing::info!("Horizon mode: Legacy - using escrow accounts v1 only");
+            // Only create v1 watcher for legacy mode
+            let v1_watcher = indexer_monitor::escrow_accounts_v1(
+                escrow_subgraph,
+                indexer_address,
+                config.subgraphs.escrow.config.syncing_interval_secs,
+                true, // Reject thawing signers eagerly
+            )
+            .await
+            .expect("Error creating escrow_accounts_v1 channel");
+
+            ServiceRouter::builder()
+                .database(database.clone())
+                .domain_separator(domain_separator.clone())
+                .graph_node(config.graph_node)
+                .http_client(http_client)
+                .release(release)
+                .indexer(config.indexer)
+                .service(config.service)
+                .blockchain(config.blockchain)
+                .timestamp_buffer_secs(config.tap.rav_request.timestamp_buffer_secs)
+                .network_subgraph(network_subgraph, config.subgraphs.network)
+                .escrow_accounts_v1(v1_watcher)
+                .build()
+        }
+        HorizonMode::Transition => {
+            tracing::info!("Horizon mode: Transition - using both escrow accounts v1 and v2");
+            // Create both watchers for transition mode
+            let v1_watcher = indexer_monitor::escrow_accounts_v1(
+                escrow_subgraph,
+                indexer_address,
+                config.subgraphs.escrow.config.syncing_interval_secs,
+                true, // Reject thawing signers eagerly
+            )
+            .await
+            .expect("Error creating escrow_accounts_v1 channel");
+
+            let v2_watcher = indexer_monitor::escrow_accounts_v2(
+                escrow_subgraph,
+                indexer_address,
+                config.subgraphs.escrow.config.syncing_interval_secs,
+                true, // Reject thawing signers eagerly
+            )
+            .await
+            .expect("Error creating escrow_accounts_v2 channel");
+
+            ServiceRouter::builder()
+                .database(database.clone())
+                .domain_separator(domain_separator.clone())
+                .graph_node(config.graph_node)
+                .http_client(http_client)
+                .release(release)
+                .indexer(config.indexer)
+                .service(config.service)
+                .blockchain(config.blockchain)
+                .timestamp_buffer_secs(config.tap.rav_request.timestamp_buffer_secs)
+                .network_subgraph(network_subgraph, config.subgraphs.network)
+                .escrow_accounts_v1(v1_watcher)
+                .escrow_accounts_v2(v2_watcher)
+                .build()
+        }
+        HorizonMode::Full => {
+            tracing::info!("Horizon mode: Full - using escrow accounts v2 only");
+            // Only create v2 watcher for full Horizon mode
+            let v2_watcher = indexer_monitor::escrow_accounts_v2(
+                escrow_subgraph,
+                indexer_address,
+                config.subgraphs.escrow.config.syncing_interval_secs,
+                true, // Reject thawing signers eagerly
+            )
+            .await
+            .expect("Error creating escrow_accounts_v2 channel");
+
+            ServiceRouter::builder()
+                .database(database.clone())
+                .domain_separator(domain_separator.clone())
+                .graph_node(config.graph_node)
+                .http_client(http_client)
+                .release(release)
+                .indexer(config.indexer)
+                .service(config.service)
+                .blockchain(config.blockchain)
+                .timestamp_buffer_secs(config.tap.rav_request.timestamp_buffer_secs)
+                .network_subgraph(network_subgraph, config.subgraphs.network)
+                .escrow_accounts_v2(v2_watcher)
+                .build()
+        }
     };
 
     serve_metrics(config.metrics.get_socket_addr());
diff --git a/crates/tap-agent/src/agent.rs b/crates/tap-agent/src/agent.rs
@@ -177,11 +177,20 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     let config = Box::leak(Box::new({
         let mut config = SenderAccountConfig::from_config(&CONFIG);
         // Use the configuration setting for Horizon support
-        config.horizon_enabled = CONFIG.horizon.enabled;
-        if CONFIG.horizon.enabled {
-            tracing::info!("Horizon support is enabled");
-        } else {
-            tracing::info!("Horizon support is disabled");
+        use indexer_config::HorizonMode;
+        match CONFIG.horizon.mode {
+            HorizonMode::Legacy => {
+                tracing::info!("Horizon mode: Legacy - v1 receipts only");
+                config.horizon_enabled = false;
+            }
+            HorizonMode::Transition => {
+                tracing::info!("Horizon mode: Transition - both v1 and v2 receipts supported");
+                config.horizon_enabled = true;
+            }
+            HorizonMode::Full => {
+                tracing::info!("Horizon mode: Full - v2 receipts only");
+                config.horizon_enabled = true;
+            }
         }
         config
     }));
diff --git a/crates/tap-agent/src/agent/sender_account.rs b/crates/tap-agent/src/agent/sender_account.rs
@@ -422,7 +422,11 @@ impl SenderAccountConfig {
             rav_request_timeout: config.tap.rav_request.request_timeout_secs,
             tap_sender_timeout: config.tap.sender_timeout_secs,
             trusted_senders: config.tap.trusted_senders.clone(),
-            horizon_enabled: config.horizon.enabled,
+            horizon_enabled: match config.horizon.mode {
+                indexer_config::HorizonMode::Legacy => false,
+                indexer_config::HorizonMode::Transition => true,
+                indexer_config::HorizonMode::Full => true,
+            },
         }
     }
 }
diff --git a/crates/test-assets/src/lib.rs b/crates/test-assets/src/lib.rs
@@ -461,8 +461,14 @@ pub fn pgpool() -> Pin<Box<dyn Future<Output = PgPool>>> {
         ConnectOptions, Connection,
     };
     Box::pin(async {
+        let timestamp = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_nanos();
+        let test_path =
+            Box::leak(format!("{}_{}", stdext::function_name!(), timestamp).into_boxed_str());
         let args = TestArgs {
-            test_path: stdext::function_name!(),
+            test_path,
             migrator: Some(&migrate!("../../migrations")),
             fixtures: &[],
         };

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,11 @@ impl SenderAccountConfig {`
`422`	`422`	`rav_request_timeout: config.tap.rav_request.request_timeout_secs,`
`423`	`423`	`tap_sender_timeout: config.tap.sender_timeout_secs,`
`424`	`424`	`trusted_senders: config.tap.trusted_senders.clone(),`
`425`		`- horizon_enabled: config.horizon.enabled,`
	`425`	`+ horizon_enabled: match config.horizon.mode {`
	`426`	`+ indexer_config::HorizonMode::Legacy => false,`
	`427`	`+ indexer_config::HorizonMode::Transition => true,`
	`428`	`+ indexer_config::HorizonMode::Full => true,`
	`429`	`+ },`
`426`	`430`	`}`
`427`	`431`	`}`
`428`	`432`	`}`