@hyperlane-xyz/sdk 1.4.3-beta1 → 1.4.3-beta2

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneIsmFactory.hardhat-test.js","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.hardhat-test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+BAA8B;AAC9B,qCAAiC;AAEjC,gDAA6C;AAE7C,6CAA8C;AAC9C,8DAA2D;AAC3D,iDAA6D;AAE7D,+DAG+B;AAC/B,+EAA4E;AAC5E,mCAMiB;AAEjB,SAAS,gBAAgB;IACvB,MAAM,OAAO,GAAG;QACd,kBAAU,CAAC,WAAW;QACtB,kBAAU,CAAC,oBAAoB;QAC/B,kBAAU,CAAC,OAAO;KACnB,CAAC;IACF,OAAO,OAAO,CAAC,IAAA,qBAAS,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,uBAAuB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAqB,EAAE;IAC1E,MAAM,UAAU,GAAG,IAAI,KAAK,CAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAA,yBAAa,GAAE,CAAC,CAAC;IACzD,OAAO;QACL,IAAI,EAAE,kBAAU,CAAC,oBAAoB;QACrC,UAAU;QACV,SAAS,EAAE,CAAC;KACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,QAAQ,GAAG,CAAC,EAAa,EAAE;IAC7D,MAAM,UAAU,GACd,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,kBAAU,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC3E,IAAI,UAAU,KAAK,kBAAU,CAAC,oBAAoB,EAAE;QAClD,MAAM,CAAC,GAAG,IAAA,qBAAS,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1B,OAAO,uBAAuB,CAAC,IAAA,qBAAS,EAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACpD;SAAM,IAAI,UAAU,KAAK,kBAAU,CAAC,OAAO,EAAE;QAC5C,MAAM,MAAM,GAAqB;YAC/B,IAAI,EAAE,kBAAU,CAAC,OAAO;YACxB,KAAK,EAAE,IAAA,yBAAa,GAAE;YACtB,OAAO,EAAE,MAAM,CAAC,WAAW,CACzB,mBAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CACvD;SACF,CAAC;QACF,OAAO,MAAM,CAAC;KACf;SAAM,IAAI,UAAU,KAAK,kBAAU,CAAC,WAAW,EAAE;QAChD,MAAM,CAAC,GAAG,IAAA,qBAAS,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1B,MAAM,OAAO,GAAG,IAAI,KAAK,CAAS,CAAC,CAAC;aACjC,IAAI,CAAC,CAAC,CAAC;aACP,GAAG,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,MAAM,GAAyB;YACnC,IAAI,EAAE,kBAAU,CAAC,WAAW;YAC5B,SAAS,EAAE,IAAA,qBAAS,EAAC,CAAC,EAAE,CAAC,CAAC;YAC1B,OAAO;SACR,CAAC;QACF,OAAO,MAAM,CAAC;KACf;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,UAAU,EAAE,CAAC,CAAC;KACxD;AACH,CAAC,CAAC;AAEF,QAAQ,CAAC,qBAAqB,EAAE,GAAS,EAAE;IACzC,IAAI,OAA4B,CAAC;IACjC,MAAM,KAAK,GAAG,OAAO,CAAC;IAEtB,MAAM,CAAC,GAAS,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAE3C,MAAM,aAAa,GAAG,6BAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAExE,MAAM,QAAQ,GAAG,IAAI,yDAA2B,CAAC,aAAa,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACjD,OAAO,GAAG,IAAI,yCAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAC9D,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,GAAS,EAAE;QACpC,MAAM,MAAM,GAAG,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,IAAA,yCAAmB,EACvC,KAAK,EACL,GAAG,CAAC,OAAO,EACX,MAAM,EACN,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAC5B,CAAC;QACF,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC7B,CAAC,CAAA,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;QAC3B,EAAE,CAAC,6BAA6B,EAAE,GAAS,EAAE;YAC3C,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;YACjC,IAAI,UAAkB,CAAC;YACvB,IAAI;gBACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBAChD,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC;aAC1B;YAAC,OAAO,CAAC,EAAE;gBACV,IAAA,aAAK,EAAC,oCAAoC,EAAE,CAAC,CAAC,CAAC;gBAC/C,IAAA,aAAK,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YAED,IAAI;gBACF,MAAM,OAAO,GAAG,MAAM,IAAA,yCAAmB,EACvC,KAAK,EACL,UAAU,EACV,MAAM,EACN,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAC5B,CAAC;gBACF,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;aAC5B;YAAC,OAAO,CAAC,EAAE;gBACV,IAAA,aAAK,EAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;gBAC9C,IAAA,aAAK,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAA,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"HyperlaneIsmFactory.hardhat-test.js","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.hardhat-test.ts"],"names":[],"mappings":"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"}

