Fix cli commands and some graphql in 0.23 rel

docs/networks/arbitrum-sepolia.md

@@ -7,8 +7,8 @@ The Graph Network's testnet is on Arbitrum Sepolia (eip155:421614). Sepolia netw
 | Component          | Release                                                                              |
 | ------------------ | ------------------------------------------------------------------------------------ |
 | contracts          | [5.3.3](https://github.com/graphprotocol/contracts/releases/tag/v5.3.3)              |
-| indexer-agent      | [0.23.2](https://github.com/graphprotocol/indexer/releases/tag/v0.23.2)              |
-| indexer-cli        | [0.23.2](https://github.com/graphprotocol/indexer/releases/tag/v0.23.2)              |
+| indexer-agent      | [0.23.3](https://github.com/graphprotocol/indexer/releases/tag/v0.23.3)              |
+| indexer-cli        | [0.23.3](https://github.com/graphprotocol/indexer/releases/tag/v0.23.3)              |
 | indexer-service-rs | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
 | tap-agent          | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
 | graph-node         | [0.35.1](https://github.com/graphprotocol/graph-node/releases/tag/v0.35.1)           |

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.23.2"
+  "version": "0.23.3"
 }

packages/indexer-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-agent",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "description": "Indexer agent",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@graphprotocol/common-ts": "2.0.11",
-    "@graphprotocol/indexer-common": "^0.23.2",
+    "@graphprotocol/indexer-common": "^0.23.3",
     "@thi.ng/heaps": "^1.3.1",
     "axios": "0.26.1",
     "bs58": "5.0.0",

packages/indexer-agent/src/agent.ts

@@ -669,7 +669,7 @@ export class Agent {
     eligibleAllocations: Allocation[],
   ): Promise<void> {
     const logger = this.logger.child({ function: 'reconcileDeployments' })
-    logger.debug('Reconcile deployments')
+    logger.debug('Reconcile deployments', { targetDeployments })
     // ----------------------------------------------------------------------------------------
     // Ensure the network subgraph deployment is _always_ indexed
     // ----------------------------------------------------------------------------------------
@@ -915,7 +915,7 @@ export class Agent {
       network.specification.indexerOptions.allocationManagementMode ===
       AllocationManagementMode.MANUAL
     ) {
-      this.logger.trace(
+      this.logger.debug(
         `Skipping allocation reconciliation since AllocationManagementMode = 'manual'`,
         {
           protocolNetwork: network.specification.networkIdentifier,
@@ -948,7 +948,6 @@ export class Agent {
     // Do nothing if there are already approved actions in the queue awaiting execution
     const approvedActions = await operator.fetchActions({
       status: ActionStatus.APPROVED,
-      protocolNetwork: network.specification.networkIdentifier,
     })
     if (approvedActions.length > 0) {
       this.logger.info(
@@ -964,7 +963,7 @@ export class Agent {
     const activeAllocations: Allocation[] =
       await network.networkMonitor.allocations(AllocationStatus.ACTIVE)
 
-    this.logger.trace(`Reconcile allocation actions`, {
+    this.logger.debug(`Reconcile allocation actions`, {
       protocolNetwork: network.specification.networkIdentifier,
       epoch,
       maxAllocationEpochs,

packages/indexer-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-cli",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "description": "Indexer CLI for The Graph Network",
   "main": "./dist/cli.js",
   "files": [
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@graphprotocol/common-ts": "2.0.11",
-    "@graphprotocol/indexer-common": "^0.23.2",
+    "@graphprotocol/indexer-common": "^0.23.3",
     "@iarna/toml": "2.2.5",
     "@thi.ng/iterators": "5.1.74",
     "@urql/core": "3.1.0",

packages/indexer-cli/src/actions.ts

@@ -10,7 +10,6 @@ import {
   nullPassThrough,
   OrderDirection,
   parseBoolean,
-  validateNetworkIdentifier,
 } from '@graphprotocol/indexer-common'
 import { validatePOI, validateRequiredParams } from './command-helpers'
 import gql from 'graphql-tag'
@@ -207,7 +206,6 @@ const ACTION_PARAMS_PARSERS: Record<keyof ActionUpdateInput, (x: never) => any>
   type: x => validateActionType(x),
   status: x => validateActionStatus(x),
   reason: nullPassThrough,
-  protocolNetwork: x => validateNetworkIdentifier(x),
 }
 
 /**
@@ -389,7 +387,6 @@ export async function fetchActions(
             first: $first
           ) {
             id
-            protocolNetwork
             type
             allocationID
             deploymentID

packages/indexer-cli/src/allocations.ts

@@ -10,7 +10,6 @@ import {
   CloseAllocationResult,
   CreateAllocationResult,
   ReallocateAllocationResult,
-  resolveChainAlias,
 } from '@graphprotocol/indexer-common'
 
 export interface IndexerAllocation {
@@ -29,7 +28,6 @@ export interface IndexerAllocation {
   indexingRewards: BigNumber
   queryFeesCollected: BigNumber
   status: string
-  protocolNetwork: string
 }
 
 const ALLOCATION_CONVERTERS_FROM_GRAPHQL: Record<
@@ -53,7 +51,6 @@ const ALLOCATION_CONVERTERS_FROM_GRAPHQL: Record<
   indexingRewards: nullPassThrough((x: string) => BigNumber.from(x)),
   queryFeesCollected: nullPassThrough((x: string) => BigNumber.from(x)),
   status: x => x,
-  protocolNetwork: x => x,
 }
 
 const ALLOCATION_FORMATTERS: Record<
@@ -76,7 +73,6 @@ const ALLOCATION_FORMATTERS: Record<
   indexingRewards: x => utils.commify(formatGRT(x)),
   queryFeesCollected: x => utils.commify(formatGRT(x)),
   status: x => x,
-  protocolNetwork: resolveChainAlias,
 }
 
 /**
@@ -175,35 +171,30 @@ export const createAllocation = async (
   deployment: string,
   amount: BigNumber,
   indexNode: string | undefined,
-  protocolNetwork: string,
 ): Promise<CreateAllocationResult> => {
   const result = await client
     .mutation(
       gql`
         mutation createAllocation(
           $deployment: String!
           $amount: String!
-          $protocolNetwork: String!
           $indexNode: String
         ) {
           createAllocation(
             deployment: $deployment
             amount: $amount
-            protocolNetwork: $protocolNetwork
             indexNode: $indexNode
           ) {
             allocation
             deployment
             allocatedTokens
-            protocolNetwork
           }
         }
       `,
       {
         deployment,
         amount: amount.toString(),
         indexNode,
-        protocolNetwork,
       },
     )
     .toPromise()
@@ -220,36 +211,23 @@ export const closeAllocation = async (
   allocationID: string,
   poi: string | undefined,
   force: boolean,
-  protocolNetwork: string,
 ): Promise<CloseAllocationResult> => {
   const result = await client
     .mutation(
       gql`
-        mutation closeAllocation(
-          $allocation: String!
-          $poi: String
-          $force: Boolean
-          $protocolNetwork: String!
-        ) {
-          closeAllocation(
-            allocation: $allocation
-            poi: $poi
-            force: $force
-            protocolNetwork: $protocolNetwork
-          ) {
+        mutation closeAllocation($allocation: String!, $poi: String, $force: Boolean) {
+          closeAllocation(allocation: $allocation, poi: $poi, force: $force) {
             allocation
             allocatedTokens
             indexingRewards
             receiptsWorthCollecting
-            protocolNetwork
           }
         }
       `,
       {
         allocation: allocationID,
         poi,
         force,
-        protocolNetwork,
       },
     )
     .toPromise()
@@ -267,7 +245,6 @@ export const reallocateAllocation = async (
   poi: string | undefined,
   amount: BigNumber,
   force: boolean,
-  protocolNetwork: string,
 ): Promise<ReallocateAllocationResult> => {
   const result = await client
     .mutation(
@@ -277,21 +254,18 @@ export const reallocateAllocation = async (
           $poi: String
           $amount: String!
           $force: Boolean
-          $protocolNetwork: String!
         ) {
           reallocateAllocation(
             allocation: $allocation
             poi: $poi
             amount: $amount
             force: $force
-            protocolNetwork: $protocolNetwork
           ) {
             closedAllocation
             indexingRewardsCollected
             receiptsWorthCollecting
             createdAllocation
             createdAllocationStake
-            protocolNetwork
           }
         }
       `,
@@ -300,7 +274,6 @@ export const reallocateAllocation = async (
         poi,
         amount: amount.toString(),
         force,
-        protocolNetwork,
       },
     )
     .toPromise()
@@ -315,24 +288,16 @@ export const reallocateAllocation = async (
 export const submitCollectReceiptsJob = async (
   client: IndexerManagementClient,
   allocationID: string,
-  protocolNetwork: string,
 ): Promise<void> => {
   const result = await client
     .mutation(
       gql`
-        mutation submitCollectReceiptsJob(
-          $allocation: String!
-          $protocolNetwork: String!
-        ) {
-          submitCollectReceiptsJob(
-            allocation: $allocation
-            protocolNetwork: $protocolNetwork
-          )
+        mutation submitCollectReceiptsJob($allocation: String!) {
+          submitCollectReceiptsJob(allocation: $allocation)
         }
       `,
       {
         allocation: allocationID,
-        protocolNetwork,
       },
     )
     .toPromise()

packages/indexer-cli/src/commands/indexer/actions/approve.ts

@@ -9,7 +9,7 @@ import {
   parseOutputFormat,
 } from '../../../command-helpers'
 import { approveActions, fetchActions } from '../../../actions'
-import { ActionStatus, resolveChainAlias } from '@graphprotocol/indexer-common'
+import { ActionStatus } from '@graphprotocol/indexer-common'
 
 const HELP = `
 ${chalk.bold('graph indexer actions approve')} [options] [<actionID1> ...]
@@ -58,7 +58,6 @@ module.exports = {
       if (actionIDs.join() == 'queued') {
         const queuedActions = await fetchActions(client, {
           status: ActionStatus.QUEUED,
-          protocolNetwork: 'deprecated',
         })
 
         numericActionIDs = queuedActions.map(action => action.id)
@@ -93,15 +92,10 @@ module.exports = {
       const queuedAction = await approveActions(client, numericActionIDs)
 
       // Format Actions 'protocolNetwork' field to display human-friendly chain aliases instead of CAIP2-IDs
-      queuedAction.forEach(
-        action => (action.protocolNetwork = resolveChainAlias(action.protocolNetwork)),
-      )
-
       actionSpinner.succeed(`Actions approved`)
       printObjectOrArray(print, outputFormat, queuedAction, [
         'id',
         'type',
-        'protocolNetwork',
         'deploymentID',
         'allocationID',
         'amount',

packages/indexer-cli/src/commands/indexer/actions/cancel.ts

@@ -1,6 +1,5 @@
 import { GluegunToolbox } from 'gluegun'
 import chalk from 'chalk'
-import { resolveChainAlias } from '@graphprotocol/indexer-common'
 import { loadValidatedConfig } from '../../../config'
 import { createIndexerManagementClient } from '../../../client'
 import { fixParameters, printObjectOrArray } from '../../../command-helpers'
@@ -67,14 +66,8 @@ module.exports = {
 
       actionSpinner.succeed(`Actions canceled`)
 
-      // Format Actions 'protocolNetwork' field to display human-friendly chain aliases instead of CAIP2-IDs
-      queuedAction.forEach(
-        action => (action.protocolNetwork = resolveChainAlias(action.protocolNetwork)),
-      )
-
       printObjectOrArray(print, outputFormat, queuedAction, [
         'id',
-        'protocolNetwork',
         'type',
         'deploymentID',
         'allocationID',

packages/indexer-cli/src/commands/indexer/actions/execute.ts

@@ -1,6 +1,5 @@
 import { GluegunToolbox } from 'gluegun'
 import chalk from 'chalk'
-import { resolveChainAlias } from '@graphprotocol/indexer-common'
 import { loadValidatedConfig } from '../../../config'
 import { createIndexerManagementClient } from '../../../client'
 import { fixParameters, printObjectOrArray } from '../../../command-helpers'
@@ -60,14 +59,8 @@ module.exports = {
 
       spinner.succeed(`Executed approved actions`)
 
-      // Format Actions 'protocolNetwork' field to display human-friendly chain aliases instead of CAIP2-IDs
-      executedActions.forEach(
-        action => (action.protocolNetwork = resolveChainAlias(action.protocolNetwork)),
-      )
-
       printObjectOrArray(print, outputFormat, executedActions, [
         'id',
-        'protocolNetwork',
         'status',
         'type',
         'deploymentID',

packages/indexer-cli/src/commands/indexer/actions/queue.ts

@@ -95,7 +95,6 @@ module.exports = {
 
       printObjectOrArray(print, outputFormat, queuedAction, [
         'id',
-        'protocolNetwork',
         'type',
         'deploymentID',
         'allocationID',

packages/indexer-cli/src/commands/indexer/actions/update.ts

@@ -98,7 +98,6 @@ module.exports = {
       const displayProperties: (keyof Action)[] = [
         'id',
         'type',
-        'protocolNetwork',
         'deploymentID',
         'allocationID',
         'amount',