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

package/dist/{contracts.js → contracts/contracts.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.appFromAddressesMapHelper = exports.filterOwnableContracts = exports.connectContractsMap = exports.connectContracts = exports.attachContractsMap = exports.attachContracts = exports.filterAddressesMap = exports.serializeContracts = exports.serializeContractsMap = void 0;
 const utils_1 = require("@hyperlane-xyz/utils");
@@ -57,20 +48,18 @@ function connectContractsMap(contractsMap, multiProvider) {
     return (0, utils_1.objMap)(contractsMap, (chain, contracts) => connectContracts(contracts, multiProvider.getSignerOrProvider(chain)));
 }
 exports.connectContractsMap = connectContractsMap;
-function filterOwnableContracts(contracts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const isOwnable = (_, contract) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield contract.owner();
-                return true;
-            }
-            catch (_) {
-                return false;
-            }
-        });
-        const isOwnableContracts = yield (0, utils_1.promiseObjAll)((0, utils_1.objMap)(contracts, isOwnable));
-        return (0, utils_1.objFilter)(contracts, (name, contract) => isOwnableContracts[name]);
-    });
+async function filterOwnableContracts(contracts) {
+    const isOwnable = async (_, contract) => {
+        try {
+            await contract.owner();
+            return true;
+        }
+        catch (_) {
+            return false;
+        }
+    };
+    const isOwnableContracts = await (0, utils_1.promiseObjAll)((0, utils_1.objMap)(contracts, isOwnable));
+    return (0, utils_1.objFilter)(contracts, (name, contract) => isOwnableContracts[name]);
 }
 exports.filterOwnableContracts = filterOwnableContracts;
 function appFromAddressesMapHelper(addressesMap, factories, multiProvider) {

package/dist/contracts/contracts.js.map

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

package/dist/contracts/types.d.ts

@@ -0,0 +1,18 @@
+import type { ethers } from 'ethers';
+import type { Address } from '@hyperlane-xyz/utils';
+import type { ChainMap } from '../types';
+export type AddressesMap = {
+    [key: string]: Address;
+};
+export type HyperlaneFactories = {
+    [key: string]: ethers.ContractFactory;
+};
+export type HyperlaneContracts<F extends HyperlaneFactories> = {
+    [P in keyof F]: Awaited<ReturnType<F[P]['deploy']>>;
+};
+export type HyperlaneContractsMap<F extends HyperlaneFactories> = ChainMap<HyperlaneContracts<F>>;
+export type HyperlaneAddresses<F extends HyperlaneFactories> = {
+    [P in keyof F]: Address;
+};
+export type HyperlaneAddressesMap<F extends HyperlaneFactories> = ChainMap<HyperlaneAddresses<F>>;
+//# sourceMappingURL=types.d.ts.map

package/dist/contracts/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/contracts/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,IAAI;KAC5D,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,kBAAkB,IAAI,QAAQ,CACxE,kBAAkB,CAAC,CAAC,CAAC,CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,IAAI;KAC5D,CAAC,IAAI,MAAM,CAAC,GAAG,OAAO;CACxB,CAAC;AAEF,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,kBAAkB,IAAI,QAAQ,CACxE,kBAAkB,CAAC,CAAC,CAAC,CACtB,CAAC"}

package/dist/contracts/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/contracts/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/contracts/types.ts"],"names":[],"mappings":""}

package/dist/core/CoreDeployer.hardhat-test.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -24,81 +15,81 @@ const testUtils_1 = require("../test/testUtils");
 const HyperlaneCore_1 = require("./HyperlaneCore");
 const HyperlaneCoreChecker_1 = require("./HyperlaneCoreChecker");
 const HyperlaneCoreDeployer_1 = require("./HyperlaneCoreDeployer");
-describe('core', () => __awaiter(void 0, void 0, void 0, function* () {
+describe('core', async () => {
     let multiProvider;
     let deployer;
     let core;
     let contracts;
     let coreConfig;
     let ismFactory;
-    before(() => __awaiter(void 0, void 0, void 0, function* () {
-        const [signer] = yield hardhat_1.ethers.getSigners();
+    before(async () => {
+        const [signer] = await hardhat_1.ethers.getSigners();
         multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
         const ismFactoryDeployer = new HyperlaneIsmFactoryDeployer_1.HyperlaneIsmFactoryDeployer(multiProvider);
-        const ismFactories = yield ismFactoryDeployer.deploy(chains_1.TestChains);
+        const ismFactories = await ismFactoryDeployer.deploy(chains_1.TestChains);
         ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory(ismFactories, multiProvider);
-    }));
-    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
-        const [signer] = yield hardhat_1.ethers.getSigners();
+    });
+    beforeEach(async () => {
+        const [signer] = await hardhat_1.ethers.getSigners();
         // This is kind of awkward and really these tests shouldn't live here
         multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
         coreConfig = (0, testUtils_1.testCoreConfig)(chains_1.TestChains);
-    }));
-    it('deploys', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('deploys', async () => {
         deployer = new HyperlaneCoreDeployer_1.HyperlaneCoreDeployer(multiProvider, ismFactory);
-        contracts = yield deployer.deploy(coreConfig);
+        contracts = await deployer.deploy(coreConfig);
         core = new HyperlaneCore_1.HyperlaneCore(contracts, multiProvider);
-    }));
-    describe('failure modes', () => __awaiter(void 0, void 0, void 0, function* () {
-        beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    describe('failure modes', async () => {
+        beforeEach(async () => {
             deployer = new HyperlaneCoreDeployer_1.HyperlaneCoreDeployer(multiProvider, ismFactory);
             const stub = sinon_1.default.stub(deployer, 'deployContracts');
             stub.withArgs('test3', sinon_1.default.match.any).rejects();
             // @ts-ignore
             deployer.deployContracts.callThrough();
             try {
-                yield deployer.deploy(coreConfig);
+                await deployer.deploy(coreConfig);
                 // eslint-disable-next-line no-empty
             }
             catch (e) { }
-        }));
-        afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        afterEach(async () => {
             sinon_1.default.restore();
-        }));
-        it('persists partial failure', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('persists partial failure', async () => {
             (0, chai_1.expect)(deployer.deployedContracts).to.have.keys(['test1', 'test2']);
-        }));
-        it('can be resumed from partial (chain) failure', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('can be resumed from partial (chain) failure', async () => {
             sinon_1.default.restore(); // restore normal deployer behavior and test3 will be deployed
-            const result = yield deployer.deploy(coreConfig);
+            const result = await deployer.deploy(coreConfig);
             (0, chai_1.expect)(result).to.have.keys(['test1', 'test2', 'test3']);
             (0, chai_1.expect)(result.test3).to.have.keys(Object.keys(result.test2));
-        }));
-        it('can be resumed from partial contracts', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('can be resumed from partial contracts', async () => {
             sinon_1.default.restore(); // restore normal deployer behavior
             //@ts-ignore operand not optional, ignore for this test
             delete deployer.deployedContracts.test2.multisigIsm;
             //@ts-ignore operand not optional, ignore for this test
             delete deployer.deployedContracts.test2.mailbox;
-            const result = yield deployer.deploy(coreConfig);
+            const result = await deployer.deploy(coreConfig);
             (0, chai_1.expect)(result.test2).to.have.keys(Object.keys(result.test1));
             (0, chai_1.expect)(result.test3).to.have.keys(Object.keys(result.test1));
-        }));
-        it('times out ', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('times out ', async () => {
             // @ts-ignore
             deployer.chainTimeoutMs = 1;
             try {
-                yield deployer.deploy(coreConfig);
+                await deployer.deploy(coreConfig);
             }
             catch (e) {
                 // TODO: figure out how to test specific error case
                 // expect(e.message).to.include('Timed out in 1ms');
             }
-        }));
-    }));
-    it('checks', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+    });
+    it('checks', async () => {
         const checker = new HyperlaneCoreChecker_1.HyperlaneCoreChecker(multiProvider, core, coreConfig, ismFactory);
-        yield checker.check();
-    }));
-}));
+        await checker.check();
+    });
+});
 //# sourceMappingURL=CoreDeployer.hardhat-test.js.map

