refactor: use network subgraph for v2 escrow accounts

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

Author: suchapalaver

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

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

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]

crates/monitor/src/escrow_accounts.rs

@@ -9,9 +9,6 @@ use std::{
 
 use anyhow::anyhow;
 use indexer_query::escrow_account::{self, EscrowAccountQuery};
-use indexer_query::escrow_account_v2::{
-    self as escrow_account_v2, EscrowAccountQuery as EscrowAccountQueryV2,
-};
 use thegraph_core::alloy::primitives::{Address, U256};
 use thiserror::Error;
 use tokio::sync::watch::Receiver;
@@ -120,22 +117,16 @@ async fn get_escrow_accounts_v2(
     indexer_address: Address,
     reject_thawing_signers: bool,
 ) -> anyhow::Result<EscrowAccounts> {
-    // V2 TAP receipts use different field names (payer/service_provider) but the underlying
-    // escrow account model is identical to V1. Both V1 and V2 receipts reference the same
-    // sender addresses and the same escrow relationships.
-    //
-    // The separation of V1/V2 escrow account watchers allows for potential future differences
-    // in escrow models, but currently both query the same subgraph data with identical logic.
-    //
-    // V2 receipt flow:
-    // 1. V2 receipt contains payer address (equivalent to V1 sender)
-    // 2. Receipt is signed by a signer authorized by the payer
-    // 3. Escrow accounts map: signer -> payer (sender) -> balance
-    // 4. Service provider (indexer) receives payments from payer's escrow
+    // Query V2 escrow accounts from the network subgraph which tracks PaymentsEscrow
+    // and GraphTallyCollector contract events.
+
+    use indexer_query::network_escrow_account_v2::{
+        self as network_escrow_account_v2, NetworkEscrowAccountQueryV2,
+    };
 
     let response = escrow_subgraph
-        .query::<EscrowAccountQueryV2, _>(escrow_account_v2::Variables {
-            indexer: format!("{:x?}", indexer_address),
+        .query::<NetworkEscrowAccountQueryV2, _>(network_escrow_account_v2::Variables {
+            receiver: format!("{:x?}", indexer_address),
             thaw_end_timestamp: if reject_thawing_signers {
                 U256::ZERO.to_string()
             } else {
@@ -146,7 +137,20 @@ async fn get_escrow_accounts_v2(
 
     let response = response?;
 
-    tracing::trace!("V2 Escrow accounts response: {:?}", response);
+    tracing::trace!("Network V2 Escrow accounts response: {:?}", response);
+
+    // V2 TAP receipts use different field names (payer/service_provider) but the underlying
+    // escrow account model is identical to V1. Both V1 and V2 receipts reference the same
+    // sender addresses and the same escrow relationships.
+    //
+    // V1 queries the TAP subgraph while V2 queries the network subgraph, but both return
+    // the same escrow account structure for processing.
+    //
+    // V2 receipt flow:
+    // 1. V2 receipt contains payer address (equivalent to V1 sender)
+    // 2. Receipt is signed by a signer authorized by the payer
+    // 3. Escrow accounts map: signer -> payer (sender) -> balance
+    // 4. Service provider (indexer) receives payments from payer's escrow
 
     let senders_balances: HashMap<Address, U256> = response
         .escrow_accounts