feat: add ISM compatibility validation for core and warp route deployments

Author: ljankovic-txfusion

typescript/cli/src/deploy/core.ts

@@ -63,6 +63,10 @@ export async function runCoreDeploy(params: DeployParams) {
       'Select chain to connect:',
     );
   }
+
+  // Validate ISM compatibility
+  validateIsmCompatibility(chain, config, context);
+
   let apiKeys: ChainMap<string> = {};
   if (!skipConfirmation)
     apiKeys = await requestAndSaveApiKeys([chain], chainMetadata, registry);
@@ -84,19 +88,6 @@ export async function runCoreDeploy(params: DeployParams) {
 
   const userAddress = await signer.getAddress();
 
-  const { technicalStack: chainTechnicalStack } =
-    context.multiProvider.getChainMetadata(chain);
-
-  if (typeof config.defaultIsm !== 'string') {
-    assert(
-      isIsmCompatible({
-        chainTechnicalStack,
-        ismType: config.defaultIsm?.type,
-      }),
-      `ERROR: Selected ISM of type ${config.defaultIsm?.type} is not compatible with the selected Chain Technical Stack of ${chainTechnicalStack}!`,
-    );
-  }
-
   const initialBalances = await prepareDeploy(context, userAddress, [chain]);
 
   const contractVerifier = new ContractVerifier(
@@ -128,6 +119,29 @@ export async function runCoreDeploy(params: DeployParams) {
   log(indentYamlOrJson(yamlStringify(deployedAddresses, null, 2), 4));
 }
 
+/**
+ * Validates that the ISM configuration is compatible with the chain's technical stack.
+ * Throws an error if an incompatible ISM type is configured.
+ */
+function validateIsmCompatibility(
+  chain: ChainName,
+  config: CoreConfig,
+  context: WriteCommandContext,
+) {
+  const { technicalStack: chainTechnicalStack } =
+    context.multiProvider.getChainMetadata(chain);
+
+  if (typeof config.defaultIsm !== 'string') {
+    assert(
+      isIsmCompatible({
+        chainTechnicalStack,
+        ismType: config.defaultIsm?.type,
+      }),
+      `Selected ISM of type ${config.defaultIsm?.type} is not compatible with the selected Chain Technical Stack of ${chainTechnicalStack} for chain ${chain}!`,
+    );
+  }
+}
+
 export async function runCoreApply(params: ApplyParams) {
   const { context, chain, deployedCoreAddresses, config } = params;
   const { multiProvider } = context;

typescript/cli/src/deploy/warp.ts

@@ -51,6 +51,7 @@ import {
   getTokenConnectionId,
   hypERC20factories,
   isCollateralTokenConfig,
+  isIsmCompatible,
   isTokenMetadata,
 } from '@hyperlane-xyz/sdk';
 import {
@@ -127,6 +128,9 @@ export async function runWarpRouteDeploy({
 
   const chains = Object.keys(warpRouteConfig);
 
+  // Validate ISM compatibility for all chains
+  validateIsmCompatibility(warpRouteConfig, context);
+
   let apiKeys: ChainMap<string> = {};
   if (!skipConfirmation)
     apiKeys = await requestAndSaveApiKeys(chains, chainMetadata, registry);
@@ -176,6 +180,34 @@ async function runDeployPlanStep({ context, warpDeployConfig }: DeployParams) {
   if (!isConfirmed) throw new Error('Deployment cancelled');
 }
 
+/**
+ * Validates that the ISM configurations are compatible with each chain's technical stack.
+ * Throws an error if an incompatible ISM type is configured for a chain.
+ */
+function validateIsmCompatibility(
+  warpRouteConfig: WarpRouteDeployConfig,
+  context: WriteCommandContext,
+) {
+  for (const chain of Object.keys(warpRouteConfig)) {
+    const config = warpRouteConfig[chain];
+    const { technicalStack: chainTechnicalStack } =
+      context.multiProvider.getChainMetadata(chain);
+
+    if (
+      config.interchainSecurityModule &&
+      typeof config.interchainSecurityModule !== 'string'
+    ) {
+      assert(
+        isIsmCompatible({
+          chainTechnicalStack,
+          ismType: config.interchainSecurityModule.type,
+        }),
+        `Selected ISM of type ${config.interchainSecurityModule.type} is not compatible with the selected Chain Technical Stack of ${chainTechnicalStack} for chain ${chain}!`,
+      );
+    }
+  }
+}
+
 async function executeDeploy(
   params: DeployParams,
   apiKeys: ChainMap<string>,