@hyperlane-xyz/cli 33.0.1 → 33.0.2

package/bundle/773.index.js

@@ -2780,6 +2780,9 @@ class StarknetProtocolProvider {
     createValidatorAnnounceArtifactManager(chainMetadata) {
         return new StarknetValidatorAnnounceArtifactManager(chainMetadata);
     }
+    createFeeArtifactManager(_chainMetadata) {
+        return null;
+    }
     getMinGas() {
         return {
             CORE_DEPLOY_GAS: BigInt(1e9),

package/bundle/79.index.js

@@ -107533,6 +107533,9 @@ class SvmProtocolProvider {
         const rpc = createRpc(this.getRpcUrls(chainMetadata)[0]);
         return new SvmValidatorAnnounceArtifactManager(rpc, chainMetadata.domainId);
     }
+    createFeeArtifactManager(_chainMetadata) {
+        return null;
+    }
     getMinGas() {
         return {
             CORE_DEPLOY_GAS: 10000000000n,

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.1';
+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) {
@@ -735997,10 +736454,12 @@ class InventoryRebalancer {
             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;
         }
@@ -736015,6 +736474,7 @@ class InventoryRebalancer {
                 chain: p.chain,
                 maxSourceInput: p.maxSourceInput.toString(),
                 targetOutput: p.targetOutput.toString(),
+                quoteMode: p.quoteMode,
             })),
             totalPlanned: totalPlanned.toString(),
             shortfall: shortfall.toString(),
@@ -736022,33 +736482,53 @@ class InventoryRebalancer {
             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, intent, route.externalBridge)));
+        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 totalBridged = 0n;
+        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++;
-                totalBridged += plan.targetOutput;
+                totalQuotedOutputMin += result.value.quotedOutputMin;
                 this.logger.info({
                     sourceChain: plan.chain,
-                    amount: plan.targetOutput.toString(),
+                    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 {
-                const error = result.status === 'rejected'
-                    ? result.reason?.message
-                    : result.value.error;
+                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);
+                        }
+                    }
+                }
+                else if (!result.value.success) {
+                    error = result.value.error;
+                }
                 if (error) {
                     failedErrors.push(`${plan.chain}: ${error}`);
                 }
                 this.logger.warn({
                     sourceChain: plan.chain,
-                    amount: plan.targetOutput.toString(),
+                    plannedTargetOutput: plan.targetOutput.toString(),
                     error,
                 }, 'Inventory movement failed');
             }