package/dist/ism/HyperlaneIsmFactory.js

@@ -1,24 +1,16 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectValidators = exports.moduleMatchesConfig = exports.moduleCanCertainlyVerify = exports.HyperlaneIsmFactory = void 0;
 const debug_1 = require("debug");
 const ethers_1 = require("ethers");
 const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
-const HyperlaneApp_1 = require("../HyperlaneApp");
+const HyperlaneApp_1 = require("../app/HyperlaneApp");
 const environments_1 = require("../consts/environments");
-const contracts_1 = require("../contracts");
+const contracts_1 = require("../contracts/contracts");
 const contracts_2 = require("./contracts");
 const types_1 = require("./types");
+// TODO this should handle cached addresses like the other deployers
 class HyperlaneIsmFactory extends HyperlaneApp_1.HyperlaneApp {
     static fromEnvironment(env, multiProvider) {
         const envAddresses = environments_1.hyperlaneEnvironments[env];
@@ -31,123 +23,113 @@ class HyperlaneIsmFactory extends HyperlaneApp_1.HyperlaneApp {
         const helper = (0, contracts_1.appFromAddressesMapHelper)(addressesMap, contracts_2.ismFactoryFactories, multiProvider);
         return new HyperlaneIsmFactory(helper.contractsMap, helper.multiProvider, (0, debug_1.debug)('hyperlane:IsmFactoryApp'));
     }
-    deploy(chain, config, origin) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (config.type === types_1.ModuleType.MERKLE_ROOT_MULTISIG ||
-                config.type === types_1.ModuleType.MESSAGE_ID_MULTISIG ||
-                config.type === types_1.ModuleType.LEGACY_MULTISIG) {
-                switch (config.type) {
-                    case types_1.ModuleType.LEGACY_MULTISIG:
-                        this.logger(`Deploying Legacy Multisig ISM to ${chain} for verifying ${origin}`);
-                        break;
-                    case types_1.ModuleType.MERKLE_ROOT_MULTISIG:
-                        this.logger(`Deploying Merkle Root Multisig ISM to ${chain} for verifying ${origin}`);
-                        break;
-                    case types_1.ModuleType.MESSAGE_ID_MULTISIG:
-                        this.logger(`Deploying Message ID Multisig ISM to ${chain} for verifying ${origin}`);
-                        break;
-                }
-                return this.deployMultisigIsm(chain, config, origin);
-            }
-            else if (config.type === types_1.ModuleType.ROUTING) {
-                this.logger(`Deploying Routing ISM to ${chain} for verifying ${Object.keys(config.domains)}`);
-                return this.deployRoutingIsm(chain, config);
-            }
-            else if (config.type === types_1.ModuleType.AGGREGATION) {
-                this.logger(`Deploying Aggregation ISM to ${chain}`);
-                return this.deployAggregationIsm(chain, config);
-            }
-            else {
-                throw new Error(`Unsupported ISM type`);
+    async deploy(chain, config, origin) {
+        if (config.type === types_1.ModuleType.MERKLE_ROOT_MULTISIG ||
+            config.type === types_1.ModuleType.MESSAGE_ID_MULTISIG ||
+            config.type === types_1.ModuleType.LEGACY_MULTISIG) {
+            switch (config.type) {
+                case types_1.ModuleType.LEGACY_MULTISIG:
+                    this.logger(`Deploying Legacy Multisig ISM to ${chain} for verifying ${origin}`);
+                    break;
+                case types_1.ModuleType.MERKLE_ROOT_MULTISIG:
+                    this.logger(`Deploying Merkle Root Multisig ISM to ${chain} for verifying ${origin}`);
+                    break;
+                case types_1.ModuleType.MESSAGE_ID_MULTISIG:
+                    this.logger(`Deploying Message ID Multisig ISM to ${chain} for verifying ${origin}`);
+                    break;
             }
-        });
+            return this.deployMultisigIsm(chain, config, origin);
+        }
+        else if (config.type === types_1.ModuleType.ROUTING) {
+            this.logger(`Deploying Routing ISM to ${chain} for verifying ${Object.keys(config.domains)}`);
+            return this.deployRoutingIsm(chain, config);
+        }
+        else if (config.type === types_1.ModuleType.AGGREGATION) {
+            this.logger(`Deploying Aggregation ISM to ${chain}`);
+            return this.deployAggregationIsm(chain, config);
+        }
+        else {
+            throw new Error(`Unsupported ISM type`);
+        }
     }
-    deployMultisigIsm(chain, config, origin) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signer = this.multiProvider.getSigner(chain);
-            let address;
-            if (config.type === types_1.ModuleType.LEGACY_MULTISIG) {
-                const multisig = yield new core_1.LegacyMultisigIsm__factory()
-                    .connect(signer)
-                    .deploy();
-                yield this.multiProvider.handleTx(chain, multisig.deployTransaction);
-                const originDomain = this.multiProvider.getDomainId(origin);
-                this.logger(`Enrolling validators for ${originDomain}`);
-                yield this.multiProvider.handleTx(chain, multisig.enrollValidators([originDomain], [config.validators]));
-                yield this.multiProvider.handleTx(chain, multisig.setThreshold(originDomain, config.threshold));
-                address = multisig.address;
-            }
-            else {
-                const multisigIsmFactory = config.type === types_1.ModuleType.MERKLE_ROOT_MULTISIG
-                    ? this.getContracts(chain).merkleRootMultisigIsmFactory
-                    : this.getContracts(chain).messageIdMultisigIsmFactory;
-                address = yield this.deployMOfNFactory(chain, multisigIsmFactory, config.validators, config.threshold);
-            }
-            return core_1.IMultisigIsm__factory.connect(address, signer);
-        });
+    async deployMultisigIsm(chain, config, origin) {
+        const signer = this.multiProvider.getSigner(chain);
+        let address;
+        if (config.type === types_1.ModuleType.LEGACY_MULTISIG) {
+            const multisig = await new core_1.LegacyMultisigIsm__factory()
+                .connect(signer)
+                .deploy();
+            await this.multiProvider.handleTx(chain, multisig.deployTransaction);
+            const originDomain = this.multiProvider.getDomainId(origin);
+            this.logger(`Enrolling validators for ${originDomain}`);
+            await this.multiProvider.handleTx(chain, multisig.enrollValidators([originDomain], [config.validators]));
+            await this.multiProvider.handleTx(chain, multisig.setThreshold(originDomain, config.threshold));
+            address = multisig.address;
+        }
+        else {
+            const multisigIsmFactory = config.type === types_1.ModuleType.MERKLE_ROOT_MULTISIG
+                ? this.getContracts(chain).merkleRootMultisigIsmFactory
+                : this.getContracts(chain).messageIdMultisigIsmFactory;
+            address = await this.deployMOfNFactory(chain, multisigIsmFactory, config.validators, config.threshold);
+        }
+        return core_1.IMultisigIsm__factory.connect(address, signer);
     }
