@hyperlane-xyz/sdk 13.2.0 → 13.3.0

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js

@@ -1,3 +1,4 @@
+import { OperationType, } from '@safe-global/safe-core-sdk-types';
 import { assert, rootLogger } from '@hyperlane-xyz/utils';
 // prettier-ignore
 // @ts-ignore
@@ -29,27 +30,30 @@ export class EV5GnosisSafeTxSubmitter {
         const safeService = await getSafeService(chain, multiProvider);
         return new EV5GnosisSafeTxSubmitter(multiProvider, props, safe, safeService);
     }
-    async createSafeTransaction({ to, data, value, chainId, }) {
+    async createSafeTransaction(...transactions) {
         const nextNonce = await this.safeService.getNextNonce(this.props.safeAddress);
         const submitterChainId = this.multiProvider.getChainId(this.props.chain);
-        assert(chainId, 'Invalid AnnotatedEV5Transaction: chainId is required');
-        assert(chainId === submitterChainId, `Invalid AnnotatedEV5Transaction: Cannot submit tx for chain ID ${chainId} to submitter for chain ID ${submitterChainId}.`);
-        return this.safe.createTransaction({
-            safeTransactionData: [{ to, data, value: value?.toString() ?? '0' }],
-            options: { nonce: nextNonce },
+        const safeTransactionData = transactions.map(({ to, data, value, chainId }) => {
+            assert(chainId, 'Invalid AnnotatedEV5Transaction: chainId is required');
+            assert(chainId === submitterChainId, `Invalid AnnotatedEV5Transaction: Cannot submit tx for chain ID ${chainId} to submitter for chain ID ${submitterChainId}.`);
+            return { to, data, value: value?.toString() ?? '0' };
         });
+        const isMultiSend = transactions.length > 1;
+        const safeTransaction = await this.safe.createTransaction({
+            safeTransactionData,
+            onlyCalls: isMultiSend,
+            options: {
+                nonce: nextNonce,
+                operation: isMultiSend
+                    ? OperationType.DelegateCall
+                    : OperationType.Call,
+            },
+        });
+        return safeTransaction;
     }
     async submit(...txs) {
-        return this.proposeIndividualTransactions(txs);
-    }
-    async proposeIndividualTransactions(txs) {
-        const safeTransactions = [];
-        for (const tx of txs) {
-            const safeTransaction = await this.createSafeTransaction(tx);
-            await this.proposeSafeTransaction(safeTransaction);
-            safeTransactions.push(safeTransaction);
-        }
-        return safeTransactions;
+        const safeTransaction = await this.createSafeTransaction(...txs);
+        return this.proposeSafeTransaction(safeTransaction);
     }
     async proposeSafeTransaction(safeTransaction) {
         const safeTxHash = await this.safe.getTransactionHash(safeTransaction);

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js.map

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

package/dist/providers/transactions/transformer/ethersV5/types.d.ts

@@ -35,8 +35,7 @@ export declare const EV5InterchainAccountTxTransformerPropsSchema: z.ZodObject<P
         ismOverride?: string | undefined;
     }>;
     hookMetadata: z.ZodOptional<z.ZodString>;
-}, "chain" | "config" | "hookMetadata">, "strip", z.ZodTypeAny, {
-    chain: string;
+}, "config" | "chain" | "hookMetadata">, "strip", z.ZodTypeAny, {
     config: {
         owner: string;
         origin: string;
@@ -44,9 +43,9 @@ export declare const EV5InterchainAccountTxTransformerPropsSchema: z.ZodObject<P
         routerOverride?: string | undefined;
         ismOverride?: string | undefined;
     };
+    chain: string;
     hookMetadata?: string | undefined;
 }, {
-    chain: string;
     config: {
         owner: string;
         origin: string;
@@ -54,6 +53,7 @@ export declare const EV5InterchainAccountTxTransformerPropsSchema: z.ZodObject<P
         routerOverride?: string | undefined;
         ismOverride?: string | undefined;
     };
+    chain: string;
     hookMetadata?: string | undefined;
 }>;
 export type EV5InterchainAccountTxTransformerProps = z.infer<typeof EV5InterchainAccountTxTransformerPropsSchema>;

package/dist/providers/transactions/transformer/types.d.ts

@@ -1,7 +1,6 @@
 import { z } from 'zod';
 import { TxTransformerType } from './TxTransformerTypes.js';
 export declare const TransformerMetadataSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
-    chain: z.ZodString;
     config: z.ZodObject<{
         origin: z.ZodString;
         owner: z.ZodString;
@@ -21,11 +20,11 @@ export declare const TransformerMetadataSchema: z.ZodDiscriminatedUnion<"type",
         routerOverride?: string | undefined;
         ismOverride?: string | undefined;
     }>;
+    chain: z.ZodString;
     hookMetadata: z.ZodOptional<z.ZodString>;
     type: z.ZodLiteral<TxTransformerType>;
 }, "strip", z.ZodTypeAny, {
     type: TxTransformerType;
-    chain: string;
     config: {
         owner: string;
         origin: string;
@@ -33,10 +32,10 @@ export declare const TransformerMetadataSchema: z.ZodDiscriminatedUnion<"type",
         routerOverride?: string | undefined;
         ismOverride?: string | undefined;
     };
+    chain: string;
     hookMetadata?: string | undefined;
 }, {
     type: TxTransformerType;
-    chain: string;
     config: {
         owner: string;
         origin: string;
@@ -44,6 +43,7 @@ export declare const TransformerMetadataSchema: z.ZodDiscriminatedUnion<"type",
         routerOverride?: string | undefined;
         ismOverride?: string | undefined;
     };
+    chain: string;
     hookMetadata?: string | undefined;
 }>]>;
 export type TransformerMetadata = z.infer<typeof TransformerMetadataSchema>;

