@michaleffffff/mcp-trading-server 2.4.1 → 2.4.3

package/README.md

@@ -82,6 +82,11 @@ IS_TESTNET=false
 MAX_TRADE_AMOUNT=5000 # Optional safety constraint limit for AI
 ```
 
+Testnet quick mapping:
+
+- `Arbitrum Sepolia (421614)`: `BROKER_ADDRESS=0x8f3153C18f698166f5D6124d8ba5B567F5f120f9`, `QUOTE_TOKEN_ADDRESS=0x7E248Ec1721639413A280d9E82e2862Cae2E6E28`
+- `Linea Sepolia (59141)`: `BROKER_ADDRESS=0x0FB08D3A1Ea6bE515fe78D3e0CaEb6990b468Cf3`, `QUOTE_TOKEN_ADDRESS=0xD984fd34f91F92DA0586e1bE82E262fF27DC431b`
+
 ---
 
 # Running the Server

package/dist/auth/resolveClient.js

@@ -2,14 +2,30 @@ import { MyxClient } from "@myx-trade/sdk";
 import { JsonRpcProvider, Wallet } from "ethers";
 import { normalizeAddress } from "../utils/address.js";
 let cached = null;
+function getDefaultBrokerByChainId(chainId) {
+    // Testnet mappings
+    if (chainId === 421614)
+        return "0x8f3153C18f698166f5D6124d8ba5B567F5f120f9"; // Arbitrum Sepolia
+    if (chainId === 59141)
+        return "0x0FB08D3A1Ea6bE515fe78D3e0CaEb6990b468Cf3"; // Linea Sepolia
+    return "0x8f3153C18f698166f5D6124d8ba5B567F5f120f9";
+}
+function getDefaultQuoteTokenByChainId(chainId) {
+    // Testnet mappings
+    if (chainId === 421614)
+        return "0x7E248Ec1721639413A280d9E82e2862Cae2E6E28"; // Arbitrum Sepolia
+    if (chainId === 59141)
+        return "0xD984fd34f91F92DA0586e1bE82E262fF27DC431b"; // Linea Sepolia
+    return "0xD984fd34f91F92DA0586e1bE82E262fF27DC431b";
+}
 export async function resolveClient() {
     if (cached)
         return cached;
     const rpcUrl = process.env.RPC_URL || "https://rpc.sepolia.linea.build";
     const privateKey = process.env.PRIVATE_KEY;
-    const brokerAddressRaw = process.env.BROKER_ADDRESS || "0xAc6C93eaBDc3DBE4e1B0176914dc2a16f8Fd1800";
     const chainId = Number(process.env.CHAIN_ID) || 59141;
-    const quoteTokenRaw = process.env.QUOTE_TOKEN_ADDRESS || "0xD984fd34f91F92DA0586e1bE82E262fF27DC431b";
+    const brokerAddressRaw = process.env.BROKER_ADDRESS || getDefaultBrokerByChainId(chainId);
+    const quoteTokenRaw = process.env.QUOTE_TOKEN_ADDRESS || getDefaultQuoteTokenByChainId(chainId);
     const quoteDecimals = Number(process.env.QUOTE_TOKEN_DECIMALS) || 6;
     if (!rpcUrl)
         throw new Error("RPC_URL env var is required.");
@@ -44,7 +60,8 @@ export function getChainId() {
 export function getQuoteToken() {
     if (cached)
         return cached.quoteToken;
-    const tokenRaw = process.env.QUOTE_TOKEN_ADDRESS || "0xD984fd34f91F92DA0586e1bE82E262fF27DC431b";
+    const chainId = Number(process.env.CHAIN_ID) || 59141;
+    const tokenRaw = process.env.QUOTE_TOKEN_ADDRESS || getDefaultQuoteTokenByChainId(chainId);
     if (!tokenRaw)
         throw new Error("QUOTE_TOKEN_ADDRESS env var is required.");
     return normalizeAddress(tokenRaw, "QUOTE_TOKEN_ADDRESS");

package/dist/services/tradeService.js

@@ -23,6 +23,15 @@ export async function openPosition(client, address, args) {
     const chainId = getChainId();
     const dir = resolveDirection(args.direction);
     const executionFeeToken = normalizeAddress(args.executionFeeToken, "executionFeeToken");
+    // Fetch pool detail to get decimals
+    const poolResponse = await client.markets.getMarketDetail({ chainId, poolId: args.poolId });
+    const poolData = poolResponse?.data || (poolResponse?.marketId ? poolResponse : null);
+    if (!poolData) {
+        console.error(`[ERROR] poolResponse for ${args.poolId}:`, JSON.stringify(poolResponse, null, 2));
+        throw new Error(`Could not find pool metadata for ID: ${args.poolId}`);
+    }
+    const baseDecimals = poolData.baseDecimals || 18;
+    const quoteDecimals = poolData.quoteDecimals || 6;
     const orderParams = {
         chainId,
         address,
@@ -31,23 +40,23 @@ export async function openPosition(client, address, args) {
         orderType: args.orderType,
         triggerType: args.triggerType,
         direction: dir,
-        collateralAmount: args.collateralAmount,
-        size: args.size,
-        price: args.price,
+        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: args.slippagePct,
+        slippagePct: String(args.slippagePct),
         executionFeeToken,
         leverage: args.leverage,
     };
     if (args.tpSize)
-        orderParams.tpSize = args.tpSize;
+        orderParams.tpSize = ensureUnits(args.tpSize, baseDecimals, "tpSize");
     if (args.tpPrice)
-        orderParams.tpPrice = args.tpPrice;
+        orderParams.tpPrice = ensureUnits(args.tpPrice, 30, "tpPrice");
     if (args.slSize)
-        orderParams.slSize = args.slSize;
+        orderParams.slSize = ensureUnits(args.slSize, baseDecimals, "slSize");
     if (args.slPrice)
-        orderParams.slPrice = args.slPrice;
+        orderParams.slPrice = ensureUnits(args.slPrice, 30, "slPrice");
     return client.order.createIncreaseOrder(orderParams, args.tradingFee, args.marketId);
 }
 /**
@@ -60,6 +69,15 @@ export async function closePosition(client, address, args) {
         throw new Error("direction is required (0=LONG, 1=SHORT), must match position direction.");
     }
     const dir = resolveDirection(args.direction);
+    // Fetch pool detail to get decimals
+    const poolResponse = await client.markets.getMarketDetail({ chainId, poolId: args.poolId });
+    const poolData = poolResponse?.data || (poolResponse?.marketId ? poolResponse : null);
+    if (!poolData) {
+        console.error(`[ERROR] poolResponse for ${args.poolId}:`, JSON.stringify(poolResponse, null, 2));
+        throw new Error(`Could not find pool metadata for ID: ${args.poolId}`);
+    }
+    const baseDecimals = poolData.baseDecimals || 18;
+    const quoteDecimals = poolData.quoteDecimals || 6;
     return client.order.createDecreaseOrder({
         chainId,
         address,
@@ -68,12 +86,12 @@ export async function closePosition(client, address, args) {
         orderType: args.orderType,
         triggerType: args.triggerType,
         direction: dir,
-        collateralAmount: args.collateralAmount,
-        size: args.size,
-        price: args.price,
+        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: args.slippagePct,
+        slippagePct: String(args.slippagePct),
         executionFeeToken,
         leverage: args.leverage,
     });
@@ -120,14 +138,18 @@ export async function adjustMargin(client, address, args) {
     if (!/^-?\d+$/.test(adjustAmount)) {
         throw new Error("adjustAmount must be an integer string in quote token raw units.");
     }
-    return client.position.adjustCollateral({
+    const params = {
         poolId: args.poolId,
         positionId: args.positionId,
         adjustAmount,
         quoteToken,
         chainId,
         address,
-    });
+    };
+    if (args.poolOracleType !== undefined) {
+        params.poolOracleType = Number(args.poolOracleType);
+    }
+    return client.position.adjustCollateral(params);
 }
 /**
  * 平掉所有仓位

package/dist/tools/accountTransfer.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
 import { normalizeAddress } from "../utils/address.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const accountDepositTool = {
     name: "account_deposit",
     description: "Deposit funds from wallet into the MYX trading account.",
@@ -10,15 +11,16 @@ export const accountDepositTool = {
     },
     handler: async (args) => {
         try {
-            const { client } = await resolveClient();
+            const { client, signer } = await resolveClient();
             const chainId = getChainId();
             const tokenAddress = normalizeAddress(args.tokenAddress, "tokenAddress");
-            const result = await client.account.deposit({
+            const raw = await client.account.deposit({
                 amount: args.amount,
                 tokenAddress,
                 chainId,
             });
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const data = await finalizeMutationResult(raw, signer, "account_deposit");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };
@@ -35,16 +37,17 @@ export const accountWithdrawTool = {
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
+            const { client, address, signer } = await resolveClient();
             const chainId = getChainId();
-            const result = await client.account.withdraw({
+            const raw = await client.account.withdraw({
                 chainId,
                 receiver: address,
                 amount: args.amount,
                 poolId: args.poolId,
                 isQuoteToken: args.isQuoteToken,
             });
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const data = await finalizeMutationResult(raw, signer, "account_withdraw");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/adjustMargin.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { adjustMargin as adjustMarginSvc } from "../services/tradeService.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const adjustMarginTool = {
     name: "adjust_margin",
     description: "Adjust the margin (collateral) of an open position.",
@@ -9,12 +10,14 @@ export const adjustMarginTool = {
         positionId: z.string().describe("Position ID"),
         adjustAmount: z.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"),
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
-            const tx = await adjustMarginSvc(client, address, args);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: tx }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const { client, address, signer } = await resolveClient();
+            const raw = await adjustMarginSvc(client, address, args);
+            const data = await finalizeMutationResult(raw, signer, "adjust_margin");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/cancelAllOrders.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const cancelAllOrdersTool = {
     name: "cancel_all_orders",
     description: "Cancel multiple open orders by orderIds.",
@@ -8,10 +9,11 @@ export const cancelAllOrdersTool = {
     },
     handler: async (args) => {
         try {
-            const { client } = await resolveClient();
+            const { client, signer } = await resolveClient();
             const chainId = getChainId();
             const orderIds = args.orderIds;
-            const result = await client.order.cancelAllOrders(orderIds, chainId);
+            const raw = await client.order.cancelAllOrders(orderIds, chainId);
+            const result = await finalizeMutationResult(raw, signer, "cancel_all_orders");
             return {
                 content: [{ type: "text", text: JSON.stringify({ status: "success", data: { cancelled: orderIds.length, orderIds, result } }, (_, v) => typeof v === "bigint" ? v.toString() : v, 2) }],
             };

package/dist/tools/cancelOrder.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { resolveClient, getChainId } from "../auth/resolveClient.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const cancelOrderTool = {
     name: "cancel_order",
     description: "Cancel an open order by its order ID.",
@@ -8,10 +9,11 @@ export const cancelOrderTool = {
     },
     handler: async (args) => {
         try {
-            const { client } = await resolveClient();
+            const { client, signer } = await resolveClient();
             const chainId = getChainId();
-            const result = await client.order.cancelOrder(args.orderId, chainId);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const raw = await client.order.cancelOrder(args.orderId, chainId);
+            const data = await finalizeMutationResult(raw, signer, "cancel_order");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/checkApproval.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { resolveClient, getChainId, getQuoteToken } from "../auth/resolveClient.js";
 import { normalizeAddress } from "../utils/address.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 const MAX_UINT256 = "115792089237316195423570985008687907853269984665640564039457584007913129639935";
 export const checkApprovalTool = {
     name: "check_approval",
@@ -13,18 +14,19 @@ export const checkApprovalTool = {
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
+            const { client, address, signer } = await resolveClient();
             const chainId = getChainId();
             const quoteToken = normalizeAddress(args.quoteToken || getQuoteToken(), "quoteToken");
             const needApproval = await client.utils.needsApproval(address, chainId, quoteToken, args.amount);
             if (needApproval && args.autoApprove) {
                 const approveAmount = args.approveMax ? MAX_UINT256 : args.amount;
-                await client.utils.approveAuthorization({
+                const raw = await client.utils.approveAuthorization({
                     chainId,
                     quoteAddress: quoteToken,
                     amount: approveAmount,
                 });
-                return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: { needApproval: true, approved: true, quoteToken, approvedAmount: approveAmount, approveMax: !!args.approveMax } }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+                const approval = await finalizeMutationResult(raw, signer, "approve_authorization");
+                return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: { needApproval: true, approved: true, quoteToken, approvedAmount: approveAmount, approveMax: !!args.approveMax, approval } }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
             }
             return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: { needApproval, approved: false, quoteToken } }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }

package/dist/tools/closeAllPositions.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { resolveClient, getChainId, getQuoteToken } from "../auth/resolveClient.js";
 import { getOraclePrice } from "../services/marketService.js";
 import { ensureUnits } from "../utils/units.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const closeAllPositionsTool = {
     name: "close_all_positions",
     description: "Emergency: close ALL open positions in a pool at once. Use for risk management.",
@@ -11,7 +12,7 @@ export const closeAllPositionsTool = {
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
+            const { client, address, signer } = await resolveClient();
             const chainId = getChainId();
             // 1) 先获取该池的所有持仓
             const posResult = await client.position.listPositions(address);
@@ -63,7 +64,8 @@ export const closeAllPositionsTool = {
                     leverage: pos.userLeverage ?? pos.leverage ?? 1,
                 };
             });
-            const result = await client.order.closeAllPositions(chainId, closeParams);
+            const raw = await client.order.closeAllPositions(chainId, closeParams);
+            const result = await finalizeMutationResult(raw, signer, "close_all_positions");
             return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: { closed: poolPositions.length, result } }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {

package/dist/tools/closePosition.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { closePosition as closePos } from "../services/tradeService.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const closePositionTool = {
     name: "close_position",
     description: "Create a decrease order using SDK-native parameters.",
@@ -10,20 +11,21 @@ export const closePositionTool = {
         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 raw units"),
-        size: z.string().regex(/^\d+$/).describe("Position size raw units"),
-        price: z.string().regex(/^\d+$/).describe("Price raw units (30 decimals)"),
+        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.string().regex(/^\d+$/).describe("Slippage with 4-dec precision raw units"),
+        slippagePct: z.union([z.string(), z.number()]).describe("Slippage in BPS (e.g. 100 = 1%)"),
         executionFeeToken: z.string().describe("Execution fee token address"),
         leverage: z.number().describe("Leverage"),
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
-            const tx = await closePos(client, address, args);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: tx }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            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) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/createPerpMarket.js

@@ -1,5 +1,7 @@
 import { z } from "zod";
 import { createPool } from "../services/poolService.js";
+import { resolveClient } from "../auth/resolveClient.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const createPerpMarketTool = {
     name: "create_perp_market",
     description: "Create a new perpetual contract pool on MYX. IMPORTANT: marketId cannot be randomly generated. It must be a valid 66-character config hash (0x...) tied to a supported quote token (like USDC). Use get_market_list to fetch an existing marketId if you don't have a specific newly allocated one.",
@@ -11,8 +13,10 @@ export const createPerpMarketTool = {
         try {
             if (!args.baseToken || !args.marketId)
                 throw new Error("baseToken and marketId are required.");
-            const result = await createPool(args.baseToken, args.marketId);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const { signer } = await resolveClient();
+            const raw = await createPool(args.baseToken, args.marketId);
+            const data = await finalizeMutationResult(raw, signer, "create_perp_market");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, 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

@@ -1,21 +1,95 @@
 import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { openPosition } from "../services/tradeService.js";
+import { finalizeMutationResult } from "../utils/mutationResult.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.",
     schema: {
         poolId: z.string().describe("Pool ID"),
-        positionId: z.string().describe("Position ID ('0' for new position)"),
+        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("Quote token raw units"),
-        size: z.string().regex(/^\d+$/).describe("Position size raw units"),
-        price: z.string().regex(/^\d+$/).describe("Price raw units (30 decimals)"),
+        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 with 4-dec precision raw units"),
+        slippagePct: z.string().regex(/^\d+$/).describe("Slippage in 4-decimal precision raw units"),
         executionFeeToken: z.string().describe("Execution fee token address"),
         leverage: z.number().describe("Leverage"),
         tpSize: z.string().regex(/^\d+$/).optional().describe("TP size raw units"),
@@ -27,9 +101,16 @@ export const executeTradeTool = {
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
-            const tx = await openPosition(client, address, args);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: tx }, (k, v) => typeof v === 'bigint' ? v.toString() : v) }] };
+            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 payload = { ...data, effect };
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: payload }, (k, v) => typeof v === 'bigint' ? v.toString() : v) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/manageLiquidity.js

@@ -1,5 +1,7 @@
 import { z } from "zod";
 import { quoteDeposit, quoteWithdraw, baseDeposit, baseWithdraw, getLpPrice, } from "../services/poolService.js";
+import { resolveClient } from "../auth/resolveClient.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const manageLiquidityTool = {
     name: "manage_liquidity",
     description: "Add or withdraw liquidity from a BASE or QUOTE pool.",
@@ -13,20 +15,22 @@ export const manageLiquidityTool = {
     },
     handler: async (args) => {
         try {
+            const { signer } = await resolveClient();
             const { action, poolType, poolId } = args;
             const { amount, slippage } = args;
-            let result;
+            let raw;
             if (poolType === "QUOTE") {
-                result = action === "deposit"
+                raw = action === "deposit"
                     ? await quoteDeposit(poolId, amount, slippage, args.chainId)
                     : await quoteWithdraw(poolId, amount, slippage, args.chainId);
             }
             else {
-                result = action === "deposit"
+                raw = action === "deposit"
                     ? await baseDeposit(poolId, amount, slippage, args.chainId)
                     : await baseWithdraw(poolId, amount, slippage, args.chainId);
             }
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const data = await finalizeMutationResult(raw, signer, "manage_liquidity");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/setTpSl.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { setPositionTpSl } from "../services/tradeService.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const setTpSlTool = {
     name: "set_tp_sl",
     description: "Create TP/SL order using SDK-native parameters.",
@@ -20,9 +21,10 @@ export const setTpSlTool = {
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
-            const tx = await setPositionTpSl(client, address, args);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: tx }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const { client, address, signer } = await resolveClient();
+            const raw = await setPositionTpSl(client, address, args);
+            const data = await finalizeMutationResult(raw, signer, "set_tp_sl");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/tools/updateOrderTpSl.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { resolveClient } from "../auth/resolveClient.js";
 import { updateOrderTpSl } from "../services/tradeService.js";
+import { finalizeMutationResult } from "../utils/mutationResult.js";
 export const updateOrderTpSlTool = {
     name: "update_order_tp_sl",
     description: "Update an existing take profit or stop loss order.",
@@ -19,9 +20,10 @@ export const updateOrderTpSlTool = {
     },
     handler: async (args) => {
         try {
-            const { client, address } = await resolveClient();
-            const result = await updateOrderTpSl(client, address, args);
-            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data: result }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
+            const { client, address, signer } = await resolveClient();
+            const raw = await updateOrderTpSl(client, address, args);
+            const data = await finalizeMutationResult(raw, signer, "update_order_tp_sl");
+            return { content: [{ type: "text", text: JSON.stringify({ status: "success", data }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) }] };
         }
         catch (error) {
             return { content: [{ type: "text", text: `Error: ${error.message}` }], isError: true };

package/dist/utils/mutationResult.js

@@ -0,0 +1,68 @@
+const TX_HASH_RE = /^0x[0-9a-fA-F]{64}$/;
+const TX_HASH_KEYS = new Set(["hash", "txHash", "transactionHash"]);
+function isObject(value) {
+    return !!value && typeof value === "object";
+}
+function findTxHashDeep(input, depth = 0) {
+    if (!isObject(input) || depth > 4)
+        return undefined;
+    for (const [key, value] of Object.entries(input)) {
+        if (TX_HASH_KEYS.has(key) && typeof value === "string" && TX_HASH_RE.test(value)) {
+            return value;
+        }
+    }
+    for (const value of Object.values(input)) {
+        if (Array.isArray(value)) {
+            for (const item of value) {
+                const found = findTxHashDeep(item, depth + 1);
+                if (found)
+                    return found;
+            }
+            continue;
+        }
+        const found = findTxHashDeep(value, depth + 1);
+        if (found)
+            return found;
+    }
+    return undefined;
+}
+function assertSdkCode(result, actionName) {
+    if (!isObject(result))
+        return;
+    if (!Object.prototype.hasOwnProperty.call(result, "code"))
+        return;
+    const code = Number(result.code);
+    if (!Number.isFinite(code)) {
+        throw new Error(`${actionName} failed: invalid SDK code.`);
+    }
+    if (code !== 0) {
+        const msg = result.msg ?? result.message ?? "unknown error";
+        throw new Error(`${actionName} failed: code=${code}, msg=${String(msg)}`);
+    }
+}
+export async function finalizeMutationResult(result, signer, actionName) {
+    assertSdkCode(result, actionName);
+    const txHash = findTxHashDeep(result);
+    if (!txHash) {
+        return { result };
+    }
+    const provider = signer?.provider;
+    if (!provider?.waitForTransaction) {
+        return { result, confirmation: { txHash, status: "submitted" } };
+    }
+    const receipt = await provider.waitForTransaction(txHash, 1, 120000);
+    if (!receipt) {
+        throw new Error(`${actionName} failed: tx not confirmed within timeout (${txHash}).`);
+    }
+    if (receipt.status !== 1) {
+        throw new Error(`${actionName} failed on-chain: tx reverted (${txHash}).`);
+    }
+    return {
+        result,
+        confirmation: {
+            txHash,
+            blockNumber: receipt.blockNumber,
+            status: receipt.status,
+        },
+    };
+}

package/package.json

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