refactor: use network subgraph for v2 escrow accounts

suchapalaver · suchapalaver · commit 6e81594d9591 · 2025-06-26T14:51:59.000-04:00
diff --git a/contrib/indexer-service/config.toml b/contrib/indexer-service/config.toml
@@ -20,10 +20,7 @@ query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"
 deployment_id = "ESCROW_DEPLOYMENT_PLACEHOLDER"
 syncing_interval_secs = 30
 
-[subgraphs.escrow_v2]
-query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap-v2"
-deployment_id = "ESCROW_V2_DEPLOYMENT_PLACEHOLDER"
-syncing_interval_secs = 30
+# Note: V2 escrow accounts are in the network subgraph, not a separate TAP v2 subgraph
 
 [blockchain]
 chain_id = 1337
diff --git a/contrib/tap-agent/config.toml b/contrib/tap-agent/config.toml
@@ -20,10 +20,7 @@ query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"
 deployment_id = "ESCROW_DEPLOYMENT_PLACEHOLDER"
 syncing_interval_secs = 30
 
-[subgraphs.escrow_v2]
-query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap-v2"
-deployment_id = "ESCROW_V2_DEPLOYMENT_PLACEHOLDER"
-syncing_interval_secs = 30
+# Note: V2 escrow accounts are in the network subgraph, not a separate TAP v2 subgraph
 
 [blockchain]
 chain_id = 1337
diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs
@@ -303,7 +303,7 @@ impl MetricsConfig {
 pub struct SubgraphsConfig {
     pub network: NetworkSubgraphConfig,
     pub escrow: EscrowSubgraphConfig,
-    pub escrow_v2: Option<EscrowSubgraphConfig>,
+    // Note: V2 escrow accounts are in the network subgraph, not a separate escrow_v2 subgraph
 }
 
 #[serde_as]
diff --git a/crates/service/src/service.rs b/crates/service/src/service.rs
@@ -78,18 +78,7 @@ pub async fn run() -> anyhow::Result<()> {
     )
     .await;
 
-    let escrow_subgraph_v2 = if let Some(ref escrow_v2_config) = config.subgraphs.escrow_v2 {
-        Some(
-            create_subgraph_client(
-                http_client.clone(),
-                &config.graph_node,
-                &escrow_v2_config.config,
-            )
-            .await,
-        )
-    } else {
-        None
-    };
+    // V2 escrow accounts are in the network subgraph, not a separate escrow_v2 subgraph
 
     // Establish Database connection necessary for serving indexer management
     // requests with defined schema
@@ -113,11 +102,8 @@ pub async fn run() -> anyhow::Result<()> {
 
     // Capture individual fields needed for DIPS before they get moved
     let escrow_v1_query_url_for_dips = config.subgraphs.escrow.config.query_url.clone();
-    let escrow_v2_query_url_for_dips = config
-        .subgraphs
-        .escrow_v2
-        .as_ref()
-        .map(|c| c.config.query_url.clone());
+    // V2 escrow accounts are in the network subgraph
+    let escrow_v2_query_url_for_dips = Some(config.subgraphs.network.config.query_url.clone());
 
     // Configure router with escrow watchers based on Horizon mode
     use indexer_config::HorizonMode;
@@ -157,7 +143,7 @@ pub async fn run() -> anyhow::Result<()> {
         }
         HorizonMode::Transition => {
             tracing::info!("Horizon mode: Transition - using both escrow accounts v1 and v2");
-            // Create both watchers for transition mode using separate subgraph clients
+            // Create both watchers for transition mode
             let escrow_subgraph_v1 = create_subgraph_client(
                 http_client.clone(),
                 &config.graph_node,
@@ -174,78 +160,38 @@ pub async fn run() -> anyhow::Result<()> {
             .await
             .expect("Error creating escrow_accounts_v1 channel");
 
-            if let Some(escrow_v2_subgraph) = escrow_subgraph_v2 {
-                let v2_watcher = indexer_monitor::escrow_accounts_v2(
-                    escrow_v2_subgraph,
-                    indexer_address,
-                    config
-                        .subgraphs
-                        .escrow_v2
-                        .as_ref()
-                        .unwrap()
-                        .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()
-            } else {
-                tracing::warn!("Horizon mode is Transition but no escrow_v2 configuration provided, falling back to v1 only");
-                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()
-            }
+            // V2 escrow accounts are in the network subgraph
+            let v2_watcher = indexer_monitor::escrow_accounts_v2(
+                network_subgraph,
+                indexer_address,
+                config.subgraphs.network.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_subgraph = if let Some(escrow_v2_subgraph) = escrow_subgraph_v2 {
-                escrow_v2_subgraph
-            } else {
-                tracing::warn!("Horizon mode is Full but no escrow_v2 configuration provided, falling back to escrow v1 endpoint for v2 queries");
-                create_subgraph_client(
-                    http_client.clone(),
-                    &config.graph_node,
-                    &config.subgraphs.escrow.config,
-                )
-                .await
-            };
-            let v2_config = config
-                .subgraphs
-                .escrow_v2
-                .as_ref()
-                .map(|c| &c.config)
-                .unwrap_or(&config.subgraphs.escrow.config);
-
+            // V2 escrow accounts are in the network subgraph
             let v2_watcher = indexer_monitor::escrow_accounts_v2(
-                v2_subgraph,
+                network_subgraph,
                 indexer_address,
-                v2_config.syncing_interval_secs,
+                config.subgraphs.network.config.syncing_interval_secs,
                 true, // Reject thawing signers eagerly
             )
             .await
diff --git a/crates/tap-agent/src/agent.rs b/crates/tap-agent/src/agent.rs
@@ -98,7 +98,6 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
                                 syncing_interval_secs: escrow_sync_interval,
                             },
                     },
-                escrow_v2,
             },
         tap:
             TapConfig {
@@ -157,29 +156,6 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
         .await,
     ));
 
-    // Create v2 escrow subgraph client if configured
-    let escrow_subgraph_v2 = if let Some(ref escrow_v2_config) = escrow_v2 {
-        Some(Box::leak(Box::new(
-            SubgraphClient::new(
-                http_client.clone(),
-                escrow_v2_config.config.deployment_id.map(|deployment| {
-                    DeploymentDetails::for_graph_node_url(
-                        graph_node_status_endpoint.clone(),
-                        graph_node_query_endpoint.clone(),
-                        deployment,
-                    )
-                }),
-                DeploymentDetails::for_query_url_with_token(
-                    escrow_v2_config.config.query_url.clone(),
-                    escrow_v2_config.config.query_auth_token.clone(),
-                ),
-            )
-            .await,
-        )))
-    } else {
-        None
-    };
-
     let escrow_accounts_v1 = escrow_accounts_v1(
         escrow_subgraph,
         *indexer_address,
@@ -189,33 +165,15 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     .await
     .expect("Error creating escrow_accounts channel");
 
-    // Check if v2 is configured before moving the value
-    let has_escrow_v2 = escrow_subgraph_v2.is_some();
-
-    let escrow_accounts_v2 = if let Some(escrow_v2_subgraph) = escrow_subgraph_v2 {
-        let escrow_v2_sync_interval = escrow_v2
-            .as_ref()
-            .map(|c| c.config.syncing_interval_secs)
-            .unwrap_or(*escrow_sync_interval);
-        escrow_accounts_v2(
-            escrow_v2_subgraph,
-            *indexer_address,
-            escrow_v2_sync_interval,
-            false,
-        )
-        .await
-        .expect("Error creating escrow_accounts_v2 channel")
-    } else {
-        // Fall back to v1 subgraph for v2 watcher if no v2 config
-        escrow_accounts_v2(
-            escrow_subgraph,
-            *indexer_address,
-            *escrow_sync_interval,
-            false,
-        )
-        .await
-        .expect("Error creating escrow_accounts_v2 channel")
-    };
+    // V2 escrow accounts are in the network subgraph, not a separate TAP v2 subgraph
+    let escrow_accounts_v2 = escrow_accounts_v2(
+        network_subgraph,
+        *indexer_address,
+        *network_sync_interval,
+        false,
+    )
+    .await
+    .expect("Error creating escrow_accounts_v2 channel");
 
     // Configure watchers based on Horizon mode
     use indexer_config::HorizonMode;
@@ -226,11 +184,6 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
         }
         HorizonMode::Transition => {
             tracing::info!("Horizon mode: Transition - both v1 and v2 receipts supported");
-            if !has_escrow_v2 {
-                tracing::warn!(
-                    "Horizon mode is Transition but no escrow_v2 configuration provided"
-                );
-            }
             (escrow_accounts_v1, escrow_accounts_v2)
         }
         HorizonMode::Full => {
diff --git a/crates/tap-agent/src/agent/sender_allocation.rs b/crates/tap-agent/src/agent/sender_allocation.rs
@@ -803,7 +803,7 @@ where
         )
         .execute(&self.pgpool)
         .await
-        .map_err(|e| {
+        .map_err(|e: sqlx::Error| {
             tracing::error!("Failed to store invalid receipt: {}", e);
             anyhow!(e)
         })?;
@@ -893,7 +893,7 @@ where
         )
         .execute(&self.pgpool)
         .await
-        .map_err(|e| {
+        .map_err(|e: sqlx::Error| {
             tracing::error!("Failed to store invalid receipt: {}", e);
             anyhow!(e)
         })?;

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ impl MetricsConfig {`
`303`	`303`	`pub struct SubgraphsConfig {`
`304`	`304`	`pub network: NetworkSubgraphConfig,`
`305`	`305`	`pub escrow: EscrowSubgraphConfig,`
`306`		`- pub escrow_v2: Option<EscrowSubgraphConfig>,`
	`306`	`+ // Note: V2 escrow accounts are in the network subgraph, not a separate escrow_v2 subgraph`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`#[serde_as]`