package/dist/router/EvmRouterReader.d.ts

@@ -0,0 +1,18 @@
+import { Address } from '@hyperlane-xyz/utils';
+import { EvmHookReader } from '../hook/EvmHookReader.js';
+import { EvmIsmReader } from '../ism/EvmIsmReader.js';
+import { MultiProvider } from '../providers/MultiProvider.js';
+import { ChainNameOrId } from '../types.js';
+import { HyperlaneReader } from '../utils/HyperlaneReader.js';
+import { DerivedMailboxClientConfig, DerivedRouterConfig, RemoteRouters } from './types.js';
+export declare class EvmRouterReader extends HyperlaneReader {
+    protected readonly concurrency: number;
+    protected readonly logger: import("pino").default.Logger<never>;
+    protected evmHookReader: EvmHookReader;
+    protected evmIsmReader: EvmIsmReader;
+    constructor(multiProvider: MultiProvider, chain: ChainNameOrId, concurrency?: number);
+    readRouterConfig(address: Address): Promise<DerivedRouterConfig>;
+    fetchMailboxClientConfig(routerAddress: Address): Promise<DerivedMailboxClientConfig>;
+    fetchRemoteRouters(routerAddress: Address): Promise<RemoteRouters>;
+}
+//# sourceMappingURL=EvmRouterReader.d.ts.map

package/dist/router/EvmRouterReader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EvmRouterReader.d.ts","sourceRoot":"","sources":["../../src/router/EvmRouterReader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAyB,MAAM,sBAAsB,CAAC;AAGtE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,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,0BAA0B,EAC1B,mBAAmB,EACnB,aAAa,EAEd,MAAM,YAAY,CAAC;AAEpB,qBAAa,eAAgB,SAAQ,eAAe;IAQhD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM;IAPxC,SAAS,CAAC,QAAQ,CAAC,MAAM,uCAAmD;IAC5E,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;gBAGnC,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,aAAa,EACD,WAAW,GAAE,MAA0C;IAO/D,gBAAgB,CAC3B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,mBAAmB,CAAC;IAWzB,wBAAwB,CAC5B,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,0BAA0B,CAAC;IA2BhC,kBAAkB,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;CAazE"}

package/dist/router/EvmRouterReader.js

