@hyperlane-xyz/sdk 1.4.3-beta2 → 1.5.0

package/dist/consts/environments/index.d.ts

@@ -353,9 +353,380 @@ export declare const hyperlaneEnvironments: {
         };
     };
 };
+export declare const hyperlaneEnvironmentsWithSealevel: {
+    testnet: {
+        solanadevnet: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        alfajores: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        fuji: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        mumbai: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        bsctestnet: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        goerli: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        moonbasealpha: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainAccountIsm: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        optimismgoerli: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        arbitrumgoerli: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        sepolia: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+    };
+    test: {
+        test1: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            legacyMultisigIsm: string;
+            merkleRootMultisigIsm: string;
+            messageIdMultisigIsm: string;
+            aggregationIsm: string;
+            routingIsm: string;
+        };
+        test2: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            legacyMultisigIsm: string;
+            merkleRootMultisigIsm: string;
+            messageIdMultisigIsm: string;
+            aggregationIsm: string;
+            routingIsm: string;
+        };
+        test3: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            legacyMultisigIsm: string;
+            merkleRootMultisigIsm: string;
+            messageIdMultisigIsm: string;
+            aggregationIsm: string;
+            routingIsm: string;
+        };
+    };
+    mainnet: {
+        celo: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        ethereum: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        avalanche: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        polygon: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        bsc: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        arbitrum: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            timelockController: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        optimism: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        moonbeam: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+        gnosis: {
+            storageGasOracle: string;
+            validatorAnnounce: string;
+            proxyAdmin: string;
+            mailbox: string;
+            interchainGasPaymaster: string;
+            defaultIsmInterchainGasPaymaster: string;
+            multisigIsm: string;
+            create2Factory: string;
+            testRecipient: string;
+            interchainAccountIsm: string;
+            aggregationIsmFactory: string;
+            routingIsmFactory: string;
+            interchainQueryRouter: string;
+            interchainAccountRouter: string;
+            merkleRootMultisigIsmFactory: string;
+            messageIdMultisigIsmFactory: string;
+        };
+    };
+};
 export type HyperlaneEnvironment = keyof typeof hyperlaneEnvironments;
