@hyperlane-xyz/sdk 1.4.1 → 1.4.3-beta0

package/dist/router/HyperlaneRouterChecker.js

@@ -1,13 +1,4 @@
 "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.HyperlaneRouterChecker = void 0;
 const ethers_1 = require("ethers");
@@ -15,50 +6,45 @@ const utils_1 = require("@hyperlane-xyz/utils");
 const HyperlaneAppChecker_1 = require("../deploy/HyperlaneAppChecker");
 const types_1 = require("./types");
 class HyperlaneRouterChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
-    checkOwnership(chain) {
-        const owner = this.configMap[chain].owner;
-        return super.checkOwnership(chain, owner);
+    async checkChain(chain) {
+        await this.checkHyperlaneConnectionClient(chain);
+        await this.checkEnrolledRouters(chain);
+        await super.checkOwnership(chain, this.configMap[chain].owner);
     }
-    checkChain(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.checkHyperlaneConnectionClient(chain);
-            yield this.checkEnrolledRouters(chain);
-            yield this.checkOwnership(chain);
-        });
+    async checkHyperlaneConnectionClient(chain) {
+        const router = this.app.router(this.app.getContracts(chain));
+        const checkConnectionClientProperty = async (property, violationType) => {
+            const actual = await router[property]();
+            // TODO: check for IsmConfig
+            const value = this.configMap[chain][property];
+            if (value && typeof value === 'object')
+                throw new Error('ISM as object unimplemented');
+            const expected = value && typeof value === 'string'
+                ? value
+                : ethers_1.ethers.constants.AddressZero;
+            if (!utils_1.utils.eqAddress(actual, expected)) {
+                const violation = {
+                    chain,
+                    type: violationType,
+                    contract: router,
+                    actual,
+                    expected,
+                };
+                this.addViolation(violation);
+            }
+        };
+        await checkConnectionClientProperty('mailbox', types_1.ConnectionClientViolationType.Mailbox);
+        await checkConnectionClientProperty('interchainGasPaymaster', types_1.ConnectionClientViolationType.InterchainGasPaymaster);
+        await checkConnectionClientProperty('interchainSecurityModule', types_1.ConnectionClientViolationType.InterchainSecurityModule);
     }
-    checkHyperlaneConnectionClient(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const router = this.app.router(this.app.getContracts(chain));
-            const checkConnectionClientProperty = (property, violationType) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const actual = yield router[property]();
-                const expected = (_a = this.configMap[chain][property]) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.AddressZero;
-                if (!utils_1.utils.eqAddress(actual, expected)) {
-                    const violation = {
-                        chain,
-                        type: violationType,
-                        contract: router,
-                        actual,
-                        expected,
-                    };
-                    this.addViolation(violation);
-                }
-            });
-            yield checkConnectionClientProperty('mailbox', types_1.ConnectionClientViolationType.Mailbox);
-            yield checkConnectionClientProperty('interchainGasPaymaster', types_1.ConnectionClientViolationType.InterchainGasPaymaster);
-            yield checkConnectionClientProperty('interchainSecurityModule', types_1.ConnectionClientViolationType.InterchainSecurityModule);
-        });
-    }
-    checkEnrolledRouters(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const router = this.app.router(this.app.getContracts(chain));
-            yield Promise.all(this.app.remoteChains(chain).map((remoteChain) => __awaiter(this, void 0, void 0, function* () {
-                const remoteRouter = this.app.router(this.app.getContracts(remoteChain));
-                const remoteDomainId = this.multiProvider.getDomainId(remoteChain);
-                const address = yield router.routers(remoteDomainId);
-                utils_1.utils.assert(address === utils_1.utils.addressToBytes32(remoteRouter.address));
-            })));
-        });
+    async checkEnrolledRouters(chain) {
+        const router = this.app.router(this.app.getContracts(chain));
+        await Promise.all(this.app.remoteChains(chain).map(async (remoteChain) => {
+            const remoteRouter = this.app.router(this.app.getContracts(remoteChain));
+            const remoteDomainId = this.multiProvider.getDomainId(remoteChain);
+            const address = await router.routers(remoteDomainId);
+            utils_1.utils.assert(address === utils_1.utils.addressToBytes32(remoteRouter.address));
+        }));
     }
 }
 exports.HyperlaneRouterChecker = HyperlaneRouterChecker;

