@michaleffffff/mcp-trading-server 2.5.1 → 2.5.3

package/dist/server.js

@@ -81,7 +81,7 @@ function zodSchemaToJsonSchema(zodSchema) {
     };
 }
 // ─── MCP Server ───
-const server = new Server({ name: "myx-mcp-trading-server", version: "2.4.1" }, { capabilities: { tools: {}, resources: {}, prompts: {} } });
+const server = new Server({ name: "myx-mcp-trading-server", version: "2.5.3" }, { capabilities: { tools: {}, resources: {}, prompts: {} } });
 // List tools
 server.setRequestHandler(ListToolsRequestSchema, async () => {
     return {
@@ -181,7 +181,7 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
 async function main() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    logger.info("🚀 MYX Trading MCP Server v2.4.1 running (stdio, pure on-chain, prod ready)");
+    logger.info("🚀 MYX Trading MCP Server v2.5.3 running (stdio, pure on-chain, prod ready)");
 }
 main().catch((err) => {
     logger.error("Fatal Server Startup Error", err);

package/dist/services/tradeService.js

@@ -3,6 +3,7 @@ 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";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 function resolveDirection(direction) {
     if (direction !== 0 && direction !== 1) {
         throw new Error("direction must be 0 (LONG) or 1 (SHORT).");
@@ -58,6 +59,48 @@ export async function openPosition(client, address, args) {
     }
     const baseDecimals = poolData.baseDecimals || 18;
     const quoteDecimals = poolData.quoteDecimals || 6;
+    const collateralRaw = ensureUnits(args.collateralAmount, quoteDecimals, "collateralAmount");
+    const sizeRaw = ensureUnits(args.size, baseDecimals, "size");
+    const priceRaw = ensureUnits(args.price, 30, "price");
+    const tradingFeeRaw = ensureUnits(args.tradingFee, quoteDecimals, "tradingFee");
+    // --- Auto-Deposit Logic (Strict) ---
+    console.log(`[tradeService] Checking marginBalance for ${address} in pool ${args.poolId}...`);
+    const marginInfo = await client.account.getAccountInfo(chainId, address, args.poolId);
+    let marginBalanceRaw = BigInt(0);
+    let walletBalanceRaw = BigInt(0); // Using availableMargin as wallet balance per user
+    if (marginInfo?.code === 0) {
+        if (Array.isArray(marginInfo.data)) {
+            marginBalanceRaw = BigInt(marginInfo.data[0] || "0");
+            walletBalanceRaw = BigInt(marginInfo.data[1] || "0");
+        }
+        else {
+            marginBalanceRaw = BigInt(marginInfo.data?.marginBalance || "0");
+            walletBalanceRaw = BigInt(marginInfo.data?.availableMargin || "0");
+        }
+    }
+    const requiredRaw = BigInt(collateralRaw);
+    if (marginBalanceRaw < requiredRaw) {
+        const neededRaw = requiredRaw - marginBalanceRaw;
+        console.log(`[tradeService] marginBalance (${marginBalanceRaw.toString()}) < Required (${requiredRaw.toString()}). Need to deposit: ${neededRaw.toString()}`);
+        if (walletBalanceRaw < neededRaw) {
+            // Also check real wallet balance just in case user's availableMargin is truly empty
+            const realWalletRes = await client.account.getWalletQuoteTokenBalance(chainId, address);
+            const realWalletRaw = BigInt(realWalletRes?.data || "0");
+            if (realWalletRaw < neededRaw) {
+                throw new Error(`Insufficient funds: marginBalance (${marginBalanceRaw.toString()}) + availableMargin (as wallet: ${walletBalanceRaw.toString()}) + real wallet (${realWalletRaw.toString()}) is less than required collateral (${requiredRaw.toString()}).`);
+            }
+            walletBalanceRaw = realWalletRaw;
+        }
+        console.log(`[tradeService] Depositing ${neededRaw.toString()} ${poolData.quoteSymbol} from wallet (availableMargin)...`);
+        const depositRaw = await client.account.deposit({
+            amount: neededRaw.toString(),
+            tokenAddress: poolData.quoteToken,
+            chainId
+        });
+        const depositResult = await finalizeMutationResult(depositRaw, client.signer || (client.provider ? { provider: client.provider } : null), "auto_deposit");
+        console.log(`[tradeService] Auto-deposit confirmed in tx: ${depositResult.confirmation?.txHash}`);
+    }
+    // --- End Auto-Deposit Logic ---
     const orderParams = {
         chainId,
         address,
@@ -66,9 +109,9 @@ export async function openPosition(client, address, args) {
         orderType: args.orderType,
         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"),
+        collateralAmount: collateralRaw,
+        size: sizeRaw,
+        price: priceRaw,
         timeInForce: args.timeInForce,
         postOnly: args.postOnly,
         slippagePct: normalizeSlippagePct4dp(args.slippagePct),
@@ -83,7 +126,6 @@ export async function openPosition(client, address, args) {
         orderParams.slSize = ensureUnits(args.slSize, baseDecimals, "slSize");
     if (args.slPrice)
         orderParams.slPrice = ensureUnits(args.slPrice, 30, "slPrice");
-    const tradingFeeRaw = ensureUnits(args.tradingFee, quoteDecimals, "tradingFee");
     return client.order.createIncreaseOrder(orderParams, tradingFeeRaw, args.marketId);
 }
 /**

package/dist/tools/closePosition.js

@@ -3,6 +3,7 @@ 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";
+import { verifyTradeOutcome } from "../utils/verification.js";
 export const closePositionTool = {
     name: "close_position",
     description: "Create a decrease order using SDK-native parameters.",
@@ -28,7 +29,13 @@ export const closePositionTool = {
             const { client, address, signer } = await resolveClient();
             const raw = await closePos(client, address, args);
             const data = await finalizeMutationResult(raw, signer, "close_position");
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const txHash = data.confirmation?.txHash;
+            let verification = null;
+            if (txHash) {
+                verification = await verifyTradeOutcome(client, address, args.poolId, txHash);
+            }
+            const payload = { ...data, verification };
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: payload }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/executeTrade.js

@@ -3,77 +3,8 @@ 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";
+import { verifyTradeOutcome } from "../utils/verification.js";
 const POSITION_ID_RE = /^$|^0x[0-9a-fA-F]{64}$/;
-function toList(input) {
-    if (Array.isArray(input))
-        return input;
-    if (Array.isArray(input?.data))
-        return input.data;
-    return [];
-}
-function buildPositionFingerprint(rows, poolId) {
-    const map = new Map();
-    for (const row of rows) {
-        if (String(row?.poolId ?? row?.pool_id ?? "") !== poolId)
-            continue;
-        const id = String(row?.positionId ?? row?.position_id ?? "");
-        if (!id)
-            continue;
-        const fingerprint = JSON.stringify({
-            size: String(row?.size ?? ""),
-            collateralAmount: String(row?.collateralAmount ?? row?.collateral_amount ?? ""),
-            txTime: Number(row?.txTime ?? row?.tx_time ?? 0),
-        });
-        map.set(id, fingerprint);
-    }
-    return map;
-}
-function buildOpenOrderSet(rows, poolId) {
-    const set = new Set();
-    for (const row of rows) {
-        if (String(row?.poolId ?? row?.pool_id ?? "") !== poolId)
-            continue;
-        const id = row?.orderId ?? row?.id ?? row?.order_id;
-        if (id !== undefined && id !== null)
-            set.add(String(id));
-    }
-    return set;
-}
-async function snapshotTradeState(client, address, poolId) {
-    const [ordersRes, positionsRes] = await Promise.all([
-        client.order.getOrders(address).catch(() => null),
-        client.position.listPositions(address).catch(() => null),
-    ]);
-    return {
-        openOrders: buildOpenOrderSet(toList(ordersRes), poolId),
-        positions: buildPositionFingerprint(toList(positionsRes), poolId),
-    };
-}
-function hasTradeEffect(before, after) {
-    for (const id of after.openOrders) {
-        if (!before.openOrders.has(id))
-            return true;
-    }
-    for (const [id, fp] of after.positions.entries()) {
-        if (!before.positions.has(id))
-            return true;
-        if (before.positions.get(id) !== fp)
-            return true;
-    }
-    return false;
-}
-async function waitForTradeEffect(client, address, poolId, before) {
-    const maxAttempts = 8;
-    const intervalMs = 1500;
-    for (let i = 0; i < maxAttempts; i += 1) {
-        const after = await snapshotTradeState(client, address, poolId);
-        if (hasTradeEffect(before, after)) {
-            return { detected: true, attempts: i + 1 };
-        }
-        await new Promise((resolve) => setTimeout(resolve, intervalMs));
-    }
-    return { detected: false, attempts: maxAttempts };
-}
 export const executeTradeTool = {
     name: "execute_trade",
     description: "Create an increase order using SDK-native parameters.",
@@ -85,9 +16,9 @@ export const executeTradeTool = {
         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)"),
+        collateralAmount: z.coerce.string().describe("Collateral amount (raw or human-readable)"),
+        size: z.coerce.string().describe("Position size (raw or human-readable)"),
+        price: z.coerce.string().describe("Price (raw or human-readable, 30 decimals)"),
         timeInForce: z.coerce.number().int().describe("TimeInForce enum value"),
         postOnly: z.coerce.boolean().describe("Post-only flag"),
         slippagePct: z.coerce.string().refine(isValidSlippagePct4dp, {
@@ -95,25 +26,25 @@ export const executeTradeTool = {
         }).describe(SLIPPAGE_PCT_4DP_DESC),
         executionFeeToken: z.string().describe("Execution fee token address"),
         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"),
+        tpSize: z.coerce.string().optional().describe("TP size (raw or human-readable)"),
+        tpPrice: z.coerce.string().optional().describe("TP price (raw or human-readable)"),
+        slSize: z.coerce.string().optional().describe("SL size (raw or human-readable)"),
+        slPrice: z.coerce.string().optional().describe("SL price (raw or human-readable)"),
+        tradingFee: z.coerce.string().describe("Trading fee (raw units)"),
         marketId: z.string().describe("Market ID"),
     },
     handler: async (args) => {
         try {
             const { client, address, signer } = await resolveClient();
-            const before = await snapshotTradeState(client, address, args.poolId);
             const raw = await openPosition(client, address, args);
             const data = await finalizeMutationResult(raw, signer, "execute_trade");
-            const effect = await waitForTradeEffect(client, address, args.poolId, before);
-            if (!effect.detected) {
-                throw new Error(`execute_trade tx confirmed but no order/position change detected in ${effect.attempts} checks.`);
+            const txHash = data.confirmation?.txHash;
+            let verification = null;
+            if (txHash) {
+                verification = await verifyTradeOutcome(client, address, args.poolId, txHash);
             }
-            const payload = { ...data, effect };
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: payload }, (k, v) => typeof v === 'bigint' ? v.toString() : v) }] };
+            const payload = { ...data, verification };
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: payload }, (k, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/utils/verification.js

@@ -0,0 +1,44 @@
+import { getChainId } from "../auth/resolveClient.js";
+/**
+ * 等待后端索引并验证交易结果
+ */
+export async function verifyTradeOutcome(client, address, poolId, txHash) {
+    const chainId = getChainId();
+    // 给后端索引一定的缓冲时间
+    const maxAttempts = 5;
+    const intervalMs = 1000;
+    let matchedOrder = null;
+    for (let i = 0; i < maxAttempts; i++) {
+        try {
+            // 查询历史订单
+            const historyRes = await client.order.getOrderHistory({
+                chainId,
+                poolId,
+                limit: 10
+            }, address);
+            const history = historyRes?.data || historyRes?.data?.data || [];
+            matchedOrder = history.find((o) => String(o.orderHash).toLowerCase() === txHash.toLowerCase() ||
+                String(o.txHash).toLowerCase() === txHash.toLowerCase());
+            if (matchedOrder)
+                break;
+        }
+        catch (e) {
+            console.warn(`[verifyTradeOutcome] Attempt ${i + 1} failed:`, e);
+        }
+        await new Promise(resolve => setTimeout(resolve, intervalMs));
+    }
+    // 查询当前持仓
+    let positions = [];
+    try {
+        const posRes = await client.position.listPositions(address);
+        positions = (posRes?.data || []).filter((p) => String(p.poolId) === poolId);
+    }
+    catch (e) {
+        console.warn(`[verifyTradeOutcome] Failed to fetch positions:`, e);
+    }
+    return {
+        order: matchedOrder,
+        positions: positions,
+        verified: !!matchedOrder
+    };
+}

package/package.json

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