@@ -0,0 +1,60 @@
+import { constants } from 'ethers';
+import { MailboxClient__factory, Router__factory } from '@hyperlane-xyz/core';
+import { eqAddress, rootLogger } from '@hyperlane-xyz/utils';
+import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/concurrency.js';
+import { EvmHookReader } from '../hook/EvmHookReader.js';
+import { EvmIsmReader } from '../ism/EvmIsmReader.js';
+import { HyperlaneReader } from '../utils/HyperlaneReader.js';
+import { RemoteRoutersSchema, } from './types.js';
+export class EvmRouterReader extends HyperlaneReader {
+    concurrency;
+    logger = rootLogger.child({ module: 'EvmRouterReader' });
+    evmHookReader;
+    evmIsmReader;
+    constructor(multiProvider, chain, concurrency = DEFAULT_CONTRACT_READ_CONCURRENCY) {
+        super(multiProvider, chain);
+        this.concurrency = concurrency;
+        this.evmHookReader = new EvmHookReader(multiProvider, chain, concurrency);
+        this.evmIsmReader = new EvmIsmReader(multiProvider, chain, concurrency);
+    }
+    async readRouterConfig(address) {
+        const mailboxClientConfig = await this.fetchMailboxClientConfig(address);
+        const remoteRouters = await this.fetchRemoteRouters(address);
+        // proxyAdmin and foreignDeployment are not directly readable from a generic router
+        // and depend on deployment context or specific router implementations.
+        return {
+            ...mailboxClientConfig,
+            remoteRouters,
+        };
+    }
+    async fetchMailboxClientConfig(routerAddress) {
+        const mailboxClient = MailboxClient__factory.connect(routerAddress, this.provider);
+        const [mailbox, owner, hookAddress, ismAddress] = await Promise.all([
+            mailboxClient.mailbox(),
+            mailboxClient.owner(),
+            mailboxClient.hook(),
+            mailboxClient.interchainSecurityModule(),
+        ]);
+        const derivedIsm = eqAddress(ismAddress, constants.AddressZero)
+            ? constants.AddressZero
+            : await this.evmIsmReader.deriveIsmConfig(ismAddress);
+        const derivedHook = eqAddress(hookAddress, constants.AddressZero)
+            ? constants.AddressZero
+            : await this.evmHookReader.deriveHookConfig(hookAddress);
+        return {
+            owner,
+            mailbox,
+            hook: derivedHook,
+            interchainSecurityModule: derivedIsm,
+        };
+    }
+    async fetchRemoteRouters(routerAddress) {
+        const router = Router__factory.connect(routerAddress, this.provider);
+        const domains = await router.domains();
+        const routers = Object.fromEntries(await Promise.all(domains.map(async (domain) => {
+            return [domain, { address: await router.routers(domain) }];
+        })));
+        return RemoteRoutersSchema.parse(routers);
+    }
+}
+//# sourceMappingURL=EvmRouterReader.js.map

package/dist/router/EvmRouterReader.js.map

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

package/dist/router/HyperlaneRouterChecker.d.ts

@@ -1,3 +1,4 @@
+import { Router } from '@hyperlane-xyz/core';
 import { HyperlaneFactories } from '../contracts/types.js';
 import { HyperlaneAppChecker } from '../deploy/HyperlaneAppChecker.js';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
@@ -10,6 +11,8 @@ export declare class HyperlaneRouterChecker<Factories extends HyperlaneFactories
     readonly logger: import("pino").default.Logger<never>;
     constructor(multiProvider: MultiProvider, app: App, configMap: ChainMap<Config>, ismFactory?: HyperlaneIsmFactory | undefined, logger?: import("pino").default.Logger<never>);
     checkChain(chain: ChainName): Promise<void>;
+    protected checkMailbox(chain: ChainName, router: Router, config: RouterConfig): Promise<void>;
+    protected checkMailboxIsm(chain: ChainName, router: Router, config: RouterConfig): Promise<void>;
     checkMailboxClient(chain: ChainName): Promise<void>;
     checkEnrolledRouters(chain: ChainName, expectedRemoteChains?: ChainName[]): Promise<void>;
 }

