@hyperlane-xyz/sdk 3.20.0-beta0 → 4.0.0-alpha

package/dist/ism/EvmIsmModule.js

@@ -0,0 +1,359 @@
+import { ethers } from 'ethers';
+import { DefaultFallbackRoutingIsm__factory, DomainRoutingIsmFactory__factory, DomainRoutingIsm__factory, IAggregationIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, MailboxClient__factory, OPStackIsm__factory, Ownable__factory, PausableIsm__factory, TestIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
+import { assert, configDeepEquals, eqAddress, normalizeConfig, objFilter, rootLogger, } from '@hyperlane-xyz/utils';
+import { attachAndConnectContracts } from '../contracts/contracts.js';
+import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
+import { proxyFactoryFactories, } from '../deploy/contracts.js';
+import { findMatchingLogEvents } from '../utils/logUtils.js';
+import { EvmIsmReader } from './EvmIsmReader.js';
+import { IsmType, MUTABLE_ISM_TYPE, } from './types.js';
+import { calculateDomainRoutingDelta } from './utils.js';
+export class EvmIsmModule extends HyperlaneModule {
+    multiProvider;
+    deployer;
+    logger = rootLogger.child({ module: 'EvmIsmModule' });
+    reader;
+    factories;
+    // Adding these to reduce how often we need to grab from MultiProvider.
+    chain;
+    // We use domainId here because MultiProvider.getDomainId() will always
+    // return a number, and EVM the domainId and chainId are the same.
+    domainId;
+    constructor(multiProvider, deployer, params) {
+        super(params);
+        this.multiProvider = multiProvider;
+        this.deployer = deployer;
+        this.reader = new EvmIsmReader(multiProvider, params.chain);
+        const { mailbox: _, deployedIsm: __, ...addresses } = params.addresses;
+        this.factories = attachAndConnectContracts(addresses, proxyFactoryFactories, multiProvider.getSigner(params.chain));
+        this.chain = this.multiProvider.getChainName(this.args.chain);
+        this.domainId = this.multiProvider.getDomainId(this.chain);
+    }
+    async read() {
+        return typeof this.args.config === 'string'
+            ? this.args.addresses.deployedIsm
+            : this.reader.deriveIsmConfig(this.args.addresses.deployedIsm);
+    }
+    // whoever calls update() needs to ensure that targetConfig has a valid owner
+    async update(targetConfig) {
+        // save current config for comparison
+        // normalize the config to ensure it's in a consistent format for comparison
+        const currentConfig = normalizeConfig(await this.read());
+        // Update the config
+        this.args.config = targetConfig;
+        // moduleMatchesConfig expects any domain filtering to have been done already
+        if (typeof targetConfig !== 'string' &&
+            (targetConfig.type === IsmType.ROUTING ||
+                targetConfig.type === IsmType.FALLBACK_ROUTING)) {
+            // filter for known domains
+            const { availableDomains } = this.filterRoutingIsmDomains({
+                config: targetConfig,
+            });
+            targetConfig.domains = availableDomains;
+        }
+        // If configs match, no updates needed
+        if (configDeepEquals(currentConfig, targetConfig)) {
+            return [];
+        }
+        // Else, we have to figure out what an update for this ISM entails
+        // If target config is a custom ISM, just update the address
+        // if config -> custom ISM, update address
+        // if custom ISM -> custom ISM, update address
+        if (typeof targetConfig === 'string') {
+            // TODO: https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3773
+            this.args.addresses.deployedIsm = targetConfig;
+            return [];
+        }
+        // Check if we need to deploy a new ISM
+        if (
+        // if custom ISM -> config, do a new deploy
+        typeof currentConfig === 'string' ||
+            // if config -> config, AND types are different, do a new deploy
+            currentConfig.type !== targetConfig.type ||
+            // if it is not a mutable ISM, do a new deploy
+            !MUTABLE_ISM_TYPE.includes(targetConfig.type)) {
+            const contract = await this.deploy({
+                config: targetConfig,
+            });
+            this.args.addresses.deployedIsm = contract.address;
+            return [];
+        }
+        // At this point, only the 3 ownable/mutable ISM types should remain: PAUSABLE, ROUTING, FALLBACK_ROUTING
+        if (targetConfig.type !== IsmType.PAUSABLE &&
+            targetConfig.type !== IsmType.ROUTING &&
+            targetConfig.type !== IsmType.FALLBACK_ROUTING) {
+            throw new Error(`Unsupported ISM type ${targetConfig.type}`);
+        }
+        const logger = this.logger.child({
+            destination: this.chain,
+            ismType: targetConfig.type,
+        });
+        const provider = this.multiProvider.getProvider(this.chain);
+        logger.debug(`Updating ${targetConfig.type} on ${this.chain}`);
+        // if it's a fallback routing ISM, do a mailbox diff check and deploy a new ISM if needed
+        if (targetConfig.type === IsmType.FALLBACK_ROUTING) {
+            // can only retreive mailbox address if current ISM type is also Fallback Routing
+            const mailboxAddress = currentConfig.type === IsmType.FALLBACK_ROUTING
+                ? await MailboxClient__factory.connect(this.args.addresses.deployedIsm, provider).mailbox()
+                : ''; // empty string to force a mailbox diff
+            // if mailbox delta, deploy new routing ISM before updating
+            // this will always be the case if the current ISM is not a fallback routing ISM
+            if (!eqAddress(mailboxAddress, this.args.addresses.mailbox)) {
+                const newIsm = await this.deployRoutingIsm({
+                    config: targetConfig,
+                    logger,
+                });
+                this.args.addresses.deployedIsm = newIsm.address;
+            }
+        }
+        // if it's either of the routing ISMs, update their submodules
+        let updateTxs = [];
+        if (targetConfig.type === IsmType.ROUTING ||
+            targetConfig.type === IsmType.FALLBACK_ROUTING) {
+            updateTxs = await this.updateRoutingIsm({
+                current: currentConfig,
+                target: targetConfig,
+                logger,
+            });
+        }
+        // Lastly, check if the resolved owner is different from the current owner
+        const owner = await Ownable__factory.connect(this.args.addresses.deployedIsm, provider).owner();
+        // Return an ownership transfer transaction if required
+        if (!eqAddress(targetConfig.owner, owner)) {
+            updateTxs.push({
+                annotation: 'Transferring ownership of ownable ISM...',
+                chainId: this.domainId,
+                to: this.args.addresses.deployedIsm,
+                data: Ownable__factory.createInterface().encodeFunctionData('transferOwnership(address)', [targetConfig.owner]),
+            });
+        }
+        return updateTxs;
+    }
+    // manually write static create function
+    static async create(params) {
+        const { chain, config, deployer, factories, mailbox, multiProvider } = params;
+        // instantiate new EvmIsmModule
+        const module = new EvmIsmModule(multiProvider, deployer, {
+            addresses: {
+                ...factories,
+                mailbox,
+                deployedIsm: ethers.constants.AddressZero,
+            },
+            chain,
+            config,
+        });
+        // deploy ISM and assign address to module
+        const deployedIsm = await module.deploy({ config });
+        module.args.addresses.deployedIsm = deployedIsm.address;
+        return module;
+    }
+    async updateRoutingIsm({ current, target, logger, }) {
+        const routingIsmInterface = DomainRoutingIsm__factory.createInterface();
+        const updateTxs = [];
+        const { domainsToEnroll, domainsToUnenroll } = calculateDomainRoutingDelta(current, target);
+        // Enroll domains
+        for (const origin of domainsToEnroll) {
+            logger.debug(`Reconfiguring preexisting routing ISM for origin ${origin}...`);
+            const ism = await this.deploy({
+                config: target.domains[origin],
+            });
+            const domainId = this.multiProvider.getDomainId(origin);
+            updateTxs.push({
+                annotation: `Setting new ISM for origin ${origin}...`,
+                chainId: this.domainId,
+                to: this.args.addresses.deployedIsm,
+                data: routingIsmInterface.encodeFunctionData('set(uint32,address)', [
+                    domainId,
+                    ism.address,
+                ]),
+            });
+        }
+        // Unenroll domains
+        for (const origin of domainsToUnenroll) {
+            const domainId = this.multiProvider.getDomainId(origin);
+            updateTxs.push({
+                annotation: `Unenrolling originDomain ${domainId} from preexisting routing ISM at ${this.args.addresses.deployedIsm}...`,
+                chainId: this.domainId,
+                to: this.args.addresses.deployedIsm,
+                data: routingIsmInterface.encodeFunctionData('remove(uint32)', [
+                    domainId,
+                ]),
+            });
+        }
+        return updateTxs;
+    }
+    async deploy({ config, }) {
+        // If it's a custom ISM, just return a base ISM
+        if (typeof config === 'string') {
+            // TODO: https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3773
+            // we can remove the ts-ignore once we have a proper type for custom ISMs
+            // @ts-ignore
+            return IInterchainSecurityModule__factory.connect(config, this.multiProvider.getSignerOrProvider(this.args.chain));
+        }
+        const ismType = config.type;
+        const logger = rootLogger.child({ chainName: this.chain, ismType });
+        logger.debug(`Deploying ${ismType} to ${this.args.chain}`);
+        switch (ismType) {
+            case IsmType.MESSAGE_ID_MULTISIG:
+            case IsmType.MERKLE_ROOT_MULTISIG:
+                return this.deployMultisigIsm({
+                    config,
+                    logger,
+                });
+            case IsmType.ROUTING:
+            case IsmType.FALLBACK_ROUTING:
+                return this.deployRoutingIsm({
+                    config,
+                    logger,
+                });
+            case IsmType.AGGREGATION:
+                return this.deployAggregationIsm({
+                    config,
+                    logger,
+                });
+            case IsmType.OP_STACK:
+                return this.deployer.deployContractFromFactory(this.chain, new OPStackIsm__factory(), IsmType.OP_STACK, [config.nativeBridge]);
+            case IsmType.PAUSABLE:
+                return this.deployer.deployContractFromFactory(this.chain, new PausableIsm__factory(), IsmType.PAUSABLE, [config.owner]);
+            case IsmType.TRUSTED_RELAYER:
+                assert(this.args.addresses.mailbox, `Mailbox address is required for deploying ${ismType}`);
+                return this.deployer.deployContractFromFactory(this.chain, new TrustedRelayerIsm__factory(), IsmType.TRUSTED_RELAYER, [this.args.addresses.mailbox, config.relayer]);
+            case IsmType.TEST_ISM:
+                return this.deployer.deployContractFromFactory(this.chain, new TestIsm__factory(), IsmType.TEST_ISM, []);
+            default:
+                throw new Error(`Unsupported ISM type ${ismType}`);
+        }
+    }
+    async deployMultisigIsm({ config, logger, }) {
+        const signer = this.multiProvider.getSigner(this.chain);
+        const factoryName = config.type === IsmType.MERKLE_ROOT_MULTISIG
+            ? 'staticMerkleRootMultisigIsmFactory'
+            : 'staticMessageIdMultisigIsmFactory';
+        const address = await EvmIsmModule.deployStaticAddressSet({
+            chain: this.chain,
+            factory: this.factories[factoryName],
+            values: config.validators,
+            logger,
+            threshold: config.threshold,
+            multiProvider: this.multiProvider,
+        });
+        return IMultisigIsm__factory.connect(address, signer);
+    }
+    async deployRoutingIsm({ config, logger, }) {
+        // filter out domains which are not part of the multiprovider
+        const { availableDomains, availableDomainIds } = this.filterRoutingIsmDomains({
+            config,
+        });
+        config.domains = availableDomains;
+        // deploy the submodules first
+        const submoduleAddresses = await Promise.all(Object.keys(config.domains).map(async (origin) => {
+            const { address } = await this.deploy({
+                config: config.domains[origin],
+            });
+            return address;
+        }));
+        if (config.type === IsmType.FALLBACK_ROUTING) {
+            // deploy the fallback routing ISM
+            logger.debug('Deploying fallback routing ISM ...');
+            const ism = await this.multiProvider.handleDeploy(this.chain, new DefaultFallbackRoutingIsm__factory(), [this.args.addresses.mailbox]);
+            // initialize the fallback routing ISM
+            logger.debug('Initializing fallback routing ISM ...');
+            await ism['initialize(address,uint32[],address[])'](config.owner, availableDomainIds, submoduleAddresses);
+            // return the fallback routing ISM
+            return ism;
+        }
+        // then deploy the domain routing ISM
+        logger.debug('Deploying domain routing ISM ...');
+        return this.deployDomainRoutingIsm({
+            owner: config.owner,
+            domainIds: availableDomainIds,
+            submoduleAddresses,
+        });
+    }
+    async deployDomainRoutingIsm({ owner, domainIds, submoduleAddresses, }) {
+        const overrides = this.multiProvider.getTransactionOverrides(this.args.chain);
+        const signer = this.multiProvider.getSigner(this.args.chain);
+        const domainRoutingIsmFactory = DomainRoutingIsmFactory__factory.connect(this.args.addresses.domainRoutingIsmFactory, signer);
+        // deploying new domain routing ISM
+        const tx = await domainRoutingIsmFactory.deploy(owner, domainIds, submoduleAddresses, overrides);
+        const receipt = await this.multiProvider.handleTx(this.args.chain, tx);
+        const dispatchLogs = findMatchingLogEvents(receipt.logs, domainRoutingIsmFactory.interface, 'ModuleDeployed');
+        if (dispatchLogs.length === 0) {
+            throw new Error('No ModuleDeployed event found');
+        }
+        const moduleAddress = dispatchLogs[0].args['module'];
+        return DomainRoutingIsm__factory.connect(moduleAddress, signer);
+    }
+    async deployAggregationIsm({ config, logger, }) {
+        const addresses = await Promise.all(config.modules.map(async (module) => {
+            const submodule = await this.deploy({ config: module });
+            return submodule.address;
+        }));
+        const factoryName = 'staticAggregationIsmFactory';
+        const address = await EvmIsmModule.deployStaticAddressSet({
+            chain: this.chain,
+            factory: this.factories[factoryName],
+            values: addresses,
+            logger: logger,
+            threshold: config.threshold,
+            multiProvider: this.multiProvider,
+        });
+        const signer = this.multiProvider.getSigner(this.args.chain);
+        return IAggregationIsm__factory.connect(address, signer);
+    }
+    // Updates the mailbox address if it is different from the current one.
+    // Logs changes and updates the internal state of the module.
+    setNewMailbox(newMailboxAddress) {
+        const currentMailboxAddress = this.args.addresses.mailbox;
+        if (currentMailboxAddress === newMailboxAddress) {
+            this.logger.debug(`Mailbox address is already set to ${newMailboxAddress}`);
+            return;
+        }
+        this.logger.debug(`Setting new mailbox address from ${currentMailboxAddress} to ${newMailboxAddress}`);
+        // Update the mailbox address in the arguments
+        this.args.addresses.mailbox = newMailboxAddress;
+    }
+    // Public so it can be reused by the hook module.
+    // Caller of this function is responsible for verifying the contract
+    // because they know exactly which factory is being called.
+    static async deployStaticAddressSet({ chain, factory, values, logger, threshold = values.length, multiProvider, }) {
+        const address = await factory['getAddress(address[],uint8)'](values, threshold);
+        const code = await multiProvider.getProvider(chain).getCode(address);
+        if (code === '0x') {
+            logger.debug(`Deploying new ${threshold} of ${values.length} address set to ${chain}`);
+            const overrides = multiProvider.getTransactionOverrides(chain);
+            const hash = await factory['deploy(address[],uint8)'](values, threshold, overrides);
+            await multiProvider.handleTx(chain, hash);
+        }
+        else {
+            logger.debug(`Recovered ${threshold} of ${values.length} address set on ${chain}: ${address}`);
+        }
+        // TODO: figure out how to get the constructor arguments for manual deploy TXs
+        // const verificationInput = buildVerificationInput(
+        //   NAME,
+        //   ADDRESS,
+        //   CONSTRUCTOR_ARGS,
+        // );
+        // await this.deployer.verifyContract(
+        //   this.chainName,
+        //   verificationInput,
+        //   logger,
+        // );
+        return address;
+    }
+    // filtering out domains which are not part of the multiprovider
+    filterRoutingIsmDomains({ config }) {
+        const availableDomainIds = [];
+        const availableDomains = objFilter(config.domains, (domain, _) => {
+            const domainId = this.multiProvider.tryGetDomainId(domain);
+            if (domainId === null) {
+                this.logger.warn(`Domain ${domain} doesn't have chain metadata provided, skipping ...`);
+                return false;
+            }
+            availableDomainIds.push(domainId);
+            return true;
+        });
+        return { availableDomains, availableDomainIds };
+    }
+}
+//# sourceMappingURL=EvmIsmModule.js.map

package/dist/ism/EvmIsmModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvmIsmModule.js","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"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"}

