@michaleffffff/mcp-trading-server 2.4.3 → 2.5.1

package/dist/services/tradeService.js

@@ -1,21 +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";
-/**
- * 将人类可读数值转为指定精度的整数字串
- * e.g. toUnits("100", 6) => "100000000"
- */
-export function toUnits(human, decimals) {
-    return parseUnits(human, decimals).toString();
-}
+import { normalizeSlippagePct4dp } from "../utils/slippage.js";
 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;
+    }
+}
 /**
  * 开仓 / 加仓
  */
@@ -38,14 +64,14 @@ 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"),
         price: ensureUnits(args.price, 30, "price"),
         timeInForce: args.timeInForce,
         postOnly: args.postOnly,
-        slippagePct: String(args.slippagePct),
+        slippagePct: normalizeSlippagePct4dp(args.slippagePct),
         executionFeeToken,
         leverage: args.leverage,
     };
@@ -57,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);
 }
 /**
  * 平仓 / 减仓
@@ -84,14 +111,14 @@ 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"),
         price: ensureUnits(args.price, 30, "price"),
         timeInForce: args.timeInForce,
         postOnly: args.postOnly,
-        slippagePct: String(args.slippagePct),
+        slippagePct: normalizeSlippagePct4dp(args.slippagePct),
         executionFeeToken,
         leverage: args.leverage,
     });
@@ -106,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,
@@ -114,18 +148,18 @@ export async function setPositionTpSl(client, address, args) {
         direction: dir,
         leverage: args.leverage,
         executionFeeToken,
-        tpTriggerType: args.tpTriggerType,
-        slTriggerType: args.slTriggerType,
-        slippagePct: args.slippagePct,
+        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/tools/adjustMargin.js

@@ -8,9 +8,9 @@ export const adjustMarginTool = {
     schema: {
         poolId: z.string().describe("Pool ID"),
         positionId: z.string().describe("Position ID"),
-        adjustAmount: z.string().regex(/^-?\d+$/).describe("Quote token raw units. Positive = add, negative = remove."),
+        adjustAmount: z.coerce.string().regex(/^-?\d+$/).describe("Quote token raw units. Positive = add, negative = remove."),
         quoteToken: z.string().optional().describe("Quote token address"),
-        poolOracleType: z.number().optional().describe("Oracle type: 1 for Chainlink, 2 for Pyth"),
+        poolOracleType: z.coerce.number().optional().describe("Oracle type: 1 for Chainlink, 2 for Pyth"),
     },
     handler: async (args) => {
         try {

package/dist/tools/closeAllPositions.js

@@ -3,12 +3,15 @@ import { resolveClient, getChainId, getQuoteToken } from "../auth/resolveClient.
 import { getOraclePrice } from "../services/marketService.js";
 import { ensureUnits } from "../utils/units.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
+import { normalizeSlippagePct4dp, isValidSlippagePct4dp, SLIPPAGE_PCT_4DP_DESC } from "../utils/slippage.js";
 export const closeAllPositionsTool = {
     name: "close_all_positions",
     description: "Emergency: close ALL open positions in a pool at once. Use for risk management.",
     schema: {
         poolId: z.string().describe("Pool ID to close all positions in"),
-        slippagePct: z.string().regex(/^\d+$/).optional().describe("Slippage in 4-digit precision raw units (1 = 0.01%)"),
+        slippagePct: z.coerce.string().refine(isValidSlippagePct4dp, {
+            message: "slippagePct must be an integer in [0, 10000] with 4-decimal precision (1 = 0.01%).",
+        }).optional().describe(SLIPPAGE_PCT_4DP_DESC),
     },
     handler: async (args) => {
         try {
@@ -25,7 +28,7 @@ export const closeAllPositionsTool = {
                 return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: { message: "No open positions in this pool.", closed: 0 } }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
             }
             // 2) 为每个仓位构建平仓参数
-            const slippagePct = args.slippagePct ?? "200";
+            const slippagePct = normalizeSlippagePct4dp(args.slippagePct ?? "200");
             // 3) We need actual oracle prices to avoid Revert 0x613970e0 (InvalidParameter)
             const oraclePriceReq = await getOraclePrice(client, args.poolId).catch(() => null);
             let fallbackPrice = "0";

package/dist/tools/closePosition.js

@@ -2,23 +2,26 @@ import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { closePosition as closePos } from "../services/tradeService.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
+import { isValidSlippagePct4dp, SLIPPAGE_PCT_4DP_DESC } from "../utils/slippage.js";
 export const closePositionTool = {
     name: "close_position",
     description: "Create a decrease order using SDK-native parameters.",
     schema: {
         poolId: z.string().describe("Pool ID"),
         positionId: z.string().describe("Position ID to close"),
-        orderType: z.number().int().min(0).max(3).describe("OrderType enum value"),
-        triggerType: z.number().int().min(0).max(2).describe("TriggerType enum value"),
-        direction: z.union([z.literal(0), z.literal(1)]).describe("0 = LONG, 1 = SHORT"),
+        orderType: z.coerce.number().int().min(0).max(3).describe("OrderType enum value"),
+        triggerType: z.coerce.number().int().min(0).max(2).describe("TriggerType enum value"),
+        direction: z.coerce.number().pipe(z.union([z.literal(0), z.literal(1)])).describe("0 = LONG, 1 = SHORT"),
         collateralAmount: z.union([z.string(), z.number()]).describe("Collateral amount (human-readable or raw units)"),
         size: z.union([z.string(), z.number()]).describe("Position size (human-readable or raw units)"),
         price: z.union([z.string(), z.number()]).describe("Price (human-readable or 30-dec raw units)"),
-        timeInForce: z.number().int().describe("TimeInForce enum value"),
-        postOnly: z.boolean().describe("Post-only flag"),
-        slippagePct: z.union([z.string(), z.number()]).describe("Slippage in BPS (e.g. 100 = 1%)"),
+        timeInForce: z.coerce.number().int().describe("TimeInForce enum value"),
+        postOnly: z.coerce.boolean().describe("Post-only flag"),
+        slippagePct: z.coerce.string().refine(isValidSlippagePct4dp, {
+            message: "slippagePct must be an integer in [0, 10000] with 4-decimal precision (1 = 0.01%).",
+        }).describe(SLIPPAGE_PCT_4DP_DESC),
         executionFeeToken: z.string().describe("Execution fee token address"),
-        leverage: z.number().describe("Leverage"),
+        leverage: z.coerce.number().describe("Leverage"),
     },
     handler: async (args) => {
         try {

package/dist/tools/executeTrade.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { openPosition } from "../services/tradeService.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
+import { isValidSlippagePct4dp, SLIPPAGE_PCT_4DP_DESC } from "../utils/slippage.js";
 const POSITION_ID_RE = /^$|^0x[0-9a-fA-F]{64}$/;
 function toList(input) {
     if (Array.isArray(input))
@@ -81,22 +82,24 @@ export const executeTradeTool = {
         positionId: z.string().refine((value) => POSITION_ID_RE.test(value), {
             message: "positionId must be empty string for new position, or a bytes32 hex string.",
         }).describe("Position ID: empty string for new position"),
-        orderType: z.number().int().min(0).max(3).describe("OrderType enum value"),
-        triggerType: z.number().int().min(0).max(2).describe("TriggerType enum value"),
-        direction: z.union([z.literal(0), z.literal(1)]).describe("0 = LONG, 1 = SHORT"),
-        collateralAmount: z.string().regex(/^\d+$/).describe("Collateral amount (raw units)"),
-        size: z.string().regex(/^\d+$/).describe("Position size (raw units)"),
-        price: z.string().regex(/^\d+$/).describe("Price (30-decimal raw units)"),
-        timeInForce: z.number().int().describe("TimeInForce enum value"),
-        postOnly: z.boolean().describe("Post-only flag"),
-        slippagePct: z.string().regex(/^\d+$/).describe("Slippage in 4-decimal precision raw units"),
+        orderType: z.coerce.number().int().min(0).max(3).describe("OrderType enum value"),
+        triggerType: z.coerce.number().int().min(0).max(2).describe("TriggerType enum value"),
+        direction: z.coerce.number().pipe(z.union([z.literal(0), z.literal(1)])).describe("0 = LONG, 1 = SHORT"),
+        collateralAmount: z.coerce.string().regex(/^\d+$/).describe("Collateral amount (raw units)"),
+        size: z.coerce.string().regex(/^\d+$/).describe("Position size (raw units)"),
+        price: z.coerce.string().regex(/^\d+$/).describe("Price (30-decimal raw units)"),
+        timeInForce: z.coerce.number().int().describe("TimeInForce enum value"),
+        postOnly: z.coerce.boolean().describe("Post-only flag"),
+        slippagePct: z.coerce.string().refine(isValidSlippagePct4dp, {
+            message: "slippagePct must be an integer in [0, 10000] with 4-decimal precision (1 = 0.01%).",
+        }).describe(SLIPPAGE_PCT_4DP_DESC),
         executionFeeToken: z.string().describe("Execution fee token address"),
-        leverage: z.number().describe("Leverage"),
-        tpSize: z.string().regex(/^\d+$/).optional().describe("TP size raw units"),
-        tpPrice: z.string().regex(/^\d+$/).optional().describe("TP price raw units (30 decimals)"),
-        slSize: z.string().regex(/^\d+$/).optional().describe("SL size raw units"),
-        slPrice: z.string().regex(/^\d+$/).optional().describe("SL price raw units (30 decimals)"),
-        tradingFee: z.string().regex(/^\d+$/).describe("Trading fee raw units"),
+        leverage: z.coerce.number().describe("Leverage"),
+        tpSize: z.coerce.string().regex(/^\d+$/).optional().describe("TP size raw units"),
+        tpPrice: z.coerce.string().regex(/^\d+$/).optional().describe("TP price raw units (30 decimals)"),
+        slSize: z.coerce.string().regex(/^\d+$/).optional().describe("SL size raw units"),
+        slPrice: z.coerce.string().regex(/^\d+$/).optional().describe("SL price raw units (30 decimals)"),
+        tradingFee: z.coerce.string().regex(/^\d+$/).describe("Trading fee raw units"),
         marketId: z.string().describe("Market ID"),
     },
     handler: async (args) => {

package/dist/tools/setTpSl.js

@@ -2,22 +2,25 @@ import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { setPositionTpSl } from "../services/tradeService.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
+import { isValidSlippagePct4dp, SLIPPAGE_PCT_4DP_DESC } from "../utils/slippage.js";
 export const setTpSlTool = {
     name: "set_tp_sl",
     description: "Create TP/SL order using SDK-native parameters.",
     schema: {
         poolId: z.string().describe("Pool ID"),
         positionId: z.string().describe("Position ID"),
-        direction: z.union([z.literal(0), z.literal(1)]).describe("0 = LONG, 1 = SHORT"),
-        leverage: z.number().describe("Leverage"),
+        direction: z.coerce.number().pipe(z.union([z.literal(0), z.literal(1)])).describe("0 = LONG, 1 = SHORT"),
+        leverage: z.coerce.number().describe("Leverage"),
         executionFeeToken: z.string().describe("Execution fee token address"),
-        tpTriggerType: z.number().int().min(0).max(2).describe("TP trigger type"),
-        slTriggerType: z.number().int().min(0).max(2).describe("SL trigger type"),
-        slippagePct: z.string().regex(/^\d+$/).describe("Slippage with 4-dec precision raw units"),
-        tpPrice: z.string().regex(/^\d+$/).optional().describe("TP price raw units (30 decimals)"),
-        tpSize: z.string().regex(/^\d+$/).optional().describe("TP size raw units"),
-        slPrice: z.string().regex(/^\d+$/).optional().describe("SL price raw units (30 decimals)"),
-        slSize: z.string().regex(/^\d+$/).optional().describe("SL size raw units"),
+        tpTriggerType: z.coerce.number().int().min(0).max(2).describe("TP trigger type"),
+        slTriggerType: z.coerce.number().int().min(0).max(2).describe("SL trigger type"),
+        slippagePct: z.coerce.string().refine(isValidSlippagePct4dp, {
+            message: "slippagePct must be an integer in [0, 10000] with 4-decimal precision (1 = 0.01%).",
+        }).describe(SLIPPAGE_PCT_4DP_DESC),
+        tpPrice: z.coerce.string().regex(/^\d+$/).optional().describe("TP price raw units (30 decimals)"),
+        tpSize: z.coerce.string().regex(/^\d+$/).optional().describe("TP size raw units"),
+        slPrice: z.coerce.string().regex(/^\d+$/).optional().describe("SL price raw units (30 decimals)"),
+        slSize: z.coerce.string().regex(/^\d+$/).optional().describe("SL size raw units"),
     },
     handler: async (args) => {
         try {

package/dist/utils/slippage.js

@@ -0,0 +1,15 @@
+const SLIPPAGE_PCT_4DP_RE = /^\d+$/;
+export const SLIPPAGE_PCT_4DP_MAX = 10000n;
+export const SLIPPAGE_PCT_4DP_DESC = "Slippage in 4-decimal precision raw units (1 = 0.01%, 10000 = 100%)";
+export function isValidSlippagePct4dp(value) {
+    if (!SLIPPAGE_PCT_4DP_RE.test(value))
+        return false;
+    return BigInt(value) <= SLIPPAGE_PCT_4DP_MAX;
+}
+export function normalizeSlippagePct4dp(value, label = "slippagePct") {
+    const raw = String(value ?? "").trim();
+    if (!isValidSlippagePct4dp(raw)) {
+        throw new Error(`${label} must be an integer in [0, 10000] with 4-decimal precision (1 = 0.01%).`);
+    }
+    return raw;
+}

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.4.3",
+  "version": "2.5.1",
   "type": "module",
   "bin": {
     "myx-mcp": "dist/server.js"