@hyperlane-xyz/cli 34.0.0 → 35.0.0

package/bundle/index.js

@@ -128363,7 +128363,7 @@ __webpack_unused_export__ = ({ value: true });
 let converter;
 {
     try {
-        converter = __nccwpck_require__(8441)('bigint_buffer');
+        converter = __WEBPACK_EXTERNAL_createRequire(import.meta.url)(__nccwpck_require__.ab + "build/Release/bigint_buffer.node");
     }
     catch (e) {
         // Silently fall back to pure JS implementation
@@ -128436,234 +128436,6 @@ function toBufferBE(num, width) {
 exports.zy = toBufferBE;
 
 
-/***/ }),
-
-/***/ 8441:
-/***/ ((module, exports, __nccwpck_require__) => {
-
-/**
- * Module dependencies.
- */
-
-var fs = __nccwpck_require__(79896),
-  path = __nccwpck_require__(16928),
-  fileURLToPath = __nccwpck_require__(53904),
-  join = path.join,
-  dirname = path.dirname,
-  exists =
-    (fs.accessSync &&
-      function(path) {
-        try {
-          fs.accessSync(path);
-        } catch (e) {
-          return false;
-        }
-        return true;
-      }) ||
-    fs.existsSync ||
-    path.existsSync,
-  defaults = {
-    arrow: process.env.NODE_BINDINGS_ARROW || ' → ',
-    compiled: process.env.NODE_BINDINGS_COMPILED_DIR || 'compiled',
-    platform: process.platform,
-    arch: process.arch,
-    nodePreGyp:
-      'node-v' +
-      process.versions.modules +
-      '-' +
-      process.platform +
-      '-' +
-      process.arch,
-    version: process.versions.node,
-    bindings: 'bindings.node',
-    try: [
-      // node-gyp's linked version in the "build" dir
-      ['module_root', 'build', 'bindings'],
-      // node-waf and gyp_addon (a.k.a node-gyp)
-      ['module_root', 'build', 'Debug', 'bindings'],
-      ['module_root', 'build', 'Release', 'bindings'],
-      // Debug files, for development (legacy behavior, remove for node v0.9)
-      ['module_root', 'out', 'Debug', 'bindings'],
-      ['module_root', 'Debug', 'bindings'],
-      // Release files, but manually compiled (legacy behavior, remove for node v0.9)
-      ['module_root', 'out', 'Release', 'bindings'],
-      ['module_root', 'Release', 'bindings'],
-      // Legacy from node-waf, node <= 0.4.x
-      ['module_root', 'build', 'default', 'bindings'],
-      // Production "Release" buildtype binary (meh...)
-      ['module_root', 'compiled', 'version', 'platform', 'arch', 'bindings'],
-      // node-qbs builds
-      ['module_root', 'addon-build', 'release', 'install-root', 'bindings'],
-      ['module_root', 'addon-build', 'debug', 'install-root', 'bindings'],
-      ['module_root', 'addon-build', 'default', 'install-root', 'bindings'],
-      // node-pre-gyp path ./lib/binding/{node_abi}-{platform}-{arch}
-      ['module_root', 'lib', 'binding', 'nodePreGyp', 'bindings']
-    ]
-  };
-
-/**
- * The main `bindings()` function loads the compiled bindings for a given module.
- * It uses V8's Error API to determine the parent filename that this function is
- * being invoked from, which is then used to find the root directory.
- */
-
-function bindings(opts) {
-  // Argument surgery
-  if (typeof opts == 'string') {
-    opts = { bindings: opts };
-  } else if (!opts) {
-    opts = {};
-  }
-
-  // maps `defaults` onto `opts` object
-  Object.keys(defaults).map(function(i) {
-    if (!(i in opts)) opts[i] = defaults[i];
-  });
-
-  // Get the module root
-  if (!opts.module_root) {
-    opts.module_root = exports.getRoot(exports.getFileName());
-  }
-
-  // Ensure the given bindings name ends with .node
-  if (path.extname(opts.bindings) != '.node') {
-    opts.bindings += '.node';
-  }
-
-  // https://github.com/webpack/webpack/issues/4175#issuecomment-342931035
-  var requireFunc =
-     true
-      ? eval("require")
-      : 0;
-
-  var tries = [],
-    i = 0,
-    l = opts.try.length,
-    n,
-    b,
-    err;
-
-  for (; i < l; i++) {
-    n = join.apply(
-      null,
-      opts.try[i].map(function(p) {
-        return opts[p] || p;
-      })
-    );
-    tries.push(n);
-    try {
-      b = opts.path ? requireFunc.resolve(n) : requireFunc(n);
-      if (!opts.path) {
-        b.path = n;
-      }
-      return b;
-    } catch (e) {
-      if (e.code !== 'MODULE_NOT_FOUND' &&
-          e.code !== 'QUALIFIED_PATH_RESOLUTION_FAILED' &&
-          !/not find/i.test(e.message)) {
-        throw e;
-      }
-    }
-  }
-
-  err = new Error(
-    'Could not locate the bindings file. Tried:\n' +
-      tries
-        .map(function(a) {
-          return opts.arrow + a;
-        })
-        .join('\n')
-  );
-  err.tries = tries;
-  throw err;
-}
-module.exports = exports = bindings;
-
-/**
- * Gets the filename of the JavaScript file that invokes this function.
- * Used to help find the root directory of a module.
- * Optionally accepts an filename argument to skip when searching for the invoking filename
- */
-
-exports.getFileName = function getFileName(calling_file) {
-  var origPST = Error.prepareStackTrace,
-    origSTL = Error.stackTraceLimit,
-    dummy = {},
-    fileName;
-
-  Error.stackTraceLimit = 10;
-
-  Error.prepareStackTrace = function(e, st) {
-    for (var i = 0, l = st.length; i < l; i++) {
-      fileName = st[i].getFileName();
-      if (fileName !== __filename) {
-        if (calling_file) {
-          if (fileName !== calling_file) {
-            return;
-          }
-        } else {
-          return;
-        }
-      }
-    }
-  };
-
-  // run the 'prepareStackTrace' function above
-  Error.captureStackTrace(dummy);
-  dummy.stack;
-
-  // cleanup
-  Error.prepareStackTrace = origPST;
-  Error.stackTraceLimit = origSTL;
-
-  // handle filename that starts with "file://"
-  var fileSchema = 'file://';
-  if (fileName.indexOf(fileSchema) === 0) {
-    fileName = fileURLToPath(fileName);
-  }
-
-  return fileName;
-};
-
-/**
- * Gets the root directory of a module, given an arbitrary filename
- * somewhere in the module tree. The "root directory" is the directory
- * containing the `package.json` file.
- *
- *   In:  /home/nate/node-native-module/lib/index.js
- *   Out: /home/nate/node-native-module
- */
-
-exports.getRoot = function getRoot(file) {
-  var dir = dirname(file),
-    prev;
-  while (true) {
-    if (dir === '.') {
-      // Avoids an infinite loop in rare cases, like the REPL
-      dir = process.cwd();
-    }
-    if (
-      exists(join(dir, 'package.json')) ||
-      exists(join(dir, 'node_modules'))
-    ) {
-      // Found the 'package.json' file or 'node_modules' dir; we're done
-      return dir;
-    }
-    if (prev === dir) {
-      // Got to the top
-      throw new Error(
-        'Could not find module root given file: "' +
-          file +
-          '". Do you have a `package.json` file? '
-      );
-    }
-    // Try the parent dir next
-    prev = dir;
-    dir = join(dir, '..');
-  }
-};
-
-
 /***/ }),
 
 /***/ 73258:
@@ -205000,79 +204772,6 @@ module.exports.main = main;
 module.exports.windows = windows;
 
 
-/***/ }),
-
-/***/ 53904:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-
-/**
- * Module dependencies.
- */
-
-var sep = (__nccwpck_require__(16928).sep) || '/';
-
-/**
- * Module exports.
- */
-
-module.exports = fileUriToPath;
-
-/**
- * File URI to Path function.
- *
- * @param {String} uri
- * @return {String} path
- * @api public
- */
-
-function fileUriToPath (uri) {
-  if ('string' != typeof uri ||
-      uri.length <= 7 ||
-      'file://' != uri.substring(0, 7)) {
-    throw new TypeError('must pass in a file:// URI to convert to a file path');
-  }
-
-  var rest = decodeURI(uri.substring(7));
-  var firstSlash = rest.indexOf('/');
-  var host = rest.substring(0, firstSlash);
-  var path = rest.substring(firstSlash + 1);
-
-  // 2.  Scheme Definition
-  // As a special case, <host> can be the string "localhost" or the empty
-  // string; this is interpreted as "the machine from which the URL is
-  // being interpreted".
-  if ('localhost' == host) host = '';
-
-  if (host) {
-    host = sep + sep + host;
-  }
-
-  // 3.2  Drives, drive letters, mount points, file system root
-  // Drive letters are mapped into the top of a file URI in various ways,
-  // depending on the implementation; some applications substitute
-  // vertical bar ("|") for the colon after the drive letter, yielding
-  // "file:///c|/tmp/test.txt".  In some cases, the colon is left
-  // unchanged, as in "file:///c:/tmp/test.txt".  In other cases, the
-  // colon is simply omitted, as in "file:///c/tmp/test.txt".
-  path = path.replace(/^(.+)\|/, '$1:');
-
-  // for Windows, we need to invert the path separators from what a URI uses
-  if (sep == '\\') {
-    path = path.replace(/\//g, '\\');
-  }
-
-  if (/^.+\:/.test(path)) {
-    // has Windows drive at beginning of path
-  } else {
-    // unix path…
-    path = sep + path;
-  }
-
-  return host + path;
-}
-
-
 /***/ }),
 
 /***/ 18970:
@@ -672786,6 +672485,18 @@ class AleoBase {
         programManager.setAccount(account);
         return programManager;
     }
+    get networkPath() {
+        return this.chainId === _utils_types_js__WEBPACK_IMPORTED_MODULE_3__/* .AleoNetworkId */ .lH.TESTNET ? 'testnet' : 'mainnet';
+    }
+    async findBlockHashByTxId(txId) {
+        const url = `${this.rpcUrls[0]}/${this.networkPath}/find/blockHash/${txId}`;
+        return (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .retryAsync */ .tH)(async () => {
+            const res = await fetch(url);
+            if (!res.ok)
+                throw new Error(`HTTP ${res.status}`);
+            return JSON.parse(await res.text());
+        }, _utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .RETRY_ATTEMPTS */ .Km, _utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .RETRY_DELAY_MS */ .k);
+    }
     async queryMappingValue(programId, mappingName, key) {
         try {
             const result = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .retryAsync */ .tH)(() => this.aleoClient.getProgramMappingValue(programId, mappingName, key), _utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .RETRY_ATTEMPTS */ .Km, _utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .RETRY_DELAY_MS */ .k);
@@ -672979,6 +672690,16 @@ var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_pro
 
 class AleoProvider extends _base_js__WEBPACK_IMPORTED_MODULE_6__/* .AleoBase */ .N {
     transactionFeeCache = {};
+    signerTransferCache = new Map();
+    async hasSignerTransferFunctions(programId) {
+        if (this.signerTransferCache.has(programId)) {
+            return this.signerTransferCache.get(programId);
+        }
+        const program = await this.aleoClient.getProgram(programId);
+        const hasSigner = program.toString().includes('transfer_remote_as_signer');
+        this.signerTransferCache.set(programId, hasSigner);
+        return hasSigner;
+    }
     static async connect(rpcUrls, chainId) {
         return new AleoProvider(rpcUrls, chainId);
     }
@@ -673178,6 +672899,28 @@ class AleoProvider extends _base_js__WEBPACK_IMPORTED_MODULE_6__/* .AleoBase */
             }
         }
     }