-    deployRoutingIsm(chain, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signer = this.multiProvider.getSigner(chain);
-            const routingIsmFactory = this.getContracts(chain).routingIsmFactory;
-            const isms = {};
-            for (const origin of Object.keys(config.domains)) {
-                const ism = yield this.deploy(chain, config.domains[origin], origin);
-                isms[origin] = ism.address;
+    async deployRoutingIsm(chain, config) {
+        const signer = this.multiProvider.getSigner(chain);
+        const routingIsmFactory = this.getContracts(chain).routingIsmFactory;
+        const isms = {};
+        for (const origin of Object.keys(config.domains)) {
+            const ism = await this.deploy(chain, config.domains[origin], origin);
+            isms[origin] = ism.address;
+        }
+        const domains = Object.keys(isms).map((chain) => this.multiProvider.getDomainId(chain));
+        const submoduleAddresses = Object.values(isms);
+        const overrides = this.multiProvider.getTransactionOverrides(chain);
+        const tx = await routingIsmFactory.deploy(domains, submoduleAddresses, overrides);
+        const receipt = await this.multiProvider.handleTx(chain, tx);
+        // TODO: Break this out into a generalized function
+        const dispatchLogs = receipt.logs
+            .map((log) => {
+            try {
+                return routingIsmFactory.interface.parseLog(log);
             }
-            const domains = Object.keys(isms).map((chain) => this.multiProvider.getDomainId(chain));
-            const submoduleAddresses = Object.values(isms);
-            const overrides = this.multiProvider.getTransactionOverrides(chain);
-            const tx = yield routingIsmFactory.deploy(domains, submoduleAddresses, overrides);
-            const receipt = yield this.multiProvider.handleTx(chain, tx);
-            // TODO: Break this out into a generalized function
-            const dispatchLogs = receipt.logs
-                .map((log) => {
-                try {
-                    return routingIsmFactory.interface.parseLog(log);
-                }
-                catch (e) {
-                    return undefined;
-                }
-            })
-                .filter((log) => !!log && log.name === 'ModuleDeployed');
-            const moduleAddress = dispatchLogs[0].args['module'];
-            const routingIsm = core_1.DomainRoutingIsm__factory.connect(moduleAddress, this.multiProvider.getSigner(chain));
-            this.logger(`Transferring ownership of routing ISM to ${config.owner}`);
-            yield this.multiProvider.handleTx(chain, yield routingIsm.transferOwnership(config.owner, overrides));
-            const address = dispatchLogs[0].args['module'];
-            return core_1.IRoutingIsm__factory.connect(address, signer);
-        });
-    }
-    deployAggregationIsm(chain, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const signer = this.multiProvider.getSigner(chain);
-            const aggregationIsmFactory = this.getContracts(chain).aggregationIsmFactory;
-            const addresses = [];
-            for (const module of config.modules) {
-                addresses.push((yield this.deploy(chain, module)).address);
+            catch (e) {
+                return undefined;
             }
-            const address = yield this.deployMOfNFactory(chain, aggregationIsmFactory, addresses, config.threshold);
-            return core_1.IAggregationIsm__factory.connect(address, signer);
-        });
+        })
+            .filter((log) => !!log && log.name === 'ModuleDeployed');
+        const moduleAddress = dispatchLogs[0].args['module'];
+        const routingIsm = core_1.DomainRoutingIsm__factory.connect(moduleAddress, this.multiProvider.getSigner(chain));
+        this.logger(`Transferring ownership of routing ISM to ${config.owner}`);
+        await this.multiProvider.handleTx(chain, await routingIsm.transferOwnership(config.owner, overrides));
+        const address = dispatchLogs[0].args['module'];
+        return core_1.IRoutingIsm__factory.connect(address, signer);
     }
