@hyperlane-xyz/sdk 1.5.3 → 1.5.5-beta0

package/dist/consts/multisigIsm.js.map

@@ -1 +1 @@
-{"version":3,"file":"multisigIsm.js","sourceRoot":"","sources":["../../src/consts/multisigIsm.ts"],"names":[],"mappings":";;;AAAA,wCAA6D;AAGhD,QAAA,yBAAyB,GAAgC;IACpE,+CAA+C;IAC/C,IAAI,EAAE;QACJ,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,SAAS,EAAE;QACT,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,OAAO,EAAE;QACP,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,GAAG,EAAE;QACH,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,MAAM;SACrD;KACF;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,SAAS;SACxD;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,SAAS;SACxD;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C,EAAE,YAAY;SAC3D;KACF;IACD,+CAA+C;IAC/C,SAAS,EAAE;QACT,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,UAAU,EAAE;QACV,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,MAAM,EAAE;QACN,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,OAAO,EAAE;QACP,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,aAAa,EAAE;QACb,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,cAAc,EAAE;QACd,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,cAAc,EAAE;QACd,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,kBAAU,CAAC,eAAe;QAChC,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE;YACV,4CAA4C;YAC5C,4CAA4C;YAC5C,4CAA4C;SAC7C;KACF;CACF,CAAC"}
+{"version":3,"file":"multisigIsm.js","sourceRoot":"","sources":["../../src/consts/multisigIsm.ts"],"names":[],"mappings":"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"}

package/dist/contracts/contracts.d.ts

@@ -1,5 +1,5 @@
 import { Ownable } from '@hyperlane-xyz/core';
-import { Address, ProtocolType } from '@hyperlane-xyz/utils';
+import { ProtocolType } from '@hyperlane-xyz/utils';
 import { ChainMetadataManager } from '../metadata/ChainMetadataManager';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainMap, Connection } from '../types';