package/dist/router/HyperlaneRouterChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,gDAA6C;AAG7C,uEAAoE;AAIpE,mCAMiB;AAEjB,MAAa,sBAIX,SAAQ,yCAAgC;IACxC,cAAc,CAAC,KAAgB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC1C,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEK,UAAU,CAAC,KAAgB;;YAC/B,MAAM,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;KAAA;IAEK,8BAA8B,CAAC,KAAgB;;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YAE7D,MAAM,6BAA6B,GAAG,CACpC,QAAwD,EACxD,aAA4C,EAC5C,EAAE;;gBACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACxC,MAAM,QAAQ,GACZ,MAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,mCAAI,eAAM,CAAC,SAAS,CAAC,WAAW,CAAC;gBAClE,IAAI,CAAC,aAAK,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACtC,MAAM,SAAS,GAA8B;wBAC3C,KAAK;wBACL,IAAI,EAAE,aAAa;wBACnB,QAAQ,EAAE,MAAM;wBAChB,MAAM;wBACN,QAAQ;qBACT,CAAC;oBACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAA,CAAC;YAEF,MAAM,6BAA6B,CACjC,SAAS,EACT,qCAA6B,CAAC,OAAO,CACtC,CAAC;YACF,MAAM,6BAA6B,CACjC,wBAAwB,EACxB,qCAA6B,CAAC,sBAAsB,CACrD,CAAC;YACF,MAAM,6BAA6B,CACjC,0BAA0B,EAC1B,qCAA6B,CAAC,wBAAwB,CACvD,CAAC;QACJ,CAAC;KAAA;IAEK,oBAAoB,CAAC,KAAgB;;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YAE7D,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAClC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CACnC,CAAC;gBACF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBACnE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBACrD,aAAK,CAAC,MAAM,CAAC,OAAO,KAAK,aAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;CACF;AAlED,wDAkEC"}
+{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,gDAA6C;AAG7C,uEAAoE;AAIpE,mCAMiB;AAEjB,MAAa,sBAIX,SAAQ,yCAAgC;IACxC,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,MAAM,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,KAAgB;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,MAAM,6BAA6B,GAAG,KAAK,EACzC,QAAwD,EACxD,aAA4C,EAC5C,EAAE;YACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,4BAA4B;YAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBACpC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjD,MAAM,QAAQ,GACZ,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAChC,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,WAAW,CAAC;YACnC,IAAI,CAAC,aAAK,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACtC,MAAM,SAAS,GAA8B;oBAC3C,KAAK;oBACL,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,MAAM;oBAChB,MAAM;oBACN,QAAQ;iBACT,CAAC;gBACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;aAC9B;QACH,CAAC,CAAC;QAEF,MAAM,6BAA6B,CACjC,SAAS,EACT,qCAA6B,CAAC,OAAO,CACtC,CAAC;QACF,MAAM,6BAA6B,CACjC,wBAAwB,EACxB,qCAA6B,CAAC,sBAAsB,CACrD,CAAC;QACF,MAAM,6BAA6B,CACjC,0BAA0B,EAC1B,qCAA6B,CAAC,wBAAwB,CACvD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAAgB;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAClC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CACnC,CAAC;YACF,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrD,aAAK,CAAC,MAAM,CAAC,OAAO,KAAK,aAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAnED,wDAmEC"}

package/dist/router/HyperlaneRouterDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EACP,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAS,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAEnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAK3D,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CvD,qBAAqB,CACzB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAQV,mBAAmB,CACvB,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACnB,cAAc,GAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAM,GAC3C,OAAO,CAAC,IAAI,CAAC;IAyDV,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAUV,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;CA0B7C"}
+{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,MAAM,EACP,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAS,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAEnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAK3D,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyDvD,qBAAqB,CACzB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAQV,mBAAmB,CACvB,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACnB,cAAc,GAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAM,GAC3C,OAAO,CAAC,IAAI,CAAC;IAyDV,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAUV,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;CA2B7C"}

package/dist/router/HyperlaneRouterDeployer.js

@@ -1,15 +1,7 @@
 "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.HyperlaneRouterDeployer = void 0;
+const ethers_1 = require("ethers");
 const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const contracts_1 = require("../contracts");
@@ -20,111 +12,101 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
     // The ISM check does not appropriately handle ISMs that have sender,
     // recipient, or body-specific logic. Folks that wish to deploy using
     // such ISMs *may* need to override checkConfig to disable this check.
-    checkConfig(configMap) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const [local, config] of Object.entries(configMap)) {
-                const signerOrProvider = this.multiProvider.getSignerOrProvider(local);
-                const localIgp = core_1.IInterchainGasPaymaster__factory.connect(config.interchainGasPaymaster, signerOrProvider);
-                const localMailbox = core_1.Mailbox__factory.connect(config.mailbox, signerOrProvider);
-                const localIsm = (_a = config.interchainSecurityModule) !== null && _a !== void 0 ? _a : (yield localMailbox.defaultIsm());
-                const remotes = Object.keys(configMap).filter((c) => c !== local);
-                for (const remote of remotes) {
-                    // Try to confirm that the IGP supports delivery to all remotes
-                    try {
-                        yield localIgp.quoteGasPayment(this.multiProvider.getDomainId(remote), 1);
-                    }
-                    catch (e) {
-                        throw new Error(`The specified or default IGP with address ${localIgp.address} on ` +
-                            `${local} is not configured to deliver messages to ${remote}, ` +
-                            `did you mean to specify a different one?`);
-                    }
-                    // Try to confirm that the specified or default ISM can verify messages to all remotes
-                    const canVerify = yield (0, HyperlaneIsmFactory_1.moduleCanCertainlyVerify)(localIsm, this.multiProvider, remote, local);
-                    if (!canVerify) {
-                        throw new Error(`The specified or default ISM with address ${localIsm} on ${local} ` +
-                            `cannot verify messages from ${remote}, did you forget to ` +
-                            `specify an ISM, or mean to specify a different one?`);
-                    }
-                }
+    async checkConfig(configMap) {
+        for (const [local, config] of Object.entries(configMap)) {
+            this.logger(`Checking config for ${local}...`);
+            const signerOrProvider = this.multiProvider.getSignerOrProvider(local);
+            const localIgp = core_1.IInterchainGasPaymaster__factory.connect(config.interchainGasPaymaster, signerOrProvider);
+            const localMailbox = core_1.Mailbox__factory.connect(config.mailbox, signerOrProvider);
+            let localIsm;
+            if (!config.interchainSecurityModule ||
+                config.interchainSecurityModule === ethers_1.ethers.constants.AddressZero) {
+                localIsm = await localMailbox.defaultIsm();
             }
-        });
-    }
-    initConnectionClients(contractsMap, configMap) {
-        const _super = Object.create(null, {
-            initConnectionClient: { get: () => super.initConnectionClient }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const chain of Object.keys(contractsMap)) {
-                const contracts = contractsMap[chain];
-                const config = configMap[chain];
-                yield _super.initConnectionClient.call(this, chain, this.router(contracts), config);
+            else {
+                localIsm = config.interchainSecurityModule;
             }
-        });
-    }
-    enrollRemoteRouters(deployedContractsMap, _, foreignRouters = {}) {
-        const _super = Object.create(null, {
-            runIfOwner: { get: () => super.runIfOwner }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger(`Enrolling deployed routers with each other (if not already)...`);
-            // Make all routers aware of each other.
-            // Routers that were deployed.
-            const deployedRouters = (0, objects_1.objMap)(deployedContractsMap, (_, contracts) => this.router(contracts).address);
-            // All routers, including those that were deployed and those with existing deployments.
-            const allRouters = (0, objects_1.objMerge)(deployedRouters, foreignRouters);
-            const allChains = Object.keys(allRouters);
-            for (const [chain, contracts] of Object.entries(deployedContractsMap)) {
-                const allRemoteChains = this.multiProvider
-                    .getRemoteChains(chain)
-                    .filter((c) => allChains.includes(c));
-                const enrollEntries = yield Promise.all(allRemoteChains.map((remote) => __awaiter(this, void 0, void 0, function* () {
-                    const remoteDomain = this.multiProvider.getDomainId(remote);
-                    const current = yield this.router(contracts).routers(remoteDomain);
-                    const expected = utils_1.utils.addressToBytes32(allRouters[remote]);
-                    return current !== expected ? [remoteDomain, expected] : undefined;
-                })));
-                const entries = enrollEntries.filter((entry) => entry !== undefined);
-                const domains = entries.map(([id]) => id);
-                const addresses = entries.map(([, address]) => address);
-                // skip if no enrollments are needed
-                if (domains.length === 0) {
-                    continue;
+            const remotes = Object.keys(configMap).filter((c) => c !== local);
+            for (const remote of remotes) {
+                this.logger(`Checking origin ${remote}...`);
+                // Try to confirm that the IGP supports delivery to all remotes
+                try {
+                    await localIgp.quoteGasPayment(this.multiProvider.getDomainId(remote), 1);
+                }
+                catch (e) {
+                    throw new Error(`The specified or default IGP with address ${localIgp.address} on ` +
+                        `${local} is not configured to deliver messages to ${remote}, ` +
+                        `did you mean to specify a different one?`);
+                }
+                // Try to confirm that the specified or default ISM can verify messages to all remotes
+                const canVerify = await (0, HyperlaneIsmFactory_1.moduleCanCertainlyVerify)(localIsm, this.multiProvider, remote, local);
+                if (!canVerify) {
+                    throw new Error(`The specified or default ISM with address ${localIsm} on ${local} ` +
+                        `cannot verify messages from ${remote}, did you forget to ` +
+                        `specify an ISM, or mean to specify a different one?`);
                 }
-                yield _super.runIfOwner.call(this, chain, this.router(contracts), () => __awaiter(this, void 0, void 0, function* () {
-                    const chains = domains.map((id) => this.multiProvider.getChainName(id));
-                    this.logger(`Enrolling remote routers (${chains.join(', ')}) on ${chain}`);
-                    yield this.multiProvider.handleTx(chain, this.router(contracts).enrollRemoteRouters(domains, addresses, this.multiProvider.getTransactionOverrides(chain)));
-                }));
             }
-        });
+        }
+    }
+    async initConnectionClients(contractsMap, configMap) {
+        for (const chain of Object.keys(contractsMap)) {
+            const contracts = contractsMap[chain];
+            const config = configMap[chain];
+            await super.initConnectionClient(chain, this.router(contracts), config);
+        }
     }
-    transferOwnership(contractsMap, configMap) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger(`Transferring ownership of ownables...`);
-            for (const chain of Object.keys(contractsMap)) {
-                const contracts = contractsMap[chain];
-                const owner = configMap[chain].owner;
-                const ownables = yield (0, contracts_1.filterOwnableContracts)(contracts);
-                yield this.transferOwnershipOfContracts(chain, owner, ownables);
+    async enrollRemoteRouters(deployedContractsMap, _, foreignRouters = {}) {
+        this.logger(`Enrolling deployed routers with each other (if not already)...`);
+        // Make all routers aware of each other.
+        // Routers that were deployed.
+        const deployedRouters = (0, objects_1.objMap)(deployedContractsMap, (_, contracts) => this.router(contracts).address);
+        // All routers, including those that were deployed and those with existing deployments.
+        const allRouters = (0, objects_1.objMerge)(deployedRouters, foreignRouters);
+        const allChains = Object.keys(allRouters);
+        for (const [chain, contracts] of Object.entries(deployedContractsMap)) {
+            const allRemoteChains = this.multiProvider
+                .getRemoteChains(chain)
+                .filter((c) => allChains.includes(c));
+            const enrollEntries = await Promise.all(allRemoteChains.map(async (remote) => {
+                const remoteDomain = this.multiProvider.getDomainId(remote);
+                const current = await this.router(contracts).routers(remoteDomain);
+                const expected = utils_1.utils.addressToBytes32(allRouters[remote]);
+                return current !== expected ? [remoteDomain, expected] : undefined;
+            }));
+            const entries = enrollEntries.filter((entry) => entry !== undefined);
+            const domains = entries.map(([id]) => id);
+            const addresses = entries.map(([, address]) => address);
+            // skip if no enrollments are needed
+            if (domains.length === 0) {
+                continue;
             }
-        });
+            await super.runIfOwner(chain, this.router(contracts), async () => {
+                const chains = domains.map((id) => this.multiProvider.getChainName(id));
+                this.logger(`Enrolling remote routers (${chains.join(', ')}) on ${chain}`);
+                await this.multiProvider.handleTx(chain, this.router(contracts).enrollRemoteRouters(domains, addresses, this.multiProvider.getTransactionOverrides(chain)));
+            });
+        }
+    }
+    async transferOwnership(contractsMap, configMap) {
+        this.logger(`Transferring ownership of ownables...`);
+        for (const chain of Object.keys(contractsMap)) {
+            const contracts = contractsMap[chain];
+            const owner = configMap[chain].owner;
+            const ownables = await (0, contracts_1.filterOwnableContracts)(contracts);
+            await this.transferOwnershipOfContracts(chain, owner, ownables);
+        }
     }
-    deploy(configMap) {
-        const _super = Object.create(null, {
-            deploy: { get: () => super.deploy }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            // Only deploy on chains that don't have foreign deployments.
-            const configMapToDeploy = (0, objects_1.objFilter)(configMap, (_chainName, config) => !config.foreignDeployment);
-            // Create a map of chains that have foreign deployments.
-            const foreignDeployments = (0, objects_1.objFilter)((0, objects_1.objMap)(configMap, (_, config) => config.foreignDeployment), (_chainName, foreignDeployment) => foreignDeployment !== undefined);
-            const deployedContractsMap = yield _super.deploy.call(this, configMapToDeploy);
-            yield this.enrollRemoteRouters(deployedContractsMap, configMap, foreignDeployments);
-            yield this.initConnectionClients(deployedContractsMap, configMap);
-            yield this.transferOwnership(deployedContractsMap, configMap);
-            return deployedContractsMap;
-        });
+    async deploy(configMap) {
+        // Only deploy on chains that don't have foreign deployments.
+        const configMapToDeploy = (0, objects_1.objFilter)(configMap, (_chainName, config) => !config.foreignDeployment);
+        // Create a map of chains that have foreign deployments.
+        const foreignDeployments = (0, objects_1.objFilter)((0, objects_1.objMap)(configMap, (_, config) => config.foreignDeployment), (_chainName, foreignDeployment) => foreignDeployment !== undefined);
+        const deployedContractsMap = await super.deploy(configMapToDeploy);
+        await this.enrollRemoteRouters(deployedContractsMap, configMap, foreignDeployments);
+        await this.initConnectionClients(deployedContractsMap, configMap);
+        await this.transferOwnership(deployedContractsMap, configMap);
+        this.logger(`Finished deploying router contracts for all chains.`);
+        return deployedContractsMap;
     }
 }
 exports.HyperlaneRouterDeployer = HyperlaneRouterDeployer;

package/dist/router/HyperlaneRouterDeployer.js.map

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

package/dist/router/ProxiedRouterChecker.d.ts

@@ -1,8 +1,9 @@
 import { ChainName } from '../types';
 import { HyperlaneRouterChecker } from './HyperlaneRouterChecker';
 import { RouterApp } from './RouterApps';
-import { ProxiedFactories, RouterConfig } from './types';
-export declare abstract class ProxiedRouterChecker<Factories extends ProxiedFactories, App extends RouterApp<Factories>, Config extends RouterConfig> extends HyperlaneRouterChecker<Factories, App, Config> {
+import { ProxiedFactories, ProxiedRouterConfig } from './types';
+export declare abstract class ProxiedRouterChecker<Factories extends ProxiedFactories, App extends RouterApp<Factories>, Config extends ProxiedRouterConfig> extends HyperlaneRouterChecker<Factories, App, Config> {
+    checkOwnership(chain: ChainName): Promise<void>;
     checkChain(chain: ChainName): Promise<void>;
 }
 //# sourceMappingURL=ProxiedRouterChecker.d.ts.map

package/dist/router/ProxiedRouterChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRouterChecker.d.ts","sourceRoot":"","sources":["../../src/router/ProxiedRouterChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEzD,8BAAsB,oBAAoB,CACxC,SAAS,SAAS,gBAAgB,EAClC,GAAG,SAAS,SAAS,CAAC,SAAS,CAAC,EAChC,MAAM,SAAS,YAAY,CAC3B,SAAQ,sBAAsB,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC;IAChD,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAIlD"}
+{"version":3,"file":"ProxiedRouterChecker.d.ts","sourceRoot":"","sources":["../../src/router/ProxiedRouterChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEhE,8BAAsB,oBAAoB,CACxC,SAAS,SAAS,gBAAgB,EAClC,GAAG,SAAS,SAAS,CAAC,SAAS,CAAC,EAChC,MAAM,SAAS,mBAAmB,CAClC,SAAQ,sBAAsB,CAAC,SAAS,EAAE,GAAG,EAAE,MAAM,CAAC;IAChD,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/C,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAMlD"}

package/dist/router/ProxiedRouterChecker.js

@@ -1,25 +1,23 @@
 "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.ProxiedRouterChecker = void 0;
 const HyperlaneRouterChecker_1 = require("./HyperlaneRouterChecker");
 class ProxiedRouterChecker extends HyperlaneRouterChecker_1.HyperlaneRouterChecker {
-    checkChain(chain) {
-        const _super = Object.create(null, {
-            checkChain: { get: () => super.checkChain }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.checkChain.call(this, chain);
-            yield this.checkProxiedContracts(chain);
-        });
+    async checkOwnership(chain) {
+        const config = this.configMap[chain];
+        let ownableOverrides = {};
+        if (config.timelock) {
+            ownableOverrides = {
+                proxyAdmin: this.app.getAddresses(chain).timelockController,
+            };
+        }
+        return super.checkOwnership(chain, config.owner, ownableOverrides);
+    }
+    async checkChain(chain) {
+        await super.checkHyperlaneConnectionClient(chain);
+        await super.checkEnrolledRouters(chain);
+        await this.checkProxiedContracts(chain);
+        await this.checkOwnership(chain);
     }
 }
 exports.ProxiedRouterChecker = ProxiedRouterChecker;

package/dist/router/ProxiedRouterChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRouterChecker.js","sourceRoot":"","sources":["../../src/router/ProxiedRouterChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,qEAAkE;AAIlE,MAAsB,oBAIpB,SAAQ,+CAA8C;IAChD,UAAU,CAAC,KAAgB;;;;;YAC/B,MAAM,OAAM,UAAU,YAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;KAAA;CACF;AATD,oDASC"}
+{"version":3,"file":"ProxiedRouterChecker.js","sourceRoot":"","sources":["../../src/router/ProxiedRouterChecker.ts"],"names":[],"mappings":";;;AAEA,qEAAkE;AAIlE,MAAsB,oBAIpB,SAAQ,+CAA8C;IACtD,KAAK,CAAC,cAAc,CAAC,KAAgB;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,gBAAgB,GAAG;gBACjB,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,kBAAkB;aAC5D,CAAC;SACH;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,MAAM,KAAK,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,KAAK,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF;AAvBD,oDAuBC"}

package/dist/router/ProxiedRouterDeployer.d.ts

@@ -2,8 +2,8 @@ import { Router } from '@hyperlane-xyz/core';
 import { HyperlaneContracts } from '../contracts';
 import { ChainName } from '../types';
 import { HyperlaneRouterDeployer } from './HyperlaneRouterDeployer';
-import { ProxiedFactories, RouterConfig } from './types';
-export declare abstract class ProxiedRouterDeployer<Config extends RouterConfig, Factories extends ProxiedFactories, RouterKey extends keyof Factories> extends HyperlaneRouterDeployer<Config, Factories> {
+import { ProxiedFactories, ProxiedRouterConfig } from './types';
+export declare abstract class ProxiedRouterDeployer<Config extends ProxiedRouterConfig, Factories extends ProxiedFactories, RouterKey extends keyof Factories> extends HyperlaneRouterDeployer<Config, Factories> {
     abstract routerContractName: RouterKey;
     router(contracts: HyperlaneContracts<Factories>): Router;
     abstract constructorArgs(chain: ChainName, config: Config): Promise<Parameters<Factories[RouterKey]['deploy']>>;

package/dist/router/ProxiedRouterDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/ProxiedRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEzD,8BAAsB,qBAAqB,CACzC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,gBAAgB,EAClC,SAAS,SAAS,MAAM,SAAS,CACjC,SAAQ,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC;IAClD,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;IAEvC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAIxD,QAAQ,CAAC,eAAe,CACtB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEtD,QAAQ,CAAC,cAAc,CACrB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CACR,UAAU,CACR,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAClE,CACF;IAEK,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;CAkC1C"}
+{"version":3,"file":"ProxiedRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/ProxiedRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EAGP,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEhE,8BAAsB,qBAAqB,CACzC,MAAM,SAAS,mBAAmB,EAClC,SAAS,SAAS,gBAAgB,EAClC,SAAS,SAAS,MAAM,SAAS,CACjC,SAAQ,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC;IAClD,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;IAEvC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAIxD,QAAQ,CAAC,eAAe,CACtB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEtD,QAAQ,CAAC,cAAc,CACrB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CACR,UAAU,CACR,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAClE,CACF;IAEK,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;CAgD1C"}

package/dist/router/ProxiedRouterDeployer.js

@@ -1,41 +1,40 @@
 "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.ProxiedRouterDeployer = void 0;
+const ethers_1 = require("ethers");
+const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils/dist/src/utils");
 const HyperlaneRouterDeployer_1 = require("./HyperlaneRouterDeployer");
 class ProxiedRouterDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeployer {
     router(contracts) {
         return contracts[this.routerContractName];
     }
-    deployContracts(chain, config) {
-        const _super = Object.create(null, {
-            runIfOwner: { get: () => super.runIfOwner }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const proxyAdmin = yield this.deployContractFromFactory(chain, this.factories.proxyAdmin, 'proxyAdmin', []);
-            const proxiedRouter = yield this.deployProxiedContract(chain, this.routerContractName, proxyAdmin.address, yield this.constructorArgs(chain, config), yield this.initializeArgs(chain, config));
-            yield _super.runIfOwner.call(this, chain, proxyAdmin, () => __awaiter(this, void 0, void 0, function* () {
-                this.logger(`Checking ownership of proxy admin to ${config.owner}`);
-                if (!(0, utils_1.eqAddress)(yield proxyAdmin.owner(), config.owner)) {
-                    this.logger(`Transferring ownership of proxy admin to ${config.owner}`);
-                    return this.multiProvider.handleTx(chain, proxyAdmin.transferOwnership(config.owner));
-                }
-                return;
-            }));
-            return {
-                [this.routerContractName]: proxiedRouter,
-                proxyAdmin,
-            };
+    async deployContracts(chain, config) {
+        const proxyAdmin = await this.deployContractFromFactory(chain, this.factories.proxyAdmin, 'proxyAdmin', []);
+        let timelockController;
+        let adminOwner;
+        if (config.timelock) {
+            timelockController = await this.deployTimelock(chain, config.timelock);
+            adminOwner = timelockController.address;
+        }
+        else {
+            timelockController = core_1.TimelockController__factory.connect(ethers_1.ethers.constants.AddressZero, this.multiProvider.getProvider(chain));
+            adminOwner = config.owner;
+        }
+        await super.runIfOwner(chain, proxyAdmin, async () => {
+            this.logger(`Checking ownership of proxy admin to ${adminOwner}`);
+            if (!(0, utils_1.eqAddress)(await proxyAdmin.owner(), adminOwner)) {
+                this.logger(`Transferring ownership of proxy admin to ${adminOwner}`);
+                return this.multiProvider.handleTx(chain, proxyAdmin.transferOwnership(adminOwner));
+            }
+            return;
         });
+        const proxiedRouter = await this.deployProxiedContract(chain, this.routerContractName, proxyAdmin.address, await this.constructorArgs(chain, config), await this.initializeArgs(chain, config));
+        return {
+            [this.routerContractName]: proxiedRouter,
+            proxyAdmin,
+            timelockController,
+        };
     }
 }
 exports.ProxiedRouterDeployer = ProxiedRouterDeployer;

package/dist/router/ProxiedRouterDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRouterDeployer.js","sourceRoot":"","sources":["../../src/router/ProxiedRouterDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,+DAAgE;AAKhE,uEAAoE;AAGpE,MAAsB,qBAIpB,SAAQ,iDAA0C;IAGlD,MAAM,CAAC,SAAwC;QAC7C,OAAO,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAW,CAAC;IACtD,CAAC;IAgBK,eAAe,CACnB,KAAgB,EAChB,MAAc;;;;;YAEd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACrD,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,UAAU,EACzB,YAAY,EACZ,EAAE,CACH,CAAC;YAEF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACpD,KAAK,EACL,IAAI,CAAC,kBAAkB,EACvB,UAAU,CAAC,OAAO,EAClB,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EACzC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CACzC,CAAC;YAEF,MAAM,OAAM,UAAU,YAAC,KAAK,EAAE,UAAU,EAAE,GAAS,EAAE;gBACnD,IAAI,CAAC,MAAM,CAAC,wCAAwC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;gBAEpE,IAAI,CAAC,IAAA,iBAAS,EAAC,MAAM,UAAU,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;oBACtD,IAAI,CAAC,MAAM,CAAC,4CAA4C,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;oBACxE,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAChC,KAAK,EACL,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAC3C,CAAC;iBACH;gBACD,OAAO;YACT,CAAC,CAAA,CAAC,CAAC;YAEH,OAAO;gBACL,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,aAAa;gBACxC,UAAU;aACsB,CAAC;QACrC,CAAC;KAAA;CACF;AA9DD,sDA8DC"}
+{"version":3,"file":"ProxiedRouterDeployer.js","sourceRoot":"","sources":["../../src/router/ProxiedRouterDeployer.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,8CAI6B;AAC7B,+DAAgE;AAKhE,uEAAoE;AAGpE,MAAsB,qBAIpB,SAAQ,iDAA0C;IAGlD,MAAM,CAAC,SAAwC;QAC7C,OAAO,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAW,CAAC;IACtD,CAAC;IAgBD,KAAK,CAAC,eAAe,CACnB,KAAgB,EAChB,MAAc;QAEd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACrD,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,UAAU,EACzB,YAAY,EACZ,EAAE,CACH,CAAC;QAEF,IAAI,kBAAsC,CAAC;QAC3C,IAAI,UAAkB,CAAC;QACvB,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YACvE,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC;SACzC;aAAM;YACL,kBAAkB,GAAG,kCAA2B,CAAC,OAAO,CACtD,eAAM,CAAC,SAAS,CAAC,WAAW,EAC5B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CACtC,CAAC;YACF,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC;SAC3B;QAED,MAAM,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE;YACnD,IAAI,CAAC,MAAM,CAAC,wCAAwC,UAAU,EAAE,CAAC,CAAC;YAElE,IAAI,CAAC,IAAA,iBAAS,EAAC,MAAM,UAAU,CAAC,KAAK,EAAE,EAAE,UAAU,CAAC,EAAE;gBACpD,IAAI,CAAC,MAAM,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAC;gBACtE,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAChC,KAAK,EACL,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,CACzC,CAAC;aACH;YACD,OAAO;QACT,CAAC,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACpD,KAAK,EACL,IAAI,CAAC,kBAAkB,EACvB,UAAU,CAAC,OAAO,EAClB,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,EACzC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CACzC,CAAC;QAEF,OAAO;YACL,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,aAAa;YACxC,UAAU;YACV,kBAAkB;SACc,CAAC;IACrC,CAAC;CACF;AA5ED,sDA4EC"}

package/dist/router/RouterApps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouterApps.d.ts","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,8BAAsB,SAAS,CAC7B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAEjE,kBAAkB,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAKrD;IAEJ,SAAS,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAK5C;CACL;AAED,8BAAsB,YAAY,CAChC,SAAS,SAAS,kBAAkB,EACpC,CAAC,SAAS,SAAS,CACnB,SAAQ,SAAS,CAAC,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC;IAEtD,eAAe,CACnB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,SAAS,CAAC;CAKtB"}
+{"version":3,"file":"RouterApps.d.ts","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,8BAAsB,SAAS,CAC7B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAEjE,kBAAkB,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAKrD;IAEJ,SAAS,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAG5C;CACL;AAED,8BAAsB,YAAY,CAChC,SAAS,SAAS,kBAAkB,EACpC,CAAC,SAAS,SAAS,CACnB,SAAQ,SAAS,CAAC,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC;IAEtD,eAAe,CACnB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,SAAS,CAAC;CAKtB"}

package/dist/router/RouterApps.js

@@ -1,13 +1,4 @@
 "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.GasRouterApp = exports.RouterApp = void 0;
 const HyperlaneApp_1 = require("../HyperlaneApp");
@@ -15,16 +6,14 @@ const objects_1 = require("../utils/objects");
 class RouterApp extends HyperlaneApp_1.HyperlaneApp {
     constructor() {
         super(...arguments);
-        this.getSecurityModules = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.contractsMap, (_, contracts) => this.router(contracts).interchainSecurityModule()));
-        this.getOwners = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.contractsMap, (_, contracts) => this.router(contracts).owner()));
+        this.getSecurityModules = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.chainMap, (_, contracts) => this.router(contracts).interchainSecurityModule()));
+        this.getOwners = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.chainMap, (_, contracts) => this.router(contracts).owner()));
     }
 }
 exports.RouterApp = RouterApp;
 class GasRouterApp extends RouterApp {
-    quoteGasPayment(origin, destination) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getContracts(origin).router.quoteGasPayment(this.multiProvider.getDomainId(destination));
-        });
+    async quoteGasPayment(origin, destination) {
+        return this.getContracts(origin).router.quoteGasPayment(this.multiProvider.getDomainId(destination));
     }
 }
 exports.GasRouterApp = GasRouterApp;