package/dist/core/CoreDeployer.hardhat-test.js.map

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

package/dist/core/HyperlaneCore.d.ts

@@ -1,13 +1,13 @@
 import { ethers } from 'ethers';
 import { Mailbox } from '@hyperlane-xyz/core';
 import { ParsedMessage } from '@hyperlane-xyz/utils';
-import { HyperlaneApp } from '../HyperlaneApp';
+import { HyperlaneApp } from '../app/HyperlaneApp';
 import { HyperlaneEnvironment } from '../consts/environments';
-import { HyperlaneAddressesMap } from '../contracts';
+import { HyperlaneAddressesMap } from '../contracts/types';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainName } from '../types';
 import { CoreFactories } from './contracts';
-export declare type DispatchedMessage = {
+export type DispatchedMessage = {
     id: string;
     message: string;
     parsed: ParsedMessage;
@@ -20,9 +20,9 @@ export declare class HyperlaneCore extends HyperlaneApp<CoreFactories> {
         mailbox: Mailbox;
     };
     protected waitForProcessReceipt(message: DispatchedMessage): Promise<ethers.ContractReceipt>;
-    protected waitForMessageWasProcessed(message: DispatchedMessage): Promise<void>;
+    protected waitForMessageWasProcessed(message: DispatchedMessage, delay?: number, maxAttempts?: number): Promise<void>;
     waitForMessageProcessing(sourceTx: ethers.ContractReceipt): Promise<ethers.ContractReceipt[]>;
-    waitForMessageProcessed(sourceTx: ethers.ContractReceipt): Promise<void>;
+    waitForMessageProcessed(sourceTx: ethers.ContractReceipt, delay?: number, maxAttempts?: number): Promise<void>;
     getDispatchedMessages(sourceTx: ethers.ContractReceipt): DispatchedMessage[];
     static getDispatchedMessages(sourceTx: ethers.ContractReceipt): DispatchedMessage[];
 }

package/dist/core/HyperlaneCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCore.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAoB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACL,aAAa,EAId,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,oBAAoB,EAErB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAA6B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAE3D,oBAAY,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,qBAAa,aAAc,SAAQ,YAAY,CAAC,aAAa,CAAC;IAC5D,MAAM,CAAC,eAAe,CAAC,GAAG,SAAS,oBAAoB,EACrD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,GAC3B,aAAa;IAQhB,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,aAAa,EAAE,aAAa,GAC3B,aAAa;IAShB,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG;QACpD,gBAAgB,EAAE,SAAS,CAAC;QAC5B,OAAO,EAAE,OAAO,CAAC;KAClB;IAQD,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;cAiBlB,0BAA0B,CACxC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC;IAYhB,wBAAwB,CACtB,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;IAK9B,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAQhB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,GAAG,iBAAiB,EAAE;IAI5E,MAAM,CAAC,qBAAqB,CAC1B,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,iBAAiB,EAAE;CAqBvB"}
+{"version":3,"file":"HyperlaneCore.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAoB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACL,aAAa,EAId,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EACL,oBAAoB,EAErB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,qBAAa,aAAc,SAAQ,YAAY,CAAC,aAAa,CAAC;IAC5D,MAAM,CAAC,eAAe,CAAC,GAAG,SAAS,oBAAoB,EACrD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,GAC3B,aAAa;IAQhB,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,aAAa,EAAE,aAAa,GAC3B,aAAa;IAShB,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG;QACpD,gBAAgB,EAAE,SAAS,CAAC;QAC5B,OAAO,EAAE,OAAO,CAAC;KAClB;IAQD,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;cAiBlB,0BAA0B,CACxC,OAAO,EAAE,iBAAiB,EAC1B,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAgBhB,wBAAwB,CACtB,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;IAK9B,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,CAAC,eAAe,EAChC,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAUhB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,GAAG,iBAAiB,EAAE;IAI5E,MAAM,CAAC,qBAAqB,CAC1B,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,iBAAiB,EAAE;CAqBvB"}

package/dist/core/HyperlaneCore.js

@@ -1,20 +1,11 @@
 "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.HyperlaneCore = void 0;
 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");
 class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
     static fromEnvironment(env, multiProvider) {
@@ -46,28 +37,24 @@ class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
             });
         });
     }
