@hyperlane-xyz/sdk 5.1.2 → 5.2.0-beta.1

package/dist/providers/transactions/submitter/builder/schemas.d.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 export declare const SubmissionStrategySchema: z.ZodObject<{
-    chain: z.ZodString;
     submitter: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC>;
     }, "strip", z.ZodTypeAny, {
@@ -76,7 +75,6 @@ export declare const SubmissionStrategySchema: z.ZodObject<{
         hookMetadata?: string | undefined;
     }>]>, "many">>;
 }, "strip", z.ZodTypeAny, {
-    chain: string;
     submitter: {
         type: import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC;
     } | {
@@ -100,7 +98,6 @@ export declare const SubmissionStrategySchema: z.ZodObject<{
         hookMetadata?: string | undefined;
     }[] | undefined;
 }, {
-    chain: string;
     submitter: {
         type: import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC;
     } | {
@@ -124,4 +121,126 @@ export declare const SubmissionStrategySchema: z.ZodObject<{
         hookMetadata?: string | undefined;
     }[] | undefined;
 }>;
+export declare const ChainSubmissionStrategySchema: z.ZodRecord<z.ZodString, z.ZodObject<{
+    submitter: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+        type: z.ZodLiteral<import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC>;
+    }, "strip", z.ZodTypeAny, {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC;
+    }, {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC;
+    }>, z.ZodObject<{
+        userAddress: z.ZodString;
+        type: z.ZodLiteral<import("../TxSubmitterTypes.js").TxSubmitterType.IMPERSONATED_ACCOUNT>;
+    }, "strip", z.ZodTypeAny, {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.IMPERSONATED_ACCOUNT;
+        userAddress: string;
+    }, {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.IMPERSONATED_ACCOUNT;
+        userAddress: string;
+    }>, z.ZodObject<{
+        chain: z.ZodString;
+        safeAddress: z.ZodString;
+        type: z.ZodLiteral<import("../TxSubmitterTypes.js").TxSubmitterType.GNOSIS_SAFE>;
+    }, "strip", z.ZodTypeAny, {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.GNOSIS_SAFE;
+        chain: string;
+        safeAddress: string;
+    }, {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.GNOSIS_SAFE;
+        chain: string;
+        safeAddress: string;
+    }>]>;
+    transforms: z.ZodOptional<z.ZodArray<z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
+        chain: z.ZodString;
+        config: z.ZodObject<{
+            origin: z.ZodString;
+            owner: z.ZodString;
+            localRouter: z.ZodOptional<z.ZodString>;
+            routerOverride: z.ZodOptional<z.ZodString>;
+            ismOverride: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            owner: string;
+            origin: string;
+            localRouter?: string | undefined;
+            routerOverride?: string | undefined;
+            ismOverride?: string | undefined;
+        }, {
+            owner: string;
+            origin: string;
+            localRouter?: string | undefined;
+            routerOverride?: string | undefined;
+            ismOverride?: string | undefined;
+        }>;
+        hookMetadata: z.ZodOptional<z.ZodString>;
+        type: z.ZodLiteral<import("../../transformer/TxTransformerTypes.js").TxTransformerType>;
+    }, "strip", z.ZodTypeAny, {
+        type: import("../../transformer/TxTransformerTypes.js").TxTransformerType;
+        chain: string;
+        config: {
+            owner: string;
+            origin: string;
+            localRouter?: string | undefined;
+            routerOverride?: string | undefined;
+            ismOverride?: string | undefined;
+        };
+        hookMetadata?: string | undefined;
+    }, {
+        type: import("../../transformer/TxTransformerTypes.js").TxTransformerType;
+        chain: string;
+        config: {
+            owner: string;
+            origin: string;
+            localRouter?: string | undefined;
+            routerOverride?: string | undefined;
+            ismOverride?: string | undefined;
+        };
+        hookMetadata?: string | undefined;
+    }>]>, "many">>;
+}, "strip", z.ZodTypeAny, {
+    submitter: {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC;
+    } | {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.IMPERSONATED_ACCOUNT;
+        userAddress: string;
+    } | {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.GNOSIS_SAFE;
+        chain: string;
+        safeAddress: string;
+    };
+    transforms?: {
+        type: import("../../transformer/TxTransformerTypes.js").TxTransformerType;
+        chain: string;
+        config: {
+            owner: string;
+            origin: string;
+            localRouter?: string | undefined;
+            routerOverride?: string | undefined;
+            ismOverride?: string | undefined;
+        };
+        hookMetadata?: string | undefined;
+    }[] | undefined;
+}, {
+    submitter: {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.JSON_RPC;
+    } | {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.IMPERSONATED_ACCOUNT;
+        userAddress: string;
+    } | {
+        type: import("../TxSubmitterTypes.js").TxSubmitterType.GNOSIS_SAFE;
+        chain: string;
+        safeAddress: string;
+    };
+    transforms?: {
+        type: import("../../transformer/TxTransformerTypes.js").TxTransformerType;
+        chain: string;
+        config: {
+            owner: string;
+            origin: string;
+            localRouter?: string | undefined;
+            routerOverride?: string | undefined;
+            ismOverride?: string | undefined;
+        };
+        hookMetadata?: string | undefined;
+    }[] | undefined;
+}>>;
 //# sourceMappingURL=schemas.d.ts.map