package/dist/router/RouterApps.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,kDAA+C;AAG/C,8CAAyD;AAIzD,MAAsB,SAEpB,SAAQ,2BAAuB;IAFjC;;QAKE,uBAAkB,GAAG,GAAqC,EAAE,CAC1D,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;QAEJ,cAAS,GAAG,GAAqC,EAAE,CACjD,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAC/B,CACF,CAAC;IACN,CAAC;CAAA;AAlBD,8BAkBC;AAED,MAAsB,YAGpB,SAAQ,SAAoB;IAGtB,eAAe,CACnB,MAAiB,EACjB,WAAsB;;YAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;QACJ,CAAC;KAAA;CACF;AAdD,oCAcC"}
+{"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":";;;AAKA,kDAA+C;AAG/C,8CAAyD;AAIzD,MAAsB,SAEpB,SAAQ,2BAAuB;IAFjC;;QAKE,uBAAkB,GAAG,GAAqC,EAAE,CAC1D,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;QAEJ,cAAS,GAAG,GAAqC,EAAE,CACjD,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,CACxE,CAAC;IACN,CAAC;CAAA;AAhBD,8BAgBC;AAED,MAAsB,YAGpB,SAAQ,SAAoB;IAG5B,KAAK,CAAC,eAAe,CACnB,MAAiB,EACjB,WAAsB;QAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;IACJ,CAAC;CACF;AAdD,oCAcC"}