@hyperlane-xyz/sdk 7.1.0 → 7.3.0

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,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,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;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,cAAc,mBAAmB;CAClC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,IAAI,EAAE,mBAAmB,CAAC,cAAc,CAAC;IACzC,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,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAChE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"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;AAKtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,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;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,cAAc,mBAAmB;CAClC;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,IAAI,EAAE,mBAAmB,CAAC,cAAc,CAAC;IACzC,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,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"}

package/dist/router/types.js

@@ -1,4 +1,9 @@
+import { z } from 'zod';
 import { ProxyAdmin__factory, TimelockController__factory, } from '@hyperlane-xyz/core';
+import { HookConfigSchema } from '../hook/types.js';
+import { IsmConfigSchema } from '../ism/types.js';
+import { ZHash } from '../metadata/customZodTypes.js';
+import { DeployedOwnableSchema, OwnableSchema } from '../schemas.js';
 export const proxiedFactories = {
     proxyAdmin: new ProxyAdmin__factory(),
     timelockController: new TimelockController__factory(),
@@ -13,4 +18,28 @@ export var RouterViolationType;
 (function (RouterViolationType) {
     RouterViolationType["EnrolledRouter"] = "EnrolledRouter";
 })(RouterViolationType || (RouterViolationType = {}));
+export const MailboxClientConfigSchema = OwnableSchema.extend({
+    mailbox: ZHash,
+    hook: HookConfigSchema.optional(),
+    interchainSecurityModule: IsmConfigSchema.optional(),
+});
+export const ForeignDeploymentConfigSchema = z.object({
+    foreignDeployment: z.string().optional(),
+});
+export const RemoteRouterDomain = z.string();
+export const RemoteRouterRouter = z.object({
+    address: z.string().startsWith('0x'),
+});
+export const RemoteRoutersSchema = z.record(RemoteRouterDomain, 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 GasRouterConfigSchema = RouterConfigSchema.extend({
+    gas: z.number().optional(),
+    destinationGas: DestinationGasSchema.optional(),
+});
 //# sourceMappingURL=types.js.map

package/dist/router/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,mBAAmB,EAEnB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AA8B7B,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAChD,UAAU,EAAE,IAAI,mBAAmB,EAAE;IACrC,kBAAkB,EAAE,IAAI,2BAA2B,EAAE;CACtD,CAAC;AAEF,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,6DAAsC,CAAA;IACtC,gDAAyB,CAAA;IACzB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B;AAQD,MAAM,CAAN,IAAY,mBAEX;AAFD,WAAY,mBAAmB;IAC7B,wDAAiC,CAAA;AACnC,CAAC,EAFW,mBAAmB,KAAnB,mBAAmB,QAE9B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAEL,mBAAmB,EAEnB,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiBrE,MAAM,CAAC,MAAM,gBAAgB,GAAqB;IAChD,UAAU,EAAE,IAAI,mBAAmB,EAAE;IACrC,kBAAkB,EAAE,IAAI,2BAA2B,EAAE;CACtD,CAAC;AAEF,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,6DAAsC,CAAA;IACtC,gDAAyB,CAAA;IACzB,0CAAmB,CAAA;AACrB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B;AAQD,MAAM,CAAN,IAAY,mBAEX;AAFD,WAAY,mBAAmB;IAC7B,wDAAiC,CAAA;AACnC,CAAC,EAFW,mBAAmB,KAAnB,mBAAmB,QAE9B;AAeD,MAAM,CAAC,MAAM,yBAAyB,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5D,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACjC,wBAAwB,EAAE,eAAe,CAAC,QAAQ,EAAE;CACrD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IACpD,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACzC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;CACrC,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CACzC,kBAAkB,EAClB,kBAAkB,CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,KAAK,CAC/D,6BAA6B,CAC9B,CAAC,KAAK,CACL,CAAC,CAAC,MAAM,CAAC;IACP,aAAa,EAAE,mBAAmB,CAAC,QAAQ,EAAE;IAC7C,UAAU,EAAE,qBAAqB,CAAC,QAAQ,EAAE;CAC7C,CAAC,CACH,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;AACxC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,mDAAmD;AAC5F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAC1C,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;AACF,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,MAAM,CAAC;IAC7D,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,cAAc,EAAE,oBAAoB,CAAC,QAAQ,EAAE;CAChD,CAAC,CAAC"}

package/dist/schemas.d.ts

@@ -22,6 +22,16 @@ export declare const DeployedOwnableSchema: z.ZodObject<{
     ownerOverrides?: Record<string, string> | undefined;
     address?: string | undefined;
 }>;
+export declare const DerivedOwnableSchema: z.ZodObject<{
+    owner: z.ZodString;
+    address: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    owner: string;
+    address: string;
+}, {
+    owner: string;
+    address: string;
+}>;
 export declare const PausableSchema: z.ZodObject<{
     owner: z.ZodString;
     ownerOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;

package/dist/schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,aAAa;;;;;;;;;EAGxB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;EAEhC,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;EAEzB,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,aAAa;;;;;;;;;EAGxB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;EAEhC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;EAEpB,CAAC;AAEd,eAAO,MAAM,cAAc;;;;;;;;;;;;EAEzB,CAAC"}

package/dist/schemas.js

@@ -7,6 +7,9 @@ export const OwnableSchema = z.object({
 export const DeployedOwnableSchema = OwnableSchema.extend({
     address: ZHash.optional(),
 });
+export const DerivedOwnableSchema = DeployedOwnableSchema.omit({
+    ownerOverrides: true,
+}).required();
 export const PausableSchema = OwnableSchema.extend({
     paused: z.boolean(),
 });

package/dist/schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,KAAK;IACZ,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC,MAAM,CAAC;IACxD,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC;IACjD,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;CACpB,CAAC,CAAC"}
+{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../src/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAErD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,KAAK;IACZ,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC,MAAM,CAAC;IACxD,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,IAAI,CAAC;IAC7D,cAAc,EAAE,IAAI;CACrB,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEd,MAAM,CAAC,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,CAAC;IACjD,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;CACpB,CAAC,CAAC"}

package/dist/token/EvmERC20WarpModule.d.ts

@@ -1,14 +1,16 @@
-import { ContractVerifier } from '@hyperlane-xyz/sdk';
+import { ContractVerifier, HyperlaneAddresses } from '@hyperlane-xyz/sdk';
 import { Address, Domain, EvmChainId, ProtocolType } from '@hyperlane-xyz/utils';
 import { HyperlaneModule, HyperlaneModuleParams } from '../core/AbstractHyperlaneModule.js';
+import { ProxyFactoryFactories } from '../deploy/contracts.js';
 import { MultiProvider } from '../providers/MultiProvider.js';
 import { AnnotatedEV5Transaction } from '../providers/ProviderType.js';
 import { ChainName, ChainNameOrId } from '../types.js';
 import { EvmERC20WarpRouteReader } from './EvmERC20WarpRouteReader.js';
 import { TokenRouterConfig } from './schemas.js';
-export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Ethereum, TokenRouterConfig, {
+type WarpRouteAddresses = HyperlaneAddresses<ProxyFactoryFactories> & {
     deployedTokenRoute: Address;
-}> {
+};
+export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Ethereum, TokenRouterConfig, WarpRouteAddresses> {
     protected readonly multiProvider: MultiProvider;
     protected readonly contractVerifier?: ContractVerifier | undefined;
     protected logger: import("pino").default.Logger<never>;
@@ -16,9 +18,7 @@ export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Eth
     readonly chainName: ChainName;
     readonly chainId: EvmChainId;
     readonly domainId: Domain;
-    constructor(multiProvider: MultiProvider, args: HyperlaneModuleParams<TokenRouterConfig, {
-        deployedTokenRoute: Address;
-    }>, contractVerifier?: ContractVerifier | undefined);
+    constructor(multiProvider: MultiProvider, args: HyperlaneModuleParams<TokenRouterConfig, WarpRouteAddresses>, contractVerifier?: ContractVerifier | undefined);
     /**
      * Retrieves the token router configuration for the specified address.
      *
@@ -40,7 +40,8 @@ export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Eth
      * @param expectedConfig - The expected token router configuration.
      * @returns A array with a single Ethereum transaction that need to be executed to enroll the routers
      */
-    createRemoteRoutersUpdateTxs(actualConfig: TokenRouterConfig, expectedConfig: TokenRouterConfig): AnnotatedEV5Transaction[];
+    createEnrollRemoteRoutersUpdateTxs(actualConfig: TokenRouterConfig, expectedConfig: TokenRouterConfig): AnnotatedEV5Transaction[];
+    createUnenrollRemoteRoutersUpdateTxs(actualConfig: TokenRouterConfig, expectedConfig: TokenRouterConfig): AnnotatedEV5Transaction[];
     /**
      * Create a transaction to update the remote routers for the Warp Route contract.
      *
@@ -57,6 +58,7 @@ export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Eth
      * @returns Ethereum transaction that need to be executed to update the ISM configuration.
      */
     createIsmUpdateTxs(actualConfig: TokenRouterConfig, expectedConfig: TokenRouterConfig): Promise<AnnotatedEV5Transaction[]>;
+    createHookUpdateTxs(actualConfig: TokenRouterConfig, expectedConfig: TokenRouterConfig): Promise<AnnotatedEV5Transaction[]>;
     /**
      * Transfer ownership of an existing Warp route with a given config.
      *
@@ -74,6 +76,23 @@ export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Eth
         deployedIsm: Address;
         updateTransactions: AnnotatedEV5Transaction[];
     }>;
+    /**
+     * Updates or deploys the hook using the provided configuration.
+     *
+     * @returns Object with deployedHook address, and update Transactions
+     */
+    deployOrUpdateHook(actualConfig: TokenRouterConfig, expectedConfig: TokenRouterConfig): Promise<{
+        deployedHook: Address;
+        updateTransactions: AnnotatedEV5Transaction[];
+    }>;
+    deployNewHook(expectedConfig: TokenRouterConfig): Promise<{
+        deployedHook: Address;
+        updateTransactions: AnnotatedEV5Transaction[];
+    }>;
+    updateExistingHook(expectedConfig: TokenRouterConfig, actualConfig: TokenRouterConfig): Promise<{
+        deployedHook: Address;
+        updateTransactions: AnnotatedEV5Transaction[];
+    }>;
     /**
      * Deploys the Warp Route.
      *
@@ -87,6 +106,8 @@ export declare class EvmERC20WarpModule extends HyperlaneModule<ProtocolType.Eth
         config: TokenRouterConfig;
         multiProvider: MultiProvider;
         contractVerifier?: ContractVerifier;
+        proxyFactoryFactories: HyperlaneAddresses<ProxyFactoryFactories>;
     }): Promise<EvmERC20WarpModule>;
 }
+export {};
 //# sourceMappingURL=EvmERC20WarpModule.d.ts.map

package/dist/token/EvmERC20WarpModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EvmERC20WarpModule.d.ts","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAuB,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EACL,OAAO,EACP,MAAM,EACN,UAAU,EACV,YAAY,EAOb,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAI5C,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAA2B,MAAM,cAAc,CAAC;AAE1E,qBAAa,kBAAmB,SAAQ,eAAe,CACrD,YAAY,CAAC,QAAQ,EACrB,iBAAiB,EACjB;IACE,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CACF;IAUG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAO/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAhBtC,SAAS,CAAC,MAAM,uCAEb;IACH,MAAM,EAAE,uBAAuB,CAAC;IAChC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,SAAgB,OAAO,EAAE,UAAU,CAAC;IACpC,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAGZ,aAAa,EAAE,aAAa,EAC/C,IAAI,EAAE,qBAAqB,CACzB,iBAAiB,EACjB;QACE,kBAAkB,EAAE,OAAO,CAAC;KAC7B,CACF,EACkB,gBAAgB,CAAC,8BAAkB;IAgBxD;;;;;OAKG;IACU,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAM/C;;;;;OAKG;IACU,MAAM,CACjB,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC,uBAAuB,EAAE,CAAC;IA4BrC;;;;;;OAMG;IACH,4BAA4B,CAC1B,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IAyC5B;;;;;;OAMG;IACH,gCAAgC,CAC9B,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IAyC5B;;;;;;OAMG;IACG,kBAAkB,CACtB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAyCrC;;;;;;OAMG;IACH,wBAAwB,CACtB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IAU5B;;;;OAIG;IACU,iBAAiB,CAC5B,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC;QACT,WAAW,EAAE,OAAO,CAAC;QACrB,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;KAC/C,CAAC;IAoCF;;;;;;;OAOG;WACiB,MAAM,CAAC,MAAM,EAAE;QACjC,KAAK,EAAE,aAAa,CAAC;QACrB,MAAM,EAAE,iBAAiB,CAAC;QAC1B,aAAa,EAAE,aAAa,CAAC;QAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0BhC"}
+{"version":3,"file":"EvmERC20WarpModule.d.ts","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,gBAAgB,EAEhB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,OAAO,EACP,MAAM,EACN,UAAU,EACV,YAAY,EASb,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAM/D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAA2B,MAAM,cAAc,CAAC;AAE1E,KAAK,kBAAkB,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,GAAG;IACpE,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AACF,qBAAa,kBAAmB,SAAQ,eAAe,CACrD,YAAY,CAAC,QAAQ,EACrB,iBAAiB,EACjB,kBAAkB,CACnB;IAUG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAE/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAXtC,SAAS,CAAC,MAAM,uCAEb;IACH,MAAM,EAAE,uBAAuB,CAAC;IAChC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,SAAgB,OAAO,EAAE,UAAU,CAAC;IACpC,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAGZ,aAAa,EAAE,aAAa,EAC/C,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,EAC/C,gBAAgB,CAAC,8BAAkB;IAgBxD;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAMxC;;;;;OAKG;IACG,MAAM,CACV,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAiCrC;;;;;;OAMG;IACH,kCAAkC,CAChC,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IA8C5B,oCAAoC,CAClC,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IAyC5B;;;;;;OAMG;IACH,gCAAgC,CAC9B,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IAyC5B;;;;;;OAMG;IACG,kBAAkB,CACtB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAuC/B,mBAAmB,CACvB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAsCrC;;;;;;OAMG;IACH,wBAAwB,CACtB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,uBAAuB,EAAE;IAU5B;;;;OAIG;IACG,iBAAiB,CACrB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC;QACT,WAAW,EAAE,OAAO,CAAC;QACrB,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;KAC/C,CAAC;IA6BF;;;;OAIG;IACG,kBAAkB,CACtB,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,GAChC,OAAO,CAAC;QACT,YAAY,EAAE,OAAO,CAAC;QACtB,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;KAC/C,CAAC;IAUI,aAAa,CAAC,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAAC;QAC9D,YAAY,EAAE,OAAO,CAAC;QACtB,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;KAC/C,CAAC;IA4CI,kBAAkB,CACtB,cAAc,EAAE,iBAAiB,EACjC,YAAY,EAAE,iBAAiB,GAC9B,OAAO,CAAC;QACT,YAAY,EAAE,OAAO,CAAC;QACtB,kBAAkB,EAAE,uBAAuB,EAAE,CAAC;KAC/C,CAAC;IA4CF;;;;;;;OAOG;WACU,MAAM,CAAC,MAAM,EAAE;QAC1B,KAAK,EAAE,aAAa,CAAC;QACrB,MAAM,EAAE,iBAAiB,CAAC;QAC1B,aAAa,EAAE,aAAa,CAAC;QAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,EAAE,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;KAClE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiChC"}

package/dist/token/EvmERC20WarpModule.hardhat-test.js

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
-import { constants } from 'ethers';
 import hre from 'hardhat';
-import { ERC20Test__factory, ERC4626Test__factory, HypERC20__factory, HypERC4626Collateral__factory, HypNative__factory, Mailbox__factory, } from '@hyperlane-xyz/core';
-import { EvmIsmModule, IsmType, TestChainName, serializeContracts, } from '@hyperlane-xyz/sdk';
+import { ERC20Test__factory, ERC4626Test__factory, HypERC20__factory, HypERC4626Collateral__factory, HypNative__factory, MailboxClient__factory, Mailbox__factory, } from '@hyperlane-xyz/core';
+import { EvmIsmModule, HookType, IsmType, TestChainName, proxyAdmin, serializeContracts, } from '@hyperlane-xyz/sdk';
+import { randomInt } from '@hyperlane-xyz/utils';
 import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
 import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
 import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
@@ -14,7 +14,9 @@ import { TokenType } from './config.js';
 const randomRemoteRouters = (n) => {
     const routers = {};
     for (let domain = 0; domain < n; domain++) {
-        routers[domain] = randomAddress();
+        routers[domain] = {
+            address: randomAddress(),
+        };
     }
     return routers;
 };
@@ -24,7 +26,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
     const TOKEN_DECIMALS = 18;
     const chain = TestChainName.test4;
     let mailbox;
-    let hookAddress;
     let ismAddress;
     let ismFactory;
     let factories;
@@ -38,8 +39,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
     let baseConfig;
     async function validateCoreValues(deployedToken) {
         expect(await deployedToken.mailbox()).to.equal(mailbox.address);
-        expect(await deployedToken.hook()).to.equal(hookAddress);
-        expect(await deployedToken.interchainSecurityModule()).to.equal(constants.AddressZero);
         expect(await deployedToken.owner()).to.equal(signer.address);
     }
     async function sendTxs(txs) {
@@ -60,7 +59,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
         token = await erc20Factory.deploy(TOKEN_NAME, TOKEN_NAME, TOKEN_SUPPLY, TOKEN_DECIMALS);
         baseConfig = routerConfigMap[chain];
         mailbox = Mailbox__factory.connect(baseConfig.mailbox, signer);
-        hookAddress = await mailbox.defaultHook();
         ismAddress = await mailbox.defaultIsm();
     });
     it('should create with a collateral config', async () => {
@@ -68,13 +66,13 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             ...baseConfig,
             type: TokenType.collateral,
             token: token.address,
-            hook: hookAddress,
         };
         // Deploy using WarpModule
         const evmERC20WarpModule = await EvmERC20WarpModule.create({
             chain,
             config,
             multiProvider,
+            proxyFactoryFactories: ismFactoryAddresses,
         });
         // Let's derive it's onchain token type
         const { deployedTokenRoute } = evmERC20WarpModule.serialize();
@@ -87,7 +85,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
         const config = {
             type: TokenType.collateralVault,
             token: vault.address,
-            hook: hookAddress,
             ...baseConfig,
         };
         // Deploy using WarpModule
@@ -95,6 +92,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             chain,
             config,
             multiProvider,
+            proxyFactoryFactories: ismFactoryAddresses,
         });
         // Let's derive it's onchain token type
         const { deployedTokenRoute } = evmERC20WarpModule.serialize();
@@ -108,19 +106,19 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
     });
     it('should create with a synthetic config', async () => {
         const config = {
+            ...baseConfig,
             type: TokenType.synthetic,
-            hook: hookAddress,
             name: TOKEN_NAME,
             symbol: TOKEN_NAME,
             decimals: TOKEN_DECIMALS,
             totalSupply: TOKEN_SUPPLY,
-            ...baseConfig,
         };
         // Deploy using WarpModule
         const evmERC20WarpModule = await EvmERC20WarpModule.create({
             chain,
             config,
             multiProvider,
+            proxyFactoryFactories: ismFactoryAddresses,
         });
         // Let's derive it's onchain token type
         const { deployedTokenRoute } = evmERC20WarpModule.serialize();
@@ -137,7 +135,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
     it('should create with a native config', async () => {
         const config = {
             type: TokenType.native,
-            hook: hookAddress,
             ...baseConfig,
         };
         // Deploy using WarpModule
@@ -145,6 +142,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             chain,
             config,
             multiProvider,
+            proxyFactoryFactories: ismFactoryAddresses,
         });
         // Let's derive it's onchain token type
         const { deployedTokenRoute } = evmERC20WarpModule.serialize();
@@ -159,7 +157,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
         const config = {
             ...baseConfig,
             type: TokenType.native,
-            hook: hookAddress,
             remoteRouters: randomRemoteRouters(numOfRouters),
         };
         // Deploy using WarpModule
@@ -167,32 +164,53 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             chain,
             config,
             multiProvider,
+            proxyFactoryFactories: ismFactoryAddresses,
         });
         const { remoteRouters } = await evmERC20WarpModule.read();
         expect(Object.keys(remoteRouters).length).to.equal(numOfRouters);
     });
     describe('Update', async () => {
+        const owner = randomAddress();
         const ismConfigToUpdate = [
             {
                 type: IsmType.TRUSTED_RELAYER,
-                relayer: randomAddress(),
+                relayer: owner,
             },
             {
                 type: IsmType.FALLBACK_ROUTING,
-                owner: randomAddress(),
+                owner: owner,
                 domains: {},
             },
             {
                 type: IsmType.PAUSABLE,
-                owner: randomAddress(),
+                owner: owner,
                 paused: false,
             },
         ];
+        const hookConfigToUpdate = [
+            {
+                type: HookType.PROTOCOL_FEE,
+                beneficiary: owner,
+                owner: owner,
+                maxProtocolFee: '1337',
+                protocolFee: '1337',
+            },
+            {
+                type: HookType.INTERCHAIN_GAS_PAYMASTER,
+                owner: owner,
+                beneficiary: owner,
+                oracleKey: owner,
+                overhead: {},
+                oracleConfig: {},
+            },
+            {
+                type: HookType.MERKLE_TREE,
+            },
+        ];
         it('should deploy and set a new Ism', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
                 interchainSecurityModule: ismAddress,
             };
             // Deploy using WarpModule
@@ -200,12 +218,12 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                 chain,
                 config,
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             const actualConfig = await evmERC20WarpModule.read();
             for (const interchainSecurityModule of ismConfigToUpdate) {
                 const expectedConfig = {
                     ...actualConfig,
-                    ismFactoryAddresses,
                     interchainSecurityModule,
                 };
                 await sendTxs(await evmERC20WarpModule.update(expectedConfig));
@@ -217,7 +235,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
                 interchainSecurityModule: ismAddress,
             };
             // Deploy using WarpModule
@@ -225,6 +242,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                 chain,
                 config,
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             const actualConfig = await evmERC20WarpModule.read();
             const owner = randomAddress();
@@ -235,7 +253,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             };
             const expectedConfig = {
                 ...actualConfig,
-                ismFactoryAddresses,
                 interchainSecurityModule,
             };
             await sendTxs(await evmERC20WarpModule.update(expectedConfig));
@@ -245,6 +262,75 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const txs = await evmERC20WarpModule.update(expectedConfig);
             expect(txs.length).to.equal(0);
         });
+        it('should update and set a new Hook based on config', async () => {
+            const config = {
+                ...baseConfig,
+                type: TokenType.native,
+            };
+            // Deploy using WarpModule
+            const evmERC20WarpModule = await EvmERC20WarpModule.create({
+                chain,
+                config,
+                multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
+            });
+            const actualConfig = await evmERC20WarpModule.read();
+            for (const hook of hookConfigToUpdate) {
+                const expectedConfig = {
+                    ...actualConfig,
+                    hook,
+                };
+                await sendTxs(await evmERC20WarpModule.update(expectedConfig));
+                const updatedConfig = (await evmERC20WarpModule.read())
+                    .hook;
+                expect(normalizeConfig(updatedConfig)).to.deep.equal(hook);
+            }
+        });
+        it('should set new deployed hook mailbox to WarpConfig.owner', async () => {
+            const config = {
+                ...baseConfig,
+                type: TokenType.native,
+            };
+            // Deploy using WarpModule
+            const evmERC20WarpModule = await EvmERC20WarpModule.create({
+                chain,
+                config,
+                multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
+            });
+            const actualConfig = await evmERC20WarpModule.read();
+            const expectedConfig = {
+                ...actualConfig,
+                hook: hookConfigToUpdate.find((c) => c.type === HookType.MERKLE_TREE),
+            };
+            await sendTxs(await evmERC20WarpModule.update(expectedConfig));
+            const updatedConfig = (await evmERC20WarpModule.read())
+                .hook;
+            const hook = MailboxClient__factory.connect(updatedConfig.address, multiProvider.getProvider(chain));
+            expect(await hook.mailbox()).to.equal(expectedConfig.mailbox);
+        });
+        it("should set Proxied Hook's proxyAdmins to WarpConfig.proxyAdmin", async () => {
+            const config = {
+                ...baseConfig,
+                type: TokenType.native,
+            };
+            // Deploy using WarpModule
+            const evmERC20WarpModule = await EvmERC20WarpModule.create({
+                chain,
+                config,
+                multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
+            });
+            const actualConfig = await evmERC20WarpModule.read();
+            const expectedConfig = {
+                ...actualConfig,
+                hook: hookConfigToUpdate.find((c) => c.type === HookType.INTERCHAIN_GAS_PAYMASTER),
+            };
+            await sendTxs(await evmERC20WarpModule.update(expectedConfig));
+            const updatedConfig = (await evmERC20WarpModule.read())
+                .hook;
+            expect(await proxyAdmin(multiProvider.getProvider(chain), updatedConfig.address)).to.equal(expectedConfig.proxyAdmin?.address);
+        });
         it('should update a mutable Ism', async () => {
             const ismConfig = {
                 type: IsmType.ROUTING,
@@ -265,18 +351,17 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
                 interchainSecurityModule: deployedIsm,
             };
             const evmERC20WarpModule = await EvmERC20WarpModule.create({
                 chain,
                 config,
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             const actualConfig = await evmERC20WarpModule.read();
             const expectedConfig = {
                 ...actualConfig,
-                ismFactoryAddresses,
                 interchainSecurityModule: {
                     type: IsmType.ROUTING,
                     owner: randomAddress(),
@@ -289,11 +374,10 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const updatedConfig = normalizeConfig((await evmERC20WarpModule.read()).interchainSecurityModule);
             expect(updatedConfig).to.deep.equal(expectedConfig.interchainSecurityModule);
         });
-        it('should update connected routers', async () => {
+        it('should enroll connected routers', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
                 ismFactoryAddresses,
             };
             // Deploy using WarpModule
@@ -304,8 +388,9 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                     interchainSecurityModule: ismAddress,
                 },
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
-            const numOfRouters = Math.floor(Math.random() * 10);
+            const numOfRouters = randomInt(10, 0);
             await sendTxs(await evmERC20WarpModule.update({
                 ...config,
                 remoteRouters: randomRemoteRouters(numOfRouters),
@@ -313,11 +398,40 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const updatedConfig = await evmERC20WarpModule.read();
             expect(Object.keys(updatedConfig.remoteRouters).length).to.be.equal(numOfRouters);
         });
-        it('should only extend routers if they are new ones are different', async () => {
+        it('should unenroll connected routers', async () => {
+            const config = {
+                ...baseConfig,
+                type: TokenType.native,
+                ismFactoryAddresses,
+            };
+            // Deploy using WarpModule
+            const evmERC20WarpModule = await EvmERC20WarpModule.create({
+                chain,
+                config: {
+                    ...config,
+                    interchainSecurityModule: ismAddress,
+                },
+                multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
+            });
+            const numOfRouters = randomInt(10, 0);
+            await sendTxs(await evmERC20WarpModule.update({
+                ...config,
+                remoteRouters: randomRemoteRouters(numOfRouters),
+            }));
+            // Read config & delete remoteRouters
+            const existingConfig = await evmERC20WarpModule.read();
+            for (let i = 0; i < numOfRouters; i++) {
+                delete existingConfig.remoteRouters?.[i.toString()];
+                await sendTxs(await evmERC20WarpModule.update(existingConfig));
+                const updatedConfig = await evmERC20WarpModule.read();
+                expect(Object.keys(updatedConfig.remoteRouters).length).to.be.equal(numOfRouters - (i + 1));
+            }
+        });
+        it('should replace an enrollment if they are new one different, if the config lengths are the same', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
                 ismFactoryAddresses,
             };
             // Deploy using WarpModule
@@ -328,6 +442,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                     interchainSecurityModule: ismAddress,
                 },
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             const remoteRouters = randomRemoteRouters(1);
             await sendTxs(await evmERC20WarpModule.update({
@@ -344,22 +459,25 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             expect(txs.length).to.equal(0);
             await sendTxs(txs);
             // Try to extend with the different remoteRouters, but same length
+            const extendedRemoteRouter = {
+                3: {
+                    address: randomAddress(),
+                },
+            };
             txs = await evmERC20WarpModule.update({
                 ...config,
-                remoteRouters: {
-                    3: randomAddress(),
-                },
+                remoteRouters: extendedRemoteRouter,
             });
-            expect(txs.length).to.equal(1);
+            expect(txs.length).to.equal(2);
             await sendTxs(txs);
             updatedConfig = await evmERC20WarpModule.read();
-            expect(Object.keys(updatedConfig.remoteRouters).length).to.be.equal(2);
+            expect(Object.keys(updatedConfig.remoteRouters).length).to.be.equal(1);
+            expect(updatedConfig.remoteRouters?.['3'].address.toLowerCase()).to.be.eq(extendedRemoteRouter['3'].address.toLowerCase());
         });
         it('should update the owner only if they are different', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
                 ismFactoryAddresses,
             };
             const owner = signer.address.toLowerCase();
@@ -370,6 +488,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                     interchainSecurityModule: ismAddress,
                 },
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             const currentConfig = await evmERC20WarpModule.read();
             expect(currentConfig.owner.toLowerCase()).to.equal(owner);
@@ -391,8 +510,6 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
-                ismFactoryAddresses,
             };
             const owner = signer.address.toLowerCase();
             const evmERC20WarpModule = await EvmERC20WarpModule.create({
@@ -402,6 +519,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                     interchainSecurityModule: ismAddress,
                 },
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             const currentConfig = await evmERC20WarpModule.read();
             expect(currentConfig.proxyAdmin?.owner.toLowerCase()).to.equal(owner);
@@ -427,10 +545,10 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
             const config = {
                 ...baseConfig,
                 type: TokenType.native,
-                hook: hookAddress,
-                ismFactoryAddresses,
                 remoteRouters: {
-                    [domain]: randomAddress(),
+                    [domain]: {
+                        address: randomAddress(),
+                    },
                 },
             };
             // Deploy using WarpModule
@@ -440,6 +558,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
                     ...config,
                 },
                 multiProvider,
+                proxyFactoryFactories: ismFactoryAddresses,
             });
             await sendTxs(await evmERC20WarpModule.update({
                 ...config,