cli,common: remove protocolNetwork from actions cli commands

Author: dwerner

packages/indexer-cli/src/actions.ts

@@ -33,7 +33,6 @@ export async function buildActionInput(
   reason: string,
   status: ActionStatus,
   priority: number,
-  protocolNetwork: string,
 ): Promise<ActionInput> {
   await validateActionInput(type, actionParams)
   switch (type) {
@@ -46,7 +45,6 @@ export async function buildActionInput(
         reason,
         status,
         priority,
-        protocolNetwork,
       }
     case ActionType.UNALLOCATE: {
       let poi = actionParams.param2
@@ -63,7 +61,6 @@ export async function buildActionInput(
         reason,
         status,
         priority,
-        protocolNetwork,
       }
     }
     case ActionType.REALLOCATE: {
@@ -82,7 +79,6 @@ export async function buildActionInput(
         reason,
         status,
         priority,
-        protocolNetwork,
       }
     }
   }
@@ -187,7 +183,6 @@ export async function queueActions(
             reason
             priority
             status
-            protocolNetwork
           }
         }
       `,
@@ -241,7 +236,6 @@ export async function executeApprovedActions(
         mutation executeApprovedActions {
           executeApprovedActions {
             id
-            protocolNetwork
             status
             type
             deploymentID
@@ -288,7 +282,6 @@ export async function approveActions(
             priority
             transaction
             status
-            protocolNetwork
           }
         }
       `,
