fix: fix escrow accounts queries

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

Author: suchapalaver

crates/monitor/src/escrow_accounts.rs

@@ -159,7 +159,7 @@ async fn get_escrow_accounts_v2(
     // 4. Service provider (indexer) receives payments from payer's escrow
 
     let senders_balances: HashMap<Address, U256> = response
-        .escrow_accounts
+        .payments_escrow_accounts
         .iter()
         .map(|account| {
             let balance = U256::checked_sub(
@@ -180,7 +180,7 @@ async fn get_escrow_accounts_v2(
         .collect::<Result<HashMap<_, _>, anyhow::Error>>()?;
 
     let senders_to_signers = response
-        .escrow_accounts
+        .payments_escrow_accounts
         .into_iter()
         .map(|account| {
             let payer = Address::from_str(&account.payer.id)?;

crates/query/graphql/network.schema.graphql

@@ -6661,8 +6661,8 @@ input PaymentsEscrowAccount_filter {
   thawEndTimestamp_in: [BigInt!]
   thawEndTimestamp_not_in: [BigInt!]
   _change_block: BlockChangedFilter
-  and: [EscrowAccount_filter]
-  or: [EscrowAccount_filter]
+  and: [PaymentsEscrowAccount_filter]
+  or: [PaymentsEscrowAccount_filter]
 }
 
 enum PaymentsEscrowAccount_orderBy {

crates/tap-agent/src/agent/sender_accounts_manager.rs

@@ -753,7 +753,7 @@ impl State {
             let signer_id = Address::from_str(&row.signer_address)
                 .expect("signer_address should be a valid address");
             let sender_id = self
-                .escrow_accounts_v1
+                .escrow_accounts_v2
                 .borrow()
                 .get_sender_for_signer(&signer_id)
                 .expect("should be able to get sender from signer");
@@ -785,10 +785,10 @@ impl State {
             if let Some(allocation_id_strings) = row.allocation_ids {
                 let allocation_ids = allocation_id_strings
                     .iter()
-                    .map(|allocation_id| {
-                        AllocationId::Legacy(
-                            AllocationIdCore::from_str(allocation_id)
-                                .expect("allocation_id should be a valid allocation ID"),
+                    .map(|collection_id| {
+                        AllocationId::Horizon(
+                            CollectionId::from_str(collection_id)
+                                .expect("collection_id should be a valid collection ID"),
                         )
                     })
                     .collect::<HashSet<_>>();

crates/tap-agent/src/agent/sender_allocation.rs

@@ -1131,14 +1131,16 @@ impl DatabaseInteractions for SenderAllocationState<Horizon> {
     ) -> anyhow::Result<()> {
         sqlx::query!(
             r#"
-                        DELETE FROM scalar_tap_receipts
+                        DELETE FROM tap_horizon_receipts
                         WHERE timestamp_ns BETWEEN $1 AND $2
-                        AND allocation_id = $3
-                        AND signer_address IN (SELECT unnest($4::text[]));
+                        AND collection_id = $3
+                        AND service_provider = $4
+                        AND signer_address IN (SELECT unnest($5::text[]));
                     "#,
             BigDecimal::from(min_timestamp),
             BigDecimal::from(max_timestamp),
-            self.allocation_id.as_address().encode_hex(),
+            self.allocation_id.to_string(),
+            self.indexer_address.encode_hex(),
             &signers,
         )
         .execute(&self.pgpool)

crates/test-assets/src/lib.rs

@@ -116,7 +116,7 @@ pub const ESCROW_QUERY_RESPONSE: &str = r#"
 pub const ESCROW_QUERY_RESPONSE_V2: &str = r#"
     {
         "data": {
-            "escrowAccounts": [
+            "paymentsEscrowAccounts": [
                 {
                     "balance": "34",
                     "totalAmountThawing": "10",