test(integration-tests): update test setup for v2

Author: suchapalaver

contrib/indexer-service/config.toml

@@ -12,13 +12,13 @@ status_url = "http://graph-node:8030/graphql"
 [subgraphs.network]
 query_url = "http://graph-node:8000/subgraphs/name/graph-network"
 deployment_id = "NETWORK_DEPLOYMENT_PLACEHOLDER"
-syncing_interval_secs = 30
-recently_closed_allocation_buffer_secs = 60
+syncing_interval_secs = 5
+recently_closed_allocation_buffer_secs = 10
 
 [subgraphs.escrow]
 query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"
 deployment_id = "ESCROW_DEPLOYMENT_PLACEHOLDER"
-syncing_interval_secs = 30
+syncing_interval_secs = 5
 
 # Note: V2 escrow accounts are in the network subgraph, not a separate TAP v2 subgraph
 

contrib/tap-agent/config.toml

@@ -12,13 +12,13 @@ status_url = "http://graph-node:8030/graphql"
 [subgraphs.network]
 query_url = "http://graph-node:8000/subgraphs/name/graph-network"
 deployment_id = "NETWORK_DEPLOYMENT_PLACEHOLDER"
-syncing_interval_secs = 30
-recently_closed_allocation_buffer_secs = 60
+syncing_interval_secs = 5
+recently_closed_allocation_buffer_secs = 10
 
 [subgraphs.escrow]
 query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"
 deployment_id = "ESCROW_DEPLOYMENT_PLACEHOLDER"
-syncing_interval_secs = 30
+syncing_interval_secs = 5
 
 # Note: V2 escrow accounts are in the network subgraph, not a separate TAP v2 subgraph
 

integration-tests/fund_escrow.sh

@@ -126,10 +126,10 @@ echo ""
 echo "========== FUNDING V2 ESCROW =========="
 
 # For V2, we need to specify payer, collector, and receiver
-# In test setup, we'll use the same address for all three
+# Payer is the test account, but receiver must be the indexer address
 PAYER=$SENDER_ADDRESS
-COLLECTOR=$SENDER_ADDRESS
-RECEIVER=$SENDER_ADDRESS
+COLLECTOR=$SENDER_ADDRESS  
+RECEIVER="0xf4EF6650E48d099a4972ea5B414daB86e1998Bd3"  # This must be the indexer address
 
 # Check current V2 escrow balance before funding
 echo "Checking current V2 escrow balance..."

integration-tests/src/constants.rs

@@ -29,3 +29,7 @@ pub const GRT_DECIMALS: u8 = 18;
 pub const GRT_BASE: u128 = 10u128.pow(GRT_DECIMALS as u32);
 
 pub const MAX_RECEIPT_VALUE: u128 = GRT_BASE / 10_000;
+
+// Data service address for V2 testing
+// For testing, we'll use the indexer address as the data service
+pub const TEST_DATA_SERVICE: &str = "0xf4ef6650e48d099a4972ea5b414dab86e1998bd3"; // indexer address

integration-tests/src/utils.rs

@@ -19,6 +19,8 @@ use tap_graph::Receipt;
 use thegraph_core::alloy::{primitives::Address, signers::local::PrivateKeySigner};
 use thegraph_core::CollectionId;
 
+use crate::constants::TEST_DATA_SERVICE;
+
 pub fn create_tap_receipt(
     value: u128,
     allocation_id: &Address,
@@ -56,7 +58,7 @@ pub fn create_tap_receipt(
 
 pub fn create_tap_receipt_v2(
     value: u128,
-    allocation_id: &Address,
+    allocation_id: &Address, // Used to derive collection_id in V2
     verifier_contract: &str,
     chain_id: u64,
     wallet: &PrivateKeySigner,
@@ -71,8 +73,9 @@ pub fn create_tap_receipt_v2(
         .as_nanos();
     let timestamp_ns = timestamp as u64;
 
-    // Convert allocation_id to collection_id (as per V2 design)
-    let collection_id = *CollectionId::from(*allocation_id);
+    // In V2, convert the allocation_id to a collection_id
+    // For the migration period, we derive collection_id from allocation_id
+    let collection_id = CollectionId::from(*allocation_id);
 
     // Create domain separator
     let eip712_domain_separator =
@@ -83,10 +86,10 @@ pub fn create_tap_receipt_v2(
     let receipt = Eip712SignedMessage::new(
         &eip712_domain_separator,
         tap_graph::v2::Receipt {
-            collection_id,
+            collection_id: *collection_id,
             payer: *payer,
             service_provider: *service_provider,
-            data_service: Address::ZERO, // Using zero address for data service
+            data_service: Address::from_str(TEST_DATA_SERVICE)?, // Use proper data service
             nonce,
             timestamp_ns,
             value,