@@ -313,7 +306,6 @@ export async function cancelActions(
         mutation cancelActions($actionIDs: [Int!]!) {
           cancelActions(actionIDs: $actionIDs) {
             id
-            protocolNetwork
             type
             allocationID
             deploymentID
@@ -349,7 +341,6 @@ export async function fetchAction(
         query action($actionID: Int!) {
           action(actionID: $actionID) {
             id
-            protocolNetwork
             type
             allocationID
             deploymentID
@@ -398,7 +389,6 @@ export async function fetchActions(
             first: $first
           ) {
             id
-            protocolNetwork
             type
             allocationID
             deploymentID
@@ -435,7 +425,6 @@ export async function deleteActions(
         mutation deleteActions($actionIDs: [Int!]!) {
           deleteActions(actionIDs: $actionIDs) {
             id
-            protocolNetwork
             type
             allocationID
             deploymentID
@@ -485,7 +474,6 @@ export async function updateActions(
             transaction
             status
             failureReason
-            protocolNetwork
           }
         }
       `,

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

@@ -3,10 +3,7 @@ import chalk from 'chalk'
 
 import { loadValidatedConfig } from '../../../config'
 import { createIndexerManagementClient } from '../../../client'
-import {
-  requireProtocolNetworkOption,
-  printObjectOrArray,
-} from '../../../command-helpers'
+import { printObjectOrArray } from '../../../command-helpers'
 import { buildActionInput, queueActions, validateActionType } from '../../../actions'
 import {
   ActionInput,
@@ -29,7 +26,6 @@ ${chalk.bold(
 ${chalk.dim('Options:')}
 
   -h, --help                    Show usage information
-  -n, --network <STRING>        [Required] The protocol network for this action (mainnet, arbitrum-one, sepolia, arbitrum-sepolia)
   -o, --output table|json|yaml  Choose the output format: table (default), JSON, or YAML
   -s, --source <STRING>         Specify the source of the action decision
   -r, --reason <STRING>         Specify the reason for the action to be taken
@@ -73,16 +69,13 @@ module.exports = {
         )
       }
 
-      const networkIdentifier = requireProtocolNetworkOption(parameters.options)
-
       actionInputParams = await buildActionInput(
         validateActionType(type),
         { targetDeployment, param1, param2, param3, param4 },
         decisionSource,
         decisionReason,
         ActionStatus.QUEUED,
         executionPriority,
-        networkIdentifier,
       )
 
       inputSpinner.succeed(`Processed input parameters`)
@@ -111,7 +104,6 @@ module.exports = {
 
       printObjectOrArray(print, outputFormat, queuedAction, [
         'id',
-        'protocolNetwork',
         'type',
         'deploymentID',
         'allocationID',

packages/indexer-common/src/actions.ts

@@ -4,7 +4,6 @@ import { Logger } from '@graphprotocol/common-ts'
 import { WhereOperators, WhereOptions } from 'sequelize'
 import { Op } from 'sequelize'
 import { WhereAttributeHashValue } from 'sequelize/types/model'
-import { validateNetworkIdentifier } from './parsers'
 
 export interface ActionParamsInput {
   deploymentID?: string
@@ -45,7 +44,6 @@ export interface ActionInput {
   reason: string
   status: ActionStatus
   priority: number | undefined
-  protocolNetwork: string
 }
 
 export const isValidActionInput = (
@@ -87,18 +85,6 @@ export const validateActionInputs = async (
   // Validate actions before adding to queue
   // TODO: Perform all checks simultaneously and throw combined error if 1 or more fail
   for (const action of actions) {
-    // Must have a valid protocol network identifier
-    if (!action.protocolNetwork) {
-      throw Error("Cannot set an action without the field 'protocolNetwork'")
-    }
-
-    try {
-      // Set the parsed network identifier back in the action input object
-      action.protocolNetwork = validateNetworkIdentifier(action.protocolNetwork)
-    } catch (e) {
-      throw Error(`Invalid value for the field 'protocolNetwork'. ${e}`)
-    }
-
     // Must have the required params for the action type
     if (!isValidActionInput(action)) {
       throw new Error(

packages/indexer-common/src/indexer-management/__tests__/resolvers/actions.test.ts

@@ -165,12 +165,6 @@ async function actionInputToExpected(
     }
   }
 
-  // We expect the protocol network to be transformed to it's CAIP2-ID
-  // form for all inputs
-  if (input.protocolNetwork === 'arbitrum-sepolia') {
-    expected.protocolNetwork = 'eip155:421614'
-  }
-
   return expected
 }
 
@@ -709,8 +703,6 @@ describe.skip('Actions', () => {
       source: 'indexerAgent',
       reason: 'indexingRule',
       priority: 0,
-      //  When writing directly to the database, `protocolNetwork` must be in the CAIP2-ID format.
-      protocolNetwork: 'eip155:421614',
     } as ActionInput
 
     const proposedAction = {
@@ -721,16 +713,20 @@ describe.skip('Actions', () => {
       source: 'indexerAgent',
       reason: 'indexingRule',
       priority: 0,
-      protocolNetwork: 'arbitrum-sepolia',
     } as ActionInput
 
-    await managementModels.Action.create(failedAction, {
-      validate: true,
-      returning: true,
-    })
+    await managementModels.Action.create(
+      { ...failedAction, protocolNetwork: 'whatever' },
+      {
+        validate: true,
+        returning: true,
+      },
+    )
 
     const result = await client
-      .mutation(QUEUE_ACTIONS_MUTATION, { actions: [proposedAction] })
+      .mutation(QUEUE_ACTIONS_MUTATION, {
+        actions: [{ ...proposedAction, protocolNetwork: 'whatever' }],
+      })
       .toPromise()
 
     expect(result).toHaveProperty(
@@ -779,10 +775,13 @@ describe.skip('Actions', () => {
       protocolNetwork: 'arbitrum-sepolia',
     } as ActionInput
 
-    await managementModels.Action.create(successfulAction, {
-      validate: true,
-      returning: true,
-    })
+    await managementModels.Action.create(
+      { ...successfulAction, protocolNetwork: 'whatever' },
+      {
+        validate: true,
+        returning: true,
+      },
+    )
 
     await expect(
       client.mutation(QUEUE_ACTIONS_MUTATION, { actions: [proposedAction] }).toPromise(),
@@ -833,10 +832,13 @@ describe.skip('Actions', () => {
       protocolNetwork: 'arbitrum-sepolia',
     } as ActionInput
 
-    await managementModels.Action.create(queuedUnallocateAction, {
-      validate: true,
-      returning: true,
-    })
+    await managementModels.Action.create(
+      { ...queuedUnallocateAction, protocolNetwork: 'whatever' },
+      {
+        validate: true,
+        returning: true,
+      },
+    )
 
     const queuedAllocateAction1 = { ...queuedAllocateAction }
     const queuedAllocateAction2 = { ...queuedAllocateAction }

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

@@ -13,6 +13,7 @@ import {
   IndexerManagementModels,
   OrderDirection,
   validateActionInputs,
+  validateNetworkIdentifier,
 } from '@graphprotocol/indexer-common'
 import { literal, Op, Transaction } from 'sequelize'
 import { ActionManager } from '../actions'
@@ -29,6 +30,7 @@ async function executeQueueOperation(
   recentlyAttemptedActions: Action[],
   models: IndexerManagementModels,
   transaction: Transaction,
+  protocolNetwork: string,
 ): Promise<ActionResult[]> {
   // Check for previously failed conflicting actions
   const conflictingActions = recentlyAttemptedActions.filter(function (recentAction) {
@@ -49,14 +51,18 @@ async function executeQueueOperation(
   const duplicateActions = actionsAwaitingExecution.filter(
     (a) => a.deploymentID === action.deploymentID,
   )
+
   if (duplicateActions.length === 0) {
     logger.trace('Inserting Action in database', { action })
     return [
-      await models.Action.create(action, {
-        validate: true,
-        returning: true,
-        transaction,
-      }),
+      await models.Action.create(
+        { ...action, protocolNetwork },
+        {
+          validate: true,
+          returning: true,
+          transaction,
+        },
+      ),
     ]
   } else if (duplicateActions.length === 1) {
     if (
@@ -155,9 +161,9 @@ export default {
       throw Error('IndexerManagementClient must be in `network` mode to modify actions')
     }
 
-    actions.forEach((action) => {
-      action.protocolNetwork = network.networkMonitor.networkCAIPID
-    })
+    const protocolNetwork = validateNetworkIdentifier(
+      network.specification.networkIdentifier,
+    )
 
     // Let Network Monitors validate actions based on their protocol networks
     await validateActionInputs(actions, network.networkMonitor, logger)
@@ -218,6 +224,7 @@ export default {
           recentlyAttemptedActions,
           models,
           transaction,
+          protocolNetwork,
         )
         results = results.concat(result)
       }
@@ -364,11 +371,6 @@ export default {
 
 // Helper function to assess equality among a enqueued and a proposed actions
 function compareActions(enqueued: Action, proposed: ActionInput): boolean {
-  // actions are not the same if they target different protocol networks
-  if (enqueued.protocolNetwork !== proposed.protocolNetwork) {
-    return false
-  }
-
   // actions are not the same if they target different deployments
   if (enqueued.deploymentID !== proposed.deploymentID) {
     return false