package/dist/ism/{read.d.ts → EvmIsmReader.d.ts}

@@ -2,11 +2,10 @@ import { providers } from 'ethers';
 import { Address, WithAddress } from '@hyperlane-xyz/utils';
 import { MultiProvider } from '../providers/MultiProvider.js';
 import { ChainNameOrId } from '../types.js';
-import { AggregationIsmConfig, IsmConfig, MultisigIsmConfig, OpStackIsmConfig, PausableIsmConfig, RoutingIsmConfig, TestIsmConfig, TrustedRelayerIsmConfig } from './types.js';
-type NullIsmConfig = PausableIsmConfig | TestIsmConfig | OpStackIsmConfig | TrustedRelayerIsmConfig;
-export type DerivedIsmConfigWithAddress = WithAddress<Exclude<IsmConfig, Address>>;
+import { AggregationIsmConfig, IsmConfig, MultisigIsmConfig, NullIsmConfig, RoutingIsmConfig } from './types.js';
+export type DerivedIsmConfig = WithAddress<Exclude<IsmConfig, Address>>;
 export interface IsmReader {
-    deriveIsmConfig(address: Address): Promise<DerivedIsmConfigWithAddress>;
+    deriveIsmConfig(address: Address): Promise<DerivedIsmConfig>;
     deriveRoutingConfig(address: Address): Promise<WithAddress<RoutingIsmConfig>>;
     deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationIsmConfig>>;
     deriveMultisigConfig(address: Address): Promise<WithAddress<MultisigIsmConfig>>;
@@ -19,11 +18,10 @@ export declare class EvmIsmReader implements IsmReader {
     protected readonly provider: providers.Provider;
     protected readonly logger: import("pino").default.Logger<never>;
     constructor(multiProvider: MultiProvider, chain: ChainNameOrId, concurrency?: number);
-    deriveIsmConfig(address: Address): Promise<DerivedIsmConfigWithAddress>;
+    deriveIsmConfig(address: Address): Promise<DerivedIsmConfig>;
     deriveRoutingConfig(address: Address): Promise<WithAddress<RoutingIsmConfig>>;
     deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationIsmConfig>>;
     deriveMultisigConfig(address: string): Promise<WithAddress<MultisigIsmConfig>>;
     deriveNullConfig(address: Address): Promise<WithAddress<NullIsmConfig>>;
 }
-export {};
-//# sourceMappingURL=read.d.ts.map
+//# sourceMappingURL=EvmIsmReader.d.ts.map

package/dist/ism/EvmIsmReader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvmIsmReader.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,SAAS,EAAE,MAAM,QAAQ,CAAC;AAY3C,OAAO,EACL,OAAO,EACP,WAAW,EAIZ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,SAAS,EAGT,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,WAAW,SAAS;IACxB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7D,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC9E,uBAAuB,CACrB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9C,oBAAoB,CAClB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC3C,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;CACzE;AAED,qBAAa,YAAa,YAAW,SAAS;IAK1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa;IACvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM;IANxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,MAAM,uCAAgD;gBAGpD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,aAAa,EACpB,WAAW,GAAE,MAEM;IAKlC,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8B5D,mBAAmB,CACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IA2CnC,uBAAuB,CAC3B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAsBvC,oBAAoB,CACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAyBpC,gBAAgB,CACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;CAkEvC"}

package/dist/ism/{read.js → EvmIsmReader.js}

@@ -1,7 +1,7 @@
 import { ethers } from 'ethers';
 import { DefaultFallbackRoutingIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, OPStackIsm__factory, PausableIsm__factory, StaticAggregationIsm__factory, TestIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
 import { assert, concurrentMap, rootLogger, } from '@hyperlane-xyz/utils';
-import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/crud.js';
+import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/concurrency.js';
 import { IsmType, ModuleType, } from './types.js';
 export class EvmIsmReader {
     multiProvider;
@@ -18,6 +18,7 @@ export class EvmIsmReader {
     async deriveIsmConfig(address) {
         const ism = IInterchainSecurityModule__factory.connect(address, this.provider);
         const moduleType = await ism.moduleType();
+        this.logger.debug('Deriving ISM config', { address, moduleType });
         switch (moduleType) {
             case ModuleType.UNUSED:
                 throw new Error('UNUSED does not have a corresponding IsmType');
@@ -46,11 +47,15 @@ export class EvmIsmReader {
         const domains = {};
         const domainIds = await ism.domains();
         await concurrentMap(this.concurrency, domainIds, async (domainId) => {
-            const chainName = this.multiProvider.getChainName(domainId.toNumber());
+            const chainName = this.multiProvider.tryGetChainName(domainId.toNumber());
+            if (!chainName) {
+                this.logger.warn(`Unknown domain ID ${domainId}, skipping domain configuration`);
+                return;
+            }
             const module = await ism.module(domainId);
             domains[chainName] = await this.deriveIsmConfig(module);
         });
-        // Fallback routing ISM extends from MailboxClient, default routign
+        // Fallback routing ISM extends from MailboxClient, default routing
         let ismType = IsmType.FALLBACK_ROUTING;
         try {
             await ism.mailbox();
@@ -149,4 +154,4 @@ export class EvmIsmReader {
         };
     }
 }
-//# sourceMappingURL=read.js.map
+//# sourceMappingURL=EvmIsmReader.js.map

package/dist/ism/EvmIsmReader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvmIsmReader.js","sourceRoot":"","sources":["../../src/ism/EvmIsmReader.ts"],"names":[],"mappings":"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"}

package/dist/ism/EvmIsmReader.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EvmIsmReader.test.d.ts.map

package/dist/ism/EvmIsmReader.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvmIsmReader.test.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmReader.test.ts"],"names":[],"mappings":""}

package/dist/ism/{read.test.js → EvmIsmReader.test.js}

@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import { IInterchainSecurityModule__factory, IMultisigIsm__factory, OPStackIsm__factory, PausableIsm__factory, TestIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
 import { TestChainName } from '../consts/testChains.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
-import { EvmIsmReader } from './read.js';
+import { EvmIsmReader } from './EvmIsmReader.js';
 import { IsmType, ModuleType, } from './types.js';
 describe('EvmIsmReader', () => {
     let evmIsmReader;
@@ -121,4 +121,4 @@ describe('EvmIsmReader', () => {
       - Fallback Domain Routing
     */
 });
-//# sourceMappingURL=read.test.js.map
+//# sourceMappingURL=EvmIsmReader.test.js.map

package/dist/ism/EvmIsmReader.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvmIsmReader.test.js","sourceRoot":"","sources":["../../src/ism/EvmIsmReader.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAEL,kCAAkC,EAElC,qBAAqB,EAErB,mBAAmB,EAEnB,oBAAoB,EAEpB,gBAAgB,EAEhB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EACL,OAAO,EACP,UAAU,GAIX,MAAM,YAAY,CAAC;AAEpB,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,YAA0B,CAAC;IAC/B,IAAI,aAA4B,CAAC;IACjC,IAAI,OAA2B,CAAC;IAEhC,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC;IAEzE,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QAChC,aAAa,GAAG,aAAa,CAAC,uBAAuB,EAAE,CAAC;QACxD,YAAY,GAAG,IAAI,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,cAAc,GAAG,CAAC,qBAAqB,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAC1E,MAAM,aAAa,GAAG,CAAC,CAAC;QAExB,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;YACnE,sBAAsB,EAAE,OAAO;iBAC5B,IAAI,EAAE;iBACN,QAAQ,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;SAC7C,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;aACtC,OAAO,CAAC,YAAuC,CAAC,CAAC;QACpD,OAAO;aACJ,IAAI,CAAC,kCAAkC,EAAE,SAAS,CAAC;aACnD,OAAO,CAAC,YAAoD,CAAC,CAAC;QAEjE,MAAM,cAAc,GAAmC;YACrD,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,OAAO,CAAC,mBAAmB;YACjC,UAAU,EAAE,cAAc;YAC1B,SAAS,EAAE,aAAa;SACzB,CAAC;QAEF,mCAAmC;QACnC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEhD,yEAAyE;QACzE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC;QAExB,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;YACpD,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;SAC5C,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;aACrC,OAAO,CAAC,YAAsC,CAAC,CAAC;QACnD,OAAO;aACJ,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC;aAC3C,OAAO,CAAC,YAA4C,CAAC,CAAC;QACzD,OAAO;aACJ,IAAI,CAAC,kCAAkC,EAAE,SAAS,CAAC;aACnD,OAAO,CAAC,YAAoD,CAAC,CAAC;QAEjE,MAAM,cAAc,GAAmC;YACrD,OAAO,EAAE,WAAW;YACpB,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,OAAO,CAAC,QAAQ;YACtB,MAAM,EAAE,UAAU;SACnB,CAAC;QAEF,mCAAmC;QACnC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEhD,yEAAyE;QACzE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAE5C,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;SACrD,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC;aACjC,OAAO,CAAC,YAAkC,CAAC,CAAC;QAC/C,OAAO;aACJ,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC;aACpC,OAAO,CAAC,YAAqC,CAAC,CAAC;QAClD,OAAO;aACJ,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;aACrC,OAAO,CAAC,YAAsC,CAAC,CAAC;QACnD,OAAO;aACJ,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC;aAC3C,OAAO,CAAC,YAA4C,CAAC,CAAC;QACzD,OAAO;aACJ,IAAI,CAAC,kCAAkC,EAAE,SAAS,CAAC;aACnD,OAAO,CAAC,YAAoD,CAAC,CAAC;QAEjE,MAAM,cAAc,GAA+B;YACjD,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,OAAO,CAAC,QAAQ;SACvB,CAAC;QAEF,mCAAmC;QACnC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEhD,yEAAyE;QACzE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH;;;;;;MAME;AACJ,CAAC,CAAC,CAAC"}

package/dist/ism/HyperlaneIsmFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneIsmFactory.d.ts","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAKL,eAAe,EAGf,YAAY,EAEZ,WAAW,EAGX,uBAAuB,EACvB,gCAAgC,EAGjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EACL,oBAAoB,EACpB,WAAW,EAEX,SAAS,EAET,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAGpB,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAInE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAM;IAExC,SAAS,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjD,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI;IAIxD,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,aAAa,EAAE,aAAa,GAC3B,mBAAmB;IAahB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE;QACxC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,OAAO,CAAC,WAAW,CAAC;cA4HR,iBAAiB,CAC/B,WAAW,EAAE,SAAS,EACtB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC;cAkBR,gBAAgB,CAAC,MAAM,EAAE;QACvC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,gBAAgB,CAAC;QACzB,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,WAAW,CAAC;cAyKR,oBAAoB,CAAC,MAAM,EAAE;QAC3C,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,oBAAoB,CAAC;QAC7B,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBtB,sBAAsB,CAC1B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,gCAAgC,GAAG,uBAAuB,EACnE,MAAM,EAAE,OAAO,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,SAAgB,GACxB,OAAO,CAAC,OAAO,CAAC;CA2BpB"}
+{"version":3,"file":"HyperlaneIsmFactory.d.ts","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAKL,eAAe,EAGf,YAAY,EAEZ,WAAW,EAGX,uBAAuB,EACvB,gCAAgC,EAGjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EACL,oBAAoB,EACpB,WAAW,EAEX,SAAS,EAET,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAGpB,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAInE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAM;IAExC,SAAS,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjD,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI;IAIxD,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,aAAa,EAAE,aAAa,GAC3B,mBAAmB;IAahB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE;QACxC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,OAAO,CAAC,WAAW,CAAC;cAsHR,iBAAiB,CAC/B,WAAW,EAAE,SAAS,EACtB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC;cAkBR,gBAAgB,CAAC,MAAM,EAAE;QACvC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,gBAAgB,CAAC;QACzB,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,WAAW,CAAC;cA+JR,oBAAoB,CAAC,MAAM,EAAE;QAC3C,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,oBAAoB,CAAC;QAC7B,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBtB,sBAAsB,CAC1B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,gCAAgC,GAAG,uBAAuB,EACnE,MAAM,EAAE,OAAO,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,SAAgB,GACxB,OAAO,CAAC,OAAO,CAAC;CA2BpB"}

package/dist/ism/HyperlaneIsmFactory.hardhat-test.d.ts

@@ -1,2 +1,4 @@
-export {};
+import { Address } from '@hyperlane-xyz/utils';
+import { IsmConfig } from './types.js';
+export declare const randomIsmConfig: (maxDepth?: number, validatorAddresses?: string[], relayerAddress?: string) => Exclude<IsmConfig, Address>;
 //# sourceMappingURL=HyperlaneIsmFactory.hardhat-test.d.ts.map

package/dist/ism/HyperlaneIsmFactory.hardhat-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneIsmFactory.hardhat-test.d.ts","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.hardhat-test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"HyperlaneIsmFactory.hardhat-test.d.ts","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.hardhat-test.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAA4B,MAAM,sBAAsB,CAAC;AAUzE,OAAO,EAEL,SAAS,EAMV,MAAM,YAAY,CAAC;AA6BpB,eAAO,MAAM,eAAe,2CAEL,MAAM,EAAE,mBACZ,MAAM,KACtB,QAAQ,SAAS,EAAE,OAAO,CAwC5B,CAAC"}

package/dist/ism/HyperlaneIsmFactory.hardhat-test.js

@@ -1,51 +1,57 @@
 /* eslint-disable no-console */
 import { expect } from 'chai';
 import hre from 'hardhat';
+import { randomElement, randomInt } from '@hyperlane-xyz/utils';
 import { TestChainName, testChains } from '../consts/testChains.js';
 import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
 import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
-import { randomAddress, randomInt } from '../test/testUtils.js';
+import { randomAddress } from '../test/testUtils.js';
 import { HyperlaneIsmFactory } from './HyperlaneIsmFactory.js';
 import { IsmType, ModuleType, } from './types.js';
 import { moduleMatchesConfig } from './utils.js';
 function randomModuleType() {
     const choices = [
         ModuleType.AGGREGATION,
-        ModuleType.MERKLE_ROOT_MULTISIG,
+        ModuleType.MESSAGE_ID_MULTISIG,
         ModuleType.ROUTING,
         ModuleType.NULL,
     ];
-    return choices[randomInt(choices.length)];
+    return randomElement(choices);
 }
-const randomMultisigIsmConfig = (m, n) => {
+const randomMultisigIsmConfig = (m, n, addresses) => {
     const emptyArray = new Array(n).fill(0);
-    const validators = emptyArray.map(() => randomAddress());
+    const validators = emptyArray
+        .map(() => (addresses ? randomElement(addresses) : randomAddress()))
+        .sort();
     return {
-        type: IsmType.MERKLE_ROOT_MULTISIG,
+        type: IsmType.MESSAGE_ID_MULTISIG,
         validators,
         threshold: m,
     };
 };
-const randomIsmConfig = (depth = 0, maxDepth = 2) => {
-    const moduleType = depth == maxDepth ? ModuleType.MERKLE_ROOT_MULTISIG : randomModuleType();
-    if (moduleType === ModuleType.MERKLE_ROOT_MULTISIG) {
-        const n = randomInt(5, 1);
-        return randomMultisigIsmConfig(randomInt(n, 1), n);
+export const randomIsmConfig = (maxDepth = 5, validatorAddresses, relayerAddress) => {
+    const moduleType = maxDepth === 0 ? ModuleType.MESSAGE_ID_MULTISIG : randomModuleType();
+    if (moduleType === ModuleType.MESSAGE_ID_MULTISIG) {
+        const n = randomInt(validatorAddresses?.length ?? 5, 1);
+        return randomMultisigIsmConfig(randomInt(n, 1), n, validatorAddresses);
     }
     else if (moduleType === ModuleType.ROUTING) {
         const config = {
             type: IsmType.ROUTING,
             owner: randomAddress(),
-            domains: Object.fromEntries(testChains.map((c) => [c, randomIsmConfig(depth + 1)])),
+            domains: Object.fromEntries(testChains.map((c) => [
+                c,
+                randomIsmConfig(maxDepth - 1, validatorAddresses, relayerAddress),
+            ])),
         };
         return config;
     }
     else if (moduleType === ModuleType.AGGREGATION) {
-        const n = randomInt(5, 1);
+        const n = randomInt(5, 2);
         const modules = new Array(n)
             .fill(0)
-            .map(() => randomIsmConfig(depth + 1));
+            .map(() => randomIsmConfig(maxDepth - 1, validatorAddresses, relayerAddress));
         const config = {
             type: IsmType.AGGREGATION,
             threshold: randomInt(n, 1),
@@ -56,7 +62,7 @@ const randomIsmConfig = (depth = 0, maxDepth = 2) => {
     else if (moduleType === ModuleType.NULL) {
         const config = {
             type: IsmType.TRUSTED_RELAYER,
-            relayer: randomAddress(),
+            relayer: relayerAddress ?? randomAddress(),
         };
         return config;
     }
@@ -87,7 +93,7 @@ describe('HyperlaneIsmFactory', async () => {
             type: IsmType.ROUTING,
             owner: await multiProvider.getSignerAddress(chain),
             domains: Object.fromEntries(testChains
-                .filter((c) => c !== TestChainName.test1)
+                .filter((c) => c !== TestChainName.test1 && c !== TestChainName.test4)
                 .map((c) => [c, randomMultisigIsmConfig(3, 5)])),
         };
     });