@hyperlane-xyz/sdk 4.0.0 → 4.2.0-beta.2

package/dist/ism/EvmIsmModule.hardhat-test.js

@@ -2,7 +2,6 @@
 import assert from 'assert';
 import { expect } from 'chai';
 import hre from 'hardhat';
-import { FallbackDomainRoutingHook__factory } from '@hyperlane-xyz/core';
 import { eqAddress, normalizeConfig } from '@hyperlane-xyz/utils';
 import { TestChainName, testChains } from '../consts/testChains.js';
 import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
@@ -72,7 +71,6 @@ describe('EvmIsmModule', async () => {
     let multiProvider;
     let exampleRoutingConfig;
     let mailboxAddress;
-    let newMailboxAddress;
     let fundingAccount;
     const chain = TestChainName.test4;
     let factoryAddresses;
@@ -93,12 +91,10 @@ describe('EvmIsmModule', async () => {
         const legacyIsmFactory = new HyperlaneIsmFactory(contractsMap, multiProvider);
         // mailbox
         mailboxAddress = (await new TestCoreDeployer(multiProvider, legacyIsmFactory).deployApp()).getContracts(chain).mailbox.address;
-        // new mailbox
-        newMailboxAddress = (await new TestCoreDeployer(multiProvider, legacyIsmFactory).deployApp()).getContracts(chain).mailbox.address;
         // example routing config
         exampleRoutingConfig = {
             type: IsmType.ROUTING,
-            owner: await multiProvider.getSignerAddress(chain),
+            owner: (await multiProvider.getSignerAddress(chain)).toLowerCase(),
             domains: Object.fromEntries(testChains
                 .filter((c) => c !== TestChainName.test4)
                 .map((c) => [c, randomMultisigIsmConfig(3, 5)])),
@@ -179,14 +175,16 @@ describe('EvmIsmModule', async () => {
             it(`should skip deployment with warning if no chain metadata configured ${type}`, async () => {
                 // create a new ISM
                 const { ism } = await createIsm(exampleRoutingConfig);
-                // add config for a domain the multiprovider doesn't have
-                exampleRoutingConfig.domains['test5'] = {
-                    type: IsmType.MESSAGE_ID_MULTISIG,
-                    threshold: 1,
-                    validators: [randomAddress()],
+                // create an updated config with a domain the multiprovider doesn't have
+                const updatedRoutingConfig = {
+                    ...exampleRoutingConfig,
+                    domains: {
+                        ...exampleRoutingConfig.domains,
+                        test5: randomMultisigIsmConfig(3, 5),
+                    },
                 };
                 // expect 0 txs, as adding test5 domain is no-op
-                await expectTxsAndUpdate(ism, exampleRoutingConfig, 0);
+                await expectTxsAndUpdate(ism, updatedRoutingConfig, 0);
             });
             it(`update route in an existing ${type}`, async () => {
                 // create a new ISM
@@ -224,7 +222,6 @@ describe('EvmIsmModule', async () => {
                 await expectTxsAndUpdate(ism, exampleRoutingConfig, 1);
                 // domains should have decreased by 1
                 const numDomainsAfter = Object.keys((await ism.read()).domains).length;
-                console.log(numDomainsBefore, numDomainsAfter);
                 expect(numDomainsBefore - 1).to.equal(numDomainsAfter);
             });
             it(`updates owner in an existing ${type}`, async () => {
@@ -284,23 +281,28 @@ describe('EvmIsmModule', async () => {
                 expect(eqAddress(initialIsmAddress, ism.serialize().deployedIsm)).to.be
                     .true;
             });
+            it(`update threshold in an existing ${type} with Module creating using constructor`, async () => {
+                // create a an initial ISM
+                const { initialIsmAddress } = await createIsm(exampleRoutingConfig);
+                // update the threshold for a domain
+                exampleRoutingConfig.domains[TestChainName.test2].threshold = 2;
+                // create a new IsmModule using it's constructor. Set it's deployedIsm address to the initialIsmAddr
+                const ism = new EvmIsmModule(multiProvider, {
+                    chain,
+                    config: exampleRoutingConfig,
+                    addresses: {
+                        ...factoryAddresses,
+                        mailbox: mailboxAddress,
+                        deployedIsm: initialIsmAddress,
+                    },
+                });
+                // expect 1 tx to update threshold for test2 domain
+                await expectTxsAndUpdate(ism, exampleRoutingConfig, 1);
+                // expect the ISM address to be the same
+                expect(eqAddress(initialIsmAddress, ism.serialize().deployedIsm)).to.be
+                    .true;
+            });
         }
-        it(`redeploy same config if the mailbox address changes for defaultFallbackRoutingIsm`, async () => {
-            exampleRoutingConfig.type = IsmType.FALLBACK_ROUTING;
-            // create a new ISM
-            const { ism, initialIsmAddress } = await createIsm(exampleRoutingConfig);
-            // point to new mailbox
-            ism.setNewMailbox(newMailboxAddress);
-            // expect a new ISM to be deployed, so no in-place updates to return
-            await expectTxsAndUpdate(ism, exampleRoutingConfig, 0);
-            // expect the ISM address to be different
-            expect(eqAddress(initialIsmAddress, ism.serialize().deployedIsm)).to.be
-                .false;
-            // expect that the ISM is configured with the new mailbox
-            const onchainIsm = FallbackDomainRoutingHook__factory.connect(ism.serialize().deployedIsm, multiProvider.getSigner(chain));
-            const onchainMailbox = await onchainIsm['mailbox()']();
-            expect(eqAddress(onchainMailbox, newMailboxAddress)).to.be.true;
-        });
     });
 });
 //# sourceMappingURL=EvmIsmModule.hardhat-test.js.map

package/dist/ism/EvmIsmModule.hardhat-test.js.map

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

package/dist/ism/EvmIsmModule.js

@@ -1,16 +1,18 @@
 import { ethers } from 'ethers';
-import { DefaultFallbackRoutingIsm__factory, DomainRoutingIsmFactory__factory, DomainRoutingIsm__factory, IAggregationIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, MailboxClient__factory, OPStackIsm__factory, Ownable__factory, PausableIsm__factory, TestIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
-import { assert, configDeepEquals, eqAddress, normalizeConfig, objFilter, rootLogger, } from '@hyperlane-xyz/utils';
+import { DefaultFallbackRoutingIsm__factory, DomainRoutingIsmFactory__factory, DomainRoutingIsm__factory, IAggregationIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, OPStackIsm__factory, Ownable__factory, PausableIsm__factory, TestIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
+import { assert, deepEquals, eqAddress, normalizeConfig, objFilter, rootLogger, } from '@hyperlane-xyz/utils';
 import { attachAndConnectContracts } from '../contracts/contracts.js';
 import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
 import { EvmModuleDeployer } from '../deploy/EvmModuleDeployer.js';
 import { proxyFactoryFactories, } from '../deploy/contracts.js';
 import { findMatchingLogEvents } from '../utils/logUtils.js';
 import { EvmIsmReader } from './EvmIsmReader.js';
+import { IsmConfigSchema } from './schemas.js';
 import { IsmType, MUTABLE_ISM_TYPE, } from './types.js';
 import { calculateDomainRoutingDelta } from './utils.js';
 export class EvmIsmModule extends HyperlaneModule {
     multiProvider;
+    contractVerifier;
     logger = rootLogger.child({ module: 'EvmIsmModule' });
     reader;
     deployer;
@@ -21,8 +23,10 @@ export class EvmIsmModule extends HyperlaneModule {
     // return a number, and EVM the domainId and chainId are the same.
     domainId;
     constructor(multiProvider, params, contractVerifier) {
+        params.config = IsmConfigSchema.parse(params.config);
         super(params);
         this.multiProvider = multiProvider;
+        this.contractVerifier = contractVerifier;
         this.reader = new EvmIsmReader(multiProvider, params.chain);
         this.deployer = new EvmModuleDeployer(this.multiProvider, {}, this.logger, contractVerifier);
         this.factories = attachAndConnectContracts({
@@ -42,39 +46,29 @@ export class EvmIsmModule extends HyperlaneModule {
     }
     // whoever calls update() needs to ensure that targetConfig has a valid owner
     async update(targetConfig) {
+        targetConfig = IsmConfigSchema.parse(targetConfig);
+        // Do not support updating to a custom ISM address
+        if (typeof targetConfig === 'string') {
+            throw new Error('Invalid targetConfig: Updating to a custom ISM address is not supported. Please provide a valid ISM configuration.');
+        }
         // save current config for comparison
         // normalize the config to ensure it's in a consistent format for comparison
         const currentConfig = normalizeConfig(await this.read());
         // Update the config
         this.args.config = targetConfig;
-        // moduleMatchesConfig expects any domain filtering to have been done already
-        if (typeof targetConfig !== 'string' &&
-            (targetConfig.type === IsmType.ROUTING ||
-                targetConfig.type === IsmType.FALLBACK_ROUTING)) {
-            // filter for known domains
-            const { availableDomains } = this.filterRoutingIsmDomains({
-                config: targetConfig,
-            });
-            targetConfig.domains = availableDomains;
-        }
+        targetConfig = normalizeConfig(targetConfig);
+        assert(typeof targetConfig === 'object', 'normalized targetConfig should be an object');
+        // if it's a fallback routing ISM, do a mailbox diff check
         // If configs match, no updates needed
-        if (configDeepEquals(currentConfig, targetConfig)) {
+        if (deepEquals(currentConfig, targetConfig)) {
             return [];
         }
         // Else, we have to figure out what an update for this ISM entails
-        // If target config is an address ISM, just update the address
-        // if config -> address ISM, update address
-        // if address ISM -> address ISM, update address
-        if (typeof targetConfig === 'string') {
-            // TODO: https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3773
-            this.args.addresses.deployedIsm = targetConfig;
-            return [];
-        }
         // Check if we need to deploy a new ISM
         if (
-        // if address ISM -> config, do a new deploy
+        // if updating from an address/custom config to a proper ISM config, do a new deploy
         typeof currentConfig === 'string' ||
-            // if config -> config, AND types are different, do a new deploy
+            // if updating a proper ISM config whose types are different, do a new deploy
             currentConfig.type !== targetConfig.type ||
             // if it is not a mutable ISM, do a new deploy
             !MUTABLE_ISM_TYPE.includes(targetConfig.type)) {
@@ -94,24 +88,7 @@ export class EvmIsmModule extends HyperlaneModule {
             destination: this.chain,
             ismType: targetConfig.type,
         });
-        const provider = this.multiProvider.getProvider(this.chain);
         logger.debug(`Updating ${targetConfig.type} on ${this.chain}`);
-        // if it's a fallback routing ISM, do a mailbox diff check and deploy a new ISM if needed
-        if (targetConfig.type === IsmType.FALLBACK_ROUTING) {
-            // can only retrieve mailbox address if current ISM type is also Fallback Routing
-            const mailboxAddress = currentConfig.type === IsmType.FALLBACK_ROUTING
-                ? await MailboxClient__factory.connect(this.args.addresses.deployedIsm, provider).mailbox()
-                : ''; // empty string to force a mailbox diff
-            // if mailbox delta, deploy new routing ISM before updating
-            // this will always be the case if the current ISM is not a fallback routing ISM
-            if (!eqAddress(mailboxAddress, this.args.addresses.mailbox)) {
-                const newIsm = await this.deployRoutingIsm({
-                    config: targetConfig,
-                    logger,
-                });
-                this.args.addresses.deployedIsm = newIsm.address;
-            }
-        }
         // if it's either of the routing ISMs, update their submodules
         let updateTxs = [];
         if (targetConfig.type === IsmType.ROUTING ||
@@ -123,6 +100,7 @@ export class EvmIsmModule extends HyperlaneModule {
             });
         }
         // Lastly, check if the resolved owner is different from the current owner
+        const provider = this.multiProvider.getProvider(this.chain);
         const owner = await Ownable__factory.connect(this.args.addresses.deployedIsm, provider).owner();
         // Return an ownership transfer transaction if required
         if (!eqAddress(targetConfig.owner, owner)) {
@@ -136,8 +114,7 @@ export class EvmIsmModule extends HyperlaneModule {
         return updateTxs;
     }
     // manually write static create function
-    static async create({ chain, config, proxyFactoryFactories, mailbox, multiProvider, }) {
-        // instantiate new EvmIsmModule
+    static async create({ chain, config, proxyFactoryFactories, mailbox, multiProvider, contractVerifier, }) {
         const module = new EvmIsmModule(multiProvider, {
             addresses: {
                 ...proxyFactoryFactories,
@@ -146,8 +123,7 @@ export class EvmIsmModule extends HyperlaneModule {
             },
             chain,
             config,
-        });
-        // deploy ISM and assign address to module
+        }, contractVerifier);
         const deployedIsm = await module.deploy({ config });
         module.args.addresses.deployedIsm = deployedIsm.address;
         return module;
@@ -155,6 +131,19 @@ export class EvmIsmModule extends HyperlaneModule {
     async updateRoutingIsm({ current, target, logger, }) {
         const routingIsmInterface = DomainRoutingIsm__factory.createInterface();
         const updateTxs = [];
+        // filter out domains which are not part of the multiprovider
+        current = {
+            ...current,
+            domains: this.filterRoutingIsmDomains({
+                config: current,
+            }).availableDomains,
+        };
+        target = {
+            ...target,
+            domains: this.filterRoutingIsmDomains({
+                config: target,
+            }).availableDomains,
+        };
         const { domainsToEnroll, domainsToUnenroll } = calculateDomainRoutingDelta(current, target);
         // Enroll domains
         for (const origin of domainsToEnroll) {
@@ -188,6 +177,7 @@ export class EvmIsmModule extends HyperlaneModule {
         return updateTxs;
     }
     async deploy({ config, }) {
+        config = IsmConfigSchema.parse(config);
         // If it's an address ISM, just return a base ISM
         if (typeof config === 'string') {
             // TODO: https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3773
@@ -269,14 +259,18 @@ export class EvmIsmModule extends HyperlaneModule {
         const { availableDomains, availableDomainIds } = this.filterRoutingIsmDomains({
             config,
         });
-        config.domains = availableDomains;
+        config = {
+            ...config,
+            domains: availableDomains,
+        };
         // deploy the submodules first
-        const submoduleAddresses = await Promise.all(Object.keys(config.domains).map(async (origin) => {
+        const submoduleAddresses = [];
+        for (const origin of Object.keys(config.domains)) {
             const { address } = await this.deploy({
                 config: config.domains[origin],
             });
-            return address;
-        }));
+            submoduleAddresses.push(address);
+        }
         if (config.type === IsmType.FALLBACK_ROUTING) {
             // deploy the fallback routing ISM
             logger.debug('Deploying fallback routing ISM ...');
@@ -334,18 +328,6 @@ export class EvmIsmModule extends HyperlaneModule {
         const signer = this.multiProvider.getSigner(this.args.chain);
         return IAggregationIsm__factory.connect(address, signer);
     }
-    // Updates the mailbox address if it is different from the current one.
-    // Logs changes and updates the internal state of the module.
-    setNewMailbox(newMailboxAddress) {
-        const currentMailboxAddress = this.args.addresses.mailbox;
-        if (currentMailboxAddress === newMailboxAddress) {
-            this.logger.debug(`Mailbox address is already set to ${newMailboxAddress}`);
-            return;
-        }
-        this.logger.debug(`Setting new mailbox address from ${currentMailboxAddress} to ${newMailboxAddress}`);
-        // Update the mailbox address in the arguments
-        this.args.addresses.mailbox = newMailboxAddress;
-    }
     // filtering out domains which are not part of the multiprovider
     filterRoutingIsmDomains({ config }) {
         const availableDomainIds = [];

package/dist/ism/EvmIsmModule.js.map

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

package/dist/ism/EvmIsmReader.d.ts

@@ -1,8 +1,8 @@
-import { providers } from 'ethers';
 import { Address, WithAddress } from '@hyperlane-xyz/utils';
 import { MultiProvider } from '../providers/MultiProvider.js';
 import { ChainNameOrId } from '../types.js';
-import { AggregationIsmConfig, IsmConfig, MultisigIsmConfig, NullIsmConfig, RoutingIsmConfig } from './types.js';
+import { HyperlaneReader } from '../utils/HyperlaneReader.js';
+import { AggregationIsmConfig, IsmConfig, ModuleType, MultisigIsmConfig, NullIsmConfig, RoutingIsmConfig } from './types.js';
 export type DerivedIsmConfig = WithAddress<Exclude<IsmConfig, Address>>;
 export interface IsmReader {
     deriveIsmConfig(address: Address): Promise<DerivedIsmConfig>;
@@ -10,12 +10,12 @@ export interface IsmReader {
     deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationIsmConfig>>;
     deriveMultisigConfig(address: Address): Promise<WithAddress<MultisigIsmConfig>>;
     deriveNullConfig(address: Address): Promise<WithAddress<NullIsmConfig>>;
+    assertModuleType(moduleType: ModuleType, expectedModuleType: ModuleType): void;
 }
-export declare class EvmIsmReader implements IsmReader {
+export declare class EvmIsmReader extends HyperlaneReader implements IsmReader {
     protected readonly multiProvider: MultiProvider;
     protected readonly chain: ChainNameOrId;
     protected readonly concurrency: number;
-    protected readonly provider: providers.Provider;
     protected readonly logger: import("pino").default.Logger<never>;
     constructor(multiProvider: MultiProvider, chain: ChainNameOrId, concurrency?: number);
     deriveIsmConfig(address: Address): Promise<DerivedIsmConfig>;
@@ -23,5 +23,6 @@ export declare class EvmIsmReader implements IsmReader {
     deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationIsmConfig>>;
     deriveMultisigConfig(address: string): Promise<WithAddress<MultisigIsmConfig>>;
     deriveNullConfig(address: Address): Promise<WithAddress<NullIsmConfig>>;
+    assertModuleType(moduleType: ModuleType, expectedModuleType: ModuleType): void;
 }
 //# sourceMappingURL=EvmIsmReader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EvmIsmReader.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,SAAS,EAAE,MAAM,QAAQ,CAAC;AAY3C,OAAO,EACL,OAAO,EACP,WAAW,EAIZ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EACL,oBAAoB,EACpB,SAAS,EAGT,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,WAAW,SAAS;IACxB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7D,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC9E,uBAAuB,CACrB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9C,oBAAoB,CAClB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC3C,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;CACzE;AAED,qBAAa,YAAa,YAAW,SAAS;IAK1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa;IACvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM;IANxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,MAAM,uCAAgD;gBAGpD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,aAAa,EACpB,WAAW,GAAE,MAEM;IAKlC,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8B5D,mBAAmB,CACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IA2CnC,uBAAuB,CAC3B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAsBvC,oBAAoB,CACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAyBpC,gBAAgB,CACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;CAkEvC"}
+{"version":3,"file":"EvmIsmReader.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmReader.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,OAAO,EACP,WAAW,EAKZ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EACL,oBAAoB,EACpB,SAAS,EAET,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;AAExE,MAAM,WAAW,SAAS;IACxB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7D,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAC9E,uBAAuB,CACrB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9C,oBAAoB,CAClB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC3C,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;IACxE,gBAAgB,CACd,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,UAAU,GAC7B,IAAI,CAAC;CACT;AAED,qBAAa,YAAa,SAAQ,eAAgB,YAAW,SAAS;IAIlE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa;IACvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM;IALxC,SAAS,CAAC,QAAQ,CAAC,MAAM,uCAAgD;gBAGpD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,aAAa,EACpB,WAAW,GAAE,MAEM;IAKlC,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkD5D,mBAAmB,CACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;IA2CnC,uBAAuB,CAC3B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAsBvC,oBAAoB,CACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IA0BpC,gBAAgB,CACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAqEtC,gBAAgB,CACd,UAAU,EAAE,UAAU,EACtB,kBAAkB,EAAE,UAAU,GAC7B,IAAI;CAMR"}

package/dist/ism/EvmIsmReader.js

@@ -1,49 +1,69 @@
 import { ethers } from 'ethers';
-import { DefaultFallbackRoutingIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, OPStackIsm__factory, PausableIsm__factory, StaticAggregationIsm__factory, TestIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
-import { assert, concurrentMap, rootLogger, } from '@hyperlane-xyz/utils';
+import { DefaultFallbackRoutingIsm__factory, IInterchainSecurityModule__factory, IMultisigIsm__factory, OPStackIsm__factory, PausableIsm__factory, StaticAggregationIsm__factory, TrustedRelayerIsm__factory, } from '@hyperlane-xyz/core';
+import { assert, concurrentMap, getLogLevel, rootLogger, } from '@hyperlane-xyz/utils';
 import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/concurrency.js';
+import { HyperlaneReader } from '../utils/HyperlaneReader.js';
 import { IsmType, ModuleType, } from './types.js';
-export class EvmIsmReader {
+export class EvmIsmReader extends HyperlaneReader {
     multiProvider;
     chain;
     concurrency;
-    provider;
     logger = rootLogger.child({ module: 'EvmIsmReader' });
     constructor(multiProvider, chain, concurrency = multiProvider.tryGetRpcConcurrency(chain) ?? DEFAULT_CONTRACT_READ_CONCURRENCY) {
+        super(multiProvider, chain);
         this.multiProvider = multiProvider;
         this.chain = chain;
         this.concurrency = concurrency;
-        this.provider = multiProvider.getProvider(chain);
     }
     async deriveIsmConfig(address) {
-        const ism = IInterchainSecurityModule__factory.connect(address, this.provider);
-        const moduleType = await ism.moduleType();
-        this.logger.debug('Deriving ISM config', { address, moduleType });
-        switch (moduleType) {
-            case ModuleType.UNUSED:
-                throw new Error('UNUSED does not have a corresponding IsmType');
-            case ModuleType.ROUTING:
-                // IsmType is either ROUTING or FALLBACK_ROUTING, but that's determined inside deriveRoutingConfig
-                return this.deriveRoutingConfig(address);
-            case ModuleType.AGGREGATION:
-                return this.deriveAggregationConfig(address);
-            case ModuleType.LEGACY_MULTISIG:
-                throw new Error('LEGACY_MULTISIG is deprecated and not supported');
-            case ModuleType.MERKLE_ROOT_MULTISIG:
-            case ModuleType.MESSAGE_ID_MULTISIG:
-                return this.deriveMultisigConfig(address);
-            case ModuleType.NULL:
-                return this.deriveNullConfig(address);
-            case ModuleType.CCIP_READ:
-                throw new Error('CCIP_READ does not have a corresponding IsmType');
-            default:
-                throw new Error('Unknown ModuleType');
+        let moduleType = undefined;
+        let derivedIsmConfig;
+        try {
+            const ism = IInterchainSecurityModule__factory.connect(address, this.provider);
+            this.logger.debug('Deriving IsmConfig:', { address });
+            // Temporarily turn off SmartProvider logging
+            // Provider errors are expected because deriving will call methods that may not exist in the Bytecode
+            this.setSmartProviderLogLevel('silent');
+            moduleType = await ism.moduleType();
+            switch (moduleType) {
+                case ModuleType.UNUSED:
+                    throw new Error('UNUSED does not have a corresponding IsmType');
+                case ModuleType.ROUTING:
+                    // IsmType is either ROUTING or FALLBACK_ROUTING, but that's determined inside deriveRoutingConfig
+                    derivedIsmConfig = await this.deriveRoutingConfig(address);
+                    break;
+                case ModuleType.AGGREGATION:
+                    derivedIsmConfig = await this.deriveAggregationConfig(address);
+                    break;
+                case ModuleType.LEGACY_MULTISIG:
+                    throw new Error('LEGACY_MULTISIG is deprecated and not supported');
+                case ModuleType.MERKLE_ROOT_MULTISIG:
+                case ModuleType.MESSAGE_ID_MULTISIG:
+                    derivedIsmConfig = await this.deriveMultisigConfig(address);
+                    break;
+                case ModuleType.NULL:
+                    derivedIsmConfig = await this.deriveNullConfig(address);
+                    break;
+                case ModuleType.CCIP_READ:
+                    throw new Error('CCIP_READ does not have a corresponding IsmType');
+                default:
+                    throw new Error(`Unknown ISM ModuleType: ${moduleType}`);
+            }
         }
+        catch (e) {
+            const errorMessage = `Failed to derive ISM module type ${moduleType} (${address}):\n\t${e}`;
+            this.logger.debug(errorMessage);
+            throw new Error(errorMessage);
+        }
+        finally {
+            this.setSmartProviderLogLevel(getLogLevel()); // returns to original level defined by rootLogger
+        }
+        return derivedIsmConfig;
     }
     async deriveRoutingConfig(address) {
         const ism = DefaultFallbackRoutingIsm__factory.connect(address, this.provider);
         const owner = await ism.owner();
-        assert((await ism.moduleType()) === ModuleType.ROUTING);
+        this.assertModuleType(await ism.moduleType(), ModuleType.ROUTING);
         const domains = {};
         const domainIds = await ism.domains();
         await concurrentMap(this.concurrency, domainIds, async (domainId) => {
@@ -73,7 +93,7 @@ export class EvmIsmReader {
     }
     async deriveAggregationConfig(address) {
         const ism = StaticAggregationIsm__factory.connect(address, this.provider);
-        assert((await ism.moduleType()) === ModuleType.AGGREGATION);
+        this.assertModuleType(await ism.moduleType(), ModuleType.AGGREGATION);
         const [modules, threshold] = await ism.modulesAndThreshold(ethers.constants.AddressZero);
         const ismConfigs = await concurrentMap(this.concurrency, modules, async (module) => this.deriveIsmConfig(module));
         return {
@@ -87,7 +107,7 @@ export class EvmIsmReader {
         const ism = IMultisigIsm__factory.connect(address, this.provider);
         const moduleType = await ism.moduleType();
         assert(moduleType === ModuleType.MERKLE_ROOT_MULTISIG ||
-            moduleType === ModuleType.MESSAGE_ID_MULTISIG);
+            moduleType === ModuleType.MESSAGE_ID_MULTISIG, `expected module type to be ${ModuleType.MERKLE_ROOT_MULTISIG} or ${ModuleType.MESSAGE_ID_MULTISIG}, got ${moduleType}`);
         const ismType = moduleType === ModuleType.MERKLE_ROOT_MULTISIG
             ? IsmType.MERKLE_ROOT_MULTISIG
             : IsmType.MESSAGE_ID_MULTISIG;
@@ -100,11 +120,12 @@ export class EvmIsmReader {
         };
     }
     async deriveNullConfig(address) {
-        // if it has trustedRelayer() property --> TrustedRelayer ISM
+        const ism = IInterchainSecurityModule__factory.connect(address, this.provider);
+        this.assertModuleType(await ism.moduleType(), ModuleType.NULL);
+        // if it has trustedRelayer() property --> TRUSTED_RELAYER
         const trustedRelayerIsm = TrustedRelayerIsm__factory.connect(address, this.provider);
         try {
             const relayer = await trustedRelayerIsm.trustedRelayer();
-            assert((await trustedRelayerIsm.moduleType()) === ModuleType.NULL);
             return {
                 address,
                 relayer,
@@ -119,7 +140,6 @@ export class EvmIsmReader {
         try {
             const paused = await pausableIsm.paused();
             const owner = await pausableIsm.owner();
-            assert((await pausableIsm.moduleType()) === ModuleType.NULL);
             return {
                 address,
                 owner,
@@ -133,7 +153,6 @@ export class EvmIsmReader {
         // if it has VERIFIED_MASK_INDEX, it's AbstractMessageIdAuthorizedIsm which means OPStackIsm
         const opStackIsm = OPStackIsm__factory.connect(address, this.provider);
         try {
-            assert((await opStackIsm.moduleType()) === ModuleType.NULL);
             await opStackIsm.VERIFIED_MASK_INDEX();
             return {
                 address,
@@ -146,12 +165,13 @@ export class EvmIsmReader {
             this.logger.debug('Error accessing "VERIFIED_MASK_INDEX" property, implying this is not an OP Stack ISM.', address);
         }
         // no specific properties, must be Test ISM
-        const testIsm = TestIsm__factory.connect(address, this.provider);
-        assert((await testIsm.moduleType()) === ModuleType.NULL);
         return {
             address,
             type: IsmType.TEST_ISM,
         };
     }
+    assertModuleType(moduleType, expectedModuleType) {
+        assert(moduleType === expectedModuleType, `expected module type to be ${expectedModuleType}, got ${moduleType}`);
+    }
 }
 //# sourceMappingURL=EvmIsmReader.js.map