package/dist/router/HyperlaneRouterChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterChecker.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAKL,YAAY,EAGb,MAAM,YAAY,CAAC;AAEpB,qBAAa,sBAAsB,CACjC,SAAS,SAAS,kBAAkB,EACpC,GAAG,SAAS,SAAS,CAAC,SAAS,CAAC,EAChC,MAAM,SAAS,YAAY,CAC3B,SAAQ,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;IAKtC,QAAQ,CAAC,UAAU,CAAC;IACpB,QAAQ,CAAC,MAAM;gBAJf,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAClB,UAAU,CAAC,iCAAqB,EAChC,MAAM,uCAAyD;IAKpE,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAyEnD,oBAAoB,CACxB,KAAK,EAAE,SAAS,EAChB,oBAAoB,GAAE,SAAS,EAAO,GACrC,OAAO,CAAC,IAAI,CAAC;CAoFjB"}
+{"version":3,"file":"HyperlaneRouterChecker.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAS7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAKL,YAAY,EAGb,MAAM,YAAY,CAAC;AAEpB,qBAAa,sBAAsB,CACjC,SAAS,SAAS,kBAAkB,EACpC,GAAG,SAAS,SAAS,CAAC,SAAS,CAAC,EAChC,MAAM,SAAS,YAAY,CAC3B,SAAQ,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;IAKtC,QAAQ,CAAC,UAAU,CAAC;IACpB,QAAQ,CAAC,MAAM;gBAJf,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAClB,UAAU,CAAC,iCAAqB,EAChC,MAAM,uCAAyD;IAKpE,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;cAUjC,YAAY,CAC1B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC;cA0BA,eAAe,CAC7B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC;IAgDV,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnD,oBAAoB,CACxB,KAAK,EAAE,SAAS,EAChB,oBAAoB,GAAE,SAAS,EAAO,GACrC,OAAO,CAAC,IAAI,CAAC;CAoFjB"}

package/dist/router/HyperlaneRouterChecker.js

@@ -17,9 +17,7 @@ export class HyperlaneRouterChecker extends HyperlaneAppChecker {
         await this.checkEnrolledRouters(chain);
         await super.checkOwnership(chain, this.configMap[chain].owner, this.configMap[chain].ownerOverrides);
     }