-    deployMOfNFactory(chain, factory, values, threshold) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sorted = [...values].sort();
-            const address = yield factory.getAddress(sorted, threshold);
-            const provider = this.multiProvider.getProvider(chain);
-            const code = yield provider.getCode(address);
-            if (code === '0x') {
-                this.logger(`Deploying new ${threshold} of ${values.length} address set to ${chain}`);
-                const overrides = this.multiProvider.getTransactionOverrides(chain);
-                const hash = yield factory.deploy(sorted, threshold, overrides);
-                yield this.multiProvider.handleTx(chain, hash);
-            }
-            else {
-                this.logger(`Recovered ${threshold} of ${values.length} address set on ${chain}`);
-            }
-            return address;
-        });
+    async deployAggregationIsm(chain, config) {
+        const signer = this.multiProvider.getSigner(chain);
+        const aggregationIsmFactory = this.getContracts(chain).aggregationIsmFactory;
+        const addresses = [];
+        for (const module of config.modules) {
+            addresses.push((await this.deploy(chain, module)).address);
+        }
+        const address = await this.deployMOfNFactory(chain, aggregationIsmFactory, addresses, config.threshold);
+        return core_1.IAggregationIsm__factory.connect(address, signer);
+    }
+    async deployMOfNFactory(chain, factory, values, threshold) {
+        const sorted = [...values].sort();
+        const address = await factory.getAddress(sorted, threshold);
+        const provider = this.multiProvider.getProvider(chain);
+        const code = await provider.getCode(address);
+        if (code === '0x') {
+            this.logger(`Deploying new ${threshold} of ${values.length} address set to ${chain}`);
+            const overrides = this.multiProvider.getTransactionOverrides(chain);
+            const hash = await factory.deploy(sorted, threshold, overrides);
+            await this.multiProvider.handleTx(chain, hash);
+        }
+        else {
+            this.logger(`Recovered ${threshold} of ${values.length} address set on ${chain}`);
+        }
+        return address;
     }
 }
 exports.HyperlaneIsmFactory = HyperlaneIsmFactory;
