fix: deployment id

Author: pcarranzav

packages/indexer-common/src/indexer-management/models/indexing-agreement.ts

@@ -1,38 +1,19 @@
 import { toAddress, Address } from '@graphprotocol/common-ts'
-import { DataTypes, Sequelize, Model, CreationOptional } from 'sequelize'
+import {
+  DataTypes,
+  Sequelize,
+  Model,
+  CreationOptional,
+  InferCreationAttributes,
+  InferAttributes,
+} from 'sequelize'
 
 // Indexing Fees AKA "DIPs"
-export interface IndexingAgreementAttributes {
-  id: string
-  signature: Buffer
-  signed_payload: Buffer
-  protocol_network: string
-  chain_id: string
-  base_price_per_epoch: string
-  price_per_entity: string
-  subgraph_deployment_id: string
-  service: string
-  payee: string
-  payer: string
-  deadline: Date
-  duration_epochs: bigint
-  max_initial_amount: string
-  max_ongoing_amount_per_epoch: string
-  min_epochs_per_collection: bigint
-  max_epochs_per_collection: bigint
-  created_at: Date
-  updated_at: Date
-  cancelled_at: Date | null
-  signed_cancellation_payload: Buffer | null
-  current_allocation_id: string | null
-  last_allocation_id: string | null
-  last_payment_collected_at: Date | null
-}
 