-    async checkMailboxClient(chain) {
-        const router = this.app.router(this.app.getContracts(chain));
-        const config = this.configMap[chain];
+    async checkMailbox(chain, router, config) {
         const mailboxAddr = await router.mailbox();
         if (!eqAddress(mailboxAddr, config.mailbox)) {
             this.addViolation({
@@ -42,12 +40,18 @@ export class HyperlaneRouterChecker extends HyperlaneAppChecker {
                 });
             }
         }
+    }
+    async checkMailboxIsm(chain, router, config) {
+        const mailboxAddr = await router.mailbox();
         const actualIsmAddress = await router.interchainSecurityModule();
+        // If the router is its own ism (e.g. the ICA router, skip checking configs)
+        if (eqAddress(actualIsmAddress, router.address))
+            return;
         const matches = await moduleMatchesConfig(chain, actualIsmAddress, config.interchainSecurityModule ?? ethers.constants.AddressZero, this.multiProvider, this.ismFactory?.chainMap[chain] ?? {}, mailboxAddr);
         if (!matches) {
             const ismReader = new EvmIsmReader(this.multiProvider, chain);
             let actualConfig = ethers.constants.AddressZero;
-            if (actualIsmAddress !== ethers.constants.AddressZero) {
+            if (!isZeroishAddress(actualIsmAddress)) {
                 actualConfig = await ismReader.deriveIsmConfig(actualIsmAddress);
             }
             let expectedConfig = config.interchainSecurityModule;
@@ -69,6 +73,12 @@ export class HyperlaneRouterChecker extends HyperlaneAppChecker {
             this.addViolation(violation);
         }
     }
+    async checkMailboxClient(chain) {
+        const router = this.app.router(this.app.getContracts(chain));
+        const config = this.configMap[chain];
+        await this.checkMailbox(chain, router, config);
+        await this.checkMailboxIsm(chain, router, config);
+    }
     async checkEnrolledRouters(chain, expectedRemoteChains = []) {
         const router = this.app.router(this.app.getContracts(chain));
         const actualRemoteChains = await this.app.remoteChains(chain);

package/dist/router/HyperlaneRouterChecker.js.map

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAEL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAKtD,OAAO,EAEL,mBAAmB,EAKnB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAEpB,MAAM,OAAO,sBAIX,SAAQ,mBAAgC;IAK7B;IACA;IALX,YACE,aAA4B,EAC5B,GAAQ,EACR,SAA2B,EAClB,UAAgC,EAChC,SAAS,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;QAExE,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAH5B,eAAU,GAAV,UAAU,CAAsB;QAChC,WAAM,GAAN,MAAM,CAAyD;IAG1E,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,KAAgB;QAC/B,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,KAAK,CAAC,cAAc,CACxB,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAC3B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc,CACrC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,KAAgB;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAErC,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAC3C,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,YAAY,CAAC;gBAChB,KAAK;gBACL,IAAI,EAAE,mBAAmB,CAAC,OAAO;gBACjC,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,WAAW;gBACnB,QAAQ,EAAE,MAAM,CAAC,OAAO;aACzB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAc,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,YAAY,CAAC;oBAChB,KAAK;oBACL,IAAI,EAAE,mBAAmB,CAAC,IAAI;oBAC9B,QAAQ,EAAE,MAAM;oBAChB,MAAM,EAAE,IAAI;oBACZ,QAAQ,EAAE,MAAM,CAAC,IAAI;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,wBAAwB,EAAE,CAAC;QAEjE,MAAM,OAAO,GAAG,MAAM,mBAAmB,CACvC,KAAK,EACL,gBAAgB,EAChB,MAAM,CAAC,wBAAwB,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,EAC/D,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAK,EAAU,EAC/C,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YAC9D,IAAI,YAAY,GACd,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;YAC/B,IAAI,gBAAgB,KAAK,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;gBACtD,YAAY,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YACnE,CAAC;YAED,IAAI,cAAc,GAAG,MAAM,CAAC,wBAAwB,CAAC;YAErD,IACE,OAAO,cAAc,KAAK,QAAQ;gBAClC,CAAC,gBAAgB,CAAC,cAAc,CAAC,EACjC,CAAC;gBACD,cAAc,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;YACnE,CAAC;YAED,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBACjC,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;YAChD,CAAC;YAED,MAAM,SAAS,GAAoB;gBACjC,KAAK;gBACL,IAAI,EAAE,mBAAmB,CAAC,wBAAwB;gBAClD,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,YAAY;gBACpB,QAAQ,EAAE,cAAc;gBACxB,WAAW,EAAE,wCAAwC;aACtD,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,KAAgB,EAChB,uBAAoC,EAAE;QAEtC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7D,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAE9D,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAqB,EAAE,CAAC;QAE7C,MAAM,mBAAmB,GAAG,oBAAoB;aAC7C,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aAClD,IAAI,EAAE,CAAC;QACV,MAAM,uBAAuB,GAGxB,EAAE,CAAC;QACR,MAAM,oBAAoB,GAAgB,EAAE,CAAC;QAE7C,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YAC3C,IAAI,mBAA2B,CAAC;YAChC,IAAI,CAAC;gBACH,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,uDAAuD;gBACvD,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACvC,OAAO;YACT,CAAC;YACD,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACnE,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC1D,MAAM,cAAc,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;YAE7D,cAAc,CAAC,WAAW,CAAC,GAAG,YAAY,CAAC;YAC3C,eAAe,CAAC,WAAW,CAAC,GAAG,cAAc,CAAC;YAE9C,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;gBACpC,uBAAuB,CAAC,WAAW,CAAC,GAAG;oBACrC,MAAM,EAAE,YAAY;oBACpB,QAAQ,EAAE,cAAc;iBACzB,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,MAAM,CACpD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CACjD,CAAC;QAEF,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,SAAS,GAAmC;gBAChD,KAAK;gBACL,IAAI,EAAE,mBAAmB,CAAC,qBAAqB;gBAC/C,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;gBACrC,QAAQ,EAAE,oBAAoB,CAAC,IAAI,EAAE;gBACrC,aAAa,EAAE,mBAAmB;gBAClC,WAAW,EAAE,sDAAsD;aACpE,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,MAAM,SAAS,GAAoB;gBACjC,KAAK;gBACL,IAAI,EAAE,mBAAmB,CAAC,2BAA2B;gBACrD,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,cAAc;gBACtB,QAAQ,EAAE,eAAe;gBACzB,UAAU,EAAE,uBAAuB;gBACnC,WAAW,EAAE,gEAAgE;aAC9E,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;QAED,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,SAAS,GAA2B;gBACxC,KAAK;gBACL,IAAI,EAAE,mBAAmB,CAAC,aAAa;gBACvC,QAAQ,EAAE,MAAM;gBAChB,MAAM,EAAE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC;gBACpC,QAAQ,EAAE,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC;gBACxC,WAAW,EAAE,sDAAsD;aACpE,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"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"}

package/dist/router/types.d.ts

@@ -6,17 +6,18 @@ import { UpgradeConfig } from '../deploy/proxy.js';
 import { CheckerViolation } from '../deploy/types.js';
 import { DerivedHookConfig } from '../hook/types.js';
 import { DerivedIsmConfig } from '../ism/types.js';
+import { MultiProvider } from '../providers/MultiProvider.js';
 import { ChainMap } from '../types.js';
 export type RouterAddress = {
     router: Address;
 };
 export type MailboxClientConfig = z.infer<typeof MailboxClientConfigSchema>;
-export type DerivedMailboxClientFields = {
-    hook: string | DerivedHookConfig;
-    interchainSecurityModule: string | DerivedIsmConfig;
+export type DerivedMailboxClientConfig = MailboxClientConfig & {
+    hook: DerivedHookConfig | Address;
+    interchainSecurityModule: DerivedIsmConfig | Address;
 };
-export type DerivedMailboxClientConfig = Omit<MailboxClientConfig, keyof DerivedMailboxClientFields> & DerivedMailboxClientFields;
 export type RouterConfig = z.infer<typeof RouterConfigSchema>;
+export type DerivedRouterConfig = RouterConfig & DerivedMailboxClientConfig;
 export type GasRouterConfig = z.infer<typeof GasRouterConfigSchema>;
 export type ProxiedRouterConfig = RouterConfig & Partial<UpgradeConfig>;
 export type ProxiedFactories = HyperlaneFactories & {
@@ -312,11 +313,20 @@ export declare const MailboxClientConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     }>, z.ZodObject<{
-        type: z.ZodLiteral<import("../ism/types.js").IsmType.CCIP_READ>;
+        owner: z.ZodString;
+        ownerOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        type: z.ZodLiteral<import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP>;
+        urls: z.ZodArray<z.ZodString, "many">;
     }, "strip", z.ZodTypeAny, {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     }, {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     }>]>>;
 }, "strip", z.ZodTypeAny, {
     owner: string;
@@ -401,7 +411,10 @@ export declare const MailboxClientConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     } | {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     } | import("../ism/types.js").RoutingIsmConfig | import("../ism/types.js").AggregationIsmConfig | undefined;
 }, {
     owner: string;
@@ -486,7 +499,10 @@ export declare const MailboxClientConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     } | {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     } | import("../ism/types.js").RoutingIsmConfig | import("../ism/types.js").AggregationIsmConfig | undefined;
 }>;
 export declare const ForeignDeploymentConfigSchema: z.ZodObject<{
@@ -496,7 +512,9 @@ export declare const ForeignDeploymentConfigSchema: z.ZodObject<{
 }, {
     foreignDeployment?: string | undefined;
 }>;
-export declare const RemoteRouterDomain: z.ZodString;
+export declare const RemoteRouterDomainOrChainNameSchema: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+export type RemoteRouterDomainOrChainName = z.infer<typeof RemoteRouterDomainOrChainNameSchema>;
+export declare function resolveRouterMapConfig<T>(multiProvider: MultiProvider, routerMap: Record<RemoteRouterDomainOrChainName, T>): Record<number, T>;
 export declare const RemoteRouterRouter: z.ZodObject<{
     address: z.ZodString;
 }, "strip", z.ZodTypeAny, {
@@ -504,7 +522,7 @@ export declare const RemoteRouterRouter: z.ZodObject<{
 }, {
     address: string;
 }>;
-export declare const RemoteRoutersSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
+export declare const RemoteRoutersSchema: z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
     address: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     address: string;
@@ -762,14 +780,23 @@ export declare const RouterConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     }>, z.ZodObject<{
-        type: z.ZodLiteral<import("../ism/types.js").IsmType.CCIP_READ>;
+        owner: z.ZodString;
+        ownerOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        type: z.ZodLiteral<import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP>;
+        urls: z.ZodArray<z.ZodString, "many">;
     }, "strip", z.ZodTypeAny, {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     }, {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     }>]>>;
     foreignDeployment: z.ZodOptional<z.ZodString>;