package/dist/providers/transactions/submitter/builder/schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/builder/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAInC,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/builder/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGnC,CAAC;AAEH,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAGzC,CAAC"}

package/dist/providers/transactions/submitter/builder/schemas.js

@@ -3,8 +3,8 @@ import { ZChainName } from '../../../../metadata/customZodTypes.js';
 import { TransformerMetadataSchema } from '../../transformer/schemas.js';
 import { SubmitterMetadataSchema } from '../schemas.js';
 export const SubmissionStrategySchema = z.object({
-    chain: ZChainName,
     submitter: SubmitterMetadataSchema,
     transforms: z.array(TransformerMetadataSchema).optional(),
 });
+export const ChainSubmissionStrategySchema = z.record(ZChainName, SubmissionStrategySchema);
 //# sourceMappingURL=schemas.js.map

package/dist/providers/transactions/submitter/builder/schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/builder/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,uBAAuB;IAClC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE;CAC1D,CAAC,CAAC"}
+{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/builder/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAExD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/C,SAAS,EAAE,uBAAuB;IAClC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE;CAC1D,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CACnD,UAAU,EACV,wBAAwB,CACzB,CAAC"}

package/dist/providers/transactions/submitter/builder/types.d.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
-import { SubmissionStrategySchema } from './schemas.js';
+import { ChainSubmissionStrategySchema, SubmissionStrategySchema } from './schemas.js';
 export type SubmissionStrategy = z.infer<typeof SubmissionStrategySchema>;
+export type ChainSubmissionStrategy = z.infer<typeof ChainSubmissionStrategySchema>;
 //# sourceMappingURL=types.d.ts.map

package/dist/providers/transactions/submitter/builder/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/builder/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAExD,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/builder/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAC3C,OAAO,6BAA6B,CACrC,CAAC"}

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts

@@ -7,9 +7,12 @@ import { EV5GnosisSafeTxSubmitterProps } from './types.js';
 export declare class EV5GnosisSafeTxSubmitter implements EV5TxSubmitterInterface {
     readonly multiProvider: MultiProvider;
     readonly props: EV5GnosisSafeTxSubmitterProps;
+    private safe;
+    private safeService;
     readonly txSubmitterType: TxSubmitterType;
     protected readonly logger: Logger;
-    constructor(multiProvider: MultiProvider, props: EV5GnosisSafeTxSubmitterProps);
-    submit(...txs: PopulatedTransactions): Promise<void>;
+    constructor(multiProvider: MultiProvider, props: EV5GnosisSafeTxSubmitterProps, safe: any, safeService: any);
+    static create(multiProvider: MultiProvider, props: EV5GnosisSafeTxSubmitterProps): Promise<EV5GnosisSafeTxSubmitter>;
+    submit(...txs: PopulatedTransactions): Promise<any[]>;
 }
 //# sourceMappingURL=EV5GnosisSafeTxSubmitter.d.ts.map

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EV5GnosisSafeTxSubmitter.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAM9B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAwB,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAE3D,qBAAa,wBAAyB,YAAW,uBAAuB;aASpD,aAAa,EAAE,aAAa;aAC5B,KAAK,EAAE,6BAA6B;IATtD,SAAgB,eAAe,EAAE,eAAe,CAClB;IAE9B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAE9B;gBAGe,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,6BAA6B;IAGzC,MAAM,CAAC,GAAG,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;CA+ClE"}
+{"version":3,"file":"EV5GnosisSafeTxSubmitter.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAO9B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAwB,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,YAAY,CAAC;AAE3D,qBAAa,wBAAyB,YAAW,uBAAuB;aASpD,aAAa,EAAE,aAAa;aAC5B,KAAK,EAAE,6BAA6B;IACpD,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,WAAW;IAXrB,SAAgB,eAAe,EAAE,eAAe,CAClB;IAE9B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAE9B;gBAGe,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,6BAA6B,EAC5C,IAAI,EAAE,GAAG,EACT,WAAW,EAAE,GAAG;WAGb,MAAM,CACjB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,6BAA6B,GACnC,OAAO,CAAC,wBAAwB,CAAC;IAgCvB,MAAM,CAAC,GAAG,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CA0CnE"}

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

@@ -1,44 +1,59 @@
 import { assert, rootLogger } from '@hyperlane-xyz/utils';
+// prettier-ignore
 // @ts-ignore
-import { getSafe, getSafeService } from '../../../../utils/gnosisSafe.js';
+import { canProposeSafeTransactions, getSafe, getSafeService } from '../../../../utils/gnosisSafe.js';
 import { TxSubmitterType } from '../TxSubmitterTypes.js';
 export class EV5GnosisSafeTxSubmitter {
     multiProvider;
     props;
+    safe;
+    safeService;
     txSubmitterType = TxSubmitterType.GNOSIS_SAFE;
     logger = rootLogger.child({
         module: 'gnosis-safe-submitter',
     });
-    constructor(multiProvider, props) {
+    constructor(multiProvider, props, safe, safeService) {
         this.multiProvider = multiProvider;
         this.props = props;
+        this.safe = safe;
+        this.safeService = safeService;
+    }
+    static async create(multiProvider, props) {
+        const { chain, safeAddress } = props;
+        const { gnosisSafeTransactionServiceUrl } = multiProvider.getChainMetadata(chain);
+        assert(gnosisSafeTransactionServiceUrl, `Must set gnosisSafeTransactionServiceUrl in the Registry metadata for ${chain}`);
+        const signerAddress = await multiProvider.getSigner(chain).getAddress();
+        const authorized = await canProposeSafeTransactions(signerAddress, chain, multiProvider, safeAddress);
+        assert(authorized, `Signer ${signerAddress} is not an authorized Safe Proposer for ${safeAddress}`);
+        const safe = await getSafe(chain, multiProvider, safeAddress);
+        const safeService = await getSafeService(chain, multiProvider);
+        return new EV5GnosisSafeTxSubmitter(multiProvider, props, safe, safeService);
     }
     async submit(...txs) {
-        const safe = await getSafe(this.props.chain, this.multiProvider, this.props.safeAddress);
-        const safeService = await getSafeService(this.props.chain, this.multiProvider);
-        const nextNonce = await safeService.getNextNonce(this.props.safeAddress);
+        const nextNonce = await this.safeService.getNextNonce(this.props.safeAddress);
         const safeTransactionBatch = txs.map(({ to, data, value, chainId }) => {
             const txChain = this.multiProvider.getChainName(chainId);
             assert(txChain === this.props.chain, `Invalid PopulatedTransaction: Cannot submit ${txChain} tx to ${this.props.chain} submitter.`);
             return { to, data, value: value?.toString() ?? '0' };
         });
-        const safeTransaction = await safe.createTransaction({
+        const safeTransaction = await this.safe.createTransaction({
             safeTransactionData: safeTransactionBatch,
             options: { nonce: nextNonce },
         });
         const safeTransactionData = safeTransaction.data;
-        const safeTxHash = await safe.getTransactionHash(safeTransaction);
+        const safeTxHash = await this.safe.getTransactionHash(safeTransaction);
         const senderAddress = await this.multiProvider.getSignerAddress(this.props.chain);
-        const safeSignature = await safe.signTransactionHash(safeTxHash);
+        const safeSignature = await this.safe.signTransactionHash(safeTxHash);
         const senderSignature = safeSignature.data;
-        this.logger.debug(`Submitting transaction proposal to ${this.props.safeAddress} on ${this.props.chain}: ${safeTxHash}`);
-        return safeService.proposeTransaction({
+        this.logger.info(`Submitting transaction proposal to ${this.props.safeAddress} on ${this.props.chain}: ${safeTxHash}`);
+        const transactionReceipts = await this.safeService.proposeTransaction({
             safeAddress: this.props.safeAddress,
             safeTransactionData,
             safeTxHash,
             senderAddress,
             senderSignature,
         });
+        return transactionReceipts ?? [];
     }
 }
 //# sourceMappingURL=EV5GnosisSafeTxSubmitter.js.map

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":"AAEA,OAAO,EAAW,MAAM,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEnE,aAAa;AACb,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAG1E,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAKzD,MAAM,OAAO,wBAAwB;IASjB;IACA;IATF,eAAe,GAC7B,eAAe,CAAC,WAAW,CAAC;IAEX,MAAM,GAAW,UAAU,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE,uBAAuB;KAChC,CAAC,CAAC;IAEH,YACkB,aAA4B,EAC5B,KAAoC;QADpC,kBAAa,GAAb,aAAa,CAAe;QAC5B,UAAK,GAAL,KAAK,CAA+B;IACnD,CAAC;IAEG,KAAK,CAAC,MAAM,CAAC,GAAG,GAA0B;QAC/C,MAAM,IAAI,GAAG,MAAM,OAAO,CACxB,IAAI,CAAC,KAAK,CAAC,KAAK,EAChB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,KAAK,CAAC,WAAW,CACvB,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,IAAI,CAAC,KAAK,CAAC,KAAK,EAChB,IAAI,CAAC,aAAa,CACnB,CAAC;QACF,MAAM,SAAS,GAAW,MAAM,WAAW,CAAC,YAAY,CACtD,IAAI,CAAC,KAAK,CAAC,WAAW,CACvB,CAAC;QACF,MAAM,oBAAoB,GAAU,GAAG,CAAC,GAAG,CACzC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAwB,EAAE,EAAE;YACrD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,CACJ,OAAO,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,EAC5B,+CAA+C,OAAO,UAAU,IAAI,CAAC,KAAK,CAAC,KAAK,aAAa,CAC9F,CAAC;YACF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC;QACvD,CAAC,CACF,CAAC;QACF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YACnD,mBAAmB,EAAE,oBAAoB;YACzC,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;SAC9B,CAAC,CAAC;QACH,MAAM,mBAAmB,GAAQ,eAAe,CAAC,IAAI,CAAC;QACtD,MAAM,UAAU,GAAW,MAAM,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAC1E,MAAM,aAAa,GAAY,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CACtE,IAAI,CAAC,KAAK,CAAC,KAAK,CACjB,CAAC;QACF,MAAM,aAAa,GAAQ,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,eAAe,GAAW,aAAa,CAAC,IAAI,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,sCAAsC,IAAI,CAAC,KAAK,CAAC,WAAW,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,UAAU,EAAE,CACrG,CAAC;QAEF,OAAO,WAAW,CAAC,kBAAkB,CAAC;YACpC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;YACnC,mBAAmB;YACnB,UAAU;YACV,aAAa;YACb,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"EV5GnosisSafeTxSubmitter.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.ts"],"names":[],"mappings":"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"}

package/dist/router/GasRouterDeployer.js

@@ -11,7 +11,7 @@ export class GasRouterDeployer extends ProxiedRouterDeployer {
             const remoteConfigs = remoteDomains
                 .map((domain, i) => ({
                 domain,
-                gas: configMap[remoteChains[i]].gas ?? DEFAULT_GAS_OVERHEAD,
+                gas: configMap[remoteChains[i]]?.gas ?? DEFAULT_GAS_OVERHEAD,
             }))
                 .filter(({ gas }, index) => !currentConfigs[index].eq(gas));
             if (remoteConfigs.length == 0) {

package/dist/router/GasRouterDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"GasRouterDeployer.js","sourceRoot":"","sources":["../../src/router/GasRouterDeployer.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,MAAM,oBAAoB,GAAG,MAAO,CAAC;AAErC,MAAM,OAAgB,iBAGpB,SAAQ,qBAAwC;IAGhD,KAAK,CAAC,mBAAmB,CACvB,YAA8C,EAC9C,SAA2B,EAC3B,iBAAoC,EAAE;QAEtC,MAAM,KAAK,CAAC,mBAAmB,CAAC,YAAY,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAC7D,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChD,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CACxC,CAAC;YACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAC9C,CACF,CAAC;YACF,MAAM,aAAa,GAAG,aAAa;iBAChC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnB,MAAM;gBACN,GAAG,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,oBAAoB;aAC5D,CAAC,CAAC;iBACF,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,KAAK,QAAQ,YAAY,EAAE,CAAC,CAAC;YACzE,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK,EACL,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,uCAAuC,CAAC,CAC7D,aAAa,CACd,CACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"GasRouterDeployer.js","sourceRoot":"","sources":["../../src/router/GasRouterDeployer.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,MAAM,oBAAoB,GAAG,MAAO,CAAC;AAErC,MAAM,OAAgB,iBAGpB,SAAQ,qBAAwC;IAGhD,KAAK,CAAC,mBAAmB,CACvB,YAA8C,EAC9C,SAA2B,EAC3B,iBAAoC,EAAE;QAEtC,MAAM,KAAK,CAAC,mBAAmB,CAAC,YAAY,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QAEzE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAC7D,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChD,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CACxC,CAAC;YACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAC9C,CACF,CAAC;YACF,MAAM,aAAa,GAAG,aAAa;iBAChC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnB,MAAM;gBACN,GAAG,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,oBAAoB;aAC7D,CAAC,CAAC;iBACF,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9D,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC9B,SAAS;YACX,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,KAAK,QAAQ,YAAY,EAAE,CAAC,CAAC;YACzE,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK,EACL,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,uCAAuC,CAAC,CAC7D,aAAa,CACd,CACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}

package/dist/router/HyperlaneRouterChecker.d.ts

@@ -7,7 +7,8 @@ import { RouterApp } from './RouterApps.js';
 import { RouterConfig } from './types.js';
 export declare class HyperlaneRouterChecker<Factories extends HyperlaneFactories, App extends RouterApp<Factories>, Config extends RouterConfig> extends HyperlaneAppChecker<App, Config> {
     readonly ismFactory?: HyperlaneIsmFactory | undefined;
-    constructor(multiProvider: MultiProvider, app: App, configMap: ChainMap<Config>, ismFactory?: HyperlaneIsmFactory | undefined);
+    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>;
     checkMailboxClient(chain: ChainName): Promise<void>;
     checkEnrolledRouters(chain: 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":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,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,EAGL,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;gBAHpB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAClB,UAAU,CAAC,iCAAqB;IAKrC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAyEnD,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAuB5D"}
+{"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;AAEpE,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,EAGL,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;IA0EnD,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA0C5D"}

package/dist/router/HyperlaneRouterChecker.js

@@ -1,14 +1,16 @@
 import { ethers } from 'ethers';
-import { addressToBytes32, assert, eqAddress } from '@hyperlane-xyz/utils';
+import { addressToBytes32, assert, eqAddress, rootLogger, } from '@hyperlane-xyz/utils';
 import { HyperlaneAppChecker } from '../deploy/HyperlaneAppChecker.js';
 import { EvmIsmReader } from '../ism/EvmIsmReader.js';
 import { moduleMatchesConfig } from '../ism/utils.js';
 import { ClientViolationType, RouterViolationType, } from './types.js';
 export class HyperlaneRouterChecker extends HyperlaneAppChecker {
     ismFactory;
-    constructor(multiProvider, app, configMap, ismFactory) {
+    logger;
+    constructor(multiProvider, app, configMap, ismFactory, logger = rootLogger.child({ module: 'HyperlaneRouterChecker' })) {
         super(multiProvider, app, configMap);
         this.ismFactory = ismFactory;
+        this.logger = logger;
     }
     async checkChain(chain) {
         await this.checkMailboxClient(chain);
@@ -42,7 +44,7 @@ export class HyperlaneRouterChecker extends HyperlaneAppChecker {
             }
         }
         const actualIsmAddress = await router.interchainSecurityModule();
-        const matches = await moduleMatchesConfig(chain, actualIsmAddress, config.interchainSecurityModule ?? ethers.constants.AddressZero, this.multiProvider, this.ismFactory?.chainMap[chain] ?? {});
+        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;
@@ -70,23 +72,35 @@ export class HyperlaneRouterChecker extends HyperlaneAppChecker {
     async checkEnrolledRouters(chain) {
         const router = this.app.router(this.app.getContracts(chain));
         const remoteChains = await this.app.remoteChains(chain);
+        const currentRouters = {};
+        const expectedRouters = {};
+        const routerDiff = {};
         await Promise.all(remoteChains.map(async (remoteChain) => {
             const remoteRouterAddress = this.app.routerAddress(remoteChain);
             const remoteDomainId = this.multiProvider.getDomainId(remoteChain);
             const actualRouter = await router.routers(remoteDomainId);
             const expectedRouter = addressToBytes32(remoteRouterAddress);
+            currentRouters[remoteChain] = actualRouter;
+            expectedRouters[remoteChain] = expectedRouter;
             if (actualRouter !== expectedRouter) {
-                const violation = {
-                    chain,
-                    remoteChain,
-                    type: RouterViolationType.EnrolledRouter,
-                    contract: router,
+                routerDiff[remoteChain] = {
                     actual: actualRouter,
                     expected: expectedRouter,
                 };
-                this.addViolation(violation);
             }
         }));
+        if (Object.keys(routerDiff).length > 0) {
+            const violation = {
+                chain,
+                type: RouterViolationType.EnrolledRouter,
+                contract: router,
+                actual: currentRouters,
+                expected: expectedRouters,
+                routerDiff,
+                description: `Routers for some domains are missing or not enrolled correctly`,
+            };
+            this.addViolation(violation);
+        }
     }
 }
 //# sourceMappingURL=HyperlaneRouterChecker.js.map

package/dist/router/HyperlaneRouterChecker.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAE3D,gBAAgB,CACpB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAQV,mBAAmB,CACvB,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACnB,cAAc,GAAE,QAAQ,CAAC,OAAO,CAAM,GACrC,OAAO,CAAC,IAAI,CAAC;IAyDV,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAeV,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;CA2B7C"}
+{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAE3D,gBAAgB,CACpB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAQV,mBAAmB,CACvB,oBAAoB,EAAE,qBAAqB,CAAC,SAAS,CAAC,EACtD,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,EACnB,cAAc,GAAE,QAAQ,CAAC,OAAO,CAAM,GACrC,OAAO,CAAC,IAAI,CAAC;IA4DV,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC9C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,IAAI,CAAC;IAeV,MAAM,CACV,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC1B,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;CA2B7C"}

package/dist/router/HyperlaneRouterDeployer.js

@@ -1,4 +1,4 @@
-import { addressToBytes32, objFilter, objMap, objMerge, } from '@hyperlane-xyz/utils';
+import { addBufferToGasLimit, addressToBytes32, objFilter, objMap, objMerge, } from '@hyperlane-xyz/utils';
 import { filterOwnableContracts } from '../contracts/contracts.js';
 import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer.js';
 export class HyperlaneRouterDeployer extends HyperlaneDeployer {
@@ -37,7 +37,14 @@ export class HyperlaneRouterDeployer extends HyperlaneDeployer {
             await super.runIfOwner(chain, this.router(contracts), async () => {
                 const chains = domains.map((id) => this.multiProvider.getChainName(id));
                 this.logger.debug(`Enrolling remote routers (${chains.join(', ')}) on ${chain}`);
-                await this.multiProvider.handleTx(chain, this.router(contracts).enrollRemoteRouters(domains, addresses, this.multiProvider.getTransactionOverrides(chain)));
+                const router = this.router(contracts);
+                const estimatedGas = await router.estimateGas.enrollRemoteRouters(domains, addresses);
+                // deploy with 10% buffer on gas limit
+                const enrollTx = await router.enrollRemoteRouters(domains, addresses, {
+                    gasLimit: addBufferToGasLimit(estimatedGas),
+                    ...this.multiProvider.getTransactionOverrides(chain),
+                });
+                await this.multiProvider.handleTx(chain, enrollTx);
             });
         }
     }

package/dist/router/HyperlaneRouterDeployer.js.map

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

package/dist/router/RouterApps.js

@@ -16,14 +16,14 @@ export class RouterApp extends HyperlaneApp {
     // check onchain for remote enrollments
     async remoteChains(chainName) {
         const router = this.router(this.contractsMap[chainName]);
-        const domainIds = (await router.domains()).map((domain) => {
+        const onchainRemoteChainNames = (await router.domains()).map((domain) => {
             const chainName = this.multiProvider.tryGetChainName(domain);
             if (chainName === null) {
                 throw new Error(`Chain name not found for domain: ${domain}`);
             }
             return chainName;
         });
-        return domainIds;
+        return onchainRemoteChainNames;
     }
     getSecurityModules() {
         return promiseObjAll(objMap(this.chainMap, (_, contracts) => this.router(contracts).interchainSecurityModule()));

package/dist/router/RouterApps.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,MAAM,OAAgB,SAEpB,SAAQ,YAAuB;IAKpB;IAJX,YACE,YAA8C,EAC9C,aAA4B,EAC5B,MAAe,EACN,qBAAwC,EAAE;QAEnD,KAAK,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAFlC,uBAAkB,GAAlB,kBAAkB,CAAwB;IAGrD,CAAC;IAID,aAAa,CAAC,SAAiB;QAC7B,IACE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,QAAQ;YACvD,YAAY,CAAC,QAAQ,EACrB,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,uCAAuC;IAC9B,KAAK,CAAC,YAAY,CAAC,SAAiB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACxD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC7D,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kBAAkB;QAChB,OAAO,aAAa,CAClB,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,aAAa,CAClB,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAgB,YAGpB,SAAQ,SAAoB;IAG5B,KAAK,CAAC,eAAe,CACnB,MAAiB,EACjB,WAAsB;QAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,YAAY,EACZ,MAAM,EACN,aAAa,GACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,MAAM,OAAgB,SAEpB,SAAQ,YAAuB;IAKpB;IAJX,YACE,YAA8C,EAC9C,aAA4B,EAC5B,MAAe,EACN,qBAAwC,EAAE;QAEnD,KAAK,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QAFlC,uBAAkB,GAAlB,kBAAkB,CAAwB;IAGrD,CAAC;IAID,aAAa,CAAC,SAAiB;QAC7B,IACE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,QAAQ;YACvD,YAAY,CAAC,QAAQ,EACrB,CAAC;YACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,uCAAuC;IAC9B,KAAK,CAAC,YAAY,CAAC,SAAiB;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QACzD,MAAM,uBAAuB,GAAG,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACtE,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC7D,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,kBAAkB;QAChB,OAAO,aAAa,CAClB,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACrC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;IACJ,CAAC;IAED,SAAS;QACP,OAAO,aAAa,CAClB,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAgB,YAGpB,SAAQ,SAAoB;IAG5B,KAAK,CAAC,eAAe,CACnB,MAAiB,EACjB,WAAsB;QAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;IACJ,CAAC;CACF"}