-export class IndexingAgreement
-  extends Model<IndexingAgreementAttributes>
-  implements IndexingAgreementAttributes
-{
+export class IndexingAgreement extends Model<
+  InferAttributes<IndexingAgreement>,
+  InferCreationAttributes<IndexingAgreement>
+> {
   declare id: CreationOptional<string>
   declare signature: Buffer
   declare signed_payload: Buffer
@@ -41,9 +22,9 @@ export class IndexingAgreement
   declare base_price_per_epoch: string
   declare price_per_entity: string
   declare subgraph_deployment_id: string
-  declare service: Address
-  declare payee: Address
-  declare payer: Address
+  declare service: string
+  declare payee: string
+  declare payer: string
   declare deadline: Date
   declare duration_epochs: bigint
   declare max_initial_amount: string
@@ -54,8 +35,8 @@ export class IndexingAgreement
   declare updated_at: Date
   declare cancelled_at: Date | null
   declare signed_cancellation_payload: Buffer | null
-  declare current_allocation_id: Address | null
-  declare last_allocation_id: Address | null
+  declare current_allocation_id: string | null
+  declare last_allocation_id: string | null
   declare last_payment_collected_at: Date | null
 }
 

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

@@ -15,6 +15,7 @@ import {
   createIndexerManagementClient,
   Operator,
   ActionManager,
+  IndexerManagementClient,
 } from '@graphprotocol/indexer-common'
 import {
   connectDatabase,
@@ -23,6 +24,7 @@ import {
   Logger,
   Metrics,
   parseGRT,
+  SubgraphDeploymentID,
   toAddress,
 } from '@graphprotocol/common-ts'
 import { Sequelize } from 'sequelize'
@@ -46,6 +48,8 @@ let managementModels: IndexerManagementModels
 let queryFeeModels: QueryFeeModels
 let network: Network
 let dipsCollector: DipsCollector
+let indexerManagementClient: IndexerManagementClient
+let operator: Operator
 const networkSpecWithDips = {
   ...testNetworkSpecification,
   indexerOptions: {
@@ -59,13 +63,13 @@ const networkSpecWithDips = {
 
 const mockSubgraphDeployment = (id: string) => {
   return {
-    id: id,
+    id: new SubgraphDeploymentID(id),
     ipfsHash: id,
     deniedAt: null,
     stakedTokens: BigNumber.from('1000'),
     signalledTokens: BigNumber.from('1000'),
     queryFeesAmount: BigNumber.from('0'),
-    protocolNetwork: 'eip155:42161',
+    protocolNetwork: 'eip155:421614',
   }
 }
 
@@ -105,10 +109,7 @@ const setup = async () => {
     metrics,
   )
   dipsCollector = network.dipsCollector!
-}
-
-const ensureGlobalIndexingRule = async () => {
-  const indexerManagementClient = await createIndexerManagementClient({
+  indexerManagementClient = await createIndexerManagementClient({
     models: managementModels,
     graphNode,
     logger,
@@ -121,7 +122,10 @@ const ensureGlobalIndexingRule = async () => {
     network,
   })
 
-  const operator = new Operator(logger, indexerManagementClient, networkSpecWithDips)
+  operator = new Operator(logger, indexerManagementClient, networkSpecWithDips)
+}
+
+const ensureGlobalIndexingRule = async () => {
   await operator.ensureGlobalIndexingRule()
   logger.debug('Ensured global indexing rule')
 }
@@ -225,7 +229,7 @@ describe('DipsManager', () => {
         payer: '123456df40c29949a75a6693c77834c00b8a5678',
         signature: Buffer.from('1234', 'hex'),
         signed_payload: Buffer.from('5678', 'hex'),
-        protocol_network: 'arbitrum-one',
+        protocol_network: 'arbitrum-sepolia',
         chain_id: 'eip155:1',
         base_price_per_epoch: '100',
         price_per_entity: '1',
@@ -333,6 +337,7 @@ describe('DipsManager', () => {
         protocolNetwork: 'eip155:421614',
         allocationAmount: '1030',
       })
+
       // Mock fetch the subgraph deployment from the network subgraph
       network.networkMonitor.subgraphDeployment = jest
         .fn()
@@ -445,7 +450,7 @@ describe('DipsCollector', () => {
         payer: '123456df40c29949a75a6693c77834c00b8a5678',
         signature: Buffer.from('1234', 'hex'),
         signed_payload: Buffer.from('5678', 'hex'),
-        protocol_network: 'arbitrum-one',
+        protocol_network: 'arbitrum-sepolia',
         chain_id: 'eip155:1',
         base_price_per_epoch: '100',
         price_per_entity: '1',
@@ -476,17 +481,19 @@ describe('DipsCollector', () => {
         status: CollectPaymentStatus.ACCEPT,
         tapReceipt: Buffer.from('1234', 'hex'),
       })
-      jest.spyOn(GatewayDipsServiceMessages, 'decodeTapReceipt').mockImplementation(() => {
-        logger.info('MOCK Decoding TAP receipt')
-        return {
-          allocation_id: toAddress(testAllocationId),
-          signer_address: toAddress('0xabcd56df41234949a75a6693c77834c00b8abbbb'),
-          signature: Buffer.from('1234', 'hex'),
-          timestamp_ns: 1234567890,
-          nonce: 1,
-          value: '1000',
-        }
-      })
+      jest
+        .spyOn(GatewayDipsServiceMessages, 'decodeTapReceipt')
+        .mockImplementation(() => {
+          logger.info('MOCK Decoding TAP receipt')
+          return {
+            allocation_id: toAddress(testAllocationId),
+            signer_address: toAddress('0xabcd56df41234949a75a6693c77834c00b8abbbb'),
+            signature: Buffer.from('1234', 'hex'),
+            timestamp_ns: 1234567890,
+            nonce: 1,
+            value: '1000',
+          }
+        })
       ;(getEscrowSenderForSigner as jest.Mock).mockImplementation(() => {
         return toAddress('0x123456df40c29949a75a6693c77834c00b8a5678')
       })

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

@@ -133,7 +133,11 @@ export class DipsManager {
         }, deployment ${subgraphDeploymentID.toString()}`,
       )
       // If there is not yet an indexingRule that deems this deployment worth allocating to, make one
-      if (!(await this.parent.matchingRuleExists(this.logger, subgraphDeploymentID))) {
+      const ruleExists = await this.parent.matchingRuleExists(
+        this.logger,
+        subgraphDeploymentID,
+      )
+      if (!ruleExists) {
         this.logger.info(
           `Creating indexing rule for agreement ${agreement.id}, deployment ${agreement.subgraph_deployment_id}`,
         )