-    remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+    remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
         address: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         address: string;
@@ -872,10 +899,13 @@ export declare const RouterConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     } | {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     } | import("../ism/types.js").RoutingIsmConfig | import("../ism/types.js").AggregationIsmConfig | undefined;
     foreignDeployment?: string | undefined;
-    remoteRouters?: Record<string, {
+    remoteRouters?: Record<string | number, {
         address: string;
     }> | undefined;
     proxyAdmin?: {
@@ -966,10 +996,13 @@ export declare const RouterConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     } | {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     } | import("../ism/types.js").RoutingIsmConfig | import("../ism/types.js").AggregationIsmConfig | undefined;
     foreignDeployment?: string | undefined;
-    remoteRouters?: Record<string, {
+    remoteRouters?: Record<string | number, {
         address: string;
     }> | undefined;
     proxyAdmin?: {
@@ -978,7 +1011,7 @@ export declare const RouterConfigSchema: z.ZodObject<{
         address?: string | undefined;
     } | undefined;
 }>;
-export declare const DestinationGasSchema: z.ZodRecord<z.ZodString, z.ZodString>;
+export declare const DestinationGasSchema: z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodString>;
 export declare const GasRouterConfigSchema: z.ZodObject<{
     owner: z.ZodString;
     ownerOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
@@ -1243,14 +1276,23 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     }>, z.ZodObject<{
-        type: z.ZodLiteral<import("../ism/types.js").IsmType.CCIP_READ>;
+        owner: z.ZodString;
+        ownerOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        type: z.ZodLiteral<import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP>;
+        urls: z.ZodArray<z.ZodString, "many">;
     }, "strip", z.ZodTypeAny, {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     }, {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     }>]>>;
     foreignDeployment: z.ZodOptional<z.ZodString>;
-    remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+    remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
         address: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         address: string;
@@ -1258,7 +1300,7 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
         address: string;
     }>>>;
     gas: z.ZodOptional<z.ZodNumber>;
