@hyperlane-xyz/sdk 0.5.2 → 0.5.4-0

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,KAAK,EAAE,MAAM,EAAmB,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAS,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGxD,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAE3D,oBAAY,eAAe,GAAG,MAAM,OAAO,YAAY,CAAC;AACxD,oBAAY,oBAAoB,CAAC,CAAC,SAAS,eAAe,IAAI,OAAO,CACnE,MAAM,OAAO,YAAY,CAAC,CAAC,CAAC,EAC5B,SAAS,CACV,CAAC;AAEF,oBAAY,gBAAgB,CAAC,KAAK,SAAS,SAAS,IAAI;KACrD,KAAK,IAAI,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC;CAC9C,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC;CAC7B,CAAC;AAEF,qBAAa,aAAa,CACxB,KAAK,SAAS,SAAS,GAAG,SAAS,CACnC,SAAQ,YAAY,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC;gBAEtD,YAAY,EAAE,gBAAgB,CAAC,KAAK,CAAC,EACrC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC;IAMrC,MAAM,CAAC,eAAe,CACpB,GAAG,SAAS,eAAe,EAC3B,KAAK,SAAS,SAAS,GAAG,SAAS,EACnC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA0B/C,YAAY,CAAC,KAAK,SAAS,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC;IAI5E,yBAAyB,CAAC,KAAK,EAAE,KAAK,GAAG,sBAAsB;IAQ/D,4BAA4B,IAAI,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;IAMvE,gCAAgC,CAAC,CAAC,EAChC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,GAC5B,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,sBAAsB,CAAC;IAW9C,4BAA4B,CAAC,CAAC,EAC5B,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,GACzB,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,CAAC;IAOrD,cAAc,CAAC,KAAK,SAAS,KAAK,EAChC,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,EAC7B,WAAW,EAAE,KAAK,GACjB;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,KAAK,CAAA;KAAE;IAOpD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG;QACpD,KAAK,EAAE,KAAK,CAAC;QACb,eAAe,EAAE,eAAe,CAAC;KAClC;IAcD,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IAelC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,eAAe,GAAG,iBAAiB,EAAE;IAsB5E,wBAAwB,CACtB,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;CAKrC"}
+{"version":3,"file":"HyperlaneCore.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCore.ts"],"names":[],"mappings":"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"}

package/dist/core/HyperlaneCore.js

@@ -32,7 +32,7 @@ class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
     getConnectionClientConfig(chain) {
         const contracts = this.getContracts(chain);
         return {
-            connectionManager: contracts.connectionManager.address,
+            mailbox: contracts.mailbox.address,
             interchainGasPaymaster: contracts.interchainGasPaymaster.address,
         };
     }
@@ -45,53 +45,43 @@ class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
             return Object.assign(Object.assign({}, config), connectionClientConfigMap[chain]);
         });
     }