@@ -156,155 +138,151 @@ exports.HyperlaneIsmFactory = HyperlaneIsmFactory;
 // This can happen if, for example, the module has sender, recipient, or
 // body specific logic, as the sample message used when querying the ISM
 // sets all of these to zero.
-function moduleCanCertainlyVerify(destModule, multiProvider, origin, destination) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const message = (0, utils_1.formatMessage)(0, 0, multiProvider.getDomainId(origin), ethers_1.ethers.constants.AddressZero, multiProvider.getDomainId(destination), ethers_1.ethers.constants.AddressZero, '0x');
-        const provider = multiProvider.getSignerOrProvider(destination);
-        if (typeof destModule === 'string') {
-            const module = core_1.IInterchainSecurityModule__factory.connect(destModule, provider);
-            try {
-                const moduleType = yield module.moduleType();
-                if (moduleType === types_1.ModuleType.MERKLE_ROOT_MULTISIG ||
-                    moduleType === types_1.ModuleType.LEGACY_MULTISIG ||
-                    moduleType === types_1.ModuleType.MESSAGE_ID_MULTISIG) {
-                    const multisigModule = core_1.IMultisigIsm__factory.connect(destModule, provider);
-                    const [, threshold] = yield multisigModule.validatorsAndThreshold(message);
-                    return threshold > 0;
-                }
-                else if (moduleType === types_1.ModuleType.ROUTING) {
-                    const routingIsm = core_1.IRoutingIsm__factory.connect(destModule, provider);
-                    const subModule = yield routingIsm.route(message);
-                    return moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
-                }
-                else if (moduleType === types_1.ModuleType.AGGREGATION) {
-                    const aggregationIsm = core_1.IAggregationIsm__factory.connect(destModule, provider);
-                    const [subModules, threshold] = yield aggregationIsm.modulesAndThreshold(message);
-                    let verified = 0;
-                    for (const subModule of subModules) {
-                        const canVerify = yield moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
-                        if (canVerify) {
-                            verified += 1;
-                        }
+async function moduleCanCertainlyVerify(destModule, multiProvider, origin, destination) {
+    const message = (0, utils_1.formatMessage)(0, 0, multiProvider.getDomainId(origin), ethers_1.ethers.constants.AddressZero, multiProvider.getDomainId(destination), ethers_1.ethers.constants.AddressZero, '0x');
+    const provider = multiProvider.getSignerOrProvider(destination);
+    if (typeof destModule === 'string') {
+        const module = core_1.IInterchainSecurityModule__factory.connect(destModule, provider);
+        try {
+            const moduleType = await module.moduleType();
+            if (moduleType === types_1.ModuleType.MERKLE_ROOT_MULTISIG ||
+                moduleType === types_1.ModuleType.LEGACY_MULTISIG ||
+                moduleType === types_1.ModuleType.MESSAGE_ID_MULTISIG) {
+                const multisigModule = core_1.IMultisigIsm__factory.connect(destModule, provider);
+                const [, threshold] = await multisigModule.validatorsAndThreshold(message);
+                return threshold > 0;
+            }
+            else if (moduleType === types_1.ModuleType.ROUTING) {
+                const routingIsm = core_1.IRoutingIsm__factory.connect(destModule, provider);
+                const subModule = await routingIsm.route(message);
+                return moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
+            }
+            else if (moduleType === types_1.ModuleType.AGGREGATION) {
+                const aggregationIsm = core_1.IAggregationIsm__factory.connect(destModule, provider);
+                const [subModules, threshold] = await aggregationIsm.modulesAndThreshold(message);
+                let verified = 0;
+                for (const subModule of subModules) {
+                    const canVerify = await moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
+                    if (canVerify) {
+                        verified += 1;
                     }
-                    return verified >= threshold;
-                }
-                else {
-                    throw new Error(`Unsupported module type: ${moduleType}`);
                 }
+                return verified >= threshold;
             }
-            catch (e) {
-                (0, utils_1.warn)(`Error checking module ${destModule}: ${e}`);
-                return false;
+            else {
+                throw new Error(`Unsupported module type: ${moduleType}`);
             }
         }
-        else {
-            // destModule is an IsmConfig
-            switch (destModule.type) {
-                case types_1.ModuleType.MERKLE_ROOT_MULTISIG:
-                case types_1.ModuleType.MESSAGE_ID_MULTISIG:
-                case types_1.ModuleType.LEGACY_MULTISIG:
-                    return destModule.threshold > 0;
-                case types_1.ModuleType.ROUTING:
-                    return moduleCanCertainlyVerify(destModule.domains[destination], multiProvider, origin, destination);
-                case types_1.ModuleType.AGGREGATION: {
-                    let verified = 0;
-                    for (const subModule of destModule.modules) {
-                        const canVerify = yield moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
-                        if (canVerify) {
-                            verified += 1;
-                        }
+        catch (e) {
+            (0, utils_1.warn)(`Error checking module ${destModule}: ${e}`);
+            return false;
+        }
+    }
+    else {
+        // destModule is an IsmConfig
+        switch (destModule.type) {
+            case types_1.ModuleType.MERKLE_ROOT_MULTISIG:
+            case types_1.ModuleType.MESSAGE_ID_MULTISIG:
+            case types_1.ModuleType.LEGACY_MULTISIG:
+                return destModule.threshold > 0;
+            case types_1.ModuleType.ROUTING:
+                return moduleCanCertainlyVerify(destModule.domains[destination], multiProvider, origin, destination);
+            case types_1.ModuleType.AGGREGATION: {
+                let verified = 0;
+                for (const subModule of destModule.modules) {
+                    const canVerify = await moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
+                    if (canVerify) {
+                        verified += 1;
                     }
-                    return verified >= destModule.threshold;
                 }
+                return verified >= destModule.threshold;
             }
         }
-    });
+    }
 }
 exports.moduleCanCertainlyVerify = moduleCanCertainlyVerify;
-function moduleMatchesConfig(chain, moduleAddress, config, multiProvider, contracts, origin) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const provider = multiProvider.getProvider(chain);
-        const module = core_1.IInterchainSecurityModule__factory.connect(moduleAddress, provider);
-        const actualType = yield module.moduleType();
-        if (actualType !== config.type)
-            return false;
-        let matches = true;
-        switch (config.type) {
-            case types_1.ModuleType.MERKLE_ROOT_MULTISIG: {
-                // A MerkleRootMultisigIsm matches if validators and threshold match the config
-                const expectedAddress = yield contracts.merkleRootMultisigIsmFactory.getAddress(config.validators.sort(), config.threshold);
-                matches = (0, utils_1.eqAddress)(expectedAddress, module.address);
-                break;
-            }
-            case types_1.ModuleType.MESSAGE_ID_MULTISIG: {
-                // A MessageIdMultisigIsm matches if validators and threshold match the config
-                const expectedAddress = yield contracts.messageIdMultisigIsmFactory.getAddress(config.validators.sort(), config.threshold);
-                matches = (0, utils_1.eqAddress)(expectedAddress, module.address);
-                break;
-            }
-            case types_1.ModuleType.LEGACY_MULTISIG: {
-                const multisigIsm = core_1.LegacyMultisigIsm__factory.connect(moduleAddress, provider);
-                if (!origin) {
-                    throw new Error("Can't check legacy multisig without origin");
-                }
-                const originDomain = multiProvider.getDomainId(origin);
-                const validators = yield multisigIsm.validators(originDomain);
-                const threshold = yield multisigIsm.threshold(originDomain);
-                matches =
-                    JSON.stringify(config.validators.map((s) => s.toLowerCase()).sort()) ===
-                        JSON.stringify(validators.map((s) => s.toLowerCase()).sort()) &&
-                        config.threshold === threshold;
-                break;
-            }
-            case types_1.ModuleType.ROUTING: {
-                // A RoutingIsm matches if:
-                //   1. The set of domains in the config equals those on-chain
-                //   2. The modules for each domain match the config
-                // TODO: Check (1)
-                const routingIsm = core_1.DomainRoutingIsm__factory.connect(moduleAddress, provider);
-                // Check that the RoutingISM owner matches the config
-                const owner = yield routingIsm.owner();
-                matches = matches && (0, utils_1.eqAddress)(owner, config.owner);
-                // Recursively check that the submodule for each configured
-                // domain matches the submodule config.
-                for (const [origin, subConfig] of Object.entries(config.domains)) {
-                    const subModule = yield routingIsm.modules(multiProvider.getDomainId(origin));
-                    const subModuleMatches = yield moduleMatchesConfig(chain, subModule, subConfig, multiProvider, contracts, origin);
-                    matches = matches && subModuleMatches;
-                }
-                break;
+async function moduleMatchesConfig(chain, moduleAddress, config, multiProvider, contracts, origin) {
+    const provider = multiProvider.getProvider(chain);
+    const module = core_1.IInterchainSecurityModule__factory.connect(moduleAddress, provider);
+    const actualType = await module.moduleType();
+    if (actualType !== config.type)
+        return false;
+    let matches = true;
+    switch (config.type) {
+        case types_1.ModuleType.MERKLE_ROOT_MULTISIG: {
+            // A MerkleRootMultisigIsm matches if validators and threshold match the config
+            const expectedAddress = await contracts.merkleRootMultisigIsmFactory.getAddress(config.validators.sort(), config.threshold);
+            matches = (0, utils_1.eqAddress)(expectedAddress, module.address);
+            break;
+        }
+        case types_1.ModuleType.MESSAGE_ID_MULTISIG: {
+            // A MessageIdMultisigIsm matches if validators and threshold match the config
+            const expectedAddress = await contracts.messageIdMultisigIsmFactory.getAddress(config.validators.sort(), config.threshold);
+            matches = (0, utils_1.eqAddress)(expectedAddress, module.address);
+            break;
+        }
+        case types_1.ModuleType.LEGACY_MULTISIG: {
+            const multisigIsm = core_1.LegacyMultisigIsm__factory.connect(moduleAddress, provider);
+            if (!origin) {
+                throw new Error("Can't check legacy multisig without origin");
             }
-            case types_1.ModuleType.AGGREGATION: {
-                // An AggregationIsm matches if:
-                //   1. The threshold matches the config
-                //   2. There is a bijection between on and off-chain configured modules
-                const aggregationIsm = core_1.StaticAggregationIsm__factory.connect(moduleAddress, provider);
-                const [subModules, threshold] = yield aggregationIsm.modulesAndThreshold('0x');
-                matches = matches && threshold === config.threshold;
-                matches = matches && subModules.length === config.modules.length;
-                const configIndexMatched = new Map();
-                for (const subModule of subModules) {
-                    const subModuleMatchesConfig = yield Promise.all(config.modules.map((c) => moduleMatchesConfig(chain, subModule, c, multiProvider, contracts)));
-                    // The submodule returned by the ISM must match exactly one
-                    // entry in the config.
-                    const count = subModuleMatchesConfig.filter(Boolean).length;
-                    matches = matches && count === 1;
-                    // That entry in the config should not have been matched already.
-                    subModuleMatchesConfig.forEach((matched, index) => {
-                        if (matched) {
-                            matches = matches && !configIndexMatched.has(index);
-                            configIndexMatched.set(index, true);
-                        }
-                    });
-                }
-                break;
+            const originDomain = multiProvider.getDomainId(origin);
+            const validators = await multisigIsm.validators(originDomain);
+            const threshold = await multisigIsm.threshold(originDomain);
+            matches =
+                JSON.stringify(config.validators.map((s) => s.toLowerCase()).sort()) ===
+                    JSON.stringify(validators.map((s) => s.toLowerCase()).sort()) &&
+                    config.threshold === threshold;
+            break;
+        }
+        case types_1.ModuleType.ROUTING: {
+            // A RoutingIsm matches if:
+            //   1. The set of domains in the config equals those on-chain
+            //   2. The modules for each domain match the config
+            // TODO: Check (1)
+            const routingIsm = core_1.DomainRoutingIsm__factory.connect(moduleAddress, provider);
+            // Check that the RoutingISM owner matches the config
+            const owner = await routingIsm.owner();
+            matches = matches && (0, utils_1.eqAddress)(owner, config.owner);
+            // Recursively check that the submodule for each configured
+            // domain matches the submodule config.
+            for (const [origin, subConfig] of Object.entries(config.domains)) {
+                const subModule = await routingIsm.modules(multiProvider.getDomainId(origin));
+                const subModuleMatches = await moduleMatchesConfig(chain, subModule, subConfig, multiProvider, contracts, origin);
+                matches = matches && subModuleMatches;
             }
-            default: {
-                throw new Error('Unsupported ModuleType');
+            break;
+        }
+        case types_1.ModuleType.AGGREGATION: {
+            // An AggregationIsm matches if:
+            //   1. The threshold matches the config
+            //   2. There is a bijection between on and off-chain configured modules
+            const aggregationIsm = core_1.StaticAggregationIsm__factory.connect(moduleAddress, provider);
+            const [subModules, threshold] = await aggregationIsm.modulesAndThreshold('0x');
+            matches = matches && threshold === config.threshold;
+            matches = matches && subModules.length === config.modules.length;
+            const configIndexMatched = new Map();
+            for (const subModule of subModules) {
+                const subModuleMatchesConfig = await Promise.all(config.modules.map((c) => moduleMatchesConfig(chain, subModule, c, multiProvider, contracts)));
+                // The submodule returned by the ISM must match exactly one
+                // entry in the config.
+                const count = subModuleMatchesConfig.filter(Boolean).length;
+                matches = matches && count === 1;
+                // That entry in the config should not have been matched already.
+                subModuleMatchesConfig.forEach((matched, index) => {
+                    if (matched) {
+                        matches = matches && !configIndexMatched.has(index);
+                        configIndexMatched.set(index, true);
+                    }
+                });
             }
+            break;
         }
-        return matches;
-    });
+        default: {
+            throw new Error('Unsupported ModuleType');
+        }
+    }
+    return matches;
 }
 exports.moduleMatchesConfig = moduleMatchesConfig;
 function collectValidators(origin, config) {