@hyperlane-xyz/sdk 42.0.0 → 43.0.0

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAkF7C,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAI3B,CAAC;AAEH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAMlC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;iBAWtC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,GAAG;IAC1D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAErE;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,GAC5C,OAAO,CAET;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAC7C,UAAU,EACV,cAAc,GAAG,aAAa,CAC/B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,GAAG;IACxE,UAAU,EAAE,gBAAgB,CAAC;IAC7B,YAAY,EAAE,iBAAiB,CAAC;IAChC,WAAW,EAAE,iBAAiB,CAAC;CAChC,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,iBAAiB,sBAAsB;IACvC,iBAAiB,sBAAsB;CACxC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;IACzB,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAChC,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,IAAI,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAC1C,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC"}

package/dist/core/types.js

@@ -66,9 +66,9 @@ export const CoreConfigSchema = CoreConfigBaseSchema.superRefine((val, ctx) => {
     rejectWarpOnlyDefaultIsm(val, ctx);
     rejectQuotedCallsWithLegacyIgp(val, ctx);
 });
-export const DerivedCoreConfigSchema = CoreConfigBaseSchema.merge(z.object({
+export const DerivedCoreConfigSchema = CoreConfigBaseSchema.extend({
     interchainAccountRouter: DerivedIcaRouterConfigSchema.optional(),
-})).superRefine((val, ctx) => {
+}).superRefine((val, ctx) => {
     rejectRateLimitedDefaultIsm(val, ctx);
     rejectWarpOnlyDefaultIsm(val, ctx);
     rejectQuotedCallsWithLegacyIgp(val, ctx);

package/dist/core/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EACL,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EACL,qCAAqC,EACrC,0BAA0B,GAC3B,MAAM,iBAAiB,CAAC;AAEzB,MAAM,oBAAoB,GAAG,aAAa,CAAC,MAAM,CAAC;IAChD,UAAU,EAAE,eAAe;IAC3B,WAAW,EAAE,gBAAgB;IAC7B,YAAY,EAAE,gBAAgB;IAC9B,8DAA8D;IAC9D,mEAAmE;IACnE,UAAU,EAAE,qBAAqB,CAAC,QAAQ,EAAE;IAC5C,uBAAuB,EAAE,qBAAqB,CAAC,QAAQ,EAAE;IACzD,gEAAgE;IAChE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,oEAAoE;IACpE,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACzC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,wBAAwB,GAAG,CAC/B,GAA4B,EAC5B,GAAoB,EACpB,EAAE;IACF,IAAI,qCAAqC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,QAAQ,CAAC;YACX,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,OAAO,EACL,4HAA4H;YAC9H,IAAI,EAAE,CAAC,YAAY,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAClC,GAA4B,EAC5B,GAAoB,EACpB,EAAE;IACF,IAAI,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/C,GAAG,CAAC,QAAQ,CAAC;YACX,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,OAAO,EAAE,qDAAqD;YAC9D,IAAI,EAAE,CAAC,YAAY,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,2EAA2E;AAC3E,6EAA6E;AAC7E,4EAA4E;AAC5E,wCAAwC;AACxC,MAAM,8BAA8B,GAAG,CACrC,GAIC,EACD,GAAoB,EACpB,EAAE;IACF,IAAI,GAAG,CAAC,iBAAiB,KAAK,KAAK;QAAE,OAAO;IAC5C,IACE,yBAAyB,CAAC,GAAG,CAAC,WAAW,CAAC;QAC1C,yBAAyB,CAAC,GAAG,CAAC,YAAY,CAAC,EAC3C,CAAC;QACD,GAAG,CAAC,QAAQ,CAAC;YACX,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM;YAC3B,OAAO,EACL,oLAAoL;YACtL,IAAI,EAAE,CAAC,mBAAmB,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5E,2BAA2B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnC,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,KAAK,CAC/D,CAAC,CAAC,MAAM,CAAC;IACP,uBAAuB,EAAE,4BAA4B,CAAC,QAAQ,EAAE;CACjE,CAAC,CACH,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACzB,2BAA2B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACnC,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,2BAA2B,CAAC,MAAM,CAAC;IAC5E,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE;IAC7B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzC,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE;IACnC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,oBAAoB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3C,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC9C,CAAC,CAAC;AASH,MAAM,UAAU,yBAAyB,CAAC,MAAkB;IAC1D,OAAO,MAAM,CAAC,cAAc,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,MAA6C;IAE7C,OAAO,MAAM,CAAC,iBAAiB,KAAK,KAAK,CAAC;AAC5C,CAAC;AAaD,MAAM,CAAN,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC3B,wCAAmB,CAAA;IACnB,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;AACzC,CAAC,EAJW,iBAAiB,KAAjB,iBAAiB,QAI5B;AAED,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;IACzB,iDAAyB,CAAA;AAC3B,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"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"}

package/dist/deploy/HyperlaneDeployer.js

@@ -31,7 +31,7 @@ export class HyperlaneDeployer {
         this.recoverVerificationInputs = recoverVerificationInputs;
         this.icaAddresses = icaAddresses;
         this.logger = options?.logger ?? rootLogger.child({ module: 'deployer' });
-        this.chainTimeoutMs = options?.chainTimeoutMs ?? 15 * 60 * 1000; // 15 minute timeout per chain
+        this.chainTimeoutMs = options?.chainTimeoutMs ?? 45 * 60 * 1000; // 45 minute timeout per chain
         if (Object.keys(icaAddresses).length > 0) {
             this.options.icaApp = InterchainAccount.fromAddressesMap(icaAddresses, multiProvider);
         }

package/dist/deploy/proxy.d.ts

@@ -5,49 +5,17 @@ import { Address, ChainId } from '@hyperlane-xyz/utils';
 import { AnnotatedEV5Transaction } from '../providers/ProviderType.js';
 import { DeployedOwnableConfig } from '../types.js';
 export type EthersLikeProvider = ethers.providers.Provider | ZKSyncProvider;
+export declare const EIP1967_IMPLEMENTATION_SLOT = "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
+export declare const EIP1967_ADMIN_SLOT = "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
 export declare const UpgradeConfigSchema: z.ZodObject<{
     timelock: z.ZodObject<{
-        delay: z.ZodEffects<z.ZodNumber, number, number>;
+        delay: z.ZodNumber;
         roles: z.ZodObject<{
-            executor: z.ZodEffects<z.ZodString, string, string>;
-            proposer: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
-        }, "strip", z.ZodTypeAny, {
-            executor: string;
-            proposer: string;
-        }, {
-            executor: string;
-            proposer: string;
-        }>;
-    }, "strip", z.ZodTypeAny, {
-        delay: number;
-        roles: {
-            executor: string;
-            proposer: string;
-        };
-    }, {
-        delay: number;
-        roles: {
-            executor: string;
-            proposer: string;
-        };
-    }>;
-}, "strip", z.ZodTypeAny, {
-    timelock: {
-        delay: number;
-        roles: {
-            executor: string;
-            proposer: string;
-        };
-    };
-}, {
-    timelock: {
-        delay: number;
-        roles: {
-            executor: string;
-            proposer: string;
-        };
-    };
-}>;
+            executor: z.ZodString;
+            proposer: z.ZodString;
+        }, z.core.$strip>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
 export type UpgradeConfig = z.infer<typeof UpgradeConfigSchema>;
 /**
  * Checks if a storage value represents empty/uninitialized storage.

package/dist/deploy/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,IAAI,cAAc,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EACL,OAAO,EACP,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,cAAc,CAAC;AAc5E,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAS9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD;AAID,wBAAsB,eAAe,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAYD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,wBAAsB,aAAa,CACjC,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAWlB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,QAAQ,EAC5D,cAAc,EAAE,CAAC,EACjB,UAAU,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAC5C,qBAAqB,SAAe,GACnC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAQ1B;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,QAAQ,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC,EACF,cAAc,EAAE,QAAQ,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC,GACD,uBAAuB,EAAE,CAiD3B;AAWD;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC,CAMlB"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,IAAI,cAAc,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EACL,OAAO,EACP,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,cAAc,CAAC;AAE5E,eAAO,MAAM,2BAA2B,uEAC8B,CAAC;AACvE,eAAO,MAAM,kBAAkB,uEACuC,CAAC;AAcvE,eAAO,MAAM,mBAAmB;;;;;;;;iBAS9B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD;AAID,wBAAsB,eAAe,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,OAAO,CAAC,CAqBlB;AAYD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,wBAAsB,aAAa,CACjC,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,OAAO,CAAC,CASlB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,QAAQ,EAC5D,cAAc,EAAE,CAAC,EACjB,UAAU,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EAC5C,qBAAqB,SAAe,GACnC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAQ1B;AAED,wBAAsB,OAAO,CAC3B,QAAQ,EAAE,kBAAkB,EAC5B,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,QAAQ,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC,EACF,cAAc,EAAE,QAAQ,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC,GACD,uBAAuB,EAAE,CAiD3B;AAWD;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,OAAO,CAAC,CAMlB"}

package/dist/deploy/proxy.js

@@ -4,6 +4,8 @@ import { ProxyAdmin__factory } from '@hyperlane-xyz/core';
 import { assert, eqAddress, isValidAddressEvm, retryAsync, } from '@hyperlane-xyz/utils';
 import { transferOwnershipTransactions } from '../contracts/contracts.js';
 import { ZNzUint } from '../metadata/customZodTypes.js';
+export const EIP1967_IMPLEMENTATION_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc';
+export const EIP1967_ADMIN_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103';
 const ZEvmAddress = z
     .string()
     .refine(isValidAddressEvm, 'Must be a valid EVM address');
@@ -54,8 +56,7 @@ async function assertCodeExists(provider, contract) {
 }
 export async function proxyImplementation(provider, proxy) {
     await assertCodeExists(provider, proxy);
-    // Hardcoded storage slot for implementation per EIP-1967
-    const storageValue = await provider.getStorageAt(proxy, '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc');
+    const storageValue = await provider.getStorageAt(proxy, EIP1967_IMPLEMENTATION_SLOT);
     if (isStorageEmpty(storageValue)) {
         return ethers.constants.AddressZero;
     }
@@ -73,8 +74,7 @@ export async function isInitialized(provider, contract) {
 }
 export async function proxyAdmin(provider, proxy) {
     await assertCodeExists(provider, proxy);
-    // Hardcoded storage slot for admin per EIP-1967
-    const storageValue = await provider.getStorageAt(proxy, '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103');
+    const storageValue = await provider.getStorageAt(proxy, EIP1967_ADMIN_SLOT);
     if (isStorageEmpty(storageValue)) {
         return ethers.constants.AddressZero;
     }

package/dist/deploy/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAGL,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAMxD,MAAM,WAAW,GAAG,CAAC;KAClB,MAAM,EAAE;KACR,MAAM,CAAC,iBAAiB,EAAE,6BAA6B,CAAC,CAAC;AAC5D,MAAM,kBAAkB,GAAG,WAAW,CAAC,MAAM,CAC3C,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,EAC9D,gCAAgC,CACjC,CAAC;AACF,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAChC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EACtC,wBAAwB,CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;QACjB,KAAK,EAAE,WAAW;QAClB,4DAA4D;QAC5D,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;YACd,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAIH;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,KAAK,CAAC;AACpE,CAAC;AAED,MAAM,wBAAyB,SAAQ,KAAK;CAAG;AAE/C,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAA4B,EAC5B,QAAiB;IAEjB,yEAAyE;IACzE,qCAAqC;IACrC,IAAI,CAAC;QACH,MAAM,UAAU,CACd,KAAK,IAAI,EAAE;YACT,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,MAAM,IAAI,wBAAwB,CAChC,eAAe,QAAQ,cAAc,CACtC,CAAC;YACJ,CAAC;QACH,CAAC,EACD,CAAC,EACD,GAAG,CACJ,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,wBAAwB;YAAE,OAAO,KAAK,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAA4B,EAC5B,QAAiB;IAEjB,MAAM,CACJ,MAAM,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACzC,eAAe,QAAQ,cAAc,CACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,QAA4B,EAC5B,KAAc;IAEd,MAAM,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxC,yDAAyD;IACzD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAC9C,KAAK,EACL,oEAAoE,CACrE,CAAC;IACF,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAA4B,EAC5B,QAAiB;IAEjB,MAAM,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3C,8DAA8D;IAC9D,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAClE,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAClD,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,QAA4B,EAC5B,KAAc;IAEd,MAAM,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxC,gDAAgD;IAChD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,YAAY,CAC9C,KAAK,EACL,oEAAoE,CACrE,CAAC;IACF,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;IACtC,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,cAAiB,EACjB,UAAkB,EAClB,cAA4C,EAC5C,qBAAqB,GAAG,YAAY;IAEpC,MAAM,QAAQ,GAAG,cAAc;QAC7B,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,kBAAkB,CACzC,qBAAqB,EACrB,cAAc,CACf;QACH,CAAC,CAAC,IAAI,CAAC;IACT,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,QAA4B,EAC5B,KAAc;IAEd,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAChD,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,OAAgB,EAChB,YAAqB,EACrB,YAIE,EACF,cAIE;IAEF,MAAM,YAAY,GAA8B,EAAE,CAAC;IAEnD,MAAM,aAAa,GACjB,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAE5D,IACE,YAAY,CAAC,UAAU,EAAE,OAAO;QAChC,cAAc,CAAC,UAAU,EAAE,OAAO;QAClC,YAAY,CAAC,UAAU,CAAC,OAAO,KAAK,cAAc,CAAC,UAAU,CAAC,OAAO,EACrE,CAAC;QACD,YAAY,CAAC,IAAI,CAAC;YAChB,OAAO,EAAE,aAAa;YACtB,UAAU,EAAE,qCAAqC,YAAY,WAAW,YAAY,CAAC,UAAU,CAAC,OAAO,SAAS,cAAc,CAAC,UAAU,CAAC,OAAO,GAAG;YACpJ,EAAE,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO;YACnC,IAAI,EAAE,mBAAmB,CAAC,eAAe,EAAE,CAAC,kBAAkB,CAC5D,mCAAmC,EACnC,CAAC,YAAY,EAAE,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAClD;SACF,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,qBAAqB,GAAG;YAC5B,GAAG,YAAY,CAAC,UAAU;YAC1B,KAAK,EACH,YAAY,CAAC,cAAc,EAAE,UAAU;gBACvC,YAAY,CAAC,UAAU,EAAE,KAAK;gBAC9B,YAAY,CAAC,KAAK;SACrB,CAAC;QACF,MAAM,uBAAuB,GAAG;YAC9B,GAAG,cAAc,CAAC,UAAU;YAC5B,KAAK,EACH,cAAc,CAAC,cAAc,EAAE,UAAU;gBACzC,cAAc,CAAC,UAAU,EAAE,KAAK;gBAChC,cAAc,CAAC,KAAK;SACvB,CAAC;QAEF,YAAY,CAAC,IAAI;QACf,wEAAwE;QACxE,2EAA2E;QAC3E,GAAG,6BAA6B,CAC9B,aAAa,EACb,qBAAqB,CAAC,OAAQ,EAC9B,qBAAqB,EACrB,uBAAuB,CACxB,CACF,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,mCAAmC,GAAG;IAC1C,SAAS;IACT,wBAAwB;IACxB,iCAAiC;IACjC,0BAA0B;IAC1B,uCAAuC;IACvC,mCAAmC;CACpC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,QAA4B,EAC5B,OAAgB;IAEhB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,mCAAmC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC5D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/deploy/proxy.ts"],"names":[],"mappings":"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"}

package/dist/deploy/types.d.ts

@@ -12,25 +12,7 @@ export declare const ProxyFactoryFactoriesSchema: z.ZodObject<{
     incrementalDomainRoutingIsmFactory: z.ZodString;
     staticMerkleRootWeightedMultisigIsmFactory: z.ZodString;
     staticMessageIdWeightedMultisigIsmFactory: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    staticMerkleRootMultisigIsmFactory: string;
-    staticMessageIdMultisigIsmFactory: string;
-    staticAggregationIsmFactory: string;
-    staticAggregationHookFactory: string;
-    domainRoutingIsmFactory: string;
-    incrementalDomainRoutingIsmFactory: string;
-    staticMerkleRootWeightedMultisigIsmFactory: string;
-    staticMessageIdWeightedMultisigIsmFactory: string;
-}, {
-    staticMerkleRootMultisigIsmFactory: string;
-    staticMessageIdMultisigIsmFactory: string;
-    staticAggregationIsmFactory: string;
-    staticAggregationHookFactory: string;
-    domainRoutingIsmFactory: string;
-    incrementalDomainRoutingIsmFactory: string;
-    staticMerkleRootWeightedMultisigIsmFactory: string;
-    staticMessageIdWeightedMultisigIsmFactory: string;
-}>;
+}, z.core.$strip>;
 export type ProxyFactoryFactoriesAddresses = z.infer<typeof ProxyFactoryFactoriesSchema>;
 export interface CheckerViolation {
     chain: ChainName;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EACV,aAAa,EACb,OAAO,EACP,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;EAStC,CAAC;AAEH,MAAM,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAClD,OAAO,2BAA2B,CACnC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,WAAW,gBAAgB;IAC3B,gBAAgB,qBAAqB;IACrC,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC;IAC/B,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,IAAI,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,kBAAkB,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC;CACjC;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IACjE,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,YAAY,EAAE,OAAO,CAAC;CACvB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EACV,aAAa,EACb,OAAO,EACP,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,eAAO,MAAM,2BAA2B;;;;;;;;;iBAStC,CAAC;AAEH,MAAM,MAAM,8BAA8B,GAAG,CAAC,CAAC,KAAK,CAClD,OAAO,2BAA2B,CACnC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,WAAW,gBAAgB;IAC3B,gBAAgB,qBAAqB;IACrC,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC;IAC/B,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,IAAI,EAAE,aAAa,CAAC,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,kBAAkB,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC;CACjC;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IACjE,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC9D,YAAY,EAAE,OAAO,CAAC;CACvB"}

package/dist/fee/EvmTokenFeeDeployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EvmTokenFeeDeployer.d.ts","sourceRoot":"","sources":["../../src/fee/EvmTokenFeeDeployer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EACL,eAAe,EACf,iBAAiB,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAwB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAIL,cAAc,EACd,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AAEpB,qBAAa,mBAAoB,SAAQ,iBAAiB,CACxD,cAAc,EACd,oBAAoB,CACrB;IAYG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS;IALrC,UAAmB,cAAc,UAAS;IAE1C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC;IACrD,YACqB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,SAAS,EACnC,OAAO,GAAE,eAAoB,EAI9B;IACK,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,CA+BnD;YAEa,SAAS;YA4BT,6BAA6B;YAiD7B,gBAAgB;YA8DhB,+BAA+B;CA6D9C"}
+{"version":3,"file":"EvmTokenFeeDeployer.d.ts","sourceRoot":"","sources":["../../src/fee/EvmTokenFeeDeployer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EACL,eAAe,EACf,iBAAiB,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAwB,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAIL,cAAc,EACd,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AAEpB,qBAAa,mBAAoB,SAAQ,iBAAiB,CACxD,cAAc,EACd,oBAAoB,CACrB;IAYG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS;IALrC,UAAmB,cAAc,UAAS;IAE1C,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,CAAC;IACrD,YACqB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,SAAS,EACnC,OAAO,GAAE,eAAoB,EAI9B;IACK,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,CA+BnD;YAEa,SAAS;YA4BT,6BAA6B;YAiD7B,gBAAgB;YAuEhB,+BAA+B;CAmE9C"}

package/dist/fee/EvmTokenFeeDeployer.hardhat-test.js

@@ -8,6 +8,19 @@ import { EvmTokenFeeDeployer } from './EvmTokenFeeDeployer.js';
 import { BPS, HALF_AMOUNT, MAX_FEE } from './EvmTokenFeeReader.hardhat-test.js';
 import { DEFAULT_ROUTER_KEY, CrossCollateralRoutingFeeConfigSchema, RoutingFeeConfigSchema, TokenFeeConfigSchema, TokenFeeType, } from './types.js';
 import { BPS_PRECISION, convertToBps } from './utils.js';
+async function expectError(promise, expectedMessage) {
+    let thrown;
+    try {
+        await promise;
+    }
+    catch (error) {
+        thrown = error;
+    }
+    expect(thrown).to.be.instanceOf(Error);
+    if (thrown instanceof Error) {
+        expect(thrown.message).to.equal(expectedMessage);
+    }
+}
 describe('EvmTokenFeeDeployer', () => {
     let multiProvider;
     let deployer;
@@ -104,6 +117,33 @@ describe('EvmTokenFeeDeployer', () => {
         const quote2 = await routingFeeContract['quoteTransferRemote(uint32,bytes32,uint256)'](122222, addressToBytes32(signer.address), MAX_FEE);
         expect(quote2.length).to.equal(0);
     });
+    it('should reject a nested routing fee before deploying its parent', async () => {
+        const transactionCount = await signer.getTransactionCount();
+        const config = RoutingFeeConfigSchema.parse({
+            type: TokenFeeType.RoutingFee,
+            owner: signer.address,
+            token: token.address,
+            feeContracts: {
+                [TestChainName.test1]: {
+                    type: TokenFeeType.RoutingFee,
+                    owner: signer.address,
+                    token: token.address,
+                    feeContracts: {
+                        [TestChainName.test2]: {
+                            type: TokenFeeType.LinearFee,
+                            owner: signer.address,
+                            token: token.address,
+                            maxFee: MAX_FEE,
+                            halfAmount: HALF_AMOUNT,
+                            bps: BPS,
+                        },
+                    },
+                },
+            },
+        });
+        await expectError(deployer.deploy({ [TestChainName.test2]: config }), 'Cannot nest RoutingFee inside a routing fee');
+        expect(await signer.getTransactionCount()).to.equal(transactionCount);
+    });
     it('should deploy RoutingFee with multiple fee contracts', async () => {
         const config = RoutingFeeConfigSchema.parse({
             type: TokenFeeType.RoutingFee,
@@ -281,5 +321,33 @@ describe('EvmTokenFeeDeployer', () => {
         expect(await routerFeeContract.owner()).to.equal(config.owner);
         expect(await routerFeeContract.token()).to.equal(token.address);
     });
+    it('should reject nested routing before deploying a cross-collateral parent', async () => {
+        const transactionCount = await signer.getTransactionCount();
+        const config = CrossCollateralRoutingFeeConfigSchema.parse({
+            type: TokenFeeType.CrossCollateralRoutingFee,
+            owner: signer.address,
+            feeContracts: {
+                [TestChainName.test1]: {
+                    [DEFAULT_ROUTER_KEY]: {
+                        type: TokenFeeType.RoutingFee,
+                        owner: signer.address,
+                        token: token.address,
+                        feeContracts: {
+                            [TestChainName.test2]: {
+                                type: TokenFeeType.LinearFee,
+                                owner: signer.address,
+                                token: token.address,
+                                maxFee: MAX_FEE,
+                                halfAmount: HALF_AMOUNT,
+                                bps: BPS,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+        await expectError(deployer.deploy({ [TestChainName.test2]: config }), 'Cannot nest RoutingFee inside a cross-collateral routing fee');
+        expect(await signer.getTransactionCount()).to.equal(transactionCount);
+    });
 });
 //# sourceMappingURL=EvmTokenFeeDeployer.hardhat-test.js.map

package/dist/fee/EvmTokenFeeDeployer.hardhat-test.js.map

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

package/dist/fee/EvmTokenFeeDeployer.js

@@ -84,12 +84,17 @@ export class EvmTokenFeeDeployer extends HyperlaneDeployer {
         return contract;
     }
     async deployRoutingFee(chain, config) {
+        const feeEntries = Object.entries(config.feeContracts).map(([destinationChain, feeConfig]) => {
+            assert(feeConfig.type !== TokenFeeType.RoutingFee &&
+                feeConfig.type !== TokenFeeType.CrossCollateralRoutingFee, `Cannot nest ${feeConfig.type} inside a routing fee`);
+            return { destinationChain, feeConfig };
+        });
         const signerAddress = await this.multiProvider.getSignerAddress(chain);
         // RoutingFee.setFeeContract is onlyOwner, so we deploy with the signer as a
         // temporary owner to allow setup, then transfer to the configured owner.
         const routingFee = await this.deployContract(chain, TokenFeeType.RoutingFee, [config.token, signerAddress]);
         // Deploy each fee contract & set each fee for the routing fee
-        for (const [destinationChain, feeConfig] of Object.entries(config.feeContracts)) {
+        for (const { destinationChain, feeConfig } of feeEntries) {
             // Sub-fee configs inherit the routing fee's token if not explicitly set
             const resolvedFeeConfig = {
                 ...feeConfig,
@@ -107,20 +112,23 @@ export class EvmTokenFeeDeployer extends HyperlaneDeployer {
         return routingFee;
     }
     async deployCrossCollateralRoutingFee(chain, config) {
+        const feeEntries = Object.entries(config.feeContracts).flatMap(([destinationChain, destinationConfig]) => Object.entries(destinationConfig).map(([routerKey, routerFeeConfig]) => {
+            assert(routerFeeConfig.type !== TokenFeeType.RoutingFee &&
+                routerFeeConfig.type !== TokenFeeType.CrossCollateralRoutingFee, `Cannot nest ${routerFeeConfig.type} inside a cross-collateral routing fee`);
+            return { destinationChain, routerKey, routerFeeConfig };
+        }));
         const signerAddress = await this.multiProvider.getSignerAddress(chain);
         const routingFee = await this.deployContract(chain, TokenFeeType.CrossCollateralRoutingFee, [signerAddress]);
         const destinationDomains = [];
         const routerKeys = [];
         const feeAddresses = [];
-        for (const [destinationChain, destinationConfig] of Object.entries(config.feeContracts)) {
-            for (const [routerKey, routerFeeConfig] of Object.entries(destinationConfig)) {
-                const { address } = routerFeeConfig.type === TokenFeeType.OffchainQuotedLinearFee
-                    ? await this.deployOffchainQuotedLinearFee(chain, routerFeeConfig)
-                    : await this.deployFee(chain, routerFeeConfig);
-                destinationDomains.push(this.multiProvider.getDomainId(destinationChain));
-                routerKeys.push(routerKey);
-                feeAddresses.push(address);
-            }
+        for (const { destinationChain, routerKey, routerFeeConfig } of feeEntries) {
+            const { address } = routerFeeConfig.type === TokenFeeType.OffchainQuotedLinearFee
+                ? await this.deployOffchainQuotedLinearFee(chain, routerFeeConfig)
+                : await this.deployFee(chain, routerFeeConfig);
+            destinationDomains.push(this.multiProvider.getDomainId(destinationChain));
+            routerKeys.push(routerKey);
+            feeAddresses.push(address);
         }
         if (destinationDomains.length > 0) {
             await this.multiProvider.handleTx(chain, routingFee.setCrossCollateralRouterFeeContracts(destinationDomains, routerKeys, feeAddresses, this.multiProvider.getTransactionOverrides(chain)));

package/dist/fee/EvmTokenFeeDeployer.js.map

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

package/dist/fee/EvmTokenFeeModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EvmTokenFeeModule.d.ts","sourceRoot":"","sources":["../../src/fee/EvmTokenFeeModule.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EACP,YAAY,EAUb,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAGL,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EAEL,2BAA2B,EAC3B,cAAc,EACd,mBAAmB,EAIpB,MAAM,YAAY,CAAC;AAGpB,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAoGF,qBAAa,iBAAkB,SAAQ,eAAe,CACpD,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,uBAAuB,CACxB;IAQG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAE/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IATxD,MAAM,CAAC,SAAS,iBAA8C;IAC9D,SAAS,CAAC,QAAQ,CAAC,MAAM,oCAAqD;IAC9E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,YACqB,aAAa,EAAE,aAAa,EAC/C,MAAM,EAAE,qBAAqB,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,EACxD,gBAAgB,CAAC,EAAE,gBAAgB,YAAA,EAWvD;IAED,OAAa,MAAM,CAAC,EAClB,aAAa,EACb,KAAK,EACL,MAAM,EACN,gBAAgB,GACjB,EAAE;QACD,aAAa,EAAE,aAAa,CAAC;QAC7B,KAAK,EAAE,aAAa,CAAC;QACrB,MAAM,EAAE,cAAc,CAAC;QACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0B7B;IAID,OAAoB,YAAY,CAAC,MAAM,EAAE;QACvC,MAAM,EAAE,2BAA2B,CAAC;QACpC,aAAa,EAAE,aAAa,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,cAAc,CAAC,CA2H1B;YAEa,MAAM;IAgBd,IAAI,CACR,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACrC,OAAO,CAAC,qBAAqB,CAAC,CAShC;IAID,OAAO,CAAC,gBAAgB;IAgCxB,OAAO,CAAC,cAAc;IAuBtB;;;;;;;;;;;;;;;;;OAiBG;IACG,MAAM,CACV,YAAY,EAAE,mBAAmB,EACjC,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACrC,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkKpC;YAEa,+BAA+B;YA+J/B,gBAAgB;IA4E9B,OAAO,CAAC,0BAA0B;IAoClC,OAAO,CAAC,wBAAwB;CAYjC"}
+{"version":3,"file":"EvmTokenFeeModule.d.ts","sourceRoot":"","sources":["../../src/fee/EvmTokenFeeModule.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,OAAO,EACP,YAAY,EAUb,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAGL,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAOhC,OAAO,EACL,2BAA2B,EAC3B,cAAc,EACd,mBAAmB,EAIpB,MAAM,YAAY,CAAC;AAGpB,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAiHF,qBAAa,iBAAkB,SAAQ,eAAe,CACpD,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,uBAAuB,CACxB;IAQG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAE/C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB;IATxD,MAAM,CAAC,SAAS,iBAA8C;IAC9D,SAAS,CAAC,QAAQ,CAAC,MAAM,oCAAqD;IAC9E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,YACqB,aAAa,EAAE,aAAa,EAC/C,MAAM,EAAE,qBAAqB,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,EACxD,gBAAgB,CAAC,EAAE,gBAAgB,YAAA,EAWvD;IAED,OAAa,MAAM,CAAC,EAClB,aAAa,EACb,KAAK,EACL,MAAM,EACN,gBAAgB,GACjB,EAAE;QACD,aAAa,EAAE,aAAa,CAAC;QAC7B,KAAK,EAAE,aAAa,CAAC;QACrB,MAAM,EAAE,cAAc,CAAC;QACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0B7B;IAID,OAAoB,YAAY,CAAC,MAAM,EAAE;QACvC,MAAM,EAAE,2BAA2B,CAAC;QACpC,aAAa,EAAE,aAAa,CAAC;QAC7B,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,cAAc,CAAC,CA+H1B;YAEa,MAAM;IAgBd,IAAI,CACR,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACrC,OAAO,CAAC,qBAAqB,CAAC,CAShC;IAID,OAAO,CAAC,gBAAgB;IAgCxB,OAAO,CAAC,cAAc;IAuBtB;;;;;;;;;;;;;;;;;OAiBG;IACG,MAAM,CACV,YAAY,EAAE,mBAAmB,EACjC,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACrC,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkKpC;YAEa,+BAA+B;YA+J/B,gBAAgB;IA4E9B,OAAO,CAAC,0BAA0B;IAoClC,OAAO,CAAC,wBAAwB;CAYjC"}

package/dist/fee/EvmTokenFeeModule.hardhat-test.js

@@ -46,6 +46,16 @@ describe('EvmTokenFeeModule', () => {
             await multiProvider.sendTransaction(test4Chain, tx);
         }
     }
+    function getLinearBps(feeConfig) {
+        assert(feeConfig?.type === TokenFeeType.LinearFee, `Must be ${TokenFeeType.LinearFee}`);
+        assert(feeConfig.bps !== undefined, 'LinearFee must define bps');
+        return feeConfig.bps;
+    }
+    function getFeeToken(feeConfig) {
+        assert(feeConfig, 'Fee config must exist');
+        assert(feeConfig.type !== TokenFeeType.CrossCollateralRoutingFee, 'CrossCollateralRoutingFee does not have a token');
+        return feeConfig.token;
+    }
     it('should create a new token fee', async () => {
         const module = await EvmTokenFeeModule.create({
             multiProvider,
@@ -179,7 +189,7 @@ describe('EvmTokenFeeModule', () => {
                 routingDestinations: [multiProvider.getDomainId(test4Chain)],
             });
             assert(onchainConfig.type === TokenFeeType.RoutingFee, `Must be ${TokenFeeType.RoutingFee}`);
-            expect(onchainConfig.feeContracts[test4Chain]?.bps).to.equal(BPS + 1);
+            expect(getLinearBps(onchainConfig.feeContracts[test4Chain])).to.equal(BPS + 1);
         });
         it('should transfer ownership if they are different', async () => {
             const module = await EvmTokenFeeModule.create({
@@ -265,7 +275,7 @@ describe('EvmTokenFeeModule', () => {
                 routingDestinations: [multiProvider.getDomainId(test4Chain)],
             });
             assert(onchainConfig.type === TokenFeeType.RoutingFee, `Must be ${TokenFeeType.RoutingFee}`);
-            expect(onchainConfig.feeContracts[test4Chain]?.bps).to.equal(BPS + 1);
+            expect(getLinearBps(onchainConfig.feeContracts[test4Chain])).to.equal(BPS + 1);
         });
         it('should forward token reader params when updating routing fees', async () => {
             const routingConfig = {
@@ -444,7 +454,7 @@ describe('EvmTokenFeeModule', () => {
                 },
             });
             assert(onchainConfig.type === TokenFeeType.CrossCollateralRoutingFee, `Must be ${TokenFeeType.CrossCollateralRoutingFee}`);
-            expect(onchainConfig.feeContracts[test4Chain]?.[DEFAULT_ROUTER_KEY]?.token).to.equal(token.address);
+            expect(getFeeToken(onchainConfig.feeContracts[test4Chain]?.[DEFAULT_ROUTER_KEY])).to.equal(token.address);
         });
         it('should preserve caller-provided CCR routers when diffing for update', async () => {
             const initialSubFeeModule = await EvmTokenFeeModule.create({
@@ -551,8 +561,8 @@ describe('EvmTokenFeeModule', () => {
                 },
             });
             assert(onchainConfig.type === TokenFeeType.CrossCollateralRoutingFee, `Must be ${TokenFeeType.CrossCollateralRoutingFee}`);
-            expect(onchainConfig.feeContracts[test4Chain]?.[routerKeyA]?.bps).to.equal(BPS);
-            expect(onchainConfig.feeContracts[test4Chain]?.[routerKeyB]?.bps).to.equal(BPS + 5);
+            expect(getLinearBps(onchainConfig.feeContracts[test4Chain]?.[routerKeyA])).to.equal(BPS);
+            expect(getLinearBps(onchainConfig.feeContracts[test4Chain]?.[routerKeyB])).to.equal(BPS + 5);
         });
         it('should produce correct per-router configs regardless of split iteration order', async () => {
             // Same scenario as above but routerKeyB appears first in the feeContracts object,
@@ -606,8 +616,8 @@ describe('EvmTokenFeeModule', () => {
                 },
             });
             assert(onchainConfig.type === TokenFeeType.CrossCollateralRoutingFee, `Must be ${TokenFeeType.CrossCollateralRoutingFee}`);
-            expect(onchainConfig.feeContracts[test4Chain]?.[routerKeyA]?.bps).to.equal(BPS);
-            expect(onchainConfig.feeContracts[test4Chain]?.[routerKeyB]?.bps).to.equal(BPS + 5);
+            expect(getLinearBps(onchainConfig.feeContracts[test4Chain]?.[routerKeyA])).to.equal(BPS);
+            expect(getLinearBps(onchainConfig.feeContracts[test4Chain]?.[routerKeyB])).to.equal(BPS + 5);
         });
         it('should redeploy when fee type changes', async () => {
             const module = await EvmTokenFeeModule.create({
@@ -811,7 +821,7 @@ describe('EvmTokenFeeModule', () => {
             const routingConfig = expandedConfig;
             const nestedFee = routingConfig.feeContracts[test4Chain];
             assert(nestedFee, 'Nested fee must exist');
-            expect(nestedFee.token).to.equal(token.address);
+            expect(getFeeToken(nestedFee)).to.equal(token.address);
         });
         it('should expand config with fractional bps (1.5)', async () => {
             const reader = new EvmTokenFeeReader(multiProvider, test4Chain);