+    // ### QUERY DISPATCH ###
+    async getDispatchNonceForTx(mailboxAddress, txId) {
+        const { programId } = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .fromAleoAddress */ .kz)(mailboxAddress);
+        const blockHash = await this.findBlockHashByTxId(txId);
+        const block = await this.aleoClient.getBlockByHash(blockHash);
+        const blockHeight = Number(block.header.metadata.height);
+        const nonce = await this.queryMappingValue(programId, 'dispatch_event_index', `${blockHeight}u32`);
+        return nonce != null ? nonce : null;
+    }
+    async getDispatchedMessageId(mailboxAddress, nonce) {
+        const { programId } = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .fromAleoAddress */ .kz)(mailboxAddress);
+        const raw = await this.queryMappingString(programId, 'dispatch_id_events', `${nonce}u32`);
+        return (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .u128PairToBytes32 */ .Gb)(raw);
+    }
+    async getDispatchedDestinationDomain(mailboxAddress, nonce) {
+        const { programId } = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .fromAleoAddress */ .kz)(mailboxAddress);
+        const result = await this.queryMappingValue(programId, 'dispatch_events', `${nonce}u32`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .assert */ .v)(result != null, `No dispatch_events entry at nonce ${nonce} (mailbox=${mailboxAddress})`);
+        const domain = result['destination_domain'];
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .assert */ .v)(typeof domain === 'number', `destination_domain is not a number: ${domain}`);
+        return domain;
+    }
     async getQuotes(gasLimit, destinationDomainId, hooks) {
         let total_quote = new bignumber_js__WEBPACK_IMPORTED_MODULE_1__/* .BigNumber */ .g(0);
         const quotes = [];
@@ -673294,13 +673037,16 @@ class AleoProvider extends _base_js__WEBPACK_IMPORTED_MODULE_6__/* .AleoBase */
       required_hook:${mailbox.requiredHook ? (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .fromAleoAddress */ .kz)(mailbox.requiredHook).address : _utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .ALEO_NULL_ADDRESS */ .B$}
     }`;
         const amount = `${req.amount}${tokenType === _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_2__/* .AltVM.TokenType */ .bx.ks.native ? 'u64' : 'u128'}`;
+        const useSignerVariant = await this.hasSignerTransferFunctions(programId);
         if (req.customHookAddress) {
             const metadataBytes = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_3__/* .fillArray */ .R2)([...Buffer.from((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .strip0x */ .LL)(req.customHookMetadata || ''), 'hex')], 64, 0);
             const gasLimit = _provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .U128 */ .xQ.fromBytesLe(Uint8Array.from(metadataBytes.slice(0, 16))).toString();
             const hookMetadata = `{gas_limit:${gasLimit},extra_data:[${metadataBytes.map((b) => `${b}u8`).join(',')}]}`;
             return {
                 programName: programId,
-                functionName: 'transfer_remote_with_hook',
+                functionName: useSignerVariant
+                    ? 'transfer_remote_with_hook_as'
+                    : 'transfer_remote_with_hook',
                 priorityFee: 0,
                 privateFee: false,
                 inputs: [
@@ -673318,7 +673064,9 @@ class AleoProvider extends _base_js__WEBPACK_IMPORTED_MODULE_6__/* .AleoBase */
         }
         return {
             programName: programId,
-            functionName: 'transfer_remote',
+            functionName: useSignerVariant
+                ? 'transfer_remote_as_signer'
+                : 'transfer_remote',
             priorityFee: 0,
             privateFee: false,
             inputs: [
@@ -673346,24 +673094,26 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   C: () => (/* binding */ AleoSigner)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(21387);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(73689);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(14918);
-/* harmony import */ var _utils_helper_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(86255);
-/* harmony import */ var _provider_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(18269);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_helper_js__WEBPACK_IMPORTED_MODULE_0__, _provider_js__WEBPACK_IMPORTED_MODULE_1__]);
-([_utils_helper_js__WEBPACK_IMPORTED_MODULE_0__, _provider_js__WEBPACK_IMPORTED_MODULE_1__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+/* harmony import */ var _hyperlane_xyz_provider_sdk_warp__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(17791);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(73689);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(14918);
+/* harmony import */ var _utils_helper_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(86255);
+/* harmony import */ var _provider_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(18269);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_helper_js__WEBPACK_IMPORTED_MODULE_1__, _provider_js__WEBPACK_IMPORTED_MODULE_2__]);
+([_utils_helper_js__WEBPACK_IMPORTED_MODULE_1__, _provider_js__WEBPACK_IMPORTED_MODULE_2__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
 
 
 
-class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoProvider */ .t {
+class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_2__/* .AleoProvider */ .t {
     static WARP_SUFFIX_ALREADY_DEPLOYED_ERROR = 'already deployed, please choose another suffix';
     programManager;
     static async connectWithSigner(rpcUrls, privateKey, extraParams) {
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .assert */ .v)(extraParams, `extra params not defined`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(extraParams, `extra params not defined`);
         const metadata = extraParams.metadata;
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .assert */ .v)(metadata, `metadata not defined in extra params`);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .assert */ .v)(!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(metadata.chainId), `chainId not defined in metadata extra params`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(metadata, `metadata not defined in extra params`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(metadata.chainId), `chainId not defined in metadata extra params`);
         const chainId = parseInt(metadata.chainId.toString());
         return new AleoSigner(rpcUrls, chainId, privateKey);
     }
@@ -673377,7 +673127,7 @@ class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoProvid
         // Check if it's already deployed
         const isDeployed = await this.isProgramDeployed(ismManagerProgramId);
         if (!isDeployed) {
-            const suffix = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_0__/* .getProgramSuffix */ .GC)(ismManagerProgramId);
+            const suffix = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_1__/* .getProgramSuffix */ .GC)(ismManagerProgramId);
             await this.deployProgram('ism_manager', suffix);
         }
         return ismManagerProgramId;
@@ -673397,16 +673147,19 @@ class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoProvid
             err.message.includes(programId));
     }
     async getWarpTokenSuffix(tokenType, preferredSuffix, maxAttempts = 20) {
+        if (tokenType === _hyperlane_xyz_provider_sdk_warp__WEBPACK_IMPORTED_MODULE_0__/* .TokenType */ .ks.native) {
+            return 'credits';
+        }
         const configuredSuffix = preferredSuffix || this.warpSuffix;
         if (configuredSuffix) {
-            const tokenProgramId = `${this.prefix}_${tokenType}_${configuredSuffix}.aleo`;
+            const tokenProgramId = `${this.prefix}_warp_token_${configuredSuffix}.aleo`;
             const isAlreadyDeployed = await this.isProgramDeployed(tokenProgramId);
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .assert */ .v)(!isAlreadyDeployed, `Warp route with suffix ${configuredSuffix} ${AleoSigner.WARP_SUFFIX_ALREADY_DEPLOYED_ERROR}`);
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(!isAlreadyDeployed, `Warp route with suffix ${configuredSuffix} ${AleoSigner.WARP_SUFFIX_ALREADY_DEPLOYED_ERROR}`);
             return configuredSuffix;
         }
         for (let i = 0; i < maxAttempts; i++) {
-            const suffix = this.generateSuffix(_utils_helper_js__WEBPACK_IMPORTED_MODULE_0__/* .SUFFIX_LENGTH_LONG */ .SO);
-            const tokenProgramId = `${this.prefix}_${tokenType}_${suffix}.aleo`;
+            const suffix = this.generateSuffix(_utils_helper_js__WEBPACK_IMPORTED_MODULE_1__/* .SUFFIX_LENGTH_LONG */ .SO);
+            const tokenProgramId = `${this.prefix}_warp_token_${suffix}.aleo`;
             if (!(await this.isProgramDeployed(tokenProgramId))) {
                 return suffix;
             }
@@ -673414,7 +673167,7 @@ class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoProvid
         throw new Error(`Could not find an unused suffix for ${tokenType} after ${maxAttempts} attempts`);
     }
     async deployProgram(programName, coreSuffix, warpSuffix) {
-        const programs = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_0__/* .loadProgramsInDeployOrder */ .wR)(this.prefix, programName, coreSuffix, warpSuffix);
+        const programs = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_1__/* .loadProgramsInDeployOrder */ .wR)(this.prefix, programName, coreSuffix, warpSuffix);
         for (const { id, program } of programs) {
             if (await this.isProgramDeployed(id)) {
                 continue;
@@ -673455,7 +673208,7 @@ class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoProvid
     async getHookManager(suffix) {
         const programs = await this.deployProgram('hook_manager', suffix);
         const hookManagerProgramId = programs['hook_manager'];
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .assert */ .v)(hookManagerProgramId, `hook_manager program not deployed`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(hookManagerProgramId, `hook_manager program not deployed`);
         return hookManagerProgramId;
     }
     supportsTransactionBatching() {
@@ -673468,7 +673221,7 @@ class AleoSigner extends _provider_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoProvid
         const tx = this.skipProofs
             ? await this.programManager.buildDevnodeExecutionTransaction(transaction)
             : await this.programManager.buildExecutionTransaction(transaction);
-        const txId = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .retryAsync */ .tH)(() => this.programManager.networkClient.submitTransaction(tx), _utils_helper_js__WEBPACK_IMPORTED_MODULE_0__/* .RETRY_ATTEMPTS */ .Km, _utils_helper_js__WEBPACK_IMPORTED_MODULE_0__/* .RETRY_DELAY_MS */ .k);
+        const txId = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .retryAsync */ .tH)(() => this.programManager.networkClient.submitTransaction(tx), _utils_helper_js__WEBPACK_IMPORTED_MODULE_1__/* .RETRY_ATTEMPTS */ .Km, _utils_helper_js__WEBPACK_IMPORTED_MODULE_1__/* .RETRY_DELAY_MS */ .k);
         const receipt = await this.aleoClient.waitForTransactionConfirmation(txId);
         return {
             ...receipt,
@@ -675297,6 +675050,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */   B$: () => (/* binding */ ALEO_NULL_ADDRESS),
 /* harmony export */   ED: () => (/* binding */ getUnusedSuffix),
 /* harmony export */   GC: () => (/* binding */ getProgramSuffix),
+/* harmony export */   Gb: () => (/* binding */ u128PairToBytes32),
 /* harmony export */   Km: () => (/* binding */ RETRY_ATTEMPTS),
 /* harmony export */   M0: () => (/* binding */ formatAddress),
 /* harmony export */   NL: () => (/* binding */ providerWarpTokenTypeFromAleoTokenType),
@@ -675321,10 +675075,12 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */   wR: () => (/* binding */ loadProgramsInDeployOrder),
 /* harmony export */   zg: () => (/* binding */ formatIsmAddress)
 /* harmony export */ });
-/* unused harmony exports MAINNET_PREFIX, TESTNET_PREFIX, getProgramPrefix, isProgramDeployed */
+/* unused harmony exports MAINNET_PREFIX, TESTNET_PREFIX, getProgramPrefix, toKeyId, isProgramDeployed */
 /* harmony import */ var _provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(73565);
 /* harmony import */ var _hyperlane_xyz_provider_sdk_warp__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(17791);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(93142);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(18508);
 /* harmony import */ var _artifacts_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(29026);
 /* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(96602);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__]);
@@ -675383,7 +675139,13 @@ function loadProgramsInDeployOrder(prefix, programName, coreSuffix, warpSuffix)
         programs = programs.map((p) => _provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .Program */ .BP.fromString(p
             .toString()
             .replaceAll(/(mailbox|hook_manager|dispatch_proxy|validator_announce).aleo/g, (_, p1) => (coreSuffix ? `${p1}_${coreSuffix}.aleo` : `${p1}.aleo`))
-            .replaceAll(/(hyp_native|hyp_collateral|hyp_synthetic).aleo/g, (_, p1) => `${p1}_${getCustomWarpSuffixFromEnv() || warpSuffix || coreSuffix}.aleo`)));
+            .replaceAll(/(hyp_native|hyp_collateral|hyp_synthetic).aleo/g, (_, p1) => {
+            if (p1 === 'hyp_native') {
+                return `hyp_warp_token_credits.aleo`;
+            }
+            const effectiveSuffix = getCustomWarpSuffixFromEnv() || warpSuffix || coreSuffix;
+            return `hyp_warp_token_${effectiveSuffix}.aleo`;
+        })));
         if (customIsmSuffix) {
             programs = programs.map((p) => _provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .Program */ .BP.fromString(p
                 .toString()
@@ -675436,7 +675198,18 @@ constructor:
     }
     return programs.map((p) => ({
         id: p.id(),
-        name: Object.keys(_artifacts_js__WEBPACK_IMPORTED_MODULE_2__/* .programRegistry */ .aE).find((r) => p.id().startsWith(`${prefix}_${r.replaceAll('hyp_', '')}`)) || '',
+        name: Object.keys(_artifacts_js__WEBPACK_IMPORTED_MODULE_2__/* .programRegistry */ .aE).find((r) => {
+            if (r === 'hyp_native') {
+                return p.id() === `${prefix}_warp_token_credits.aleo`;
+            }
+            if ((r === 'hyp_collateral' || r === 'hyp_synthetic') &&
+                r === programName &&
+                p.id().startsWith(`${prefix}_warp_token_`) &&
+                p.id() !== `${prefix}_warp_token_credits.aleo`) {
+                return true;
+            }
+            return p.id().startsWith(`${prefix}_${r.replaceAll('hyp_', '')}`);
+        }) || '',
         program: p.toString(),
     }));
 }
@@ -675550,11 +675323,74 @@ function bytes32ToU128String(input) {
     const highBytes = Uint8Array.from(bytes.subarray(16, 32));
     return `[${_provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .U128 */ .xQ.fromBytesLe(lowBytes).toString()},${_provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .U128 */ .xQ.fromBytesLe(highBytes).toString()}]`;
 }
+// Inverse of bytes32ToU128String: parses "[lowU128u128, highU128u128]" from dispatch_id_events
+// and converts back to a 0x-prefixed 32-byte hex string.
+function u128PairToBytes32(u128PairStr) {
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(u128PairStr.startsWith('[') && u128PairStr.endsWith(']'), `u128PairToBytes32: expected "[low,high]" format, got: ${u128PairStr}`);
+    const inner = u128PairStr.slice(1, -1);
+    const parts = inner.split(',').map((s) => s.trim().replace(/u128$/, ''));
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(parts.length === 2, `u128PairToBytes32: expected exactly 2 comma-separated parts, got ${parts.length}: ${inner}`);
+    const low = BigInt(parts[0]);
+    const high = BigInt(parts[1]);
+    const u128Max = 2n ** 128n;
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(low >= 0n && low < u128Max, `u128PairToBytes32: low value out of u128 range: ${low}`);
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(high >= 0n && high < u128Max, `u128PairToBytes32: high value out of u128 range: ${high}`);
+    const bytes = new Uint8Array(32);
+    let tempLow = low;
+    for (let i = 0; i < 16; i++) {
+        bytes[i] = Number(tempLow & 0xffn);
+        tempLow >>= 8n;
+    }
+    let tempHigh = high;
+    for (let i = 0; i < 16; i++) {
+        bytes[16 + i] = Number(tempHigh & 0xffn);
+        tempHigh >>= 8n;
+    }
+    return (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .toHexString */ .U5)(Buffer.from(bytes));
+}
 function getBalanceKey(address, denom) {
     return new _provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .BHP256 */ .I_()
         .hash(_provablehq_sdk_mainnet_js__WEBPACK_IMPORTED_MODULE_0__/* .Plaintext */ .wN.fromString(`{account:${address},token_id:${denom}}`).toBitsLe())
         .toString();
 }
+// Aleo scalar field (BLS12-377 Fr) is 253 bits.
+const ALEO_FIELD_BITS = 253;
+// Encodes an Aleo Identifier to its snarkVM LE bit representation.
+// Identifier stores ASCII bytes packed into a field element: chars → LE bits → zero-padded to 253 bits.
+function identifierToBitsLe(name) {
+    const bits = [];
+    for (let i = 0; i < name.length; i++) {
+        const byte = name.charCodeAt(i);
+        for (let b = 0; b < 8; b++)
+            bits.push(((byte >> b) & 1) === 1);
+    }
+    while (bits.length < ALEO_FIELD_BITS)
+        bits.push(false);
+    return bits;
+}
+// Encodes an Aleo ProgramID (e.g., "mailbox.aleo") as LE bits.
+// ProgramID serializes as: name identifier bits || network identifier bits.
+function programIdToBitsLe(programId) {
+    const dot = programId.lastIndexOf('.');
+    return [
+        ...identifierToBitsLe(programId.slice(0, dot)),
+        ...identifierToBitsLe(programId.slice(dot + 1)),
+    ];
+}
+// Computes the Aleo mapping key_id used in FinalizeJSON.
+// Matches the Rust `to_key_id` in hyperlane-aleo/src/utils.rs:
+//   BHP1024(programId_bits | false | mappingName_bits | false | plaintextKey_bits)
+// key must be a valid Aleo plaintext string, e.g. "0u32".
+function toKeyId(programId, mappingName, key) {
+    const bits = [
+        ...programIdToBitsLe(programId),
+        false,
+        ...identifierToBitsLe(mappingName),
+        false,
+        ...Plaintext.fromString(key).toBitsLe(),
+    ];
+    return new BHP1024().hash(bits).toString();
+}
 /**
  * Convert AleoTokenType to provider-sdk TokenType
  */
@@ -676141,9 +675977,11 @@ class AleoNativeTokenWriter extends AleoNativeTokenReader {
         // Get mailbox suffix for deployment
         const { programId: mailboxProgramId } = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .fromAleoAddress */ .kz)(config.mailbox);
         const mailboxSuffix = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .getProgramSuffix */ .GC)(mailboxProgramId);
-        // Resolve token suffix from preferred setting or generate a collision-free one
+        // Resolve token suffix from preferred setting or generate a collision-free one.
+        // Native tokens always use the fixed 'credits' suffix, so the program may
+        // already be deployed and initialized from a previous warp deploy run.
         const tokenSuffix = await this.signer.getWarpTokenSuffix('native');
-        // Deploy native token program
+        // Deploy native token program (idempotent if already on-chain)
         const programs = await this.signer
             .deployProgram('hyp_native', mailboxSuffix, tokenSuffix)
             .catch((error) => {
@@ -676151,6 +675989,15 @@ class AleoNativeTokenWriter extends AleoNativeTokenReader {
         });
         const tokenProgramId = programs['hyp_native'];
         (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .assert */ .v)(tokenProgramId, 'Expected native token program to be deployed but none was found in deployment mapping');
+        const tokenAddress = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .toAleoAddress */ .j2)(tokenProgramId);
+        // Native tokens use a fixed program name (no random suffix), so only one
+        // native warp token can exist per network. If it's already initialized,
+        // fail early with a clear message instead of letting init fail on-chain.
+        const existingArtifact = await this.read(tokenAddress).catch(() => null);
+        if (existingArtifact) {
+            throw new Error(`Native warp token ${tokenProgramId} is already deployed at ${tokenAddress}. ` +
+                `Native tokens cannot be redeployed. Use \`hyperlane warp apply\` to update the existing deployment.`);
+        }
         // Initialize token
         const initTx = (0,_warp_tx_js__WEBPACK_IMPORTED_MODULE_5__/* .getCreateNativeTokenTx */ .zf)(tokenProgramId);
         const initReceipt = await this.signer
@@ -676159,7 +676006,6 @@ class AleoNativeTokenWriter extends AleoNativeTokenReader {
             throw withErrorContext(`Failed to initialize native warp token program ${tokenProgramId} (signer=${signerAddress})`, error);
         });
         allReceipts.push(initReceipt);
-        const tokenAddress = (0,_utils_helper_js__WEBPACK_IMPORTED_MODULE_2__/* .toAleoAddress */ .j2)(tokenProgramId);
         // Perform post-deployment updates (ISM setup and router enrollment)
         const postDeploymentTxs = (0,_warp_tx_js__WEBPACK_IMPORTED_MODULE_5__/* .getPostDeploymentUpdateTxs */ .UL)(tokenAddress, config);
         for (const tx of postDeploymentTxs) {
@@ -677362,6 +677208,160 @@ async function getOperatorSignature(domain, serviceManager, avsDirectory, operat
 
 /***/ }),
 