-    waitForMessageWasProcessed(message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const id = (0, utils_1.messageId)(message.message);
-            const { mailbox } = this.getDestination(message);
-            yield (0, utils_1.pollAsync)(() => __awaiter(this, void 0, void 0, function* () {
-                const delivered = yield mailbox.delivered(id);
-                if (!delivered) {
-                    throw new Error(`Message ${id} not yet processed`);
-                }
-            }));
-            return;
-        });
+    async waitForMessageWasProcessed(message, delay, maxAttempts) {
+        const id = (0, utils_1.messageId)(message.message);
+        const { mailbox } = this.getDestination(message);
+        await (0, utils_1.pollAsync)(async () => {
+            const delivered = await mailbox.delivered(id);
+            if (!delivered) {
+                throw new Error(`Message ${id} not yet processed`);
+            }
+        }, delay, maxAttempts);
+        return;
     }
     waitForMessageProcessing(sourceTx) {
         const messages = HyperlaneCore.getDispatchedMessages(sourceTx);
         return Promise.all(messages.map((msg) => this.waitForProcessReceipt(msg)));
     }
-    waitForMessageProcessed(sourceTx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const messages = HyperlaneCore.getDispatchedMessages(sourceTx);
-            yield Promise.all(messages.map((msg) => this.waitForMessageWasProcessed(msg)));
-        });
+    async waitForMessageProcessed(sourceTx, delay, maxAttempts) {
+        const messages = HyperlaneCore.getDispatchedMessages(sourceTx);
+        await Promise.all(messages.map((msg) => this.waitForMessageWasProcessed(msg, delay, maxAttempts)));
     }
     // Redundant with static method but keeping for backwards compatibility
     getDispatchedMessages(sourceTx) {

package/dist/core/HyperlaneCore.js.map

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

package/dist/core/HyperlaneCore.test.js

@@ -1,26 +1,17 @@
 "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 });
 const MultiProvider_1 = require("../providers/MultiProvider");
 const HyperlaneCore_1 = require("./HyperlaneCore");
 describe('HyperlaneCore', () => {
     describe('fromEnvironment', () => {
-        it('creates an object for mainnet', () => __awaiter(void 0, void 0, void 0, function* () {
+        it('creates an object for mainnet', async () => {
             const multiProvider = new MultiProvider_1.MultiProvider();
             HyperlaneCore_1.HyperlaneCore.fromEnvironment('mainnet', multiProvider);
-        }));
-        it('creates an object for testnet', () => __awaiter(void 0, void 0, void 0, function* () {
+        });
+        it('creates an object for testnet', async () => {
             const multiProvider = new MultiProvider_1.MultiProvider();
             HyperlaneCore_1.HyperlaneCore.fromEnvironment('testnet', multiProvider);
-        }));
+        });
     });
 });
 //# sourceMappingURL=HyperlaneCore.test.js.map

package/dist/core/HyperlaneCore.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCore.test.js","sourceRoot":"","sources":["../../src/core/HyperlaneCore.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,8DAA2D;AAE3D,mDAAgD;AAEhD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,+BAA+B,EAAE,GAAS,EAAE;YAC7C,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;YAC1C,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC,CAAA,CAAC,CAAC;QACH,EAAE,CAAC,+BAA+B,EAAE,GAAS,EAAE;YAC7C,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;YAC1C,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"HyperlaneCore.test.js","sourceRoot":"","sources":["../../src/core/HyperlaneCore.test.ts"],"names":[],"mappings":";;AAAA,8DAA2D;AAE3D,mDAAgD;AAEhD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;YAC1C,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC7C,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;YAC1C,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/core/HyperlaneCoreChecker.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.HyperlaneCoreChecker = void 0;
 const ethers_1 = require("ethers");
@@ -22,105 +13,95 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         super(multiProvider, app, configMap);
         this.ismFactory = ismFactory;
     }
