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

package/dist/core/HyperlaneCore.js

@@ -1,9 +1,11 @@
+import { ethers } from 'ethers';
 import { Mailbox__factory } from '@hyperlane-xyz/core';
-import { ProtocolType, bytes32ToAddress, eqAddress, messageId, objFilter, objMap, parseMessage, pollAsync, } from '@hyperlane-xyz/utils';
+import { ProtocolType, addressToBytes32, bytes32ToAddress, eqAddress, messageId, objFilter, objMap, parseMessage, pollAsync, } from '@hyperlane-xyz/utils';
 import { HyperlaneApp } from '../app/HyperlaneApp.js';
 import { appFromAddressesMapHelper } from '../contracts/contracts.js';
-import { EvmIsmReader } from '../ism/read.js';
+import { EvmIsmReader } from '../ism/EvmIsmReader.js';
 import { IsmType, ModuleType, ismTypeToModuleType } from '../ism/types.js';
+import { findMatchingLogEvents } from '../utils/logUtils.js';
 import { coreFactories } from './contracts.js';
 export class HyperlaneCore extends HyperlaneApp {
     static fromAddressesMap(addressesMap, multiProvider) {
@@ -19,9 +21,9 @@ export class HyperlaneCore extends HyperlaneApp {
         // filter for EVM chains
         return objFilter(config, (chainName, _) => this.multiProvider.getProtocol(chainName) === ProtocolType.Ethereum);
     };
-    quoteGasPayment = (origin, destination, recipient, body) => {
+    quoteGasPayment = (origin, destination, recipient, body, metadata, hook) => {
         const destinationId = this.multiProvider.getDomainId(destination);
-        return this.contractsMap[origin].mailbox['quoteDispatch(uint32,bytes32,bytes)'](destinationId, recipient, body);
+        return this.contractsMap[origin].mailbox['quoteDispatch(uint32,bytes32,bytes,bytes,address)'](destinationId, recipient, body, metadata || '0x', hook || ethers.constants.AddressZero);
     };
     getDestination(message) {
         return this.multiProvider.getChainName(message.parsed.destination);
@@ -57,6 +59,17 @@ export class HyperlaneCore extends HyperlaneApp {
                 throw new Error(`Unsupported module type ${moduleType}`);
         }
     }
+    async sendMessage(origin, destination, recipient, body, hook, metadata) {
+        const mailbox = this.getContracts(origin).mailbox;
+        const destinationDomain = this.multiProvider.getDomainId(destination);
+        const recipientBytes32 = addressToBytes32(recipient);
+        const quote = await this.quoteGasPayment(origin, destination, recipientBytes32, body, metadata, hook);
+        const dispatchTx = await this.multiProvider.handleTx(origin, mailbox['dispatch(uint32,bytes32,bytes,bytes,address)'](destinationDomain, recipientBytes32, body, metadata || '0x', hook || ethers.constants.AddressZero, { value: quote }));
+        return {
+            dispatchTx,
+            message: this.getDispatchedMessages(dispatchTx)[0],
+        };
+    }
     async relayMessage(message) {
         const metadata = await this.buildMetadata(message);
         const destinationChain = this.getDestination(message);
@@ -104,7 +117,12 @@ export class HyperlaneCore extends HyperlaneApp {
     }
     // Redundant with static method but keeping for backwards compatibility
     getDispatchedMessages(sourceTx) {
-        return HyperlaneCore.getDispatchedMessages(sourceTx);
+        const messages = HyperlaneCore.getDispatchedMessages(sourceTx);
+        return messages.map(({ parsed, ...other }) => {
+            const originChain = this.multiProvider.tryGetChainName(parsed.origin) ?? undefined;
+            const destinationChain = this.multiProvider.tryGetChainName(parsed.destination) ?? undefined;
+            return { parsed: { ...parsed, originChain, destinationChain }, ...other };
+        });
     }
     async getDispatchTx(originChain, messageId) {
         const mailbox = this.contractsMap[originChain].mailbox;
@@ -118,16 +136,7 @@ export class HyperlaneCore extends HyperlaneApp {
     }
     static getDispatchedMessages(sourceTx) {
         const mailbox = Mailbox__factory.createInterface();
-        const dispatchLogs = sourceTx.logs
-            .map((log) => {
-            try {
-                return mailbox.parseLog(log);
-            }
-            catch (e) {
-                return undefined;
-            }
-        })
-            .filter((log) => !!log && log.name === 'Dispatch');
+        const dispatchLogs = findMatchingLogEvents(sourceTx.logs, mailbox, 'Dispatch');
         return dispatchLogs.map((log) => {
             const message = log.args['message'];
             const parsed = parseMessage(message);

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":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAGL,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,SAAS,EACT,MAAM,EACN,YAAY,EACZ,SAAS,GACV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAGtE,OAAO,EAAoB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAI3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAiB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG9D,MAAM,OAAO,aAAc,SAAQ,YAA2B;IAC5D,MAAM,CAAC,gBAAgB,CACrB,YAAwC,EACxC,aAA4B;QAE5B,MAAM,MAAM,GAAG,yBAAyB,CACtC,YAAY,EACZ,aAAa,EACb,aAAa,CACd,CAAC;QACF,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACtE,CAAC;IAED,eAAe,GAAG,CAChB,MAAyC,EACjB,EAAE;QAC1B,aAAa;QACb,MAAM,MAAM,GAAG,MAAM,CACnB,IAAI,CAAC,YAAY,EACjB,CAAC,KAAK,EAAE,SAAS,EAAgB,EAAE,CAAC,CAAC;YACnC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO;YAClC,KAAK,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK;SACjE,CAAC,CACH,CAAC;QACF,wBAAwB;QACxB,OAAO,SAAS,CACd,MAAM,EACN,CAAC,SAAS,EAAE,CAAC,EAAqB,EAAE,CAClC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,YAAY,CAAC,QAAQ,CACtE,CAAC;IACJ,CAAC,CAAC;IAEF,eAAe,GAAG,CAChB,MAAiB,EACjB,WAAsB,EACtB,SAAyB,EACzB,IAAY,EACZ,QAAiB,EACjB,IAAc,EACa,EAAE;QAC7B,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CACtC,mDAAmD,CACpD,CACC,aAAa,EACb,SAAS,EACT,IAAI,EACJ,QAAQ,IAAI,IAAI,EAChB,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,CACrC,CAAC;IACJ,CAAC,CAAC;IAEQ,cAAc,CAAC,OAA0B;QACjD,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrE,CAAC;IAED,sBAAsB,CAAC,OAA0B;QAC/C,MAAM,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3E,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9D,OAAO,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,OAA0B;QAE1B,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAA0B;QAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAEtD,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,KAAK,OAAO,CAAC,eAAe;gBAC1B,gDAAgD;gBAChD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CACjE,gBAAgB,CACjB,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,gBAAgB,WAAW,iBAAiB,mCAAmC,SAAS,CAAC,OAAO,EAAE,CACtG,CAAC;gBACJ,CAAC;QACL,CAAC;QAED,2DAA2D;QAC3D,MAAM,UAAU,GAAG,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvD,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,UAAU,CAAC,IAAI;gBAClB,OAAO,IAAI,CAAC;YACd;gBACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CACf,MAAiB,EACjB,WAAsB,EACtB,SAAkB,EAClB,IAAY,EACZ,IAAc,EACd,QAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;QAClD,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CACtC,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,IAAI,CACL,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAClD,MAAM,EACN,OAAO,CAAC,8CAA8C,CAAC,CACrD,iBAAiB,EACjB,gBAAgB,EAChB,IAAI,EACJ,QAAQ,IAAI,IAAI,EAChB,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,EACpC,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CACF,CAAC;QACF,OAAO;YACL,UAAU;YACV,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SACnD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,OAA0B;QAE1B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;QAE5D,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAChC,gBAAgB,EAChB,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAC3C,CAAC;IACJ,CAAC;IAES,qBAAqB,CAC7B,OAA0B;QAE1B,MAAM,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;QAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE7C,OAAO,IAAI,OAAO,CAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;gBACxC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;oBACrB,MAAM,CAAC,uBAAuB,EAAE,YAAY,SAAS,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBACD,OAAO,CACL,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CACtE,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,SAAiB,EACjB,WAAsB,EACtB,OAAgB,EAChB,WAAoB;QAEpB,MAAM,SAAS,CACb,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,SAAS,gBAAgB,CAAC,CAAC;YACpE,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;YACvD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACrD,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,SAAS,gBAAgB,CAAC,CAAC;gBACvD,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,WAAW,SAAS,oBAAoB,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,EACD,OAAO,EACP,WAAW,CACZ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAwB,CACtB,QAAgD;QAEhD,MAAM,QAAQ,GAAG,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/D,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;IAED,6EAA6E;IAC7E,KAAK,CAAC,uBAAuB,CAC3B,QAAgD,EAChD,KAAc,EACd,WAAoB;QAEpB,MAAM,QAAQ,GAAG,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnB,IAAI,CAAC,yBAAyB,CAC5B,GAAG,CAAC,EAAE,EACN,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EACxB,KAAK,EACL,WAAW,CACZ,CACF,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iCAAiC,QAAQ,CAAC,eAAe,EAAE,CAC5D,CAAC;IACJ,CAAC;IAED,uEAAuE;IACvE,qBAAqB,CACnB,QAAgD;QAEhD,MAAM,QAAQ,GAAG,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;YAC3C,MAAM,WAAW,GACf,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC;YACjE,MAAM,gBAAgB,GACpB,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC;YACtE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,GAAG,KAAK,EAAE,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,WAAsB,EACtB,SAAiB;QAEjB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QACvD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,8BAA8B;QAC/D,OAAO,KAAK,CAAC,qBAAqB,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,qBAAqB,CAC1B,QAAgD;QAEhD,MAAM,OAAO,GAAG,gBAAgB,CAAC,eAAe,EAAE,CAAC;QACnD,MAAM,YAAY,GAAG,qBAAqB,CACxC,QAAQ,CAAC,IAAI,EACb,OAAO,EACP,UAAU,CACX,CAAC;QACF,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/core/HyperlaneCoreDeployer.d.ts

@@ -16,7 +16,7 @@ export declare class HyperlaneCoreDeployer extends HyperlaneDeployer<CoreConfig,
     readonly ismFactory: HyperlaneIsmFactory;
     hookDeployer: HyperlaneHookDeployer;
     testRecipient: TestRecipientDeployer;
-    constructor(multiProvider: MultiProvider, ismFactory: HyperlaneIsmFactory, contractVerifier?: ContractVerifier);
+    constructor(multiProvider: MultiProvider, ismFactory: HyperlaneIsmFactory, contractVerifier?: ContractVerifier, concurrentDeploy?: boolean);
     cacheAddressesMap(addressesMap: ChainMap<CoreAddresses>): void;
     deployMailbox(chain: ChainName, config: CoreConfig, proxyAdmin: Address): Promise<Mailbox>;
     deployValidatorAnnounce(chain: ChainName, mailboxAddress: string): Promise<ValidatorAnnounce>;

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAMG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IAL1C,YAAY,EAAE,qBAAqB,CAAC;IACpC,aAAa,EAAE,qBAAqB,CAAC;gBAGnC,aAAa,EAAE,aAAa,EACnB,UAAU,EAAE,mBAAmB,EACxC,gBAAgB,CAAC,EAAE,gBAAgB;IAoBrC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI;IAKxD,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC;IAgHb,uBAAuB,CAC3B,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC;IASvB,UAAU,CACd,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GACpC,OAAO,CAAC,iBAAiB,CAAC;IAcvB,SAAS,CACb,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC;IAUb,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,wBAAwB,CAAC,EAAE,SAAS,GACnC,OAAO,CAAC,aAAa,CAAC;IAQnB,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CA0C9C"}
+{"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,OAAO,EACP,aAAa,EACb,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAc,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAMG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IAL1C,YAAY,EAAE,qBAAqB,CAAC;IACpC,aAAa,EAAE,qBAAqB,CAAC;gBAGnC,aAAa,EAAE,aAAa,EACnB,UAAU,EAAE,mBAAmB,EACxC,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,gBAAgB,GAAE,OAAe;IAqBnC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,GAAG,IAAI;IAKxD,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC;IAyGb,uBAAuB,CAC3B,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC;IASvB,UAAU,CACd,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GACpC,OAAO,CAAC,iBAAiB,CAAC;IAqBvB,SAAS,CACb,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC;IAUb,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,wBAAwB,CAAC,EAAE,SAAS,GACnC,OAAO,CAAC,aAAa,CAAC;IAQnB,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CA0C9C"}

package/dist/core/HyperlaneCoreDeployer.js

@@ -1,3 +1,4 @@
+import { IPostDispatchHook__factory, } from '@hyperlane-xyz/core';
 import { rootLogger } from '@hyperlane-xyz/utils';
 import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer.js';
 import { HyperlaneHookDeployer } from '../hook/HyperlaneHookDeployer.js';
@@ -8,12 +9,13 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer {
     ismFactory;
     hookDeployer;
     testRecipient;
-    constructor(multiProvider, ismFactory, contractVerifier) {
+    constructor(multiProvider, ismFactory, contractVerifier, concurrentDeploy = false) {
         super(multiProvider, coreFactories, {
             logger: rootLogger.child({ module: 'CoreDeployer' }),
             chainTimeoutMs: 1000 * 60 * 10, // 10 minutes
             ismFactory,
             contractVerifier,
+            concurrentDeploy,
         });
         this.ismFactory = ismFactory;
         this.hookDeployer = new HyperlaneHookDeployer(multiProvider, {}, ismFactory, contractVerifier);
@@ -26,8 +28,6 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer {
     async deployMailbox(chain, config, proxyAdmin) {
         const domain = this.multiProvider.getDomainId(chain);
         const mailbox = await this.deployProxiedContract(chain, 'mailbox', 'mailbox', proxyAdmin, [domain]);
-        // resolve the owner account so that the subsequent calls terminate early
-        config.owner = await this.resolveInterchainAccountAsOwner(chain, config.owner);
         let defaultIsm = await mailbox.defaultIsm();
         const matches = await moduleMatchesConfig(chain, defaultIsm, config.defaultIsm, this.multiProvider, this.ismFactory.getContracts(chain));
         if (!matches) {
@@ -42,9 +42,8 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer {
         const requiredHook = await this.deployHook(chain, config.requiredHook, hookAddresses);
         // configure mailbox
         try {
-            const owner = await this.resolveInterchainAccountAsOwner(chain, config.owner);
             this.logger.debug('Initializing mailbox');
-            await this.multiProvider.handleTx(chain, mailbox.initialize(owner, defaultIsm, defaultHook.address, requiredHook.address, this.multiProvider.getTransactionOverrides(chain)));
+            await this.multiProvider.handleTx(chain, mailbox.initialize(config.owner, defaultIsm, defaultHook.address, requiredHook.address, this.multiProvider.getTransactionOverrides(chain)));
         }
         catch (e) {
             if (!e.message.includes('already initialized') &&
@@ -52,13 +51,15 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer {
                 !e.message.includes('Reverted 0x08c379a') &&
                 // Handle situation where the gas estimation fails on the call function,
                 // then the real error reason is not available in `e.message`, but rather in `e.error.reason`
-                !e.error?.reason?.includes('already initialized')) {
+                !e.error?.reason?.includes('already initialized') &&
+                // Some providers, like on Viction, return a generic error message for all revert reasons
+                !e.message.includes('always failing transaction')) {
                 throw e;
             }
             this.logger.debug('Mailbox already initialized');
             const overrides = this.multiProvider.getTransactionOverrides(chain);
-            await this.configureHook(chain, mailbox, defaultHook, (_mailbox) => _mailbox.defaultHook(), (_mailbox, _hook) => _mailbox.populateTransaction.setDefaultHook(_hook, { ...overrides }));
-            await this.configureHook(chain, mailbox, requiredHook, (_mailbox) => _mailbox.requiredHook(), (_mailbox, _hook) => _mailbox.populateTransaction.setRequiredHook(_hook, { ...overrides }));
+            await this.configureHook(chain, mailbox, defaultHook.address, (_mailbox) => _mailbox.defaultHook(), (_mailbox, _hook) => _mailbox.populateTransaction.setDefaultHook(_hook, { ...overrides }));
+            await this.configureHook(chain, mailbox, requiredHook.address, (_mailbox) => _mailbox.requiredHook(), (_mailbox, _hook) => _mailbox.populateTransaction.setRequiredHook(_hook, { ...overrides }));
             await this.configureIsm(chain, mailbox, defaultIsm, (_mailbox) => _mailbox.defaultIsm(), (_mailbox, _module) => _mailbox.populateTransaction.setDefaultIsm(_module));
         }
         return mailbox;
@@ -68,6 +69,9 @@ export class HyperlaneCoreDeployer extends HyperlaneDeployer {
         return validatorAnnounce;
     }
     async deployHook(chain, config, coreAddresses) {
+        if (typeof config === 'string') {
+            return IPostDispatchHook__factory.connect(config, this.multiProvider.getProvider(chain));
+        }
         const hooks = await this.hookDeployer.deployContracts(chain, config, coreAddresses);
         this.addDeployedContracts(chain, this.hookDeployer.deployedContracts[chain], this.hookDeployer.verificationInputs[chain]);
         return hooks[config.type];

package/dist/core/HyperlaneCoreDeployer.js.map

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