-    // TODO: deprecate
-    extendWithConnectionManagers(config) {
-        return (0, objects_1.objMap)(config, (chain, config) => (Object.assign(Object.assign({}, config), { connectionManager: this.getContracts(chain).connectionManager.address })));
-    }
-    getMailboxPair(origin, destination) {
-        const originOutbox = this.getContracts(origin).outbox.contract;
-        const destinationInbox = this.getContracts(destination).inboxes[origin].inbox.contract;
-        return { originOutbox, destinationInbox };
-    }
     getDestination(message) {
-        const sourceChain = domains_1.DomainIdToChainName[message.parsed.origin];
         const destinationChain = domains_1.DomainIdToChainName[message.parsed.destination];
-        const { destinationInbox } = this.getMailboxPair(sourceChain, destinationChain);
+        const mailbox = this.getContracts(destinationChain).mailbox.contract;
         const chainConnection = this.multiProvider.getChainConnection(destinationChain);
-        return { inbox: destinationInbox, chainConnection };
+        return { mailbox, chainConnection };
     }
     waitForProcessReceipt(message) {
-        const hash = utils_1.utils.messageHash(message.message, message.leafIndex);
-        const { inbox, chainConnection } = this.getDestination(message);
-        const filter = inbox.filters.Process(hash);
+        const id = utils_1.utils.messageId(message.message);
+        const { mailbox, chainConnection } = this.getDestination(message);
+        const filter = mailbox.filters.Process(id);
         return new Promise((resolve, reject) => {
-            inbox.once(filter, (emittedHash, event) => {
-                if (hash !== emittedHash) {
-                    reject(`Expected message hash ${hash} but got ${emittedHash}`);
+            mailbox.once(filter, (emittedId, event) => {
+                if (id !== emittedId) {
+                    reject(`Expected message id ${id} but got ${emittedId}`);
                 }
+                // @ts-ignore
                 resolve(chainConnection.handleTx(event.getTransaction()));
             });
         });
     }
     getDispatchedMessages(sourceTx) {
-        const outbox = core_1.Outbox__factory.createInterface();
-        const describedLogs = sourceTx.logs.map((log) => {
+        const mailbox = core_1.Mailbox__factory.createInterface();
+        const dispatchLogs = sourceTx.logs
+            .map((log) => {
             try {
-                return outbox.parseLog(log);
+                return mailbox.parseLog(log);
             }
             catch (e) {
                 return undefined;
             }
-        });
-        const dispatchLogs = describedLogs.filter((log) => log && log.name === 'Dispatch');
-        if (dispatchLogs.length === 0) {
-            throw new Error('Dispatch logs not found');
-        }
+        })
+            .filter((log) => !!log && log.name === 'Dispatch');
         return dispatchLogs.map((log) => {
             const message = log.args['message'];
+            const id = log.args['messageId'];
             const parsed = utils_1.utils.parseMessage(message);
-            return { leafIndex: log.args['leafIndex'], message, parsed };
+            return { id, message, parsed };
         });
     }
     waitForMessageProcessing(sourceTx) {

package/dist/core/HyperlaneCore.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCore.js","sourceRoot":"","sources":["../../src/core/HyperlaneCore.ts"],"names":[],"mappings":";;;AAEA,8CAAqE;AACrE,gDAAoD;AAEpD,kDAA+C;AAC/C,yDAAsD;AACtD,4CAA8C;AAC9C,wCAAiD;AAKjD,8CAAgD;AAEhD,2CAA2D;AAkB3D,MAAa,aAEX,SAAQ,2BAAgD;IACxD,YACE,YAAqC,EACrC,aAAmC;QAEnC,KAAK,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACrC,CAAC;IAED,6EAA6E;IAC7E,MAAM,CAAC,eAAe,CAGpB,GAAQ,EAAE,aAAmC;QAC7C,MAAM,SAAS,GAAG,2BAAY,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAC;SAC3D;QAID,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAwB,CAAC;QAEhE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,GACzD,aAAa,CAAC,SAAS,CAAoB,SAAS,CAAC,CAAC;QAExD,MAAM,kBAAkB,GAAG,IAAA,cAAI,EAC7B,SAAiC,EACjC,YAAY,CACb,CAAC;QACF,MAAM,YAAY,GAAG,IAAA,0BAAc,EACjC,kBAAkB,EAClB,yBAAa,CACyB,CAAC;QAEzC,OAAO,IAAI,aAAa,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAC/D,CAAC;IAED,6CAA6C;IAC7C,YAAY,CAAsB,KAAY;QAC5C,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,CAAgC,CAAC;IAClE,CAAC;IAED,yBAAyB,CAAC,KAAY;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC3C,OAAO;YACL,iBAAiB,EAAE,SAAS,CAAC,iBAAiB,CAAC,OAAO;YACtD,sBAAsB,EAAE,SAAS,CAAC,sBAAsB,CAAC,OAAO;SACjE,CAAC;IACJ,CAAC;IAED,4BAA4B;QAC1B,OAAO,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CACzC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CACtC,CAAC;IACJ,CAAC;IAED,gCAAgC,CAC9B,SAA6B;QAE7B,MAAM,yBAAyB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACtE,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzC,uCACK,MAAM,GACN,yBAAyB,CAAC,KAAK,CAAC,EACnC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IAClB,4BAA4B,CAC1B,MAA0B;QAE1B,OAAO,IAAA,gBAAM,EAAC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,iCACpC,MAAM,KACT,iBAAiB,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,iBAAiB,CAAC,OAAO,IACrE,CAAC,CAAC;IACN,CAAC;IAED,cAAc,CACZ,MAA6B,EAC7B,WAAkB;QAElB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC/D,MAAM,gBAAgB,GACpB,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QAChE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;IAC5C,CAAC;IAES,cAAc,CAAC,OAA0B;QAIjD,MAAM,WAAW,GAAG,6BAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAU,CAAC;QACxE,MAAM,gBAAgB,GAAG,6BAAmB,CAC1C,OAAO,CAAC,MAAM,CAAC,WAAW,CAClB,CAAC;QACX,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,cAAc,CAC9C,WAAsD,EACtD,gBAAgB,CACjB,CAAC;QACF,MAAM,eAAe,GACnB,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAC1D,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACtD,CAAC;IAES,qBAAqB,CAC7B,OAA0B;QAE1B,MAAM,IAAI,GAAG,aAAK,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3C,OAAO,IAAI,OAAO,CAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;gBACxC,IAAI,IAAI,KAAK,WAAW,EAAE;oBACxB,MAAM,CAAC,yBAAyB,IAAI,YAAY,WAAW,EAAE,CAAC,CAAC;iBAChE;gBACD,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,QAAgC;QACpD,MAAM,MAAM,GAAG,sBAAe,CAAC,eAAe,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9C,IAAI;gBACF,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAC7B;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,SAAS,CAAC;aAClB;QACH,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CACvC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CACP,CAAC;QACnC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QACD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG,aAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAC3C,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/D,CAAC,CAAC,CAAC;IACL,CAAC;IAED,wBAAwB,CACtB,QAAgC;QAEhC,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAEtD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF;AAzJD,sCAyJC"}
+{"version":3,"file":"HyperlaneCore.js","sourceRoot":"","sources":["../../src/core/HyperlaneCore.ts"],"names":[],"mappings":"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"}

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

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

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

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

package/dist/core/HyperlaneCore.test.js

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"HyperlaneCore.test.js","sourceRoot":"","sources":["../../src/core/HyperlaneCore.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6EAA0E;AAC1E,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,CAAC,+CAAsB,CAAC,CAAC;YAChE,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC1D,CAAC,CAAA,CAAC,CAAC;QACH,EAAE,CAAC,gCAAgC,EAAE,GAAS,EAAE;YAC9C,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,+CAAsB,CAAC,CAAC;YAChE,6BAAa,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAC3D,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/core/TestCoreApp.d.ts

@@ -1,25 +1,19 @@
 import { ethers } from 'ethers';
-import { TestInbox, TestOutbox } from '@hyperlane-xyz/core';
+import { TestMailbox } from '@hyperlane-xyz/core';
 import { ProxiedContract } from '../proxy';
-import { ChainMap, ChainName, Remotes, TestChainNames } from '../types';
+import { ChainName, TestChainNames } from '../types';
 import { HyperlaneCore } from './HyperlaneCore';
-import { CoreContracts, InboxContracts, OutboxContracts } from './contracts';
+import { CoreContracts } from './contracts';
 declare type MockProxyAddresses = {
     kind: 'MOCK';
     proxy: string;
     implementation: string;
 };
-export declare type TestOutboxContracts = OutboxContracts & {
-    outbox: ProxiedContract<TestOutbox, MockProxyAddresses>;
-};
-export declare type TestInboxContracts = InboxContracts & {
-    inbox: ProxiedContract<TestInbox, MockProxyAddresses>;
-};
-export declare type TestCoreContracts<Local extends TestChainNames> = CoreContracts<TestChainNames, Local> & TestOutboxContracts & {
-    inboxes: ChainMap<Remotes<TestChainNames, Local>, TestInboxContracts>;
+export declare type TestCoreContracts = CoreContracts & {
+    mailbox: ProxiedContract<TestMailbox, MockProxyAddresses>;
 };
 export declare class TestCoreApp<TestChain extends TestChainNames = TestChainNames> extends HyperlaneCore<TestChain> {
-    getContracts<Local extends TestChain>(chain: Local): TestCoreContracts<Local>;
+    getContracts<Local extends TestChain>(chain: Local): TestCoreContracts;
     processMessages(): Promise<Map<TestChain, Map<TestChain, ethers.providers.TransactionResponse[]>>>;
     processOutboundMessages<Local extends TestChain>(origin: Local): Promise<Map<ChainName, ethers.providers.TransactionResponse[]>>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"TestCoreApp.d.ts","sourceRoot":"","sources":["../../src/core/TestCoreApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAK5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAExE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7E,aAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,oBAAY,mBAAmB,GAAG,eAAe,GAAG;IAClD,MAAM,EAAE,eAAe,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;CACzD,CAAC;AACF,oBAAY,kBAAkB,GAAG,cAAc,GAAG;IAChD,KAAK,EAAE,eAAe,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;CACvD,CAAC;AAEF,oBAAY,iBAAiB,CAAC,KAAK,SAAS,cAAc,IAAI,aAAa,CACzE,cAAc,EACd,KAAK,CACN,GACC,mBAAmB,GAAG;IACpB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAAE,kBAAkB,CAAC,CAAC;CACvE,CAAC;AAEJ,qBAAa,WAAW,CACtB,SAAS,SAAS,cAAc,GAAG,cAAc,CACjD,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,YAAY,CAAC,KAAK,SAAS,SAAS,EAClC,KAAK,EAAE,KAAK,GACX,iBAAiB,CAAC,KAAK,CAAC;IAIrB,eAAe,IAAI,OAAO,CAC9B,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC,CACvE;IAaK,uBAAuB,CAAC,KAAK,SAAS,SAAS,EACnD,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC;CAmCnE"}
+{"version":3,"file":"TestCoreApp.d.ts","sourceRoot":"","sources":["../../src/core/TestCoreApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,aAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,oBAAY,iBAAiB,GAAG,aAAa,GAAG;IAC9C,OAAO,EAAE,eAAe,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;CAC3D,CAAC;AAEF,qBAAa,WAAW,CACtB,SAAS,SAAS,cAAc,GAAG,cAAc,CACjD,SAAQ,aAAa,CAAC,SAAS,CAAC;IAChC,YAAY,CAAC,KAAK,SAAS,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,iBAAiB;IAIhE,eAAe,IAAI,OAAO,CAC9B,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC,CACvE;IAaK,uBAAuB,CAAC,KAAK,SAAS,SAAS,EACnD,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC;CA2BnE"}

package/dist/core/TestCoreApp.js

@@ -34,7 +34,7 @@ class TestCoreApp extends HyperlaneCore_1.HyperlaneCore {
         return __awaiter(this, void 0, void 0, function* () {
             const responses = new Map();
             const contracts = this.getContracts(origin);
-            const outbox = contracts.outbox.contract;
+            const outbox = contracts.mailbox.contract;
             const dispatchFilter = outbox.filters.Dispatch();
             const dispatches = yield outbox.queryFilter(dispatchFilter);
             for (const dispatch of dispatches) {
@@ -46,10 +46,10 @@ class TestCoreApp extends HyperlaneCore_1.HyperlaneCore {
                 const destinationChain = domains_1.DomainIdToChainName[destination];
                 const inbox = 
                 // @ts-ignore
-                this.getContracts(destinationChain).inboxes[origin].inbox.contract;
-                const status = yield inbox.messages(utils_1.utils.messageHash(dispatch.args.message, dispatch.args.leafIndex.toNumber()));
-                if (status !== utils_1.types.MessageStatus.PROCESSED) {
-                    const response = yield inbox.testProcess(dispatch.args.message, dispatch.args.leafIndex.toNumber());
+                this.getContracts(destinationChain).mailbox.contract;
+                const delivered = yield inbox.delivered(dispatch.args.messageId);
+                if (!delivered) {
+                    const response = yield inbox.process('0x', dispatch.args.message);
                     const destinationResponses = responses.get(destinationChain) || [];
                     destinationResponses.push(response);
                     responses.set(destinationChain, destinationResponses);

package/dist/core/TestCoreApp.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestCoreApp.js","sourceRoot":"","sources":["../../src/core/TestCoreApp.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,gDAAoD;AAEpD,2DAAwD;AACxD,wCAAiD;AAIjD,mDAAgD;AAwBhD,MAAa,WAEX,SAAQ,6BAAwB;IAChC,YAAY,CACV,KAAY;QAEZ,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,CAA6B,CAAC;IAC/D,CAAC;IAEK,eAAe;;YAGnB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;gBAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;gBAClC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAChD,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAC5D,CAAC;gBACF,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;aACxC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEK,uBAAuB,CAC3B,MAAa;;YAEb,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAe,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;YAErD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAC5D,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;gBACjC,MAAM,OAAO,GAAG,aAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;gBACxC,IAAI,WAAW,KAAK,6BAAa,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE;oBAC5C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;iBACvD;gBACD,MAAM,gBAAgB,GAAG,6BAAmB,CAAC,WAAW,CAAC,CAAC;gBAC1D,MAAM,KAAK;gBACT,aAAa;gBACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACrE,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,CACjC,aAAK,CAAC,WAAW,CACf,QAAQ,CAAC,IAAI,CAAC,OAAO,EACrB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CACnC,CACF,CAAC;gBACF,IAAI,MAAM,KAAK,aAAK,CAAC,aAAa,CAAC,SAAS,EAAE;oBAC5C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CACtC,QAAQ,CAAC,IAAI,CAAC,OAAO,EACrB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CACnC,CAAC;oBACF,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBACnE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACpC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;iBACvD;aACF;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;CACF;AA7DD,kCA6DC"}
+{"version":3,"file":"TestCoreApp.js","sourceRoot":"","sources":["../../src/core/TestCoreApp.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,gDAA6C;AAE7C,2DAAwD;AACxD,wCAAiD;AAIjD,mDAAgD;AAahD,MAAa,WAEX,SAAQ,6BAAwB;IAChC,YAAY,CAA0B,KAAY;QAChD,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,CAAsB,CAAC;IACxD,CAAC;IAEK,eAAe;;YAGnB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;gBAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;gBAClC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAChD,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAC5D,CAAC;gBACF,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;aACxC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEK,uBAAuB,CAC3B,MAAa;;YAEb,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAgB,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;YAEvD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAC5D,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;gBACjC,MAAM,OAAO,GAAG,aAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;gBACxC,IAAI,WAAW,KAAK,6BAAa,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE;oBAC5C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;iBACvD;gBACD,MAAM,gBAAgB,GAAG,6BAAmB,CAAC,WAAW,CAAC,CAAC;gBAC1D,MAAM,KAAK;gBACT,aAAa;gBACb,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;gBACvD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACjE,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAClE,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBACnE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACpC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;iBACvD;aACF;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;CACF;AAnDD,kCAmDC"}

package/dist/core/TestCoreDeployer.d.ts

@@ -1,13 +1,14 @@
+import { TestMailbox } from '@hyperlane-xyz/core';
 import { HyperlaneCoreDeployer } from '../deploy/core/HyperlaneCoreDeployer';
-import { CoreConfig, ValidatorManagerConfig } from '../deploy/core/types';
+import { CoreConfig } from '../deploy/core/types';
 import { MultiProvider } from '../providers/MultiProvider';
-import { ChainMap, Remotes, TestChainNames } from '../types';
-import { TestCoreApp, TestInboxContracts, TestOutboxContracts } from './TestCoreApp';
+import { BeaconProxyAddresses, ProxiedContract } from '../proxy';
+import { ChainMap, TestChainNames } from '../types';
+import { TestCoreApp } from './TestCoreApp';
 export declare class TestCoreDeployer<TestChain extends TestChainNames = TestChainNames> extends HyperlaneCoreDeployer<TestChain> {
     readonly multiProvider: MultiProvider<TestChain>;
     constructor(multiProvider: MultiProvider<TestChain>, configMap?: ChainMap<TestChain, CoreConfig>);
-    deployOutbox<LocalChain extends TestChain>(chain: LocalChain, config: ValidatorManagerConfig): Promise<TestOutboxContracts>;
-    deployInbox<LocalChain extends TestChain>(local: LocalChain, remote: Remotes<TestChain, LocalChain>, config: ValidatorManagerConfig): Promise<TestInboxContracts>;
+    deployMailbox<LocalChain extends TestChain>(chain: LocalChain): Promise<ProxiedContract<TestMailbox, BeaconProxyAddresses>>;
     deployApp(): Promise<TestCoreApp<TestChain>>;
 }
 //# sourceMappingURL=TestCoreDeployer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TestCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AA2BvB,qBAAa,gBAAgB,CAC3B,SAAS,SAAS,cAAc,GAAG,cAAc,CACjD,SAAQ,qBAAqB,CAAC,SAAS,CAAC;aAEtB,aAAa,EAAE,aAAa,CAAC,SAAS,CAAC;gBAAvC,aAAa,EAAE,aAAa,CAAC,SAAS,CAAC,EACvD,SAAS,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAcvC,YAAY,CAAC,UAAU,SAAS,SAAS,EAC7C,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,mBAAmB,CAAC;IAmBzB,WAAW,CAAC,UAAU,SAAS,SAAS,EAC5C,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,EACtC,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,kBAAkB,CAAC;IAkBxB,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;CAGnD"}
+{"version":3,"file":"TestCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,WAAW,EAEZ,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAa,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAmB5C,qBAAa,gBAAgB,CAC3B,SAAS,SAAS,cAAc,GAAG,cAAc,CACjD,SAAQ,qBAAqB,CAAC,SAAS,CAAC;aAEtB,aAAa,EAAE,aAAa,CAAC,SAAS,CAAC;gBAAvC,aAAa,EAAE,aAAa,CAAC,SAAS,CAAC,EACvD,SAAS,CAAC,EAAE,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAevC,aAAa,CAAC,UAAU,SAAS,SAAS,EAC9C,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,eAAe,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;IAqBxD,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;CAGnD"}

package/dist/core/TestCoreDeployer.js

@@ -19,60 +19,38 @@ const TestCoreApp_1 = require("./TestCoreApp");
 const contracts_1 = require("./contracts");
 const nonZeroAddress = ethers_1.ethers.constants.AddressZero.replace('00', '01');
 // dummy config as TestInbox and TestOutbox do not use deployed ValidatorManager
-const testValidatorManagerConfig = {
-    validatorManager: {
+const testMultisigIsmConfig = {
+    multisigIsm: {
         validators: [nonZeroAddress],
         threshold: 1,
     },
 };
-const testCoreFactories = Object.assign(Object.assign({}, contracts_1.coreFactories), { inbox: new core_1.TestInbox__factory(), outbox: new core_1.TestOutbox__factory() });
-function mockProxy(contract) {
-    return new proxy_1.ProxiedContract(contract, {
-        kind: 'MOCK',
-        proxy: contract.address,
-        implementation: contract.address,
-    });
-}
+const testCoreFactories = Object.assign(Object.assign({}, contracts_1.coreFactories), { mailbox: new core_1.TestMailbox__factory(), testIsm: new core_1.TestIsm__factory() });
 class TestCoreDeployer extends HyperlaneCoreDeployer_1.HyperlaneCoreDeployer {
     constructor(multiProvider, configMap) {
+        // Note that the multisig module configs are unused.
         const configs = configMap !== null && configMap !== void 0 ? configMap : {
-            test1: testValidatorManagerConfig,
-            test2: testValidatorManagerConfig,
-            test3: testValidatorManagerConfig,
+            test1: testMultisigIsmConfig,
+            test2: testMultisigIsmConfig,
+            test3: testMultisigIsmConfig,
         }; // cast so param can be optional
         super(multiProvider, configs, testCoreFactories);
         this.multiProvider = multiProvider;
     }
     // skip proxying
-    deployOutbox(chain, config) {
+    deployMailbox(chain) {
         return __awaiter(this, void 0, void 0, function* () {
             const localDomain = chainMetadata_1.chainMetadata[chain].id;
-            const outboxContract = yield this.deployContract(chain, 'outbox', [
-                localDomain,
-            ]);
-            const outboxValidatorManager = yield this.deployContract(chain, 'outboxValidatorManager', [localDomain, config.validators, config.threshold]);
-            // validator manager must be contract
-            yield outboxContract.initialize(outboxValidatorManager.address);
-            return {
-                outbox: mockProxy(outboxContract),
-                outboxValidatorManager,
-            };
-        });
-    }
-    // skip proxying
-    deployInbox(local, remote, config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const localDomain = chainMetadata_1.chainMetadata[local].id;
-            const remoteDomain = chainMetadata_1.chainMetadata[remote].id;
-            const inboxContract = yield this.deployContract(local, 'inbox', [
-                localDomain,
-            ]);
-            const inboxValidatorManager = yield this.deployContract(local, 'inboxValidatorManager', [remoteDomain, config.validators, config.threshold]);
-            yield inboxContract.initialize(remoteDomain, inboxValidatorManager.address);
-            return {
-                inbox: mockProxy(inboxContract),
-                inboxValidatorManager,
-            };
+            const testIsm = yield this.deployContractFromFactory(chain, testCoreFactories.testIsm, 'testIsm', []);
+            yield testIsm.setAccept(true);
+            const mailbox = yield this.deployContract(chain, 'mailbox', [localDomain]);
+            yield mailbox.initialize(testIsm.address);
+            return new proxy_1.ProxiedContract(mailbox, {
+                kind: proxy_1.ProxyKind.UpgradeBeacon,
+                proxy: mailbox.address,
+                implementation: mailbox.address,
+                beacon: mailbox.address,
+            });
         });
     }
     deployApp() {

package/dist/core/TestCoreDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"TestCoreDeployer.js","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TestCoreDeployer.js","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,8CAI6B;AAE7B,2DAAwD;AACxD,gFAA6E;AAG7E,oCAA4E;AAG5E,+CAA4C;AAC5C,2CAA4C;AAE5C,MAAM,cAAc,GAAG,eAAM,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAExE,gFAAgF;AAChF,MAAM,qBAAqB,GAAe;IACxC,WAAW,EAAE;QACX,UAAU,EAAE,CAAC,cAAc,CAAC;QAC5B,SAAS,EAAE,CAAC;KACb;CACF,CAAC;AAEF,MAAM,iBAAiB,mCAClB,yBAAa,KAChB,OAAO,EAAE,IAAI,2BAAoB,EAAE,EACnC,OAAO,EAAE,IAAI,uBAAgB,EAAE,GAChC,CAAC;AAEF,MAAa,gBAEX,SAAQ,6CAAgC;IACxC,YACkB,aAAuC,EACvD,SAA2C;QAE3C,oDAAoD;QACpD,MAAM,OAAO,GACX,SAAS,aAAT,SAAS,cAAT,SAAS,GACR;YACC,KAAK,EAAE,qBAAqB;YAC5B,KAAK,EAAE,qBAAqB;YAC5B,KAAK,EAAE,qBAAqB;SACO,CAAC,CAAC,gCAAgC;QAEzE,KAAK,CAAC,aAAa,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAZjC,kBAAa,GAAb,aAAa,CAA0B;IAazD,CAAC;IAED,gBAAgB;IACV,aAAa,CACjB,KAAiB;;YAEjB,MAAM,WAAW,GAAG,6BAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAE5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAClD,KAAK,EACL,iBAAiB,CAAC,OAAO,EACzB,SAAS,EACT,EAAE,CACH,CAAC;YACF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAE9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;YAC3E,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1C,OAAO,IAAI,uBAAe,CAAC,OAAO,EAAE;gBAClC,IAAI,EAAE,iBAAS,CAAC,aAAa;gBAC7B,KAAK,EAAE,OAAO,CAAC,OAAO;gBACtB,cAAc,EAAE,OAAO,CAAC,OAAO;gBAC/B,MAAM,EAAE,OAAO,CAAC,OAAO;aACxB,CAAuD,CAAC;QAC3D,CAAC;KAAA;IAEK,SAAS;;YACb,OAAO,IAAI,yBAAW,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAClE,CAAC;KAAA;CACF;AA9CD,4CA8CC"}

package/dist/core/contracts.d.ts

@@ -1,30 +1,21 @@
-import { AbacusConnectionManager, AbacusConnectionManager__factory, Inbox, InboxValidatorManager, InboxValidatorManager__factory, Inbox__factory, InterchainGasPaymaster, InterchainGasPaymaster__factory, Outbox, OutboxValidatorManager, OutboxValidatorManager__factory, Outbox__factory, UpgradeBeaconController, UpgradeBeaconController__factory } from '@hyperlane-xyz/core';
+import { Create2Factory__factory, InterchainAccountRouter__factory, InterchainGasPaymaster, InterchainGasPaymaster__factory, InterchainQueryRouter__factory, Mailbox, Mailbox__factory, MultisigIsm, MultisigIsm__factory, UpgradeBeaconController, UpgradeBeaconController__factory } from '@hyperlane-xyz/core';
 import { BeaconProxyAddresses, ProxiedContract } from '../proxy';
-import { ChainName, RemoteChainMap } from '../types';
-export declare type InboxContracts = {
-    inbox: ProxiedContract<Inbox, BeaconProxyAddresses>;
-    inboxValidatorManager: InboxValidatorManager;
-};
-export declare type OutboxContracts = {
-    outbox: ProxiedContract<Outbox, BeaconProxyAddresses>;
-    outboxValidatorManager: OutboxValidatorManager;
-};
 declare type ConnectionClientContracts = {
     interchainGasPaymaster: ProxiedContract<InterchainGasPaymaster, BeaconProxyAddresses>;
-    connectionManager: AbacusConnectionManager;
 };
-export declare type CoreContracts<Chains extends ChainName, Local extends Chains> = OutboxContracts & ConnectionClientContracts & {
-    inboxes: RemoteChainMap<Chains, Local, InboxContracts>;
+export declare type CoreContracts = ConnectionClientContracts & {
+    mailbox: ProxiedContract<Mailbox, BeaconProxyAddresses>;
+    multisigIsm: MultisigIsm;
     upgradeBeaconController: UpgradeBeaconController;
 };
 export declare const coreFactories: {
-    outbox: Outbox__factory;
-    outboxValidatorManager: OutboxValidatorManager__factory;
-    inbox: Inbox__factory;
-    inboxValidatorManager: InboxValidatorManager__factory;
-    connectionManager: AbacusConnectionManager__factory;
+    interchainAccountRouter: InterchainAccountRouter__factory;
+    interchainQueryRouter: InterchainQueryRouter__factory;
+    create2Factory: Create2Factory__factory;
     upgradeBeaconController: UpgradeBeaconController__factory;
     interchainGasPaymaster: InterchainGasPaymaster__factory;
+    multisigIsm: MultisigIsm__factory;
+    mailbox: Mailbox__factory;
 };
 export {};
 //# sourceMappingURL=contracts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,gCAAgC,EAChC,KAAK,EACL,qBAAqB,EACrB,8BAA8B,EAC9B,cAAc,EACd,sBAAsB,EACtB,+BAA+B,EAC/B,MAAM,EACN,sBAAsB,EACtB,+BAA+B,EAC/B,eAAe,EACf,uBAAuB,EACvB,gCAAgC,EACjC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAErD,oBAAY,cAAc,GAAG;IAC3B,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;IACpD,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C,CAAC;AAEF,oBAAY,eAAe,GAAG;IAC5B,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACtD,sBAAsB,EAAE,sBAAsB,CAAC;CAChD,CAAC;AAEF,aAAK,yBAAyB,GAAG;IAC/B,sBAAsB,EAAE,eAAe,CACrC,sBAAsB,EACtB,oBAAoB,CACrB,CAAC;IACF,iBAAiB,EAAE,uBAAuB,CAAC;CAC5C,CAAC;AAEF,oBAAY,aAAa,CACvB,MAAM,SAAS,SAAS,EACxB,KAAK,SAAS,MAAM,IAClB,eAAe,GACjB,yBAAyB,GAAG;IAC1B,OAAO,EAAE,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;IACvD,uBAAuB,EAAE,uBAAuB,CAAC;CAClD,CAAC;AAYJ,eAAO,MAAM,aAAa;;;;;;;;CAMzB,CAAC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,gCAAgC,EAChC,sBAAsB,EACtB,+BAA+B,EAC/B,8BAA8B,EAC9B,OAAO,EACP,gBAAgB,EAChB,WAAW,EACX,oBAAoB,EACpB,uBAAuB,EACvB,gCAAgC,EACjC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEjE,aAAK,yBAAyB,GAAG;IAC/B,sBAAsB,EAAE,eAAe,CACrC,sBAAsB,EACtB,oBAAoB,CACrB,CAAC;CACH,CAAC;AAEF,oBAAY,aAAa,GAAG,yBAAyB,GAAG;IACtD,OAAO,EAAE,eAAe,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IACxD,WAAW,EAAE,WAAW,CAAC;IACzB,uBAAuB,EAAE,uBAAuB,CAAC;CAClD,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;;CAQzB,CAAC"}

package/dist/core/contracts.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.coreFactories = void 0;
 const core_1 = require("@hyperlane-xyz/core");
-const inboxFactories = {
-    inbox: new core_1.Inbox__factory(),
-    inboxValidatorManager: new core_1.InboxValidatorManager__factory(),
+exports.coreFactories = {
+    interchainAccountRouter: new core_1.InterchainAccountRouter__factory(),
+    interchainQueryRouter: new core_1.InterchainQueryRouter__factory(),
+    create2Factory: new core_1.Create2Factory__factory(),
+    upgradeBeaconController: new core_1.UpgradeBeaconController__factory(),
+    interchainGasPaymaster: new core_1.InterchainGasPaymaster__factory(),
+    multisigIsm: new core_1.MultisigIsm__factory(),
+    mailbox: new core_1.Mailbox__factory(),
 };
-const outboxFactories = {
-    outbox: new core_1.Outbox__factory(),
-    outboxValidatorManager: new core_1.OutboxValidatorManager__factory(),
-};
-exports.coreFactories = Object.assign(Object.assign({ connectionManager: new core_1.AbacusConnectionManager__factory(), upgradeBeaconController: new core_1.UpgradeBeaconController__factory(), interchainGasPaymaster: new core_1.InterchainGasPaymaster__factory() }, inboxFactories), outboxFactories);
 //# sourceMappingURL=contracts.js.map

package/dist/core/contracts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAe6B;AAgC7B,MAAM,cAAc,GAAG;IACrB,KAAK,EAAE,IAAI,qBAAc,EAAE;IAC3B,qBAAqB,EAAE,IAAI,qCAA8B,EAAE;CAC5D,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,IAAI,sBAAe,EAAE;IAC7B,sBAAsB,EAAE,IAAI,sCAA+B,EAAE;CAC9D,CAAC;AAEW,QAAA,aAAa,iCACxB,iBAAiB,EAAE,IAAI,uCAAgC,EAAE,EACzD,uBAAuB,EAAE,IAAI,uCAAgC,EAAE,EAC/D,sBAAsB,EAAE,IAAI,sCAA+B,EAAE,IAC1D,cAAc,GACd,eAAe,EAClB"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAY6B;AAiBhB,QAAA,aAAa,GAAG;IAC3B,uBAAuB,EAAE,IAAI,uCAAgC,EAAE;IAC/D,qBAAqB,EAAE,IAAI,qCAA8B,EAAE;IAC3D,cAAc,EAAE,IAAI,8BAAuB,EAAE;IAC7C,uBAAuB,EAAE,IAAI,uCAAgC,EAAE;IAC/D,sBAAsB,EAAE,IAAI,sCAA+B,EAAE;IAC7D,WAAW,EAAE,IAAI,2BAAoB,EAAE;IACvC,OAAO,EAAE,IAAI,uBAAgB,EAAE;CAChC,CAAC"}

package/dist/core/events.d.ts

@@ -1,5 +1,4 @@
-import type { ProcessEvent } from '@hyperlane-xyz/core/dist/contracts/Inbox';
-import type { DispatchEvent } from '@hyperlane-xyz/core/dist/contracts/Outbox';
+import type { DispatchEvent, ProcessEvent } from '@hyperlane-xyz/core/dist/contracts/Mailbox';
 import { Annotated } from '../events';
 export { DispatchEvent, ProcessEvent };
 export declare type HyperlaneLifecyleEvent = ProcessEvent | DispatchEvent;

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

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/core/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAEvC,oBAAY,sBAAsB,GAAG,YAAY,GAAG,aAAa,CAAC;AAElE,oBAAY,iBAAiB,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AACzD,oBAAY,gBAAgB,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;AAEvD,oBAAY,uBAAuB,GAAG,iBAAiB,GAAG,gBAAgB,CAAC"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/core/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACb,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAEvC,oBAAY,sBAAsB,GAAG,YAAY,GAAG,aAAa,CAAC;AAElE,oBAAY,iBAAiB,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AACzD,oBAAY,gBAAgB,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;AAEvD,oBAAY,uBAAuB,GAAG,iBAAiB,GAAG,gBAAgB,CAAC"}

package/dist/core/message.d.ts

@@ -1,5 +1,5 @@
-import { BigNumber, providers } from 'ethers';
-import { Inbox, Outbox } from '@hyperlane-xyz/core';
+import { providers } from 'ethers';
+import { Mailbox } from '@hyperlane-xyz/core';
 import { types } from '@hyperlane-xyz/utils';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainName, NameOrDomain } from '../types';
@@ -21,11 +21,6 @@ export declare enum MessageStatus {
     Relayed = 2,
     Processed = 3
 }
-export declare enum InboxMessageStatus {
-    None = 0,
-    Proven = 1,
-    Processed = 2
-}
 export declare type EventCache = {
     process?: AnnotatedProcess;
 };
@@ -35,8 +30,8 @@ export declare type EventCache = {
 export declare class HyperlaneMessage {
     readonly dispatch: AnnotatedDispatch;
     readonly message: types.ParsedMessage;
-    readonly outbox: Outbox;
-    readonly inbox: Inbox;
+    readonly outbox: Mailbox;
+    readonly inbox: Mailbox;
     readonly multiProvider: MultiProvider;
     readonly core: HyperlaneCore;
     protected cache: EventCache;
@@ -97,13 +92,6 @@ export declare class HyperlaneMessage {
      * @returns An array of {@link AnnotatedLifecycleEvent} objects
      */
     events(): Promise<HyperlaneStatus>;
-    /**
-     * Retrieve the inbox status of this message.
-     *
-     * @returns The {@link InboxMessageStatus} corresponding to the solidity
-     * status of the message.
-     */
-    inboxStatus(): Promise<InboxMessageStatus>;
     /**
      * Checks whether the message has been delivered.
      *
@@ -151,12 +139,8 @@ export declare class HyperlaneMessage {
      */
     get transactionHash(): string;
     /**
-     * The messageHash committed to the tree in the Outbox contract.
-     */
-    get leaf(): string;
-    /**
-     * The index of the leaf in the contract.
+     * The messageId committed to the tree in the Outbox contract.
      */
-    get leafIndex(): BigNumber;
+    get id(): string;
 }
 //# sourceMappingURL=message.d.ts.map

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

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