-    checkChain(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = this.configMap[chain];
-            // skip chains that are configured to be removed
-            if (config.remove) {
-                return;
-            }
-            yield this.checkDomainOwnership(chain);
-            yield this.checkProxiedContracts(chain);
-            yield this.checkMailbox(chain);
-            yield this.checkBytecodes(chain);
-            yield this.checkValidatorAnnounce(chain);
-            if (config.upgrade) {
-                yield this.checkUpgrade(chain, config.upgrade);
-            }
-        });
+    async checkChain(chain) {
+        const config = this.configMap[chain];
+        // skip chains that are configured to be removed
+        if (config.remove) {
+            return;
+        }
+        await this.checkDomainOwnership(chain);
+        await this.checkProxiedContracts(chain);
+        await this.checkMailbox(chain);
+        await this.checkBytecodes(chain);
+        await this.checkValidatorAnnounce(chain);
+        if (config.upgrade) {
+            await this.checkUpgrade(chain, config.upgrade);
+        }
     }
-    checkDomainOwnership(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = this.configMap[chain];
-            let ownableOverrides = {};
-            if (config.upgrade) {
-                const timelockController = this.app.getAddresses(chain).timelockController;
-                ownableOverrides = {
-                    proxyAdmin: timelockController,
-                };
-            }
-            return this.checkOwnership(chain, config.owner, ownableOverrides);
-        });
+    async checkDomainOwnership(chain) {
+        const config = this.configMap[chain];
+        let ownableOverrides = {};
+        if (config.upgrade) {
+            const timelockController = this.app.getAddresses(chain).timelockController;
+            ownableOverrides = {
+                proxyAdmin: timelockController,
+            };
+        }
+        return this.checkOwnership(chain, config.owner, ownableOverrides);
+    }
+    async checkMailbox(chain) {
+        const contracts = this.app.getContracts(chain);
+        const mailbox = contracts.mailbox;
+        const localDomain = await mailbox.localDomain();
+        (0, utils_1.assert)(localDomain === this.multiProvider.getDomainId(chain));
+        const actualIsm = await mailbox.defaultIsm();
+        const config = this.configMap[chain];
+        const matches = await (0, HyperlaneIsmFactory_1.moduleMatchesConfig)(chain, actualIsm, config.defaultIsm, this.ismFactory.multiProvider, this.ismFactory.getContracts(chain));
+        if (!matches) {
+            const violation = {
+                type: types_1.CoreViolationType.Mailbox,
+                mailboxType: types_1.MailboxViolationType.DefaultIsm,
+                contract: mailbox,
+                chain,
+                actual: actualIsm,
+                expected: config.defaultIsm,
+            };
+            this.addViolation(violation);
+        }
     }
