@hyperlane-xyz/sdk 1.5.8 → 3.1.0-beta0

package/dist/metadata/chainMetadataTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDomainId = exports.isValidChainMetadata = exports.ChainMetadataSchema = exports.RpcUrlSchema = exports.ExplorerFamily = void 0;
+exports.getChainIdNumber = exports.getDomainId = exports.isValidChainMetadata = exports.ChainMetadataSchema = exports.ChainMetadataSchemaObject = exports.RpcUrlSchema = exports.ExplorerFamily = void 0;
 /**
  * The types defined here are the source of truth for chain metadata.
  * ANY CHANGES HERE NEED TO BE REFLECTED IN HYPERLANE-BASE CONFIG PARSING.
@@ -43,16 +43,18 @@ exports.RpcUrlSchema = zod_1.z.object({
  * A collection of useful properties and settings for chains using Hyperlane
  * Specified as a Zod schema
  */
-exports.ChainMetadataSchema = zod_1.z.object({
-    protocol: zod_1.z
-        .nativeEnum(utils_1.ProtocolType)
-        .describe('The type of protocol used by this chain. See ProtocolType for valid values.'),
-    chainId: customZodTypes_1.ZNzUint.describe(`The chainId of the chain. Uses EIP-155 for EVM chains`),
-    domainId: customZodTypes_1.ZNzUint.optional().describe('The domainId of the chain, should generally default to `chainId`. Consumer of `ChainMetadata` should use this value if present, but otherwise fallback to `chainId`.'),
+exports.ChainMetadataSchemaObject = zod_1.z.object({
     name: zod_1.z
         .string()
         .regex(/^[a-z][a-z0-9]*$/)
         .describe('The unique string identifier of the chain, used as the key in ChainMap dictionaries.'),
+    protocol: zod_1.z
+        .nativeEnum(utils_1.ProtocolType)
+        .describe('The type of protocol used by this chain. See ProtocolType for valid values.'),
+    chainId: zod_1.z
+        .union([customZodTypes_1.ZNzUint, zod_1.z.string()])
+        .describe(`The chainId of the chain. Uses EIP-155 for EVM chains`),
+    domainId: customZodTypes_1.ZNzUint.optional().describe('The domainId of the chain, should generally default to `chainId`. Consumer of `ChainMetadata` should use this value if present, but otherwise fallback to `chainId`.'),
     displayName: zod_1.z
         .string()
         .optional()
@@ -121,17 +123,61 @@ exports.ChainMetadataSchema = zod_1.z.object({
         .string()
         .optional()
         .describe('The URL of the gnosis safe transaction service.'),
+    bech32Prefix: zod_1.z
+        .string()
+        .optional()
+        .describe('The human readable address prefix for the chains using bech32.'),
+    slip44: zod_1.z.number().optional().describe('The SLIP-0044 coin type.'),
     isTestnet: zod_1.z
         .boolean()
         .optional()
         .describe('Whether the chain is considered a testnet or a mainnet.'),
 });
+// Add refinements to the object schema to conditionally validate certain fields
+exports.ChainMetadataSchema = exports.ChainMetadataSchemaObject.refine((metadata) => {
+    if ([utils_1.ProtocolType.Ethereum, utils_1.ProtocolType.Sealevel].includes(metadata.protocol) &&
+        typeof metadata.chainId !== 'number')
+        return false;
+    else if (metadata.protocol === utils_1.ProtocolType.Cosmos &&
+        typeof metadata.chainId !== 'string')
+        return false;
+    else
+        return true;
+}, { message: 'Invalid Chain Id', path: ['chainId'] })
+    .refine((metadata) => {
+    if (typeof metadata.chainId === 'string' && !metadata.domainId)
+        return false;
+    else
+        return true;
+}, { message: 'Domain Id required', path: ['domainId'] })
+    .refine((metadata) => {
+    if (metadata.protocol === utils_1.ProtocolType.Cosmos &&
+        (!metadata.bech32Prefix || !metadata.slip44))
+        return false;
+    else
+        return true;
+}, {
+    message: 'Bech32Prefix and Slip44 required for Cosmos chains',
+    path: ['bech32Prefix', 'slip44'],
+});
 function isValidChainMetadata(c) {
     return exports.ChainMetadataSchema.safeParse(c).success;
 }
 exports.isValidChainMetadata = isValidChainMetadata;
 function getDomainId(chainMetadata) {
-    return chainMetadata.domainId ?? chainMetadata.chainId;
+    if (chainMetadata.domainId)
+        return chainMetadata.domainId;
+    else if (typeof chainMetadata.chainId === 'number')
+        return chainMetadata.chainId;
+    else
+        throw new Error('Invalid chain metadata, no valid domainId');
 }
 exports.getDomainId = getDomainId;
+function getChainIdNumber(chainMetadata) {
+    if (typeof chainMetadata.chainId === 'number')
+        return chainMetadata.chainId;
+    else
+        throw new Error('ChainId is not a number, chain may be of Cosmos type');
+}
+exports.getChainIdNumber = getChainIdNumber;
 //# sourceMappingURL=chainMetadataTypes.js.map

package/dist/metadata/chainMetadataTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"chainMetadataTypes.js","sourceRoot":"","sources":["../../src/metadata/chainMetadataTypes.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,6BAAwB;AAExB,gDAAoD;AAEpD,qDAAkD;AAElD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,yCAAuB,CAAA;IACvB,2CAAyB,CAAA;IACzB,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,8BAAd,cAAc,QAIzB;AAKY,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,OAAC;SACJ,MAAM,EAAE;SACR,GAAG,EAAE;SACL,QAAQ,CAAC,sDAAsD,CAAC;IACnE,SAAS,EAAE,OAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,uDAAuD,CAAC;IACpE,UAAU,EAAE,OAAC;SACV,MAAM,CAAC;QACN,aAAa,EAAE,wBAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACxC,0EAA0E,CAC3E;QACD,cAAc,EAAE,sBAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACvC,2DAA2D,CAC5D;QACD,WAAW,EAAE,wBAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACtC,kEAAkE,CACnE;KACF,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,yDAAyD,CAAC;IACtE,KAAK,EAAE,OAAC;SACL,MAAM,CAAC;QACN,WAAW,EAAE,wBAAO,CAAC,QAAQ,CAC3B,2DAA2D,CAC5D;QACD,WAAW,EAAE,wBAAO,CAAC,QAAQ,CAAC,uCAAuC,CAAC;KACvE,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CACP,wEAAwE,CACzE;CACJ,CAAC,CAAC;AAIH;;;GAGG;AACU,QAAA,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC1C,QAAQ,EAAE,OAAC;SACR,UAAU,CAAC,oBAAY,CAAC;SACxB,QAAQ,CACP,6EAA6E,CAC9E;IACH,OAAO,EAAE,wBAAO,CAAC,QAAQ,CACvB,uDAAuD,CACxD;IACD,QAAQ,EAAE,wBAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACnC,sKAAsK,CACvK;IACD,IAAI,EAAE,OAAC;SACJ,MAAM,EAAE;SACR,KAAK,CAAC,kBAAkB,CAAC;SACzB,QAAQ,CACP,sFAAsF,CACvF;IACH,WAAW,EAAE,OAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,mCAAmC,CAAC;IAChD,gBAAgB,EAAE,OAAC;SAChB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,wEAAwE,CACzE;IACH,OAAO,EAAE,OAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,kEAAkE,CACnE;IACH,WAAW,EAAE,OAAC;SACX,MAAM,CAAC;QACN,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;QAChB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,sBAAK,CAAC,EAAE,CAAC,GAAG,CAAC;KACxB,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CACP,wEAAwE,CACzE;IACH,OAAO,EAAE,OAAC;SACP,KAAK,CAAC,oBAAY,CAAC;SACnB,QAAQ,EAAE;SACV,QAAQ,CAAC,2DAA2D,CAAC;IACxE,cAAc,EAAE,OAAC;SACd,KAAK,CACJ,OAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,yCAAyC,CAAC;QACpE,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,gCAAgC,CAAC;QAChE,MAAM,EAAE,OAAC;aACN,MAAM,EAAE;aACR,GAAG,EAAE;aACL,QAAQ,CAAC,gDAAgD,CAAC;QAC7D,MAAM,EAAE,OAAC;aACN,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CACP,mEAAmE,CACpE;QACH,MAAM,EAAE,OAAC;aACN,UAAU,CAAC,cAAc,CAAC;aAC1B,QAAQ,EAAE;aACV,QAAQ,CACP,sEAAsE,CACvE;KACJ,CAAC,CACH;SACA,QAAQ,EAAE;SACV,QAAQ,CAAC,oDAAoD,CAAC;IACjE,MAAM,EAAE,OAAC;SACN,MAAM,CAAC;QACN,aAAa,EAAE,sBAAK,CAAC,QAAQ,CAC3B,sEAAsE,CACvE;QACD,WAAW,EAAE,sBAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACpC,4EAA4E,CAC7E;QACD,iBAAiB,EAAE,OAAC;aACjB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,8CAA8C,CAAC;KAC5D,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,0CAA0C,CAAC;IACvD,oBAAoB,EAAE,OAAC;SACpB,MAAM,CAAC,EAAE,CAAC;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,0DAA0D,CAAC;IACvE,sBAAsB,EAAE,OAAC;SACtB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,yDAAyD,CAAC;IACtE,+BAA+B,EAAE,OAAC;SAC/B,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,iDAAiD,CAAC;IAC9D,SAAS,EAAE,OAAC;SACT,OAAO,EAAE;SACT,QAAQ,EAAE;SACV,QAAQ,CAAC,yDAAyD,CAAC;CACvE,CAAC,CAAC;AAKH,SAAgB,oBAAoB,CAAC,CAAgB;IACnD,OAAO,2BAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AAClD,CAAC;AAFD,oDAEC;AAED,SAAgB,WAAW,CAAC,aAA4B;IACtD,OAAO,aAAa,CAAC,QAAQ,IAAI,aAAa,CAAC,OAAO,CAAC;AACzD,CAAC;AAFD,kCAEC"}
+{"version":3,"file":"chainMetadataTypes.js","sourceRoot":"","sources":["../../src/metadata/chainMetadataTypes.ts"],"names":[],"mappings":"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"}

package/dist/metadata/deploymentArtifacts.d.ts

@@ -1,18 +1,21 @@
 import { z } from 'zod';
 export declare const HyperlaneDeploymentArtifactsSchema: z.ZodObject<{
     mailbox: z.ZodString;
+    merkleTreeHook: z.ZodString;
     interchainGasPaymaster: z.ZodString;
     validatorAnnounce: z.ZodString;
     interchainSecurityModule: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    interchainGasPaymaster: string;
     mailbox: string;
     validatorAnnounce: string;
+    merkleTreeHook: string;
+    interchainGasPaymaster: string;
     interchainSecurityModule?: string | undefined;
 }, {
-    interchainGasPaymaster: string;
     mailbox: string;
     validatorAnnounce: string;
+    merkleTreeHook: string;
+    interchainGasPaymaster: string;
     interchainSecurityModule?: string | undefined;
 }>;
 export type HyperlaneDeploymentArtifacts = z.infer<typeof HyperlaneDeploymentArtifactsSchema>;

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

@@ -1 +1 @@
-{"version":3,"file":"deploymentArtifacts.d.ts","sourceRoot":"","sources":["../../src/metadata/deploymentArtifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,kCAAkC;;;;;;;;;;;;;;;EAW7C,CAAC;AAEH,MAAM,MAAM,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAChD,OAAO,kCAAkC,CAC1C,CAAC"}
+{"version":3,"file":"deploymentArtifacts.d.ts","sourceRoot":"","sources":["../../src/metadata/deploymentArtifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,kCAAkC;;;;;;;;;;;;;;;;;;EAc7C,CAAC;AAEH,MAAM,MAAM,4BAA4B,GAAG,CAAC,CAAC,KAAK,CAChD,OAAO,kCAAkC,CAC1C,CAAC"}

package/dist/metadata/deploymentArtifacts.js

@@ -5,6 +5,7 @@ const zod_1 = require("zod");
 const customZodTypes_1 = require("./customZodTypes");
 exports.HyperlaneDeploymentArtifactsSchema = zod_1.z.object({
     mailbox: customZodTypes_1.ZHash.describe('The address of the Mailbox contract.'),
+    merkleTreeHook: customZodTypes_1.ZHash.describe('The address of the Merkle Tree hook contract.'),
     interchainGasPaymaster: customZodTypes_1.ZHash.describe('The address of the Interchain Gas Paymaster (IGP) contract.'),
     validatorAnnounce: customZodTypes_1.ZHash.describe('The address of the Validator Announce contract.'),
     interchainSecurityModule: customZodTypes_1.ZHash.optional().describe('The address of the Interchain Security Module (ISM) contract.'),

package/dist/metadata/deploymentArtifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploymentArtifacts.js","sourceRoot":"","sources":["../../src/metadata/deploymentArtifacts.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,qDAAyC;AAE5B,QAAA,kCAAkC,GAAG,OAAC,CAAC,MAAM,CAAC;IACzD,OAAO,EAAE,sBAAK,CAAC,QAAQ,CAAC,sCAAsC,CAAC;IAC/D,sBAAsB,EAAE,sBAAK,CAAC,QAAQ,CACpC,6DAA6D,CAC9D;IACD,iBAAiB,EAAE,sBAAK,CAAC,QAAQ,CAC/B,iDAAiD,CAClD;IACD,wBAAwB,EAAE,sBAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACjD,+DAA+D,CAChE;CACF,CAAC,CAAC"}
+{"version":3,"file":"deploymentArtifacts.js","sourceRoot":"","sources":["../../src/metadata/deploymentArtifacts.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,qDAAyC;AAE5B,QAAA,kCAAkC,GAAG,OAAC,CAAC,MAAM,CAAC;IACzD,OAAO,EAAE,sBAAK,CAAC,QAAQ,CAAC,sCAAsC,CAAC;IAC/D,cAAc,EAAE,sBAAK,CAAC,QAAQ,CAC5B,+CAA+C,CAChD;IACD,sBAAsB,EAAE,sBAAK,CAAC,QAAQ,CACpC,6DAA6D,CAC9D;IACD,iBAAiB,EAAE,sBAAK,CAAC,QAAQ,CAC/B,iDAAiD,CAClD;IACD,wBAAwB,EAAE,sBAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACjD,+DAA+D,CAChE;CACF,CAAC,CAAC"}

package/dist/metadata/matchingList.d.ts

@@ -5,36 +5,36 @@
 import { z } from 'zod';
 declare const MatchingListElementSchema: z.ZodObject<{
     originDomain: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodNumber, z.ZodArray<z.ZodNumber, "atleastone">]>>;
-    senderAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "atleastone">]>>;
+    senderAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     destinationDomain: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodNumber, z.ZodArray<z.ZodNumber, "atleastone">]>>;
-    recipientAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "atleastone">]>>;
+    recipientAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
 }, "strip", z.ZodTypeAny, {
     originDomain?: number | "*" | [number, ...number[]] | undefined;
-    senderAddress?: string | [string, ...string[]] | undefined;
+    senderAddress?: string | string[] | undefined;
     destinationDomain?: number | "*" | [number, ...number[]] | undefined;
-    recipientAddress?: string | [string, ...string[]] | undefined;
+    recipientAddress?: string | string[] | undefined;
 }, {
     originDomain?: number | "*" | [number, ...number[]] | undefined;
-    senderAddress?: string | [string, ...string[]] | undefined;
+    senderAddress?: string | string[] | undefined;
     destinationDomain?: number | "*" | [number, ...number[]] | undefined;
-    recipientAddress?: string | [string, ...string[]] | undefined;
+    recipientAddress?: string | string[] | undefined;
 }>;
 export declare const MatchingListSchema: z.ZodArray<z.ZodObject<{
     originDomain: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodNumber, z.ZodArray<z.ZodNumber, "atleastone">]>>;
-    senderAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "atleastone">]>>;
+    senderAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
     destinationDomain: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodNumber, z.ZodArray<z.ZodNumber, "atleastone">]>>;
-    recipientAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "atleastone">]>>;
+    recipientAddress: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"*">, z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
 }, "strip", z.ZodTypeAny, {
     originDomain?: number | "*" | [number, ...number[]] | undefined;
-    senderAddress?: string | [string, ...string[]] | undefined;
+    senderAddress?: string | string[] | undefined;
     destinationDomain?: number | "*" | [number, ...number[]] | undefined;
-    recipientAddress?: string | [string, ...string[]] | undefined;
+    recipientAddress?: string | string[] | undefined;
 }, {
     originDomain?: number | "*" | [number, ...number[]] | undefined;
-    senderAddress?: string | [string, ...string[]] | undefined;
+    senderAddress?: string | string[] | undefined;
     destinationDomain?: number | "*" | [number, ...number[]] | undefined;
-    recipientAddress?: string | [string, ...string[]] | undefined;
-}>, "atleastone">;
+    recipientAddress?: string | string[] | undefined;
+}>, "many">;
 export type MatchingListElement = z.infer<typeof MatchingListElementSchema>;
 export type MatchingList = z.infer<typeof MatchingListSchema>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"matchingList.d.ts","sourceRoot":"","sources":["../../src/metadata/matchingList.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAgBxB,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;EAK7B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;iBAAgD,CAAC;AAEhF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAC5E,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"matchingList.d.ts","sourceRoot":"","sources":["../../src/metadata/matchingList.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;EAK7B,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;WAAqC,CAAC;AAErE,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAC5E,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/dist/metadata/matchingList.js

@@ -12,16 +12,12 @@ const DomainSchema = zod_1.z.union([
     customZodTypes_1.ZNzUint,
     zod_1.z.array(customZodTypes_1.ZNzUint).nonempty(),
 ]);
-const AddressSchema = zod_1.z.union([
-    zod_1.z.literal('*'),
-    customZodTypes_1.ZHash,
-    zod_1.z.array(customZodTypes_1.ZHash).nonempty(),
-]);
+const AddressSchema = zod_1.z.union([zod_1.z.literal('*'), customZodTypes_1.ZHash, zod_1.z.array(customZodTypes_1.ZHash)]);
 const MatchingListElementSchema = zod_1.z.object({
     originDomain: DomainSchema.optional(),
     senderAddress: AddressSchema.optional(),
     destinationDomain: DomainSchema.optional(),
     recipientAddress: AddressSchema.optional(),
 });
-exports.MatchingListSchema = zod_1.z.array(MatchingListElementSchema).nonempty();
+exports.MatchingListSchema = zod_1.z.array(MatchingListElementSchema);
 //# sourceMappingURL=matchingList.js.map

package/dist/metadata/matchingList.js.map

@@ -1 +1 @@
-{"version":3,"file":"matchingList.js","sourceRoot":"","sources":["../../src/metadata/matchingList.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,6BAAwB;AAExB,qDAAkD;AAElD,MAAM,YAAY,GAAG,OAAC,CAAC,KAAK,CAAC;IAC3B,OAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACd,wBAAO;IACP,OAAC,CAAC,KAAK,CAAC,wBAAO,CAAC,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,OAAC,CAAC,KAAK,CAAC;IAC5B,OAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACd,sBAAK;IACL,OAAC,CAAC,KAAK,CAAC,sBAAK,CAAC,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;AAEH,MAAM,yBAAyB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;IACrC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;IACvC,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC1C,gBAAgB,EAAE,aAAa,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,OAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"matchingList.js","sourceRoot":"","sources":["../../src/metadata/matchingList.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,6BAAwB;AAExB,qDAAkD;AAElD,MAAM,YAAY,GAAG,OAAC,CAAC,KAAK,CAAC;IAC3B,OAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IACd,wBAAO;IACP,OAAC,CAAC,KAAK,CAAC,wBAAO,CAAC,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,sBAAK,EAAE,OAAC,CAAC,KAAK,CAAC,sBAAK,CAAC,CAAC,CAAC,CAAC;AAEvE,MAAM,yBAAyB,GAAG,OAAC,CAAC,MAAM,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;IACrC,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;IACvC,iBAAiB,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC1C,gBAAgB,EAAE,aAAa,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,OAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC"}

package/dist/middleware/account/InterchainAccountDeployer.d.ts

@@ -8,13 +8,8 @@ export type InterchainAccountConfig = ProxiedRouterConfig;
 export declare class InterchainAccountDeployer extends ProxiedRouterDeployer<InterchainAccountConfig, InterchainAccountFactories, 'interchainAccountRouter'> {
     readonly routerContractName = "interchainAccountRouter";
     constructor(multiProvider: MultiProvider);
-    constructorArgs(chain: string, __: RouterConfig): Promise<[number]>;
-    initializeArgs(chain: string, config: RouterConfig): Promise<[
-        _mailbox: string,
-        _interchainGasPaymaster: string,
-        _interchainSecurityModule: string,
-        _owner: string
-    ]>;
+    constructorArgs(_: string, config: RouterConfig): Promise<[string]>;
+    initializeArgs(chain: string, config: RouterConfig): Promise<[string, string, string]>;
     deployContracts(chain: ChainName, config: InterchainAccountConfig): Promise<HyperlaneContracts<InterchainAccountFactories>>;
 }
 //# sourceMappingURL=InterchainAccountDeployer.d.ts.map

package/dist/middleware/account/InterchainAccountDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InterchainAccountDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EACL,0BAA0B,EAE3B,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,qBAAqB,CAClE,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,CAC1B;IACC,QAAQ,CAAC,kBAAkB,6BAA6B;gBAE5C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAKnE,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;IAaK,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,CAAC;CAqB3D"}
+{"version":3,"file":"InterchainAccountDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EACL,0BAA0B,EAE3B,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,qBAAqB,CAClE,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,CAC1B;IACC,QAAQ,CAAC,kBAAkB,6BAA6B;gBAE5C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAInE,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAS9B,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,CAAC;CAqB3D"}

package/dist/middleware/account/InterchainAccountDeployer.js

@@ -9,19 +9,14 @@ class InterchainAccountDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDep
         super(multiProvider, contracts_1.interchainAccountFactories);
         this.routerContractName = 'interchainAccountRouter';
     }
-    async constructorArgs(chain, __) {
-        const localDomain = this.multiProvider.getDomainId(chain);
-        return [localDomain];
+    async constructorArgs(_, config) {
+        return [config.mailbox];
     }
     async initializeArgs(chain, config) {
         const owner = await this.multiProvider.getSignerAddress(chain);
-        if (typeof config.interchainSecurityModule === 'object') {
-            throw new Error('ISM as object unimplemented');
-        }
         return [
-            config.mailbox,
-            config.interchainGasPaymaster,
-            config.interchainSecurityModule ?? ethers_1.ethers.constants.AddressZero,
+            config.hook ?? ethers_1.ethers.constants.AddressZero,
+            config.interchainSecurityModule,
             owner,
         ];
     }

package/dist/middleware/account/InterchainAccountDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterchainAccountDeployer.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAIhC,8EAA2E;AAI3E,2CAGqB;AAIrB,MAAa,yBAA0B,SAAQ,6CAI9C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,sCAA0B,CAAC,CAAC;QAH1C,uBAAkB,GAAG,yBAAyB,CAAC;IAIxD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa,EAAE,EAAgB;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC1D,OAAO,CAAC,WAAW,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,KAAa,EACb,MAAoB;QASpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EAAE;YACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;QACD,OAAO;YACL,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,sBAAsB;YAC7B,MAAM,CAAC,wBAAwB,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC/D,KAAK;SACN,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,KAAgB,EAChB,MAA+B;QAE/B,IAAI,MAAM,CAAC,wBAAwB,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACvE;QAED,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CACpD,KAAK,EACL,sBAAsB,EACtB,CAAC,MAAM,CAAC,OAAO,CAAC,CACjB,CAAC;QACF,MAAM,cAAc,GAAG;YACrB,GAAG,MAAM;YACT,wBAAwB,EAAE,oBAAoB,CAAC,OAAO;SACvD,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAErE,OAAO;YACL,GAAG,SAAS;YACZ,oBAAoB;SACrB,CAAC;IACJ,CAAC;CACF;AA/DD,8DA+DC"}
+{"version":3,"file":"InterchainAccountDeployer.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAIhC,8EAA2E;AAI3E,2CAGqB;AAIrB,MAAa,yBAA0B,SAAQ,6CAI9C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,sCAA0B,CAAC,CAAC;QAH1C,uBAAkB,GAAG,yBAAyB,CAAC;IAIxD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAS,EAAE,MAAoB;QACnD,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,KAAa,EACb,MAAoB;QAEpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC/D,OAAO;YACL,MAAM,CAAC,IAAI,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC3C,MAAM,CAAC,wBAAmC;YAC1C,KAAK;SACN,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,KAAgB,EAChB,MAA+B;QAE/B,IAAI,MAAM,CAAC,wBAAwB,EAAE;YACnC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;SACvE;QAED,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CACpD,KAAK,EACL,sBAAsB,EACtB,CAAC,MAAM,CAAC,OAAO,CAAC,CACjB,CAAC;QACF,MAAM,cAAc,GAAG;YACrB,GAAG,MAAM;YACT,wBAAwB,EAAE,oBAAoB,CAAC,OAAO;SACvD,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAErE,OAAO;YACL,GAAG,SAAS;YACZ,oBAAoB;SACrB,CAAC;IACJ,CAAC;CACF;AAnDD,8DAmDC"}

package/dist/middleware/account/accounts.hardhat-test.js

@@ -5,12 +5,13 @@ const hardhat_1 = require("hardhat");
 const core_1 = require("@hyperlane-xyz/core");
 const chains_1 = require("../../consts/chains");
 const TestCoreDeployer_1 = require("../../core/TestCoreDeployer");
+const HyperlaneProxyFactoryDeployer_1 = require("../../deploy/HyperlaneProxyFactoryDeployer");
+const HyperlaneIsmFactory_1 = require("../../ism/HyperlaneIsmFactory");
 const MultiProvider_1 = require("../../providers/MultiProvider");
-const testUtils_1 = require("../../test/testUtils");
 const InterchainAccount_1 = require("./InterchainAccount");
 const InterchainAccountChecker_1 = require("./InterchainAccountChecker");
 const InterchainAccountDeployer_1 = require("./InterchainAccountDeployer");
-describe('InterchainAccounts', async () => {
+describe.skip('InterchainAccounts', async () => {
     const localChain = chains_1.Chains.test1;
     const remoteChain = chains_1.Chains.test2;
     let signer;
@@ -23,12 +24,13 @@ describe('InterchainAccounts', async () => {
     before(async () => {
         [signer] = await hardhat_1.ethers.getSigners();
         multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
-        coreApp = await new TestCoreDeployer_1.TestCoreDeployer(multiProvider).deployApp();
-        config = await (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreApp.contractsMap);
+        const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer_1.HyperlaneProxyFactoryDeployer(multiProvider);
+        const ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory(await ismFactoryDeployer.deploy(multiProvider.mapKnownChains(() => ({}))), multiProvider);
+        coreApp = await new TestCoreDeployer_1.TestCoreDeployer(multiProvider, ismFactory).deployApp();
+        config = coreApp.getRouterConfig(signer.address);
     });
     beforeEach(async () => {
-        const deployer = new InterchainAccountDeployer_1.InterchainAccountDeployer(multiProvider);
-        contracts = await deployer.deploy(config);
+        contracts = await new InterchainAccountDeployer_1.InterchainAccountDeployer(multiProvider).deploy(config);
         local = contracts[localChain].interchainAccountRouter;
         remote = contracts[remoteChain].interchainAccountRouter;
     });

package/dist/middleware/account/accounts.hardhat-test.js.map

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

package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts

@@ -36,13 +36,8 @@ export type LiquidityLayerConfig = RouterConfig & BridgeAdapterConfig;
 export declare class LiquidityLayerDeployer extends ProxiedRouterDeployer<LiquidityLayerConfig, LiquidityLayerFactories, 'liquidityLayerRouter'> {
     readonly routerContractName = "liquidityLayerRouter";
     constructor(multiProvider: MultiProvider);
-    constructorArgs(_: string, __: LiquidityLayerConfig): Promise<[]>;
-    initializeArgs(chain: string, config: LiquidityLayerConfig): Promise<[
-        _mailbox: string,
-        _interchainGasPaymaster: string,
-        _interchainSecurityModule: string,
-        _owner: string
-    ]>;
+    constructorArgs(_: string, config: LiquidityLayerConfig): Promise<[string]>;
+    initializeArgs(chain: string, config: LiquidityLayerConfig): Promise<[string, string, string]>;
     enrollRemoteRouters(contractsMap: HyperlaneContractsMap<LiquidityLayerFactories>, configMap: ChainMap<LiquidityLayerConfig>, foreignRouters: ChainMap<Address>): Promise<void>;
     deployContracts(chain: ChainName, config: LiquidityLayerConfig): Promise<HyperlaneContracts<LiquidityLayerFactories>>;
     deployPortalAdapter(chain: ChainName, adapterConfig: PortalAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<PortalAdapter>;

package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LiquidityLayerRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAgC,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAA2B,MAAM,aAAa,CAAC;AAE/E,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yBAAyB,EAAE,MAAM,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;KACtB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,yBAAyB,CAAC;IACnC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,qBAAqB,CAC/D,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,CACvB;IACC,QAAQ,CAAC,kBAAkB,0BAA0B;gBAEzC,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,EAAE,CAAC;IAIjE,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;IAaK,mBAAmB,CACvB,YAAY,EAAE,qBAAqB,CAAC,uBAAuB,CAAC,EAC5D,SAAS,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EACzC,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC;IAyCV,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IAiCjD,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,mBAAmB,EAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,aAAa,CAAC;IAqDnB,yBAAyB,CAC7B,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,yBAAyB,EACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,mBAAmB,CAAC;CAqEhC"}
+{"version":3,"file":"LiquidityLayerRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAgC,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAA2B,MAAM,aAAa,CAAC;AAE/E,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yBAAyB,EAAE,MAAM,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;KACtB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,yBAAyB,CAAC;IACnC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,qBAAqB,CAC/D,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,CACvB;IACC,QAAQ,CAAC,kBAAkB,0BAA0B;gBAEzC,aAAa,EAAE,aAAa;IAIlC,eAAe,CACnB,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAId,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAY9B,mBAAmB,CACvB,YAAY,EAAE,qBAAqB,CAAC,uBAAuB,CAAC,EAC5D,SAAS,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EACzC,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC;IAyCV,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IAiCjD,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,mBAAmB,EAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,aAAa,CAAC;IAiDnB,yBAAyB,CAC7B,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,yBAAyB,EACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,mBAAmB,CAAC;CAsEhC"}

package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js

@@ -15,8 +15,8 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
         super(multiProvider, contracts_1.liquidityLayerFactories);
         this.routerContractName = 'liquidityLayerRouter';
     }
-    async constructorArgs(_, __) {
-        return [];
+    async constructorArgs(_, config) {
+        return [config.mailbox];
     }
     async initializeArgs(chain, config) {
         const owner = await this.multiProvider.getSignerAddress(chain);
@@ -24,8 +24,7 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
             throw new Error('ISM as object unimplemented');
         }
         return [
-            config.mailbox,
-            config.interchainGasPaymaster,
+            config.hook ?? ethers_1.ethers.constants.AddressZero,
             config.interchainSecurityModule ?? ethers_1.ethers.constants.AddressZero,
             owner,
         ];
@@ -63,12 +62,8 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
         };
     }
     async deployPortalAdapter(chain, adapterConfig, owner, router) {
-        const portalAdapter = await this.deployContract(chain, 'portalAdapter', [], [
-            this.multiProvider.getDomainId(chain),
-            owner,
-            adapterConfig.portalBridgeAddress,
-            router.address,
-        ]);
+        const mailbox = await router.mailbox();
+        const portalAdapter = await this.deployContract(chain, 'portalAdapter', [mailbox], [owner, adapterConfig.portalBridgeAddress, router.address]);
         for (const { wormholeDomain, hyperlaneDomain, } of adapterConfig.wormholeDomainMapping) {
             const expectedCircleDomain = await portalAdapter.hyperlaneDomainToWormholeDomain(hyperlaneDomain);
             if (expectedCircleDomain === wormholeDomain)
@@ -83,7 +78,8 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
         return portalAdapter;
     }
     async deployCircleBridgeAdapter(chain, adapterConfig, owner, router) {
-        const circleBridgeAdapter = await this.deployContract(chain, 'circleBridgeAdapter', [], [
+        const mailbox = await router.mailbox();
+        const circleBridgeAdapter = await this.deployContract(chain, 'circleBridgeAdapter', [mailbox], [
             owner,
             adapterConfig.tokenMessengerAddress,
             adapterConfig.messageTransmitterAddress,

package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js.map

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

package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js

@@ -6,13 +6,13 @@ const core_1 = require("@hyperlane-xyz/core");
 const utils_1 = require("@hyperlane-xyz/utils");
 const chainMetadata_1 = require("../../consts/chainMetadata");
 const chains_1 = require("../../consts/chains");
-const TestCoreApp_1 = require("../../core/TestCoreApp");
 const TestCoreDeployer_1 = require("../../core/TestCoreDeployer");
+const HyperlaneProxyFactoryDeployer_1 = require("../../deploy/HyperlaneProxyFactoryDeployer");
+const HyperlaneIsmFactory_1 = require("../../ism/HyperlaneIsmFactory");
 const MultiProvider_1 = require("../../providers/MultiProvider");
-const testUtils_1 = require("../../test/testUtils");
 const LiquidityLayerApp_1 = require("./LiquidityLayerApp");
 const LiquidityLayerRouterDeployer_1 = require("./LiquidityLayerRouterDeployer");
-describe('LiquidityLayerRouter', async () => {
+describe.skip('LiquidityLayerRouter', async () => {
     const localChain = chains_1.Chains.test1;
     const remoteChain = chains_1.Chains.test2;
     const localDomain = chainMetadata_1.chainMetadata[localChain].chainId;
@@ -30,9 +30,10 @@ describe('LiquidityLayerRouter', async () => {
     before(async () => {
         [signer] = await hardhat_1.ethers.getSigners();
         multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
-        const coreDeployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
-        const coreContractsMaps = await coreDeployer.deploy();
-        coreApp = new TestCoreApp_1.TestCoreApp(coreContractsMaps, multiProvider);
+        const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer_1.HyperlaneProxyFactoryDeployer(multiProvider);
+        const ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory(await ismFactoryDeployer.deploy(multiProvider.mapKnownChains(() => ({}))), multiProvider);
+        coreApp = await new TestCoreDeployer_1.TestCoreDeployer(multiProvider, ismFactory).deployApp();
+        const routerConfig = coreApp.getRouterConfig(signer.address);
         const mockTokenF = new core_1.MockToken__factory(signer);
         mockToken = await mockTokenF.deploy();
         const portalBridgeF = new core_1.MockPortalBridge__factory(signer);
@@ -41,7 +42,6 @@ describe('LiquidityLayerRouter', async () => {
         portalBridge = await portalBridgeF.deploy(mockToken.address);
         const messageTransmitterF = new core_1.MockCircleMessageTransmitter__factory(signer);
         messageTransmitter = await messageTransmitterF.deploy(mockToken.address);
-        const routerConfig = await (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreContractsMaps);
         config = (0, utils_1.objMap)(routerConfig, (chain, config) => {
             return {
                 ...config,

package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js.map

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

package/dist/middleware/query/InterchainQueryDeployer.d.ts

@@ -6,12 +6,7 @@ export type InterchainQueryConfig = RouterConfig;
 export declare class InterchainQueryDeployer extends ProxiedRouterDeployer<InterchainQueryConfig, InterchainQueryFactories, 'interchainQueryRouter'> {
     readonly routerContractName = "interchainQueryRouter";
     constructor(multiProvider: MultiProvider);
-    constructorArgs(_: string, __: RouterConfig): Promise<[]>;
-    initializeArgs(chain: string, config: RouterConfig): Promise<[
-        _mailbox: string,
-        _interchainGasPaymaster: string,
-        _interchainSecurityModule: string,
-        _owner: string
-    ]>;
+    constructorArgs(_: string, config: RouterConfig): Promise<[string]>;
+    initializeArgs(chain: string, config: RouterConfig): Promise<[string, string, string]>;
 }
 //# sourceMappingURL=InterchainQueryDeployer.d.ts.map

package/dist/middleware/query/InterchainQueryDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InterchainQueryDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EACL,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAwB,SAAQ,qBAAqB,CAChE,qBAAqB,EACrB,wBAAwB,EACxB,uBAAuB,CACxB;IACC,QAAQ,CAAC,kBAAkB,2BAA2B;gBAE1C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;IAGzD,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;CAYF"}
+{"version":3,"file":"InterchainQueryDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EACL,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,qBAAqB,GAAG,YAAY,CAAC;AAEjD,qBAAa,uBAAwB,SAAQ,qBAAqB,CAChE,qBAAqB,EACrB,wBAAwB,EACxB,uBAAuB,CACxB;IACC,QAAQ,CAAC,kBAAkB,2BAA2B;gBAE1C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAInE,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAWrC"}

package/dist/middleware/query/InterchainQueryDeployer.js

@@ -9,8 +9,8 @@ class InterchainQueryDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeplo
         super(multiProvider, contracts_1.interchainQueryFactories);
         this.routerContractName = 'interchainQueryRouter';
     }
-    async constructorArgs(_, __) {
-        return [];
+    async constructorArgs(_, config) {
+        return [config.mailbox];
     }
     async initializeArgs(chain, config) {
         const owner = await this.multiProvider.getSignerAddress(chain);
@@ -18,8 +18,7 @@ class InterchainQueryDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeplo
             throw new Error('ISM as object unimplemented');
         }
         return [
-            config.mailbox,
-            config.interchainGasPaymaster,
+            config.hook ?? ethers_1.ethers.constants.AddressZero,
             config.interchainSecurityModule ?? ethers_1.ethers.constants.AddressZero,
             owner,
         ];

package/dist/middleware/query/InterchainQueryDeployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"InterchainQueryDeployer.js","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAGhC,8EAA2E;AAG3E,2CAGqB;AAIrB,MAAa,uBAAwB,SAAQ,6CAI5C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,oCAAwB,CAAC,CAAC;QAHxC,uBAAkB,GAAG,uBAAuB,CAAC;IAItD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAS,EAAE,EAAgB;QAC/C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,CAAC,cAAc,CAClB,KAAa,EACb,MAAoB;QASpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EAAE;YACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;QACD,OAAO;YACL,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,sBAAsB;YAC7B,MAAM,CAAC,wBAAwB,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC/D,KAAK;SACN,CAAC;IACJ,CAAC;CACF;AApCD,0DAoCC"}
+{"version":3,"file":"InterchainQueryDeployer.js","sourceRoot":"","sources":["../../../src/middleware/query/InterchainQueryDeployer.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAGhC,8EAA2E;AAG3E,2CAGqB;AAIrB,MAAa,uBAAwB,SAAQ,6CAI5C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,oCAAwB,CAAC,CAAC;QAHxC,uBAAkB,GAAG,uBAAuB,CAAC;IAItD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,CAAS,EAAE,MAAoB;QACnD,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,KAAa,EACb,MAAoB;QAEpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EAAE;YACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;QACD,OAAO;YACL,MAAM,CAAC,IAAI,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC3C,MAAM,CAAC,wBAAwB,IAAI,eAAM,CAAC,SAAS,CAAC,WAAW;YAC/D,KAAK;SACN,CAAC;IACJ,CAAC;CACF;AA7BD,0DA6BC"}