@hypurrquant/defi-cli 1.0.10 → 1.0.12

package/dist/mcp-server.js

@@ -2080,12 +2080,16 @@ var init_dist2 = __esm({
           functionName: "add_liquidity",
           args: [[params.amount_a, params.amount_b], 0n]
         });
+        const approvals = [];
+        if (params.amount_a > 0n) approvals.push({ token: params.token_a, spender: this.router, amount: params.amount_a });
+        if (params.amount_b > 0n) approvals.push({ token: params.token_b, spender: this.router, amount: params.amount_b });
         return {
           description: `[${this.protocolName}] Curve add liquidity`,
           to: this.router,
           data,
           value: 0n,
-          gas_estimate: 4e5
+          gas_estimate: 4e5,
+          approvals
         };
       }
       async buildRemoveLiquidity(params) {
@@ -7450,11 +7454,29 @@ var Executor = class _Executor {
   static applyGasBuffer(gas) {
     return gas * GAS_BUFFER_BPS / 10000n;
   }
+  /**
+   * EIP-1559 max-fee formula: `baseFee * 1.25 + priorityFee`.
+   * Extracted as a static so the math is unit-testable without mocking viem.
+   */
+  static computeMaxFee(baseFeePerGas, priorityFee) {
+    return baseFeePerGas * 125n / 100n + priorityFee;
+  }
   /**
    * Check allowance for a single token/spender pair and send an approve tx if needed.
    * Only called in broadcast mode (not dry-run).
    */
+  /**
+   * Recognize the standard native-token sentinels:
+   * - 0x0000…0000 — defi-cli's internal marker for native gas tokens
+   * - 0xeeee…eeee — 1inch / KyberSwap / OpenOcean canonical sentinel
+   * Any address normalised to lowercase matches case-insensitively.
+   */
+  static isNativeSentinel(token) {
+    const t = token.toLowerCase();
+    return t === "0x0000000000000000000000000000000000000000" || t === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+  }
   async checkAndApprove(token, spender, amount, owner, publicClient, walletClient) {
+    if (_Executor.isNativeSentinel(token)) return;
     const allowance = await publicClient.readContract({
       address: token,
       abi: ERC20_ABI4,
@@ -7535,9 +7557,12 @@ var Executor = class _Executor {
   /**
    * Fetch EIP-1559 fee params. Returns [maxFeePerGas, maxPriorityFeePerGas].
    *
-   * Strategy: read the latest block's `baseFeePerGas` and use the canonical
-   * EIP-1559 formula `maxFee = baseFee * 2 + priorityFee` (1 block of head-room
-   * after a 12.5% bump). Falls back to `getGasPrice() + priorityFee` only when
+   * Strategy: read the latest block's `baseFeePerGas` and apply the conservative
+   * formula `maxFee = baseFee * 1.25 + priorityFee` (one block of head-room — the
+   * 12.5% per-block max bump). The canonical 2× wastes budget on chains where
+   * baseFee is already elevated (e.g., Mantle ~50 gwei → 100 gwei doubled the
+   * MNT requirement and broke multi-step flows). Falls back to
+   * `getGasPrice() + priorityFee` only when
    * the chain doesn't expose `baseFeePerGas` (pre-1559).
    *
    * Why not gasPrice * 2: `getGasPrice()` returns `baseFee + priorityFee`, so
@@ -7556,8 +7581,7 @@ var Executor = class _Executor {
       try {
         const block = await client.getBlock({ blockTag: "latest" });
         if (block.baseFeePerGas !== null && block.baseFeePerGas !== void 0) {
-          const maxFee = block.baseFeePerGas * 125n / 100n + priorityFee;
-          return [maxFee, priorityFee];
+          return [_Executor.computeMaxFee(block.baseFeePerGas, priorityFee), priorityFee];
         }
       } catch {
       }
@@ -7600,6 +7624,7 @@ var Executor = class _Executor {
     if (tx.approvals && tx.approvals.length > 0) {
       const pendingApprovals = [];
       for (const approval of tx.approvals) {
+        if (_Executor.isNativeSentinel(approval.token)) continue;
         try {
           const allowance = await client.readContract({
             address: approval.token,