fix(cli): fix signer init strategy

.changeset/hot-spies-share.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': minor
+---
+
+fix signer strategy init for broken cli commands

typescript/cli/src/commands/signCommands.ts

@@ -13,7 +13,8 @@ export const SIGN_COMMANDS = [
 export function isSignCommand(argv: any): boolean {
   //TODO: fix reading and checking warp without signer, and remove this
   const temporarySignCommandsCheck =
-    argv._[0] === 'warp' && (argv._[1] === 'read' || argv._[1] === 'check');
+    argv._[0] === 'warp' &&
+    (argv._[1] === 'read' || argv._[1] === 'check' || argv._[1] === 'verify');
   return (
     SIGN_COMMANDS.includes(argv._[0]) ||
     (argv._.length > 1 && SIGN_COMMANDS.includes(argv._[1])) ||

typescript/cli/src/context/strategies/chain/ChainResolverFactory.ts

@@ -1,7 +1,6 @@
 import { CommandType } from '../../../commands/signCommands.js';
 
 import { MultiChainResolver } from './MultiChainResolver.js';
-import { SingleChainResolver } from './SingleChainResolver.js';
 import { ChainResolver } from './types.js';
 
 /**
@@ -11,13 +10,16 @@ import { ChainResolver } from './types.js';
 export class ChainResolverFactory {
   private static strategyMap: Map<CommandType, () => ChainResolver> = new Map([
     [CommandType.WARP_DEPLOY, () => MultiChainResolver.forWarpRouteConfig()],
-    [CommandType.WARP_SEND, () => MultiChainResolver.forOriginDestination()],
+    // Using the forRelayer resolver because warp send allows the user to self relay the tx
+    [CommandType.WARP_SEND, () => MultiChainResolver.forRelayer()],
     [CommandType.WARP_APPLY, () => MultiChainResolver.forWarpRouteConfig()],
     [CommandType.WARP_READ, () => MultiChainResolver.forWarpCoreConfig()],
     [CommandType.WARP_CHECK, () => MultiChainResolver.forWarpCoreConfig()],
-    [CommandType.SEND_MESSAGE, () => MultiChainResolver.forOriginDestination()],
+    // Using the forRelayer resolver because send allows the user to self relay the tx
+    [CommandType.SEND_MESSAGE, () => MultiChainResolver.forRelayer()],
     [CommandType.AGENT_KURTOSIS, () => MultiChainResolver.forAgentKurtosis()],
-    [CommandType.STATUS, () => MultiChainResolver.forOriginDestination()],
+    // Using the forRelayer resolver because status allows the user to self relay the tx
+    [CommandType.STATUS, () => MultiChainResolver.forRelayer()],
     [CommandType.SUBMIT, () => MultiChainResolver.forStrategyConfig()],
     [CommandType.RELAYER, () => MultiChainResolver.forRelayer()],
     [CommandType.CORE_APPLY, () => MultiChainResolver.forCoreApply()],
@@ -30,7 +32,7 @@ export class ChainResolverFactory {
   static getStrategy(argv: Record<string, any>): ChainResolver {
     const commandKey = `${argv._[0]}:${argv._[1] || ''}`.trim() as CommandType;
     const createStrategy =
-      this.strategyMap.get(commandKey) || (() => new SingleChainResolver());
+      this.strategyMap.get(commandKey) || (() => MultiChainResolver.default());
     return createStrategy();
   }
 }

typescript/cli/src/context/strategies/chain/MultiChainResolver.ts

@@ -4,8 +4,9 @@ import {
   DeployedCoreAddresses,
   DeployedCoreAddressesSchema,
   EvmCoreModule,
+  MultiProvider,
 } from '@hyperlane-xyz/sdk';
-import { assert } from '@hyperlane-xyz/utils';
+import { ProtocolType, assert } from '@hyperlane-xyz/utils';
 
 import { DEFAULT_WARP_ROUTE_DEPLOYMENT_CONFIG_PATH } from '../../../commands/options.js';
 import { readCoreDeployConfigs } from '../../../config/core.js';
@@ -26,13 +27,13 @@ import { getWarpCoreConfigOrExit } from '../../../utils/warp.js';
 import { ChainResolver } from './types.js';
 
 enum ChainSelectionMode {
-  ORIGIN_DESTINATION,
   AGENT_KURTOSIS,
   WARP_CONFIG,
   WARP_READ,
   STRATEGY,
   RELAYER,
   CORE_APPLY,
+  DEFAULT,
 }
 
 // This class could be broken down into multiple strategies
@@ -58,9 +59,9 @@ export class MultiChainResolver implements ChainResolver {
         return this.resolveRelayerChains(argv);
       case ChainSelectionMode.CORE_APPLY:
         return this.resolveCoreApplyChains(argv);
-      case ChainSelectionMode.ORIGIN_DESTINATION:
+      case ChainSelectionMode.DEFAULT:
       default:
-        return this.resolveOriginDestinationChains(argv);
+        return this.resolveRelayerChains(argv);
     }
   }
 
@@ -119,28 +120,6 @@ export class MultiChainResolver implements ChainResolver {
     return [argv.origin, ...argv.targets];
   }
 
-  private async resolveOriginDestinationChains(
-    argv: Record<string, any>,
-  ): Promise<ChainName[]> {
-    const { chainMetadata } = argv.context;
-
-    argv.origin =
-      argv.origin ??
-      (await runSingleChainSelectionStep(
-        chainMetadata,
-        'Select the origin chain',
-      ));
-
-    argv.destination =
-      argv.destination ??
-      (await runSingleChainSelectionStep(
-        chainMetadata,
-        'Select the destination chain',
-      ));
-
-    return [argv.origin, argv.destination];
-  }
-
   private async resolveStrategyChains(
     argv: Record<string, any>,
   ): Promise<ChainName[]> {
@@ -151,7 +130,29 @@ export class MultiChainResolver implements ChainResolver {
   private async resolveRelayerChains(
     argv: Record<string, any>,
   ): Promise<ChainName[]> {
-    return argv.chains.split(',').map((item: string) => item.trim());
+    const { multiProvider } = argv.context;
+    const chains = [];
+
+    if (argv.origin) {
+      chains.push(argv.origin);
+    }
+
+    if (argv.destination) {
+      chains.push(argv.destination);
+    }
+
+    if (!argv.chains) {
+      return Array.from(
+        new Set([...chains, ...this.getEvmChains(multiProvider)]),
+      );
+    }
+
+    return Array.from(
+      new Set([
+        ...chains,
+        ...argv.chains.split(',').map((item: string) => item.trim()),
+      ]),
+    );
   }
 
   private async getWarpRouteConfigChains(
@@ -219,12 +220,16 @@ export class MultiChainResolver implements ChainResolver {
     }
   }
 
-  static forAgentKurtosis(): MultiChainResolver {
-    return new MultiChainResolver(ChainSelectionMode.AGENT_KURTOSIS);
+  private getEvmChains(multiProvider: MultiProvider): ChainName[] {
+    const chains = multiProvider.getKnownChainNames();
+
+    return chains.filter(
+      (chain) => multiProvider.getProtocol(chain) === ProtocolType.Ethereum,
+    );
   }
 
-  static forOriginDestination(): MultiChainResolver {
-    return new MultiChainResolver(ChainSelectionMode.ORIGIN_DESTINATION);
+  static forAgentKurtosis(): MultiChainResolver {
+    return new MultiChainResolver(ChainSelectionMode.AGENT_KURTOSIS);
   }
 
   static forRelayer(): MultiChainResolver {
@@ -246,4 +251,8 @@ export class MultiChainResolver implements ChainResolver {
   static forCoreApply(): MultiChainResolver {
     return new MultiChainResolver(ChainSelectionMode.CORE_APPLY);
   }
+
+  static default(): MultiChainResolver {
+    return new MultiChainResolver(ChainSelectionMode.DEFAULT);
+  }
 }

typescript/cli/src/context/strategies/signer/MultiProtocolSignerManager.ts

@@ -118,12 +118,12 @@ export class MultiProtocolSignerManager {
     let privateKey: string;
 
     if (this.options.key) {
-      this.logger.info(
+      this.logger.debug(
         `Using private key passed via CLI --key flag for chain ${chain}`,
       );
       privateKey = this.options.key;
     } else if (ENV.HYP_KEY) {
-      this.logger.info(`Using private key from .env for chain ${chain}`);
+      this.logger.debug(`Using private key from .env for chain ${chain}`);
       privateKey = ENV.HYP_KEY;
     } else {
       privateKey = await this.extractPrivateKey(chain, signerStrategy);
@@ -145,7 +145,7 @@ export class MultiProtocolSignerManager {
       `No private key found for chain ${chain}`,
     );
 
-    this.logger.info(
+    this.logger.debug(
       `Extracting private key from strategy config/user prompt for chain ${chain}`,
     );
     return strategyConfig.privateKey;