-export type HyperlaneEnvironmentChain<E extends HyperlaneEnvironment> = Extract<keyof (typeof hyperlaneEnvironments)[E], ChainName>;
-export declare const hyperlaneContractAddresses: Record<"polygon" | "ethereum" | "test1" | "test2" | "test3" | "alfajores" | "arbitrum" | "arbitrumgoerli" | "avalanche" | "bsc" | "bsctestnet" | "celo" | "fuji" | "goerli" | "sepolia" | "moonbasealpha" | "moonbeam" | "mumbai" | "optimism" | "optimismgoerli" | "gnosis" | "solanadevnet", {
+export type HyperlaneEnvironmentChain<E extends HyperlaneEnvironment> = Extract<keyof typeof hyperlaneEnvironments[E], ChainName>;
+export declare const hyperlaneContractAddresses: Record<"polygon" | "ethereum" | "test1" | "test2" | "test3" | "alfajores" | "arbitrum" | "arbitrumgoerli" | "avalanche" | "bsc" | "bsctestnet" | "celo" | "fuji" | "goerli" | "sepolia" | "moonbasealpha" | "moonbeam" | "mumbai" | "optimism" | "optimismgoerli" | "gnosis" | "solanadevnet" | "proteustestnet" | "solana" | "nautilus", {
     storageGasOracle: string;
     validatorAnnounce: string;
     proxyAdmin: string;

package/dist/consts/environments/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/consts/environments/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAOxC,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA6B,CAAC;AAEhE,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,qBAAqB,CAAC;AACtE,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,oBAAoB,IAAI,OAAO,CAC7E,MAAM,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,EACvC,SAAS,CACV,CAAC;AAGF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;EAMtC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/consts/environments/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAQxC,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAA6B,CAAC;AAChE,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG7C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,qBAAqB,CAAC;AACtE,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,oBAAoB,IAAI,OAAO,CAC7E,MAAM,OAAO,qBAAqB,CAAC,CAAC,CAAC,EACrC,SAAS,CACV,CAAC;AAGF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;EAGwC,CAAC"}

package/dist/consts/environments/index.js

@@ -3,12 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hyperlaneContractAddresses = exports.hyperlaneEnvironments = void 0;
+exports.hyperlaneContractAddresses = exports.hyperlaneEnvironmentsWithSealevel = exports.hyperlaneEnvironments = void 0;
 const utils_1 = require("@hyperlane-xyz/utils");
 const mainnet_json_1 = __importDefault(require("./mainnet.json"));
 const test_json_1 = __importDefault(require("./test.json"));
+const testnet_sealevel_json_1 = __importDefault(require("./testnet-sealevel.json"));
 const testnet_json_1 = __importDefault(require("./testnet.json"));
 exports.hyperlaneEnvironments = { test: test_json_1.default, testnet: testnet_json_1.default, mainnet: mainnet_json_1.default };
+exports.hyperlaneEnvironmentsWithSealevel = {
+    ...exports.hyperlaneEnvironments,
+    testnet: { ...testnet_json_1.default, ...testnet_sealevel_json_1.default },
+};
 // Note, this assumes no chain name is repeated across environments
 exports.hyperlaneContractAddresses = (0, utils_1.objMerge)(exports.hyperlaneEnvironments.testnet, exports.hyperlaneEnvironments.mainnet);
 //# sourceMappingURL=index.js.map

package/dist/consts/environments/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/consts/environments/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAgD;AAKhD,kEAAqC;AACrC,4DAA+B;AAC/B,kEAAqC;AAExB,QAAA,qBAAqB,GAAG,EAAE,IAAI,EAAJ,mBAAI,EAAE,OAAO,EAAP,sBAAO,EAAE,OAAO,EAAP,sBAAO,EAAE,CAAC;AAQhE,mEAAmE;AACtD,QAAA,0BAA0B,GAAG,IAAA,gBAAQ,EAChD,6BAAqB,CAAC,OAAO,EAC7B,6BAAqB,CAAC,OAAO,CAI9B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/consts/environments/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAgD;AAKhD,kEAAqC;AACrC,4DAA+B;AAC/B,oFAAsD;AACtD,kEAAqC;AAExB,QAAA,qBAAqB,GAAG,EAAE,IAAI,EAAJ,mBAAI,EAAE,OAAO,EAAP,sBAAO,EAAE,OAAO,EAAP,sBAAO,EAAE,CAAC;AACnD,QAAA,iCAAiC,GAAG;IAC/C,GAAG,6BAAqB;IACxB,OAAO,EAAE,EAAE,GAAG,sBAAO,EAAE,GAAG,+BAAe,EAAE;CAC5C,CAAC;AAQF,mEAAmE;AACtD,QAAA,0BAA0B,GAAG,IAAA,gBAAQ,EAChD,6BAAqB,CAAC,OAAO,EAC7B,6BAAqB,CAAC,OAAO,CACgD,CAAC"}

package/dist/consts/environments/testnet-sealevel.json

@@ -0,0 +1,19 @@
+{
+    "solanadevnet": {
+        "storageGasOracle": "",
+        "validatorAnnounce": "",
+        "proxyAdmin": "",
+        "mailbox": "4v25Dz9RccqUrTzmfHzJMsjd1iVoNrWzeJ4o6GYuJrVn",
+        "interchainGasPaymaster": "",
+        "defaultIsmInterchainGasPaymaster": "",
+        "multisigIsm": "",
+        "testRecipient": "",
+        "interchainAccountIsm": "",
+        "aggregationIsmFactory": "",
+        "routingIsmFactory": "",
+        "interchainQueryRouter": "",
+        "interchainAccountRouter": "",
+        "merkleRootMultisigIsmFactory": "",
+        "messageIdMultisigIsmFactory": ""
+    }
+}

package/dist/consts/sealevel.d.ts

@@ -0,0 +1,2 @@
+export declare const SEALEVEL_SPL_NOOP_ADDRESS = "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV";
+//# sourceMappingURL=sealevel.d.ts.map

package/dist/consts/sealevel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sealevel.d.ts","sourceRoot":"","sources":["../../src/consts/sealevel.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,gDACS,CAAC"}

package/dist/consts/sealevel.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SEALEVEL_SPL_NOOP_ADDRESS = void 0;
+exports.SEALEVEL_SPL_NOOP_ADDRESS = 'noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV';
+//# sourceMappingURL=sealevel.js.map

package/dist/consts/sealevel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sealevel.js","sourceRoot":"","sources":["../../src/consts/sealevel.ts"],"names":[],"mappings":";;;AAAa,QAAA,yBAAyB,GACpC,6CAA6C,CAAC"}

package/dist/contracts/contracts.d.ts

@@ -1,10 +1,13 @@
 import { Ownable } from '@hyperlane-xyz/core';
+import { ProtocolType } from '@hyperlane-xyz/utils';
+import { ChainMetadataManager } from '../metadata/ChainMetadataManager';
 import { MultiProvider } from '../providers/MultiProvider';
 import { ChainMap, Connection } from '../types';
 import { HyperlaneAddresses, HyperlaneAddressesMap, HyperlaneContracts, HyperlaneContractsMap, HyperlaneFactories } from './types';
 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 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 connectContracts<F extends HyperlaneFactories>(contracts: HyperlaneContracts<F>, connection: Connection): HyperlaneContracts<F>;

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

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/contracts/contracts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAU9C,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,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"}
+{"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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appFromAddressesMapHelper = exports.filterOwnableContracts = exports.connectContractsMap = exports.connectContracts = exports.attachContractsMap = exports.attachContracts = exports.filterAddressesMap = exports.serializeContracts = exports.serializeContractsMap = void 0;
+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) => {
@@ -28,6 +28,12 @@ function filterAddressesMap(addressesMap, factories) {
     });
 }
 exports.filterAddressesMap = filterAddressesMap;
+function filterAddressesToProtocol(addresses, protocolType, 
+// Note, MultiProviders are passable here
+metadataManager) {
+    return (0, utils_1.objFilter)(addresses, (c, _addrs) => metadataManager.tryGetChainMetadata(c)?.protocol === protocolType);
+}
+exports.filterAddressesToProtocol = filterAddressesToProtocol;
 function attachContracts(addresses, factories) {
     return (0, utils_1.objMap)(addresses, (key, address) => {
         const factory = getFactory(key, factories);
@@ -73,7 +79,7 @@ function appFromAddressesMapHelper(addressesMap, factories, multiProvider) {
     const filteredContractsMap = (0, utils_1.pick)(contractsMap, intersection.intersection);
     return {
         contractsMap: filteredContractsMap,
-        multiProvider: intersection.multiProvider,
+        multiProvider: intersection.result,
     };
 }
 exports.appFromAddressesMapHelper = appFromAddressesMapHelper;

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

@@ -1,26 +1,17 @@
 import { ethers } from 'ethers';
-import { Mailbox } from '@hyperlane-xyz/core';
-import { ParsedMessage } 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 { CoreFactories } from './contracts';
-export type DispatchedMessage = {
-    id: string;
-    message: string;
-    parsed: ParsedMessage;
-};
+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;
-    protected getDestination(message: DispatchedMessage): {
-        destinationChain: ChainName;
-        mailbox: Mailbox;
-    };
+    protected getDestination(message: DispatchedMessage): ChainName;
     protected waitForProcessReceipt(message: DispatchedMessage): Promise<ethers.ContractReceipt>;
-    protected waitForMessageWasProcessed(message: DispatchedMessage, delay?: number, maxAttempts?: number): Promise<void>;
+    waitForMessageIdProcessed(messageId: string, destination: ChainName, delayMs?: number, maxAttempts?: number): Promise<void>;
     waitForMessageProcessing(sourceTx: ethers.ContractReceipt): Promise<ethers.ContractReceipt[]>;
     waitForMessageProcessed(sourceTx: ethers.ContractReceipt, delay?: number, maxAttempts?: number): Promise<void>;
     getDispatchedMessages(sourceTx: ethers.ContractReceipt): DispatchedMessage[];

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

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

package/dist/core/HyperlaneCore.js

@@ -20,13 +20,12 @@ class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
         return new HyperlaneCore(helper.contractsMap, helper.multiProvider);
     }
     getDestination(message) {
-        const destinationChain = this.multiProvider.getChainName(message.parsed.destination);
-        const mailbox = this.getContracts(destinationChain).mailbox;
-        return { destinationChain, mailbox };
+        return this.multiProvider.getChainName(message.parsed.destination);
     }
     waitForProcessReceipt(message) {
         const id = (0, utils_1.messageId)(message.message);
-        const { destinationChain, mailbox } = this.getDestination(message);
+        const destinationChain = this.getDestination(message);
+        const mailbox = this.contractsMap[destinationChain].mailbox;
         const filter = mailbox.filters.ProcessId(id);
         return new Promise((resolve, reject) => {
             mailbox.once(filter, (emittedId, event) => {
@@ -37,24 +36,29 @@ class HyperlaneCore extends HyperlaneApp_1.HyperlaneApp {
             });
         });
     }
-    async waitForMessageWasProcessed(message, delay, maxAttempts) {
-        const id = (0, utils_1.messageId)(message.message);
-        const { mailbox } = this.getDestination(message);
+    async waitForMessageIdProcessed(messageId, destination, delayMs, maxAttempts) {
         await (0, utils_1.pollAsync)(async () => {
-            const delivered = await mailbox.delivered(id);
-            if (!delivered) {
-                throw new Error(`Message ${id} not yet processed`);
+            this.logger(`Checking if message ${messageId} was processed`);
+            const mailbox = this.contractsMap[destination].mailbox;
+            const delivered = await mailbox.delivered(messageId);
+            if (delivered) {
+                this.logger(`Message ${messageId} was processed`);
+                return;
+            }
+            else {
+                throw new Error(`Message ${messageId} not yet processed`);
             }
-        }, delay, maxAttempts);
+        }, delayMs, maxAttempts);
         return;
     }
     waitForMessageProcessing(sourceTx) {
         const messages = HyperlaneCore.getDispatchedMessages(sourceTx);
         return Promise.all(messages.map((msg) => this.waitForProcessReceipt(msg)));
     }
+    // TODO consider renaming this, all the waitForMessage* methods are confusing
     async waitForMessageProcessed(sourceTx, delay, maxAttempts) {
         const messages = HyperlaneCore.getDispatchedMessages(sourceTx);
-        await Promise.all(messages.map((msg) => this.waitForMessageWasProcessed(msg, delay, maxAttempts)));
+        await Promise.all(messages.map((msg) => this.waitForMessageIdProcessed(msg.id, this.getDestination(msg), delay, maxAttempts)));
     }
     // Redundant with static method but keeping for backwards compatibility
     getDispatchedMessages(sourceTx) {

package/dist/core/HyperlaneCore.js.map

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