@hyperlane-xyz/cli 33.0.0 → 33.0.2

package/bundle/index.js

@@ -672930,6 +672930,9 @@ class AleoProtocolProvider {
             : new _provablehq_sdk_testnet_js__WEBPACK_IMPORTED_MODULE_1__/* .AleoNetworkClient */ .zX(rpcUrl);
         return new _validator_announce_validator_announce_artifact_manager_js__WEBPACK_IMPORTED_MODULE_7__/* .AleoValidatorAnnounceArtifactManager */ .q({ domainId: chainMetadata.domainId, aleoNetworkId }, aleoClient);
     }
+    createFeeArtifactManager(_chainMetadata) {
+        return null;
+    }
     getMinGas() {
         return {
             CORE_DEPLOY_GAS: 0n,
@@ -681796,7 +681799,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ });
 /* unused harmony export getContext */
 /* harmony import */ var _inquirer_prompts__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(98720);
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(71280);
 /* harmony import */ var _hyperlane_xyz_registry_fs__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(84873);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(3483);
@@ -682731,7 +682734,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */   d: () => (/* binding */ validateCoreConfigForAltVM),
 /* harmony export */   u: () => (/* reexport safe */ _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__.u_)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(38231);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__]);
 _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
@@ -682782,7 +682785,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ });
 /* harmony import */ var yaml__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(10684);
 /* harmony import */ var _hyperlane_xyz_core_buildArtifact_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(74119);
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(71280);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(76939);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(26492);
@@ -683285,7 +683288,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony import */ var _inquirer_prompts__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(98720);
 /* harmony import */ var yaml__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(10684);
 /* harmony import */ var _hyperlane_xyz_core_buildArtifact_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(74119);
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_deploy_sdk_AltVMFileSubmitter__WEBPACK_IMPORTED_MODULE_36__ = __nccwpck_require__(49988);
 /* harmony import */ var _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(71280);
 /* harmony import */ var _hyperlane_xyz_provider_sdk_artifact__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(4287);
@@ -684624,7 +684627,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   C: () => (/* binding */ readHookConfig)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(69319);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(16639);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(73938);
@@ -684689,7 +684692,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */   E: () => (/* binding */ runIsmDeploy)
 /* harmony export */ });
 /* harmony import */ var _hyperlane_xyz_core_buildArtifact_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(74119);
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_provider_sdk_ism__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(96426);
 /* harmony import */ var _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(71280);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(69352);
@@ -684833,7 +684836,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   Y: () => (/* binding */ readIsmConfig)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(60715);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(22887);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(16639);
@@ -684953,7 +684956,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   R: () => (/* binding */ executeCoreRead)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(80031);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(22887);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(21387);
@@ -685019,7 +685022,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* unused harmony exports getWarpRouteConfigsByCore, logXERC20Limits */
 /* harmony import */ var ethers__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(61934);
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(50653);
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(71280);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(40945);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(22887);
@@ -693924,7 +693927,7 @@ __webpack_async_result__();
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   x: () => (/* binding */ VERSION)
 /* harmony export */ });
-const VERSION = '33.0.0';
+const VERSION = '33.0.2';
 //# sourceMappingURL=version.js.map
 
 /***/ }),
@@ -694001,6 +694004,9 @@ class CosmosNativeProtocolProvider {
         // Cosmos does not support validator announce
         return null;
     }
+    createFeeArtifactManager(_chainMetadata) {
+        return null;
+    }
     getMinGas() {
         return {
             CORE_DEPLOY_GAS: BigInt(1e6),
@@ -712049,7 +712055,7 @@ class AltVMFileSubmitter {
 
 /***/ }),
 
-/***/ 66423:
+/***/ 56854:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
 
@@ -712068,7 +712074,7 @@ __nccwpck_require__.d(__webpack_exports__, {
   mM: () => (/* reexport */ validateIsmConfig)
 });
 
-// UNUSED EXPORTS: CoreArtifactReader, CoreWriter, HookWriter, IsmWriter, UnsupportedIsmTypeError, WarpTokenReader, WarpTokenWriter, validateIsmType
+// UNUSED EXPORTS: CoreArtifactReader, CoreWriter, FeeReader, FeeWriter, HookWriter, IsmWriter, UnsupportedIsmTypeError, WarpTokenReader, WarpTokenWriter, createFeeReader, createFeeWriter, validateIsmType
 
 // EXTERNAL MODULE: ../utils/dist/logging.js
 var logging = __nccwpck_require__(94523);
@@ -712115,6 +712121,88 @@ class AltVMJsonRpcSubmitter {
 //# sourceMappingURL=AltVMJsonRpcSubmitter.js.map
 // EXTERNAL MODULE: ../provider-sdk/dist/index.js + 3 modules
 var dist = __nccwpck_require__(71280);
+;// CONCATENATED MODULE: ../deploy-sdk/dist/fee/fee-reader.js
+
+/**
+ * Factory function to create a FeeReader instance.
+ * Returns null if the protocol does not support fee programs.
+ *
+ * @param chainMetadata Chain metadata for the target chain
+ * @param context Required fee read context with domains and routers to check
+ * @returns A FeeReader instance, or null if the protocol does not support fees
+ */
+function createFeeReader(chainMetadata, context) {
+    const protocolProvider = (0,dist/* getProtocolProvider */.IU)(chainMetadata.protocol);
+    const artifactManager = protocolProvider.createFeeArtifactManager(chainMetadata);
+    if (!artifactManager) {
+        return null;
+    }
+    return new FeeReader(artifactManager, context);
+}
+/**
+ * Generic Fee Reader that reads fee configurations from on-chain state.
+ *
+ * The FeeReadContext is required at construction time to ensure the reader always
+ * knows which domains and routers to check (some fee contracts are not enumerable).
+ */
+class FeeReader {
+    artifactManager;
+    context;
+    constructor(artifactManager, context) {
+        this.artifactManager = artifactManager;
+        this.context = context;
+    }
+    async read(address) {
+        return this.artifactManager.readFee(address, this.context);
+    }
+}
+//# sourceMappingURL=fee-reader.js.map
+;// CONCATENATED MODULE: ../deploy-sdk/dist/fee/fee-writer.js
+
+
+/**
+ * Factory function to create a FeeWriter instance.
+ * Returns null if the protocol does not support fee programs.
+ *
+ * @param chainMetadata Chain metadata for the target chain
+ * @param signer Signer interface for signing transactions
+ * @param context Required fee read context with domains and routers to check
+ * @returns A FeeWriter instance, or null if the protocol does not support fees
+ */
+function createFeeWriter(chainMetadata, signer, context) {
+    const protocolProvider = (0,dist/* getProtocolProvider */.IU)(chainMetadata.protocol);
+    const artifactManager = protocolProvider.createFeeArtifactManager(chainMetadata);
+    if (!artifactManager) {
+        return null;
+    }
+    return new FeeWriter(artifactManager, context, signer);
+}
+/**
+ * FeeWriter handles creation and updates of fee configurations using the Artifact API.
+ * It delegates to protocol-specific artifact writers for individual fee types.
+ *
+ * Extends FeeReader to inherit read() functionality.
+ * The FeeReadContext is required at construction time to ensure the reader always
+ * knows which domains and routers to check (some fee contracts are not enumerable).
+ */
+class FeeWriter extends FeeReader {
+    signer;
+    constructor(artifactManager, context, signer) {
+        super(artifactManager, context);
+        this.signer = signer;
+    }
+    async create(artifact) {
+        const { config } = artifact;
+        const writer = this.artifactManager.createWriter(config.type, this.signer);
+        return writer.create(artifact);
+    }
+    async update(artifact) {
+        const { config } = artifact;
+        const writer = this.artifactManager.createWriter(config.type, this.signer);
+        return writer.update(artifact);
+    }
+}
+//# sourceMappingURL=fee-writer.js.map
 // EXTERNAL MODULE: ../provider-sdk/dist/artifact.js
 var dist_artifact = __nccwpck_require__(4287);
 // EXTERNAL MODULE: ../provider-sdk/dist/hook.js
@@ -713134,6 +713222,8 @@ class UnsupportedIsmTypeError extends Error {
     }
 }
 //# sourceMappingURL=validation.js.map
+// EXTERNAL MODULE: ../utils/dist/validation.js
+var validation = __nccwpck_require__(21387);
 // EXTERNAL MODULE: ../provider-sdk/dist/warp.js
 var warp = __nccwpck_require__(17791);
 ;// CONCATENATED MODULE: ../deploy-sdk/dist/warp/warp-reader.js
@@ -713142,6 +713232,8 @@ var warp = __nccwpck_require__(17791);
 
 
 
+
+
 /**
  * Generic Warp Token Reader that can read any warp token type by detecting its type
  * and expanding nested ISM artifacts if present.
@@ -713168,12 +713260,15 @@ class WarpTokenReader {
         const expandedIsmArtifact = await this.expandIsmArtifact(rawArtifact.config.interchainSecurityModule);
         // Expand nested Hook artifact if present
         const expandedHookArtifact = await this.expandHookArtifact(hookReader, rawArtifact.config.hook);
+        // Expand nested Fee artifact if present
+        const expandedFeeArtifact = await this.expandFeeArtifact(rawArtifact.config, rawArtifact.config.fee);
         return {
             ...rawArtifact,
             config: {
                 ...rawArtifact.config,
                 interchainSecurityModule: expandedIsmArtifact,
                 hook: expandedHookArtifact,
+                fee: expandedFeeArtifact,
             },
         };
     }
@@ -713215,6 +713310,28 @@ class WarpTokenReader {
         // NEW state should not occur in read artifacts
         throw new Error(`Unexpected Hook artifact state 'new' when reading warp token Hook configuration`);
     }
+    /**
+     * Expands a Fee artifact by reading it if underived.
+     * Builds FeeReadContext from the warp config's remote routers and CC routers.
+     * Returns undefined only when no feeArtifact is provided. Deployed artifacts
+     * are returned as-is. Underived artifacts are read via the fee reader.
+     * Throws if a fee artifact exists but the protocol has no fee artifact manager.
+     */
+    async expandFeeArtifact(warpConfig, feeArtifact) {
+        if (!feeArtifact) {
+            return undefined;
+        }
+        if ((0,dist_artifact/* isArtifactDeployed */.R)(feeArtifact)) {
+            return feeArtifact;
+        }
+        if ((0,dist_artifact/* isArtifactUnderived */.l2)(feeArtifact)) {
+            const context = (0,warp/* buildFeeReadContextFromWarpArtifactConfig */.oS)(warpConfig);
+            const feeReader = createFeeReader(this.chainMetadata, context);
+            (0,validation/* assert */.v)(feeReader, `Fee artifact present on warp config but protocol ${this.chainMetadata.protocol} has no fee artifact manager`);
+            return feeReader.read(feeArtifact.deployed.address);
+        }
+        throw new Error(`Unexpected Fee artifact state 'new' when reading warp token Fee configuration`);
+    }
     /**
      * Backward compatibility method that converts DeployedWarpArtifact to DerivedWarpConfig.
      * This allows WarpTokenReader to be used as a drop-in replacement for the old AltVMWarpRouteReader.
@@ -713245,8 +713362,8 @@ function createWarpTokenReader(chainMetadata, chainLookup) {
     return new WarpTokenReader(artifactManager, chainMetadata, chainLookup);
 }
 //# sourceMappingURL=warp-reader.js.map
-// EXTERNAL MODULE: ../utils/dist/validation.js
-var validation = __nccwpck_require__(21387);
+// EXTERNAL MODULE: ../provider-sdk/dist/fee.js
+var fee = __nccwpck_require__(26109);
 // EXTERNAL MODULE: ../utils/dist/typeof.js
 var dist_typeof = __nccwpck_require__(73689);
 ;// CONCATENATED MODULE: ../deploy-sdk/dist/warp/warp-writer.js
@@ -713258,6 +713375,9 @@ var dist_typeof = __nccwpck_require__(73689);
 
 
 
+
+
+
 /**
  * Factory function to create a WarpTokenWriter instance.
  *
@@ -713347,6 +713467,25 @@ class WarpTokenWriter extends WarpTokenReader {
                 }
             }
         }
+        // Deploy Fee if configured as a NEW artifact
+        // No FeeReadContext needed on create - deploying from scratch
+        let onChainFeeArtifact;
+        if (config.fee) {
+            const feeWriter = createFeeWriter(this.chainMetadata, this.signer, {
+                knownRoutersPerDomain: {},
+            });
+            if (!feeWriter) {
+                logging/* rootLogger */.Jk.warn('Fee programs are not supported for this protocol. Fee configuration will be ignored.');
+            }
+            else if ((0,dist_artifact/* isArtifactNew */.v_)(config.fee)) {
+                const [deployedFee, feeReceipts] = await feeWriter.create(config.fee);
+                allReceipts.push(...feeReceipts);
+                onChainFeeArtifact = deployedFee;
+            }
+            else {
+                onChainFeeArtifact = config.fee;
+            }
+        }
         // Convert to raw artifact config (flatten nested artifacts)
         const rawArtifact = {
             artifactState: dist_artifact/* ArtifactState */.O2.NEW,
@@ -713354,6 +713493,7 @@ class WarpTokenWriter extends WarpTokenReader {
                 ...config,
                 interchainSecurityModule: onChainIsmArtifact,
                 hook: onChainHookArtifact,
+                fee: onChainFeeArtifact,
             },
         };
         // Delegate to protocol-specific writer
@@ -713368,6 +713508,7 @@ class WarpTokenWriter extends WarpTokenReader {
                     ...artifact.config,
                     interchainSecurityModule: onChainIsmArtifact,
                     hook: onChainHookArtifact,
+                    fee: onChainFeeArtifact,
                 },
                 deployed: deployed.deployed,
             },
@@ -713400,6 +713541,8 @@ class WarpTokenWriter extends WarpTokenReader {
             (0,dist_artifact/* isArtifactDeployed */.R)(currentArtifact.config.interchainSecurityModule), `Expected Warp Reader to expand the ISM config`);
         (0,validation/* assert */.v)((0,dist_typeof/* isNullish */.u)(currentArtifact.config.hook) ||
             (0,dist_artifact/* isArtifactDeployed */.R)(currentArtifact.config.hook), `Expected Warp Reader to expand the Hook config`);
+        (0,validation/* assert */.v)((0,dist_typeof/* isNullish */.u)(currentArtifact.config.fee) ||
+            (0,dist_artifact/* isArtifactDeployed */.R)(currentArtifact.config.fee), `Expected Warp Reader to expand the Fee config`);
         const updateTxs = [];
         // Resolve ISM updates
         const expectedIsm = config.interchainSecurityModule;