-    destinationGas: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    destinationGas: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
     owner: string;
     mailbox: string;
@@ -1347,14 +1389,17 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     } | {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     } | import("../ism/types.js").RoutingIsmConfig | import("../ism/types.js").AggregationIsmConfig | undefined;
     foreignDeployment?: string | undefined;
-    remoteRouters?: Record<string, {
+    remoteRouters?: Record<string | number, {
         address: string;
     }> | undefined;
     gas?: number | undefined;
-    destinationGas?: Record<string, string> | undefined;
+    destinationGas?: Record<string | number, string> | undefined;
 }, {
     owner: string;
     mailbox: string;
@@ -1443,13 +1488,16 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
         type: import("../ism/types.js").IsmType.ARB_L2_TO_L1;
         bridge: string;
     } | {
-        type: import("../ism/types.js").IsmType.CCIP_READ;
+        type: import("../ism/types.js").IsmType.OFFCHAIN_LOOKUP;
+        owner: string;
+        urls: string[];
+        ownerOverrides?: Record<string, string> | undefined;
     } | import("../ism/types.js").RoutingIsmConfig | import("../ism/types.js").AggregationIsmConfig | undefined;
     foreignDeployment?: string | undefined;
-    remoteRouters?: Record<string, {
+    remoteRouters?: Record<string | number, {
         address: string;
     }> | undefined;
     gas?: number | undefined;
-    destinationGas?: Record<string, string> | undefined;
+    destinationGas?: Record<string | number, string> | undefined;
 }>;
 //# sourceMappingURL=types.d.ts.map

