@hyperlane-xyz/sdk 3.9.0 → 3.10.1-beta0

package/dist/ism/types.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ismTypeToModuleType = exports.IsmType = exports.ModuleType = void 0;
 // this enum should match the IInterchainSecurityModule.sol enum
 // meant for the relayer
-var ModuleType;
+export var ModuleType;
 (function (ModuleType) {
     ModuleType[ModuleType["UNUSED"] = 0] = "UNUSED";
     ModuleType[ModuleType["ROUTING"] = 1] = "ROUTING";
@@ -12,10 +9,11 @@ var ModuleType;
     ModuleType[ModuleType["MERKLE_ROOT_MULTISIG"] = 4] = "MERKLE_ROOT_MULTISIG";
     ModuleType[ModuleType["MESSAGE_ID_MULTISIG"] = 5] = "MESSAGE_ID_MULTISIG";
     ModuleType[ModuleType["NULL"] = 6] = "NULL";
-})(ModuleType || (exports.ModuleType = ModuleType = {}));
+    ModuleType[ModuleType["CCIP_READ"] = 7] = "CCIP_READ";
+})(ModuleType || (ModuleType = {}));
 // this enum can be adjusted as per deployments necessary
 // meant for the deployer and checker
-var IsmType;
+export var IsmType;
 (function (IsmType) {
     IsmType["OP_STACK"] = "opStackIsm";
     IsmType["ROUTING"] = "domainRoutingIsm";
@@ -25,12 +23,11 @@ var IsmType;
     IsmType["MESSAGE_ID_MULTISIG"] = "messageIdMultisigIsm";
     IsmType["TEST_ISM"] = "testIsm";
     IsmType["PAUSABLE"] = "pausableIsm";
-})(IsmType || (exports.IsmType = IsmType = {}));
+    IsmType["TRUSTED_RELAYER"] = "trustedRelayerIsm";
+})(IsmType || (IsmType = {}));
 // mapping between the two enums
