@michaleffffff/mcp-trading-server 2.5.0 → 2.5.1

package/dist/services/tradeService.js

@@ -1,22 +1,47 @@
 import { Direction, OrderType, TriggerType } from "@myx-trade/sdk";
-import { parseUnits } from "ethers";
 import { getChainId, getQuoteToken } from "../auth/resolveClient.js";
 import { ensureUnits } from "../utils/units.js";
 import { normalizeAddress } from "../utils/address.js";
 import { normalizeSlippagePct4dp } from "../utils/slippage.js";
-/**
- * 将人类可读数值转为指定精度的整数字串
- * e.g. toUnits("100", 6) => "100000000"
- */
-export function toUnits(human, decimals) {
-    return parseUnits(human, decimals).toString();
-}
 function resolveDirection(direction) {
     if (direction !== 0 && direction !== 1) {
         throw new Error("direction must be 0 (LONG) or 1 (SHORT).");
     }
     return direction === 0 ? Direction.LONG : Direction.SHORT;
 }
+/**
+ * 自动推断开启订单的触发类型 (Limit/Stop)
+ */
+function resolveTriggerType(orderType, direction, triggerType) {
+    if (triggerType !== undefined && triggerType !== null && triggerType !== 0) {
+        return triggerType;
+    }
+    // LIMIT LONG: LTE(2), LIMIT SHORT: GTE(1)
+    if (orderType === OrderType.LIMIT) {
+        return direction === 0 ? 2 : 1;
+    }
+    // STOP LONG: GTE(1), STOP SHORT: LTE(2)
+    if (orderType === OrderType.STOP) {
+        return direction === 0 ? 1 : 2;
+    }
+    return 0; // MARKET order typically uses 0
+}
+/**
+ * 自动推断已有仓位的止盈止损触发类型
+ */
+function resolveTpSlTriggerType(isTp, direction, triggerType) {
+    if (triggerType !== undefined && triggerType !== null && triggerType !== 0) {
+        return triggerType;
+    }
+    // TP: LONG -> GTE(1), SHORT -> LTE(2)
+    // SL: LONG -> LTE(2), SHORT -> GTE(1)
+    if (isTp) {
+        return direction === 0 ? 1 : 2;
+    }
+    else {
+        return direction === 0 ? 2 : 1;
+    }
+}
 /**
  * 开仓 / 加仓
  */
@@ -39,7 +64,7 @@ export async function openPosition(client, address, args) {
         poolId: args.poolId,
         positionId: args.positionId,
         orderType: args.orderType,
-        triggerType: args.triggerType,
+        triggerType: resolveTriggerType(args.orderType, args.direction, args.triggerType),
         direction: dir,
         collateralAmount: ensureUnits(args.collateralAmount, quoteDecimals, "collateralAmount"),
         size: ensureUnits(args.size, baseDecimals, "size"),
@@ -58,7 +83,8 @@ export async function openPosition(client, address, args) {
         orderParams.slSize = ensureUnits(args.slSize, baseDecimals, "slSize");
     if (args.slPrice)
         orderParams.slPrice = ensureUnits(args.slPrice, 30, "slPrice");
-    return client.order.createIncreaseOrder(orderParams, args.tradingFee, args.marketId);
+    const tradingFeeRaw = ensureUnits(args.tradingFee, quoteDecimals, "tradingFee");
+    return client.order.createIncreaseOrder(orderParams, tradingFeeRaw, args.marketId);
 }
 /**
  * 平仓 / 减仓
@@ -85,7 +111,7 @@ export async function closePosition(client, address, args) {
         poolId: args.poolId,
         positionId: args.positionId,
         orderType: args.orderType,
-        triggerType: args.triggerType,
+        triggerType: resolveTriggerType(args.orderType, args.direction, args.triggerType),
         direction: dir,
         collateralAmount: ensureUnits(args.collateralAmount, quoteDecimals, "collateralAmount"),
         size: ensureUnits(args.size, baseDecimals, "size"),
@@ -107,6 +133,13 @@ export async function setPositionTpSl(client, address, args) {
         throw new Error("At least one of tpPrice or slPrice must be provided.");
     }
     const dir = resolveDirection(args.direction);
+    // Fetch pool detail for decimals
+    const poolResponse = await client.markets.getMarketDetail({ chainId, poolId: args.poolId });
+    const poolData = poolResponse?.data || (poolResponse?.marketId ? poolResponse : null);
+    if (!poolData) {
+        throw new Error(`Could not find pool metadata for ID: ${args.poolId}`);
+    }
+    const baseDecimals = poolData.baseDecimals || 18;
     const params = {
         chainId,
         address,
@@ -115,18 +148,18 @@ export async function setPositionTpSl(client, address, args) {
         direction: dir,
         leverage: args.leverage,
         executionFeeToken,
-        tpTriggerType: args.tpTriggerType,
-        slTriggerType: args.slTriggerType,
+        tpTriggerType: resolveTpSlTriggerType(true, args.direction, args.tpTriggerType),
+        slTriggerType: resolveTpSlTriggerType(false, args.direction, args.slTriggerType),
         slippagePct: normalizeSlippagePct4dp(args.slippagePct),
     };
     if (args.tpPrice)
-        params.tpPrice = args.tpPrice;
+        params.tpPrice = ensureUnits(args.tpPrice, 30, "tpPrice");
     if (args.tpSize)
-        params.tpSize = args.tpSize;
+        params.tpSize = ensureUnits(args.tpSize, baseDecimals, "tpSize");
     if (args.slPrice)
-        params.slPrice = args.slPrice;
+        params.slPrice = ensureUnits(args.slPrice, 30, "slPrice");
     if (args.slSize)
-        params.slSize = args.slSize;
+        params.slSize = ensureUnits(args.slSize, baseDecimals, "slSize");
     return client.order.createPositionTpSlOrder(params);
 }
 /**

package/dist/utils/units.js

@@ -23,10 +23,18 @@ export function ensureUnits(value, decimals, label = "value") {
         throw new Error(`${label} is required.`);
     if (!DECIMAL_RE.test(str))
         throw new Error(`${label} must be a numeric string.`);
-    if (str.includes(".")) {
+    // If it's already a very large integer (e.g. > 12 digits or > decimals digits), 
+    // assume it's already in the smallest unit (Wei/Raw).
+    if (!str.includes(".") && (str.length > 12 || str.length > decimals)) {
+        return str;
+    }
+    try {
         return parseUnits(str, decimals).toString();
     }
-    return str;
+    catch (e) {
+        console.warn(`[ensureUnits] parseUnits failed for ${label}: ${str}. Returning raw.`);
+        return str;
+    }
 }
 export function parseHumanUnits(value, decimals, label = "value") {
     const str = String(value).trim();

package/package.json

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