-    checkMailbox(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const contracts = this.app.getContracts(chain);
-            const mailbox = contracts.mailbox;
-            const localDomain = yield mailbox.localDomain();
-            (0, utils_1.assert)(localDomain === this.multiProvider.getDomainId(chain));
-            const actualIsm = yield mailbox.defaultIsm();
-            const config = this.configMap[chain];
-            const matches = yield (0, HyperlaneIsmFactory_1.moduleMatchesConfig)(chain, actualIsm, config.defaultIsm, this.ismFactory.multiProvider, this.ismFactory.getContracts(chain));
-            if (!matches) {
+    async checkBytecodes(chain) {
+        const contracts = this.app.getContracts(chain);
+        const mailbox = contracts.mailbox;
+        const localDomain = await mailbox.localDomain();
+        const implementation = await (0, proxy_1.proxyImplementation)(this.multiProvider.getProvider(chain), mailbox.address);
+        await this.checkBytecode(chain, 'Mailbox implementation', implementation, [
+            bytecode_1.BytecodeHash.MAILBOX_WITHOUT_LOCAL_DOMAIN_BYTE_CODE_HASH,
+            bytecode_1.BytecodeHash.MAILBOX_WITHOUT_LOCAL_DOMAIN_NONZERO_PAUSE_BYTE_CODE_HASH,
+        ], (bytecode) => 
+        // This is obviously super janky but basically we are searching
+        //  for the ocurrences of localDomain in the bytecode and remove
+        //  that to compare, but some coincidental ocurrences of
+        // localDomain in the bytecode should be not be removed which
+        // are just done via an offset guard
+        bytecode.replaceAll(ethers_1.utils.defaultAbiCoder
+            .encode(['uint32'], [localDomain])
+            .slice(2), (match, offset) => (offset > 8000 ? match : '')));
+        await this.checkBytecode(chain, 'Mailbox proxy', contracts.mailbox.address, [bytecode_1.BytecodeHash.TRANSPARENT_PROXY_BYTECODE_HASH]);
+        await this.checkBytecode(chain, 'ProxyAdmin', contracts.proxyAdmin.address, [bytecode_1.BytecodeHash.PROXY_ADMIN_BYTECODE_HASH]);
+    }
+    async checkValidatorAnnounce(chain) {
+        const validators = new Set();
+        const remotes = Object.keys(this.configMap).filter((c) => c !== chain);
+        const remoteOriginValidators = remotes.map((remote) => (0, HyperlaneIsmFactory_1.collectValidators)(chain, this.configMap[remote].defaultIsm));
+        remoteOriginValidators.map((set) => {
+            [...set].map((v) => validators.add(v));
+        });
+        const validatorAnnounce = this.app.getContracts(chain).validatorAnnounce;
+        const announcedValidators = await validatorAnnounce.getAnnouncedValidators();
+        [...validators].forEach((validator) => {
+            const matches = announcedValidators.filter((x) => (0, utils_1.eqAddress)(x, validator));
+            if (matches.length == 0) {
                 const violation = {
-                    type: types_1.CoreViolationType.Mailbox,
-                    mailboxType: types_1.MailboxViolationType.DefaultIsm,
-                    contract: mailbox,
+                    type: types_1.CoreViolationType.ValidatorAnnounce,
                     chain,
-                    actual: actualIsm,
-                    expected: config.defaultIsm,
+                    validator,
+                    actual: false,
+                    expected: true,
                 };
                 this.addViolation(violation);
             }
         });
     }
-    checkBytecodes(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const contracts = this.app.getContracts(chain);
-            const mailbox = contracts.mailbox;
-            const localDomain = yield mailbox.localDomain();
-            const implementation = yield (0, proxy_1.proxyImplementation)(this.multiProvider.getProvider(chain), mailbox.address);
-            yield this.checkBytecode(chain, 'Mailbox implementation', implementation, [
-                bytecode_1.BytecodeHash.MAILBOX_WITHOUT_LOCAL_DOMAIN_BYTE_CODE_HASH,
-                bytecode_1.BytecodeHash.MAILBOX_WITHOUT_LOCAL_DOMAIN_NONZERO_PAUSE_BYTE_CODE_HASH,
-            ], (bytecode) => 
-            // This is obviously super janky but basically we are searching
-            //  for the ocurrences of localDomain in the bytecode and remove
-            //  that to compare, but some coincidental ocurrences of
-            // localDomain in the bytecode should be not be removed which
-            // are just done via an offset guard
-            bytecode.replaceAll(ethers_1.utils.defaultAbiCoder
-                .encode(['uint32'], [localDomain])
-                .slice(2), (match, offset) => (offset > 8000 ? match : '')));
-            yield this.checkBytecode(chain, 'Mailbox proxy', contracts.mailbox.address, [bytecode_1.BytecodeHash.TRANSPARENT_PROXY_BYTECODE_HASH]);
-            yield this.checkBytecode(chain, 'ProxyAdmin', contracts.proxyAdmin.address, [bytecode_1.BytecodeHash.PROXY_ADMIN_BYTECODE_HASH]);
-        });
-    }
-    checkValidatorAnnounce(chain) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const validators = new Set();
-            const remotes = Object.keys(this.configMap).filter((c) => c !== chain);
-            const remoteOriginValidators = remotes.map((remote) => (0, HyperlaneIsmFactory_1.collectValidators)(chain, this.configMap[remote].defaultIsm));
-            remoteOriginValidators.map((set) => {
-                [...set].map((v) => validators.add(v));
-            });
-            const validatorAnnounce = this.app.getContracts(chain).validatorAnnounce;
-            const announcedValidators = yield validatorAnnounce.getAnnouncedValidators();
-            [...validators].forEach((validator) => {
-                const matches = announcedValidators.filter((x) => (0, utils_1.eqAddress)(x, validator));
-                if (matches.length == 0) {
-                    const violation = {
-                        type: types_1.CoreViolationType.ValidatorAnnounce,
-                        chain,
-                        validator,
-                        actual: false,
-                        expected: true,
-                    };
-                    this.addViolation(violation);
-                }
-            });
-        });
-    }
 }
 exports.HyperlaneCoreChecker = HyperlaneCoreChecker;
 //# sourceMappingURL=HyperlaneCoreChecker.js.map