-function ismTypeToModuleType(ismType) {
+export function ismTypeToModuleType(ismType) {
     switch (ismType) {
-        case IsmType.OP_STACK:
-            return ModuleType.NULL;
         case IsmType.ROUTING:
             return ModuleType.ROUTING;
         case IsmType.FALLBACK_ROUTING:
@@ -41,11 +38,11 @@ function ismTypeToModuleType(ismType) {
             return ModuleType.MERKLE_ROOT_MULTISIG;
         case IsmType.MESSAGE_ID_MULTISIG:
             return ModuleType.MESSAGE_ID_MULTISIG;
+        case IsmType.OP_STACK:
         case IsmType.TEST_ISM:
-            return ModuleType.NULL;
         case IsmType.PAUSABLE:
+        case IsmType.TRUSTED_RELAYER:
             return ModuleType.NULL;
     }
 }
-exports.ismTypeToModuleType = ismTypeToModuleType;
 //# sourceMappingURL=types.js.map

package/dist/ism/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/ism/types.ts"],"names":[],"mappings":";;;AAaA,gEAAgE;AAChE,wBAAwB;AACxB,IAAY,UAQX;AARD,WAAY,UAAU;IACpB,+CAAM,CAAA;IACN,iDAAO,CAAA;IACP,yDAAW,CAAA;IACX,iEAAe,CAAA;IACf,2EAAoB,CAAA;IACpB,yEAAmB,CAAA;IACnB,2CAAI,CAAA;AACN,CAAC,EARW,UAAU,0BAAV,UAAU,QAQrB;AAED,yDAAyD;AACzD,qCAAqC;AACrC,IAAY,OASX;AATD,WAAY,OAAO;IACjB,kCAAuB,CAAA;IACvB,uCAA4B,CAAA;IAC5B,yDAA8C,CAAA;IAC9C,+CAAoC,CAAA;IACpC,yDAA8C,CAAA;IAC9C,uDAA4C,CAAA;IAC5C,+BAAoB,CAAA;IACpB,mCAAwB,CAAA;AAC1B,CAAC,EATW,OAAO,uBAAP,OAAO,QASlB;AAED,gCAAgC;AAChC,SAAgB,mBAAmB,CAAC,OAAgB;IAClD,QAAQ,OAAO,EAAE;QACf,KAAK,OAAO,CAAC,QAAQ;YACnB,OAAO,UAAU,CAAC,IAAI,CAAC;QACzB,KAAK,OAAO,CAAC,OAAO;YAClB,OAAO,UAAU,CAAC,OAAO,CAAC;QAC5B,KAAK,OAAO,CAAC,gBAAgB;YAC3B,OAAO,UAAU,CAAC,OAAO,CAAC;QAC5B,KAAK,OAAO,CAAC,WAAW;YACtB,OAAO,UAAU,CAAC,WAAW,CAAC;QAChC,KAAK,OAAO,CAAC,oBAAoB;YAC/B,OAAO,UAAU,CAAC,oBAAoB,CAAC;QACzC,KAAK,OAAO,CAAC,mBAAmB;YAC9B,OAAO,UAAU,CAAC,mBAAmB,CAAC;QACxC,KAAK,OAAO,CAAC,QAAQ;YACnB,OAAO,UAAU,CAAC,IAAI,CAAC;QACzB,KAAK,OAAO,CAAC,QAAQ;YACnB,OAAO,UAAU,CAAC,IAAI,CAAC;KAC1B;AACH,CAAC;AAnBD,kDAmBC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/ism/types.ts"],"names":[],"mappings":"AAcA,gEAAgE;AAChE,wBAAwB;AACxB,MAAM,CAAN,IAAY,UASX;AATD,WAAY,UAAU;IACpB,+CAAM,CAAA;IACN,iDAAO,CAAA;IACP,yDAAW,CAAA;IACX,iEAAe,CAAA;IACf,2EAAoB,CAAA;IACpB,yEAAmB,CAAA;IACnB,2CAAI,CAAA;IACJ,qDAAS,CAAA;AACX,CAAC,EATW,UAAU,KAAV,UAAU,QASrB;AAED,yDAAyD;AACzD,qCAAqC;AACrC,MAAM,CAAN,IAAY,OAUX;AAVD,WAAY,OAAO;IACjB,kCAAuB,CAAA;IACvB,uCAA4B,CAAA;IAC5B,yDAA8C,CAAA;IAC9C,+CAAoC,CAAA;IACpC,yDAA8C,CAAA;IAC9C,uDAA4C,CAAA;IAC5C,+BAAoB,CAAA;IACpB,mCAAwB,CAAA;IACxB,gDAAqC,CAAA;AACvC,CAAC,EAVW,OAAO,KAAP,OAAO,QAUlB;AAED,gCAAgC;AAChC,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,OAAO;YAClB,OAAO,UAAU,CAAC,OAAO,CAAC;QAC5B,KAAK,OAAO,CAAC,gBAAgB;YAC3B,OAAO,UAAU,CAAC,OAAO,CAAC;QAC5B,KAAK,OAAO,CAAC,WAAW;YACtB,OAAO,UAAU,CAAC,WAAW,CAAC;QAChC,KAAK,OAAO,CAAC,oBAAoB;YAC/B,OAAO,UAAU,CAAC,oBAAoB,CAAC;QACzC,KAAK,OAAO,CAAC,mBAAmB;YAC9B,OAAO,UAAU,CAAC,mBAAmB,CAAC;QACxC,KAAK,OAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,OAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,OAAO,CAAC,QAAQ,CAAC;QACtB,KAAK,OAAO,CAAC,eAAe;YAC1B,OAAO,UAAU,CAAC,IAAI,CAAC;IAC3B,CAAC;AACH,CAAC"}

package/dist/ism/utils.d.ts

@@ -1,9 +1,9 @@
 import { Address } from '@hyperlane-xyz/utils';
-import { HyperlaneContracts } from '../contracts/types';
-import { ProxyFactoryFactories } from '../deploy/contracts';
-import { MultiProvider } from '../providers/MultiProvider';
-import { ChainName } from '../types';
-import { IsmConfig, RoutingIsmConfig, RoutingIsmDelta } from './types';
+import { HyperlaneContracts } from '../contracts/types.js';
+import { ProxyFactoryFactories } from '../deploy/contracts.js';
+import { MultiProvider } from '../providers/MultiProvider.js';
+import { ChainName } from '../types.js';
+import { IsmConfig, RoutingIsmConfig, RoutingIsmDelta } from './types.js';
 export declare function moduleCanCertainlyVerify(destModule: Address | IsmConfig, multiProvider: MultiProvider, origin: ChainName, destination: ChainName): Promise<boolean>;
 export declare function moduleMatchesConfig(chain: ChainName, moduleAddress: Address, config: IsmConfig, multiProvider: MultiProvider, contracts: HyperlaneContracts<ProxyFactoryFactories>, mailbox?: Address): Promise<boolean>;
 export declare function routingModuleDelta(destination: ChainName, moduleAddress: Address, config: RoutingIsmConfig, multiProvider: MultiProvider, contracts: HyperlaneContracts<ProxyFactoryFactories>, mailbox?: Address): Promise<RoutingIsmDelta>;

package/dist/ism/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/ism/utils.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EACL,SAAS,EAGT,gBAAgB,EAChB,eAAe,EAEhB,MAAM,SAAS,CAAC;AASjB,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,OAAO,CAAC,CAiHlB;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,kBAAkB,CAAC,qBAAqB,CAAC,EACpD,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,OAAO,CAAC,CA8IlB;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,gBAAgB,EACxB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,kBAAkB,CAAC,qBAAqB,CAAC,EACpD,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,eAAe,CAAC,CAqD1B;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,SAAS,GAChB,GAAG,CAAC,MAAM,CAAC,CAsCb"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/ism/utils.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EACL,SAAS,EAGT,gBAAgB,EAChB,eAAe,EAEhB,MAAM,YAAY,CAAC;AASpB,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,OAAO,GAAG,SAAS,EAC/B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,OAAO,CAAC,CAiHlB;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,kBAAkB,CAAC,qBAAqB,CAAC,EACpD,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,OAAO,CAAC,CAmKlB;AAED,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,SAAS,EACtB,aAAa,EAAE,OAAO,EACtB,MAAM,EAAE,gBAAgB,EACxB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,kBAAkB,CAAC,qBAAqB,CAAC,EACpD,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,eAAe,CAAC,CA0D1B;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,SAAS,GAChB,GAAG,CAAC,MAAM,CAAC,CAwCb"}

package/dist/ism/utils.js

@@ -1,46 +1,40 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectValidators = exports.routingModuleDelta = exports.moduleMatchesConfig = exports.moduleCanCertainlyVerify = void 0;
-const debug_1 = __importDefault(require("debug"));
-const ethers_1 = require("ethers");
-const core_1 = require("@hyperlane-xyz/core");
-const utils_1 = require("@hyperlane-xyz/utils");
-const chainMetadata_1 = require("../consts/chainMetadata");
-const types_1 = require("./types");
-const logger = (0, debug_1.default)('hyperlane:IsmUtils');
+import { ethers } from 'ethers';
+import { DomainRoutingIsm__factory, IAggregationIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, IRoutingIsm__factory, MailboxClient__factory, OPStackIsm__factory, PausableIsm__factory, StaticAggregationIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
+import { eqAddress, formatMessage, normalizeAddress, objMap, rootLogger, } from '@hyperlane-xyz/utils';
+import { chainMetadata } from '../consts/chainMetadata.js';
+import { resolveOrDeployAccountOwner } from '../deploy/types.js';
+import { IsmType, ModuleType, ismTypeToModuleType, } from './types.js';
+const logger = rootLogger.child({ module: 'IsmUtils' });
 // Note that this function may return false negatives, but should
 // not return false positives.
 // This can happen if, for example, the module has sender, recipient, or
 // body specific logic, as the sample message used when querying the ISM
 // sets all of these to zero.
-async function moduleCanCertainlyVerify(destModule, multiProvider, origin, destination) {
+export async function moduleCanCertainlyVerify(destModule, multiProvider, origin, destination) {
     const originDomainId = multiProvider.tryGetDomainId(origin);
     const destinationDomainId = multiProvider.tryGetDomainId(destination);
     if (!originDomainId || !destinationDomainId) {
         return false;
     }
-    const message = (0, utils_1.formatMessage)(0, 0, originDomainId, ethers_1.ethers.constants.AddressZero, destinationDomainId, ethers_1.ethers.constants.AddressZero, '0x');
+    const message = formatMessage(0, 0, originDomainId, ethers.constants.AddressZero, destinationDomainId, ethers.constants.AddressZero, '0x');
     const provider = multiProvider.getSignerOrProvider(destination);
     if (typeof destModule === 'string') {
-        const module = core_1.IInterchainSecurityModule__factory.connect(destModule, provider);
+        const module = IInterchainSecurityModule__factory.connect(destModule, provider);
         try {
             const moduleType = await module.moduleType();
-            if (moduleType === types_1.ModuleType.MERKLE_ROOT_MULTISIG ||
-                moduleType === types_1.ModuleType.MESSAGE_ID_MULTISIG) {
-                const multisigModule = core_1.IMultisigIsm__factory.connect(destModule, provider);
+            if (moduleType === ModuleType.MERKLE_ROOT_MULTISIG ||
+                moduleType === ModuleType.MESSAGE_ID_MULTISIG) {
+                const multisigModule = IMultisigIsm__factory.connect(destModule, provider);
                 const [, threshold] = await multisigModule.validatorsAndThreshold(message);
                 return threshold > 0;
             }
-            else if (moduleType === types_1.ModuleType.ROUTING) {
-                const routingIsm = core_1.IRoutingIsm__factory.connect(destModule, provider);
+            else if (moduleType === ModuleType.ROUTING) {
+                const routingIsm = IRoutingIsm__factory.connect(destModule, provider);
                 const subModule = await routingIsm.route(message);
                 return moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
             }
-            else if (moduleType === types_1.ModuleType.AGGREGATION) {
-                const aggregationIsm = core_1.IAggregationIsm__factory.connect(destModule, provider);
+            else if (moduleType === ModuleType.AGGREGATION) {
+                const aggregationIsm = IAggregationIsm__factory.connect(destModule, provider);
                 const [subModules, threshold] = await aggregationIsm.modulesAndThreshold(message);
                 let verified = 0;
                 for (const subModule of subModules) {
@@ -55,22 +49,22 @@ async function moduleCanCertainlyVerify(destModule, multiProvider, origin, desti
                 throw new Error(`Unsupported module type: ${moduleType}`);
             }
         }
-        catch (e) {
-            logger(`Error checking module ${destModule}: ${e}`);
+        catch (err) {
+            logger.error(`Error checking module ${destModule}`, err);
             return false;
         }
     }
     else {
         // destModule is an IsmConfig
         switch (destModule.type) {
-            case types_1.IsmType.MERKLE_ROOT_MULTISIG:
-            case types_1.IsmType.MESSAGE_ID_MULTISIG:
+            case IsmType.MERKLE_ROOT_MULTISIG:
+            case IsmType.MESSAGE_ID_MULTISIG:
                 return destModule.threshold > 0;
-            case types_1.IsmType.ROUTING: {
+            case IsmType.ROUTING: {
                 const checking = moduleCanCertainlyVerify(destModule.domains[destination], multiProvider, origin, destination);
                 return checking;
             }
-            case types_1.IsmType.AGGREGATION: {
+            case IsmType.AGGREGATION: {
                 let verified = 0;
                 for (const subModule of destModule.modules) {
                     const canVerify = await moduleCanCertainlyVerify(subModule, multiProvider, origin, destination);
@@ -80,9 +74,9 @@ async function moduleCanCertainlyVerify(destModule, multiProvider, origin, desti
                 }
                 return verified >= destModule.threshold;
             }
-            case types_1.IsmType.OP_STACK:
-                return destModule.nativeBridge !== ethers_1.ethers.constants.AddressZero;
-            case types_1.IsmType.TEST_ISM: {
+            case IsmType.OP_STACK:
+                return destModule.nativeBridge !== ethers.constants.AddressZero;
+            case IsmType.TEST_ISM: {
                 return true;
             }
             default:
@@ -90,53 +84,53 @@ async function moduleCanCertainlyVerify(destModule, multiProvider, origin, desti
         }
     }
 }
-exports.moduleCanCertainlyVerify = moduleCanCertainlyVerify;
-async function moduleMatchesConfig(chain, moduleAddress, config, multiProvider, contracts, mailbox) {
+export async function moduleMatchesConfig(chain, moduleAddress, config, multiProvider, contracts, mailbox) {
     if (typeof config === 'string') {
-        return (0, utils_1.eqAddress)(moduleAddress, config);
+        return eqAddress(moduleAddress, config);
     }
     // If the module address is zero, it can't match any object-based config.
     // The subsequent check of what moduleType it is will throw, so we fail here.
-    if ((0, utils_1.eqAddress)(moduleAddress, ethers_1.ethers.constants.AddressZero)) {
+    if (eqAddress(moduleAddress, ethers.constants.AddressZero)) {
         return false;
     }
     const provider = multiProvider.getProvider(chain);
-    const module = core_1.IInterchainSecurityModule__factory.connect(moduleAddress, provider);
+    const module = IInterchainSecurityModule__factory.connect(moduleAddress, provider);
     const actualType = await module.moduleType();
-    if (actualType !== (0, types_1.ismTypeToModuleType)(config.type))
+    if (actualType !== ismTypeToModuleType(config.type))
         return false;
     let matches = true;
     switch (config.type) {
-        case types_1.IsmType.MERKLE_ROOT_MULTISIG: {
+        case IsmType.MERKLE_ROOT_MULTISIG: {
             // A MerkleRootMultisigIsm matches if validators and threshold match the config
             const expectedAddress = await contracts.staticMerkleRootMultisigIsmFactory.getAddress(config.validators.sort(), config.threshold);
-            matches = (0, utils_1.eqAddress)(expectedAddress, module.address);
+            matches = eqAddress(expectedAddress, module.address);
             break;
         }
-        case types_1.IsmType.MESSAGE_ID_MULTISIG: {
+        case IsmType.MESSAGE_ID_MULTISIG: {
             // A MessageIdMultisigIsm matches if validators and threshold match the config
             const expectedAddress = await contracts.staticMessageIdMultisigIsmFactory.getAddress(config.validators.sort(), config.threshold);
-            matches = (0, utils_1.eqAddress)(expectedAddress, module.address);
+            matches = eqAddress(expectedAddress, module.address);
             break;
         }
-        case types_1.IsmType.FALLBACK_ROUTING:
-        case types_1.IsmType.ROUTING: {
+        case IsmType.FALLBACK_ROUTING:
+        case IsmType.ROUTING: {
             // A RoutingIsm matches if:
             //   1. The set of domains in the config equals those on-chain
             //   2. The modules for each domain match the config
             // TODO: Check (1)
-            const routingIsm = core_1.DomainRoutingIsm__factory.connect(moduleAddress, provider);
+            const routingIsm = DomainRoutingIsm__factory.connect(moduleAddress, provider);
             // Check that the RoutingISM owner matches the config
             const owner = await routingIsm.owner();
-            matches && (matches = (0, utils_1.eqAddress)(owner, config.owner));
+            const expectedOwner = await resolveOrDeployAccountOwner(multiProvider, chain, config.owner);
+            matches &&= eqAddress(owner, expectedOwner);
             // check if the mailbox matches the config for fallback routing
-            if (config.type === types_1.IsmType.FALLBACK_ROUTING) {
-                const client = core_1.MailboxClient__factory.connect(moduleAddress, provider);
+            if (config.type === IsmType.FALLBACK_ROUTING) {
+                const client = MailboxClient__factory.connect(moduleAddress, provider);
                 const mailboxAddress = await client.mailbox();
                 matches =
                     matches &&
                         mailbox !== undefined &&
-                        (0, utils_1.eqAddress)(mailboxAddress, mailbox);
+                        eqAddress(mailboxAddress, mailbox);
             }
             const delta = await routingModuleDelta(chain, moduleAddress, config, multiProvider, contracts, mailbox);
             matches =
@@ -147,49 +141,58 @@ async function moduleMatchesConfig(chain, moduleAddress, config, multiProvider,
                     !delta.owner;
             break;
         }
-        case types_1.IsmType.AGGREGATION: {
+        case IsmType.AGGREGATION: {
             // An AggregationIsm matches if:
             //   1. The threshold matches the config
             //   2. There is a bijection between on and off-chain configured modules
-            const aggregationIsm = core_1.StaticAggregationIsm__factory.connect(moduleAddress, provider);
+            const aggregationIsm = StaticAggregationIsm__factory.connect(moduleAddress, provider);
             const [subModules, threshold] = await aggregationIsm.modulesAndThreshold('0x');
-            matches && (matches = threshold === config.threshold);
-            matches && (matches = subModules.length === config.modules.length);
+            matches &&= threshold === config.threshold;
+            matches &&= subModules.length === config.modules.length;
             const configIndexMatched = new Map();
             for (const subModule of subModules) {
                 const subModuleMatchesConfig = await Promise.all(config.modules.map((c) => moduleMatchesConfig(chain, subModule, c, multiProvider, contracts)));
                 // The submodule returned by the ISM must match exactly one
                 // entry in the config.
                 const count = subModuleMatchesConfig.filter(Boolean).length;
-                matches && (matches = count === 1);
+                matches &&= count === 1;
                 // That entry in the config should not have been matched already.
                 subModuleMatchesConfig.forEach((matched, index) => {
                     if (matched) {
-                        matches && (matches = !configIndexMatched.has(index));
+                        matches &&= !configIndexMatched.has(index);
                         configIndexMatched.set(index, true);
                     }
                 });
             }
             break;
         }
-        case types_1.IsmType.OP_STACK: {
-            const opStackIsm = core_1.OPStackIsm__factory.connect(moduleAddress, provider);
+        case IsmType.OP_STACK: {
+            const opStackIsm = OPStackIsm__factory.connect(moduleAddress, provider);
             const type = await opStackIsm.moduleType();
-            matches && (matches = type === types_1.ModuleType.NULL);
+            matches &&= type === ModuleType.NULL;
             break;
         }
-        case types_1.IsmType.TEST_ISM: {
+        case IsmType.TEST_ISM: {
             // This is just a TestISM
             matches = true;
             break;
         }
-        case types_1.IsmType.PAUSABLE: {
-            const pausableIsm = core_1.PausableIsm__factory.connect(moduleAddress, provider);
+        case IsmType.TRUSTED_RELAYER: {
+            const trustedRelayerIsm = TrustedRelayerIsm__factory.connect(moduleAddress, provider);
+            const type = await trustedRelayerIsm.moduleType();
+            matches &&= type === ModuleType.NULL;
+            const relayer = await trustedRelayerIsm.trustedRelayer();
+            matches &&= eqAddress(relayer, config.relayer);
+            break;
+        }
+        case IsmType.PAUSABLE: {
+            const pausableIsm = PausableIsm__factory.connect(moduleAddress, provider);
             const owner = await pausableIsm.owner();
-            matches && (matches = (0, utils_1.eqAddress)(owner, config.owner));
+            const expectedOwner = await resolveOrDeployAccountOwner(multiProvider, chain, config.owner);
+            matches &&= eqAddress(owner, expectedOwner);
             if (config.paused) {
                 const isPaused = await pausableIsm.paused();
-                matches && (matches = config.paused === isPaused);
+                matches &&= config.paused === isPaused;
             }
             break;
         }
@@ -199,26 +202,26 @@ async function moduleMatchesConfig(chain, moduleAddress, config, multiProvider,
     }
     return matches;
 }
-exports.moduleMatchesConfig = moduleMatchesConfig;
-async function routingModuleDelta(destination, moduleAddress, config, multiProvider, contracts, mailbox) {
+export async function routingModuleDelta(destination, moduleAddress, config, multiProvider, contracts, mailbox) {
     const provider = multiProvider.getProvider(destination);
-    const routingIsm = core_1.DomainRoutingIsm__factory.connect(moduleAddress, provider);
+    const routingIsm = DomainRoutingIsm__factory.connect(moduleAddress, provider);
     const owner = await routingIsm.owner();
     const deployedDomains = (await routingIsm.domains()).map((domain) => domain.toNumber());
     // config.domains is already filtered to only include domains in the multiprovider
-    const safeConfigDomains = (0, utils_1.objMap)(config.domains, (chainName) => chainMetadata_1.chainMetadata[chainName]?.domainId ??
+    const safeConfigDomains = objMap(config.domains, (chainName) => chainMetadata[chainName]?.domainId ??
         multiProvider.getDomainId(chainName));
     const delta = {
         domainsToUnenroll: [],
         domainsToEnroll: [],
     };
     // if owners don't match, we need to transfer ownership
-    if (!(0, utils_1.eqAddress)(owner, (0, utils_1.normalizeAddress)(config.owner)))
-        delta.owner = config.owner;
-    if (config.type === types_1.IsmType.FALLBACK_ROUTING) {
-        const client = core_1.MailboxClient__factory.connect(moduleAddress, provider);
+    const expectedOwner = await resolveOrDeployAccountOwner(multiProvider, destination, config.owner);
+    if (!eqAddress(owner, normalizeAddress(expectedOwner)))
+        delta.owner = expectedOwner;
+    if (config.type === IsmType.FALLBACK_ROUTING) {
+        const client = MailboxClient__factory.connect(moduleAddress, provider);
         const mailboxAddress = await client.mailbox();
-        if (mailbox && !(0, utils_1.eqAddress)(mailboxAddress, mailbox))
+        if (mailbox && !eqAddress(mailboxAddress, mailbox))
             delta.mailbox = mailbox;
     }
     // check for exclusion of domains in the config
@@ -240,32 +243,33 @@ async function routingModuleDelta(destination, moduleAddress, config, multiProvi
     }
     return delta;
 }
-exports.routingModuleDelta = routingModuleDelta;
-function collectValidators(origin, config) {
+export function collectValidators(origin, config) {
     // TODO: support address configurations in collectValidators
     if (typeof config === 'string') {
-        logger.extend(origin)('Address config unimplemented in collectValidators');
+        logger
+            .child({ origin })
+            .debug('Address config unimplemented in collectValidators');
         return new Set([]);
     }
     let validators = [];
-    if (config.type === types_1.IsmType.MERKLE_ROOT_MULTISIG ||
-        config.type === types_1.IsmType.MESSAGE_ID_MULTISIG) {
+    if (config.type === IsmType.MERKLE_ROOT_MULTISIG ||
+        config.type === IsmType.MESSAGE_ID_MULTISIG) {
         validators = config.validators;
     }
-    else if (config.type === types_1.IsmType.ROUTING) {
+    else if (config.type === IsmType.ROUTING) {
         if (Object.keys(config.domains).includes(origin)) {
             const domainValidators = collectValidators(origin, config.domains[origin]);
             validators = [...domainValidators];
         }
     }
-    else if (config.type === types_1.IsmType.AGGREGATION) {
+    else if (config.type === IsmType.AGGREGATION) {
         const aggregatedValidators = config.modules.map((c) => collectValidators(origin, c));
         aggregatedValidators.forEach((set) => {
             validators = validators.concat([...set]);
         });
     }
-    else if (config.type === types_1.IsmType.TEST_ISM ||
-        config.type === types_1.IsmType.PAUSABLE) {
+    else if (config.type === IsmType.TEST_ISM ||
+        config.type === IsmType.PAUSABLE) {
         return new Set([]);
     }
     else {
@@ -273,5 +277,4 @@ function collectValidators(origin, config) {
     }
     return new Set(validators);
 }
-exports.collectValidators = collectValidators;
 //# sourceMappingURL=utils.js.map

package/dist/ism/utils.js.map

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

package/dist/metadata/ChainMetadataManager.d.ts

@@ -1,9 +1,9 @@
-import { Debugger } from 'debug';
+import { Logger } from 'pino';
 import { ProtocolType } from '@hyperlane-xyz/utils';
-import { ChainMap, ChainName, ChainNameOrId } from '../types';
-import { ChainMetadata, ExplorerFamily } from './chainMetadataTypes';
+import { ChainMap, ChainName, ChainNameOrId } from '../types.js';
+import { ChainMetadata, ExplorerFamily } from './chainMetadataTypes.js';
 export interface ChainMetadataManagerOptions {
-    loggerName?: string;
+    logger?: Logger;
 }
 /**
  * A set of utilities to manage chain metadata
@@ -12,7 +12,7 @@ export interface ChainMetadataManagerOptions {
  */
 export declare class ChainMetadataManager<MetaExt = {}> {
     readonly metadata: ChainMap<ChainMetadata<MetaExt>>;
-    readonly logger: Debugger;
+    readonly logger: Logger;
     /**
      * Create a new ChainMetadataManager with the given chainMetadata,
      * or the SDK's default metadata if not provided

package/dist/metadata/ChainMetadataManager.d.ts.map

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