package/dist/router/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,MAAM,EACN,2BAA2B,EAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAmB,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAwC,MAAM,aAAa,CAAC;AAE7E,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAE5E,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAAC;IACjC,wBAAwB,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,mBAAmB,EACnB,MAAM,0BAA0B,CACjC,GACC,0BAA0B,CAAC;AAE7B,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxE,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,2BAA2B,CAAC;CACjD,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,gBAG9B,CAAC;AAEF,oBAAY,mBAAmB;IAC7B,wBAAwB,cAAc;IACtC,OAAO,kBAAkB;IACzB,IAAI,eAAe;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,aAAa,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,mBAAmB;IAC7B,2BAA2B,gCAAgC;IAC3D,qBAAqB,0BAA0B;IAC/C,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,IAAI,EAAE,mBAAmB,CAAC,2BAA2B,CAAC;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,QAAQ,CAAC;QACnB,MAAM,EAAE,cAAc,CAAC;QACvB,QAAQ,EAAE,cAAc,CAAC;KAC1B,CAAC,CAAC;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,8BAA+B,SAAQ,gBAAgB;IACtE,IAAI,EAAE,mBAAmB,CAAC,qBAAqB,CAAC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,IAAI,EAAE,mBAAmB,CAAC,aAAa,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIpC,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;;;;EAExC,CAAC;AAEH,eAAO,MAAM,kBAAkB,aAAa,CAAC;AAC7C,eAAO,MAAM,kBAAkB;;;;;;EAE7B,CAAC;AACH,eAAO,MAAM,mBAAmB;;;;;;GAG/B,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAO9B,CAAC;AAIF,eAAO,MAAM,oBAAoB,uCAGhC,CAAC;AACF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGhC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}

package/dist/router/types.js

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { ProxyAdmin__factory, TimelockController__factory, } from '@hyperlane-xyz/core';
+import { isNumeric } from '@hyperlane-xyz/utils';
 import { HookConfigSchema } from '../hook/types.js';
 import { IsmConfigSchema } from '../ism/types.js';
 import { ZHash } from '../metadata/customZodTypes.js';
@@ -28,18 +29,26 @@ export const MailboxClientConfigSchema = OwnableSchema.extend({
 export const ForeignDeploymentConfigSchema = z.object({
     foreignDeployment: z.string().optional(),
 });
-export const RemoteRouterDomain = z.string();
+export const RemoteRouterDomainOrChainNameSchema = z.string().or(z.number());
+export function resolveRouterMapConfig(multiProvider, routerMap) {
+    return Object.fromEntries(Object.entries(routerMap).map(([domainIdOrChainName, value]) => {
+        if (isNumeric(domainIdOrChainName)) {
+            return [parseInt(domainIdOrChainName), value];
+        }
+        const meta = multiProvider.getChainMetadata(domainIdOrChainName);
+        return [meta.domainId, value];
+    }));
+}
 export const RemoteRouterRouter = z.object({
     address: z.string().startsWith('0x'),
 });
-export const RemoteRoutersSchema = z.record(RemoteRouterDomain, RemoteRouterRouter);
+export const RemoteRoutersSchema = z.record(RemoteRouterDomainOrChainNameSchema, RemoteRouterRouter);
 export const RouterConfigSchema = MailboxClientConfigSchema.merge(ForeignDeploymentConfigSchema).merge(z.object({
     remoteRouters: RemoteRoutersSchema.optional(),
     proxyAdmin: DeployedOwnableSchema.optional(),
 }));
-const DestinationGasDomain = z.string();
 const DestinationGasAmount = z.string(); // This must be a string type to match Ether's type
-export const DestinationGasSchema = z.record(DestinationGasDomain, DestinationGasAmount);
+export const DestinationGasSchema = z.record(RemoteRouterDomainOrChainNameSchema, DestinationGasAmount);
 export const GasRouterConfigSchema = RouterConfigSchema.extend({
     gas: z.number().optional(),
     destinationGas: DestinationGasSchema.optional(),