+/***/ 46761:
+/***/ ((__webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+
+__nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try {
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   u: () => (/* binding */ runWarpRouteBalances)
+/* harmony export */ });
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(9035);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(4879);
+/* harmony import */ var _logger_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(54321);
+/* harmony import */ var _utils_files_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(17468);
+/* harmony import */ var _utils_warp_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(85361);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_warp_js__WEBPACK_IMPORTED_MODULE_1__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__]);
+([_utils_warp_js__WEBPACK_IMPORTED_MODULE_1__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
+
+
+
+function formatBigIntBalance(raw, decimals) {
+    const str = raw.toString().padStart(decimals + 1, '0');
+    const intPart = str.slice(0, str.length - decimals);
+    const fracFull = str.slice(str.length - decimals);
+    const fracTrimmed = fracFull.replace(/0+$/, '');
+    const intFormatted = new Intl.NumberFormat().format(BigInt(intPart));
+    return fracTrimmed ? `${intFormatted}.${fracTrimmed}` : intFormatted;
+}
+async function runWarpRouteBalances({ context, warpRouteId, chains, out, address, raw, }) {
+    const warpCoreConfig = await (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_1__/* .getWarpCoreConfigOrExit */ .ff)({
+        context,
+        warpRouteId,
+        chains,
+    });
+    const registryAddresses = await context.registry.getAddresses();
+    const mailboxMetadata = {};
+    for (const token of warpCoreConfig.tokens) {
+        const chainAddresses = registryAddresses[token.chainName];
+        if (chainAddresses?.mailbox) {
+            mailboxMetadata[token.chainName] = { mailbox: chainAddresses.mailbox };
+        }
+    }
+    const multiProvider = context.multiProtocolProvider.extendChainMetadata(mailboxMetadata);
+    const warpCore = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__/* .WarpCore */ .u.FromConfig(multiProvider, warpCoreConfig);
+    const collateralizedSet = new Set([
+        ..._hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__/* .TOKEN_COLLATERALIZED_STANDARDS */ .PP,
+        ..._hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__/* .ERC4626_COLLATERAL_STANDARDS */ .eB,
+    ]);
+    const chainsSet = chains && chains.length > 0 ? new Set(chains) : undefined;
+    const filteredTokens = chainsSet
+        ? warpCore.tokens.filter((t) => chainsSet.has(t.chainName))
+        : warpCore.tokens;
+    const tokenEntries = await Promise.all(filteredTokens.map(async (token) => {
+        const isCollateral = collateralizedSet.has(token.standard);
+        try {
+            let balanceRaw;
+            if (address) {
+                const adapter = token.getAdapter(multiProvider);
+                balanceRaw = await adapter.getBalance(address);
+            }
+            else if (isCollateral) {
+                balanceRaw = await warpCore.getTokenCollateral(token);
+            }
+            else {
+                const adapter = token.getAdapter(multiProvider);
+                balanceRaw = await adapter.getTotalSupply();
+            }
+            const balance = balanceRaw !== undefined
+                ? raw
+                    ? balanceRaw.toString()
+                    : formatBigIntBalance(balanceRaw, token.decimals)
+                : 'N/A';
+            return {
+                chain: token.chainName,
+                row: {
+                    Symbol: token.symbol,
+                    Standard: token.standard,
+                    Address: token.addressOrDenom,
+                    Balance: balance,
+                },
+                rawBalance: balanceRaw,
+                isCollateral,
+                decimals: token.decimals,
+            };
+        }
+        catch (e) {
+            (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .warnYellow */ .dE)(`Could not fetch balance for ${token.symbol} on ${token.chainName}: ${e instanceof Error ? e.message : String(e)}`);
+            return {
+                chain: token.chainName,
+                row: {
+                    Symbol: token.symbol,
+                    Standard: token.standard,
+                    Address: token.addressOrDenom,
+                    Balance: 'Error',
+                },
+                rawBalance: undefined,
+                isCollateral,
+                decimals: token.decimals,
+            };
+        }
+    }));
+    const tableData = {};
+    for (const { chain, row } of tokenEntries) {
+        let key = chain;
+        let i = 2;
+        while (key in tableData) {
+            key = `${chain} (${i++})`;
+        }
+        tableData[key] = row;
+    }
+    if (address) {
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .logBlue */ .RK)(`\nWarp route balances for ${address}:`);
+    }
+    else {
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .logBlue */ .RK)('\nWarp route balances:');
+    }
+    (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .logTable */ .Jn)(tableData);
+    if (!address) {
+        const collateralEntries = tokenEntries.filter((e) => e.isCollateral);
+        const syntheticEntries = tokenEntries.filter((e) => !e.isCollateral);
+        if (collateralEntries.length > 0 && syntheticEntries.length > 0) {
+            const hasErrors = tokenEntries.some((e) => e.rawBalance === undefined);
+            if (hasErrors) {
+                (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .warnYellow */ .dE)('\nStatus: INCONCLUSIVE — some balances unavailable, cannot compare collateral vs synthetic supply');
+            }
+            else {
+                const commonDecimals = Math.max(...collateralEntries.map((e) => e.decimals), ...syntheticEntries.map((e) => e.decimals));
+                const scale = (e) => 10n ** BigInt(commonDecimals - e.decimals);
+                const totalCollateral = collateralEntries.reduce((sum, e) => sum + (e.rawBalance ?? 0n) * scale(e), 0n);
+                const totalSynthetic = syntheticEntries.reduce((sum, e) => sum + (e.rawBalance ?? 0n) * scale(e), 0n);
+                const fmt = (v) => raw ? v.toString() : formatBigIntBalance(v, commonDecimals);
+                if (totalCollateral === totalSynthetic) {
+                    (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .logGreen */ .In)(`\nStatus: collateral matches synthetic supply (${fmt(totalCollateral)})`);
+                }
+                else {
+                    const diff = totalCollateral > totalSynthetic
+                        ? totalCollateral - totalSynthetic
+                        : totalSynthetic - totalCollateral;
+                    const sign = totalCollateral > totalSynthetic ? '+' : '-';
+                    (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .warnYellow */ .dE)(`\nStatus: MISMATCH — collateral ${fmt(totalCollateral)} vs synthetic ${fmt(totalSynthetic)} (diff: ${sign}${fmt(diff)})`);
+                }
+            }
+        }
+    }
+    if (out) {
+        const jsonData = tokenEntries.map(({ chain, row }) => ({ chain, ...row }));
+        (0,_utils_files_js__WEBPACK_IMPORTED_MODULE_0__/* .writeYamlOrJson */ .o9)(out, jsonData);
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_4__/* .logGreen */ .In)(`\nBalances written to ${out}`);
+    }
+}
+//# sourceMappingURL=warp.js.map
+__webpack_async_result__();
+} catch(e) { __webpack_async_result__(e); } });
+
+/***/ }),
+
 /***/ 53994:
 /***/ ((__webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
@@ -679474,29 +679474,31 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(39023);
 /* harmony import */ var yaml__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(10684);
 /* harmony import */ var _hyperlane_xyz_rebalancer__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(97772);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_21__ = __nccwpck_require__(47265);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_23__ = __nccwpck_require__(17023);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(21387);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__ = __nccwpck_require__(52193);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__ = __nccwpck_require__(16639);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_22__ = __nccwpck_require__(94523);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_22__ = __nccwpck_require__(47265);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_24__ = __nccwpck_require__(17023);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_19__ = __nccwpck_require__(52193);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_21__ = __nccwpck_require__(16639);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_23__ = __nccwpck_require__(94523);
 /* harmony import */ var _check_warp_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(53994);
 /* harmony import */ var _config_warp_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(10392);
 /* harmony import */ var _deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(41687);
-/* harmony import */ var _fees_warp_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(89717);
-/* harmony import */ var _fork_fork_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(51908);
-/* harmony import */ var _logger_js__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(54321);
-/* harmony import */ var _read_warp_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(59794);
-/* harmony import */ var _send_transfer_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(67793);
-/* harmony import */ var _submitters_types_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(17555);
-/* harmony import */ var _utils_files_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(17468);
-/* harmony import */ var _utils_warp_send_js__WEBPACK_IMPORTED_MODULE_19__ = __nccwpck_require__(96192);
-/* harmony import */ var _utils_warp_js__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(85361);
-/* harmony import */ var _verify_warp_js__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(56661);
-/* harmony import */ var _options_js__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(89438);
-/* harmony import */ var _send_js__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(56148);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_hyperlane_xyz_rebalancer__WEBPACK_IMPORTED_MODULE_2__, _check_warp_js__WEBPACK_IMPORTED_MODULE_3__, _config_warp_js__WEBPACK_IMPORTED_MODULE_4__, _deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__, _fees_warp_js__WEBPACK_IMPORTED_MODULE_6__, _fork_fork_js__WEBPACK_IMPORTED_MODULE_7__, _read_warp_js__WEBPACK_IMPORTED_MODULE_8__, _send_transfer_js__WEBPACK_IMPORTED_MODULE_9__, _submitters_types_js__WEBPACK_IMPORTED_MODULE_10__, _utils_warp_js__WEBPACK_IMPORTED_MODULE_12__, _verify_warp_js__WEBPACK_IMPORTED_MODULE_13__, _options_js__WEBPACK_IMPORTED_MODULE_14__, _send_js__WEBPACK_IMPORTED_MODULE_15__]);
-([_hyperlane_xyz_rebalancer__WEBPACK_IMPORTED_MODULE_2__, _check_warp_js__WEBPACK_IMPORTED_MODULE_3__, _config_warp_js__WEBPACK_IMPORTED_MODULE_4__, _deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__, _fees_warp_js__WEBPACK_IMPORTED_MODULE_6__, _fork_fork_js__WEBPACK_IMPORTED_MODULE_7__, _read_warp_js__WEBPACK_IMPORTED_MODULE_8__, _send_transfer_js__WEBPACK_IMPORTED_MODULE_9__, _submitters_types_js__WEBPACK_IMPORTED_MODULE_10__, _utils_warp_js__WEBPACK_IMPORTED_MODULE_12__, _verify_warp_js__WEBPACK_IMPORTED_MODULE_13__, _options_js__WEBPACK_IMPORTED_MODULE_14__, _send_js__WEBPACK_IMPORTED_MODULE_15__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+/* harmony import */ var _balances_warp_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(46761);
+/* harmony import */ var _fees_warp_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(89717);
+/* harmony import */ var _fork_fork_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(51908);
+/* harmony import */ var _logger_js__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(54321);
+/* harmony import */ var _read_warp_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(59794);
+/* harmony import */ var _send_transfer_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(67793);
+/* harmony import */ var _submitters_types_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(17555);
+/* harmony import */ var _utils_files_js__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(17468);
+/* harmony import */ var _utils_warp_send_js__WEBPACK_IMPORTED_MODULE_20__ = __nccwpck_require__(96192);
+/* harmony import */ var _utils_warp_js__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(85361);
+/* harmony import */ var _verify_warp_js__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(56661);
+/* harmony import */ var _options_js__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(89438);
+/* harmony import */ var _send_js__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(56148);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_hyperlane_xyz_rebalancer__WEBPACK_IMPORTED_MODULE_2__, _check_warp_js__WEBPACK_IMPORTED_MODULE_3__, _config_warp_js__WEBPACK_IMPORTED_MODULE_4__, _deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__, _balances_warp_js__WEBPACK_IMPORTED_MODULE_6__, _fees_warp_js__WEBPACK_IMPORTED_MODULE_7__, _fork_fork_js__WEBPACK_IMPORTED_MODULE_8__, _read_warp_js__WEBPACK_IMPORTED_MODULE_9__, _send_transfer_js__WEBPACK_IMPORTED_MODULE_10__, _submitters_types_js__WEBPACK_IMPORTED_MODULE_11__, _utils_warp_js__WEBPACK_IMPORTED_MODULE_13__, _verify_warp_js__WEBPACK_IMPORTED_MODULE_14__, _options_js__WEBPACK_IMPORTED_MODULE_15__, _send_js__WEBPACK_IMPORTED_MODULE_16__]);
+([_hyperlane_xyz_rebalancer__WEBPACK_IMPORTED_MODULE_2__, _check_warp_js__WEBPACK_IMPORTED_MODULE_3__, _config_warp_js__WEBPACK_IMPORTED_MODULE_4__, _deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__, _balances_warp_js__WEBPACK_IMPORTED_MODULE_6__, _fees_warp_js__WEBPACK_IMPORTED_MODULE_7__, _fork_fork_js__WEBPACK_IMPORTED_MODULE_8__, _read_warp_js__WEBPACK_IMPORTED_MODULE_9__, _send_transfer_js__WEBPACK_IMPORTED_MODULE_10__, _submitters_types_js__WEBPACK_IMPORTED_MODULE_11__, _utils_warp_js__WEBPACK_IMPORTED_MODULE_13__, _verify_warp_js__WEBPACK_IMPORTED_MODULE_14__, _options_js__WEBPACK_IMPORTED_MODULE_15__, _send_js__WEBPACK_IMPORTED_MODULE_16__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
 
 
 
@@ -679525,6 +679527,7 @@ const warpCommand = {
     describe: 'Manage Hyperlane warp routes',
     builder: (yargs) => yargs
         .command(apply)
+        .command(balances)
         .command(check)
         .command(combine)
         .command(deploy)
@@ -679537,10 +679540,10 @@ const warpCommand = {
         .command(verify)
         .version(false)
         .demandCommand(),
-    handler: () => (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .log */ .Rm)('Command required'),
+    handler: () => (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .log */ .Rm)('Command required'),
 };
 const WARP_ROUTE_OPTIONS = {
-    'warp-route-id': _options_js__WEBPACK_IMPORTED_MODULE_14__/* .warpRouteIdCommandOption */ .N$,
+    'warp-route-id': _options_js__WEBPACK_IMPORTED_MODULE_15__/* .warpRouteIdCommandOption */ .N$,
 };
 async function getWarpConfigsFromContextOrRegistry({ context, warpRouteId, }) {
     if (context.warpCoreConfig && context.warpDeployConfig) {
@@ -679552,7 +679555,7 @@ async function getWarpConfigsFromContextOrRegistry({ context, warpRouteId, }) {
     }
     // If cache is partial, refresh both configs together to avoid mixing stale+fresh routes.
     const requestedWarpRouteId = context.resolvedWarpRouteId ?? warpRouteId;
-    const fetchedConfigs = await (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_12__/* .getWarpConfigs */ .Yb)({
+    const fetchedConfigs = await (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_13__/* .getWarpConfigs */ .Yb)({
         context,
         warpRouteId: requestedWarpRouteId,
     });
@@ -679567,17 +679570,47 @@ async function getWarpConfigsFromContextOrRegistry({ context, warpRouteId, }) {
         resolvedWarpRouteId,
     };
 }
+const balances = {
+    command: 'balances',
+    describe: 'Display token balances for each leg of a warp route',
+    builder: {
+        ...WARP_ROUTE_OPTIONS,
+        chains: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .stringArrayOptionConfig */ .om)({
+            description: 'Filter to specific chains',
+            demandOption: false,
+        }),
+        out: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .outputFileCommandOption */ .Ym)(undefined, false, 'Output file path (JSON or YAML)'),
+        address: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .addressCommandOption */ .Fs)("User address to check balances for. When provided, shows the user's token balance on each chain instead of collateral/supply."),
+        raw: {
+            type: 'boolean',
+            description: 'Show balances in base units (without decimal formatting)',
+            default: false,
+        },
+    },
+    handler: async ({ context, warpRouteId, chains, out, address, raw }) => {
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Balances');
+        await (0,_balances_warp_js__WEBPACK_IMPORTED_MODULE_6__/* .runWarpRouteBalances */ .u)({
+            context,
+            warpRouteId,
+            chains,
+            out,
+            address,
+            raw,
+        });
+        process.exit(0);
+    },
+};
 const apply = {
     command: 'apply',
     describe: 'Update Warp Route contracts',
     builder: {
         ...WARP_ROUTE_OPTIONS,
-        strategy: { ..._options_js__WEBPACK_IMPORTED_MODULE_14__/* .strategyCommandOption */ .sB, demandOption: false },
+        strategy: { ..._options_js__WEBPACK_IMPORTED_MODULE_15__/* .strategyCommandOption */ .sB, demandOption: false },
         'receipts-dir': {
             type: 'string',
             description: 'The directory to output transaction receipts.',
             default: './generated/transactions',
-            coerce: (dir) => (0,_utils_files_js__WEBPACK_IMPORTED_MODULE_11__/* .removeTrailingSlash */ .UC)(dir),
+            coerce: (dir) => (0,_utils_files_js__WEBPACK_IMPORTED_MODULE_12__/* .removeTrailingSlash */ .UC)(dir),
         },
         relay: {
             type: 'boolean',
@@ -679586,9 +679619,9 @@ const apply = {
         },
     },
     handler: async ({ context, strategy: strategyUrl, receiptsDir, relay, warpRouteId, }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Apply');
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Apply');
         if (strategyUrl)
-            _submitters_types_js__WEBPACK_IMPORTED_MODULE_10__/* .ExtendedChainSubmissionStrategySchema */ .VH.parse((0,_utils_files_js__WEBPACK_IMPORTED_MODULE_11__/* .readYamlOrJson */ .xQ)(strategyUrl));
+            _submitters_types_js__WEBPACK_IMPORTED_MODULE_11__/* .ExtendedChainSubmissionStrategySchema */ .VH.parse((0,_utils_files_js__WEBPACK_IMPORTED_MODULE_12__/* .readYamlOrJson */ .xQ)(strategyUrl));
         await (0,_deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__/* .runWarpRouteApply */ .RT)({
             context,
             warpDeployConfig: context.warpDeployConfig,
@@ -679606,7 +679639,7 @@ const deploy = {
     describe: 'Deploy Warp Route contracts',
     builder: WARP_ROUTE_OPTIONS,
     handler: async ({ context, warpRouteId }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)(`Hyperlane Warp Route Deployment`);
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)(`Hyperlane Warp Route Deployment`);
         await (0,_deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__/* .runWarpRouteDeploy */ .e9)({
             context,
             warpDeployConfig: context.warpDeployConfig,
@@ -679631,13 +679664,13 @@ const combine = {
         },
     },
     handler: async ({ context, routes, 'output-warp-route-id': outputId }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Combine');
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Combine');
         const routeIds = routes
             .split(',')
             .map((r) => r.trim())
             .filter((r) => r.length > 0);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(routeIds.length >= 2, 'At least 2 route IDs are required to combine');
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(outputId.trim().length > 0, 'Output warp route ID must be non-empty');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(routeIds.length >= 2, 'At least 2 route IDs are required to combine');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(outputId.trim().length > 0, 'Output warp route ID must be non-empty');
         await (0,_deploy_warp_js__WEBPACK_IMPORTED_MODULE_5__/* .runWarpRouteCombine */ .Iw)({
             context,
             routeIds,
@@ -679655,10 +679688,10 @@ const init = {
             describe: 'Create an advanced ISM',
             default: false,
         },
-        out: (0,_options_js__WEBPACK_IMPORTED_MODULE_14__/* .outputFileCommandOption */ .Ym)(),
+        out: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .outputFileCommandOption */ .Ym)(),
     },
     handler: async ({ context, advanced, out }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Configure');
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Configure');
         await (0,_config_warp_js__WEBPACK_IMPORTED_MODULE_4__/* .createWarpRouteDeployConfig */ .ft)({
             context,
             outPath: out,
@@ -679673,28 +679706,28 @@ const read = {
     builder: {
         ...WARP_ROUTE_OPTIONS,
         chain: {
-            ..._options_js__WEBPACK_IMPORTED_MODULE_14__/* .chainCommandOption */ .mF,
+            ..._options_js__WEBPACK_IMPORTED_MODULE_15__/* .chainCommandOption */ .mF,
             demandOption: false,
         },
-        address: (0,_options_js__WEBPACK_IMPORTED_MODULE_14__/* .addressCommandOption */ .Fs)('Address of the router contract to read.', false),
-        out: (0,_options_js__WEBPACK_IMPORTED_MODULE_14__/* .outputFileCommandOption */ .Ym)(),
+        address: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .addressCommandOption */ .Fs)('Address of the router contract to read.', false),
+        out: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .outputFileCommandOption */ .Ym)(),
     },
     handler: async ({ context, chain, address, warpRouteId, out }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Reader');
-        const config = await (0,_read_warp_js__WEBPACK_IMPORTED_MODULE_8__/* .runWarpRouteRead */ .bb)({
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Reader');
+        const config = await (0,_read_warp_js__WEBPACK_IMPORTED_MODULE_9__/* .runWarpRouteRead */ .bb)({
             context,
             chain,
             address,
             warpRouteId,
         });
         if (out) {
-            (0,_utils_files_js__WEBPACK_IMPORTED_MODULE_11__/* .writeYamlOrJson */ .o9)(out, config, 'yaml');
-            (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logGreen */ .In)(`✅ Warp route config written successfully to ${out}:\n`);
+            (0,_utils_files_js__WEBPACK_IMPORTED_MODULE_12__/* .writeYamlOrJson */ .o9)(out, config, 'yaml');
+            (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logGreen */ .In)(`✅ Warp route config written successfully to ${out}:\n`);
         }
         else {
-            (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logGreen */ .In)(`✅ Warp route config read successfully:\n`);
+            (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logGreen */ .In)(`✅ Warp route config read successfully:\n`);
         }
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .log */ .Rm)((0,_utils_files_js__WEBPACK_IMPORTED_MODULE_11__/* .indentYamlOrJson */ .R7)((0,yaml__WEBPACK_IMPORTED_MODULE_1__/* .stringify */ .As)(config, null, 2), 4));
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .log */ .Rm)((0,_utils_files_js__WEBPACK_IMPORTED_MODULE_12__/* .indentYamlOrJson */ .R7)((0,yaml__WEBPACK_IMPORTED_MODULE_1__/* .stringify */ .As)(config, null, 2), 4));
         process.exit(0);
     },
 };
@@ -679710,8 +679743,8 @@ const getFees = {
         },
     },
     handler: async ({ context, warpRouteId, amount }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Route Fees');
-        await (0,_fees_warp_js__WEBPACK_IMPORTED_MODULE_6__/* .runWarpRouteFees */ .A)({
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Route Fees');
+        await (0,_fees_warp_js__WEBPACK_IMPORTED_MODULE_7__/* .runWarpRouteFees */ .A)({
             context,
             warpRouteId,
             amount: amount,
@@ -679723,7 +679756,7 @@ const send = {
     command: 'send',
     describe: 'Send a test token transfer on a warp route',
     builder: {
-        ..._send_js__WEBPACK_IMPORTED_MODULE_15__/* .messageSendOptions */ .eC,
+        ..._send_js__WEBPACK_IMPORTED_MODULE_16__/* .messageSendOptions */ .eC,
         ...WARP_ROUTE_OPTIONS,
         amount: {
             type: 'string',
@@ -679734,7 +679767,7 @@ const send = {
             type: 'string',
             description: 'Token recipient address. Required for non-EVM destinations. Defaults to destination signer for EVM destinations.',
         },
-        chains: (0,_options_js__WEBPACK_IMPORTED_MODULE_14__/* .stringArrayOptionConfig */ .om)({
+        chains: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .stringArrayOptionConfig */ .om)({
             description: 'List of chains to send messages to',
             demandOption: false,
             conflicts: ['origin', 'destination'],
@@ -679784,7 +679817,7 @@ const send = {
             .filter((v) => Boolean(v))
             .filter((v, i, a) => a.indexOf(v) === i);
         const warpCoreConfig = context.warpCoreConfig ??
-            (await (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_12__/* .getWarpCoreConfigOrExit */ .ff)({
+            (await (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_13__/* .getWarpCoreConfigOrExit */ .ff)({
                 warpRouteId,
                 context,
                 chains: filterChains.length > 0 ? filterChains : undefined,
@@ -679796,8 +679829,8 @@ const send = {
         }
         const supportedChains = new Set(warpCoreConfig.tokens.map((t) => t.chainName));
         // Check if any of the chain selection through --chains or --origin & --destination are not in the warp core
-        const unsupportedChains = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .difference */ .iv)(new Set([...(chainsArg || []), origin, destination].filter(Boolean)), supportedChains);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(unsupportedChains.size === 0, `Chain(s) ${[...unsupportedChains].join(', ')} are not part of the warp route.`);
+        const unsupportedChains = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_19__/* .difference */ .iv)(new Set([...(chainsArg || []), origin, destination].filter(Boolean)), supportedChains);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(unsupportedChains.size === 0, `Chain(s) ${[...unsupportedChains].join(', ')} are not part of the warp route.`);
         // When origin & destination are explicitly provided, preserve duplicates
         // for same-chain transfers (e.g., origin=anvil2, destination=anvil2).
         // Only deduplicate when using --chains or auto-selecting from config.
@@ -679805,24 +679838,24 @@ const send = {
             chains = [origin, destination];
         }
         else {
-            const orderedDefaultChains = (0,_utils_warp_send_js__WEBPACK_IMPORTED_MODULE_19__/* .getOrderedWarpSendChains */ .M)(supportedChains, context.multiProvider);
+            const orderedDefaultChains = (0,_utils_warp_send_js__WEBPACK_IMPORTED_MODULE_20__/* .getOrderedWarpSendChains */ .M)(supportedChains, context.multiProvider);
             chains =
                 chains.length === 0
                     ? orderedDefaultChains
-                    : [...(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .intersection */ .E$)(new Set(chains), supportedChains)];
+                    : [...(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_19__/* .intersection */ .E$)(new Set(chains), supportedChains)];
         }
         if (roundTrip) {
             // Round-trip requires all chains to be EVM-like since non-EVM chains
             // become intermediate origins in the reversed path.
-            const nonEvmChains = chains.filter((chain) => !(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__/* .isEVMLike */ .Us)(context.multiProvider.getProtocol(chain)));
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(nonEvmChains.length === 0, `--round-trip is not supported with non-EVM chains (${nonEvmChains.join(', ')}). ` +
+            const nonEvmChains = chains.filter((chain) => !(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_21__/* .isEVMLike */ .Us)(context.multiProvider.getProtocol(chain)));
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(nonEvmChains.length === 0, `--round-trip is not supported with non-EVM chains (${nonEvmChains.join(', ')}). ` +
                 `Non-EVM chains cannot be intermediate hop origins.`);
             // Appends the reverse of the array, excluding the 1st (e.g. [1,2,3] becomes [1,2,3,2,1])
             const reversed = [...chains].reverse().slice(1, chains.length + 1);
             chains = [...chains, ...reversed];
         }
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logBlue */ .RK)(`🚀 Sending a message for chains: ${chains.join(' ➡️ ')}`);
-        await (0,_send_transfer_js__WEBPACK_IMPORTED_MODULE_9__/* .sendTestTransfer */ .P)({
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logBlue */ .RK)(`🚀 Sending a message for chains: ${chains.join(' ➡️ ')}`);
+        await (0,_send_transfer_js__WEBPACK_IMPORTED_MODULE_10__/* .sendTestTransfer */ .P)({
             context,
             warpCoreConfig,
             chains,
@@ -679840,7 +679873,7 @@ const send = {
             feeQuotingUrl,
             feeQuotingApiKey,
         });
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logGreen */ .In)(`✅ Successfully sent messages for chains: ${chains.join(' ➡️ ')}`);
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logGreen */ .In)(`✅ Successfully sent messages for chains: ${chains.join(' ➡️ ')}`);
         process.exit(0);
     },
 };
@@ -679864,18 +679897,18 @@ const check = {
             description: 'Override the origin owner address instead of reading from warp deploy config.',
             implies: 'origin',
         },
-        chains: (0,_options_js__WEBPACK_IMPORTED_MODULE_14__/* .stringArrayOptionConfig */ .om)({
+        chains: (0,_options_js__WEBPACK_IMPORTED_MODULE_15__/* .stringArrayOptionConfig */ .om)({
             description: 'List of chains to check. Defaults to all chains except origin when using --ica.',
             implies: 'ica',
         }),
     },
     handler: async ({ context, warpRouteId, ica, origin, originOwner, chains, }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Check');
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Check');
         // CROSS route case: resolver set warpCoreConfig but not warpDeployConfig
         // (combined CROSS routes have no deploy config of their own)
         if (context.warpCoreConfig && !context.warpDeployConfig) {
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(!ica, 'Cannot perform ICA owner check for combined CROSS routes (no deploy config)');
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(context.resolvedWarpRouteId, 'resolvedWarpRouteId must be set for CROSS routes');
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(!ica, 'Cannot perform ICA owner check for combined CROSS routes (no deploy config)');
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(context.resolvedWarpRouteId, 'resolvedWarpRouteId must be set for CROSS routes');
             const result = await (0,_check_warp_js__WEBPACK_IMPORTED_MODULE_3__/* .checkCrossCollateralWarpRoute */ .l$)({
                 context,
                 warpCoreConfig: context.warpCoreConfig,
@@ -679891,7 +679924,7 @@ const check = {
         // If --ica flag is set, run ICA owner check instead of the regular config check
         // Note: ICA check uses full warpDeployConfig (not filtered) to support pre-deployed chains
         if (ica) {
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_17__/* .assert */ .v)(origin, '--origin is required when using --ica');
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__/* .assert */ .v)(origin, '--origin is required when using --ica');
             await (0,_check_warp_js__WEBPACK_IMPORTED_MODULE_3__/* .runWarpIcaOwnerCheck */ .WN)({
                 context,
                 warpDeployConfig,
@@ -679901,8 +679934,8 @@ const check = {
             });
             process.exit(0);
         }
-        ({ warpCoreConfig, warpDeployConfig } = (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_12__/* .filterWarpConfigsToMatchingChains */ .mg)(warpDeployConfig, warpCoreConfig));
-        const result = await (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_21__/* .checkWarpRouteDeployConfig */ .TU)({
+        ({ warpCoreConfig, warpDeployConfig } = (0,_utils_warp_js__WEBPACK_IMPORTED_MODULE_13__/* .filterWarpConfigsToMatchingChains */ .mg)(warpDeployConfig, warpCoreConfig));
+        const result = await (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_22__/* .checkWarpRouteDeployConfig */ .TU)({
             multiProvider: context.multiProvider,
             warpCoreConfig,
             warpDeployConfig,
@@ -679968,7 +680001,7 @@ const rebalancer = {
     },
     handler: async (args) => {
         const { context, config: configPath, checkFrequency, withMetrics, monitorOnly, manual, origin, destination, amount, } = args;
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Route Rebalancer');
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Route Rebalancer');
         try {
             // Load rebalancer configuration
             const rebalancerConfig = _hyperlane_xyz_rebalancer__WEBPACK_IMPORTED_MODULE_2__/* .RebalancerConfig */ .Wo.load(configPath);
@@ -679981,12 +680014,12 @@ const rebalancer = {
                 withMetrics,
                 monitorOnly,
                 coingeckoApiKey: process.env.COINGECKO_API_KEY,
-                logger: _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_22__/* .rootLogger */ .Jk.child({ module: 'rebalancer' }),
+                logger: _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_23__/* .rootLogger */ .Jk.child({ module: 'rebalancer' }),
             });
             // Execute based on mode
             if (manual) {
                 if (!origin || !destination || !amount) {
-                    (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .errorRed */ .aq)('Origin, destination, and amount are required for manual rebalance');
+                    (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .errorRed */ .aq)('Origin, destination, and amount are required for manual rebalance');
                     process.exit(1);
                 }
                 await service.executeManual({
@@ -679994,7 +680027,7 @@ const rebalancer = {
                     destination,
                     amount,
                 });
-                (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logGreen */ .In)('✅ Manual rebalance completed successfully');
+                (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logGreen */ .In)('✅ Manual rebalance completed successfully');
             }
             else {
                 // Start daemon mode
@@ -680002,7 +680035,7 @@ const rebalancer = {
             }
         }
         catch (e) {
-            (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .errorRed */ .aq)(`Rebalancer error: ${util__WEBPACK_IMPORTED_MODULE_0__.format(e)}`);
+            (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .errorRed */ .aq)(`Rebalancer error: ${util__WEBPACK_IMPORTED_MODULE_0__.format(e)}`);
             process.exit(1);
         }
     },
@@ -680012,25 +680045,25 @@ const verify = {
     describe: 'Verify deployed contracts on explorers',
     builder: WARP_ROUTE_OPTIONS,
     handler: async ({ context, warpRouteId }) => {
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logCommandHeader */ .dp)('Hyperlane Warp Verify');
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logCommandHeader */ .dp)('Hyperlane Warp Verify');
         const { warpCoreConfig } = await getWarpConfigsFromContextOrRegistry({
             context,
             warpRouteId,
         });
-        return (0,_verify_warp_js__WEBPACK_IMPORTED_MODULE_13__/* .runVerifyWarpRoute */ .c)({ context, warpCoreConfig });
+        return (0,_verify_warp_js__WEBPACK_IMPORTED_MODULE_14__/* .runVerifyWarpRoute */ .c)({ context, warpCoreConfig });
     },
 };
 const fork = {
     command: 'fork',
     describe: 'Fork a Hyperlane chain on a compatible Anvil/Hardhat node',
     builder: {
-        ..._options_js__WEBPACK_IMPORTED_MODULE_14__/* .forkCommandOptions */ .im,
+        ..._options_js__WEBPACK_IMPORTED_MODULE_15__/* .forkCommandOptions */ .im,
         ...WARP_ROUTE_OPTIONS,
     },
     handler: async ({ context, warpRouteId, port, kill, forkConfig: forkConfigPath, }) => {
         let forkConfig;
         if (forkConfigPath) {
-            forkConfig = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_23__/* .RawForkedChainConfigByChainSchema */ .uE.parse((0,_utils_files_js__WEBPACK_IMPORTED_MODULE_11__/* .readYamlOrJson */ .xQ)(forkConfigPath));
+            forkConfig = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_24__/* .RawForkedChainConfigByChainSchema */ .uE.parse((0,_utils_files_js__WEBPACK_IMPORTED_MODULE_12__/* .readYamlOrJson */ .xQ)(forkConfigPath));
         }
         else {
             forkConfig = {};
@@ -680040,8 +680073,8 @@ const fork = {
             warpRouteId,
         });
         const chainsToFork = new Set(Object.keys(warpDeployConfig));
-        (0,_logger_js__WEBPACK_IMPORTED_MODULE_16__/* .logBlue */ .RK)(`Forking chains from warp deploy config: ${Array.from(chainsToFork).join(', ')}`);
-        await (0,_fork_fork_js__WEBPACK_IMPORTED_MODULE_7__/* .runForkCommand */ .x)({
+        (0,_logger_js__WEBPACK_IMPORTED_MODULE_17__/* .logBlue */ .RK)(`Forking chains from warp deploy config: ${Array.from(chainsToFork).join(', ')}`);
+        await (0,_fork_fork_js__WEBPACK_IMPORTED_MODULE_8__/* .runForkCommand */ .x)({
             context,
             chainsToFork,
             forkConfig,
@@ -685581,6 +685614,7 @@ const SUPPORTED_PROTOCOLS = new Set([
     _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .ProtocolType */ .Hb.CosmosNative,
     _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .ProtocolType */ .Hb.Starknet,
     _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .ProtocolType */ .Hb.Radix,
+    _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .ProtocolType */ .Hb.Aleo,
 ]);
 const EXPLORER_GRAPHQL_URL = process.env.HYPERLANE_EXPLORER_GRAPHQL_URL ??
     process.env.EXPLORER_GRAPHQL_URL ??
@@ -685973,7 +686007,7 @@ async function executeDelivery({ context, origin, destination, warpCoreConfig, a
     if (!transferReceipt) {
         throw new Error('No transfer transaction receipt found');
     }
-    const extracted = core.extractMessageIds(origin, transferReceipt);
+    const extracted = await core.extractMessageIds(origin, transferReceipt);
     const messageId = extracted[0]?.messageId;
     if (!messageId) {
         // Same-chain transfers don't dispatch an interchain message.
@@ -694193,7 +694227,7 @@ __webpack_async_result__();
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   x: () => (/* binding */ VERSION)
 /* harmony export */ });
-const VERSION = '34.0.0';
+const VERSION = '35.0.0';
 //# sourceMappingURL=version.js.map
 
 /***/ }),
@@ -745467,6 +745501,10 @@ const DEFAULT_BLOCKPI_VALIDATOR = {
     address: '0x6d113ae51bfea7b63a8828f97e9dce393b25c189',
     alias: 'BlockPI',
 };
+const DEFAULT_POPS_VALIDATOR = {
+    address: '0xa6c998f0db2b56d7a63faf30a9b677c8b9b6faab',
+    alias: 'P-OPS Team',
+};
 // TODO: consider migrating these to the registry too
 const defaultMultisigConfigs = {
     abstract: {
@@ -745850,21 +745888,14 @@ const defaultMultisigConfigs = {
         ],
     },
     celestia: {
-        threshold: 4,
+        threshold: 3,
         validators: [
             {
                 address: '0x6dbc192c06907784fb0af0c0c2d8809ea50ba675',
                 alias: AW_VALIDATOR_ALIAS,
             },
             DEFAULT_ZKV_VALIDATOR,
-            {
-                address: '0x885a8c1ef7f7eea8955c8f116fc1fbe1113c4a78',
-                alias: 'P2P.ORG',
-            },
-            {
-                address: '0xa6c998f0db2b56d7a63faf30a9b677c8b9b6faab',
-                alias: 'P-OPS Team',
-            },
+            DEFAULT_POPS_VALIDATOR,
             {
                 address: '0x21e93a81920b73c0e98aed8e6b058dae409e4909',
                 alias: 'Binary Builders',
@@ -746046,12 +746077,25 @@ const defaultMultisigConfigs = {
         ],
     },
     eden: {
-        threshold: 1,
+        threshold: 3,
         validators: [
             {
                 address: '0x1c61e6379443e2842d3e9db28e962b6c717fdab1',
                 alias: AW_VALIDATOR_ALIAS,
             },
+            DEFAULT_POPS_VALIDATOR,
+            {
+                address: '0xE95a08Ef009be3Fbc7FDfa4739AB2428910C285f',
+                alias: 'Substance Labs',
+            },
+            {
+                address: '0x359042Ade900d465e96C9c7A9BF975b061c1e8f7',
+                alias: 'Cosmostation',
+            },
+            {
+                address: '0xa3f19CDFa6B684b44da3cF1e2D19d5Cb916cA0EF',
+                alias: 'Qubelabs',
+            },
         ],
     },
     electroneum: {
@@ -746582,7 +746626,7 @@ const defaultMultisigConfigs = {
         ],
     },
     mantapacific: {
-        threshold: 4,
+        threshold: 3,
         validators: [
             {
                 address: '0x8e668c97ad76d0e28375275c41ece4972ab8a5bc',
@@ -746592,7 +746636,6 @@ const defaultMultisigConfigs = {
                 address: '0x521a3e6bf8d24809fde1c1fd3494a859a16f132c',
                 alias: 'Cosmostation',
             },
-            { address: '0x14025fe092f5f8a401dd9819704d9072196d2125', alias: 'P2P' },
             {
                 address: '0x25b9a0961c51e74fd83295293bc029131bf1e05a',
                 alias: 'Neutron',
@@ -746851,8 +746894,17 @@ const defaultMultisigConfigs = {
             DEFAULT_MITOSIS_VALIDATOR,
         ],
     },
+    nesa: {
+        threshold: 1,
+        validators: [
+            {
+                address: '0x990f548e766b830f69642d36cdd47fb20a2aa405',
+                alias: AW_VALIDATOR_ALIAS,
+            },
+        ],
+    },
     neutron: {
-        threshold: 4,
+        threshold: 3,
         validators: [
             {
                 address: '0xa9b8c1f4998f781f958c63cfcd1708d02f004ff0',
@@ -746862,7 +746914,6 @@ const defaultMultisigConfigs = {
                 address: '0xb65438a014fb05fbadcfe35bc6e25d372b6ba460',
                 alias: 'Cosmostation',
             },
-            { address: '0x42fa752defe92459370a052b6387a87f7de9b80c', alias: 'P2P' },
             {
                 address: '0xc79503a3e3011535a9c60f6d21f76f59823a38bd',
                 alias: 'Neutron',
@@ -747826,7 +747877,7 @@ const SEALEVEL_PRIORITY_FEES = {
 /* harmony export */   g: () => (/* binding */ multiProtocolTestChainMetadata),
 /* harmony export */   hR: () => (/* binding */ testChainMetadata)
 /* harmony export */ });
-/* unused harmony exports TestChainName, test1, test2, test3, test4, testXERC20, testVSXERC20, testXERC20Lockbox, testScale1, testScale2, testCollateralFiat, testCosmosChain, testSealevelChain, testStarknetChain, KNOWN_ETHEREUM_TIMELOCK_CONTRACT, ethereumTestChain, multiProtocolTestChains */
+/* unused harmony exports TestChainName, test1, test2, test3, test4, testXERC20, testVSXERC20, testXERC20Lockbox, testOwnerCollateral, testRebaseCollateral, testScale1, testScale2, testCollateralFiat, testCosmosChain, testSealevelChain, testStarknetChain, KNOWN_ETHEREUM_TIMELOCK_CONTRACT, ethereumTestChain, multiProtocolTestChains */
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(16639);
 /* harmony import */ var _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(1430);
 
@@ -747915,6 +747966,20 @@ const testXERC20Lockbox = {
     displayName: 'Test XERC20Lockbox',
     name: 'testxerc20lockbox',
 };
+const testOwnerCollateral = {
+    ...test1,
+    chainId: 9913380,
+    domainId: 9913380,
+    displayName: 'Test OwnerCollateral',
+    name: 'testownercollateral',
+};
+const testRebaseCollateral = {
+    ...test1,
+    chainId: 9913381,
+    domainId: 9913381,
+    displayName: 'Test RebaseCollateral',
+    name: 'testrebasecollateral',
+};
 const testScale1 = {
     ...test1,
     chainId: 9913377,
@@ -748049,6 +748114,8 @@ const multiProtocolTestChainMetadata = {
     testscale1: testScale1,
     testscale2: testScale2,
     testcollateralfiat: testCollateralFiat,
+    testownercollateral: testOwnerCollateral,
+    testrebasecollateral: testRebaseCollateral,
 };
 const multiProtocolTestChains = Object.keys(multiProtocolTestChainMetadata);
 //# sourceMappingURL=testChains.js.map
@@ -749937,10 +750004,10 @@ var logging = __nccwpck_require__(94523);
 var types = __nccwpck_require__(16639);
 // EXTERNAL MODULE: ../sdk/dist/app/MultiProtocolApp.js
 var MultiProtocolApp = __nccwpck_require__(48381);
-// EXTERNAL MODULE: ../utils/dist/validation.js
-var validation = __nccwpck_require__(21387);
 // EXTERNAL MODULE: ../utils/dist/async.js
 var dist_async = __nccwpck_require__(14918);
+// EXTERNAL MODULE: ../utils/dist/validation.js
+var validation = __nccwpck_require__(21387);
 // EXTERNAL MODULE: ../sdk/dist/providers/ProviderType.js
 var ProviderType = __nccwpck_require__(25047);
 ;// CONCATENATED MODULE: ../sdk/dist/core/adapters/AleoCoreAdapter.js
@@ -749957,9 +750024,41 @@ class AleoCoreAdapter extends MultiProtocolApp/* BaseAleoAdapter */.Ki {
         this.multiProvider = multiProvider;
         this.addresses = addresses;
     }
-    extractMessageIds(sourceTx) {
-        (0,validation/* assert */.v)(sourceTx.type === ProviderType/* ProviderType */.c.Aleo, `Unsupported provider type for AleoCoreAdapter ${sourceTx.type}`);
-        return [];
+    async extractMessageIds(sourceTx) {
+        if (sourceTx.type !== ProviderType/* ProviderType */.c.Aleo) {
+            return [];
+        }
+        if (!this.addresses.mailbox) {
+            this.logger.debug('No Aleo mailbox address configured; skipping message ID extraction');
+            return [];
+        }
+        if (sourceTx.receipt.type !== 'execute') {
+            this.logger.warn(`Aleo dispatch transaction was rejected (type=${sourceTx.receipt.type}); no message dispatched`);
+            return [];
+        }
+        const provider = this.multiProvider.getAleoProvider(this.chainName);
+        const txId = sourceTx.receipt.transactionHash;
+        // Use dispatch_event_index[block_height] to find the exact nonce for this
+        // transaction's block — same approach as the Rust relayer's block-level anchor.
+        const dispatchNonce = await provider.getDispatchNonceForTx(this.addresses.mailbox, txId);
+        if (dispatchNonce == null) {
+            this.logger.warn(`No dispatch_event_index entry for tx ${txId}; no message dispatched`);
+            return [];
+        }
+        const [messageId, destinationDomain] = await Promise.all([
+            provider.getDispatchedMessageId(this.addresses.mailbox, dispatchNonce),
+            provider.getDispatchedDestinationDomain(this.addresses.mailbox, dispatchNonce),
+        ]);
+        if (!messageId || destinationDomain == null) {
+            this.logger.warn(`Could not fetch message ID or destination for nonce ${dispatchNonce}`);
+            return [];
+        }
+        const destination = this.multiProvider.tryGetChainName(destinationDomain);
+        if (!destination) {
+            this.logger.warn(`Unknown destination domain ${destinationDomain}`);
+            return [];
+        }
+        return [{ messageId, destination }];
     }
     async waitForMessageProcessed(messageId, destination, delayMs, maxAttempts) {
         const provider = this.multiProvider.getAleoProvider(destination);
@@ -750014,7 +750113,7 @@ class CosmNativeCoreAdapter extends MultiProtocolApp/* BaseCosmosAdapter */.L_ {
         this.multiProvider = multiProvider;
         this.addresses = addresses;
     }
-    extractMessageIds(sourceTx) {
+    async extractMessageIds(sourceTx) {
         (0,validation/* assert */.v)(sourceTx.type === ProviderType/* ProviderType */.c.CosmJsNative, `Unsupported provider type for CosmNativeCoreAdapter ${sourceTx.type}`);
         const dispatchEvents = sourceTx.receipt.events.filter((e) => MESSAGE_DISPATCH_EVENT_TYPES.includes(e.type));
         return dispatchEvents.map((event) => {
@@ -750172,7 +750271,7 @@ class CosmWasmCoreAdapter extends MultiProtocolApp/* BaseCosmWasmAdapter */.J {
         });
         return response.delivered;
     }
-    extractMessageIds(sourceTx) {
+    async extractMessageIds(sourceTx) {
         if (sourceTx.type !== ProviderType/* ProviderType */.c.CosmJsWasm) {
             throw new Error(`Unsupported provider type for CosmosCoreAdapter ${sourceTx.type}`);
         }
@@ -750229,7 +750328,7 @@ class EvmCoreAdapter extends MultiProtocolApp/* BaseEvmAdapter */.zl {
         }; // Core only uses mailbox so cast to keep adapter interface simple
         this.core = new HyperlaneCore/* HyperlaneCore */.K(contractsMap, multiProvider.toMultiProvider());
     }
-    extractMessageIds(sourceTx) {
+    async extractMessageIds(sourceTx) {
         if (sourceTx.type !== ProviderType/* ProviderType */.c.EthersV5 &&
             sourceTx.type !== ProviderType/* ProviderType */.c.Tron) {
             throw new Error(`Unsupported provider type for EvmCoreAdapter ${sourceTx.type}`);
@@ -750266,7 +750365,7 @@ class RadixCoreAdapter extends MultiProtocolApp/* BaseRadixAdapter */.v5 {
         this.multiProvider = multiProvider;
         this.addresses = addresses;
     }
-    extractMessageIds(sourceTx) {
+    async extractMessageIds(sourceTx) {
         (0,validation/* assert */.v)(sourceTx.type === ProviderType/* ProviderType */.c.Radix, `Unsupported provider type for RadixCoreAdapter ${sourceTx.type}`);
         const events = sourceTx.receipt.transaction.receipt?.events ?? [];
         if (events.length === 0) {
@@ -750333,7 +750432,7 @@ class StarknetCoreAdapter extends MultiProtocolApp/* BaseStarknetAdapter */.Rn {
         this.multiProvider = multiProvider;
         this.addresses = addresses;
     }
-    extractMessageIds(sourceTx) {
+    async extractMessageIds(sourceTx) {
         if (sourceTx.type !== ProviderType/* ProviderType */.c.Starknet) {
             throw new Error(`Unsupported provider type for StarknetCoreAdapter ${sourceTx.type}`);
         }
@@ -750427,11 +750526,11 @@ class MultiProtocolCore extends MultiProtocolApp/* MultiProtocolApp */.ff {
             return AleoCoreAdapter;
         throw new Error(`No adapter for protocol ${protocol}`);
     }
-    extractMessageIds(origin, sourceTx) {
+    async extractMessageIds(origin, sourceTx) {
         return this.adapter(origin).extractMessageIds(sourceTx);
     }
     async waitForMessagesProcessed(origin, destination, sourceTx, delayMs, maxAttempts) {
-        const messages = this.adapter(origin).extractMessageIds(sourceTx);
+        const messages = await this.adapter(origin).extractMessageIds(sourceTx);
         await Promise.all(messages.map((msg) => this.adapter(destination).waitForMessageProcessed(msg.messageId, msg.destination, delayMs, maxAttempts)));
         return true;
     }
@@ -750588,7 +750687,7 @@ class SealevelCoreAdapter extends MultiProtocolApp/* BaseSealevelAdapter */.OR {
         this.multiProvider = multiProvider;
         this.addresses = addresses;
     }
-    extractMessageIds(sourceTx) {
+    async extractMessageIds(sourceTx) {
         if (sourceTx.type !== ProviderType/* ProviderType */.c.SolanaWeb3) {
             throw new Error(`Unsupported provider type for SealevelCoreAdapter ${sourceTx.type}`);
         }
@@ -752853,6 +752952,8 @@ var objects = __nccwpck_require__(73938);
 var types = __nccwpck_require__(16639);
 // EXTERNAL MODULE: ../utils/dist/logging.js
 var logging = __nccwpck_require__(94523);
+// EXTERNAL MODULE: ../utils/dist/validation.js
+var validation = __nccwpck_require__(21387);
 // EXTERNAL MODULE: ../utils/dist/addresses.js
 var addresses = __nccwpck_require__(93142);
 // EXTERNAL MODULE: ../utils/dist/sets.js
@@ -752863,8 +752964,6 @@ var contracts = __nccwpck_require__(15570);
 var AbstractHyperlaneModule = __nccwpck_require__(53387);
 // EXTERNAL MODULE: ../sdk/dist/utils/ism.js
 var ism = __nccwpck_require__(764);
-// EXTERNAL MODULE: ../utils/dist/validation.js
-var validation = __nccwpck_require__(21387);
 // EXTERNAL MODULE: ../sdk/dist/deploy/HyperlaneDeployer.js
 var HyperlaneDeployer = __nccwpck_require__(6609);
 // EXTERNAL MODULE: ../sdk/dist/fee/EvmTokenFeeReader.js
@@ -753280,7 +753379,8 @@ class EvmTokenFeeModule extends AbstractHyperlaneModule/* HyperlaneModule */.x {
         if (targetConfig.type === fee_types/* TokenFeeType */.cA.OffchainQuotedLinearFee) {
             mutableFields.quoteSigners = true;
         }
-        if (targetConfig.type === fee_types/* TokenFeeType */.cA.RoutingFee) {
+        if (targetConfig.type === fee_types/* TokenFeeType */.cA.RoutingFee ||
+            targetConfig.type === fee_types/* TokenFeeType */.cA.CrossCollateralRoutingFee) {
             mutableFields.feeContracts = true;
         }
         return !(0,objects/* deepEquals */.c2)((0,objects/* objOmit */.Xi)(actualConfig, mutableFields), (0,objects/* objOmit */.Xi)(targetConfig, mutableFields));
@@ -753336,6 +753436,58 @@ class EvmTokenFeeModule extends AbstractHyperlaneModule/* HyperlaneModule */.x {
                 ...this.createOwnershipUpdateTxs(normalizedActualConfig, normalizedTargetConfig),
             ];
         }
+        // CrossCollateralRoutingFee: update sub-fee contracts (nested structure)
+        if (normalizedTargetConfig.type === fee_types/* TokenFeeType */.cA.CrossCollateralRoutingFee &&
+            normalizedActualConfig.type === fee_types/* TokenFeeType */.cA.CrossCollateralRoutingFee &&
+            actualConfig.type === fee_types/* TokenFeeType */.cA.CrossCollateralRoutingFee) {
+            const targetFeeContracts = normalizedTargetConfig.feeContracts ?? {};
+            // Carry actual addresses into target entries, but limit to target keys only so
+            // orphan entries from actualConfig don't get re-injected into the update loop.
+            const merged = (0,objects/* objMerge */._J)(actualConfig, normalizedTargetConfig, 10, true);
+            if (merged.feeContracts) {
+                for (const chainName of Object.keys(merged.feeContracts)) {
+                    if (!(chainName in targetFeeContracts)) {
+                        delete merged.feeContracts[chainName];
+                    }
+                    else {
+                        for (const routerBytes32 of Object.keys(merged.feeContracts[chainName])) {
+                            if (!(routerBytes32 in targetFeeContracts[chainName])) {
+                                delete merged.feeContracts[chainName][routerBytes32];
+                            }
+                        }
+                    }
+                }
+            }
+            // Emit clearing transactions for entries removed from target.
+            const removalDestinations = [];
+            const removalRouterKeys = [];
+            const zeroAddresses = [];
+            for (const [chainName, routerConfigs] of Object.entries(actualConfig.feeContracts ?? {})) {
+                const targetRouterConfigs = targetFeeContracts[chainName] ?? {};
+                for (const routerBytes32 of Object.keys(routerConfigs)) {
+                    if (!(routerBytes32 in targetRouterConfigs)) {
+                        removalDestinations.push(this.multiProvider.getDomainId(chainName));
+                        removalRouterKeys.push(routerBytes32);
+                        zeroAddresses.push(lib.constants.AddressZero);
+                    }
+                }
+            }
+            const removalTxs = removalDestinations.length > 0
+                ? [
+                    {
+                        annotation: 'Clearing removed CrossCollateralRoutingFee sub-contract pointers',
+                        chainId: this.chainId,
+                        to: this.args.addresses.deployedFee,
+                        data: dist/* CrossCollateralRoutingFee__factory */.gv3.createInterface().encodeFunctionData('setCrossCollateralRouterFeeContracts', [removalDestinations, removalRouterKeys, zeroAddresses]),
+                    },
+                ]
+                : [];
+            return [
+                ...(await this.updateCrossCollateralRoutingFee(merged)),
+                ...removalTxs,
+                ...this.createOwnershipUpdateTxs(normalizedActualConfig, normalizedTargetConfig),
+            ];
+        }
         // Routing fee: update sub-fee contracts
         if (normalizedTargetConfig.type === fee_types/* TokenFeeType */.cA.RoutingFee &&
             normalizedActualConfig.type === fee_types/* TokenFeeType */.cA.RoutingFee) {
@@ -753346,6 +753498,114 @@ class EvmTokenFeeModule extends AbstractHyperlaneModule/* HyperlaneModule */.x {
         }
         return this.createOwnershipUpdateTxs(normalizedActualConfig, normalizedTargetConfig);
     }
+    async updateCrossCollateralRoutingFee(targetConfig) {
+        const updateTransactions = [];
+        if (!targetConfig.feeContracts)
+            return [];
+        const currentRoutingAddress = this.args.addresses.deployedFee;
+        // Validate all destination chains and collect domain IDs upfront so that an unknown
+        // chain name fails before any sub-fee deployments are attempted.
+        const domainIdByChain = new Map();
+        for (const chainName of Object.keys(targetConfig.feeContracts)) {
+            domainIdByChain.set(chainName, this.multiProvider.getDomainId(chainName));
+        }
+        // Deduplicate update work for shared addresses (old address → deployed address after update).
+        // Multiple (chainName, routerBytes32) pairs may point to the same physical contract; we only
+        // run the update once per (address, config) pair. If two entries share an address but have
+        // divergent target configs (split case), each gets its own deployment.
+        const updatedByAddress = new Map();
+        // Per-entry deployed address, keyed by "chainName:routerBytes32".
+        const entryDeployedAddr = new Map();
+        for (const [chainName, routerConfigs] of Object.entries(targetConfig.feeContracts)) {
+            for (const [routerBytes32, subFeeConfig] of Object.entries(routerConfigs)) {
+                (0,validation/* assert */.v)(/^0x[0-9a-fA-F]{64}$/.test(routerBytes32), `routerBytes32 key "${routerBytes32}" for chain ${chainName} is not a valid 32-byte hex string`);
+                const address = subFeeConfig.address;
+                const entryKey = `${chainName}:${routerBytes32}`;
+                if (!address) {
+                    // No existing sub-fee contract — deploy a new one
+                    this.logger.info(`No existing sub-fee contract for ${chainName}/${routerBytes32}, deploying new one`);
+                    const subFeeModule = await EvmTokenFeeModule.create({
+                        multiProvider: this.multiProvider,
+                        chain: this.chainName,
+                        config: subFeeConfig,
+                        contractVerifier: this.contractVerifier,
+                    });
+                    const deployedSubFee = subFeeModule.serialize().deployedFee;
+                    this.logger.debug(`New cross-collateral sub-fee contract deployed at ${deployedSubFee} for ${chainName}/${routerBytes32}`);
+                    entryDeployedAddr.set(entryKey, deployedSubFee);
+                }
+                else {
+                    const addrKey = address.toLowerCase();
+                    const cached = updatedByAddress.get(addrKey);
+                    const configMatches = cached && (0,objects/* deepEquals */.c2)(cached.config, subFeeConfig);
+                    if (!cached || !configMatches) {
+                        if (cached && !configMatches) {
+                            // Same physical address but divergent target config — this is a route split.
+                            // Deploy a fresh sub-fee contract rather than reusing the other entry's result.
+                            this.logger.info(`Cross-collateral sub-fee config diverged for ${chainName}/${routerBytes32} at ${address}, deploying new contract`);
+                            const subFeeModule = await EvmTokenFeeModule.create({
+                                multiProvider: this.multiProvider,
+                                chain: this.chainName,
+                                config: subFeeConfig,
+                                contractVerifier: this.contractVerifier,
+                            });
+                            const deployedSubFee = subFeeModule.serialize().deployedFee;
+                            this.logger.debug(`New cross-collateral sub-fee contract deployed at ${deployedSubFee} for ${chainName}/${routerBytes32}`);
+                            entryDeployedAddr.set(entryKey, deployedSubFee);
+                            continue;
+                        }
+                        // First time we see this address — run the update
+                        const subFeeModule = new EvmTokenFeeModule(this.multiProvider, {
+                            addresses: { deployedFee: address },
+                            chain: this.chainName,
+                            config: subFeeConfig,
+                        }, this.contractVerifier);
+                        const subFeeUpdateTransactions = await subFeeModule.update(subFeeConfig, { address });
+                        updateTransactions.push(...subFeeUpdateTransactions);
+                        const deployedSubFeeAddr = subFeeModule.serialize().deployedFee;
+                        if (!(0,addresses/* eqAddress */.fv)(deployedSubFeeAddr, address)) {
+                            this.logger.debug(`Cross-collateral sub-fee redeployed: ${address} → ${deployedSubFeeAddr} for ${chainName}/${routerBytes32}`);
+                        }
+                        updatedByAddress.set(addrKey, {
+                            config: subFeeConfig,
+                            deployedAddr: deployedSubFeeAddr,
+                        });
+                    }
+                    const entry = updatedByAddress.get(addrKey);
+                    (0,validation/* assert */.v)(entry !== undefined, `Missing deployed fee for ${addrKey}`);
+                    entryDeployedAddr.set(entryKey, entry.deployedAddr);
+                }
+            }
+        }
+        // Build setCrossCollateralRouterFeeContracts args for entries whose pointer changed
+        const destinations = [];
+        const routerKeys = [];
+        const newAddresses = [];
+        for (const [chainName, routerConfigs] of Object.entries(targetConfig.feeContracts)) {
+            const domainId = domainIdByChain.get(chainName);
+            (0,validation/* assert */.v)(domainId !== undefined, `Domain ID not found for ${chainName}`);
+            for (const [routerBytes32, subFeeConfig] of Object.entries(routerConfigs)) {
+                const entryKey = `${chainName}:${routerBytes32}`;
+                const deployedSubFee = entryDeployedAddr.get(entryKey);
+                (0,validation/* assert */.v)(deployedSubFee !== undefined, `Missing deployed fee for entry ${entryKey}`);
+                const oldAddr = subFeeConfig.address;
+                if (!oldAddr || !(0,addresses/* eqAddress */.fv)(deployedSubFee, oldAddr)) {
+                    destinations.push(domainId);
+                    routerKeys.push(routerBytes32);
+                    newAddresses.push(deployedSubFee);
+                }
+            }
+        }
+        if (destinations.length > 0) {
+            updateTransactions.push({
+                annotation: 'Updating CrossCollateralRoutingFee sub-contract pointers',
+                chainId: this.chainId,
+                to: currentRoutingAddress,
+                data: dist/* CrossCollateralRoutingFee__factory */.gv3.createInterface().encodeFunctionData('setCrossCollateralRouterFeeContracts', [destinations, routerKeys, newAddresses]),
+            });
+        }
+        return updateTransactions;
+    }
     async updateRoutingFee(targetConfig) {
         const updateTransactions = [];
         if (!targetConfig.feeContracts)
@@ -756583,22 +756843,50 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         switch (config.type) {
             case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.FALLBACK_ROUTING:
             case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.ROUTING:
-                config.domains = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .promiseObjAll */ .a1)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .objMap */ .Yp)(config.domains, async (_, hook) => this.deriveHookConfig(hook)));
-                if (config.type === _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.FALLBACK_ROUTING)
-                    config.fallback = await this.deriveHookConfig(config.fallback);
+                config.domains = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .promiseObjAll */ .a1)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .objMap */ .Yp)(config.domains, async (_, hook) => {
+                    const derived = await this.deriveHookConfig(hook);
+                    return this.preserveUnredeployable(hook, derived);
+                }));
+                if (config.type === _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.FALLBACK_ROUTING) {
+                    const derived = await this.deriveHookConfig(config.fallback);
+                    config.fallback = this.preserveUnredeployable(config.fallback, derived);
+                }
                 break;
+            case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.CCTP:
+                return config;
             case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.AGGREGATION:
-                config.hooks = await Promise.all(config.hooks.map(async (hook) => this.deriveHookConfig(hook)));
+                config.hooks = await Promise.all(config.hooks.map(async (hook) => {
+                    const derived = await this.deriveHookConfig(hook);
+                    return this.preserveUnredeployable(hook, derived);
+                }));
                 break;
-            case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.AMOUNT_ROUTING:
-                [config.lowerHook, config.upperHook] = await Promise.all([
-                    this.deriveHookConfig(config.lowerHook),
-                    this.deriveHookConfig(config.upperHook),
+            case _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.AMOUNT_ROUTING: {
+                const lowerOrig = config.lowerHook;
+                const upperOrig = config.upperHook;
+                const [lowerDerived, upperDerived] = await Promise.all([
+                    this.deriveHookConfig(lowerOrig),
+                    this.deriveHookConfig(upperOrig),
                 ]);
+                config.lowerHook = this.preserveUnredeployable(lowerOrig, lowerDerived);
+                config.upperHook = this.preserveUnredeployable(upperOrig, upperDerived);
                 break;
+            }
         }
         return config;
     }
+    // Returns original HookConfig for non-redeployable types (CCTP, PREDICATE) so that
+    // normalizeConfig — which strips 'address' from all objects — does not discard
+    // the address. Returns the address as a bare string so it survives normalizeConfig
+    // and deploy() reaches the string branch intact, regardless of whether the original
+    // was already a string or an object with an address field.
+    preserveUnredeployable(original, derived) {
+        if (derived.type !== _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.CCTP && derived.type !== _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.PREDICATE) {
+            return derived;
+        }
+        if (typeof original === 'string')
+            return original;
+        return derived.address;
+    }
     async deriveMailboxDefaultHookConfig(address) {
         const hook = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .DefaultHook__factory */ .hR3.connect(address, this.provider);
         this.assertHookType(await hook.hookType(), _types_js__WEBPACK_IMPORTED_MODULE_4__/* .OnchainHookType */ .c0.MAILBOX_DEFAULT_HOOK);
@@ -756677,7 +756965,10 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
             hook.hooks(ethers__WEBPACK_IMPORTED_MODULE_6__.ethers.constants.AddressZero),
         ]);
         this.assertHookType(hookType, _types_js__WEBPACK_IMPORTED_MODULE_4__/* .OnchainHookType */ .c0.AGGREGATION);
-        const hookConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .concurrentMap */ .q1)(this.concurrency, hooks, (hook) => this.deriveHookConfig(hook));
+        const hookConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .concurrentMap */ .q1)(this.concurrency, hooks, async (hookAddress) => {
+            const derived = await this.deriveHookConfigFromAddress(hookAddress);
+            return this.preserveUnredeployable(hookAddress, derived);
+        });
         const config = {
             address,
             type: _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.AGGREGATION,
@@ -756806,7 +757097,8 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
             hook.childHook(),
         ]);
         const destinationChainName = this.multiProvider.getChainName(destinationDomain);
-        const childHookConfig = await this.deriveHookConfig(childHookAddress);
+        const derivedChild = await this.deriveHookConfigFromAddress(childHookAddress);
+        const childHookConfig = this.preserveUnredeployable(childHookAddress, derivedChild);
         const config = {
             address,
             type: _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.ARB_L2_TO_L1,
@@ -756845,7 +757137,8 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
             this.fetchDomainHooks(hook),
         ]);
         this.assertHookType(hookType, _types_js__WEBPACK_IMPORTED_MODULE_4__/* .OnchainHookType */ .c0.FALLBACK_ROUTING);
-        const fallbackHookConfig = await this.deriveHookConfig(fallbackHookAddress);
+        const derivedFallback = await this.deriveHookConfigFromAddress(fallbackHookAddress);
+        const fallbackHookConfig = this.preserveUnredeployable(fallbackHookAddress, derivedFallback);
         const config = {
             owner,
             address,
@@ -756863,7 +757156,8 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
             try {
                 const domainHook = await hook.hooks(domainId);
                 if (domainHook !== ethers__WEBPACK_IMPORTED_MODULE_6__.ethers.constants.AddressZero) {
-                    domainHooks[chainName] = await this.deriveHookConfig(domainHook);
+                    const derived = await this.deriveHookConfigFromAddress(domainHook);
+                    domainHooks[chainName] = this.preserveUnredeployable(domainHook, derived);
                 }
             }
             catch {
@@ -756901,10 +757195,12 @@ class EvmHookReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1
         ]);
         this.assertHookType(hookType, _types_js__WEBPACK_IMPORTED_MODULE_4__/* .OnchainHookType */ .c0.AMOUNT_ROUTING);
         // Parallelize hook config derivation
-        const [lowerHookConfig, upperHookConfig] = await Promise.all([
-            this.deriveHookConfig(lowerHookAddress),
-            this.deriveHookConfig(upperHookAddress),
+        const [lowerDerived, upperDerived] = await Promise.all([
+            this.deriveHookConfigFromAddress(lowerHookAddress),
+            this.deriveHookConfigFromAddress(upperHookAddress),
         ]);
+        const lowerHookConfig = this.preserveUnredeployable(lowerHookAddress, lowerDerived);
+        const upperHookConfig = this.preserveUnredeployable(upperHookAddress, upperDerived);
         const config = {
             address,
             type: _types_js__WEBPACK_IMPORTED_MODULE_4__/* .HookType */ .WD.AMOUNT_ROUTING,
@@ -757705,16 +758001,16 @@ class EvmIsmModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_MO
 /* harmony export */ });
 /* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(61934);
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(50653);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(94523);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(94523);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(73938);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(14918);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(21387);
 /* harmony import */ var _ccip_utils_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(93035);
-/* harmony import */ var _consts_concurrency_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(92573);
-/* harmony import */ var _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(1430);
-/* harmony import */ var _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(49680);
+/* harmony import */ var _consts_concurrency_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(92573);
+/* harmony import */ var _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(1430);
+/* harmony import */ var _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(49680);
 /* harmony import */ var _utils_contract_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(76709);
-/* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(69352);
+/* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(69352);
 
 
 
@@ -757725,14 +758021,19 @@ class EvmIsmModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_MO
 
 
 const INCREMENTAL_REVERT_STRING = 'IncrementalDomainRoutingIsm: removal not supported';
-class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1__/* .HyperlaneReader */ .S {
+// ISM types that cannot be deployed by HyperlaneIsmFactory — preserve as address strings.
+const NON_REDEPLOYABLE_ISM_TYPES = new Set([
+    _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.OFFCHAIN_LOOKUP,
+    _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
+]);
+class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_2__/* .HyperlaneReader */ .S {
     multiProvider;
     chain;
     concurrency;
     messageContext;
-    logger = _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .rootLogger */ .Jk.child({ module: 'EvmIsmReader' });
+    logger = _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .rootLogger */ .Jk.child({ module: 'EvmIsmReader' });
     isZkSyncChain;
-    constructor(multiProvider, chain, concurrency = multiProvider.tryGetRpcConcurrency(chain) ?? _consts_concurrency_js__WEBPACK_IMPORTED_MODULE_3__/* .DEFAULT_CONTRACT_READ_CONCURRENCY */ .M, messageContext) {
+    constructor(multiProvider, chain, concurrency = multiProvider.tryGetRpcConcurrency(chain) ?? _consts_concurrency_js__WEBPACK_IMPORTED_MODULE_4__/* .DEFAULT_CONTRACT_READ_CONCURRENCY */ .M, messageContext) {
         super(multiProvider, chain);
         this.multiProvider = multiProvider;
         this.chain = chain;
@@ -757740,7 +758041,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
         this.messageContext = messageContext;
         // So we can distinguish between Storage/Static ISMs
         const chainTechnicalStack = this.multiProvider.getChainMetadata(this.chain).technicalStack;
-        this.isZkSyncChain = chainTechnicalStack === _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_4__/* .ChainTechnicalStack */ .DU.ZkSync;
+        this.isZkSyncChain = chainTechnicalStack === _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_5__/* .ChainTechnicalStack */ .DU.ZkSync;
     }
     async deriveIsmConfigFromAddress(address) {
         let moduleType = undefined;
@@ -757753,28 +758054,28 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             this.setSmartProviderLogLevel('silent');
             moduleType = await ism.moduleType();
             switch (moduleType) {
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.UNUSED:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.UNUSED:
                     throw new Error('UNUSED does not have a corresponding IsmType');
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.ROUTING:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.ROUTING:
                     // IsmType is either ROUTING or FALLBACK_ROUTING, but that's determined inside deriveRoutingConfig
                     derivedIsmConfig = await this.deriveRoutingConfig(address);
                     break;
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.AGGREGATION:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.AGGREGATION:
                     derivedIsmConfig = await this.deriveAggregationConfig(address);
                     break;
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.LEGACY_MULTISIG:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.LEGACY_MULTISIG:
                     throw new Error('LEGACY_MULTISIG is deprecated and not supported');
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG:
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MESSAGE_ID_MULTISIG:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MESSAGE_ID_MULTISIG:
                     derivedIsmConfig = await this.deriveMultisigConfig(address);
                     break;
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.NULL:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.NULL:
                     derivedIsmConfig = await this.deriveNullConfig(address);
                     break;
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.CCIP_READ:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.CCIP_READ:
                     derivedIsmConfig = await this.deriveOffchainLookupConfig(address);
                     break;
-                case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.ARB_L2_TO_L1:
+                case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.ARB_L2_TO_L1:
                     return this.deriveArbL2ToL1Config(address);
                 default:
                     throw new Error(`Unknown ISM ModuleType: ${moduleType}`);
@@ -757786,17 +758087,17 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             throw new Error(errorMessage);
         }
         finally {
-            this.setSmartProviderLogLevel((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .getLogLevel */ .XM)()); // returns to original level defined by rootLogger
+            this.setSmartProviderLogLevel((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .getLogLevel */ .XM)()); // returns to original level defined by rootLogger
         }
         return derivedIsmConfig;
     }
     async deriveOffchainLookupConfig(address) {
         const ism = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .AbstractCcipReadIsm__factory */ .RWQ.connect(address, this.provider);
-        this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.CCIP_READ);
+        this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.CCIP_READ);
         const [urls, owner] = await Promise.all([ism.urls(), ism.owner()]);
         return {
             address,
-            type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.OFFCHAIN_LOOKUP,
+            type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.OFFCHAIN_LOOKUP,
             urls,
             owner,
         };
@@ -757808,26 +758109,48 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             return this.deriveIsmConfigFromAddress(config);
         // Extend the inner isms
         switch (config.type) {
-            case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.FALLBACK_ROUTING:
-            case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.ROUTING:
-                config.domains = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .promiseObjAll */ .a1)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .objMap */ .Yp)(config.domains, async (_, ism) => this.deriveIsmConfig(ism)));
+            case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.FALLBACK_ROUTING:
+            case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.ROUTING:
+                config.domains = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .promiseObjAll */ .a1)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .objMap */ .Yp)(config.domains, async (_, ism) => {
+                    const derived = await this.deriveIsmConfig(ism);
+                    return this.preserveUnredeployableIsm(ism, derived);
+                }));
                 break;
-            case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.AGGREGATION:
-            case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.STORAGE_AGGREGATION:
-                config.modules = await Promise.all(config.modules.map(async (ism) => this.deriveIsmConfig(ism)));
+            case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.AGGREGATION:
+            case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.STORAGE_AGGREGATION:
+                config.modules = await Promise.all(config.modules.map(async (ism) => {
+                    const derived = await this.deriveIsmConfig(ism);
+                    return this.preserveUnredeployableIsm(ism, derived);
+                }));
                 break;
-            case _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.AMOUNT_ROUTING:
-                [config.lowerIsm, config.upperIsm] = await Promise.all([
-                    this.deriveIsmConfig(config.lowerIsm),
-                    this.deriveIsmConfig(config.upperIsm),
+            case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.AMOUNT_ROUTING: {
+                const lowerOrig = config.lowerIsm;
+                const upperOrig = config.upperIsm;
+                const [lowerDerived, upperDerived] = await Promise.all([
+                    this.deriveIsmConfig(lowerOrig),
+                    this.deriveIsmConfig(upperOrig),
                 ]);
+                config.lowerIsm = this.preserveUnredeployableIsm(lowerOrig, lowerDerived);
+                config.upperIsm = this.preserveUnredeployableIsm(upperOrig, upperDerived);
                 break;
+            }
         }
         return config;
     }
+    // Returns the original IsmConfig for non-redeployable ISM types (e.g. OFFCHAIN_LOOKUP,
+    // INTERCHAIN_ACCOUNT_ROUTING) so normalizeConfig and deploy() handle them correctly.
+    // The original is typically a string address that survives normalizeConfig intact and
+    // reaches deploy()'s string branch; an object config is also preserved via derived.address.
+    preserveUnredeployableIsm(original, derived) {
+        if (!NON_REDEPLOYABLE_ISM_TYPES.has(derived.type))
+            return derived;
+        if (typeof original === 'string')
+            return original;
+        return derived.address;
+    }
     async deriveRoutingConfig(address) {
         const abstractRoutingIsm = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .AbstractRoutingIsm__factory */ .cYN.connect(address, this.provider);
-        this.assertModuleType(await abstractRoutingIsm.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.ROUTING);
+        this.assertModuleType(await abstractRoutingIsm.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.ROUTING);
         // OPTIMIZATION: When we have messageContext, we only need to derive
         // the specific ISM that will verify this message, not the full routing table.
         // Just call route(message) and derive that single ISM directly.
@@ -757848,7 +758171,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
         if (!owner) {
             if (isIca) {
                 return {
-                    type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
+                    type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
                     isms: {},
                     address,
                     owner: ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero,
@@ -757862,7 +758185,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
         if (isIca) {
             const icaRouter = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .InterchainAccountRouter__factory */ .ojJ.connect(address, this.provider);
             return {
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
                 isms: await this.deriveRemoteIsmConfigs(domainIds, abstractRoutingIsm, icaRouter.isms, 
                 // The isms here are deployed on remote chains and can't be derived
                 false),
@@ -757872,18 +758195,18 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
         }
         const domains = await this.deriveRemoteIsmConfigs(domainIds, abstractRoutingIsm, defaultFallbackIsmInstance.module, true);
         // Fallback routing ISM extends from MailboxClient, default routing
-        let ismType = _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.FALLBACK_ROUTING;
+        let ismType = _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.FALLBACK_ROUTING;
         try {
             await defaultFallbackIsmInstance.mailbox();
         }
         catch {
-            ismType = _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.ROUTING;
+            ismType = _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.ROUTING;
             this.logger.debug('Error accessing mailbox property, implying this is not a fallback routing ISM.', address);
         }
         // Check if it's an incremental routing ISM by looking for the unique error message in bytecode
-        if (ismType === _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.ROUTING) {
+        if (ismType === _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.ROUTING) {
             if (await (0,_utils_contract_js__WEBPACK_IMPORTED_MODULE_8__/* .contractHasString */ .u)(this.provider, address, INCREMENTAL_REVERT_STRING)) {
-                ismType = _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.INCREMENTAL_ROUTING;
+                ismType = _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INCREMENTAL_ROUTING;
                 this.logger.debug({ address }, 'Detected incremental routing ISM');
             }
         }
@@ -757925,12 +758248,14 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             const moduleAddress = this.messageContext
                 ? await contractInstance.route(this.messageContext.message)
                 : await addressDeriveFunc(domainId);
-            return [
-                chainName,
-                deriveConfig
-                    ? await this.deriveIsmConfig(moduleAddress)
-                    : moduleAddress,
-            ];
+            if (deriveConfig) {
+                const derived = await this.deriveIsmConfigFromAddress(moduleAddress);
+                return [
+                    chainName,
+                    this.preserveUnredeployableIsm(moduleAddress, derived),
+                ];
+            }
+            return [chainName, moduleAddress];
         });
         return Object.fromEntries(res.filter((curr) => curr));
     }
@@ -757951,29 +758276,36 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             this.logger.debug('Error accessing AmountRoutingIsm properties, treating as legacy InterchainAccountIsm.', address);
             // return a basic ICA routing config for legacy contracts
             return {
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING,
                 isms: {},
                 address,
                 owner: ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero,
             };
         }
+        const [lowerDerived, upperDerived] = await Promise.all([
+            this.deriveIsmConfigFromAddress(lowerIsm),
+            this.deriveIsmConfigFromAddress(upperIsm),
+        ]);
         return {
-            type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.AMOUNT_ROUTING,
+            type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.AMOUNT_ROUTING,
             address,
-            lowerIsm: await this.deriveIsmConfig(lowerIsm),
-            upperIsm: await this.deriveIsmConfig(upperIsm),
+            lowerIsm: this.preserveUnredeployableIsm(lowerIsm, lowerDerived),
+            upperIsm: this.preserveUnredeployableIsm(upperIsm, upperDerived),
             threshold: threshold.toNumber(),
         };
     }
     async deriveAggregationConfig(address) {
         const ism = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .StaticAggregationIsm__factory */ .UMv.connect(address, this.provider);
-        this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.AGGREGATION);
+        this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.AGGREGATION);
         const [modules, threshold] = await ism.modulesAndThreshold(ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero);
-        const ismConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .concurrentMap */ .q1)(this.concurrency, modules, async (module) => this.deriveIsmConfig(module));
+        const ismConfigs = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_9__/* .concurrentMap */ .q1)(this.concurrency, modules, async (module) => {
+            const derived = await this.deriveIsmConfigFromAddress(module);
+            return this.preserveUnredeployableIsm(module, derived);
+        });
         // If it's a zkSync chain, it must be a StorageAggregationIsm
         const ismType = this.isZkSyncChain
-            ? _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.STORAGE_AGGREGATION
-            : _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.AGGREGATION;
+            ? _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.STORAGE_AGGREGATION
+            : _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.AGGREGATION;
         return {
             address,
             type: ismType,
@@ -757984,17 +758316,17 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
     async deriveMultisigConfig(address) {
         const ism = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .IMultisigIsm__factory */ .jku.connect(address, this.provider);
         const moduleType = await ism.moduleType();
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .assert */ .v)(moduleType === _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG ||
-            moduleType === _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MESSAGE_ID_MULTISIG, `expected module type to be ${_types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG} or ${_types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MESSAGE_ID_MULTISIG}, got ${moduleType}`);
-        let ismType = moduleType === _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG
-            ? _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.MERKLE_ROOT_MULTISIG
-            : _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.MESSAGE_ID_MULTISIG;
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .assert */ .v)(moduleType === _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG ||
+            moduleType === _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MESSAGE_ID_MULTISIG, `expected module type to be ${_types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG} or ${_types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MESSAGE_ID_MULTISIG}, got ${moduleType}`);
+        let ismType = moduleType === _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG
+            ? _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.MERKLE_ROOT_MULTISIG
+            : _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.MESSAGE_ID_MULTISIG;
         // If it's a zkSync chain, it must be a StorageMultisigIsm
         if (this.isZkSyncChain) {
             ismType =
-                moduleType === _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG
-                    ? _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.STORAGE_MERKLE_ROOT_MULTISIG
-                    : _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.STORAGE_MESSAGE_ID_MULTISIG;
+                moduleType === _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.MERKLE_ROOT_MULTISIG
+                    ? _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.STORAGE_MERKLE_ROOT_MULTISIG
+                    : _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.STORAGE_MESSAGE_ID_MULTISIG;
         }
         const [validators, threshold] = await ism.validatorsAndThreshold(ethers__WEBPACK_IMPORTED_MODULE_7__.ethers.constants.AddressZero);
         return {
@@ -758006,7 +758338,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
     }
     async deriveNullConfig(address) {
         const ism = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .IInterchainSecurityModule__factory */ .Die.connect(address, this.provider);
-        this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_5__/* .ModuleType */ .nR.NULL);
+        this.assertModuleType(await ism.moduleType(), _types_js__WEBPACK_IMPORTED_MODULE_1__/* .ModuleType */ .nR.NULL);
         // if it has trustedRelayer() property --> TRUSTED_RELAYER
         const trustedRelayerIsm = _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__/* .TrustedRelayerIsm__factory */ .tdx.connect(address, this.provider);
         try {
@@ -758014,7 +758346,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             return {
                 address,
                 relayer,
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.TRUSTED_RELAYER,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.TRUSTED_RELAYER,
             };
         }
         catch {
@@ -758028,7 +758360,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             return {
                 address,
                 owner,
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.PAUSABLE,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.PAUSABLE,
                 paused,
             };
         }
@@ -758045,7 +758377,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             }
             return {
                 address,
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.CCIP,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.CCIP,
                 originChain,
             };
         }
@@ -758058,7 +758390,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             await opStackIsm.VERIFIED_MASK_INDEX();
             return {
                 address,
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.OP_STACK,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.OP_STACK,
                 origin: address,
                 nativeBridge: '', // no way to extract native bridge from the ism
             };
@@ -758077,7 +758409,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
             const owner = await rateLimitedIsm.owner();
             return {
                 address,
-                type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.RATE_LIMITED,
+                type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.RATE_LIMITED,
                 recipient,
                 maxCapacity,
                 owner,
@@ -758089,7 +758421,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
         // no specific properties, must be Test ISM
         return {
             address,
-            type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.TEST_ISM,
+            type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.TEST_ISM,
         };
     }
     async deriveArbL2ToL1Config(address) {
@@ -758099,7 +758431,7 @@ class EvmIsmReader extends _utils_HyperlaneReader_js__WEBPACK_IMPORTED_MODULE_1_
         const bridge = await outboxContract.bridge();
         return {
             address,
-            type: _types_js__WEBPACK_IMPORTED_MODULE_5__/* .IsmType */ .GO.ARB_L2_TO_L1,
+            type: _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.ARB_L2_TO_L1,
             bridge,
         };
     }
@@ -758293,6 +758625,9 @@ class HyperlaneIsmFactory extends _app_HyperlaneApp_js__WEBPACK_IMPORTED_MODULE_
             case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.CCIP:
                 contract = await this.deployCCIPIsm(destination, config);
                 break;
+            case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.OFFCHAIN_LOOKUP:
+                throw new Error(`OFFCHAIN_LOOKUP ISM cannot be deployed — it must already be deployed. ` +
+                    `Pass its contract address as a string instead of a config object.`);
             case _types_js__WEBPACK_IMPORTED_MODULE_1__/* .IsmType */ .GO.INTERCHAIN_ACCOUNT_ROUTING:
                 throw new Error('Interchain Account ISM is not supported in this context');
             default:
@@ -765041,6 +765376,8 @@ class EvmIcaTxSubmitter {
             chain: config.chain,
             destinationChain: config.destinationChain,
             originInterchainAccountRouter: interchainAccountRouterAddress,
+            destinationInterchainAccountRouter: config.destinationInterchainAccountRouter,
+            interchainSecurityModule: config.interchainSecurityModule,
         }, internalSubmitter, multiProvider, interchainAccountApp);
     }
     async submit(...txs) {
@@ -765068,18 +765405,28 @@ class EvmIcaTxSubmitter {
             return { data, to, value: value?.toString() };
         });
         const refundAddress = (0,addresses/* bytes32ToAddress */.ov)(this.config.owner);
-        const hookMetadata = (0,messages/* formatStandardHookMetadata */.NE)({ refundAddress });
+        const icaConfig = {
+            origin: this.config.chain,
+            owner: this.config.owner,
+            ismOverride: this.config.interchainSecurityModule,
+            routerOverride: this.config.destinationInterchainAccountRouter,
+            localRouter: this.config.originInterchainAccountRouter,
+        };
+        const gasLimit = await this.interchainAccountApp.estimateIcaHandleGas({
+            origin: this.config.chain,
+            destination: this.config.destinationChain,
+            innerCalls,
+            config: icaConfig,
+        });
+        const hookMetadata = (0,messages/* formatStandardHookMetadata */.NE)({
+            refundAddress,
+            gasLimit: gasLimit.toBigInt(),
+        });
         const icaTx = await this.interchainAccountApp.getCallRemote({
             chain: this.config.chain,
             destination: this.config.destinationChain,
             innerCalls,
-            config: {
-                origin: this.config.chain,
-                owner: this.config.owner,
-                ismOverride: this.config.interchainSecurityModule,
-                routerOverride: this.config.destinationInterchainAccountRouter,
-                localRouter: this.config.originInterchainAccountRouter,
-            },
+            config: icaConfig,
             hookMetadata,
         });
         return this.submitter.submit({
@@ -799885,34 +800232,70 @@ var index_default = SafeApiKit_default;
 
 const SAFE_API_RETRIES = 10;
 const SAFE_API_BASE_RETRY_MS = 1000;
+function isSafeApiKitConstructor(value) {
+    return typeof value === 'function';
+}
 function safeApiKeyRequired(txServiceUrl) {
     return /safe\.global|5afe\.dev/.test(txServiceUrl);
 }
+function normalizeSafeTxServiceUrl(txServiceUrl) {
+    const trimmedUrl = txServiceUrl.replace(/\/+$/, '');
+    if (trimmedUrl.endsWith('/api'))
+        return trimmedUrl;
+    return `${trimmedUrl}/api`;
+}
+function isSafeGlobalTxServiceUrl(txServiceUrl) {
+    try {
+        const url = new URL(normalizeSafeTxServiceUrl(txServiceUrl));
+        return (['api.safe.global', 'api.5afe.dev'].includes(url.hostname) &&
+            /^\/tx-service\/[^/]+\/api$/.test(url.pathname));
+    }
+    catch {
+        return false;
+    }
+}
+function getSafeApiKitConfig(chainId, txServiceUrl, gnosisSafeApiKey) {
+    const normalizedTxServiceUrl = normalizeSafeTxServiceUrl(txServiceUrl);
+    const apiKey = safeApiKeyRequired(normalizedTxServiceUrl)
+        ? gnosisSafeApiKey
+        : undefined;
+    const baseConfig = {
+        chainId: BigInt(chainId),
+        apiKey,
+    };
+    // Safe's hosted gateway authenticates API-key traffic correctly when API Kit
+    // derives the service URL from chainId. Supplying txServiceUrl can hit lower
+    // unauthenticated rate limits on some endpoints.
+    if (apiKey && isSafeGlobalTxServiceUrl(normalizedTxServiceUrl)) {
+        return baseConfig;
+    }
+    return {
+        ...baseConfig,
+        txServiceUrl: normalizedTxServiceUrl,
+    };
+}
 function getSafeService(chain, multiProvider) {
     const { gnosisSafeTransactionServiceUrl, gnosisSafeApiKey } = multiProvider.getChainMetadata(chain);
-    let txServiceUrl = gnosisSafeTransactionServiceUrl;
-    if (!txServiceUrl) {
-        throw new Error(`must provide tx service url for ${chain}`);
-    }
-    // Ensure txServiceUrl ends with /api
-    if (!txServiceUrl.endsWith('/api') &&
-        !txServiceUrl.endsWith('/api/') &&
-        !txServiceUrl.endsWith('api')) {
-        // Remove trailing slash if present to avoid double slashes
-        txServiceUrl = txServiceUrl.replace(/\/+$/, '');
-        txServiceUrl = `${txServiceUrl}/api`;
-    }
+    (0,validation/* assert */.v)(gnosisSafeTransactionServiceUrl, `must provide tx service url for ${chain}`);
     const chainId = multiProvider.getEvmChainId(chain);
-    if (!chainId) {
-        throw new Error(`Chain is not an EVM chain: ${chain}`);
+    (0,validation/* assert */.v)(chainId, `Chain is not an EVM chain: ${chain}`);
+    const config = getSafeApiKitConfig(chainId, gnosisSafeTransactionServiceUrl, gnosisSafeApiKey);
+    (0,validation/* assert */.v)(isSafeApiKitConstructor(index_default), '@safe-global/api-kit default export is not a constructor');
+    try {
+        return new index_default(config);
+    }
+    catch (error) {
+        if (error instanceof TypeError &&
+            error.message.includes('There is no transaction service available for chainId') &&
+            !config.txServiceUrl &&
+            isSafeGlobalTxServiceUrl(gnosisSafeTransactionServiceUrl)) {
+            return new index_default({
+                ...config,
+                txServiceUrl: normalizeSafeTxServiceUrl(gnosisSafeTransactionServiceUrl),
+            });
+        }
+        throw error;
     }
-    // @ts-ignore
-    return new index_default({
-        chainId: BigInt(chainId),
-        txServiceUrl,
-        // Only provide apiKey if the url contains safe.global or 5afe.dev
-        apiKey: safeApiKeyRequired(txServiceUrl) ? gnosisSafeApiKey : undefined,
-    });
 }
 // This is the version of the Safe contracts that the SDK is compatible with.
 // Copied the MVP fields from https://github.com/safe-global/safe-core-sdk/blob/4d1c0e14630f951c2498e1d4dd521403af91d6e1/packages/protocol-kit/src/contracts/config.ts#L19
@@ -800013,7 +800396,13 @@ async function canProposeSafeTransactions(proposer, chain, multiProvider, safeAd
     try {
         safeService = getSafeService(chain, multiProvider);
     }
-    catch {
+    catch (e) {
+        logging/* rootLogger */.Jk.error('Failed to get Safe service for chain', {
+            chain,
+            chainName: multiProvider.tryGetChainName(chain),
+            knownChains: multiProvider.getKnownChainNames(),
+            error: e,
+        });
         return false;
     }
     const safe = await getSafe(chain, multiProvider, safeAddress);
@@ -801730,7 +802119,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   N: () => (/* binding */ EvmWarpModule)
 /* harmony export */ });
-/* harmony import */ var compare_versions__WEBPACK_IMPORTED_MODULE_29__ = __nccwpck_require__(95416);
+/* harmony import */ var compare_versions__WEBPACK_IMPORTED_MODULE_31__ = __nccwpck_require__(95416);
 /* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_21__ = __nccwpck_require__(61934);
 /* harmony import */ var starknet__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(98954);
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(50653);
@@ -801742,26 +802131,28 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(52193);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_18__ = __nccwpck_require__(73689);
 /* harmony import */ var _block_explorer_etherscan_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(26492);
-/* harmony import */ var _contracts_contracts_js__WEBPACK_IMPORTED_MODULE_26__ = __nccwpck_require__(15570);
+/* harmony import */ var _contracts_contracts_js__WEBPACK_IMPORTED_MODULE_28__ = __nccwpck_require__(15570);
 /* harmony import */ var _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(53387);
 /* harmony import */ var _deploy_proxy_js__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(83697);
 /* harmony import */ var _deploy_verify_ContractVerifier_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(76939);
 /* harmony import */ var _fee_EvmTokenFeeModule_js__WEBPACK_IMPORTED_MODULE_25__ = __nccwpck_require__(43313);
+/* harmony import */ var _fee_crossCollateralUtils_js__WEBPACK_IMPORTED_MODULE_27__ = __nccwpck_require__(66630);
+/* harmony import */ var _fee_types_js__WEBPACK_IMPORTED_MODULE_26__ = __nccwpck_require__(52555);
 /* harmony import */ var _hook_updates_js__WEBPACK_IMPORTED_MODULE_20__ = __nccwpck_require__(69203);
 /* harmony import */ var _hook_utils_js__WEBPACK_IMPORTED_MODULE_19__ = __nccwpck_require__(13912);
 /* harmony import */ var _hook_types_js__WEBPACK_IMPORTED_MODULE_22__ = __nccwpck_require__(52116);
-/* harmony import */ var _ism_EvmIsmModule_js__WEBPACK_IMPORTED_MODULE_27__ = __nccwpck_require__(3612);
+/* harmony import */ var _ism_EvmIsmModule_js__WEBPACK_IMPORTED_MODULE_29__ = __nccwpck_require__(3612);
 /* harmony import */ var _predicate_PredicateDeployer_js__WEBPACK_IMPORTED_MODULE_23__ = __nccwpck_require__(550);
 /* harmony import */ var _router_types_js__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(38230);
-/* harmony import */ var _utils_decimals_js__WEBPACK_IMPORTED_MODULE_30__ = __nccwpck_require__(27043);
+/* harmony import */ var _utils_decimals_js__WEBPACK_IMPORTED_MODULE_32__ = __nccwpck_require__(27043);
 /* harmony import */ var _ism_types_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(69352);
 /* harmony import */ var _utils_ism_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(764);
 /* harmony import */ var _EvmWarpRouteReader_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(40945);
 /* harmony import */ var _EvmXERC20Module_js__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(5715);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_28__ = __nccwpck_require__(4169);
+/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_30__ = __nccwpck_require__(4169);
 /* harmony import */ var _configUtils_js__WEBPACK_IMPORTED_MODULE_24__ = __nccwpck_require__(63776);
-/* harmony import */ var _contracts_js__WEBPACK_IMPORTED_MODULE_32__ = __nccwpck_require__(81504);
-/* harmony import */ var _deploy_js__WEBPACK_IMPORTED_MODULE_31__ = __nccwpck_require__(19186);
+/* harmony import */ var _contracts_js__WEBPACK_IMPORTED_MODULE_34__ = __nccwpck_require__(81504);
+/* harmony import */ var _deploy_js__WEBPACK_IMPORTED_MODULE_33__ = __nccwpck_require__(19186);
 /* harmony import */ var _types_js__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(38466);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_EvmXERC20Module_js__WEBPACK_IMPORTED_MODULE_13__]);
 _EvmXERC20Module_js__WEBPACK_IMPORTED_MODULE_13__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
@@ -801791,6 +802182,8 @@ _EvmXERC20Module_js__WEBPACK_IMPORTED_MODULE_13__ = (__webpack_async_dependencie
 
 
 
+
+
 
 
 
@@ -802623,6 +803016,16 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
      */
     async createTokenFeeUpdateTxs(actualConfig, expectedConfig, tokenReaderParams) {
         if (!expectedConfig.tokenFee) {
+            if (actualConfig.tokenFee) {
+                return [
+                    {
+                        annotation: 'Removing fee recipient...',
+                        chainId: this.chainId,
+                        to: this.args.addresses.deployedTokenRoute,
+                        data: _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_1__/* .TokenRouter__factory */ .NgW.createInterface().encodeFunctionData('setFeeRecipient(address)', [ethers__WEBPACK_IMPORTED_MODULE_21__.constants.AddressZero]),
+                    },
+                ];
+            }
             return [];
         }
         const routerAddress = this.args.addresses.deployedTokenRoute;
@@ -802670,7 +803073,21 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
                 deployedFee: currentTokenFee.address,
             },
         }, this.contractVerifier);
-        const updateTransactions = await tokenFeeModule.update(resolvedTokenFee, tokenReaderParams);
+        // For CCR fee updates, forward the on-chain enrolled router keys as hints so the
+        // reader can observe orphan feeContracts entries not present in the target config.
+        // Without these hints, the removal loop in EvmTokenFeeModule.update() never sees
+        // stale (dest, router) entries and the on-chain pointer stays wired.
+        let effectiveTokenReaderParams = tokenReaderParams;
+        if ((0,_types_js__WEBPACK_IMPORTED_MODULE_12__/* .isCrossCollateralTokenConfig */ .v3)(actualConfig) &&
+            actualConfig.crossCollateralRouters &&
+            resolvedTokenFee.type === _fee_types_js__WEBPACK_IMPORTED_MODULE_26__/* .TokenFeeType */ .cA.CrossCollateralRoutingFee) {
+            const onchainRoutersByDomain = (0,_router_types_js__WEBPACK_IMPORTED_MODULE_17__/* .resolveRouterMapConfig */ .c0)(this.multiProvider, actualConfig.crossCollateralRouters);
+            effectiveTokenReaderParams = {
+                ...tokenReaderParams,
+                crossCollateralRouters: (0,_fee_crossCollateralUtils_js__WEBPACK_IMPORTED_MODULE_27__/* .mergeCrossCollateralRouters */ .wC)(tokenReaderParams?.crossCollateralRouters, onchainRoutersByDomain),
+            };
+        }
+        const updateTransactions = await tokenFeeModule.update(resolvedTokenFee, effectiveTokenReaderParams);
         const { deployedFee } = tokenFeeModule.serialize();
         // Only call setFeeRecipient if the fee recipient address has changed
         if (!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .eqAddress */ .fv)(currentTokenFee.address, deployedFee)) {
@@ -802691,7 +803108,7 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
      * @returns Ethereum transaction that need to be executed to update the owner.
      */
     createOwnershipUpdateTxs(actualConfig, expectedConfig) {
-        return (0,_contracts_contracts_js__WEBPACK_IMPORTED_MODULE_26__/* .transferOwnershipTransactions */ .Yg)(this.multiProvider.getEvmChainId(this.args.chain), this.args.addresses.deployedTokenRoute, actualConfig, expectedConfig, `${expectedConfig.type} Warp Route`);
+        return (0,_contracts_contracts_js__WEBPACK_IMPORTED_MODULE_28__/* .transferOwnershipTransactions */ .Yg)(this.multiProvider.getEvmChainId(this.args.chain), this.args.addresses.deployedTokenRoute, actualConfig, expectedConfig, `${expectedConfig.type} Warp Route`);
     }
     /**
      * Updates or deploys the ISM using the provided configuration.
@@ -802727,7 +803144,7 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
                 (typeof onChainOwner === 'string' ? onChainOwner : undefined);
             expectedIsm = (0,_utils_ism_js__WEBPACK_IMPORTED_MODULE_11__/* .setRateLimitedIsmRecipient */ .re)(expectedIsm, this.args.addresses.deployedTokenRoute, defaultOwner);
         }
-        const ismModule = new _ism_EvmIsmModule_js__WEBPACK_IMPORTED_MODULE_27__/* .EvmIsmModule */ .a(this.multiProvider, {
+        const ismModule = new _ism_EvmIsmModule_js__WEBPACK_IMPORTED_MODULE_29__/* .EvmIsmModule */ .a(this.multiProvider, {
             chain: this.args.chain,
             config: actualConfig.interchainSecurityModule,
             addresses: {
@@ -802750,7 +803167,7 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
      */
     async upgradeWarpRouteImplementationTx(actualConfig, expectedConfig) {
         const updateTransactions = [];
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)(expectedConfig.type !== _config_js__WEBPACK_IMPORTED_MODULE_28__/* .TokenType */ .ks.unknown, 'Cannot upgrade warp route with unknown token type');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)(expectedConfig.type !== _config_js__WEBPACK_IMPORTED_MODULE_30__/* .TokenType */ .ks.unknown, 'Cannot upgrade warp route with unknown token type');
         // This should be impossible since we try catch the call to `PACKAGE_VERSION`
         // in `EvmWarpRouteReader.fetchPackageVersion`
         (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)(actualConfig.contractVersion, 'Actual contract version is undefined');
@@ -802758,7 +803175,7 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
         if (!expectedConfig.contractVersion) {
             return [];
         }
-        const comparisonValue = (0,compare_versions__WEBPACK_IMPORTED_MODULE_29__.compareVersions)(expectedConfig.contractVersion, actualConfig.contractVersion);
+        const comparisonValue = (0,compare_versions__WEBPACK_IMPORTED_MODULE_31__.compareVersions)(expectedConfig.contractVersion, actualConfig.contractVersion);
         // Expected version is lower than actual version, no upgrade is possible
         if (comparisonValue === -1) {
             throw new Error(`Expected contract version ${expectedConfig.contractVersion} is lower than actual contract version ${actualConfig.contractVersion}`);
@@ -802773,13 +803190,13 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
         // Scale values are immutables baked into the implementation bytecode.
         // Changing the effective scale during an upgrade would cause in-flight
         // messages to be decoded with incorrect scaling.
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)((0,_utils_decimals_js__WEBPACK_IMPORTED_MODULE_30__/* .scalesEqual */ .gm)(actualConfig.scale, expectedConfig.scale), `Scale change detected during upgrade. ` +
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_15__/* .assert */ .v)((0,_utils_decimals_js__WEBPACK_IMPORTED_MODULE_32__/* .scalesEqual */ .gm)(actualConfig.scale, expectedConfig.scale), `Scale change detected during upgrade. ` +
             `Changing scale on an existing deployment may cause in-flight messages to be decoded incorrectly.`);
         this.logger.info(`Upgrading Warp Route implementation on ${this.args.chain} from ${actualConfig.contractVersion} to ${expectedConfig.contractVersion}`);
-        const deployer = new _deploy_js__WEBPACK_IMPORTED_MODULE_31__/* .HypERC20Deployer */ .A7(this.multiProvider);
+        const deployer = new _deploy_js__WEBPACK_IMPORTED_MODULE_33__/* .HypERC20Deployer */ .A7(this.multiProvider);
         const constructorArgs = await deployer.constructorArgs(this.chainName, expectedConfig);
         const tokenType = expectedConfig.type;
-        const implementation = await deployer.deployContractWithName(this.chainName, tokenType, _contracts_js__WEBPACK_IMPORTED_MODULE_32__/* .hypERC20contracts */ .LW[tokenType], constructorArgs, undefined, false);
+        const implementation = await deployer.deployContractWithName(this.chainName, tokenType, _contracts_js__WEBPACK_IMPORTED_MODULE_34__/* .hypERC20contracts */ .LW[tokenType], constructorArgs, undefined, false);
         const provider = this.multiProvider.getProvider(this.domainId);
         const proxyAddress = this.args.addresses.deployedTokenRoute;
         const proxyAdminAddress = await (0,_deploy_proxy_js__WEBPACK_IMPORTED_MODULE_14__/* .proxyAdmin */ .Ey)(provider, proxyAddress);
@@ -802808,9 +803225,9 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
         // proxy upgrade. Always emit setMaxFeePpm in this case.
         const crossingPpmBoundary = actualConfig.contractVersion &&
             expectedConfig.contractVersion &&
-            (0,compare_versions__WEBPACK_IMPORTED_MODULE_29__.compareVersions)(actualConfig.contractVersion, _EvmWarpRouteReader_js__WEBPACK_IMPORTED_MODULE_7__/* .CCTP_PPM_STORAGE_VERSION */ .EY) <
+            (0,compare_versions__WEBPACK_IMPORTED_MODULE_31__.compareVersions)(actualConfig.contractVersion, _EvmWarpRouteReader_js__WEBPACK_IMPORTED_MODULE_7__/* .CCTP_PPM_STORAGE_VERSION */ .EY) <
                 0 &&
-            (0,compare_versions__WEBPACK_IMPORTED_MODULE_29__.compareVersions)(expectedConfig.contractVersion, _EvmWarpRouteReader_js__WEBPACK_IMPORTED_MODULE_7__/* .CCTP_PPM_STORAGE_VERSION */ .EY) >= 0;
+            (0,compare_versions__WEBPACK_IMPORTED_MODULE_31__.compareVersions)(expectedConfig.contractVersion, _EvmWarpRouteReader_js__WEBPACK_IMPORTED_MODULE_7__/* .CCTP_PPM_STORAGE_VERSION */ .EY) >= 0;
         if (!crossingPpmBoundary && actualMaxFeeBps === expectedConfig.maxFeeBps) {
             return [];
         }
@@ -802835,7 +803252,7 @@ class EvmWarpModule extends _core_AbstractHyperlaneModule_js__WEBPACK_IMPORTED_M
     static async create(params) {
         const { chain, config, multiProvider, ccipContractCache, contractVerifier, proxyFactoryFactories, } = params;
         const chainName = multiProvider.getChainName(chain);
-        const deployer = new _deploy_js__WEBPACK_IMPORTED_MODULE_31__/* .HypERC20Deployer */ .A7(multiProvider);
+        const deployer = new _deploy_js__WEBPACK_IMPORTED_MODULE_33__/* .HypERC20Deployer */ .A7(multiProvider);
         const deployedContracts = await deployer.deployContracts(chainName, config);
         const warpModule = new EvmWarpModule(multiProvider, {
             addresses: {
@@ -803130,7 +803547,7 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
             'interchainSecurityModule' in routerConfig) {
             routerConfig.interchainSecurityModule = lib.constants.AddressZero;
         }
-        const predicateWrapper = await this.derivePredicateWrapperConfig(routerConfig.hook);
+        const predicateWrapper = await this.derivePredicateWrapperConfig(routerConfig.hook, warpRouteAddress);
         const derivedConfig = {
             ...routerConfig,
             ...tokenConfig,
@@ -803146,9 +803563,37 @@ class EvmWarpRouteReader extends EvmRouterReader/* EvmRouterReader */.V {
     /**
      * Searches the derived hook tree for a PredicateRouterWrapper and, if found,
      * reads its on-chain config (registry, policyId, owner).
+     *
+     * EvmHookReader.preserveUnredeployable() stores PREDICATE sub-hooks as bare address
+     * strings (to survive normalizeConfig and deploy's string branch). The sync
+     * findPredicateAddressInHook() returns undefined for bare strings, so we fall back to
+     * an on-chain hookType() probe on bare string sub-hooks of aggregation hooks.
      */
-    async derivePredicateWrapperConfig(hook) {
-        const predicateAddress = this.findPredicateAddressInHook(hook);
+    async derivePredicateWrapperConfig(hook, warpRouteAddress) {
+        let predicateAddress = this.findPredicateAddressInHook(hook);
+        if (!predicateAddress &&
+            typeof hook !== 'string' &&
+            hook?.type === types/* HookType */.WD.AGGREGATION) {
+            for (const sub of hook.hooks) {
+                if (typeof sub !== 'string')
+                    continue;
+                try {
+                    const candidate = dist/* PredicateRouterWrapper__factory */.sYb.connect(sub, this.provider);
+                    const [hookType, warpRoute] = await Promise.all([
+                        candidate.hookType(),
+                        candidate.warpRoute(),
+                    ]);
+                    if (hookType === types/* OnchainHookType */.c0.PREDICATE_ROUTER_WRAPPER &&
+                        (0,addresses/* eqAddress */.fv)(warpRoute, warpRouteAddress)) {
+                        predicateAddress = sub;
+                        break;
+                    }
+                }
+                catch {
+                    // Not a PredicateRouterWrapper — continue
+                }
+            }
+        }
         if (!predicateAddress)
             return undefined;
         const wrapper = dist/* PredicateRouterWrapper__factory */.sYb.connect(predicateAddress, this.provider);
@@ -804887,6 +805332,7 @@ class TokenMetadata {
 /* harmony export */   Zz: () => (/* binding */ PROTOCOL_TO_HYP_NATIVE_STANDARD),
 /* harmony export */   _T: () => (/* binding */ tokenTypeToStandard),
 /* harmony export */   c_: () => (/* binding */ LOCKBOX_STANDARDS),
+/* harmony export */   eB: () => (/* binding */ ERC4626_COLLATERAL_STANDARDS),
 /* harmony export */   kK: () => (/* binding */ TOKEN_CROSS_COLLATERAL_STANDARDS),
 /* harmony export */   ph: () => (/* binding */ TokenStandard),
 /* harmony export */   ro: () => (/* binding */ TOKEN_STANDARD_TO_PROVIDER_TYPE)
@@ -805077,6 +805523,7 @@ const TOKEN_NFT_STANDARDS = [
 const TOKEN_COLLATERALIZED_STANDARDS = [
     TokenStandard.EvmHypCollateral,
     TokenStandard.EvmHypOwnerCollateral,
+    TokenStandard.EvmHypRebaseCollateral,
     TokenStandard.EvmHypNative,
     TokenStandard.SealevelHypCollateral,
     TokenStandard.SealevelHypNative,
@@ -805089,6 +805536,8 @@ const TOKEN_COLLATERALIZED_STANDARDS = [
     TokenStandard.AleoHypCollateral,
     TokenStandard.TronHypNative,
     TokenStandard.TronHypCollateral,
+    TokenStandard.TronHypOwnerCollateral,
+    TokenStandard.TronHypRebaseCollateral,
     TokenStandard.TronHypXERC20Lockbox,
     TokenStandard.TronHypVSXERC20Lockbox,
     TokenStandard.RadixHypCollateral,
@@ -805119,6 +805568,12 @@ const LOCKBOX_STANDARDS = [
     TokenStandard.TronHypXERC20Lockbox,
     TokenStandard.TronHypVSXERC20Lockbox,
 ];
+const ERC4626_COLLATERAL_STANDARDS = [
+    TokenStandard.EvmHypOwnerCollateral,
+    TokenStandard.EvmHypRebaseCollateral,
+    TokenStandard.TronHypOwnerCollateral,
+    TokenStandard.TronHypRebaseCollateral,
+];
 const MINT_LIMITED_STANDARDS = [
     TokenStandard.EvmHypXERC20,
     TokenStandard.EvmHypXERC20Lockbox,
@@ -806131,6 +806586,7 @@ __nccwpck_require__.d(__webpack_exports__, {
   u$: () => (/* binding */ EvmHypCollateralAdapter),
   OR: () => (/* binding */ EvmHypCollateralFiatAdapter),
   uc: () => (/* binding */ EvmHypNativeAdapter),
+  dv: () => (/* binding */ EvmHypOwnerCollateralAdapter),
   aT: () => (/* binding */ EvmHypRebaseCollateralAdapter),
   Qn: () => (/* binding */ EvmHypSyntheticAdapter),
   kL: () => (/* binding */ EvmHypSyntheticRebaseAdapter),
@@ -806715,8 +807171,20 @@ class EvmHypRebaseCollateralAdapter extends BaseEvmHypCollateralAdapter {
     async getBridgedSupply(options) {
         const vault = dist/* ERC4626__factory */.RTL.connect(await this.collateralContract.vault(), this.getProvider());
         const overrides = buildBlockTagOverrides(options?.blockTag);
-        const balance = await vault.balanceOf(this.addresses.token, overrides);
-        return balance.toBigInt();
+        const assets = await vault.maxWithdraw(this.addresses.token, overrides);
+        return assets.toBigInt();
+    }
+}
+class EvmHypOwnerCollateralAdapter extends EvmHypRebaseCollateralAdapter {
+    collateralContract;
+    constructor(chainName, multiProvider, addresses) {
+        super(chainName, multiProvider, addresses);
+        this.collateralContract = dist/* HypERC4626OwnerCollateral__factory */.uhc.connect(addresses.token, this.getProvider());
+    }
+    async getBridgedSupply(options) {
+        const overrides = buildBlockTagOverrides(options?.blockTag);
+        const assetDeposited = await this.collateralContract.assetDeposited(overrides);
+        return assetDeposited.toBigInt();
     }
 }
 class EvmHypSyntheticRebaseAdapter extends EvmHypSyntheticAdapter {
@@ -812579,10 +813047,8 @@ function createEvmHypAdapter(multiProvider, token) {
     return (0,_evmLikeHyp_js__WEBPACK_IMPORTED_MODULE_0__/* .createEvmLikeHypAdapter */ .a)(multiProvider, token, {
         native: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmNative,
         hypNative: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypNative,
-        hypCollateral: [
-            _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypCollateral,
-            _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypOwnerCollateral,
-        ],
+        hypCollateral: [_TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypCollateral],
+        hypOwnerCollateral: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypOwnerCollateral,
         hypCrossCollateralRouter: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypCrossCollateralRouter,
         hypRebaseCollateral: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypRebaseCollateral,
         hypCollateralFiat: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypCollateralFiat,
@@ -812723,6 +813189,12 @@ function createEvmLikeHypAdapter(multiProvider, token, standards) {
             token: addressOrDenom,
         });
     }
+    if (standards.hypOwnerCollateral &&
+        standard === standards.hypOwnerCollateral) {
+        return new EvmTokenAdapter/* EvmHypOwnerCollateralAdapter */.dv(chainName, multiProvider, {
+            token: addressOrDenom,
+        });
+    }
     if (standards.hypCollateral.some((candidate) => candidate === standard)) {
         return new EvmTokenAdapter/* EvmMovableCollateralAdapter */.vo(chainName, multiProvider, {
             token: addressOrDenom,
@@ -813870,10 +814342,8 @@ function createTronHypAdapter(multiProvider, token) {
     return (0,_evmLikeHyp_js__WEBPACK_IMPORTED_MODULE_0__/* .createEvmLikeHypAdapter */ .a)(multiProvider, token, {
         native: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronNative,
         hypNative: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypNative,
-        hypCollateral: [
-            _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypCollateral,
-            _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypOwnerCollateral,
-        ],
+        hypCollateral: [_TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypCollateral],
+        hypOwnerCollateral: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypOwnerCollateral,
         hypCrossCollateralRouter: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypCrossCollateralRouter,
         hypRebaseCollateral: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypRebaseCollateral,
         hypCollateralFiat: _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypCollateralFiat,
@@ -815403,7 +815873,7 @@ const PROTOCOL_TO_DEFAULT_NATIVE_TOKEN = {
     },
     [_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .ProtocolType */ .Hb.Aleo]: {
         decimals: 6,
-        denom: '0field',
+        denom: 'credits',
         name: 'Aleo',
         symbol: 'ALEO',
     },
@@ -818886,9 +819356,11 @@ class WarpCore {
             return originToken.amount(0);
     }
     async getTokenCollateral(token) {
-        if (_token_TokenStandard_js__WEBPACK_IMPORTED_MODULE_13__/* .LOCKBOX_STANDARDS */ .c_.includes(token.standard)) {
-            const adapter = token.getAdapter(this.multiProvider);
+        if (_token_TokenStandard_js__WEBPACK_IMPORTED_MODULE_13__/* .LOCKBOX_STANDARDS */ .c_.includes(token.standard) ||
+            _token_TokenStandard_js__WEBPACK_IMPORTED_MODULE_13__/* .ERC4626_COLLATERAL_STANDARDS */ .eB.includes(token.standard)) {
+            const adapter = token.getHypAdapter(this.multiProvider);
             const tokenCollateral = await adapter.getBridgedSupply();
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(tokenCollateral !== undefined, `getBridgedSupply returned undefined for ${token.symbol} on ${token.chainName}`);
             return tokenCollateral;
         }
         else {
@@ -907327,7 +907799,7 @@ module.exports = /*#__PURE__*/JSON.parse('[{"type":"function","name":"proveL2Lea
 /***/ 99468:
 /***/ ((module) => {
 
-module.exports = {"rE":"34.0.0"};
+module.exports = {"rE":"35.0.0"};
 
 /***/ })