fix: allocation cli bugs

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

packages/indexer-cli/src/commands/indexer/allocations/reallocate.ts

@@ -23,6 +23,7 @@ ${chalk.dim('Options:')}
 
   ${chalk.dim('Arguments:')}
   <id>                            The allocation id to close
+  <amount>                        The amount of GRT to reallocate
   <poi>                           (optional) The POI to close the allocation with
   <blockNumber>                   (optional, horizon only) The block number the POI was computed at. Must be set if POI is provided.
   <publicPOI>                     (optional, horizon only) The public POI to close the allocation with. Must be same block height as POI.

packages/indexer-common/src/errors.ts

@@ -94,6 +94,8 @@ export enum IndexerErrorCode {
   IE081 = 'IE081',
   IE082 = 'IE082',
   IE083 = 'IE083',
+  IE084 = 'IE084',
+  IE085 = 'IE085',
 }
 
 export const INDEXER_ERROR_MESSAGES: Record<IndexerErrorCode, string> = {
@@ -181,6 +183,8 @@ export const INDEXER_ERROR_MESSAGES: Record<IndexerErrorCode, string> = {
   IE081: 'Multiple provisions found',
   IE082: 'Graph Horizon protocol not detected',
   IE083: 'Failed to thaw stake from provision',
+  IE084: 'Could not resolve POI block number',
+  IE085: 'Could not resolve public POI',
 }
 
 export type IndexerErrorCause = unknown

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

@@ -56,7 +56,7 @@ export class NetworkMonitor {
     private networkSubgraph: SubgraphClient,
     private ethereum: Provider,
     private epochSubgraph: SubgraphClient,
-  ) {}
+  ) { }
 
   poiDisputeMonitoringEnabled(): boolean {
     return this.indexerOptions.poiDisputeMonitoring
@@ -285,8 +285,7 @@ export class NetworkMonitor {
 
       if (allocations.length === 0) {
         this.logger.warn(
-          `No ${
-            AllocationStatus[status.toUpperCase() as keyof typeof AllocationStatus]
+          `No ${AllocationStatus[status.toUpperCase() as keyof typeof AllocationStatus]
           } allocations found for indexer '${this.indexerOptions.address}'`,
         )
       }
@@ -1560,11 +1559,10 @@ Please submit an issue at https://github.com/graphprotocol/block-oracle/issues/n
                 IndexerErrorCode.IE067,
                 `POI not available for deployment at current epoch start block.
               currentEpochStartBlock: ${epochStartBlock.number}
-              deploymentStatus: ${
-                deploymentStatus.length > 0
+              deploymentStatus: ${deploymentStatus.length > 0
                   ? JSON.stringify(deploymentStatus)
                   : 'not deployed'
-              }`,
+                }`,
               )
             } else {
               return [poi, epochStartBlock.number]
@@ -1599,7 +1597,7 @@ Please submit an issue at https://github.com/graphprotocol/block-oracle/issues/n
     let returnBlockNumber = 0
     if (generatedPOIBlockNumber === 0) {
       if (blockNumber === undefined) {
-        throw indexerError(IndexerErrorCode.IE067, 'Could not resolve POI block number')
+        throw indexerError(IndexerErrorCode.IE084, 'No block number generated and none provided')
       }
       returnBlockNumber = blockNumber
     } else if (blockNumber === undefined || generatedPOIBlockNumber === blockNumber) {
@@ -1640,7 +1638,7 @@ Please submit an issue at https://github.com/graphprotocol/block-oracle/issues/n
     let returnPublicPOI: string
     if (generatedPublicPOI === undefined) {
       if (publicPOI === undefined) {
-        throw indexerError(IndexerErrorCode.IE067, 'Could not resolve public POI')
+        throw indexerError(IndexerErrorCode.IE085, 'No public POI generated and none provided')
       }
       returnPublicPOI = publicPOI
     } else if (publicPOI === undefined || generatedPublicPOI === publicPOI) {

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

@@ -803,8 +803,8 @@ async function closeHorizonAllocation(
   const closeAllocationEventLogs = transactionManager.findEvent(
     'ServiceStopped',
     contracts.SubgraphService.interface,
-    'data',
-    closeAllocationData,
+    'serviceProvider',
+    address,
     receipt,
     logger,
   )
@@ -840,6 +840,7 @@ async function closeHorizonAllocation(
   return { txHash: receipt.hash, rewardsAssigned }
 }
 
+// isHorizon: false
 async function reallocateLegacyAllocation(
   allocation: Allocation,
   allocationAmount: bigint,
@@ -1056,6 +1057,7 @@ async function reallocateLegacyAllocation(
   return { txHash: receipt.hash, rewardsAssigned, newAllocationId }
 }
 
+// isHorizon: true and allocation: not legacy
 async function reallocateHorizonAllocation(
   allocation: Allocation,
   allocationAmount: bigint,
@@ -1073,20 +1075,6 @@ async function reallocateHorizonAllocation(
   // Double-check whether the allocation is still active on chain, to
   // avoid unnecessary transactions.
   const allocationData = await contracts.SubgraphService.getAllocation(allocation.id)
-  const legacyAllocation = await contracts.SubgraphService.getLegacyAllocation(
-    allocation.id,
-  )
-  const existsSubgraphService = allocationData.createdAt !== 0n
-  const existsLegacyAllocation = legacyAllocation.indexer !== ZeroAddress
-  if (existsSubgraphService || existsLegacyAllocation) {
-    logger.warn(`Skipping allocation as it already exists onchain`, {
-      indexer: address,
-      allocation: allocation.id,
-      existsSubgraphService,
-      existsLegacyAllocation,
-    })
-    throw indexerError(IndexerErrorCode.IE066, 'AllocationID already exists')
-  }
 
   if (allocationData.closedAt !== 0n) {
     logger.warn(`Allocation has already been closed`)
@@ -1254,8 +1242,8 @@ async function reallocateHorizonAllocation(
   const createAllocationEventLogs = network.transactionManager.findEvent(
     'ServiceStarted',
     network.contracts.SubgraphService.interface,
-    'data',
-    createAllocationData,
+    'serviceProvider',
+    address,
     receipt,
     logger,
   )
@@ -1292,8 +1280,8 @@ async function reallocateHorizonAllocation(
   const closeAllocationEventLogs = transactionManager.findEvent(
     'ServiceStopped',
     contracts.SubgraphService.interface,
-    'data',
-    closeAllocationData,
+    'serviceProvider',
+    address,
     receipt,
     logger,
   )
@@ -1322,6 +1310,7 @@ async function reallocateHorizonAllocation(
   return { txHash: receipt.hash, rewardsAssigned, newAllocationId }
 }
 
+// isHorizon: true and allocation: legacy
 async function migrateLegacyAllocationToHorizon(
   allocation: Allocation,
   allocationAmount: bigint,
@@ -1487,11 +1476,16 @@ export default {
 
     try {
       const currentEpoch = await network.contracts.EpochManager.currentEpoch()
+      const isHorizon = await network.isHorizon.value()
+
+      logger.debug('createAllocation: Checking allocation resolution path', {
+        isHorizon,
+      })
 
       let txHash: string
       let allocationId: Address
-      if (await network.isHorizon.value()) {
-        logger.info('Creating horizon allocation')
+      if (isHorizon) {
+        logger.debug('Creating horizon allocation')
         const result = await createHorizonAllocation(
           network,
           graphNode,
@@ -1505,6 +1499,7 @@ export default {
         txHash = result.txHash
         allocationId = result.allocationId
       } else {
+        logger.debug('Creating legacy allocation')
         const result = await createLegacyAllocation(
           network,
           graphNode,
@@ -1603,16 +1598,22 @@ export default {
       )
       logger.debug('POI resolved', {
         userProvidedPOI: poi,
+        userProvidedPublicPOI: publicPOI,
         userProvidedBlockNumber: blockNumber,
         poi: poiData.poi,
         publicPOI: poiData.publicPOI,
         blockNumber: poiData.blockNumber,
         force,
       })
 
+      logger.debug('closeAllocation: Checking allocation resolution path', {
+        allocationIsLegacy: allocationData.isLegacy,
+      })
+
       let txHash: string
       let rewardsAssigned: bigint
       if (allocationData.isLegacy) {
+        logger.debug('Closing legacy allocation')
         const result = await closeLegacyAllocation(
           allocationData,
           poiData.poi,
@@ -1622,6 +1623,7 @@ export default {
         txHash = result.txHash
         rewardsAssigned = result.rewardsAssigned
       } else {
+        logger.debug('Closing horizon allocation')
         const result = await closeHorizonAllocation(
           allocationData,
           poiData,
@@ -1736,6 +1738,7 @@ export default {
       )
       logger.debug('POI resolved', {
         userProvidedPOI: poi,
+        userProvidedPublicPOI: publicPOI,
         userProvidedBlockNumber: blockNumber,
         poi: poiData.poi,
         publicPOI: poiData.publicPOI,
@@ -1745,10 +1748,16 @@ export default {
 
       const isHorizon = await network.isHorizon.value()
 
+      logger.debug('reallocateAllocation: Checking allocation resolution path', {
+        isHorizon,
+        allocationIsLegacy: allocationData.isLegacy,
+      })
+
       let txHash: string
       let rewardsAssigned: bigint
       let newAllocationId: Address
       if (!isHorizon) {
+        logger.debug('Reallocating legacy allocation')
         const result = await reallocateLegacyAllocation(
           allocationData,
           allocationAmount,
@@ -1761,6 +1770,7 @@ export default {
         rewardsAssigned = result.rewardsAssigned
         newAllocationId = result.newAllocationId
       } else if (allocationData.isLegacy) {
+        logger.debug('Migrating legacy allocation to horizon')
         const result = await migrateLegacyAllocationToHorizon(
           allocationData,
           allocationAmount,
@@ -1774,6 +1784,7 @@ export default {
         rewardsAssigned = result.rewardsAssigned
         newAllocationId = result.newAllocationId
       } else {
+        logger.debug('Reallocating horizon allocation')
         const result = await reallocateHorizonAllocation(
           allocationData,
           allocationAmount,