fix: get entity count from graph node before collecting dips

Author: pcarranzav

packages/indexer-common/src/graph-node.ts

@@ -708,6 +708,22 @@ export class GraphNode {
     }
   }
 
+  public async entityCount(deployments: SubgraphDeploymentID[]): Promise<number[]> {
+    // Query the entity count for each deployment using the indexingStatuses query
+    const query = `
+      query entityCounts($deployments: [String!]!) {
+          indexingStatuses(subgraphs: $deployments) {
+            entityCount
+          }
+        }
+    `
+    const result = await this.status
+      .query(query, { deployments: deployments.map((id) => id.ipfsHash) })
+      .toPromise()
+
+    return result.data.indexingStatuses.map((status) => status.entityCount) as number[]
+  }
+
   public async proofOfIndexing(
     deployment: SubgraphDeploymentID,
     block: BlockPointer,

packages/indexer-common/src/indexer-management/allocations.ts

@@ -107,13 +107,7 @@ export class AllocationManager {
     private network: Network,
   ) {
     if (this.network.specification.indexerOptions.dipperEndpoint) {
-      this.dipsManager = new DipsManager(
-        this.logger,
-        this.models,
-        this.graphNode,
-        this.network,
-        this,
-      )
+      this.dipsManager = new DipsManager(this.logger, this.models, this.network, this)
     }
   }
 

packages/indexer-common/src/indexing-fees/dips.ts

@@ -37,7 +37,6 @@ export class DipsManager {
   constructor(
     private logger: Logger,
     private models: IndexerManagementModels,
-    private graphNode: GraphNode,
     private network: Network,
     private parent: AllocationManager | null,
   ) {
@@ -157,6 +156,7 @@ export class DipsCollector {
     private specification: NetworkSpecification,
     private tapCollector: TapCollector,
     private wallet: Wallet,
+    private graphNode: GraphNode,
   ) {
     if (!this.specification.indexerOptions.dipperEndpoint) {
       throw new Error('dipperEndpoint is not set')
@@ -173,6 +173,7 @@ export class DipsCollector {
     specification: NetworkSpecification,
     tapCollector: TapCollector,
     wallet: Wallet,
+    graphNode: GraphNode,
   ) {
     const collector = new DipsCollector(
       logger,
@@ -181,6 +182,7 @@ export class DipsCollector {
       specification,
       tapCollector,
       wallet,
+      graphNode,
     )
     collector.startCollectionLoop()
     return collector
@@ -223,7 +225,14 @@ export class DipsCollector {
       this.logger.error(`Agreement ${agreement.id} has no last allocation id`)
       return
     }
-    const entityCount = 0 // TODO: get entity count from graph node
+    const entityCounts = await this.graphNode.entityCount([
+      new SubgraphDeploymentID(agreement.subgraph_deployment_id),
+    ])
+    if (entityCounts.length === 0) {
+      this.logger.error(`Agreement ${agreement.id} has no entity count`)
+      return
+    }
+    const entityCount = entityCounts[0]
     const collection = await createSignedCollectionRequest(
       agreement.id,
       agreement.last_allocation_id,

packages/indexer-common/src/network.ts

@@ -343,6 +343,7 @@ export class Network {
           specification,
           tapCollector,
           wallet,
+          graphNode,
         )
       }
     } else {