@@ -713463,13 +713606,47 @@ class WarpTokenWriter extends WarpTokenReader {
         else {
             onChainHookArtifact = expectedHook;
         }
-        // Build raw artifact with flattened ISM and Hook references
+        // Resolve Fee updates
+        const expectedFee = config.fee;
+        const currentFee = currentArtifact.config.fee;
+        let onChainFeeArtifact;
+        if (expectedFee && !(0,dist_artifact/* isArtifactUnderived */.l2)(expectedFee)) {
+            const feeContext = (0,warp/* buildFeeReadContextFromWarpArtifactConfig */.oS)(config, currentArtifact.config);
+            const feeWriter = createFeeWriter(this.chainMetadata, this.signer, feeContext);
+            if (!feeWriter) {
+                logging/* rootLogger */.Jk.warn('Fee programs are not supported for this protocol. Fee configuration will be ignored.');
+                onChainFeeArtifact = currentFee;
+            }
+            else {
+                const mergedFeeConfig = (0,fee/* mergeFeeArtifacts */.KA)(currentFee, expectedFee);
+                if ((0,dist_artifact/* isArtifactNew */.v_)(mergedFeeConfig)) {
+                    const [deployedFee] = await feeWriter.create(mergedFeeConfig);
+                    onChainFeeArtifact = {
+                        artifactState: dist_artifact/* ArtifactState */.O2.UNDERIVED,
+                        deployed: { address: deployedFee.deployed.address },
+                    };
+                }
+                else if ((0,dist_artifact/* isArtifactDeployed */.R)(mergedFeeConfig)) {
+                    const txs = await feeWriter.update(mergedFeeConfig);
+                    updateTxs.push(...txs);
+                    onChainFeeArtifact = {
+                        artifactState: dist_artifact/* ArtifactState */.O2.UNDERIVED,
+                        deployed: { address: mergedFeeConfig.deployed.address },
+                    };
+                }
+            }
+        }
+        else {
+            onChainFeeArtifact = expectedFee;
+        }
+        // Build raw artifact with flattened ISM, Hook, and Fee references
         const rawArtifact = {
             artifactState: dist_artifact/* ArtifactState */.O2.DEPLOYED,
             config: {
                 ...config,
                 interchainSecurityModule: onChainIsmArtifact,
                 hook: onChainHookArtifact,
+                fee: onChainFeeArtifact,
             },
             deployed,
         };
@@ -713496,6 +713673,8 @@ class WarpTokenWriter extends WarpTokenReader {
 
 
 
+
+
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -715214,6 +715393,229 @@ function artifactOnChainToAddress(artifact, formatter) {
 
 /***/ }),
 
+/***/ 26109:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   AY: () => (/* binding */ feeConfigToArtifact),
+/* harmony export */   KA: () => (/* binding */ mergeFeeArtifacts),
+/* harmony export */   X6: () => (/* binding */ feeArtifactToDerivedConfig)
+/* harmony export */ });
+/* unused harmony exports FeeStrategyType, FeeType, shouldDeployNewFee */
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(94523);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(73689);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(73938);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(98474);
+/* harmony import */ var _artifact_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(4287);
+
+
+// These fee types model fees as a single contract/program with internal routing,
+// unlike the EVM implementation where RoutingFee and CrossCollateralRoutingFee
+// deploy separate fee contracts per destination domain. The upcoming SVM fee
+// program will handle all routing internally via PDAs within one program, and
+// these multi-VM types follow that single-entity model to avoid the complexity
+// of supporting both approaches simultaneously. This will be unified later to
+// support both models under a single interface.
+// ====== Strategy Types (shared between Config API and Artifact API) ======
+const FeeStrategyType = {
+    linear: 'linear',
+    regressive: 'regressive',
+    progressive: 'progressive',
+    offchainQuotedLinear: 'offchainQuotedLinear',
+};
+const FeeType = {
+    linear: 'linear',
+    regressive: 'regressive',
+    progressive: 'progressive',
+    offchainQuotedLinear: 'offchainQuotedLinear',
+    routing: 'routing',
+    crossCollateralRouting: 'crossCollateralRouting',
+};
+// ====== Config <-> Artifact Conversion ======
+const feeLogger = _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .rootLogger */ .Jk.child({ module: 'fee-config-utils' });
+function convertRoutesToArtifact(routes, chainLookup) {
+    const result = {};
+    for (const [chainName, strategy] of Object.entries(routes)) {
+        const domainId = chainLookup.getDomainId(chainName);
+        if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .isNullish */ .u)(domainId)) {
+            feeLogger.warn(`Skipping fee route for unknown chain: ${chainName}. ` +
+                `Chain not found in chain lookup.`);
+            continue;
+        }
+        result[domainId] = strategy;
+    }
+    return result;
+}
+function convertCCRoutesToArtifact(routes, chainLookup) {
+    const result = {};
+    for (const [chainName, routerMap] of Object.entries(routes)) {
+        const domainId = chainLookup.getDomainId(chainName);
+        if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .isNullish */ .u)(domainId)) {
+            feeLogger.warn(`Skipping CC fee route for unknown chain: ${chainName}. ` +
+                `Chain not found in chain lookup.`);
+            continue;
+        }
+        result[domainId] = routerMap;
+    }
+    return result;
+}
+function convertRoutesToDerived(routes, chainLookup) {
+    const result = {};
+    for (const [domainIdStr, strategy] of Object.entries(routes)) {
+        const domainId = parseInt(domainIdStr);
+        const chainName = chainLookup.getChainName(domainId);
+        if (!chainName) {
+            feeLogger.warn(`Skipping fee route for unknown domain ID: ${domainId}. ` +
+                `Domain not found in chain lookup.`);
+            continue;
+        }
+        result[chainName] = strategy;
+    }
+    return result;
+}
+function convertCCRoutesToDerived(routes, chainLookup) {
+    const result = {};
+    for (const [domainIdStr, routerMap] of Object.entries(routes)) {
+        const domainId = parseInt(domainIdStr);
+        const chainName = chainLookup.getChainName(domainId);
+        if (!chainName) {
+            feeLogger.warn(`Skipping CC fee route for unknown domain ID: ${domainId}. ` +
+                `Domain not found in chain lookup.`);
+            continue;
+        }
+        result[chainName] = routerMap;
+    }
+    return result;
+}
+/**
+ * Converts FeeConfig (Config API) to FeeArtifactConfig (Artifact API).
+ * Chain names are converted to domain IDs for routing/CC routing fee types.
+ * Direct fee types (linear, regressive, progressive) are passed through unchanged.
+ */
+function feeConfigToArtifact(config, chainLookup) {
+    switch (config.type) {
+        case FeeType.linear:
+        case FeeType.regressive:
+        case FeeType.progressive:
+        case FeeType.offchainQuotedLinear:
+            return {
+                artifactState: _artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .ArtifactState */ .O2.NEW,
+                config,
+            };
+        case FeeType.routing:
+            return {
+                artifactState: _artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .ArtifactState */ .O2.NEW,
+                config: {
+                    type: config.type,
+                    owner: config.owner,
+                    beneficiary: config.beneficiary,
+                    routes: convertRoutesToArtifact(config.routes, chainLookup),
+                },
+            };
+        case FeeType.crossCollateralRouting:
+            return {
+                artifactState: _artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .ArtifactState */ .O2.NEW,
+                config: {
+                    type: config.type,
+                    owner: config.owner,
+                    beneficiary: config.beneficiary,
+                    routes: convertCCRoutesToArtifact(config.routes, chainLookup),
+                },
+            };
+        default: {
+            const invalidConfig = config;
+            throw new Error(`Unsupported fee type for artifact API: ${JSON.stringify(invalidConfig)}`);
+        }
+    }
+}
+/**
+ * Converts a DeployedFeeArtifact to DerivedFeeConfig format.
+ * Domain IDs are converted back to chain names for routing/CC routing fee types.
+ */
+function feeArtifactToDerivedConfig(artifact, chainLookup) {
+    const { config } = artifact;
+    const address = artifact.deployed.address;
+    switch (config.type) {
+        case FeeType.linear:
+        case FeeType.regressive:
+        case FeeType.progressive:
+        case FeeType.offchainQuotedLinear:
+            return { ...config, address };
+        case FeeType.routing:
+            return {
+                type: config.type,
+                owner: config.owner,
+                beneficiary: config.beneficiary,
+                routes: convertRoutesToDerived(config.routes, chainLookup),
+                address,
+            };
+        case FeeType.crossCollateralRouting:
+            return {
+                type: config.type,
+                owner: config.owner,
+                beneficiary: config.beneficiary,
+                routes: convertCCRoutesToDerived(config.routes, chainLookup),
+                address,
+            };
+        default: {
+            const invalidConfig = config;
+            throw new Error(`Unhandled fee type: ${JSON.stringify(invalidConfig)}`);
+        }
+    }
+}
+/**
+ * Determines if a new fee should be deployed instead of updating the existing one.
+ * Deploy new if fee type changed. For direct types (linear, regressive, progressive),
+ * deploy new if config changed (immutable on EVM - constructor-set params).
+ * Routing/CC routing types are mutable and can be updated in-place.
+ */
+function shouldDeployNewFee(actual, expected) {
+    if (actual.type !== expected.type)
+        return true;
+    switch (expected.type) {
+        case FeeType.linear:
+        case FeeType.regressive:
+        case FeeType.progressive:
+        case FeeType.offchainQuotedLinear:
+            return !(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .deepEquals */ .c2)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .normalizeConfig */ .I)(actual), (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .normalizeConfig */ .I)(expected));
+        case FeeType.routing:
+        case FeeType.crossCollateralRouting:
+            return false;
+        default: {
+            const invalidConfig = expected;
+            throw new Error(`Unhandled fee type in shouldDeployNewFee: ${JSON.stringify(invalidConfig)}`);
+        }
+    }
+}
+/**
+ * Merges current on-chain fee artifact with expected fee artifact.
+ * Determines whether to deploy a new fee or update/reuse existing one.
+ */
+function mergeFeeArtifacts(currentArtifact, expectedArtifact) {
+    const expectedConfig = expectedArtifact.config;
+    if (!currentArtifact) {
+        return expectedArtifact;
+    }
+    const currentConfig = currentArtifact.config;
+    if (shouldDeployNewFee(currentConfig, expectedConfig)) {
+        return {
+            artifactState: _artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .ArtifactState */ .O2.NEW,
+            config: expectedConfig,
+        };
+    }
+    const deployedAddress = (0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactDeployed */ .R)(expectedArtifact)
+        ? expectedArtifact.deployed
+        : currentArtifact.deployed;
+    return {
+        artifactState: _artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .ArtifactState */ .O2.DEPLOYED,
+        config: expectedConfig,
+        deployed: deployedAddress,
+    };
+}
+//# sourceMappingURL=fee.js.map
+
+/***/ }),
+
 /***/ 77230:
 /***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
 
@@ -716076,16 +716478,19 @@ function ismConfigToArtifact(config, chainLookup) {
 /* harmony export */   Ob: () => (/* binding */ computeCCRouterGasConfigUpdates),
 /* harmony export */   aq: () => (/* binding */ computeRemoteRoutersUpdates),
 /* harmony export */   ks: () => (/* binding */ TokenType),
-/* harmony export */   ku: () => (/* binding */ warpConfigToArtifact)
+/* harmony export */   ku: () => (/* binding */ warpConfigToArtifact),
+/* harmony export */   oS: () => (/* binding */ buildFeeReadContextFromWarpArtifactConfig)
 /* harmony export */ });
-/* 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__(21387);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(73938);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(93142);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(52193);
+/* 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__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(73938);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(93142);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(52193);
 /* harmony import */ var _artifact_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(4287);
-/* harmony import */ var _hook_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(77230);
-/* harmony import */ var _ism_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(96426);
+/* harmony import */ var _fee_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(26109);
+/* harmony import */ var _hook_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(77230);
+/* harmony import */ var _ism_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(96426);
+
 
 
 
@@ -716118,7 +716523,7 @@ function warpConfigToArtifact(config, chainLookup, logger) {
         }
         else {
             // ISM config - convert using ismConfigToArtifact
-            ismArtifact = (0,_ism_js__WEBPACK_IMPORTED_MODULE_2__/* .ismConfigToArtifact */ .HL)(config.interchainSecurityModule, chainLookup);
+            ismArtifact = (0,_ism_js__WEBPACK_IMPORTED_MODULE_3__/* .ismConfigToArtifact */ .HL)(config.interchainSecurityModule, chainLookup);
         }
     }
     // Convert Hook config to artifact if present
@@ -716130,7 +716535,17 @@ function warpConfigToArtifact(config, chainLookup, logger) {
         }
         else {
             // Hook config - convert using hookConfigToArtifact
-            hookArtifact = (0,_hook_js__WEBPACK_IMPORTED_MODULE_1__/* .hookConfigToArtifact */ .hV)(config.hook, chainLookup);
+            hookArtifact = (0,_hook_js__WEBPACK_IMPORTED_MODULE_2__/* .hookConfigToArtifact */ .hV)(config.hook, chainLookup);
+        }
+    }
+    // Convert Fee config to artifact if present
+    let feeArtifact;
+    if (config.fee) {
+        if (typeof config.fee === 'string') {
+            feeArtifact = (0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .addressToUnderivedArtifact */ .Se)(config.fee);
+        }
+        else {
+            feeArtifact = (0,_fee_js__WEBPACK_IMPORTED_MODULE_1__/* .feeConfigToArtifact */ .AY)(config.fee, chainLookup);
         }
     }
     // Convert remoteRouters from chain names to domain IDs
@@ -716138,7 +716553,7 @@ function warpConfigToArtifact(config, chainLookup, logger) {
     if (config.remoteRouters) {
         for (const [chainName, router] of Object.entries(config.remoteRouters)) {
             const domainId = chainLookup.getDomainId(chainName);
-            if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(domainId)) {
+            if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(domainId)) {
                 logger?.warn(`Skipping remote router for unknown chain: ${chainName}. ` +
                     `Chain not found in chain lookup.`);
                 continue;
@@ -716151,7 +716566,7 @@ function warpConfigToArtifact(config, chainLookup, logger) {
     if (config.destinationGas) {
         for (const [chainName, gas] of Object.entries(config.destinationGas)) {
             const domainId = chainLookup.getDomainId(chainName);
-            if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(domainId)) {
+            if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(domainId)) {
                 logger?.warn(`Skipping destination gas for unknown chain: ${chainName}. ` +
                     `Chain not found in chain lookup.`);
                 continue;
@@ -716164,6 +716579,7 @@ function warpConfigToArtifact(config, chainLookup, logger) {
         mailbox: config.mailbox,
         interchainSecurityModule: ismArtifact,
         hook: hookArtifact,
+        fee: feeArtifact,
         remoteRouters,
         destinationGas,
         scale: config.scale,
@@ -716180,9 +716596,9 @@ function warpConfigToArtifact(config, chainLookup, logger) {
             };
         case 'synthetic':
             // Validate required fields for synthetic token
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(config.name, 'name is required for synthetic token deployment');
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(config.symbol, 'symbol is required for synthetic token deployment');
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(config.decimals !== undefined, 'decimals is required for synthetic token deployment');
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(config.name, 'name is required for synthetic token deployment');
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(config.symbol, 'symbol is required for synthetic token deployment');
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(config.decimals !== undefined, 'decimals is required for synthetic token deployment');
             return {
                 artifactState: _artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .ArtifactState */ .O2.NEW,
                 config: {
@@ -716252,35 +716668,48 @@ function warpArtifactToDerivedConfig(artifact, chainLookup) {
         destinationGas[chainName] = gas;
     }
     // Convert ISM artifact to config if present
-    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(config.interchainSecurityModule) ||
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(config.interchainSecurityModule) ||
         !(0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactNew */ .v_)(config.interchainSecurityModule), 'Expected ISM to be a deployed or underived artifact');
     let ismConfig;
-    if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(config.interchainSecurityModule)) {
+    if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(config.interchainSecurityModule)) {
         ismConfig = '0x0000000000000000000000000000000000000000';
     }
     else if ((0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactDeployed */ .R)(config.interchainSecurityModule)) {
-        ismConfig = (0,_ism_js__WEBPACK_IMPORTED_MODULE_2__/* .ismArtifactToDerivedConfig */ .co)(config.interchainSecurityModule, chainLookup);
+        ismConfig = (0,_ism_js__WEBPACK_IMPORTED_MODULE_3__/* .ismArtifactToDerivedConfig */ .co)(config.interchainSecurityModule, chainLookup);
     }
     else {
         ismConfig = config.interchainSecurityModule.deployed.address;
     }
     // Convert hook artifact to config if present
-    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(config.hook) || !(0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactNew */ .v_)(config.hook), 'Expected hook to be a deployed or underived artifact');
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(config.hook) || !(0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactNew */ .v_)(config.hook), 'Expected hook to be a deployed or underived artifact');
     let hookConfig;
-    if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(config.hook)) {
+    if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(config.hook)) {
         hookConfig = '0x0000000000000000000000000000000000000000';
     }
     else if ((0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactDeployed */ .R)(config.hook)) {
-        hookConfig = (0,_hook_js__WEBPACK_IMPORTED_MODULE_1__/* .hookArtifactToDerivedConfig */ .q6)(config.hook, chainLookup);
+        hookConfig = (0,_hook_js__WEBPACK_IMPORTED_MODULE_2__/* .hookArtifactToDerivedConfig */ .q6)(config.hook, chainLookup);
     }
     else {
         hookConfig = config.hook.deployed.address;
     }
+    // Convert fee artifact to config if present
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(config.fee) || !(0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactNew */ .v_)(config.fee), 'Expected fee to be a deployed or underived artifact');
+    let feeConfig;
+    if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(config.fee)) {
+        feeConfig = undefined;
+    }
+    else if ((0,_artifact_js__WEBPACK_IMPORTED_MODULE_0__/* .isArtifactDeployed */ .R)(config.fee)) {
+        feeConfig = (0,_fee_js__WEBPACK_IMPORTED_MODULE_1__/* .feeArtifactToDerivedConfig */ .X6)(config.fee, chainLookup);
+    }
+    else {
+        feeConfig = config.fee.deployed.address;
+    }
     const baseDerivedConfig = {
         owner: config.owner,
         mailbox: config.mailbox,
         interchainSecurityModule: ismConfig,
         hook: hookConfig,
+        fee: feeConfig,
         remoteRouters,
         destinationGas,
         name: config.name,
@@ -716326,7 +716755,7 @@ function convertCrossCollateralRoutersToArtifact(crossCollateralRouters, chainLo
         return result;
     for (const [chainName, routers] of Object.entries(crossCollateralRouters)) {
         const domainId = chainLookup.getDomainId(chainName);
-        if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(domainId)) {
+        if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(domainId)) {
             logger?.warn(`Skipping cross-collateral routers for unknown chain: ${chainName}. ` +
                 `Chain not found in chain lookup.`);
             continue;
@@ -716346,6 +716775,31 @@ function convertCrossCollateralRoutersToDerived(crossCollateralRouters, chainLoo
     }
     return result;
 }
+// Fee Read Context Utilities
+/**
+ * Builds a FeeReadContext by unioning domains/routers from the provided
+ * WarpArtifactConfigs. Pass both expected and current configs so the fee
+ * reader can discover routes from current state (for cleanup) and expected
+ * state (for setup).
+ */
+function buildFeeReadContextFromWarpArtifactConfig(...configs) {
+    const knownRoutersPerDomain = {};
+    for (const config of configs) {
+        for (const [domainStr, router] of Object.entries(config.remoteRouters)) {
+            const domain = Number(domainStr);
+            const existing = knownRoutersPerDomain[domain] ?? new Set();
+            knownRoutersPerDomain[domain] = new Set([...existing, router.address]);
+        }
+        if (config.type === TokenType.crossCollateral) {
+            for (const [domainStr, routers] of Object.entries(config.crossCollateralRouters)) {
+                const domain = Number(domainStr);
+                const existing = knownRoutersPerDomain[domain] ?? new Set();
+                knownRoutersPerDomain[domain] = new Set([...existing, ...routers]);
+            }
+        }
+    }
+    return { knownRoutersPerDomain };
+}
 /**
  * Computes which routers need enrollment/unenrollment by diffing current and expected configs.
  * Pure function - compares router addresses and destination gas to determine required updates.
@@ -716370,7 +716824,7 @@ function computeRemoteRoutersUpdates(currentRoutersConfig, expectedRoutersConfig
     for (const [domainIdStr, expectedRemoteRouter] of Object.entries(expectedRoutersConfig.remoteRouters)) {
         const domainId = parseInt(domainIdStr);
         const expectedDestinationGas = expectedRoutersConfig.destinationGas[domainId];
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(expectedDestinationGas), `Missing destination gas for domain ${domainId} in expected router configuration`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(expectedDestinationGas), `Missing destination gas for domain ${domainId} in expected router configuration`);
         const currentRouterAddress = Object.prototype.hasOwnProperty.call(currentRoutersConfig.remoteRouters, domainId)
             ? currentRoutersConfig.remoteRouters[domainId].address
             : undefined;
@@ -716395,18 +716849,18 @@ function computeRemoteRoutersUpdates(currentRoutersConfig, expectedRoutersConfig
  * hex32 before comparison so callers don't need to normalize beforehand.
  */
 function computeCrossCollateralRouterUpdates(current, expected) {
-    const canonicalize = (routers) => (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .objMap */ .Yp)(routers, (_domain, routerSet) => new Set([...routerSet].map((r) => (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .addressToBytes32 */ .In)(r).toLowerCase())));
+    const canonicalize = (routers) => (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_6__/* .objMap */ .Yp)(routers, (_domain, routerSet) => new Set([...routerSet].map((r) => (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .addressToBytes32 */ .In)(r).toLowerCase())));
     const canonicalCurrent = canonicalize(current);
     const canonicalExpected = canonicalize(expected);
     const toUnenroll = {};
     for (const [domainStr, currentSet] of Object.entries(canonicalCurrent)) {
         const domain = Number(domainStr);
         const expectedSet = canonicalExpected[domain];
-        if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .isNullish */ .u)(expectedSet) || expectedSet.size === 0) {
+        if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .isNullish */ .u)(expectedSet) || expectedSet.size === 0) {
             toUnenroll[domain] = null;
         }
         else {
-            const removed = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .difference */ .iv)(currentSet, expectedSet);
+            const removed = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .difference */ .iv)(currentSet, expectedSet);
             if (removed.size > 0) {
                 toUnenroll[domain] = removed;
             }
@@ -716416,7 +716870,7 @@ function computeCrossCollateralRouterUpdates(current, expected) {
     for (const [domainStr, expectedSet] of Object.entries(canonicalExpected)) {
         const domain = Number(domainStr);
         const currentSet = canonicalCurrent[domain] ?? new Set();
-        const added = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_7__/* .difference */ .iv)(expectedSet, currentSet);
+        const added = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_8__/* .difference */ .iv)(expectedSet, currentSet);
         if (added.size > 0) {
             toEnroll[domain] = added;
         }
@@ -716525,6 +716979,9 @@ class RadixProtocolProvider {
         const { gateway, base } = this.configureNetworkConnection(chainMetadata);
         return new _validator_announce_validator_announce_artifact_manager_js__WEBPACK_IMPORTED_MODULE_6__/* .RadixValidatorAnnounceArtifactManager */ .x(gateway, base);
     }
+    createFeeArtifactManager(_chainMetadata) {
+        return null;
+    }
     getMinGas() {
         return {
             CORE_DEPLOY_GAS: 0n,
@@ -734619,7 +735076,7 @@ class LiFiBridge {
             slippage: (params.slippage ?? this.config.defaultSlippage ?? 0.005)
                 .toFixed(4)
                 .replace(/\.?0+$/, ''),
-            order: 'CHEAPEST',
+            order: 'RECOMMENDED',
             integrator: this.config.integrator,
         });
         if (this.config.apiKey) {
@@ -735381,23 +735838,24 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   c: () => (/* binding */ InventoryRebalancer)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(4879);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(97518);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(32242);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(95778);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(54194);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(4879);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(95778);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(54194);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(25047);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(71598);
 /* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(59942);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(21387);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(93142);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(16639);
-/* harmony import */ var _utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(47560);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(39196);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(16639);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(93142);
+/* harmony import */ var _utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(47560);
 /* harmony import */ var _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(46618);
 /* harmony import */ var _utils_solanaKeyParser_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(20162);
-/* harmony import */ var _utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(32581);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_6__, _utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_10__]);
-([_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_6__, _utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_10__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+/* harmony import */ var _utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(32581);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(11369);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__, _utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_9__]);
+([_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__, _utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_9__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
 
 
 
@@ -735421,6 +735879,46 @@ const GAS_COST_MULTIPLIER = 20n;
  * If gas exceeds this threshold, the bridge is not economically worthwhile.
  */
 const MAX_GAS_PERCENT_THRESHOLD = 10n;
+const RECOVERABLE_MAX_TRANSFER_ERROR_MESSAGES = [
+    'balance may be insufficient',
+    'transfer amount exceeds balance',
+    'insufficient balance',
+];
+function hasRecoverableMaxTransferErrorMessage(message) {
+    const normalized = message.toLowerCase();
+    return (normalized.includes('unpredictable_gas_limit') ||
+        RECOVERABLE_MAX_TRANSFER_ERROR_MESSAGES.some((pattern) => normalized.includes(pattern)));
+}
+function isRecoverableMaxTransferProbeError(error) {
+    const seen = new Set();
+    const stack = [error];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        if (current == null)
+            continue;
+        if (typeof current === 'string') {
+            if (hasRecoverableMaxTransferErrorMessage(current))
+                return true;
+            continue;
+        }
+        if (typeof current !== 'object')
+            continue;
+        if (seen.has(current))
+            continue;
+        seen.add(current);
+        const candidate = current;
+        if (typeof candidate.code === 'string' &&
+            candidate.code.toUpperCase() === 'UNPREDICTABLE_GAS_LIMIT') {
+            return true;
+        }
+        if (typeof candidate.message === 'string' &&
+            hasRecoverableMaxTransferErrorMessage(candidate.message)) {
+            return true;
+        }
+        stack.push(candidate.cause, candidate.error);
+    }
+    return false;
+}
 /**
  * Executes inventory-based rebalances for chains that don't support MovableCollateralRouter.
  *
@@ -735507,10 +736005,10 @@ class InventoryRebalancer {
             if (!inventoryChainSet.has(token.chainName)) {
                 continue;
             }
-            if (!_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__/* .TOKEN_COLLATERALIZED_STANDARDS */ .PP.includes(token.standard)) {
+            if (!_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__/* .TOKEN_COLLATERALIZED_STANDARDS */ .PP.includes(token.standard)) {
                 throw new Error(`InventoryRebalancer cannot be used with synthetic token on chain "${token.chainName}". ` +
                     `Token standard "${token.standard}" is not collateral-backed. ` +
-                    `Only collateral-backed standards are supported: ${_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__/* .TOKEN_COLLATERALIZED_STANDARDS */ .PP.join(', ')}`);
+                    `Only collateral-backed standards are supported: ${_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__/* .TOKEN_COLLATERALIZED_STANDARDS */ .PP.join(', ')}`);
             }
         }
     }