@@ -7,14 +7,9 @@ import { HyperlaneAddresses, HyperlaneAddressesMap, HyperlaneContracts, Hyperlan
 export declare function serializeContractsMap<F extends HyperlaneFactories>(contractsMap: HyperlaneContractsMap<F>): HyperlaneAddressesMap<F>;
 export declare function serializeContracts<F extends HyperlaneFactories>(contracts: HyperlaneContracts<F>): HyperlaneAddresses<F>;
 export declare function filterAddressesMap<F extends HyperlaneFactories>(addressesMap: HyperlaneAddressesMap<any>, factories: F): HyperlaneAddressesMap<F>;
-export declare function filterChainMapToProtocol(contractsMap: ChainMap<any>, protocolType: ProtocolType, metadataManager: ChainMetadataManager<any>): ChainMap<any>;
-export declare function filterChainMapExcludeProtocol(contractsMap: ChainMap<any>, protocolType: ProtocolType, metadataManager: ChainMetadataManager<any>): ChainMap<any>;
+export declare function filterAddressesToProtocol(addresses: HyperlaneAddressesMap<any>, protocolType: ProtocolType, metadataManager: ChainMetadataManager<any>): HyperlaneAddressesMap<any>;
 export declare function attachContracts<F extends HyperlaneFactories>(addresses: HyperlaneAddresses<F>, factories: F): HyperlaneContracts<F>;
 export declare function attachContractsMap<F extends HyperlaneFactories>(addressesMap: HyperlaneAddressesMap<any>, factories: F): HyperlaneContractsMap<F>;
-export declare function attachContractsMapAndGetForeignDeployments<F extends HyperlaneFactories>(addressesMap: HyperlaneAddressesMap<any>, factories: F, metadataManager: ChainMetadataManager<any>): {
-    contractsMap: HyperlaneContractsMap<F>;
-    foreignDeployments: ChainMap<Address>;
-};
 export declare function connectContracts<F extends HyperlaneFactories>(contracts: HyperlaneContracts<F>, connection: Connection): HyperlaneContracts<F>;
 export declare function connectContractsMap<F extends HyperlaneFactories>(contractsMap: ChainMap<HyperlaneContracts<F>>, multiProvider: MultiProvider): ChainMap<HyperlaneContracts<F>>;
 export declare function filterOwnableContracts(contracts: HyperlaneContracts<any>): Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/contracts/contracts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/contracts/contracts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAEL,YAAY,EAMb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,kBAAkB,EAChE,YAAY,EAAE,qBAAqB,CAAC,CAAC,CAAC,GACrC,qBAAqB,CAAC,CAAC,CAAC,CAI1B;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,EAC7D,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC/B,kBAAkB,CAAC,CAAC,CAAC,CAEvB;AAYD,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,EAC7D,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,SAAS,EAAE,CAAC,GACX,qBAAqB,CAAC,CAAC,CAAC,CAa1B;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACrC,YAAY,EAAE,YAAY,EAE1B,eAAe,EAAE,oBAAoB,CAAC,GAAG,CAAC,GACzC,qBAAqB,CAAC,GAAG,CAAC,CAM5B;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,kBAAkB,EAC1D,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAChC,SAAS,EAAE,CAAC,GACX,kBAAkB,CAAC,CAAC,CAAC,CAKvB;AAED,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,kBAAkB,EAC7D,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,SAAS,EAAE,CAAC,GACX,qBAAqB,CAAC,CAAC,CAAC,CAK1B;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,kBAAkB,EAC3D,SAAS,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAChC,UAAU,EAAE,UAAU,GACrB,kBAAkB,CAAC,CAAC,CAAC,CAKvB;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,kBAAkB,EAC9D,YAAY,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAC7C,aAAa,EAAE,aAAa,GAC3B,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAIjC;AAED,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,kBAAkB,CAAC,GAAG,CAAC,GACjC,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC,CAcrC;AAED,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,kBAAkB,EACpE,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,SAAS,EAAE,CAAC,EACZ,aAAa,EAAE,aAAa,GAC3B;IACD,YAAY,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B,CAgBA"}

package/dist/contracts/contracts.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appFromAddressesMapHelper = exports.filterOwnableContracts = exports.connectContractsMap = exports.connectContracts = exports.attachContractsMapAndGetForeignDeployments = exports.attachContractsMap = exports.attachContracts = exports.filterChainMapExcludeProtocol = exports.filterChainMapToProtocol = exports.filterAddressesMap = exports.serializeContracts = exports.serializeContractsMap = void 0;
-const ethers_1 = require("ethers");
+exports.appFromAddressesMapHelper = exports.filterOwnableContracts = exports.connectContractsMap = exports.connectContracts = exports.attachContractsMap = exports.attachContracts = exports.filterAddressesToProtocol = exports.filterAddressesMap = exports.serializeContracts = exports.serializeContractsMap = void 0;
 const utils_1 = require("@hyperlane-xyz/utils");
 function serializeContractsMap(contractsMap) {
     return (0, utils_1.objMap)(contractsMap, (_, contracts) => {
@@ -29,14 +28,12 @@ function filterAddressesMap(addressesMap, factories) {
     });
 }
 exports.filterAddressesMap = filterAddressesMap;
-function filterChainMapToProtocol(contractsMap, protocolType, metadataManager) {
-    return (0, utils_1.objFilter)(contractsMap, (c, _addrs) => metadataManager.tryGetChainMetadata(c)?.protocol === protocolType);
+function filterAddressesToProtocol(addresses, protocolType, 
+// Note, MultiProviders are passable here
+metadataManager) {
+    return (0, utils_1.objFilter)(addresses, (c, _addrs) => metadataManager.tryGetChainMetadata(c)?.protocol === protocolType);
 }
-exports.filterChainMapToProtocol = filterChainMapToProtocol;
-function filterChainMapExcludeProtocol(contractsMap, protocolType, metadataManager) {
-    return (0, utils_1.objFilter)(contractsMap, (c, _addrs) => metadataManager.tryGetChainMetadata(c)?.protocol !== protocolType);
-}
-exports.filterChainMapExcludeProtocol = filterChainMapExcludeProtocol;
+exports.filterAddressesToProtocol = filterAddressesToProtocol;
 function attachContracts(addresses, factories) {
     return (0, utils_1.objMap)(addresses, (key, address) => {
         const factory = getFactory(key, factories);
@@ -49,15 +46,6 @@ function attachContractsMap(addressesMap, factories) {
     return (0, utils_1.objMap)(filteredAddressesMap, (_, addresses) => attachContracts(addresses, factories));
 }
 exports.attachContractsMap = attachContractsMap;
-function attachContractsMapAndGetForeignDeployments(addressesMap, factories, metadataManager) {
-    const contractsMap = attachContractsMap(filterChainMapToProtocol(addressesMap, utils_1.ProtocolType.Ethereum, metadataManager), factories);
-    const foreignDeployments = (0, utils_1.objMap)(filterChainMapExcludeProtocol(addressesMap, utils_1.ProtocolType.Ethereum, metadataManager), (_, addresses) => (0, utils_1.hexOrBase58ToHex)(addresses.router));
-    return {
-        contractsMap,
-        foreignDeployments,
-    };
-}
-exports.attachContractsMapAndGetForeignDeployments = attachContractsMapAndGetForeignDeployments;
 function connectContracts(contracts, connection) {
     return (0, utils_1.objMap)(contracts, (_, contract) => contract.connect(connection));
 }
@@ -81,21 +69,9 @@ async function filterOwnableContracts(contracts) {
 }
 exports.filterOwnableContracts = filterOwnableContracts;
 function appFromAddressesMapHelper(addressesMap, factories, multiProvider) {
-    // Hack to accommodate non-Ethereum artifacts, while still retaining their
-    // presence in the addressesMap so that they are included in the list of chains
-    // on the MultiProvider (needed for getting metadata). A non-Ethereum-style address
-    // from another execution environment will cause Ethers to throw if we try to attach
-    // it, so we just replace it with the zero address.
-    const addressesMapWithEthereumizedAddresses = (0, utils_1.objMap)(addressesMap, (chain, addresses) => {
-        const metadata = multiProvider.getChainMetadata(chain);
-        if (metadata.protocol === utils_1.ProtocolType.Ethereum) {
-            return addresses;
-        }
-        return (0, utils_1.objMap)(addresses, (_key, _address) => ethers_1.ethers.constants.AddressZero);
-    });
     // Attaches contracts for each chain for which we have a complete set of
     // addresses
-    const contractsMap = attachContractsMap(addressesMapWithEthereumizedAddresses, factories);
+    const contractsMap = attachContractsMap(addressesMap, factories);
     // Filters out providers for chains for which we don't have a complete set
     // of addresses
     const intersection = multiProvider.intersect(Object.keys(contractsMap));

package/dist/contracts/contracts.js.map

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

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

@@ -8,8 +8,8 @@ const chai_1 = require("chai");
 const hardhat_1 = require("hardhat");
 const sinon_1 = __importDefault(require("sinon"));
 const chains_1 = require("../consts/chains");
+const HyperlaneProxyFactoryDeployer_1 = require("../deploy/HyperlaneProxyFactoryDeployer");
 const HyperlaneIsmFactory_1 = require("../ism/HyperlaneIsmFactory");
-const HyperlaneIsmFactoryDeployer_1 = require("../ism/HyperlaneIsmFactoryDeployer");
 const MultiProvider_1 = require("../providers/MultiProvider");
 const testUtils_1 = require("../test/testUtils");
 const HyperlaneCore_1 = require("./HyperlaneCore");
@@ -25,15 +25,15 @@ describe('core', async () => {
     before(async () => {
         const [signer] = await hardhat_1.ethers.getSigners();
         multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
-        const ismFactoryDeployer = new HyperlaneIsmFactoryDeployer_1.HyperlaneIsmFactoryDeployer(multiProvider);
-        const ismFactories = await ismFactoryDeployer.deploy(chains_1.TestChains);
+        const proxyFactoryDeployer = new HyperlaneProxyFactoryDeployer_1.HyperlaneProxyFactoryDeployer(multiProvider);
+        coreConfig = (0, testUtils_1.testCoreConfig)(chains_1.TestChains);
+        const ismFactories = await proxyFactoryDeployer.deploy(coreConfig);
         ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory(ismFactories, multiProvider);
     });
     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', async () => {
         deployer = new HyperlaneCoreDeployer_1.HyperlaneCoreDeployer(multiProvider, ismFactory);

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,14 +1,18 @@
 import { ethers } from 'ethers';
+import { Address, AddressBytes32 } from '@hyperlane-xyz/utils';
 import { HyperlaneApp } from '../app/HyperlaneApp';
 import { HyperlaneEnvironment } from '../consts/environments';
 import { HyperlaneAddressesMap } from '../contracts/types';
 import { MultiProvider } from '../providers/MultiProvider';
-import { ChainName } from '../types';
+import { RouterConfig } from '../router/types';
+import { ChainMap, ChainName } from '../types';
 import { CoreFactories } from './contracts';
 import { DispatchedMessage } from './types';
 export declare class HyperlaneCore extends HyperlaneApp<CoreFactories> {
     static fromEnvironment<Env extends HyperlaneEnvironment>(env: Env, multiProvider: MultiProvider): HyperlaneCore;
     static fromAddressesMap(addressesMap: HyperlaneAddressesMap<any>, multiProvider: MultiProvider): HyperlaneCore;
+    getRouterConfig: (owner: Address) => ChainMap<RouterConfig>;
+    quoteGasPayment: (origin: ChainName, destination: ChainName, recipient: AddressBytes32, body: string) => Promise<ethers.BigNumber>;
     protected getDestination(message: DispatchedMessage): ChainName;
     protected waitForProcessReceipt(message: DispatchedMessage): Promise<ethers.ContractReceipt>;
     waitForMessageIdProcessed(messageId: string, destination: ChainName, delayMs?: number, maxAttempts?: number): Promise<void>;

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;AAKhC,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;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,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,SAAS;IAI/D,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IAkB5B,yBAAyB,CAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,SAAS,EACtB,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAmBhB,wBAAwB,CACtB,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;IAM9B,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,CAAC,eAAe,EAChC,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAehB,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;AAGhC,OAAO,EACL,OAAO,EACP,cAAc,EAKf,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,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,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,eAAe,UAAW,OAAO,KAAG,SAAS,YAAY,CAAC,CAMrD;IAEL,eAAe,WACL,SAAS,eACJ,SAAS,aACX,cAAc,QACnB,MAAM,KACX,QAAQ,OAAO,SAAS,CAAC,CAK1B;IAEF,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS;IAI/D,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IAkB5B,yBAAyB,CAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,SAAS,EACtB,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAmBhB,wBAAwB,CACtB,QAAQ,EAAE,MAAM,CAAC,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;IAM9B,uBAAuB,CAC3B,QAAQ,EAAE,MAAM,CAAC,eAAe,EAChC,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAehB,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

@@ -8,6 +8,19 @@ const environments_1 = require("../consts/environments");
 const contracts_1 = require("../contracts/contracts");
 const contracts_2 = require("./contracts");
 class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
+    constructor() {
+        super(...arguments);
+        this.getRouterConfig = (owner) => (0, utils_1.objMap)(this.contractsMap, (_, contracts) => {
+            return {
+                mailbox: contracts.mailbox.address,
+                owner,
+            };
+        });
+        this.quoteGasPayment = (origin, destination, recipient, body) => {
+            const destinationId = this.multiProvider.getDomainId(destination);
+            return this.contractsMap[origin].mailbox['quoteDispatch(uint32,bytes32,bytes)'](destinationId, recipient, body);
+        };
+    }
     static fromEnvironment(env, multiProvider) {
         const envAddresses = environments_1.hyperlaneEnvironments[env];
         if (!envAddresses) {

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/HyperlaneCoreChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreChecker.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EACL,mBAAmB,EAGpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,UAAU,EAKX,MAAM,SAAS,CAAC;AAEjB,qBAAa,oBAAqB,SAAQ,mBAAmB,CAC3D,aAAa,EACb,UAAU,CACX;IAKG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;gBAHxC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,EACtB,UAAU,EAAE,mBAAmB;IAKpC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB3C,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrD,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B7C,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/C,sBAAsB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA6B9D"}
+{"version":3,"file":"HyperlaneCoreChecker.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EACL,mBAAmB,EAGpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EACL,UAAU,EAKX,MAAM,SAAS,CAAC;AAEjB,qBAAa,oBAAqB,SAAQ,mBAAmB,CAC3D,aAAa,EACb,UAAU,CACX;IAKG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;gBAHxC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,EACtB,UAAU,EAAE,mBAAmB;IAKpC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB3C,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAarD,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B7C,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6C/C,sBAAsB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA6B9D"}

package/dist/core/HyperlaneCoreChecker.js

@@ -32,9 +32,9 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         const config = this.configMap[chain];
         let ownableOverrides = {};
         if (config.upgrade) {
-            const timelockController = this.app.getAddresses(chain).timelockController;
+            const proxyOwner = await this.app.getContracts(chain).proxyAdmin.owner();
             ownableOverrides = {
-                proxyAdmin: timelockController,
+                proxyAdmin: proxyOwner,
             };
         }
         return this.checkOwnership(chain, config.owner, ownableOverrides);
@@ -50,7 +50,7 @@ class HyperlaneCoreChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
         if (!matches) {
             const violation = {
                 type: types_1.CoreViolationType.Mailbox,
-                subType: types_1.MailboxViolationType.DefaultIsm,
+                mailboxType: types_1.MailboxViolationType.DefaultIsm,
                 contract: mailbox,
                 chain,
                 actual: actualIsm,

package/dist/core/HyperlaneCoreChecker.js.map

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

package/dist/core/HyperlaneCoreDeployer.d.ts

@@ -2,18 +2,23 @@ import { Mailbox, ValidatorAnnounce } from '@hyperlane-xyz/core';
 import { Address } from '@hyperlane-xyz/utils';
 import { HyperlaneContracts } from '../contracts/types';
 import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer';
+import { HyperlaneHookDeployer } from '../hook/HyperlaneHookDeployer';
+import { HookConfig } from '../hook/types';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory';
 import { IsmConfig } from '../ism/types';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainMap, ChainName } from '../types';
-import { CoreFactories } from './contracts';
+import { CoreAddresses, CoreFactories } from './contracts';
 import { CoreConfig } from './types';
 export declare class HyperlaneCoreDeployer extends HyperlaneDeployer<CoreConfig, CoreFactories> {
     readonly ismFactory: HyperlaneIsmFactory;
     startingBlockNumbers: ChainMap<number | undefined>;
+    hookDeployer: HyperlaneHookDeployer;
     constructor(multiProvider: MultiProvider, ismFactory: HyperlaneIsmFactory);
-    deployMailbox(chain: ChainName, ismConfig: IsmConfig, proxyAdmin: Address, owner: Address): Promise<Mailbox>;
+    cacheAddressesMap(addressesMap: ChainMap<CoreAddresses>): void;
+    deployMailbox(chain: ChainName, config: CoreConfig, proxyAdmin: Address): Promise<Mailbox>;
     deployValidatorAnnounce(chain: ChainName, mailboxAddress: string): Promise<ValidatorAnnounce>;
+    deployHook(chain: ChainName, config: HookConfig, coreAddresses: Partial<CoreAddresses>): Promise<Address>;
     deployIsm(chain: ChainName, config: IsmConfig): Promise<Address>;
     deployContracts(chain: ChainName, config: CoreConfig): Promise<HyperlaneContracts<CoreFactories>>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAGP,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAKG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IAJ1C,oBAAoB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAM;gBAGtD,aAAa,EAAE,aAAa,EACnB,UAAU,EAAE,mBAAmB;IAQpC,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,OAAO,EACnB,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC;IA4Bb,uBAAuB,CAC3B,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC;IASvB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhE,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CAqD9C"}
+{"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EACP,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAMG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IAL1C,oBAAoB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAM;IACxD,YAAY,EAAE,qBAAqB,CAAC;gBAGlC,aAAa,EAAE,aAAa,EACnB,UAAU,EAAE,mBAAmB;IAa1C,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;IAwCb,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,OAAO,CAAC;IAUb,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBhE,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CAsC9C"}

package/dist/core/HyperlaneCoreDeployer.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperlaneCoreDeployer = void 0;
 const debug_1 = __importDefault(require("debug"));
-const ethers_1 = require("ethers");
 const core_1 = require("@hyperlane-xyz/core");
 const HyperlaneDeployer_1 = require("../deploy/HyperlaneDeployer");
+const HyperlaneHookDeployer_1 = require("../hook/HyperlaneHookDeployer");
 const contracts_1 = require("./contracts");
 class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
     constructor(multiProvider, ismFactory) {
@@ -17,27 +17,52 @@ class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
         });
         this.ismFactory = ismFactory;
         this.startingBlockNumbers = {};
+        this.hookDeployer = new HyperlaneHookDeployer_1.HyperlaneHookDeployer(multiProvider, {}, ismFactory);
     }
-    async deployMailbox(chain, ismConfig, proxyAdmin, owner) {
-        const cachedMailbox = this.readCache(chain, this.factories.mailbox, 'mailbox');
-        if (cachedMailbox) {
-            // let checker/governor handle cached mailbox default ISM configuration
-            // TODO: check if config matches AND deployer is owner?
-            return cachedMailbox;
-        }
-        const defaultIsmAddress = typeof ismConfig === 'string'
-            ? ismConfig
-            : await this.deployIsm(chain, ismConfig);
+    cacheAddressesMap(addressesMap) {
+        this.hookDeployer.cacheAddressesMap(addressesMap);
+        super.cacheAddressesMap(addressesMap);
+    }
+    async deployMailbox(chain, config, proxyAdmin) {
         const domain = this.multiProvider.getDomainId(chain);
-        return this.deployProxiedContract(chain, 'mailbox', proxyAdmin, [domain], [owner, defaultIsmAddress]);
+        const mailbox = await this.deployProxiedContract(chain, 'mailbox', proxyAdmin, [domain]);
+        const defaultIsm = await this.deployIsm(chain, config.defaultIsm);
+        const hookAddresses = { mailbox: mailbox.address, proxyAdmin };
+        const defaultHook = await this.deployHook(chain, config.defaultHook, hookAddresses);
+        const requiredHook = await this.deployHook(chain, config.requiredHook, hookAddresses);
+        // configure mailbox
+        try {
+            await this.multiProvider.handleTx(chain, mailbox.initialize(config.owner, defaultIsm, defaultHook, requiredHook));
+        }
+        catch (e) {
+            if (!e.message.includes('already initialized')) {
+                throw e;
+            }
+            else {
+                this.logger('Mailbox already initialized');
+            }
+        }
+        return mailbox;
     }
     async deployValidatorAnnounce(chain, mailboxAddress) {
         const validatorAnnounce = await this.deployContract(chain, 'validatorAnnounce', [mailboxAddress]);
         return validatorAnnounce;
     }
+    async deployHook(chain, config, coreAddresses) {
+        const hooks = await this.hookDeployer.deployContracts(chain, config, coreAddresses);
+        this.addDeployedContracts(chain, hooks);
+        return hooks[config.type].address;
+    }
     async deployIsm(chain, config) {
-        this.logger(`Deploying new ISM to ${chain}`);
+        const key = 'defaultIsm';
+        if (this.cachedAddresses[chain][key]) {
+            this.addDeployedContracts(chain, {
+                [key]: core_1.IInterchainSecurityModule__factory.connect(this.cachedAddresses[chain][key], this.multiProvider.getSignerOrProvider(chain)),
+            });
+            return this.cachedAddresses[chain][key];
+        }
         const ism = await this.ismFactory.deploy(chain, config);
+        this.addDeployedContracts(chain, { [key]: ism });
         return ism.address;
     }
     async deployContracts(chain, config) {
@@ -45,29 +70,24 @@ class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
             // skip deploying to chains configured to be removed
             return undefined;
         }
-        this.startingBlockNumbers[chain] = await this.multiProvider
-            .getProvider(chain)
-            .getBlockNumber();
         const proxyAdmin = await this.deployContract(chain, 'proxyAdmin', []);
-        const mailbox = await this.deployMailbox(chain, config.defaultIsm, proxyAdmin.address, config.owner);
+        const mailbox = await this.deployMailbox(chain, config, proxyAdmin.address);
+        // TODO: remove once agents fetch deployedBlock from mailbox
+        const deployedBlock = await mailbox.deployedBlock();
+        this.startingBlockNumbers[chain] = deployedBlock.toNumber();
         const validatorAnnounce = await this.deployValidatorAnnounce(chain, mailbox.address);
-        let timelockController;
+        let proxyOwner;
         if (config.upgrade) {
-            timelockController = await this.deployTimelock(chain, config.upgrade.timelock);
-            await this.transferOwnershipOfContracts(chain, timelockController.address, { proxyAdmin });
+            const timelockController = await this.deployTimelock(chain, config.upgrade.timelock);
+            proxyOwner = timelockController.address;
         }
         else {
-            // mock this for consistent serialization
-            timelockController = core_1.TimelockController__factory.connect(ethers_1.ethers.constants.AddressZero, this.multiProvider.getProvider(chain));
-            await this.transferOwnershipOfContracts(chain, config.owner, {
-                mailbox,
-                proxyAdmin,
-            });
+            proxyOwner = config.owner;
         }
+        await this.transferOwnershipOfContracts(chain, proxyOwner, { proxyAdmin });
         return {
             mailbox,
             proxyAdmin,
-            timelockController,
             validatorAnnounce,
         };
     }

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":";;;;;;AAAA,kDAA0B;AAE1B,8CAI6B;AAI7B,mEAAgE;AAChE,yEAAsE;AAOtE,2CAA0E;AAG1E,MAAa,qBAAsB,SAAQ,qCAG1C;IAIC,YACE,aAA4B,EACnB,UAA+B;QAExC,KAAK,CAAC,aAAa,EAAE,yBAAa,EAAE;YAClC,MAAM,EAAE,IAAA,eAAK,EAAC,wBAAwB,CAAC;YACvC,cAAc,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,aAAa;SAC9C,CAAC,CAAC;QALM,eAAU,GAAV,UAAU,CAAqB;QAL1C,yBAAoB,GAAiC,EAAE,CAAC;QAWtD,IAAI,CAAC,YAAY,GAAG,IAAI,6CAAqB,CAC3C,aAAa,EACb,EAAE,EACF,UAAU,CACX,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,YAAqC;QACrD,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAClD,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAgB,EAChB,MAAkB,EAClB,UAAmB;QAEnB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC9C,KAAK,EACL,SAAS,EACT,UAAU,EACV,CAAC,MAAM,CAAC,CACT,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QAElE,MAAM,aAAa,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;QAC/D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CACvC,KAAK,EACL,MAAM,CAAC,WAAW,EAClB,aAAa,CACd,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CACxC,KAAK,EACL,MAAM,CAAC,YAAY,EACnB,aAAa,CACd,CAAC;QAEF,oBAAoB;QACpB,IAAI;YACF,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK,EACL,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,CACxE,CAAC;SACH;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;gBAC9C,MAAM,CAAC,CAAC;aACT;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;aAC5C;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,KAAgB,EAChB,cAAsB;QAEtB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CACjD,KAAK,EACL,mBAAmB,EACnB,CAAC,cAAc,CAAC,CACjB,CAAC;QACF,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU,CACd,KAAgB,EAChB,MAAkB,EAClB,aAAqC;QAErC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CACnD,KAAK,EACL,MAAM,EACN,aAAa,CACd,CAAC;QACF,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACxC,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAgB,EAAE,MAAiB;QACjD,MAAM,GAAG,GAAG,YAAY,CAAC;QACzB,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE;YACpC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE;gBAC/B,CAAC,GAAG,CAAC,EAAE,yCAAkC,CAAC,OAAO,CAC/C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAChC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAC9C;aACF,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;SACzC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QACjD,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,KAAgB,EAChB,MAAkB;QAElB,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,oDAAoD;YACpD,OAAO,SAAgB,CAAC;SACzB;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;QAEtE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;QAE5E,4DAA4D;QAC5D,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC;QACpD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;QAE5D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAC1D,KAAK,EACL,OAAO,CAAC,OAAO,CAChB,CAAC;QAEF,IAAI,UAAkB,CAAC;QACvB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAClD,KAAK,EACL,MAAM,CAAC,OAAO,CAAC,QAAQ,CACxB,CAAC;YACF,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC;SACzC;aAAM;YACL,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC;SAC3B;QAED,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QAE3E,OAAO;YACL,OAAO;YACP,UAAU;YACV,iBAAiB;SAClB,CAAC;IACJ,CAAC;CACF;AA1JD,sDA0JC"}

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

@@ -1 +1 @@
-{"version":3,"file":"MultiProtocolCore.d.ts","sourceRoot":"","sources":["../../src/core/MultiProtocolCore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EACL,oBAAoB,EAErB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,gBAAgB,CACrD,YAAY,EACZ,aAAa,CACd;aAEmB,aAAa,EAAE,qBAAqB;aACpC,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC;aAClC,MAAM;gBAFN,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC,EAClC,MAAM,iBAAuC;IAK/D,MAAM,CAAC,eAAe,CAAC,GAAG,SAAS,oBAAoB,EACrD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,qBAAqB,GACnC,iBAAiB;IAQpB,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,EACrC,aAAa,EAAE,qBAAqB,GACnC,iBAAiB;IAOX,iBAAiB,CACxB,QAAQ,EAAE,YAAY,GACrB,gBAAgB,CAAC,YAAY,CAAC;IAMjC,wBAAwB,CACtB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,EAAE,CAAC;CAanB"}
+{"version":3,"file":"MultiProtocolCore.d.ts","sourceRoot":"","sources":["../../src/core/MultiProtocolCore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EACL,oBAAoB,EAErB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAI/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,gBAAgB,CACrD,YAAY,EACZ,aAAa,CACd;aAEmB,aAAa,EAAE,qBAAqB;aACpC,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC;aAClC,MAAM;gBAFN,aAAa,EAAE,qBAAqB,EACpC,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC,EAClC,MAAM,iBAAuC;IAK/D,MAAM,CAAC,eAAe,CAAC,GAAG,SAAS,oBAAoB,EACrD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,qBAAqB,GACnC,iBAAiB;IASpB,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,QAAQ,CAAC,aAAa,CAAC,EACrC,aAAa,EAAE,qBAAqB,GACnC,iBAAiB;IAOX,iBAAiB,CACxB,QAAQ,EAAE,YAAY,GACrB,gBAAgB,CAAC,YAAY,CAAC;IAMjC,wBAAwB,CACtB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,uBAAuB,EACjC,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,EAAE,CAAC;CAanB"}

package/dist/core/MultiProtocolCore.js

@@ -22,6 +22,7 @@ class MultiProtocolCore extends MultiProtocolApp_1.MultiProtocolApp {
         if (!envAddresses) {
             throw new Error(`No addresses found for ${env}`);
         }
+        // @ts-ignore
         return MultiProtocolCore.fromAddressesMap(envAddresses, multiProvider);
     }
     static fromAddressesMap(addressesMap, multiProvider) {

package/dist/core/MultiProtocolCore.js.map

@@ -1 +1 @@
-{"version":3,"file":"MultiProtocolCore.js","sourceRoot":"","sources":["../../src/core/MultiProtocolCore.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,gDAAoD;AAEpD,8DAA6E;AAC7E,yDAGgC;AAKhC,8DAA2D;AAC3D,wEAAqE;AAIrE,MAAa,iBAAkB,SAAQ,mCAGtC;IACC,YACkB,aAAoC,EACpC,SAAkC,EAClC,SAAS,IAAA,eAAK,EAAC,6BAA6B,CAAC;QAE7D,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAJxB,kBAAa,GAAb,aAAa,CAAuB;QACpC,cAAS,GAAT,SAAS,CAAyB;QAClC,WAAM,GAAN,MAAM,CAAuC;IAG/D,CAAC;IAED,MAAM,CAAC,eAAe,CACpB,GAAQ,EACR,aAAoC;QAEpC,MAAM,YAAY,GAAG,oCAAqB,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC;SAClD;QACD,OAAO,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,gBAAgB,CACrB,YAAqC,EACrC,aAAoC;QAEpC,OAAO,IAAI,iBAAiB,CAC1B,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EACzD,YAAY,CACb,CAAC;IACJ,CAAC;IAEQ,iBAAiB,CACxB,QAAsB;QAEtB,IAAI,QAAQ,KAAK,oBAAY,CAAC,QAAQ;YAAE,OAAO,+BAAc,CAAC;QAC9D,IAAI,QAAQ,KAAK,oBAAY,CAAC,QAAQ;YAAE,OAAO,yCAAmB,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,wBAAwB,CACtB,MAAiB,EACjB,WAAsB,EACtB,QAAiC,EACjC,OAAgB,EAChB,WAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,uBAAuB,CAC/C,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,WAAW,EACf,OAAO,EACP,WAAW,CACZ,CACF,CACF,CAAC;IACJ,CAAC;CACF;AA5DD,8CA4DC"}
+{"version":3,"file":"MultiProtocolCore.js","sourceRoot":"","sources":["../../src/core/MultiProtocolCore.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,gDAAoD;AAEpD,8DAA6E;AAC7E,yDAGgC;AAKhC,8DAA2D;AAC3D,wEAAqE;AAIrE,MAAa,iBAAkB,SAAQ,mCAGtC;IACC,YACkB,aAAoC,EACpC,SAAkC,EAClC,SAAS,IAAA,eAAK,EAAC,6BAA6B,CAAC;QAE7D,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAJxB,kBAAa,GAAb,aAAa,CAAuB;QACpC,cAAS,GAAT,SAAS,CAAyB;QAClC,WAAM,GAAN,MAAM,CAAuC;IAG/D,CAAC;IAED,MAAM,CAAC,eAAe,CACpB,GAAQ,EACR,aAAoC;QAEpC,MAAM,YAAY,GAAG,oCAAqB,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC;SAClD;QACD,aAAa;QACb,OAAO,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,CAAC,gBAAgB,CACrB,YAAqC,EACrC,aAAoC;QAEpC,OAAO,IAAI,iBAAiB,CAC1B,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EACzD,YAAY,CACb,CAAC;IACJ,CAAC;IAEQ,iBAAiB,CACxB,QAAsB;QAEtB,IAAI,QAAQ,KAAK,oBAAY,CAAC,QAAQ;YAAE,OAAO,+BAAc,CAAC;QAC9D,IAAI,QAAQ,KAAK,oBAAY,CAAC,QAAQ;YAAE,OAAO,yCAAmB,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,wBAAwB,CACtB,MAAiB,EACjB,WAAsB,EACtB,QAAiC,EACjC,OAAgB,EAChB,WAAoB;QAEpB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACnB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,uBAAuB,CAC/C,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,WAAW,EACf,OAAO,EACP,WAAW,CACZ,CACF,CACF,CAAC;IACJ,CAAC;CACF;AA7DD,8CA6DC"}

package/dist/core/TestCoreApp.d.ts

@@ -7,7 +7,6 @@ export declare const testCoreFactories: {
     mailbox: TestMailbox__factory;
     validatorAnnounce: import("@hyperlane-xyz/core").ValidatorAnnounce__factory;
     proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
-    timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
 };
 export declare class TestCoreApp extends HyperlaneCore {
     getContracts(chain: ChainName): HyperlaneContracts<typeof testCoreFactories>;

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,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,eAAO,MAAM,iBAAiB;;;;;CAG7B,CAAC;AAEF,qBAAa,WAAY,SAAQ,aAAa;IAC5C,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,kBAAkB,CAAC,OAAO,iBAAiB,CAAC;IAMtE,eAAe,IAAI,OAAO,CAC9B,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC,CACvE;IAaK,uBAAuB,CAC3B,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC;CAyBnE"}
+{"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,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,eAAO,MAAM,iBAAiB;;;;CAG7B,CAAC;AAEF,qBAAa,WAAY,SAAQ,aAAa;IAC5C,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,kBAAkB,CAAC,OAAO,iBAAiB,CAAC;IAMtE,eAAe,IAAI,OAAO,CAC9B,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC,CACvE;IAaK,uBAAuB,CAC3B,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC;CAyBnE"}

package/dist/core/contracts.d.ts

@@ -1,16 +1,10 @@
-import { Mailbox__factory, ProxyAdmin__factory, TimelockController__factory, ValidatorAnnounce__factory } from '@hyperlane-xyz/core';
-import { Address } from '@hyperlane-xyz/utils';
+import { Mailbox__factory, ProxyAdmin__factory, ValidatorAnnounce__factory } from '@hyperlane-xyz/core';
+import { HyperlaneAddresses } from '../contracts/types';
 export declare const coreFactories: {
     validatorAnnounce: ValidatorAnnounce__factory;
     proxyAdmin: ProxyAdmin__factory;
     mailbox: Mailbox__factory;
-    timelockController: TimelockController__factory;
-};
-export type CoreAddresses = {
-    validatorAnnounce: Address;
-    proxyAdmin: Address;
-    mailbox: Address;
-    timelockController?: Address;
 };
 export type CoreFactories = typeof coreFactories;
+export type CoreAddresses = HyperlaneAddresses<CoreFactories>;
 //# 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,gBAAgB,EAChB,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,eAAO,MAAM,aAAa;;;;;CAKzB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,eAAO,MAAM,aAAa;;;;CAIzB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC;AAEjD,MAAM,MAAM,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC"}

package/dist/core/contracts.js

@@ -6,6 +6,5 @@ exports.coreFactories = {
     validatorAnnounce: new core_1.ValidatorAnnounce__factory(),
     proxyAdmin: new core_1.ProxyAdmin__factory(),
     mailbox: new core_1.Mailbox__factory(),
-    timelockController: new core_1.TimelockController__factory(),
 };
 //# 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,8CAK6B;AAGhB,QAAA,aAAa,GAAG;IAC3B,iBAAiB,EAAE,IAAI,iCAA0B,EAAE;IACnD,UAAU,EAAE,IAAI,0BAAmB,EAAE;IACrC,OAAO,EAAE,IAAI,uBAAgB,EAAE;IAC/B,kBAAkB,EAAE,IAAI,kCAA2B,EAAE;CACtD,CAAC"}
+{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAIhB,QAAA,aAAa,GAAG;IAC3B,iBAAiB,EAAE,IAAI,iCAA0B,EAAE;IACnD,UAAU,EAAE,IAAI,0BAAmB,EAAE;IACrC,OAAO,EAAE,IAAI,uBAAgB,EAAE;CAChC,CAAC"}

package/dist/core/testHyperlaneDeploy.hardhat-test.js

@@ -21,11 +21,12 @@ describe('TestCoreDeployer', async () => {
         testCoreApp = await deployer.deployApp();
         const recipient = await new core_1.TestRecipient__factory(signer).deploy();
         localMailbox = testCoreApp.getContracts(localChain).mailbox;
-        const dispatchResponse = localMailbox.dispatch(multiProvider.getDomainId(remoteChain), (0, utils_1.addressToBytes32)(recipient.address), message);
+        const interchainGasPayment = await localMailbox['quoteDispatch(uint32,bytes32,bytes)'](multiProvider.getDomainId(remoteChain), (0, utils_1.addressToBytes32)(recipient.address), message);
+        const dispatchResponse = localMailbox['dispatch(uint32,bytes32,bytes)'](multiProvider.getDomainId(remoteChain), (0, utils_1.addressToBytes32)(recipient.address), message, { value: interchainGasPayment });
         await (0, chai_1.expect)(dispatchResponse).to.emit(localMailbox, 'Dispatch');
         dispatchReceipt = await testCoreApp.multiProvider.handleTx(localChain, dispatchResponse);
         remoteMailbox = testCoreApp.getContracts(remoteChain).mailbox;
-        await (0, chai_1.expect)(remoteMailbox.dispatch(multiProvider.getDomainId(localChain), (0, utils_1.addressToBytes32)(recipient.address), message)).to.emit(remoteMailbox, 'Dispatch');
+        await (0, chai_1.expect)(remoteMailbox['dispatch(uint32,bytes32,bytes)'](multiProvider.getDomainId(localChain), (0, utils_1.addressToBytes32)(recipient.address), message, { value: interchainGasPayment })).to.emit(remoteMailbox, 'Dispatch');
     });
     it('processes outbound messages for a single domain', async () => {
         const responses = await testCoreApp.processOutboundMessages(localChain);