@michaleffffff/mcp-trading-server 3.0.16 → 3.0.21

package/dist/utils/slippage.js

@@ -1,7 +1,9 @@
 const SLIPPAGE_PCT_4DP_RE = /^\d+$/;
 export const SLIPPAGE_PCT_4DP_MAX = 10000n;
+export const BUSINESS_SLIPPAGE_PCT_4DP_MAX = BigInt(process.env.BUSINESS_MAX_SLIPPAGE_PCT_4DP ?? "500");
 export const SLIPPAGE_PCT_4DP_DESC = "Slippage in 4-decimal precision raw units (1 = 0.01%, 10000 = 100%)";
 const SLIPPAGE_PERCENT_HUMAN_RE = /^\d+(\.\d{1,2})?$/;
+export const BUSINESS_LP_SLIPPAGE_MAX_RATIO = Number(process.env.BUSINESS_MAX_LP_SLIPPAGE_RATIO ?? 0.05);
 export function isValidSlippagePct4dp(value) {
     if (!SLIPPAGE_PCT_4DP_RE.test(value))
         return false;
@@ -12,6 +14,10 @@ export function normalizeSlippagePct4dp(value, label = "slippagePct") {
     if (!isValidSlippagePct4dp(raw)) {
         throw new Error(`${label} must be an integer in [0, 10000] with 4-decimal precision (1 = 0.01%).`);
     }
+    const parsed = BigInt(raw);
+    if (parsed > BUSINESS_SLIPPAGE_PCT_4DP_MAX) {
+        throw new Error(`${label} exceeds business safety cap ${BUSINESS_SLIPPAGE_PCT_4DP_MAX.toString()} (${Number(BUSINESS_SLIPPAGE_PCT_4DP_MAX) / 100}%).`);
+    }
     return raw;
 }
 export function normalizeSlippagePct4dpFlexible(value, label = "slippagePct") {
@@ -34,5 +40,19 @@ export function normalizeSlippagePct4dpFlexible(value, label = "slippagePct") {
     if (converted > SLIPPAGE_PCT_4DP_MAX) {
         throw new Error(`${label} must be <= 100% (raw <= 10000).`);
     }
+    if (converted > BUSINESS_SLIPPAGE_PCT_4DP_MAX) {
+        throw new Error(`${label} exceeds business safety cap ${BUSINESS_SLIPPAGE_PCT_4DP_MAX.toString()} (${Number(BUSINESS_SLIPPAGE_PCT_4DP_MAX) / 100}%).`);
+    }
     return converted.toString();
 }
+export function normalizeLpSlippageRatio(value, label = "slippage") {
+    const numeric = Number(value);
+    if (!Number.isFinite(numeric) || numeric < 0) {
+        throw new Error(`${label} must be a finite number >= 0.`);
+    }
+    const ratio = numeric > 1 && numeric <= 100 ? numeric / 100 : numeric;
+    if (ratio > BUSINESS_LP_SLIPPAGE_MAX_RATIO) {
+        throw new Error(`${label} exceeds business safety cap ${BUSINESS_LP_SLIPPAGE_MAX_RATIO * 100}%.`);
+    }
+    return ratio;
+}

package/dist/utils/token.js

@@ -0,0 +1,15 @@
+import { Contract } from "ethers";
+const ERC20_DECIMALS_ABI = [
+    "function decimals() view returns (uint8)",
+];
+export async function fetchErc20Decimals(providerOrSigner, tokenAddress, label = "token") {
+    if (!providerOrSigner) {
+        throw new Error(`Provider unavailable while resolving decimals for ${label}.`);
+    }
+    const contract = new Contract(tokenAddress, ERC20_DECIMALS_ABI, providerOrSigner);
+    const decimals = Number(await contract.decimals());
+    if (!Number.isFinite(decimals) || decimals < 0) {
+        throw new Error(`Invalid decimals returned for ${label}: ${decimals}`);
+    }
+    return Math.floor(decimals);
+}

package/dist/utils/units.js

@@ -36,25 +36,17 @@ export function ensureUnits(value, decimals, label = "value", options = {}) {
     }
     if (!DECIMAL_RE.test(str))
         throw new Error(`${label} must be a numeric string.`);
-    // Truncate decimals if they exceed the allowed precision to prevent parseUnits throwing
     if (str.includes(".")) {
-        const parts = str.split(".");
-        if (parts[1].length > decimals) {
-            console.warn(`[ensureUnits] Truncating ${label} precision: ${str} -> ${parts[0]}.${parts[1].slice(0, decimals)}`);
-            str = `${parts[0]}.${parts[1].slice(0, decimals)}`;
+        const [, fracPart = ""] = str.split(".");
+        if (fracPart.length > decimals) {
+            throw new Error(`${label} exceeds supported precision: got ${fracPart.length} decimals, max is ${decimals}.`);
         }
     }
     // Legacy compatibility: optionally treat very large integers as already raw.
     if (allowImplicitRaw && !str.includes(".") && (str.length > 12 || str.length > decimals)) {
         return str;
     }
-    try {
-        return parseUnits(str, decimals).toString();
-    }
-    catch (e) {
-        console.warn(`[ensureUnits] parseUnits failed for ${label}: ${str}. Returning raw.`);
-        return str;
-    }
+    return parseUnits(str, decimals).toString();
 }
 export function parseUserUnits(value, decimals, label = "value") {
     let str = String(value).trim();

package/dist/utils/verification.js

@@ -1,5 +1,28 @@
 import { getChainId } from "../auth/resolveClient.js";
 import { decodeErrorSelector } from "./errors.js";
+import { getHistoryOrderStatusDesc } from "./mappings.js";
+const FINAL_HISTORY_STATUSES = new Set([1, 2, 9]);
+function collectHistoryRows(historyRes) {
+    if (Array.isArray(historyRes?.data))
+        return historyRes.data;
+    if (Array.isArray(historyRes?.data?.data))
+        return historyRes.data.data;
+    if (Array.isArray(historyRes))
+        return historyRes;
+    return [];
+}
+function normalizeHash(value) {
+    return String(value ?? "").trim().toLowerCase();
+}
+function enrichCancelReason(order) {
+    let cancelReason = order?.cancelReason || (Number(order?.status) === 1 ? "Unknown cancellation" : null);
+    if (cancelReason && cancelReason.startsWith("0x")) {
+        const decoded = decodeErrorSelector(cancelReason);
+        if (decoded)
+            cancelReason = `${cancelReason} (${decoded})`;
+    }
+    return cancelReason;
+}
 /**
  * 等待后端索引并验证交易结果 (增强版)
  */
@@ -9,22 +32,26 @@ export async function verifyTradeOutcome(client, address, poolId, txHash) {
     const maxAttempts = 6;
     let currentDelay = 1000;
     let matchedOrder = null;
+    let matchedBy = null;
     for (let i = 0; i < maxAttempts; i++) {
         try {
             // 查询历史订单
             const historyRes = await client.order.getOrderHistory({
                 chainId,
                 poolId,
-                limit: 10
+                limit: 50,
+                page: 1,
             }, address);
-            const history = historyRes?.data || historyRes?.data?.data || [];
-            matchedOrder = history.find((o) => String(o.orderHash).toLowerCase() === txHash.toLowerCase() ||
-                String(o.txHash).toLowerCase() === txHash.toLowerCase());
+            const history = collectHistoryRows(historyRes);
+            const targetHash = normalizeHash(txHash);
+            const txHashMatch = history.find((o) => normalizeHash(o.txHash) === targetHash);
+            const orderHashMatch = history.find((o) => normalizeHash(o.orderHash) === targetHash);
+            matchedOrder = txHashMatch ?? orderHashMatch ?? null;
+            matchedBy = txHashMatch ? "txHash" : orderHashMatch ? "orderHash" : null;
             // 如果找到了订单且已经有最终状态，则退出轮询
             if (matchedOrder) {
                 const status = Number(matchedOrder.status);
-                if (status === 1 || status === 9 || status === 2) {
-                    // 1: Cancelled, 9: Successful, 2: Expired
+                if (FINAL_HISTORY_STATUSES.has(status)) {
                     break;
                 }
             }
@@ -46,16 +73,20 @@ export async function verifyTradeOutcome(client, address, poolId, txHash) {
     catch (e) {
         console.warn(`[verifyTradeOutcome] Failed to fetch positions:`, e);
     }
-    let cancelReason = matchedOrder?.cancelReason || (matchedOrder?.status === 1 ? "Unknown cancellation" : null);
-    if (cancelReason && cancelReason.startsWith("0x")) {
-        const decoded = decodeErrorSelector(cancelReason);
-        if (decoded)
-            cancelReason = `${cancelReason} (${decoded})`;
-    }
+    const statusCode = matchedOrder ? Number(matchedOrder.status) : null;
+    const statusText = statusCode === null || !Number.isFinite(statusCode)
+        ? null
+        : getHistoryOrderStatusDesc(statusCode);
+    const final = statusCode !== null && FINAL_HISTORY_STATUSES.has(statusCode);
+    const cancelReason = matchedOrder ? enrichCancelReason(matchedOrder) : null;
     return {
         order: matchedOrder,
         positions: positions,
         verified: !!matchedOrder,
+        matchedBy,
+        statusCode,
+        statusText,
+        final,
         cancelReason
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michaleffffff/mcp-trading-server",
-  "version": "3.0.16",
+  "version": "3.0.21",
   "type": "module",
   "bin": {
     "myx-mcp": "dist/server.js"