@@ -735522,14 +736020,14 @@ class InventoryRebalancer {
     }
     getProtocolForChain(chainName) {
         const metadata = this.warpCore.multiProvider.getChainMetadata?.(chainName) ?? undefined;
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(metadata, `No chain metadata found for chain ${chainName}`);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(metadata.protocol, `No protocol type in metadata for chain ${chainName}`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(metadata, `No chain metadata found for chain ${chainName}`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(metadata.protocol, `No protocol type in metadata for chain ${chainName}`);
         return metadata.protocol;
     }
     getInventorySignerAddress(chainName) {
         const protocol = this.getProtocolForChain(chainName);
         const signerConfig = this.config.inventorySigners[protocol];
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(signerConfig?.address, `Missing inventory signer address for protocol ${protocol} (chain ${chainName})`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(signerConfig?.address, `Missing inventory signer address for protocol ${protocol} (chain ${chainName})`);
         return signerConfig.address;
     }
     /**
@@ -735569,6 +736067,9 @@ class InventoryRebalancer {
         }
         return total;
     }
+    formatLocalAmount(amount, token) {
+        return (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .fromWei */ .kX)(amount.toString(), token.decimals);
+    }
     /**
      * Get the effective available inventory for a chain, accounting for
      * inventory already consumed during this execution cycle.
@@ -735751,45 +736252,96 @@ class InventoryRebalancer {
         this.logger.info({
             strategyRoute: `${origin} (surplus) → ${destination} (deficit)`,
             executionRoute: `transferRemote FROM ${destination} TO ${origin}`,
-            amount: amount.toString(),
+            canonicalAmount: amount.toString(),
             intentId: intent.id,
         }, 'Executing inventory route');
+        const sourceToken = this.getTokenForChain(destination);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(sourceToken, `No token found for source chain: ${destination}`);
+        const requestedLocalAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__/* .denormalizeToLocal */ .bK)(amount, sourceToken);
+        const executionSender = this.getInventorySignerAddress(destination);
+        const executionRecipient = this.getInventorySignerAddress(origin);
         // Check available inventory on the DESTINATION (deficit) chain
         // We need inventory here because transferRemote is called FROM this chain
         const availableInventory = this.getEffectiveAvailableInventory(destination);
         this.logger.info({
             checkingChain: destination,
             availableInventory: availableInventory.toString(),
-            availableInventoryEth: (Number(availableInventory) / 1e18).toFixed(6),
-            requiredAmount: amount.toString(),
-            requiredAmountEth: (Number(amount) / 1e18).toFixed(6),
+            availableInventoryFormatted: this.formatLocalAmount(availableInventory, sourceToken),
+            requiredAmount: requestedLocalAmount.toString(),
+            requiredAmountFormatted: this.formatLocalAmount(requestedLocalAmount, sourceToken),
         }, 'Checking effective inventory on destination (deficit) chain');
         // Calculate transfer costs including max transferable and min viable amounts
         // transferRemote is called FROM destination TO origin (swapped direction)
-        const costs = await (0,_utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_4__/* .calculateTransferCosts */ ._P)(destination, // FROM chain (where transferRemote is called)
+        const costs = await (0,_utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_6__/* .calculateTransferCosts */ ._P)(destination, // FROM chain (where transferRemote is called)
         origin, // TO chain (where Hyperlane message goes)
-        availableInventory, amount, this.multiProvider, this.warpCore.multiProvider, this.getTokenForChain.bind(this), this.getInventorySignerAddress(destination), _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .isNativeTokenStandard */ .OJ, this.logger);
-        const { maxTransferable, minViableTransfer } = costs;
+        availableInventory, requestedLocalAmount, this.multiProvider, this.warpCore.multiProvider, this.getTokenForChain.bind(this), executionSender, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .isNativeTokenStandard */ .OJ, this.logger);
+        const { minViableTransfer } = costs;
+        let maxTransferable = costs.maxTransferable;
+        if (!(0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .isNativeTokenStandard */ .OJ)(sourceToken.standard)) {
+            if (availableInventory === 0n) {
+                maxTransferable = 0n;
+                this.logger.debug({
+                    fromChain: destination,
+                    toChain: origin,
+                    requestedAmount: requestedLocalAmount.toString(),
+                }, 'Skipping fee-aware max transferable probe because destination inventory is zero');
+            }
+            else {
+                try {
+                    const feeAwareMaxTransfer = await this.warpCore.getMaxTransferAmount({
+                        balance: sourceToken.amount(availableInventory),
+                        destination: origin,
+                        sender: executionSender,
+                        recipient: executionRecipient,
+                    });
+                    maxTransferable =
+                        feeAwareMaxTransfer.amount < requestedLocalAmount
+                            ? feeAwareMaxTransfer.amount
+                            : requestedLocalAmount;
+                    this.logger.debug({
+                        fromChain: destination,
+                        toChain: origin,
+                        availableInventory: availableInventory.toString(),
+                        requestedAmount: requestedLocalAmount.toString(),
+                        feeAwareMaxTransferable: maxTransferable.toString(),
+                    }, 'Calculated fee-aware max transferable amount for non-native route');
+                }
+                catch (error) {
+                    if (!isRecoverableMaxTransferProbeError(error)) {
+                        throw error;
+                    }
+                    maxTransferable = 0n;
+                    this.logger.warn({
+                        fromChain: destination,
+                        toChain: origin,
+                        availableInventory: availableInventory.toString(),
+                        requestedAmount: requestedLocalAmount.toString(),
+                        error: error instanceof Error ? error.message : String(error),
+                        intentId: intent.id,
+                    }, 'Fee-aware max transferable probe failed due to insufficient balance, falling back to external bridge');
+                }
+            }
+        }
         // Calculate total inventory across all chains
         // Note: consumedInventory tracking is handled separately within this cycle
         const totalInventory = this.getTotalInventory([]);
         this.logger.info({
             fromChain: destination,
             toChain: origin,
-            availableInventoryEth: (Number(availableInventory) / 1e18).toFixed(6),
-            requestedAmountEth: (Number(amount) / 1e18).toFixed(6),
-            maxTransferableEth: (Number(maxTransferable) / 1e18).toFixed(6),
-            minViableTransferEth: (Number(minViableTransfer) / 1e18).toFixed(6),
-            totalInventoryEth: (Number(totalInventory) / 1e18).toFixed(6),
-            canFullyFulfill: maxTransferable >= amount,
+            availableInventoryFormatted: this.formatLocalAmount(availableInventory, sourceToken),
+            requestedAmountFormatted: this.formatLocalAmount(requestedLocalAmount, sourceToken),
+            maxTransferableFormatted: this.formatLocalAmount(maxTransferable, sourceToken),
+            minViableTransferFormatted: this.formatLocalAmount(minViableTransfer, sourceToken),
+            canFullyFulfill: maxTransferable >= requestedLocalAmount,
             canPartialFulfill: maxTransferable >= minViableTransfer,
+            totalInventory: totalInventory.toString(),
         }, 'Calculated max transferable amount with cost-based threshold');
         // Early exit: If remaining amount is below minViableTransfer, complete the intent
         // This prevents infinite loops when the remaining amount is too small to economically bridge