@@ -736064,7 +736544,7 @@ class InventoryRebalancer {
         this.logger.info({
             targetChain: destination,
             successCount,
-            totalBridged: totalBridged.toString(),
+            totalQuotedOutputMin: totalQuotedOutputMin.toString(),
             targetAmount: requestedLocalAmount.toString(),
             targetAmountCanonical: amount.toString(),
             intentId: intent.id,
@@ -736323,18 +736803,20 @@ class InventoryRebalancer {
     /**
      * Execute inventory movement from source chain to target chain via LiFi bridge.
      *
-     * Uses reverse quotes (`toAmount`) so plans are expressed in target-chain local
-     * units and source-local spend is discovered by the bridge quote.
+     * 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 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, targetOutputAmount, maxSourceInput, intent, externalBridgeType) {
+    async executeInventoryMovement(sourceChain, targetChain, targetOutputAmount, maxSourceInput, quoteMode, intent, externalBridgeType) {
         const sourceToken = this.getTokenForChain(sourceChain);
         if (!sourceToken) {
             return {
@@ -736365,15 +736847,36 @@ class InventoryRebalancer {
         }, 'Resolved token addresses for LiFi bridge');
         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,
-                toAmount: targetOutputAmount,
-                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 {
@@ -736388,15 +736891,19 @@ class InventoryRebalancer {
                 targetChainId,
                 requestedTargetOutput: targetOutputAmount.toString(),
                 requestedTargetOutputFormatted: this.formatLocalAmount(targetOutputAmount, targetToken),
+                quoteModePlanned: quoteMode,
+                quoteModeUsed,
+                retriedAsForward: quoteMode === 'reverse' && quoteModeUsed === 'forward',
                 inputRequired: inputRequired.toString(),
                 inputRequiredFormatted: this.formatLocalAmount(inputRequired, sourceToken),
-                expectedOutput: quote.toAmount.toString(),
-                expectedOutputMin: quote.toAmountMin.toString(),
-                expectedOutputFormatted: this.formatLocalAmount(quote.toAmount, targetToken),
+                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,
-            }, 'Executing inventory movement via LiFi reverse quote');
+            }, 'Executing inventory movement via bridge quote');
             this.logger.debug({
                 quoteId: quote.id,
                 tool: quote.tool,
@@ -736442,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: targetOutputAmount.toString(),
                 intentId: intent.id,
-                error: error.message,
+                error: errorMessage,
             }, 'Failed to execute inventory movement');
             return {
                 success: false,
-                error: error.message,
+                error: errorMessage,
             };
         }
     }
@@ -751212,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);
@@ -817786,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),
@@ -903052,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: {
@@ -903093,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
@@ -905660,7 +906186,7 @@ module.exports = /*#__PURE__*/JSON.parse('[{"type":"function","name":"proveL2Lea
 /***/ 99468:
 /***/ ((module) => {
 
-module.exports = {"rE":"33.0.1"};
+module.exports = {"rE":"33.0.2"};
 
 /***/ })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperlane-xyz/cli",
-  "version": "33.0.1",
+  "version": "33.0.2",
   "description": "A command-line utility for common Hyperlane operations",
   "keywords": [
     "CLI",
@@ -74,21 +74,21 @@
     "zod": "^3.21.2",
     "zod-validation-error": "^3.3.0",
     "zx": "^8.1.4",
-    "@hyperlane-xyz/aleo-sdk": "33.0.1",
-    "@hyperlane-xyz/cosmos-sdk": "33.0.1",
-    "@hyperlane-xyz/deploy-sdk": "5.0.3",
+    "@hyperlane-xyz/aleo-sdk": "33.0.2",
     "@hyperlane-xyz/core": "11.3.1",
-    "@hyperlane-xyz/http-registry-server": "33.0.1",
-    "@hyperlane-xyz/provider-sdk": "5.0.3",
-    "@hyperlane-xyz/rebalancer": "27.2.13",
-    "@hyperlane-xyz/radix-sdk": "33.0.1",
-    "@hyperlane-xyz/relayer": "1.1.26",
-    "@hyperlane-xyz/sdk": "33.0.1",
-    "@hyperlane-xyz/sealevel-sdk": "33.0.1",
-    "@hyperlane-xyz/starknet-sdk": "28.0.3",
-    "@hyperlane-xyz/tron-sdk": "23.0.3",
-    "@hyperlane-xyz/utils": "33.0.1",
-    "@hyperlane-xyz/tsconfig": "^33.0.1"
+    "@hyperlane-xyz/cosmos-sdk": "33.0.2",
+    "@hyperlane-xyz/http-registry-server": "33.0.2",
+    "@hyperlane-xyz/deploy-sdk": "5.1.0",
+    "@hyperlane-xyz/provider-sdk": "5.1.0",
+    "@hyperlane-xyz/radix-sdk": "33.0.2",
+    "@hyperlane-xyz/relayer": "1.1.27",
+    "@hyperlane-xyz/sdk": "33.0.2",
+    "@hyperlane-xyz/starknet-sdk": "28.0.4",
+    "@hyperlane-xyz/rebalancer": "27.2.14",
+    "@hyperlane-xyz/sealevel-sdk": "33.0.2",
+    "@hyperlane-xyz/tron-sdk": "23.0.4",
+    "@hyperlane-xyz/tsconfig": "^33.0.2",
+    "@hyperlane-xyz/utils": "33.0.2"
   },
   "engines": {
     "node": ">=16"