-        if (amount < minViableTransfer) {
+        if (requestedLocalAmount < minViableTransfer) {
             this.logger.info({
                 intentId: intent.id,
-                amount: amount.toString(),
+                amount: requestedLocalAmount.toString(),
                 minViableTransfer: minViableTransfer.toString(),
             }, 'Remaining amount below minViableTransfer, completing intent with acceptable loss');
             await this.actionTracker.completeRebalanceIntent(intent.id);
@@ -735805,156 +736357,199 @@ class InventoryRebalancer {
             ...route,
             origin: destination, // transferRemote called FROM here
             destination: origin, // Hyperlane message goes TO here
+            amount: requestedLocalAmount,
         };
-        if (maxTransferable >= amount) {
+        if (maxTransferable >= requestedLocalAmount) {
             // Sufficient inventory on destination - execute transferRemote directly
-            const result = await this.executeTransferRemote(swappedRoute, intent, costs.gasQuote);
+            const fulfilledCanonicalAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__/* .normalizeToCanonical */ .R2)(requestedLocalAmount, sourceToken);
+            const result = await this.executeTransferRemote(swappedRoute, intent, fulfilledCanonicalAmount);
             // Return original strategy route in result (not the swapped execution route)
             return { ...result, route };
         }
         else if (maxTransferable > 0n && maxTransferable >= minViableTransfer) {
             // Partial transfer: Transfer available inventory when economically viable
-            const partialSwappedRoute = {
-                ...swappedRoute,
-                amount: maxTransferable,
-            };
-            const result = await this.executeTransferRemote(partialSwappedRoute, intent, costs.gasQuote);
-            this.logger.info({
-                intentId: intent.id,
-                partialAmount: maxTransferable.toString(),
-                requestedAmount: amount.toString(),
-                remainingAmount: (amount - maxTransferable).toString(),
-            }, 'Executed partial inventory deposit, remaining will be handled in future cycles');
-            // Return original strategy route in result (not the swapped execution route)
-            return { ...result, route };
-        }
-        else {
-            // Inventory below cost-based threshold - trigger ExternalBridge movement TO destination chain
-            this.logger.info({
-                targetChain: destination,
-                maxTransferable: maxTransferable.toString(),
-                minViableTransfer: minViableTransfer.toString(),
-                costMultiplier: _utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_4__/* .MIN_VIABLE_COST_MULTIPLIER */ .hh.toString(),
-                intentId: intent.id,
-            }, 'Inventory below cost-based threshold on destination, triggering LiFi movement');
-            // Get all available source chains with raw inventory
-            const allSources = this.selectAllSourceChains(destination);
-            if (allSources.length === 0) {
-                this.logger.warn({
-                    origin,
-                    destination,
-                    amount: amount.toString(),
+            const alignedExecution = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__/* .alignLocalToCanonical */ .gU)(maxTransferable, sourceToken);
+            if (alignedExecution.messageAmount === 0n) {
+                this.logger.info({
                     intentId: intent.id,
-                }, 'No inventory available on any monitored chain');
-                return {
-                    route,
-                    success: false,
-                    error: 'No inventory available on any monitored chain',
-                };
-            }
-            // NEW: Calculate max viable amount for each source chain
-            // This uses the quote API to determine gas costs upfront
-            const viableSources = [];
-            for (const source of allSources) {
-                const maxViable = await this.calculateMaxViableBridgeAmount(source.chain, destination, source.availableAmount, route.externalBridge);
-                if (maxViable > 0n) {
-                    viableSources.push({ chain: source.chain, maxViable });
-                }
+                    maxTransferable: maxTransferable.toString(),
+                }, 'Skipping partial transferRemote because available local amount cannot produce canonical progress');
             }
-            // Sort by max viable descending (bridge from largest sources first)
-            viableSources.sort((a, b) => (a.maxViable > b.maxViable ? -1 : 1));
-            if (viableSources.length === 0) {
-                this.logger.warn({
-                    targetChain: destination,
-                    sourcesChecked: allSources.length,
-                    intentId: intent.id,
-                }, 'No viable bridge sources - all chains have insufficient inventory or high gas costs');
-                return {
-                    route,
-                    success: false,
-                    error: 'No viable bridge sources available',
+            else {
+                const partialSwappedRoute = {
+                    ...swappedRoute,
+                    amount: alignedExecution.localAmount,
                 };
+                const result = await this.executeTransferRemote(partialSwappedRoute, intent, alignedExecution.messageAmount);
+                this.logger.info({
+                    intentId: intent.id,
+                    partialAmount: alignedExecution.localAmount.toString(),
+                    partialAmountCanonical: alignedExecution.messageAmount.toString(),
+                    requestedAmount: requestedLocalAmount.toString(),
+                    requestedAmountCanonical: amount.toString(),
+                    remainingAmountCanonical: (amount > alignedExecution.messageAmount
+                        ? amount - alignedExecution.messageAmount
+                        : 0n).toString(),
+                }, 'Executed partial inventory deposit, remaining will be handled in future cycles');
+                // Return original strategy route in result (not the swapped execution route)
+                return { ...result, route };
+            }
+        }
+        // Inventory below cost-based threshold - trigger ExternalBridge movement TO destination chain
+        this.logger.info({
+            targetChain: destination,
+            maxTransferable: maxTransferable.toString(),
+            minViableTransfer: minViableTransfer.toString(),
+            costMultiplier: _utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_6__/* .MIN_VIABLE_COST_MULTIPLIER */ .hh.toString(),
+            intentId: intent.id,
+        }, 'Inventory below cost-based threshold on destination, triggering LiFi movement');
+        // Get all available source chains with raw inventory
+        const allSources = this.selectAllSourceChains(destination);
+        if (allSources.length === 0) {
+            this.logger.warn({
+                origin,
+                destination,
+                amount: requestedLocalAmount.toString(),
+                intentId: intent.id,
+            }, 'No inventory available on any monitored chain');
+            return {
+                route,
+                success: false,
+                error: 'No inventory available on any monitored chain',
+            };
+        }
+        // Calculate source capacities in destination-local units.
+        const viableSources = [];
+        for (const source of allSources) {
+            const capacity = await this.calculateBridgeCapacity(source.chain, destination, source.availableAmount, route.externalBridge);
+            if (capacity.maxTargetOutput > 0n) {
+                viableSources.push({ chain: source.chain, ...capacity });
             }
-            // Create bridge plans using VIABLE amounts (gas already accounted for)
-            const targetWithBuffer = ((amount + costs.totalCost) * (100n + BRIDGE_BUFFER_PERCENT)) / 100n;
-            const bridgePlans = [];
-            let totalPlanned = 0n;
-            for (const source of viableSources) {
-                if (totalPlanned >= targetWithBuffer)
-                    break;
-                const remaining = targetWithBuffer - totalPlanned;
-                const amountFromSource = source.maxViable >= remaining ? remaining : source.maxViable; // Already gas-adjusted!
-                bridgePlans.push({
-                    chain: source.chain,
-                    amount: amountFromSource,
-                });
-                totalPlanned += amountFromSource;
-            }
-            this.logger.info({
+        }
+        // Sort by destination output descending.
+        viableSources.sort((a, b) => a.maxTargetOutput > b.maxTargetOutput ? -1 : 1);
+        if (viableSources.length === 0) {
+            this.logger.warn({
                 targetChain: destination,
-                viableSources: viableSources.map((s) => ({
-                    chain: s.chain,
-                    maxViable: s.maxViable.toString(),
-                    maxViableEth: (Number(s.maxViable) / 1e18).toFixed(6),
-                })),
-                bridgePlans: bridgePlans.map((p) => ({
-                    chain: p.chain,
-                    amount: p.amount.toString(),
-                    amountEth: (Number(p.amount) / 1e18).toFixed(6),
-                })),
-                totalPlanned: totalPlanned.toString(),
-                targetWithBuffer: targetWithBuffer.toString(),
+                sourcesChecked: allSources.length,
                 intentId: intent.id,
-            }, 'Created bridge plans using gas-adjusted viable amounts');
-            // Execute all bridges in parallel
-            const bridgeResults = await Promise.allSettled(bridgePlans.map((plan) => this.executeInventoryMovement(plan.chain, destination, plan.amount, intent, route.externalBridge)));
-            // Process results
-            let successCount = 0;
-            let totalBridged = 0n;
-            const failedErrors = [];
-            for (let i = 0; i < bridgeResults.length; i++) {
-                const result = bridgeResults[i];
-                const plan = bridgePlans[i];
-                if (result.status === 'fulfilled' && result.value.success) {
-                    successCount++;
-                    totalBridged += plan.amount;
-                    this.logger.info({
-                        sourceChain: plan.chain,
-                        amount: plan.amount.toString(),
-                        txHash: result.value.txHash,
-                    }, 'Inventory movement succeeded');
-                }
-                else {
-                    const error = result.status === 'rejected'
-                        ? result.reason?.message
-                        : result.value.error;
-                    if (error) {
-                        failedErrors.push(`${plan.chain}: ${error}`);
+            }, 'No viable bridge sources - all chains have insufficient inventory or high gas costs');
+            return {
+                route,
+                success: false,
+                error: 'No viable bridge sources available',
+            };
+        }
+        // Create bridge plans using destination-local output amounts.
+        const shortfall = requestedLocalAmount > availableInventory
+            ? requestedLocalAmount - availableInventory
+            : 0n;
+        const targetWithBuffer = ((shortfall + costs.totalCost) * (100n + BRIDGE_BUFFER_PERCENT)) / 100n;
+        const bridgePlans = [];
+        let totalPlanned = 0n;
+        for (const source of viableSources) {
+            if (totalPlanned >= targetWithBuffer)
+                break;
+            const remaining = targetWithBuffer - totalPlanned;
+            const targetOutput = source.maxTargetOutput >= remaining
+                ? remaining
+                : source.maxTargetOutput;
+            const quoteMode = source.maxTargetOutput > remaining ? 'reverse' : 'forward';
+            bridgePlans.push({
+                chain: source.chain,
+                maxSourceInput: source.maxSourceInput,
+                targetOutput,
+                quoteMode,
+            });
+            totalPlanned += targetOutput;
+        }
+        this.logger.info({
+            targetChain: destination,
+            viableSources: viableSources.map((s) => ({
+                chain: s.chain,
+                maxSourceInput: s.maxSourceInput.toString(),
+                maxTargetOutput: s.maxTargetOutput.toString(),
+            })),
+            bridgePlans: bridgePlans.map((p) => ({
+                chain: p.chain,
+                maxSourceInput: p.maxSourceInput.toString(),
+                targetOutput: p.targetOutput.toString(),
+                quoteMode: p.quoteMode,
+            })),
+            totalPlanned: totalPlanned.toString(),
+            shortfall: shortfall.toString(),
+            targetWithBuffer: targetWithBuffer.toString(),
+            intentId: intent.id,
+        }, 'Created bridge plans using gas-adjusted viable amounts');
+        // Execute all bridges in parallel
+        const bridgeResults = await Promise.allSettled(bridgePlans.map((plan) => this.executeInventoryMovement(plan.chain, destination, plan.targetOutput, plan.maxSourceInput, plan.quoteMode, intent, route.externalBridge)));
+        // Process results
+        let successCount = 0;
+        let totalQuotedOutputMin = 0n;
+        const failedErrors = [];
+        for (let i = 0; i < bridgeResults.length; i++) {
+            const result = bridgeResults[i];
+            const plan = bridgePlans[i];
+            if (result.status === 'fulfilled' && result.value.success) {
+                successCount++;
+                totalQuotedOutputMin += result.value.quotedOutputMin;
+                this.logger.info({
+                    sourceChain: plan.chain,
+                    plannedTargetOutput: plan.targetOutput.toString(),
+                    quotedOutput: result.value.quotedOutput.toString(),
+                    quotedOutputMin: result.value.quotedOutputMin.toString(),
+                    quoteModeUsed: result.value.quoteModeUsed,
+                    txHash: result.value.txHash,
+                }, 'Inventory movement succeeded');
+            }
+            else {
+                let error;
+                if (result.status === 'rejected') {
+                    if (result.reason instanceof Error) {
+                        error = result.reason.message;
+                    }
+                    else if (typeof result.reason === 'string') {
+                        error = result.reason;
+                    }
+                    else {
+                        try {
+                            error = JSON.stringify(result.reason) ?? String(result.reason);
+                        }
+                        catch {
+                            error = String(result.reason);
+                        }
                     }
-                    this.logger.warn({
-                        sourceChain: plan.chain,
-                        amount: plan.amount.toString(),
-                        error,
-                    }, 'Inventory movement failed');
                 }
+                else if (!result.value.success) {
+                    error = result.value.error;
+                }
+                if (error) {
+                    failedErrors.push(`${plan.chain}: ${error}`);
+                }
+                this.logger.warn({
+                    sourceChain: plan.chain,
+                    plannedTargetOutput: plan.targetOutput.toString(),
+                    error,
+                }, 'Inventory movement failed');
             }
-            if (successCount === 0) {
-                const errorDetails = failedErrors.length > 0 ? ` (${failedErrors.join('; ')})` : '';
-                return {
-                    route,
-                    success: false,
-                    error: `All inventory movements failed${errorDetails}`,
-                };
-            }
-            this.logger.info({
-                targetChain: destination,
-                successCount,
-                totalBridged: totalBridged.toString(),
-                targetAmount: amount.toString(),
-                intentId: intent.id,
-            }, 'Parallel inventory movements completed, transferRemote will execute after bridges complete');
-            return { route, success: true };
         }
+        if (successCount === 0) {
+            const errorDetails = failedErrors.length > 0 ? ` (${failedErrors.join('; ')})` : '';
+            return {
+                route,
+                success: false,
+                error: `All inventory movements failed${errorDetails}`,
+            };
+        }
+        this.logger.info({
+            targetChain: destination,
+            successCount,
+            totalQuotedOutputMin: totalQuotedOutputMin.toString(),
+            targetAmount: requestedLocalAmount.toString(),
+            targetAmountCanonical: amount.toString(),
+            intentId: intent.id,
+        }, 'Parallel inventory movements completed, transferRemote will execute after bridges complete');
+        return { route, success: true };
     }
     /**
      * Execute a transferRemote to deposit collateral.
@@ -735969,50 +736564,23 @@ class InventoryRebalancer {
      *
      * @param route - The transfer route (swapped direction)
      * @param intent - The rebalance intent being executed
-     * @param gasQuote - Pre-calculated gas quote from calculateTransferCosts
      */
-    async executeTransferRemote(route, intent, gasQuote) {
+    async executeTransferRemote(route, intent, fulfilledCanonicalAmount) {
         const { origin, destination, amount } = route;
         const originToken = this.getTokenForChain(origin);
         if (!originToken) {
             throw new Error(`No token found for origin chain: ${origin}`);
         }
         const destinationDomain = this.multiProvider.getDomainId(destination);
-        this.logger.debug({
-            origin,
-            destination,
-            amount: amount.toString(),
-            gasQuote: {
-                igpQuote: gasQuote.igpQuote.amount.toString(),
-                tokenFeeQuote: gasQuote.tokenFeeQuote?.amount?.toString() ?? 'none',
-            },
-        }, 'Using pre-calculated gas quote for transferRemote');
-        // Convert pre-calculated gas quote to TokenAmount for WarpCore
-        const originChainMetadata = this.multiProvider.getChainMetadata(origin);
-        const igpAddressOrDenom = gasQuote.igpQuote.addressOrDenom;
-        const igpToken = !igpAddressOrDenom || (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .isZeroishAddress */ .Hi)(igpAddressOrDenom)
-            ? _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_6__/* .Token */ .o.FromChainMetadataNativeToken(originChainMetadata)
-            : this.warpCore.findToken(origin, igpAddressOrDenom);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(igpToken, `IGP fee token ${igpAddressOrDenom} is unknown`);
-        const interchainFee = new _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_7__/* .TokenAmount */ .s(gasQuote.igpQuote.amount, igpToken);
-        let tokenFeeQuote;
-        if (gasQuote.tokenFeeQuote?.amount) {
-            const feeAddress = gasQuote.tokenFeeQuote.addressOrDenom;
-            const feeToken = !feeAddress || (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .isZeroishAddress */ .Hi)(feeAddress)
-                ? _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_6__/* .Token */ .o.FromChainMetadataNativeToken(originChainMetadata)
-                : originToken;
-            tokenFeeQuote = new _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_7__/* .TokenAmount */ .s(gasQuote.tokenFeeQuote.amount, feeToken);
-        }
+        this.logger.debug({ origin, destination, amount: amount.toString() }, 'Building transferRemote transactions for exact execution amount');
         const originTokenAmount = originToken.amount(amount);
         const transferTxs = await this.warpCore.getTransferRemoteTxs({
             originTokenAmount,
             destination,
             sender: this.getInventorySignerAddress(origin),
             recipient: this.getInventorySignerAddress(destination),
-            interchainFee,
-            tokenFeeQuote,
         });
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(transferTxs.length > 0, 'Expected at least one transaction from WarpCore');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(transferTxs.length > 0, 'Expected at least one transaction from WarpCore');
         this.logger.info({
             origin,
             destination,
@@ -736023,14 +736591,14 @@ class InventoryRebalancer {
         let transferTxHash;
         for (const tx of transferTxs) {
             const { txHash } = await this.sendAndConfirmInventoryTx(origin, tx);
-            if (tx.category === _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_8__/* .WarpTxCategory */ .b.Transfer) {
+            if (tx.category === _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_7__/* .WarpTxCategory */ .b.Transfer) {
                 transferTxHash = txHash;
             }
         }
         const messageId = transferTxHash
             ? await this.extractDispatchedMessageId(origin, transferTxHash)
             : undefined;
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(transferTxHash, 'No transfer transaction hash found');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(transferTxHash, 'No transfer transaction hash found');
         if (!messageId) {
             this.logger.warn({
                 origin,
@@ -736051,7 +736619,7 @@ class InventoryRebalancer {
             intentId: intent.id,
             origin: this.multiProvider.getDomainId(origin),
             destination: destinationDomain,
-            amount,
+            amount: fulfilledCanonicalAmount,
             type: 'inventory_deposit',
             txHash: transferTxHash,
             messageId,
@@ -736065,24 +736633,24 @@ class InventoryRebalancer {
     async sendAndConfirmInventoryTx(chain, typedTx) {
         const protocol = this.getProtocolForChain(chain);
         const signerConfig = this.config.inventorySigners[protocol];
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(signerConfig?.key, `Missing signer key for protocol ${protocol} (chain ${chain})`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(signerConfig?.key, `Missing signer key for protocol ${protocol} (chain ${chain})`);
         const accountConfig = this.buildSignerAccountConfig(protocol, signerConfig.key, chain);
-        const signer = await (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_9__/* .getSignerForChain */ .h)(chain, accountConfig, this.warpCore.multiProvider);
+        const signer = await (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_8__/* .getSignerForChain */ .h)(chain, accountConfig, this.warpCore.multiProvider);
         const metadata = this.warpCore.multiProvider.getChainMetadata(chain);
         const configuredConfirmations = metadata.blocks?.reorgPeriod ?? metadata.blocks?.confirmations;
         let waitConfirmations = 1;
         if (typeof configuredConfirmations === 'number') {
             waitConfirmations = configuredConfirmations;
         }
-        const txHash = await signer.sendAndConfirmTransaction((0,_utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_10__/* .toProtocolTransaction */ .S)(typedTx, protocol), { waitConfirmations });
+        const txHash = await signer.sendAndConfirmTransaction((0,_utils_transactionUtils_js__WEBPACK_IMPORTED_MODULE_9__/* .toProtocolTransaction */ .S)(typedTx, protocol), { waitConfirmations });
         return { txHash };
     }
     buildSignerAccountConfig(protocol, key, chain) {
         void chain;
         switch (protocol) {
-            case _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Ethereum:
-                return { protocol, privateKey: (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .ensure0x */ .Ho)(key) };
-            case _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Sealevel:
+            case _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .ProtocolType */ .Hb.Ethereum:
+                return { protocol, privateKey: (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ensure0x */ .Ho)(key) };
+            case _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .ProtocolType */ .Hb.Sealevel:
                 return { protocol, privateKey: (0,_utils_solanaKeyParser_js__WEBPACK_IMPORTED_MODULE_1__/* .parseSolanaPrivateKey */ .E)(key) };
             default:
                 throw new Error(`Unsupported protocol ${protocol} for inventory signer`);
@@ -736100,21 +736668,21 @@ class InventoryRebalancer {
             if (!logs)
                 return undefined;
             const parsed = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_14__/* .SealevelCoreAdapter */ .M.parseMessageDispatchLogs(logs);
-            return parsed[0]?.messageId ? (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .ensure0x */ .Ho)(parsed[0].messageId) : undefined;
+            return parsed[0]?.messageId ? (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ensure0x */ .Ho)(parsed[0].messageId) : undefined;
         }
         return undefined;
     }
     async getTransactionReceipt(origin, txHash) {
         try {
             const protocol = this.getProtocolForChain(origin);
-            if (protocol === _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Ethereum) {
+            if (protocol === _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .ProtocolType */ .Hb.Ethereum) {
                 const provider = this.warpCore.multiProvider.getEthersV5Provider(origin);
                 const receipt = await provider.getTransactionReceipt(txHash);
                 if (!receipt)
                     return undefined;
                 return { type: _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_12__/* .ProviderType */ .c.EthersV5, receipt };
             }
-            if (protocol === _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Sealevel) {
+            if (protocol === _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .ProtocolType */ .Hb.Sealevel) {
                 const provider = this.warpCore.multiProvider.getSolanaWeb3Provider(origin);
                 const receipt = await provider.getTransaction(txHash, {
                     commitment: 'confirmed',
@@ -736153,39 +736721,26 @@ class InventoryRebalancer {
         return sources.sort((a, b) => a.availableAmount > b.availableAmount ? -1 : 1);
     }
     /**
-     * Calculate the maximum amount that can be bridged from a source chain.
-     * Uses LiFi quote to determine gas costs, applies 20x multiplier buffer.
-     * Returns 0 if gas exceeds 10% of inventory (not economically viable).
-     *
-     * This is the key method for the gas-aware planning approach:
-     * - Gets a quote for the full raw inventory to determine actual gas costs
-     * - Applies conservative 20x buffer (LiFi underestimates by ~14x historically)
-     * - Returns 0 if gas > 10% of inventory (not worth bridging)
-     * - Returns inventory - estimatedGas if viable
+     * Calculate the bridge capacity from a source chain in destination-local units.
+     * Uses LiFi quotes to conservatively estimate the destination output available
+     * from the source chain's current local inventory.
      *
-     * @param sourceChain - Chain to bridge from
-     * @param targetChain - Chain to bridge to
-     * @param rawInventory - Raw available inventory on source chain
-     * @param externalBridgeType - External bridge type to use
-     * @returns Maximum viable bridge amount (0 if not viable)
+     * For native-token sources, gas is reserved from the source inventory and the
+     * output capacity is re-quoted from the remaining source input.
      */
-    async calculateMaxViableBridgeAmount(sourceChain, targetChain, rawInventory, externalBridgeType) {
+    async calculateBridgeCapacity(sourceChain, targetChain, rawInventory, externalBridgeType) {
         const sourceToken = this.getTokenForChain(sourceChain);
         const targetToken = this.getTokenForChain(targetChain);
-        if (!sourceToken || !targetToken)
-            return 0n;
-        // Only applies to native tokens (need gas from same balance)
-        if (!(0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .isNativeTokenStandard */ .OJ)(sourceToken.standard)) {
-            return rawInventory; // ERC20s don't compete with gas
-        }
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(sourceToken, `No token found for source chain: ${sourceChain}`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(targetToken, `No token found for target chain: ${targetChain}`);
         // Convert HypNative token addresses to the external bridge's native token representation
-        const fromTokenAddress = this.getNativeTokenAddress(externalBridgeType);
+        const fromTokenAddress = (0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .getExternalBridgeTokenAddress */ .iV)(sourceToken, externalBridgeType, this.getNativeTokenAddress.bind(this));
         const toTokenAddress = (0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .getExternalBridgeTokenAddress */ .iV)(targetToken, externalBridgeType, this.getNativeTokenAddress.bind(this));
         const sourceChainId = Number(this.multiProvider.getChainId(sourceChain));
         const targetChainId = Number(this.multiProvider.getChainId(targetChain));
         try {
             const externalBridge = this.getExternalBridge(externalBridgeType);
-            const quote = await externalBridge.quote({
+            const initialQuote = await externalBridge.quote({
                 fromChain: sourceChainId,
                 toChain: targetChainId,
                 fromToken: fromTokenAddress,
@@ -736194,62 +736749,74 @@ class InventoryRebalancer {
                 fromAddress: this.getInventorySignerAddress(sourceChain),
                 toAddress: this.getInventorySignerAddress(targetChain),
             });
-            // Apply 20x multiplier on quoted gas (LiFi underestimates by ~14x)
-            const estimatedGas = quote.gasCosts * GAS_COST_MULTIPLIER;
-            // Viability check: gas should not exceed 10% of inventory
-            const maxGasThreshold = rawInventory / MAX_GAS_PERCENT_THRESHOLD;
-            if (estimatedGas > maxGasThreshold) {
-                this.logger.info({
-                    sourceChain,
-                    targetChain,
-                    rawInventory: rawInventory.toString(),
-                    rawInventoryEth: (Number(rawInventory) / 1e18).toFixed(6),
-                    quotedGas: quote.gasCosts.toString(),
-                    estimatedGas: estimatedGas.toString(),
-                    estimatedGasEth: (Number(estimatedGas) / 1e18).toFixed(6),
-                    maxGasThreshold: maxGasThreshold.toString(),
-                    gasPercent: `${(Number(estimatedGas) * 100) / Number(rawInventory)}%`,
-                }, 'Bridge not viable - gas cost exceeds 10% of inventory');
-                return 0n;
+            let maxSourceInput = rawInventory;
+            let outputQuote = initialQuote;
+            if ((0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .isNativeTokenStandard */ .OJ)(sourceToken.standard)) {
+                const estimatedGas = initialQuote.gasCosts * GAS_COST_MULTIPLIER;
+                const maxGasThreshold = rawInventory / MAX_GAS_PERCENT_THRESHOLD;
+                if (estimatedGas > maxGasThreshold) {
+                    this.logger.info({
+                        sourceChain,
+                        targetChain,
+                        rawInventory: rawInventory.toString(),
+                        quotedGas: initialQuote.gasCosts.toString(),
+                        estimatedGas: estimatedGas.toString(),
+                        maxGasThreshold: maxGasThreshold.toString(),
+                    }, 'Bridge not viable - gas cost exceeds 10% of inventory');
+                    return { maxSourceInput: 0n, maxTargetOutput: 0n };
+                }
+                maxSourceInput = rawInventory - estimatedGas;
+                if (maxSourceInput <= 0n) {
+                    return { maxSourceInput: 0n, maxTargetOutput: 0n };
+                }
+                outputQuote = await externalBridge.quote({
+                    fromChain: sourceChainId,
+                    toChain: targetChainId,
+                    fromToken: fromTokenAddress,
+                    toToken: toTokenAddress,
+                    fromAmount: maxSourceInput,
+                    fromAddress: this.getInventorySignerAddress(sourceChain),
+                    toAddress: this.getInventorySignerAddress(targetChain),
+                });
             }
-            // Max viable = inventory minus estimated gas
-            const maxViable = rawInventory - estimatedGas;
             this.logger.info({
                 sourceChain,
                 targetChain,
                 rawInventory: rawInventory.toString(),
-                rawInventoryEth: (Number(rawInventory) / 1e18).toFixed(6),
-                quotedGas: quote.gasCosts.toString(),
-                estimatedGas: estimatedGas.toString(),
-                estimatedGasEth: (Number(estimatedGas) / 1e18).toFixed(6),
-                maxViable: maxViable.toString(),
-                maxViableEth: (Number(maxViable) / 1e18).toFixed(6),
-            }, 'Calculated max viable bridge amount');
-            return maxViable;
+                maxSourceInput: maxSourceInput.toString(),
+                maxTargetOutput: outputQuote.toAmountMin.toString(),
+            }, 'Calculated bridge capacity');
+            return {
+                maxSourceInput,
+                maxTargetOutput: outputQuote.toAmountMin,
+            };
         }
         catch (error) {
             this.logger.warn({
                 sourceChain,
                 targetChain,
                 error: error.message,
-            }, 'Failed to calculate max viable bridge amount, skipping chain');
-            return 0n;
+            }, 'Failed to calculate bridge capacity, skipping chain');
+            return { maxSourceInput: 0n, maxTargetOutput: 0n };
         }
     }
     /**
      * Execute inventory movement from source chain to target chain via LiFi bridge.
      *
-     * IMPORTANT: The amount parameter is now the MAX VIABLE amount (gas already subtracted
-     * by calculateMaxViableBridgeAmount). This method trusts that the amount is pre-validated.
+     * Quote mode is chosen during planning:
+     * - `reverse`: request an exact target-chain output when the source has headroom
+     * - `forward`: spend the source cap directly when source inventory is the limiter
      *
      * @param sourceChain - Chain to move inventory from
      * @param targetChain - Chain to move inventory to (origin chain for rebalancing)
-     * @param amount - Pre-validated amount to bridge (gas already accounted for)
+     * @param targetOutputAmount - Destination-local amount to receive
+     * @param maxSourceInput - Maximum source-local amount available for this plan
+     * @param quoteMode - Whether to execute this bridge plan as exact-input or exact-output
      * @param intent - Rebalance intent for tracking
      * @param externalBridgeType - External bridge type to use
      * @returns Result with success status and optional txHash/error
      */
-    async executeInventoryMovement(sourceChain, targetChain, amount, intent, externalBridgeType) {
+    async executeInventoryMovement(sourceChain, targetChain, targetOutputAmount, maxSourceInput, quoteMode, intent, externalBridgeType) {
         const sourceToken = this.getTokenForChain(sourceChain);
         if (!sourceToken) {
             return {
@@ -736278,59 +736845,65 @@ class InventoryRebalancer {
             fromTokenAddress,
             toTokenAddress,
         }, 'Resolved token addresses for LiFi bridge');
-        // Calculate minViableTransfer for the target chain
-        // If bridging less than this, the received amount won't be enough to execute transferRemote
-        // So we over-bridge to ensure we can complete the intent in the next cycle
-        const costs = await (0,_utils_gasEstimation_js__WEBPACK_IMPORTED_MODULE_4__/* .calculateTransferCosts */ ._P)(targetChain, // FROM chain for transferRemote (the target of this bridge)
-        sourceChain, // TO chain for transferRemote (Hyperlane message destination)
-        amount, // availableInventory (not used for minViableTransfer calculation)
-        amount, // requestedAmount
-        this.multiProvider, this.warpCore.multiProvider, this.getTokenForChain.bind(this), this.getInventorySignerAddress(targetChain), _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .isNativeTokenStandard */ .OJ, this.logger);
-        const { minViableTransfer } = costs;
-        // If the requested amount is below minViableTransfer, adjust it up
-        // This ensures we bridge enough to actually complete the final transferRemote
-        const effectiveAmount = amount < minViableTransfer ? minViableTransfer : amount;
-        if (effectiveAmount !== amount) {
-            this.logger.info({
-                originalAmount: amount.toString(),
-                effectiveAmount: effectiveAmount.toString(),
-                minViableTransfer: minViableTransfer.toString(),
-                originalAmountEth: (Number(amount) / 1e18).toFixed(6),
-                effectiveAmountEth: (Number(effectiveAmount) / 1e18).toFixed(6),
-                minViableTransferEth: (Number(minViableTransfer) / 1e18).toFixed(6),
-                adjustedUp: true,
-                intentId: intent.id,
-            }, 'Over-bridging to minViableTransfer to ensure final transferRemote can complete');
-        }
         try {
             const externalBridge = this.getExternalBridge(externalBridgeType);
-            const quote = await externalBridge.quote({
+            const fromAddress = this.getInventorySignerAddress(sourceChain);
+            const toAddress = this.getInventorySignerAddress(targetChain);
+            const quoteWithMode = async (mode) => externalBridge.quote({
                 fromChain: sourceChainId,
                 toChain: targetChainId,
                 fromToken: fromTokenAddress,
                 toToken: toTokenAddress,
-                fromAmount: effectiveAmount,
-                fromAddress: this.getInventorySignerAddress(sourceChain),
-                toAddress: this.getInventorySignerAddress(targetChain),
+                ...(mode === 'forward'
+                    ? { fromAmount: maxSourceInput }
+                    : { toAmount: targetOutputAmount }),
+                fromAddress,
+                toAddress,
             });
+            let quoteModeUsed = quoteMode;
+            let quote = await quoteWithMode(quoteModeUsed);
+            if (quoteModeUsed === 'reverse' && quote.fromAmount > maxSourceInput) {
+                this.logger.warn({
+                    sourceChain,
+                    targetChain,
+                    plannedQuoteMode: quoteMode,
+                    requestedTargetOutput: targetOutputAmount.toString(),
+                    quotedInput: quote.fromAmount.toString(),
+                    maxSourceInput: maxSourceInput.toString(),
+                    intentId: intent.id,
+                }, 'Reverse bridge quote exceeded source capacity, retrying with forward quote');
+                // Spend the full source cap on fallback; minor output drift is acceptable
+                // and will be reconciled by later cycles rather than risking livelock.
+                quoteModeUsed = 'forward';
+                quote = await quoteWithMode(quoteModeUsed);
+            }
             const inputRequired = quote.fromAmount;
+            if (inputRequired > maxSourceInput) {
+                return {
+                    success: false,
+                    error: `Bridge input ${inputRequired} exceeded planned source capacity ${maxSourceInput}`,
+                };
+            }
             this.logger.info({
                 sourceChain,
                 targetChain,
                 sourceChainId,
                 targetChainId,
-                preValidatedAmount: amount.toString(),
-                preValidatedAmountEth: (Number(amount) / 1e18).toFixed(6),
-                effectiveAmount: effectiveAmount.toString(),
-                effectiveAmountEth: (Number(effectiveAmount) / 1e18).toFixed(6),
+                requestedTargetOutput: targetOutputAmount.toString(),
+                requestedTargetOutputFormatted: this.formatLocalAmount(targetOutputAmount, targetToken),
+                quoteModePlanned: quoteMode,
+                quoteModeUsed,
+                retriedAsForward: quoteMode === 'reverse' && quoteModeUsed === 'forward',
                 inputRequired: inputRequired.toString(),
-                expectedOutput: quote.toAmount.toString(),
-                expectedOutputEth: (Number(quote.toAmount) / 1e18).toFixed(6),
+                inputRequiredFormatted: this.formatLocalAmount(inputRequired, sourceToken),
+                quotedOutput: quote.toAmount.toString(),
+                quotedOutputMin: quote.toAmountMin.toString(),
+                quotedOutputFormatted: this.formatLocalAmount(quote.toAmount, targetToken),
+                quotedOutputMinFormatted: this.formatLocalAmount(quote.toAmountMin, targetToken),
                 gasCosts: quote.gasCosts.toString(),
                 feeCosts: quote.feeCosts.toString(),
                 intentId: intent.id,
-                adjustedForMinViable: effectiveAmount > amount,
-            }, 'Executing inventory movement via LiFi with pre-validated amount');
+            }, 'Executing inventory movement via bridge quote');
             this.logger.debug({
                 quoteId: quote.id,
                 tool: quote.tool,
@@ -736349,7 +736922,7 @@ class InventoryRebalancer {
                 }
             }
             const sourceProtocol = this.getProtocolForChain(sourceChain);
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(privateKeys[sourceProtocol], `Missing inventory signer key for protocol ${sourceProtocol} (chain ${sourceChain})`);
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(privateKeys[sourceProtocol], `Missing inventory signer key for protocol ${sourceProtocol} (chain ${sourceChain})`);
             const result = await externalBridge.execute(quote, privateKeys);
             this.logger.info({
                 sourceChain,
@@ -736357,6 +736930,8 @@ class InventoryRebalancer {
                 txHash: result.txHash,
                 intentId: intent.id,
             }, 'Inventory movement transaction executed');
+            // Keep bridge consumption in source-local units; intent fulfillment only
+            // advances from canonical inventory_deposit amounts after transferRemote.
             await this.actionTracker.createRebalanceAction({
                 intentId: intent.id,
                 origin: this.multiProvider.getDomainId(sourceChain),
@@ -736374,19 +736949,27 @@ class InventoryRebalancer {
                 amountConsumed: inputRequired.toString(),
                 totalConsumed: (currentConsumed + inputRequired).toString(),
             }, 'Updated consumed inventory after LiFi bridge');
-            return { success: true, txHash: result.txHash };
+            return {
+                success: true,
+                txHash: result.txHash,
+                inputRequired,
+                quotedOutput: quote.toAmount,
+                quotedOutputMin: quote.toAmountMin,
+                quoteModeUsed,
+            };
         }
         catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
             this.logger.error({
                 sourceChain,
                 targetChain,
-                amount: amount.toString(),
+                amount: targetOutputAmount.toString(),
                 intentId: intent.id,
-                error: error.message,
+                error: errorMessage,
             }, 'Failed to execute inventory movement');
             return {
                 success: false,
-                error: error.message,
+                error: errorMessage,
             };
         }
     }
@@ -736404,11 +736987,15 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   K: () => (/* binding */ Rebalancer)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(21582);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(71598);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(14918);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(73689);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(93142);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(21582);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(71598);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(14918);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(73689);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(93142);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(11369);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__]);
+_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
+
 
 
 class Rebalancer {
@@ -736466,7 +737053,8 @@ class Rebalancer {
             for (const result of successfulResults) {
                 const token = this.tokensByChainName[result.route.origin];
                 if (token) {
-                    this.metrics.recordRebalanceAmount(result.route, token.amount(result.route.amount));
+                    this.metrics.recordRebalanceAmount(result.route, token.amount(result.localAmount ??
+                        (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .denormalizeToLocal */ .bK)(result.route.amount, token)));
                 }
             }
         }
@@ -736496,7 +737084,7 @@ class Rebalancer {
                     intentId,
                     origin: this.multiProvider.getDomainId(result.route.origin),
                     destination: this.multiProvider.getDomainId(result.route.destination),
-                    amount: result.route.amount,
+                    amount: result.canonicalAmount ?? result.route.amount,
                     type: 'rebalance_message',
                     messageId: result.messageId,
                     txHash: result.txHash,
@@ -736532,9 +737120,9 @@ class Rebalancer {
     }
     async prepareTransactions(routes) {
         this.logger.info({ numRoutes: routes.length }, 'Preparing all rebalance transactions.');
-        const { fulfilled, rejected } = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .mapAllSettled */ .bh)(routes, (route) => this.prepareTransaction(route), (_, i) => i);
+        const { fulfilled, rejected } = await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .mapAllSettled */ .bh)(routes, (route) => this.prepareTransaction(route), (_, i) => i);
         // Filter out null results (validation failures logged internally)
-        const preparedTransactions = Array.from(fulfilled.values()).filter((tx) => !(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .isNullish */ .u)(tx));
+        const preparedTransactions = Array.from(fulfilled.values()).filter((tx) => !(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .isNullish */ .u)(tx));
         // Create failure results for tracking
         const preparationFailureResults = [];
         for (const [i, error] of rejected) {
@@ -736548,7 +737136,7 @@ class Rebalancer {
         }
         // Also track null results (validation failures)
         Array.from(fulfilled.entries()).forEach(([i, tx]) => {
-            if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .isNullish */ .u)(tx)) {
+            if ((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .isNullish */ .u)(tx)) {
                 preparationFailureResults.push({
                     route: routes[i],
                     intentId: routes[i].intentId,
@@ -736575,14 +737163,15 @@ class Rebalancer {
         const originToken = this.tokensByChainName[origin];
         const destinationToken = this.tokensByChainName[destination];
         const destinationChainMeta = this.chainMetadata[destination];
-        const originTokenAmount = originToken.amount(amount);
+        const localAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .denormalizeToLocal */ .bK)(amount, originToken);
+        const originTokenAmount = originToken.amount(localAmount);
         const decimalFormattedAmount = originTokenAmount.getDecimalFormattedAmount();
         const originHypAdapter = originToken.getHypAdapter(this.warpCore.multiProvider);
         const { bridge } = route;
         // 2. Get quotes
         let quotes;
         try {
-            quotes = await originHypAdapter.getRebalanceQuotes(bridge, destinationChainMeta.domainId, destinationToken.addressOrDenom, amount);
+            quotes = await originHypAdapter.getRebalanceQuotes(bridge, destinationChainMeta.domainId, destinationToken.addressOrDenom, localAmount);
         }
         catch (error) {
             this.logger.error({
@@ -736597,7 +737186,7 @@ class Rebalancer {
         // 3. Populate transaction
         let populatedTx;
         try {
-            populatedTx = await originHypAdapter.populateRebalanceTx(destinationChainMeta.domainId, amount, bridge, quotes);
+            populatedTx = await originHypAdapter.populateRebalanceTx(destinationChainMeta.domainId, localAmount, bridge, quotes);
         }
         catch (error) {
             this.logger.error({
@@ -736620,7 +737209,8 @@ class Rebalancer {
             this.logger.error({ origin, destination, amount }, 'Route validation failed: origin token not found.');
             return false;
         }
-        const originTokenAmount = originToken.amount(amount);
+        const localAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .denormalizeToLocal */ .bK)(amount, originToken);
+        const originTokenAmount = originToken.amount(localAmount);
         const decimalFormattedAmount = originTokenAmount.getDecimalFormattedAmount();
         if (!destinationToken) {
             this.logger.error({ origin, destination, amount: decimalFormattedAmount }, 'Route validation failed: destination token not found.');
@@ -736631,7 +737221,7 @@ class Rebalancer {
             return false;
         }
         const originHypAdapter = originToken.getHypAdapter(this.warpCore.multiProvider);
-        if (!(originHypAdapter instanceof _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_2__/* .EvmMovableCollateralAdapter */ .vo)) {
+        if (!(originHypAdapter instanceof _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_3__/* .EvmMovableCollateralAdapter */ .vo)) {
             this.logger.error({
                 origin,
                 destination,
@@ -736654,7 +737244,7 @@ class Rebalancer {
             return false;
         }
         const allowedDestination = await originHypAdapter.getAllowedDestination(destinationDomain.domainId);
-        if (!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .eqAddress */ .fv)(allowedDestination, destinationToken.addressOrDenom)) {
+        if (!(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .eqAddress */ .fv)(allowedDestination, destinationToken.addressOrDenom)) {
             this.logger.error({
                 origin,
                 destination,
@@ -736816,7 +737406,7 @@ class Rebalancer {
      */
     buildResult(transaction, receipt) {
         const { origin, destination } = transaction.route;
-        const dispatchedMessages = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_4__/* .HyperlaneCore */ .K.getDispatchedMessages(receipt);
+        const dispatchedMessages = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_5__/* .HyperlaneCore */ .K.getDispatchedMessages(receipt);
         if (dispatchedMessages.length === 0) {
             this.logger.error({ origin, destination, txHash: receipt.transactionHash }, 'No Dispatch event found in confirmed rebalance receipt');
             return {
@@ -736834,6 +737424,8 @@ class Rebalancer {
             success: true,
             messageId: dispatchedMessages[0].id,
             txHash: receipt.transactionHash,
+            canonicalAmount: (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .normalizeToCanonical */ .R2)(transaction.originTokenAmount.amount, transaction.originTokenAmount.token),
+            localAmount: transaction.originTokenAmount.amount,
         };
     }
     getReorgPeriod(chainName) {
@@ -736892,7 +737484,7 @@ class RebalancerOrchestrator {
             await Promise.all(event.tokensInfo.map((tokenInfo) => metrics.processToken(tokenInfo)));
         }
         await this.syncActionTracker(event.confirmedBlockTags);
-        const rawBalances = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_1__/* .getRawBalances */ .q)((0,_config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .getStrategyChainNames */ .zj)(this.rebalancerConfig.strategyConfig), event, this.logger);
+        const rawBalances = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_1__/* .getRawBalances */ .qb)((0,_config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .getStrategyChainNames */ .zj)(this.rebalancerConfig.strategyConfig), event, this.logger);
         this.logger.info({
             balances: Object.entries(rawBalances).map(([chain, balance]) => ({
                 chain,
@@ -737025,14 +737617,15 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   $: () => (/* binding */ RebalancerService)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(21387);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(39196);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(21387);
 /* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(75102);
 /* harmony import */ var _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(84569);
 /* harmony import */ var _interfaces_IMonitor_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(36513);
-/* harmony import */ var _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(52209);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_1__]);
-_factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_1__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
+/* harmony import */ var _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(52209);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(11369);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_1__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_3__]);
+([_factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_1__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_3__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
 
 
 
@@ -737130,7 +737723,7 @@ class RebalancerService {
         if (this.config.actionTracker) {
             // Use externally provided ActionTracker (e.g., for simulation/testing)
             this.actionTracker = this.config.actionTracker;
-            this.inflightContextAdapter = new _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_3__/* .InflightContextAdapter */ .m(this.actionTracker, this.multiProvider);
+            this.inflightContextAdapter = new _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_4__/* .InflightContextAdapter */ .m(this.actionTracker, this.multiProvider);
             await this.actionTracker.initialize();
             this.logger.info('Using externally provided ActionTracker');
         }
@@ -737185,7 +737778,7 @@ class RebalancerService {
      */
     async executeManual(request) {
         await this.initialize();
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(this.rebalancer, 'Rebalancer not available. MonitorOnly mode cannot execute manual rebalances.');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(this.rebalancer, 'Rebalancer not available. MonitorOnly mode cannot execute manual rebalances.');
         const { origin, destination, amount } = request;
         this.logger.info(`Manual rebalance strategy selected. Origin: ${origin}, Destination: ${destination}, Amount: ${amount}`);
         const warpCore = this.contextFactory.getWarpCore();
@@ -737197,17 +737790,17 @@ class RebalancerService {
         }
         // Validate amount
         const amountNum = Number(amount);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(!isNaN(amountNum), 'Amount must be a valid number');
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(amountNum > 0, 'Amount must be greater than 0');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(!isNaN(amountNum), 'Amount must be a valid number');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(amountNum > 0, 'Amount must be greater than 0');
         const originConfig = (0,_config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .getStrategyChainConfig */ .nt)(this.rebalancerConfig.strategyConfig, origin);
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(originConfig?.bridge, `No bridge configured for origin chain ${origin}`);
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(originConfig?.bridge, `No bridge configured for origin chain ${origin}`);
         // Use destination-specific bridge override if configured, otherwise use default
         const bridge = originConfig.override?.[destination]?.bridge ?? originConfig.bridge;
         try {
             const manualRoute = {
                 origin,
                 destination,
-                amount: BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .toWei */ .fq)(amount, originToken.decimals)),
+                amount: (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_3__/* .normalizeConfiguredAmount */ .k9)(amount, originToken),
                 executionType: 'movableCollateral',
                 bridge,
                 intentId: `manual-${Date.now()}`,
@@ -737228,7 +737821,7 @@ class RebalancerService {
             throw new Error('start() can only be called in daemon mode');
         }
         await this.initialize();
-        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_4__/* .assert */ .v)(this.monitor, 'Monitor must be initialized for daemon mode');
+        (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(this.monitor, 'Monitor must be initialized for daemon mode');
         // Setup monitor event listeners
         this.monitor
             .on(_interfaces_IMonitor_js__WEBPACK_IMPORTED_MODULE_2__/* .MonitorEventType */ .nE.TokenInfo, this.onTokenInfo.bind(this))
@@ -737315,29 +737908,30 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   n: () => (/* binding */ RebalancerContextFactory)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(95176);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(9035);
-/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_18__ = __nccwpck_require__(32772);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(73938);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(16639);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(39196);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__ = __nccwpck_require__(21387);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(95176);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(9035);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_19__ = __nccwpck_require__(32772);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(73938);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(16639);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(21387);
 /* harmony import */ var _bridges_LiFiBridge_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(70311);
 /* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(75102);
 /* harmony import */ var _core_InventoryRebalancer_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(13081);
-/* harmony import */ var _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_15__ = __nccwpck_require__(3903);
-/* harmony import */ var _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(67279);
-/* harmony import */ var _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(42575);
-/* harmony import */ var _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(81708);
-/* harmony import */ var _monitor_Monitor_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(14135);
-/* harmony import */ var _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(52154);
-/* harmony import */ var _tracking_ActionTracker_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(60732);
-/* harmony import */ var _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_19__ = __nccwpck_require__(52209);
-/* harmony import */ var _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_16__ = __nccwpck_require__(98867);
-/* harmony import */ var _utils_ExplorerClient_js__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(14660);
-/* harmony import */ var _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(46618);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_core_InventoryRebalancer_js__WEBPACK_IMPORTED_MODULE_2__, _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_3__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_4__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_5__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_9__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_12__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_13__, _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_15__]);
-([_core_InventoryRebalancer_js__WEBPACK_IMPORTED_MODULE_2__, _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_3__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_4__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_5__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_9__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_12__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_13__, _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_15__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+/* harmony import */ var _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(3903);
+/* harmony import */ var _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(67279);
+/* harmony import */ var _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(42575);
+/* harmony import */ var _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(81708);
+/* harmony import */ var _monitor_Monitor_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(14135);
+/* harmony import */ var _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(88757);
+/* harmony import */ var _tracking_ActionTracker_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(60732);
+/* harmony import */ var _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_20__ = __nccwpck_require__(52209);
+/* harmony import */ var _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_17__ = __nccwpck_require__(98867);
+/* harmony import */ var _utils_ExplorerClient_js__WEBPACK_IMPORTED_MODULE_18__ = __nccwpck_require__(14660);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(11369);
+/* harmony import */ var _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(46618);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_core_InventoryRebalancer_js__WEBPACK_IMPORTED_MODULE_2__, _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_3__, _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_4__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_5__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_6__, _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_8__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_14__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_15__]);
+([_core_InventoryRebalancer_js__WEBPACK_IMPORTED_MODULE_2__, _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_3__, _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_4__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_5__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_6__, _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_8__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_14__, _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_15__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
 
 
 
@@ -737369,7 +737963,7 @@ class RebalancerContextFactory {
      * @param warpCore - An instance of `WarpCore` configured for the specified `warpRouteId`.
      * @param tokensByChainName - A map of chain->token to ease the lookup of token by chain
      * @param multiProvider - MultiProvider instance (for movable collateral operations)
-     * @param multiProtocolProvider - MultiProviderAdapter instance (with mailbox metadata)
+     * @param multiProtocolProvider - MultiProtocolProvider instance (with mailbox metadata)
      * @param registry - IRegistry instance
      * @param logger - Logger instance
      */
@@ -737386,7 +737980,7 @@ class RebalancerContextFactory {
     /**
      * @param config - The rebalancer config
      * @param multiProvider - MultiProvider instance (for movable collateral operations)
-     * @param multiProtocolProvider - MultiProviderAdapter instance (optional, created from multiProvider if not provided)
+     * @param multiProtocolProvider - MultiProtocolProvider instance (optional, created from multiProvider if not provided)
      * @param registry - IRegistry instance
      * @param logger - Logger instance
      */
@@ -737398,7 +737992,7 @@ class RebalancerContextFactory {
         const addresses = await registry.getAddresses();
         // The Sealevel warp adapters require the Mailbox address, so we
         // get mailboxes for all chains and merge them with the chain metadata.
-        const mailboxes = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_10__/* .objMap */ .Yp)(addresses, (_, { mailbox }) => ({ mailbox }));
+        const mailboxes = (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_12__/* .objMap */ .Yp)(addresses, (_, { mailbox }) => ({ mailbox }));
         // Fetch warp route config FIRST to get chain list
         const warpCoreConfig = warpCoreConfigOverride ??
             (await registry.getWarpRoute(config.warpRouteId));
@@ -737413,17 +738007,17 @@ class RebalancerContextFactory {
             ...new Set(warpCoreConfig.tokens.map((t) => t.chainName)),
         ];
         for (const chain of warpChains) {
-            if (multiProvider.getProtocol(chain) !== _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Ethereum) {
+            if (multiProvider.getProtocol(chain) !== _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_13__/* .ProtocolType */ .Hb.Ethereum) {
                 logger.debug({ chain }, 'Skipping provider init for non-EVM chain');
                 continue;
             }
             multiProvider.getProvider(chain);
         }
-        // Create MultiProviderAdapter (convert from MultiProvider if not provided)
+        // Create MultiProtocolProvider (convert from MultiProvider if not provided)
         const mpp = multiProtocolProvider ??
-            _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_12__/* .MultiProtocolProvider */ .f.fromMultiProvider(multiProvider);
+            _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_14__/* .MultiProtocolProvider */ .f.fromMultiProvider(multiProvider);
         const extendedMultiProtocolProvider = mpp.extendChainMetadata(mailboxes);
-        const warpCore = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_13__/* .WarpCore */ .u.FromConfig(extendedMultiProtocolProvider, warpCoreConfig);
+        const warpCore = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_15__/* .WarpCore */ .u.FromConfig(extendedMultiProtocolProvider, warpCoreConfig);
         const tokensByChainName = Object.fromEntries(warpCore.tokens.map((t) => [t.chainName, t]));
         logger.debug({
             warpRouteId: config.warpRouteId,
@@ -737438,16 +738032,16 @@ class RebalancerContextFactory {
     }
     async createMetrics(coingeckoApiKey) {
         this.logger.debug({ warpRouteId: this.config.warpRouteId }, 'Creating Metrics');
-        const tokenPriceGetter = _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_5__/* .PriceGetter */ .z.create(this.multiProvider.metadata, this.logger, coingeckoApiKey);
+        const tokenPriceGetter = _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_6__/* .PriceGetter */ .z.create(this.multiProvider.metadata, this.logger, coingeckoApiKey);
         const warpDeployConfig = await this.registry.getWarpDeployConfig(this.config.warpRouteId);
-        return new _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_4__/* .Metrics */ .K(tokenPriceGetter, warpDeployConfig, this.warpCore, this.config.warpRouteId, this.logger);
+        return new _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_5__/* .Metrics */ .K(tokenPriceGetter, warpDeployConfig, this.warpCore, this.config.warpRouteId, this.logger);
     }
     createMonitor(checkFrequency, inventoryConfig) {
         this.logger.debug({
             warpRouteId: this.config.warpRouteId,
             checkFrequency: checkFrequency,
         }, 'Creating Monitor');
-        return new _monitor_Monitor_js__WEBPACK_IMPORTED_MODULE_6__/* .Monitor */ .V(checkFrequency, this.warpCore, this.logger, inventoryConfig);
+        return new _monitor_Monitor_js__WEBPACK_IMPORTED_MODULE_7__/* .Monitor */ .V(checkFrequency, this.warpCore, this.logger, inventoryConfig);
     }
     async createStrategy(metrics) {
         const strategyTypes = this.config.strategyConfig.map((s) => s.rebalanceStrategy);
@@ -737463,27 +738057,27 @@ class RebalancerContextFactory {
             const chainConfig = (0,_config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .getStrategyChainConfig */ .nt)(this.config.strategyConfig, chainName);
             if (chainConfig?.bridgeMinAcceptedAmount) {
                 const token = this.tokensByChainName[chainName];
-                const decimals = token?.decimals ?? 18;
-                minAmountsByChain[chainName] = BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_14__/* .toWei */ .fq)(chainConfig.bridgeMinAcceptedAmount, decimals));
+                (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(token, `No token found for configured strategy chain ${chainName} in warp route ${this.config.warpRouteId}`);
+                minAmountsByChain[chainName] = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__/* .normalizeConfiguredAmount */ .k9)(chainConfig.bridgeMinAcceptedAmount, token);
             }
         }
         this.logger.debug({
             minAmountsByChain: Object.fromEntries(Object.entries(minAmountsByChain).map(([k, v]) => [k, v.toString()])),
         }, 'Built minimum amounts by chain for strategy');
-        return _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_7__/* .StrategyFactory */ .M.createStrategy(this.config.strategyConfig, this.tokensByChainName, await this.getInitialTotalCollateral(), this.logger, metrics, minAmountsByChain);
+        return _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_8__/* .StrategyFactory */ .M.createStrategy(this.config.strategyConfig, this.tokensByChainName, await this.getInitialTotalCollateral(), this.logger, metrics, minAmountsByChain);
     }
     createMovableCollateralRebalancer(actionTracker, metrics) {
         this.logger.debug({ warpRouteId: this.config.warpRouteId }, 'Creating Rebalancer');
-        const rebalancer = new _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_15__/* .Rebalancer */ .K(this.warpCore, this.multiProvider.metadata, this.tokensByChainName, this.multiProvider, actionTracker, this.logger, metrics);
+        const rebalancer = new _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_3__/* .Rebalancer */ .K(this.warpCore, this.multiProvider.metadata, this.tokensByChainName, this.multiProvider, actionTracker, this.logger, metrics);
         return rebalancer;
     }
     async createActionTracker(explorerUrlOrClient = DEFAULT_EXPLORER_URL) {
         this.logger.debug({ warpRouteId: this.config.warpRouteId }, 'Creating ActionTracker');
-        const transferStore = new _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_16__/* .InMemoryStore */ .A();
-        const intentStore = new _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_16__/* .InMemoryStore */ .A();
-        const actionStore = new _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_16__/* .InMemoryStore */ .A();
+        const transferStore = new _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_17__/* .InMemoryStore */ .A();
+        const intentStore = new _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_17__/* .InMemoryStore */ .A();
+        const actionStore = new _tracking_store_index_js__WEBPACK_IMPORTED_MODULE_17__/* .InMemoryStore */ .A();
         const explorerClient = typeof explorerUrlOrClient === 'string'
-            ? new _utils_ExplorerClient_js__WEBPACK_IMPORTED_MODULE_17__/* .ExplorerClient */ .x(explorerUrlOrClient, (domain) => this.multiProvider.getProtocol(domain))
+            ? new _utils_ExplorerClient_js__WEBPACK_IMPORTED_MODULE_18__/* .ExplorerClient */ .x(explorerUrlOrClient, (domain) => this.multiProvider.getProtocol(domain))
             : explorerUrlOrClient;
         // 3. Get MultiProtocolCore from registry (supports all VM types)
         // Only fetch/validate addresses for warp route chains (not all registry chains)
@@ -737496,7 +738090,7 @@ class RebalancerContextFactory {
             }
             coreAddresses[chain] = addrs;
         }
-        const multiProtocolCore = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_18__/* .MultiProtocolCore */ .n.fromAddressesMap(coreAddresses, this.multiProtocolProvider);
+        const multiProtocolCore = _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_19__/* .MultiProtocolCore */ .n.fromAddressesMap(coreAddresses, this.multiProtocolProvider);
         // 4. Get rebalancer address from signer
         // Use the first chain in the strategy to get the signer address
         const chainNames = (0,_config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .getStrategyChainNames */ .zj)(this.config.strategyConfig);
@@ -737518,7 +738112,7 @@ class RebalancerContextFactory {
             rebalancerAddress,
             inventorySignerAddresses: this.config.inventorySigners
                 ? Object.entries(this.config.inventorySigners)
-                    .filter(([protocol]) => protocol === _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Ethereum)
+                    .filter(([protocol]) => protocol === _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_13__/* .ProtocolType */ .Hb.Ethereum)
                     .map(([, signerConfig]) => signerConfig)
                     .map((s) => s.address)
                     .filter(Boolean)
@@ -737526,9 +738120,9 @@ class RebalancerContextFactory {
             intentTTL: this.config.intentTTL,
         };
         // 6. Create ActionTracker
-        const tracker = new _tracking_ActionTracker_js__WEBPACK_IMPORTED_MODULE_8__/* .ActionTracker */ .N(transferStore, intentStore, actionStore, explorerClient, multiProtocolCore, trackerConfig, this.logger);
+        const tracker = new _tracking_ActionTracker_js__WEBPACK_IMPORTED_MODULE_9__/* .ActionTracker */ .N(transferStore, intentStore, actionStore, explorerClient, multiProtocolCore, trackerConfig, this.logger);
         // 7. Create InflightContextAdapter
-        const adapter = new _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_19__/* .InflightContextAdapter */ .m(tracker, this.multiProvider);
+        const adapter = new _tracking_InflightContextAdapter_js__WEBPACK_IMPORTED_MODULE_20__/* .InflightContextAdapter */ .m(tracker, this.multiProvider);
         this.logger.debug({
             warpRouteId: this.config.warpRouteId,
             routerCount: Object.keys(routersByDomain).length,
@@ -737565,31 +738159,34 @@ class RebalancerContextFactory {
             this.logger.debug('No inventory chains configured');
             return null;
         }
+        for (const chain of allRelevantChains) {
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(this.tokensByChainName[chain], `No token found for inventory-relevant chain ${chain} in warp route ${this.config.warpRouteId}`);
+        }
         const requiredProtocols = new Set(allRelevantChains.map((chain) => {
             const metadata = this.warpCore.multiProvider.getChainMetadata(chain);
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__/* .assert */ .v)(metadata?.protocol, `No protocol in chain metadata for ${chain}`);
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(metadata?.protocol, `No protocol in chain metadata for ${chain}`);
             return metadata.protocol;
         }));
         const SUPPORTED_INVENTORY_PROTOCOLS = new Set([
-            _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Ethereum,
-            _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_11__/* .ProtocolType */ .Hb.Sealevel,
+            _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_13__/* .ProtocolType */ .Hb.Ethereum,
+            _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_13__/* .ProtocolType */ .Hb.Sealevel,
         ]);
         for (const protocol of requiredProtocols) {
             const chainsForProtocol = allRelevantChains.filter((chain) => this.warpCore.multiProvider.getChainMetadata(chain).protocol ===
                 protocol);
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__/* .assert */ .v)(SUPPORTED_INVENTORY_PROTOCOLS.has(protocol), `Inventory rebalancing does not support protocol '${protocol}' (chains: ${chainsForProtocol.join(', ')}). Supported: ethereum, sealevel`);
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(SUPPORTED_INVENTORY_PROTOCOLS.has(protocol), `Inventory rebalancing does not support protocol '${protocol}' (chains: ${chainsForProtocol.join(', ')}). Supported: ethereum, sealevel`);
         }
         for (const protocol of requiredProtocols) {
             const chainsForProtocol = allRelevantChains.filter((chain) => this.warpCore.multiProvider.getChainMetadata(chain).protocol ===
                 protocol);
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__/* .assert */ .v)(this.config.inventorySigners?.[protocol]?.key ??
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(this.config.inventorySigners?.[protocol]?.key ??
                 this.inventorySignerKeysByProtocol?.[protocol], `Missing inventory signer key for protocol ${protocol} (required by inventory chains: ${chainsForProtocol.join(', ')})`);
         }
         // Validate inventory address coverage for all required protocols
         for (const protocol of requiredProtocols) {
             const chainsForProtocol = allRelevantChains.filter((chain) => this.warpCore.multiProvider.getChainMetadata(chain).protocol ===
                 protocol);
-            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_20__/* .assert */ .v)(inventorySigners[protocol]?.address, `Missing inventory address for protocol ${protocol} (required by inventory chains: ${chainsForProtocol.join(', ')})`);
+            (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(inventorySigners[protocol]?.address, `Missing inventory address for protocol ${protocol} (required by inventory chains: ${chainsForProtocol.join(', ')})`);
         }
         const externalBridgeRegistry = externalBridgeRegistryOverride ?? this.buildExternalBridgeRegistry();
         if (Object.keys(externalBridgeRegistry).length === 0) {
@@ -737713,7 +738310,7 @@ class RebalancerContextFactory {
      */
     createOrchestrator(options) {
         this.logger.debug({ warpRouteId: this.config.warpRouteId }, 'Creating RebalancerOrchestrator');
-        return new _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_3__/* .RebalancerOrchestrator */ .E({
+        return new _core_RebalancerOrchestrator_js__WEBPACK_IMPORTED_MODULE_4__/* .RebalancerOrchestrator */ .E({
             strategy: options.strategy,
             actionTracker: options.actionTracker,
             inflightContextAdapter: options.inflightContextAdapter,
@@ -737747,11 +738344,12 @@ class RebalancerContextFactory {
         let initialTotalCollateral = 0n;
         const chainNames = new Set((0,_config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .getStrategyChainNames */ .zj)(this.config.strategyConfig));
         await Promise.all(this.warpCore.tokens.map(async (token) => {
-            if ((0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_9__/* .isCollateralizedTokenEligibleForRebalancing */ .rC)(token) &&
+            if ((0,_utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__/* .isCollateralizedTokenEligibleForRebalancing */ .rC)(token) &&
                 chainNames.has(token.chainName)) {
                 const adapter = token.getHypAdapter(this.warpCore.multiProvider);
                 const bridgedSupply = await adapter.getBridgedSupply();
-                initialTotalCollateral += bridgedSupply ?? 0n;
+                (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_16__/* .assert */ .v)(bridgedSupply !== undefined, `Missing bridged supply for ${token.chainName} while computing initial total collateral for warp route ${this.config.warpRouteId}`);
+                initialTotalCollateral += (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__/* .normalizeToCanonical */ .R2)(bridgedSupply, token);
             }
         }));
         return initialTotalCollateral;
@@ -737769,24 +738367,26 @@ __webpack_async_result__();
 __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try {
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   $X: () => (/* reexport safe */ _core_RebalancerService_js__WEBPACK_IMPORTED_MODULE_0__.$),
-/* harmony export */   Wo: () => (/* reexport safe */ _config_RebalancerConfig_js__WEBPACK_IMPORTED_MODULE_1__.W),
-/* harmony export */   zj: () => (/* reexport safe */ _config_types_js__WEBPACK_IMPORTED_MODULE_2__.zj)
+/* harmony export */   Wo: () => (/* reexport safe */ _config_RebalancerConfig_js__WEBPACK_IMPORTED_MODULE_2__.W),
+/* harmony export */   zj: () => (/* reexport safe */ _config_types_js__WEBPACK_IMPORTED_MODULE_3__.zj)
 /* harmony export */ });
 /* harmony import */ var _core_RebalancerService_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(42248);
-/* harmony import */ var _config_RebalancerConfig_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(37562);
-/* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(75102);
-/* harmony import */ var _strategy_WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(64438);
-/* harmony import */ var _strategy_MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(82833);
-/* harmony import */ var _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(52154);
-/* harmony import */ var _monitor_Monitor_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(14135);
-/* harmony import */ var _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(42575);
-/* harmony import */ var _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(81708);
-/* harmony import */ var _interfaces_IMonitor_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(36513);
-/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(11369);
-/* harmony import */ var _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(46618);
-/* harmony import */ var _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(84569);
-var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_core_RebalancerService_js__WEBPACK_IMPORTED_MODULE_0__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_7__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_8__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__, _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_12__]);
-([_core_RebalancerService_js__WEBPACK_IMPORTED_MODULE_0__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_7__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_8__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_10__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_11__, _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_12__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+/* harmony import */ var _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(3903);
+/* harmony import */ var _config_RebalancerConfig_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(37562);
+/* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(75102);
+/* harmony import */ var _strategy_BaseStrategy_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(94598);
+/* harmony import */ var _strategy_WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(64438);
+/* harmony import */ var _strategy_MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(82833);
+/* harmony import */ var _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_7__ = __nccwpck_require__(88757);
+/* harmony import */ var _monitor_Monitor_js__WEBPACK_IMPORTED_MODULE_8__ = __nccwpck_require__(14135);
+/* harmony import */ var _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_9__ = __nccwpck_require__(42575);
+/* harmony import */ var _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_10__ = __nccwpck_require__(81708);
+/* harmony import */ var _interfaces_IMonitor_js__WEBPACK_IMPORTED_MODULE_11__ = __nccwpck_require__(36513);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_12__ = __nccwpck_require__(11369);
+/* harmony import */ var _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_13__ = __nccwpck_require__(46618);
+/* harmony import */ var _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_14__ = __nccwpck_require__(84569);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_core_RebalancerService_js__WEBPACK_IMPORTED_MODULE_0__, _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_1__, _strategy_BaseStrategy_js__WEBPACK_IMPORTED_MODULE_4__, _strategy_WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_5__, _strategy_MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_6__, _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_7__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_9__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_10__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_12__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_13__, _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_14__]);
+([_core_RebalancerService_js__WEBPACK_IMPORTED_MODULE_0__, _core_Rebalancer_js__WEBPACK_IMPORTED_MODULE_1__, _strategy_BaseStrategy_js__WEBPACK_IMPORTED_MODULE_4__, _strategy_WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_5__, _strategy_MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_6__, _strategy_StrategyFactory_js__WEBPACK_IMPORTED_MODULE_7__, _metrics_Metrics_js__WEBPACK_IMPORTED_MODULE_9__, _metrics_PriceGetter_js__WEBPACK_IMPORTED_MODULE_10__, _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_12__, _utils_tokenUtils_js__WEBPACK_IMPORTED_MODULE_13__, _factories_RebalancerContextFactory_js__WEBPACK_IMPORTED_MODULE_14__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
 /**
  * @hyperlane-xyz/rebalancer
  *
@@ -738218,7 +738818,8 @@ __webpack_async_result__();
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   V: () => (/* binding */ Monitor)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(14918);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(39196);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(14918);
 /* harmony import */ var _interfaces_IMonitor_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(36513);
 /* harmony import */ var _utils_blockTag_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(82167);
 
@@ -738305,13 +738906,21 @@ class Monitor {
                     const inventoryBalances = await this.fetchInventoryBalances();
                     if (Object.keys(inventoryBalances).length > 0) {
                         event.inventoryBalances = inventoryBalances;
+                        const tokensByChain = new Map(this.warpCore.tokens.map((token) => [token.chainName, token]));
+                        // CAST: inventoryBalances keys come from configured monitor chains,
+                        // but Object.entries widens them to string.
+                        const inventoryBalanceEntries = Object.entries(inventoryBalances);
                         this.logger.info({
                             chainsMonitored: Object.keys(inventoryBalances).length,
-                            balances: Object.entries(inventoryBalances).map(([chain, balance]) => ({
-                                chain,
-                                balance: balance.toString(),
-                                balanceEth: (Number(balance) / 1e18).toFixed(6),
-                            })),
+                            balances: inventoryBalanceEntries.map(([chain, balance]) => {
+                                const token = tokensByChain.get(chain);
+                                return {
+                                    chain,
+                                    tokenSymbol: token?.symbol,
+                                    balance: balance.toString(),
+                                    balanceFormatted: (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .fromWei */ .kX)(balance.toString(), token?.decimals),
+                                };
+                            }),
                         }, 'Inventory balances fetched');
                     }
                     if (this.tokenInfoHandler) {
@@ -738326,7 +738935,7 @@ class Monitor {
                 const elapsed = Date.now() - cycleStart;
                 const remaining = this.checkFrequency - elapsed;
                 if (remaining > 0) {
-                    await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .sleep */ .yy)(remaining);
+                    await (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .sleep */ .yy)(remaining);
                 }
                 // If elapsed >= checkFrequency, start next cycle immediately
             }
@@ -738436,13 +739045,16 @@ class Monitor {
 /***/ }),
 
 /***/ 94598:
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+/***/ ((__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 */   Z: () => (/* binding */ BaseStrategy)
 /* harmony export */ });
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(39196);
-/* harmony import */ var _utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(88688);
+/* harmony import */ var _utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(88688);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(11369);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__]);
+_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
 
 
 /**
@@ -738466,7 +739078,7 @@ class BaseStrategy {
         this.tokensByChainName = tokensByChainName;
     }
     getBridgeConfigForRoute(origin, destination) {
-        return (0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .getBridgeConfig */ .Yf)(this.bridgeConfigs, origin, destination);
+        return (0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_1__/* .getBridgeConfig */ .Yf)(this.bridgeConfigs, origin, destination);
     }
     /**
      * Main method to get rebalancing routes
@@ -738548,7 +739160,7 @@ class BaseStrategy {
                 // Get bridge config for this route (with destination-specific overrides)
                 const bridgeConfig = this.getBridgeConfigForRoute(surplus.chain, deficit.chain);
                 // Create appropriate route type based on execution type
-                routes.push((0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .createStrategyRoute */ .vT)(bridgeConfig, surplus.chain, deficit.chain, transferAmount));
+                routes.push((0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_1__/* .createStrategyRoute */ .vT)(bridgeConfig, surplus.chain, deficit.chain, transferAmount));
             }
             // Decreases the amounts for the following iterations
             deficit.amount -= transferAmount;
@@ -738767,16 +739379,18 @@ class BaseStrategy {
                 const token = this.tokensByChainName[route.origin];
                 if (token) {
                     const bridgeConfig = this.getBridgeConfigForRoute(route.origin, route.destination);
-                    const minAmount = BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .toWei */ .fq)(bridgeConfig.bridgeMinAcceptedAmount, token.decimals));
-                    if (route.amount < minAmount) {
-                        this.logger.info({
-                            context: this.constructor.name,
-                            origin: route.origin,
-                            destination: route.destination,
-                            amount: route.amount.toString(),
-                            minAmount: minAmount.toString(),
-                        }, 'Dropping route below bridgeMinAcceptedAmount');
-                        return false;
+                    if (bridgeConfig.bridgeMinAcceptedAmount != null) {
+                        const minAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_0__/* .normalizeConfiguredAmount */ .k9)(bridgeConfig.bridgeMinAcceptedAmount, token);
+                        if (route.amount < minAmount) {
+                            this.logger.info({
+                                context: this.constructor.name,
+                                origin: route.origin,
+                                destination: route.destination,
+                                amount: route.amount.toString(),
+                                minAmount: minAmount.toString(),
+                            }, 'Dropping route below bridgeMinAcceptedAmount');
+                            return false;
+                        }
                     }
                 }
             }
@@ -738785,152 +739399,24 @@ class BaseStrategy {
     }
 }
 //# sourceMappingURL=BaseStrategy.js.map
+__webpack_async_result__();
+} catch(e) { __webpack_async_result__(e); } });
 
 /***/ }),
 
-/***/ 82833:
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+/***/ 22532:
+/***/ ((__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 */   I: () => (/* binding */ MinAmountStrategy)
+/* harmony export */   v: () => (/* binding */ CollateralDeficitStrategy)
 /* harmony export */ });
-/* harmony import */ var bignumber_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(62033);
-/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(39196);
-/* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(75102);
+/* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(75102);
+/* harmony import */ var _utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(88688);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(11369);
 /* harmony import */ var _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(94598);
-
-
-
-
-/**
- * Strategy implementation that rebalance based on minimum amounts
- * It ensures each chain has at least the specified minimum amount
- */
-class MinAmountStrategy extends _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_2__/* .BaseStrategy */ .Z {
-    name = _config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .RebalancerStrategyOptions */ .t$.MinAmount;
-    config = {};
-    logger;
-    constructor(config, tokensByChainName, initialTotalCollateral, logger, bridgeConfigs, metrics) {
-        const chains = Object.keys(config);
-        const log = logger.child({ class: MinAmountStrategy.name });
-        super(chains, log, bridgeConfigs, metrics, tokensByChainName);
-        this.logger = log;
-        const minAmountType = config[chains[0]].minAmount.type;
-        this.validateAmounts(initialTotalCollateral, minAmountType, config);
-        for (const chain of chains) {
-            const { min, target } = config[chain].minAmount;
-            // check range constraints
-            if ((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(target).lt(min)) {
-                throw new Error(`Target (${target}) must be greater than or equal to min (${min}) for chain ${chain}`);
-            }
-            if ((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(min).lt(0)) {
-                throw new Error(`Minimum amount (${min}) cannot be negative for chain ${chain}`);
-            }
-            if ((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(target).lt(0)) {
-                throw new Error(`Target amount (${target}) cannot be negative for chain ${chain}`);
-            }
-        }
-        this.config = config;
-        this.logger.info('MinAmountStrategy created');
-    }
-    /**
-     * Gets balances categorized by surplus and deficit based on minimum amounts and targets
-     * - For absolute values: Uses exact token amounts
-     * - For relative values: Uses percentages of total balance across all chains
-     *
-     * Simulates both types of rebalances before calculating surpluses/deficits:
-     * - pendingRebalances: in-flight intents (origin tx confirmed, add to destination only)
-     * - proposedRebalances: routes from earlier strategies (subtract from origin AND add to destination)
-     *
-     * This prevents over-rebalancing when multiple strategies run in sequence.
-     */
-    getCategorizedBalances(rawBalances, pendingRebalances, proposedRebalances) {
-        // Step 1: Simulate pending rebalances (in-flight, origin already deducted on-chain)
-        let simulatedBalances = this.simulatePendingRebalances(rawBalances, pendingRebalances ?? []);
-        // Step 2: Simulate proposed rebalances (from earlier strategies, not yet executed)
-        simulatedBalances = this.simulateProposedRebalances(simulatedBalances, proposedRebalances ?? []);
-        const totalCollateral = this.chains.reduce((sum, chain) => sum + simulatedBalances[chain], 0n);
-        return this.chains.reduce((acc, chain) => {
-            const chainConfig = this.config[chain];
-            const balance = simulatedBalances[chain];
-            let minAmount;
-            let targetAmount;
-            if (chainConfig.minAmount.type === _config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .RebalancerMinAmountType */ .gK.Absolute) {
-                const token = this.getTokenByChainName(chain);
-                minAmount = BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .toWei */ .fq)(chainConfig.minAmount.min, token.decimals));
-                targetAmount = BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .toWei */ .fq)(chainConfig.minAmount.target, token.decimals));
-            }
-            else {
-                minAmount = BigInt((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(totalCollateral.toString())
-                    .times(chainConfig.minAmount.min)
-                    .toFixed(0, bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g.ROUND_FLOOR));
-                targetAmount = BigInt((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(totalCollateral.toString())
-                    .times(chainConfig.minAmount.target)
-                    .toFixed(0, bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g.ROUND_FLOOR));
-            }
-            // If balance is less than minAmount, it has a deficit
-            if (balance < minAmount) {
-                acc.deficits.push({ chain, amount: targetAmount - balance });
-            }
-            else {
-                // Any chain with more than minAmount potentially has surplus
-                const surplus = balance - minAmount;
-                if (surplus > 0n) {
-                    acc.surpluses.push({ chain, amount: surplus });
-                }
-            }
-            return acc;
-        }, {
-            surpluses: [],
-            deficits: [],
-        });
-    }
-    getTokenByChainName(chainName) {
-        const token = this.tokensByChainName[chainName];
-        if (token === undefined) {
-            throw new Error(`Token not found for chain ${chainName}`);
-        }
-        return token;
-    }
-    validateAmounts(totalCollateral, minAmountType, config) {
-        config ??= this.config;
-        if (minAmountType === _config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .RebalancerMinAmountType */ .gK.Absolute) {
-            let totalTargets = 0n;
-            let decimals = 0;
-            for (const chainName of this.chains) {
-                const token = this.getTokenByChainName(chainName);
-                // all the tokens have the same amount of decimals
-                decimals = token.decimals;
-                totalTargets += BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .toWei */ .fq)(config[chainName].minAmount.target, token.decimals));
-            }
-            if (totalTargets > totalCollateral) {
-                throw new Error(`Consider reducing the targets as the sum (${(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .fromWei */ .kX)(totalTargets.toString(), decimals)}) is greater than sum of collaterals (${(0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_3__/* .fromWei */ .kX)(totalCollateral.toString(), decimals)})`);
-            }
-        }
-    }
-}
-//# sourceMappingURL=MinAmountStrategy.js.map
-
-/***/ }),
-
-/***/ 52154:
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
-
-
-// EXPORTS
-__nccwpck_require__.d(__webpack_exports__, {
-  M: () => (/* binding */ StrategyFactory)
-});
-
-// EXTERNAL MODULE: ../rebalancer/dist/config/types.js
-var types = __nccwpck_require__(75102);
-// EXTERNAL MODULE: ../utils/dist/amount.js
-var amount = __nccwpck_require__(39196);
-// EXTERNAL MODULE: ../rebalancer/dist/utils/bridgeUtils.js
-var bridgeUtils = __nccwpck_require__(88688);
-// EXTERNAL MODULE: ../rebalancer/dist/strategy/BaseStrategy.js
-var BaseStrategy = __nccwpck_require__(94598);
-;// CONCATENATED MODULE: ../rebalancer/dist/strategy/CollateralDeficitStrategy.js
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_1__, _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_2__]);
+([_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_1__, _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_2__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
 
 
 
@@ -738945,8 +739431,8 @@ var BaseStrategy = __nccwpck_require__(94598);
  * 3. Negative simulated balance = deficit (magnitude + buffer)
  * 4. Positive simulated balance = potential surplus
  */
-class CollateralDeficitStrategy extends BaseStrategy/* BaseStrategy */.Z {
-    name = types/* RebalancerStrategyOptions */.t$.CollateralDeficit;
+class CollateralDeficitStrategy extends _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_2__/* .BaseStrategy */ .Z {
+    name = _config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .RebalancerStrategyOptions */ .t$.CollateralDeficit;
     config;
     logger;
     constructor(config, tokensByChainName, logger, bridgeConfigs, metrics) {
@@ -738985,7 +739471,7 @@ class CollateralDeficitStrategy extends BaseStrategy/* BaseStrategy */.Z {
         for (const chain of this.chains) {
             const balance = simulatedBalances[chain];
             const token = this.getTokenByChainName(chain);
-            const bufferWei = BigInt((0,amount/* toWei */.fq)(this.config[chain].buffer, token.decimals));
+            const bufferWei = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_1__/* .normalizeConfiguredAmount */ .k9)(this.config[chain].buffer, token);
             if (balance < 0n) {
                 // Negative balance indicates deficit
                 const deficitAmount = -balance + bufferWei;
@@ -739074,7 +739560,7 @@ class CollateralDeficitStrategy extends BaseStrategy/* BaseStrategy */.Z {
             const transferAmount = surplus.amount > deficit.amount ? deficit.amount : surplus.amount;
             if (transferAmount > 0n) {
                 const bridgeConfig = this.getBridgeConfigForRoute(surplus.chain, deficit.chain);
-                routes.push((0,bridgeUtils/* createStrategyRoute */.vT)(bridgeConfig, surplus.chain, deficit.chain, transferAmount));
+                routes.push((0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_3__/* .createStrategyRoute */ .vT)(bridgeConfig, surplus.chain, deficit.chain, transferAmount));
             }
             deficit.amount -= transferAmount;
             surplus.amount -= transferAmount;
@@ -739111,12 +739597,12 @@ class CollateralDeficitStrategy extends BaseStrategy/* BaseStrategy */.Z {
             const bridgeConfig = this.getBridgeConfigForRoute(rebalance.origin, rebalance.destination);
             // For movableCollateral routes: match bridge address
             if ('bridge' in rebalance && rebalance.bridge) {
-                return ((0,bridgeUtils/* isMovableCollateralConfig */.iT)(bridgeConfig) &&
+                return ((0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_3__/* .isMovableCollateralConfig */ .iT)(bridgeConfig) &&
                     bridgeConfig.bridge === rebalance.bridge);
             }
             // For inventory routes: match externalBridge type
             if ('externalBridge' in rebalance && rebalance.externalBridge) {
-                return ((0,bridgeUtils/* isInventoryConfig */.pm)(bridgeConfig) &&
+                return ((0,_utils_bridgeUtils_js__WEBPACK_IMPORTED_MODULE_3__/* .isInventoryConfig */ .pm)(bridgeConfig) &&
                     bridgeConfig.externalBridge === rebalance.externalBridge);
             }
             // Recovered intents without bridge info - include to be safe
@@ -739184,7 +739670,17 @@ class CollateralDeficitStrategy extends BaseStrategy/* BaseStrategy */.Z {
     }
 }
 //# sourceMappingURL=CollateralDeficitStrategy.js.map
-;// CONCATENATED MODULE: ../rebalancer/dist/strategy/CompositeStrategy.js
+__webpack_async_result__();
+} catch(e) { __webpack_async_result__(e); } });
+
+/***/ }),
+
+/***/ 93282:
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+
+/* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
+/* harmony export */   l: () => (/* binding */ CompositeStrategy)
+/* harmony export */ });
 /**
  * Composite strategy that runs multiple sub-strategies sequentially.
  *
@@ -739248,11 +739744,159 @@ class CompositeStrategy {
     }
 }
 //# sourceMappingURL=CompositeStrategy.js.map
-// EXTERNAL MODULE: ../rebalancer/dist/strategy/MinAmountStrategy.js
-var MinAmountStrategy = __nccwpck_require__(82833);
-// EXTERNAL MODULE: ../rebalancer/dist/strategy/WeightedStrategy.js
-var WeightedStrategy = __nccwpck_require__(64438);
-;// CONCATENATED MODULE: ../rebalancer/dist/strategy/StrategyFactory.js
+
+/***/ }),
+
+/***/ 82833:
+/***/ ((__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 */   I: () => (/* binding */ MinAmountStrategy)
+/* harmony export */ });
+/* harmony import */ var bignumber_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(62033);
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(27043);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(39196);
+/* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(75102);
+/* harmony import */ var _utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(11369);
+/* harmony import */ var _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(94598);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__, _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_3__]);
+([_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__, _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_3__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
+
+
+
+
+
+
+/**
+ * Strategy implementation that rebalance based on minimum amounts
+ * It ensures each chain has at least the specified minimum amount
+ */
+class MinAmountStrategy extends _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_3__/* .BaseStrategy */ .Z {
+    name = _config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .RebalancerStrategyOptions */ .t$.MinAmount;
+    config = {};
+    logger;
+    constructor(config, tokensByChainName, initialTotalCollateral, logger, bridgeConfigs, metrics) {
+        const chains = Object.keys(config);
+        const log = logger.child({ class: MinAmountStrategy.name });
+        super(chains, log, bridgeConfigs, metrics, tokensByChainName);
+        this.logger = log;
+        const minAmountType = config[chains[0]].minAmount.type;
+        this.validateAmounts(initialTotalCollateral, minAmountType, config);
+        for (const chain of chains) {
+            const { min, target } = config[chain].minAmount;
+            // check range constraints
+            if ((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(target).lt(min)) {
+                throw new Error(`Target (${target}) must be greater than or equal to min (${min}) for chain ${chain}`);
+            }
+            if ((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(min).lt(0)) {
+                throw new Error(`Minimum amount (${min}) cannot be negative for chain ${chain}`);
+            }
+            if ((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(target).lt(0)) {
+                throw new Error(`Target amount (${target}) cannot be negative for chain ${chain}`);
+            }
+        }
+        this.config = config;
+        this.logger.info('MinAmountStrategy created');
+    }
+    /**
+     * Gets balances categorized by surplus and deficit based on minimum amounts and targets
+     * - For absolute values: Uses exact token amounts
+     * - For relative values: Uses percentages of total balance across all chains
+     *
+     * Simulates both types of rebalances before calculating surpluses/deficits:
+     * - pendingRebalances: in-flight intents (origin tx confirmed, add to destination only)
+     * - proposedRebalances: routes from earlier strategies (subtract from origin AND add to destination)
+     *
+     * This prevents over-rebalancing when multiple strategies run in sequence.
+     */
+    getCategorizedBalances(rawBalances, pendingRebalances, proposedRebalances) {
+        // Step 1: Simulate pending rebalances (in-flight, origin already deducted on-chain)
+        let simulatedBalances = this.simulatePendingRebalances(rawBalances, pendingRebalances ?? []);
+        // Step 2: Simulate proposed rebalances (from earlier strategies, not yet executed)
+        simulatedBalances = this.simulateProposedRebalances(simulatedBalances, proposedRebalances ?? []);
+        const totalCollateral = this.chains.reduce((sum, chain) => sum + simulatedBalances[chain], 0n);
+        return this.chains.reduce((acc, chain) => {
+            const chainConfig = this.config[chain];
+            const balance = simulatedBalances[chain];
+            let minAmount;
+            let targetAmount;
+            if (chainConfig.minAmount.type === _config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .RebalancerMinAmountType */ .gK.Absolute) {
+                const token = this.getTokenByChainName(chain);
+                minAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__/* .normalizeConfiguredAmount */ .k9)(chainConfig.minAmount.min, token);
+                targetAmount = (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__/* .normalizeConfiguredAmount */ .k9)(chainConfig.minAmount.target, token);
+            }
+            else {
+                minAmount = BigInt((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(totalCollateral.toString())
+                    .times(chainConfig.minAmount.min)
+                    .toFixed(0, bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g.ROUND_FLOOR));
+                targetAmount = BigInt((0,bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g)(totalCollateral.toString())
+                    .times(chainConfig.minAmount.target)
+                    .toFixed(0, bignumber_js__WEBPACK_IMPORTED_MODULE_0__/* .BigNumber */ .g.ROUND_FLOOR));
+            }
+            // If balance is less than minAmount, it has a deficit
+            if (balance < minAmount) {
+                acc.deficits.push({ chain, amount: targetAmount - balance });
+            }
+            else {
+                // Any chain with more than minAmount potentially has surplus
+                const surplus = balance - minAmount;
+                if (surplus > 0n) {
+                    acc.surpluses.push({ chain, amount: surplus });
+                }
+            }
+            return acc;
+        }, {
+            surpluses: [],
+            deficits: [],
+        });
+    }
+    getTokenByChainName(chainName) {
+        const token = this.tokensByChainName[chainName];
+        if (token === undefined) {
+            throw new Error(`Token not found for chain ${chainName}`);
+        }
+        return token;
+    }
+    validateAmounts(totalCollateral, minAmountType, config) {
+        config ??= this.config;
+        if (minAmountType === _config_types_js__WEBPACK_IMPORTED_MODULE_1__/* .RebalancerMinAmountType */ .gK.Absolute) {
+            let totalTargets = 0n;
+            const displayToken = this.getTokenByChainName(this.chains[0]);
+            for (const chainName of this.chains) {
+                const token = this.getTokenByChainName(chainName);
+                totalTargets += (0,_utils_balanceUtils_js__WEBPACK_IMPORTED_MODULE_2__/* .normalizeConfiguredAmount */ .k9)(config[chainName].minAmount.target, token);
+            }
+            if (totalTargets > totalCollateral) {
+                throw new Error(`Consider reducing the targets as the sum (${this.formatCanonicalAmount(totalTargets, displayToken)}) is greater than sum of collaterals (${this.formatCanonicalAmount(totalCollateral, displayToken)})`);
+            }
+        }
+    }
+    formatCanonicalAmount(amount, token) {
+        const localAmount = (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_4__/* .localAmountFromMessage */ .Vd)(amount, token.scale);
+        return (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_5__/* .fromWei */ .kX)(localAmount.toString(), token.decimals);
+    }
+}
+//# sourceMappingURL=MinAmountStrategy.js.map
+__webpack_async_result__();
+} catch(e) { __webpack_async_result__(e); } });
+
+/***/ }),
+
+/***/ 88757:
+/***/ ((__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 */   M: () => (/* binding */ StrategyFactory)
+/* harmony export */ });
+/* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(75102);
+/* harmony import */ var _CollateralDeficitStrategy_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(22532);
+/* harmony import */ var _CompositeStrategy_js__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(93282);
+/* harmony import */ var _MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(82833);
+/* harmony import */ var _WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(64438);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_CollateralDeficitStrategy_js__WEBPACK_IMPORTED_MODULE_1__, _MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_2__, _WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_3__]);
+([_CollateralDeficitStrategy_js__WEBPACK_IMPORTED_MODULE_1__, _MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_2__, _WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_3__] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);
 
 
 
@@ -739282,7 +739926,7 @@ class StrategyFactory {
         }
         // Multiple strategies - create CompositeStrategy
         const subStrategies = strategyConfigs.map((config) => this.createSingleStrategy(config, tokensByChainName, initialTotalCollateral, logger, metrics, minAmountsByChain));
-        return new CompositeStrategy(subStrategies, logger);
+        return new _CompositeStrategy_js__WEBPACK_IMPORTED_MODULE_4__/* .CompositeStrategy */ .l(subStrategies, logger);
     }
     /**
      * Create a single strategy from config.
@@ -739290,14 +739934,14 @@ class StrategyFactory {
     static createSingleStrategy(strategyConfig, tokensByChainName, initialTotalCollateral, logger, metrics, _minAmountsByChain) {
         const bridgeConfigs = this.extractBridgeConfigs(strategyConfig);
         switch (strategyConfig.rebalanceStrategy) {
-            case types/* RebalancerStrategyOptions */.t$.Weighted: {
-                return new WeightedStrategy/* WeightedStrategy */.T(strategyConfig.chains, logger, bridgeConfigs, metrics, tokensByChainName);
+            case _config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .RebalancerStrategyOptions */ .t$.Weighted: {
+                return new _WeightedStrategy_js__WEBPACK_IMPORTED_MODULE_3__/* .WeightedStrategy */ .T(strategyConfig.chains, logger, bridgeConfigs, metrics, tokensByChainName);
             }
-            case types/* RebalancerStrategyOptions */.t$.MinAmount: {
-                return new MinAmountStrategy/* MinAmountStrategy */.I(strategyConfig.chains, tokensByChainName, initialTotalCollateral, logger, bridgeConfigs, metrics);
+            case _config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .RebalancerStrategyOptions */ .t$.MinAmount: {
+                return new _MinAmountStrategy_js__WEBPACK_IMPORTED_MODULE_2__/* .MinAmountStrategy */ .I(strategyConfig.chains, tokensByChainName, initialTotalCollateral, logger, bridgeConfigs, metrics);
             }
-            case types/* RebalancerStrategyOptions */.t$.CollateralDeficit: {
-                return new CollateralDeficitStrategy(strategyConfig.chains, tokensByChainName, logger, bridgeConfigs, metrics);
+            case _config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .RebalancerStrategyOptions */ .t$.CollateralDeficit: {
+                return new _CollateralDeficitStrategy_js__WEBPACK_IMPORTED_MODULE_1__/* .CollateralDeficitStrategy */ .v(strategyConfig.chains, tokensByChainName, logger, bridgeConfigs, metrics);
             }
             default: {
                 throw new Error('Unsupported strategy type');
@@ -739310,8 +739954,8 @@ class StrategyFactory {
             const baseConfig = {
                 bridgeMinAcceptedAmount: config.bridgeMinAcceptedAmount ?? 0,
             };
-            const executionType = config.executionType ?? types/* ExecutionType */.Pf.MovableCollateral;
-            if (executionType === types/* ExecutionType */.Pf.Inventory) {
+            const executionType = config.executionType ?? _config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .ExecutionType */ .Pf.MovableCollateral;
+            if (executionType === _config_types_js__WEBPACK_IMPORTED_MODULE_0__/* .ExecutionType */ .Pf.Inventory) {
                 bridgeConfigs[chain] = {
                     ...baseConfig,
                     executionType: 'inventory',
@@ -739332,17 +739976,22 @@ class StrategyFactory {
     }
 }
 //# sourceMappingURL=StrategyFactory.js.map
+__webpack_async_result__();
+} catch(e) { __webpack_async_result__(e); } });
 
 /***/ }),
 
 /***/ 64438:
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __nccwpck_require__) => {
+/***/ ((__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 */   T: () => (/* binding */ WeightedStrategy)
 /* harmony export */ });
 /* harmony import */ var _config_types_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(75102);
 /* harmony import */ var _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(94598);
+var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_BaseStrategy_js__WEBPACK_IMPORTED_MODULE_1__]);
+_BaseStrategy_js__WEBPACK_IMPORTED_MODULE_1__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
 
 
 /**
@@ -739416,6 +740065,8 @@ class WeightedStrategy extends _BaseStrategy_js__WEBPACK_IMPORTED_MODULE_1__/* .
     }
 }
 //# sourceMappingURL=WeightedStrategy.js.map
+__webpack_async_result__();
+} catch(e) { __webpack_async_result__(e); } });
 
 /***/ }),
 
@@ -739873,7 +740524,8 @@ class ActionTracker {
                     lastBridgeStatus: movement.lastBridgeStatus,
                 }, 'Failing stale inventory movement to unblock intent');
             }
-            // Compute amounts from action states
+            // Only inventory_deposit amounts advance fulfillment. inventory_movement
+            // amounts stay in source-local units and only gate retries/stale cleanup.
             const completedAmount = actions
                 .filter((a) => a.status === 'complete' && a.type === 'inventory_deposit')
                 .reduce((sum, a) => sum + a.amount, 0n);
@@ -740587,12 +741239,46 @@ class ExplorerClient {
 
 __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try {
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
-/* harmony export */   q: () => (/* binding */ getRawBalances)
+/* harmony export */   R2: () => (/* binding */ normalizeToCanonical),
+/* harmony export */   bK: () => (/* binding */ denormalizeToLocal),
+/* harmony export */   gU: () => (/* binding */ alignLocalToCanonical),
+/* harmony export */   k9: () => (/* binding */ normalizeConfiguredAmount),
+/* harmony export */   qb: () => (/* binding */ getRawBalances)
 /* harmony export */ });
+/* unused harmony exports getTokenScale, isIdentityScale */
+/* harmony import */ var _hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(27043);
+/* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(39196);
 /* harmony import */ var _tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(46618);
 var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__]);
 _tokenUtils_js__WEBPACK_IMPORTED_MODULE_0__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];
 
+
+
+function getTokenScale(token) {
+    return (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__/* .normalizeScale */ .EM)(token.scale);
+}
+function isIdentityScale(token) {
+    return (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__/* .scalesEqual */ .gm)(token.scale, undefined);
+}
+function normalizeToCanonical(localAmount, tokenOrScale) {
+    return (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__/* .messageAmountFromLocal */ .TI)(localAmount, getScaleInput(tokenOrScale));
+}
+function denormalizeToLocal(canonicalAmount, tokenOrScale) {
+    // Use ceil semantics so the returned local amount always produces at least
+    // the requested canonical progress once the token router floors on outbound.
+    return (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__/* .minLocalAmountForMessage */ .ol)(canonicalAmount, getScaleInput(tokenOrScale));
+}
+function alignLocalToCanonical(localAmount, tokenOrScale) {
+    return (0,_hyperlane_xyz_sdk__WEBPACK_IMPORTED_MODULE_1__/* .alignLocalAmountToMessage */ .pD)(localAmount, getScaleInput(tokenOrScale));
+}
+function normalizeConfiguredAmount(amount, token) {
+    return normalizeToCanonical(BigInt((0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_2__/* .toWei */ .fq)(amount, token.decimals)), token);
+}
+function getScaleInput(tokenOrScale) {
+    return 'numerator' in tokenOrScale && 'denominator' in tokenOrScale
+        ? tokenOrScale
+        : tokenOrScale.scale;
+}
 /**
  * Returns the raw balances required by the strategies from the monitor event
  * @param chains - The chains that should be included in the raw balances (e.g. the chains in the rebalancer config)
@@ -740627,7 +741313,18 @@ function getRawBalances(chains, event, logger) {
         if (bridgedSupply === undefined) {
             throw new Error(`bridgedSupply should not be undefined for collateralized token ${token.addressOrDenom}`);
         }
-        balances[token.chainName] = bridgedSupply;
+        const normalizedBalance = normalizeToCanonical(bridgedSupply, token);
+        balances[token.chainName] = normalizedBalance;
+        if (!isIdentityScale(token)) {
+            logger.debug({
+                context: getRawBalances.name,
+                chain: token.chainName,
+                tokenSymbol: token.symbol,
+                bridgedSupply: bridgedSupply.toString(),
+                normalizedBalance: normalizedBalance.toString(),
+                scale: getTokenScale(token),
+            }, 'Normalized bridged supply to canonical units');
+        }
     }
     return balances;
 }
@@ -740651,7 +741348,7 @@ __webpack_async_result__();
  * Get the confirmed block tag for a chain, accounting for reorg period.
  * Returns a block number that is safe from reorgs, or a named tag like 'finalized'.
  *
- * @param multiProvider - MinimalProviderRegistry instance
+ * @param multiProvider - Provider registry with chain metadata and ethers access
  * @param chainName - Name of the chain
  * @param logger - Optional logger for warnings
  * @returns Confirmed block tag (number, named tag, or undefined on error)
@@ -746629,7 +747326,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_BASE_TIMELOCK_CONTRACT, baseTestChain, multiProtocolTestChains */
+/* unused harmony exports TestChainName, test1, test2, test3, test4, testXERC20, testVSXERC20, testXERC20Lockbox, 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);
 
@@ -746806,24 +747503,27 @@ const testStarknetChain = {
         },
     ],
 };
-// Address of a timelock contract on base that can be used for integration tests
-const KNOWN_BASE_TIMELOCK_CONTRACT = '0x733BC1F0D76AB8f0AB7C1c8044ECc4720Cd402AD';
-// Base chain metadata for testing with block explorer
-const baseTestChain = {
+// Address of the ENS DAO TimelockController contract on Ethereum mainnet,
+// used for integration tests that exercise the block explorer path.
+// Chosen because Base's Blockscout `getcontractcreation` endpoint has been
+// observed to hang in CI, while eth.blockscout.com is reliable.
+const KNOWN_ETHEREUM_TIMELOCK_CONTRACT = '0xFe89cc7aBB2C4183683ab71653C4cdc9B02D44b7';
+// Ethereum mainnet metadata for testing with a live block explorer
+const ethereumTestChain = {
     blockExplorers: [
         {
-            apiUrl: 'https://base.blockscout.com/api',
+            apiUrl: 'https://eth.blockscout.com/api',
             family: _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_0__/* .ExplorerFamily */ .id.Blockscout,
-            name: 'Base Explorer',
-            url: 'https://base.blockscout.com',
+            name: 'Ethereum Explorer',
+            url: 'https://eth.blockscout.com',
         },
     ],
-    blocks: { confirmations: 3, estimateBlockTime: 2, reorgPeriod: 10 },
-    chainId: 8453,
-    displayName: 'Base',
-    domainId: 8453,
+    blocks: { confirmations: 3, estimateBlockTime: 12, reorgPeriod: 14 },
+    chainId: 1,
+    displayName: 'Ethereum',
+    domainId: 1,
     gasCurrencyCoinGeckoId: 'ethereum',
-    name: 'base',
+    name: 'ethereum',
     nativeToken: {
         decimals: 18,
         name: 'Ether',
@@ -746831,15 +747531,12 @@ const baseTestChain = {
     },
     protocol: _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__/* .ProtocolType */ .Hb.Ethereum,
     rpcUrls: [
-        { http: 'https://base.publicnode.com' },
-        { http: 'https://mainnet.base.org' },
-        { http: 'https://base.blockpi.network/v1/rpc/public' },
-        { http: 'https://base.drpc.org' },
-        { http: 'https://base.llamarpc.com' },
-        { http: 'https://1rpc.io/base' },
-        { http: 'https://base-pokt.nodies.app' },
+        { http: 'https://ethereum-rpc.publicnode.com' },
+        { http: 'https://eth.llamarpc.com' },
+        { http: 'https://1rpc.io/eth' },
+        { http: 'https://ethereum.blockpi.network/v1/rpc/public' },
+        { http: 'https://eth.drpc.org' },
     ],
-    technicalStack: _metadata_chainMetadataTypes_js__WEBPACK_IMPORTED_MODULE_0__/* .ChainTechnicalStack */ .DU.OpStack,
 };
 const multiProtocolTestChainMetadata = {
     ...testChainMetadata,
@@ -751030,7 +751727,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
 /* harmony export */ });
 /* harmony import */ var _hyperlane_xyz_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(50653);
 /* harmony import */ var _hyperlane_xyz_core_buildArtifact_js__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(74119);
-/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(66423);
+/* harmony import */ var _hyperlane_xyz_deploy_sdk__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(56854);
 /* harmony import */ var _hyperlane_xyz_provider_sdk__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(71280);
 /* harmony import */ var _hyperlane_xyz_provider_sdk_artifact__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(4287);
 /* harmony import */ var _hyperlane_xyz_provider_sdk_hook__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(77230);
@@ -803133,8 +803830,7 @@ class TokenMetadata {
         return _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TOKEN_MULTI_CHAIN_STANDARDS */ .NR.includes(this.standard);
     }
     isCrossCollateralToken() {
-        return (this.standard === _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.EvmHypCrossCollateralRouter ||
-            this.standard === _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TokenStandard */ .ph.TronHypCrossCollateralRouter);
+        return _TokenStandard_js__WEBPACK_IMPORTED_MODULE_1__/* .TOKEN_CROSS_COLLATERAL_STANDARDS */ .kK.has(this.standard);
     }
     getConnections() {
         return this.connections || [];
@@ -815418,10 +816114,13 @@ async function contractHasString(provider, address, searchFor) {
 /* harmony export */ __nccwpck_require__.d(__webpack_exports__, {
 /* harmony export */   EM: () => (/* binding */ normalizeScale),
 /* harmony export */   TI: () => (/* binding */ messageAmountFromLocal),
+/* harmony export */   Vd: () => (/* binding */ localAmountFromMessage),
 /* harmony export */   gm: () => (/* binding */ scalesEqual),
-/* harmony export */   k: () => (/* binding */ verifyScale)
+/* harmony export */   k: () => (/* binding */ verifyScale),
+/* harmony export */   ol: () => (/* binding */ minLocalAmountForMessage),
+/* harmony export */   pD: () => (/* binding */ alignLocalAmountToMessage)
 /* harmony export */ });
-/* unused harmony exports DEFAULT_SCALE, localAmountFromMessage, minLocalAmountForMessage, alignLocalAmountToMessage */
+/* unused harmony export DEFAULT_SCALE */
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(21387);
 /* harmony import */ var _hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(73938);
 
@@ -815447,8 +816146,8 @@ function assertValidScale(scale) {
     (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(scale.numerator > 0n && scale.denominator > 0n, `Scale must be positive, got ${scale.numerator}/${scale.denominator}`);
 }
 function ceilDiv(numerator, denominator) {
-    assert(denominator > 0n, 'Denominator must be positive');
-    assert(numerator >= 0n, 'Numerator must be non-negative');
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(denominator > 0n, 'Denominator must be positive');
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(numerator >= 0n, 'Numerator must be non-negative');
     if (numerator === 0n)
         return 0n;
     return (numerator + denominator - 1n) / denominator;
@@ -815460,19 +816159,19 @@ function messageAmountFromLocal(localAmount, scale) {
     return (localAmount * normalized.numerator) / normalized.denominator;
 }
 function localAmountFromMessage(messageAmount, scale) {
-    assert(messageAmount >= 0n, 'Message amount must be non-negative');
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(messageAmount >= 0n, 'Message amount must be non-negative');
     const normalized = normalizeScale(scale);
     assertValidScale(normalized);
     return (messageAmount * normalized.denominator) / normalized.numerator;
 }
 function minLocalAmountForMessage(messageAmount, scale) {
-    assert(messageAmount >= 0n, 'Message amount must be non-negative');
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(messageAmount >= 0n, 'Message amount must be non-negative');
     const normalized = normalizeScale(scale);
     assertValidScale(normalized);
     return ceilDiv(messageAmount * normalized.denominator, normalized.numerator);
 }
 function alignLocalAmountToMessage(localAmount, scale) {
-    assert(localAmount >= 0n, 'Local amount must be non-negative');
+    (0,_hyperlane_xyz_utils__WEBPACK_IMPORTED_MODULE_0__/* .assert */ .v)(localAmount >= 0n, 'Local amount must be non-negative');
     const messageAmount = messageAmountFromLocal(localAmount, scale);
     if (messageAmount === 0n) {
         return {
@@ -817602,6 +818301,9 @@ class TronProtocolProvider {
         // @TODO Implement in a follow up PR
         throw Error('Not implemented');
     }
+    createFeeArtifactManager(_chainMetadata) {
+        return null;
+    }
     getMinGas() {
         return {
             CORE_DEPLOY_GAS: BigInt(1e9),
@@ -902868,25 +903570,7 @@ function setRootLogger(logger) {
     return rootLogger;
 }
 function createHyperlanePinoLogger(logLevel, logFormat) {
-    // In development, pino-pretty is used for a better dev experience,
-    // but only if the log format is 'pretty'. This allows for JSON logs
-    // in development as well if explicitly configured.
-    if (process.env.NODE_ENV === 'development' &&
-        logFormat === LogFormat.Pretty) {
-        return (0,pino__WEBPACK_IMPORTED_MODULE_0__.pino)({
-            level: logLevel,
-            transport: {
-                target: 'pino-pretty',
-                options: {
-                    colorize: true,
-                    translateTime: 'SYS:standard',
-                    ignore: 'pid,hostname',
-                },
-            },
-        });
-    }
-    // In production (or other envs), use the original hook-based logger
-    return (0,pino__WEBPACK_IMPORTED_MODULE_0__.pino)({
+    const createFallbackLogger = () => (0,pino__WEBPACK_IMPORTED_MODULE_0__.pino)({
         level: logLevel,
         name: 'hyperlane',
         formatters: {
@@ -902909,6 +903593,32 @@ function createHyperlanePinoLogger(logLevel, logFormat) {
             },
         },
     });
+    // In development, pino-pretty is used for a better dev experience,
+    // but only if the log format is 'pretty'. This allows for JSON logs
+    // in development as well if explicitly configured.
+    if (process.env.NODE_ENV === 'development' &&
+        logFormat === LogFormat.Pretty) {
+        try {
+            return (0,pino__WEBPACK_IMPORTED_MODULE_0__.pino)({
+                level: logLevel,
+                transport: {
+                    target: 'pino-pretty',
+                    options: {
+                        colorize: true,
+                        translateTime: 'SYS:standard',
+                        ignore: 'pid,hostname',
+                    },
+                },
+            });
+        }
+        catch (err) {
+            const fallbackLogger = createFallbackLogger();
+            fallbackLogger.warn(err, 'Could not initialize pino-pretty, falling back to built-in pretty logger');
+            return fallbackLogger;
+        }
+    }
+    // In production (or other envs), use the original hook-based logger
+    return createFallbackLogger();
 }
 function ethersBigNumberSerializer(key, value) {
     // Check if the value looks like a serialized BigNumber
@@ -905476,7 +906186,7 @@ module.exports = /*#__PURE__*/JSON.parse('[{"type":"function","name":"proveL2Lea
 /***/ 99468:
 /***/ ((module) => {
 
-module.exports = {"rE":"33.0.0"};
+module.exports = {"rE":"33.0.2"};
 
 /***/ })