@michaleffffff/mcp-trading-server 3.0.16 → 3.0.21

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## 3.0.21 - 2026-03-19
+
+### Fixed
+- Hardened `get_pool_metadata` funding-rate formatting:
+  - `fundingInfo.nextFundingRate` now preserves readable `%/秒` and `%/天` output for negative rates too.
+  - Regression coverage now asserts both numeric funding-rate views and display strings.
+
+### Changed
+- Refreshed operator-facing docs and prompts to match the latest trading safety behavior:
+  - `README.md` now documents Oracle-only execution, exact-approval defaults, base-size semantics, TP/SL semantic checks, and LP preview fail-close.
+  - `mcp_config_guide.md` now includes required `BROKER_ADDRESS` configuration and testnet `MYXBroker` references.
+  - `TOOL_EXAMPLES.md` now reflects fresh-Oracle execution, live-direction validation, human-price TP/SL parsing, and trading `slippagePct` conventions.
+  - `trading_best_practices` prompt now aligns with the current MCP safety constraints and testnet broker references.
+
+## 3.0.19 - 2026-03-19
+
+### Fixed
+- Refined `fundingInfo.nextFundingRate` formatting in `get_pool_metadata`:
+  - Displays percent per second as `%/秒`
+  - Displays derived percent per day as `%/天`
+  - Keeps raw integer and comma-separated views for audit/debug use
+
+## 3.0.18 - 2026-03-19
+
+### Fixed
+- Further improved `fundingInfo` / `ioTracker` readability in `get_pool_metadata`:
+  - `fundingInfo.nextEpochTime` now includes UTC timestamp and seconds-until-next-epoch.
+  - `fundingInfo.nextFundingRate` and `lastFundingFeeTracker` now include comma-separated raw views.
+  - `ioTracker` now includes derived notional-at-entry views based on `poolEntryPrice`.
+
+## 3.0.17 - 2026-03-19
+
+### Fixed
+- Improved precision handling for liquidity and pool read tools:
+  - `get_pool_metadata` now adds `poolInfoFormatted` for exchange rate, LP token price, LP supply, debt, collateral, reserves, and open interest.
+  - `get_lp_price` now returns both raw and human-readable formatted values.
+  - Added regression coverage to ensure formatted precision fields are present.
+
 ## 3.0.16 - 2026-03-18
 
 ### Fixed

package/README.md

@@ -6,10 +6,11 @@ A production-ready MCP (Model Context Protocol) server for deep integration with
 
 # Release Notes
 
-- **Current release: 3.0.16**
+- **Current release: 3.0.20**
 - **SDK baseline**: `@myx-trade/sdk@^1.0.2` compatibility completed.
 - **Refinement**: Consolidated 40+ specialized tools into ~26 high-level unified tools.
 - **Improved UX**: Enhanced AI parameter parsing, automated unit conversion, and structured error reporting.
+- **Safety refresh**: Docs and prompt guidance now reflect Oracle-only execution, exact-approval defaults, notional-based fee checks, TP/SL semantic validation, and LP preview fail-close behavior.
 - **Breaking changes**: Many low-level tools (e.g., `get_market_price`, `get_oracle_price`, `get_open_orders`) have been merged into unified counterparts.
 
 ---
@@ -20,6 +21,7 @@ A production-ready MCP (Model Context Protocol) server for deep integration with
 * **AI-First Design**: Automated Pool ID resolution and flexible unit handling (`human:` vs `raw:`).
 * **Deep Liquidity Support**: Tools for both traders and liquidity providers.
 * **Production Ready**: Robust error handling with actionable hints for LLMs.
+* **Precision-Aware Reads**: Pool and LP read tools expose human-readable formatted values alongside raw on-chain integers.
 * **Compliant**: Full Model Context Protocol (MCP) support.
 
 ---
@@ -30,13 +32,20 @@ Copy `.env.example` to `.env` and configure your trading wallet:
 
 ```bash
 PRIVATE_KEY=0x...
-RPC_URL=https://bsc-dataseed.bnbchain.org
-CHAIN_ID=56
+RPC_URL=https://your-testnet-or-mainnet-rpc
+CHAIN_ID=...
 BROKER_ADDRESS=0x...
 QUOTE_TOKEN_ADDRESS=0x...
-QUOTE_TOKEN_DECIMALS=18
+QUOTE_TOKEN_DECIMALS=...
 ```
 
+## Testnet `MYXBroker` Reference
+
+- Arbitrum test: `0x895C4ae2A22bB26851011d733A9355f663a1F939`
+- Linea test: `0x634EfDC9dC76D7AbF6E49279875a31B02E9891e2`
+
+Use the broker that matches your active RPC and chain configuration.
+
 ---
 
 # Core Tools Reference
@@ -76,6 +85,17 @@ QUOTE_TOKEN_DECIMALS=18
 
 ---
 
+# Safety Defaults
+
+- **Oracle-only execution**: trading paths now require a fresh Oracle price and reject stale / missing execution prices.
+- **Exact approvals by default**: local fallback flows now prefer exact approvals instead of implicit unlimited approval.
+- **Size semantics**: `size` always means base-asset quantity, not USD notional.
+- **Direction validation**: when a tool operates on an existing `positionId`, the supplied `direction` must match the live position.
+- **TP/SL semantics**: LONG requires `tpPrice > entryPrice` and `slPrice < entryPrice`; SHORT uses the inverse.
+- **LP safety**: LP preview failures are fail-close and no longer downgrade to `minAmountOut=0`.
+
+---
+
 # Tool Discovery
 
 When a client or LLM is unsure which tool to call:
@@ -110,6 +130,7 @@ Use these conventions when generating tool arguments:
 - `timeInForce`: SDK `v1.0.2` currently supports `IOC` only, so use `0` or `"IOC"`
 - `size`: base token quantity, not USD notional; expected order value is usually `collateralAmount * leverage`
 - `executionFeeToken`: must be a real token address; zero address is rejected. Use the pool `quoteToken`
+- `slippagePct`: trading tools use 4-decimal raw units where `100 = 1.00%` and `50 = 0.50%`
 - Human units: `"100"` means 100 USDC or 100 token units depending on field
 - Raw units: `"raw:1000000"` means exact on-chain integer units
 

package/TOOL_EXAMPLES.md

@@ -1,4 +1,4 @@
-# MYX MCP Tool Examples Handbook (v3.0.15)
+# MYX MCP Tool Examples Handbook (v3.0.20)
 
 This guide provides practical MCP payload examples for the current unified toolset.
 All examples use the MCP format:
@@ -7,6 +7,13 @@ All examples use the MCP format:
 { "name": "tool_name", "arguments": { "...": "..." } }
 ```
 
+## Environment Notes
+
+- Common testnet brokers:
+  - Arbitrum test: `0x895C4ae2A22bB26851011d733A9355f663a1F939`
+  - Linea test: `0x634EfDC9dC76D7AbF6E49279875a31B02E9891e2`
+- Keep `RPC_URL`, `CHAIN_ID`, and `BROKER_ADDRESS` on the same network.
+
 ---
 
 ## Discovery First
@@ -75,6 +82,8 @@ Recommended high-level entry tool.
 `marketId` is optional on `open_position_simple`. If supplied, it is validated against the market resolved from `poolId` or `keyword`.
 `size` is always the base-asset quantity, not the USD notional. For example, a 500 USD order at price 1200 implies `size ≈ 0.416666...`.
 `collateralAmount` remains required on `open_position_simple`; if omitted, MCP now returns an actionable suggestion instead of a generic parse error.
+If `price` is omitted, the tool uses a fresh Oracle price only; stale or unresolved execution prices are rejected.
+Auto-computed `tradingFee` follows notional semantics rather than raw collateral-only estimation.
 
 Raw-units example:
 
@@ -113,6 +122,7 @@ Low-level increase-order tool when you want full control.
 
 `timeInForce` should be `0` (or `"IOC"` in string form) for SDK `v1.0.2`.
 `executionFeeToken` must be a real token address; do not pass the zero address. Use the pool `quoteToken`.
+If `positionId` is supplied on increase flows, `direction` must remain consistent with the live position.
 
 ### `close_position`
 Close or reduce a position. Use `ALL` for a full close.
@@ -137,6 +147,8 @@ Close or reduce a position. Use `ALL` for a full close.
 }
 ```
 
+`direction` must match the live position. MCP now validates live direction before sending the close request.
+
 ### `manage_tp_sl`
 Create or update TP/SL on an open position.
 
@@ -154,6 +166,9 @@ Create or update TP/SL on an open position.
 }
 ```
 
+Plain integer prices such as `"2800"` are treated as human prices, not implicit raw 30-decimal values.
+For LONG positions, use `tpPrice > entryPrice` and `slPrice < entryPrice`. For SHORT positions, use the inverse.
+
 Delete both TP/SL orders:
 
 ```json
@@ -233,6 +248,8 @@ Unified pool detail, config, and liquidity info.
 }
 ```
 
+`get_pool_metadata` returns raw values in `poolInfo` and precision-safe human-readable values in `poolInfoFormatted`, including readable funding epoch timestamps, funding-rate `%/秒` and `%/天`, and IO notional-at-entry views.
+
 ### `get_kline`
 Read chart data. Use `limit: 1` for the latest bar.
 
@@ -282,6 +299,9 @@ Alias-friendly form also works:
 }
 ```
 
+LP preview failures now fail closed; the server no longer downgrades to `minAmountOut=0`.
+Oracle-backed LP pricing requires a fresh price snapshot before execution.
+
 ### `get_lp_price`
 Read LP NAV price for BASE or QUOTE side.
 
@@ -295,6 +315,8 @@ Read LP NAV price for BASE or QUOTE side.
 }
 ```
 
+`get_lp_price` returns both `raw` and `formatted` NAV price values.
+
 ### `get_my_lp_holdings`
 Read current LP balances across pools.
 
@@ -387,3 +409,5 @@ Read open positions, history, or both.
 4. Canonical enums are still preferred:
    `OPEN|HISTORY|ALL`, `BASE|QUOTE`, `LONG|SHORT`, `MARKET|LIMIT|STOP`.
 5. The server tolerates common lowercase and alias forms for better AI compatibility.
+6. Trading `slippagePct` uses 4-decimal raw units, so `100 = 1.00%` and `50 = 0.50%`.
+7. High-risk execution paths prefer fresh Oracle pricing, exact approval sizing, and fail-close behavior on missing previews or invalid units.

package/dist/prompts/tradingGuide.js

@@ -12,7 +12,7 @@ export const tradingGuidePrompt = {
                     content: {
                         type: "text",
                         text: `
-# MYX Trading MCP Best Practices (v3.0.12)
+# MYX Trading MCP Best Practices (v3.0.21)
 
 You are an expert crypto trader using the MYX Protocol. To ensure successful execution and safe handling of user funds, follow these patterns:
 
@@ -28,21 +28,27 @@ You are an expert crypto trader using the MYX Protocol. To ensure successful exe
 - **Consolidated Tools**: Many legacy tools have been merged. Always use the high-level versions (e.g., \`get_price\` instead of \`get_market_price\`).
 - **Discovery**: \`search_tools\` understands legacy names like \`get_open_orders\` and intent phrases like \`add base lp\`.
 - **Unit Prefixes**: Prefer \`human:\` for readable amounts (e.g., "100" USDC) and \`raw:\` for exact on-chain units.
-- **Slippage**: Default is 100 (1%). For volatile tokens, consider 200-300 (2-3%).
+- **Slippage**: Trading tools use 4-decimal raw units where \`100 = 1.00%\` and \`50 = 0.50%\`. Keep it tight unless the market is genuinely illiquid.
 - **Fees**: Use \`get_pool_metadata\` to view current fee tiers and pool configuration.
 - **LP Strategy**: Use \`get_my_lp_holdings\` to monitor liquidity positions. Naming follows \`mBASE.QUOTE\` (e.g., \`mBTC.USDC\`).
 - **Enum Tolerance**: The server tolerates common lowercase or alias inputs such as \`open\`, \`base\`, \`buy\`, and \`add\`, but canonical forms are still preferred in documentation.
+- **Oracle Safety**: Execution flows now require a fresh Oracle price. Do not fall back to stale ticker or user-supplied execution prices when the Oracle is unavailable.
+- **Approval Safety**: Local fallback flows prefer exact approval sizing. Do not assume unlimited approvals are necessary.
+- **Position Semantics**: \`size\` is BASE quantity, not USD notional. If a \`positionId\` is supplied, \`direction\` must match the live position.
+- **TP/SL Semantics**: LONG should use \`tpPrice > entryPrice\` and \`slPrice < entryPrice\`; SHORT uses the inverse. Plain integer strings like \`"65000"\` are treated as human prices, not implicit raw 30-decimal values.
+- **LP Safety**: LP execution requires a fresh price snapshot and preview success; do not continue after preview failure.
+
+## 3. Testnet Broker Reference
+- Arbitrum test: \`0x895C4ae2A22bB26851011d733A9355f663a1F939\`
+- Linea test: \`0x634EfDC9dC76D7AbF6E49279875a31B02E9891e2\`
+- Always keep \`RPC_URL\`, \`CHAIN_ID\`, and \`BROKER_ADDRESS\` on the same network.
 
 Current Session:
 - Wallet: ${address}
 - Chain ID: ${chainId}
 
-## 3. Self-Healing
+## 4. Self-Healing
 If a transaction reverts with a hex code, the server will attempt to decode it (e.g., "AccountInsufficientFreeAmount"). Error payloads now include structured \`code/hint/action\` fields; use them to provide concrete next steps.
-
-Current Session:
-- Wallet: ${address}
-- Chain ID: ${chainId}
 `
                     }
                 }

package/dist/server.js

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

package/dist/services/marketService.js

@@ -1,5 +1,6 @@
 import { getChainId } from "../auth/resolveClient.js";
 import { getMarketStateDesc } from "../utils/mappings.js";
+export const DEFAULT_ORACLE_MAX_AGE_SEC = Number(process.env.ORACLE_MAX_AGE_SEC ?? 90);
 function collectRows(input) {
     if (Array.isArray(input))
         return input.flatMap(collectRows);
@@ -92,6 +93,46 @@ export async function getOraclePrice(client, poolId, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
     return client.utils.getOraclePrice(poolId, chainId);
 }
+function parseOraclePublishTime(value, poolId) {
+    const text = String(value ?? "").trim();
+    if (!/^\d+$/.test(text)) {
+        throw new Error(`Oracle publishTime missing or invalid for poolId=${poolId}.`);
+    }
+    const parsed = BigInt(text);
+    if (parsed <= 0n) {
+        throw new Error(`Oracle publishTime must be positive for poolId=${poolId}.`);
+    }
+    return parsed;
+}
+export function assertOracleFreshness(publishTimeValue, poolId, maxAgeSec = DEFAULT_ORACLE_MAX_AGE_SEC) {
+    if (!Number.isFinite(maxAgeSec) || maxAgeSec <= 0) {
+        throw new Error(`Invalid oracle max age configuration: ${maxAgeSec}`);
+    }
+    const publishTime = parseOraclePublishTime(publishTimeValue, poolId);
+    const nowSec = BigInt(Math.floor(Date.now() / 1000));
+    const maxAge = BigInt(Math.floor(maxAgeSec));
+    if (publishTime > nowSec + 5n) {
+        throw new Error(`Oracle publishTime is in the future for poolId=${poolId}.`);
+    }
+    const age = nowSec - publishTime;
+    if (age > maxAge) {
+        throw new Error(`Oracle price expired for poolId=${poolId}: age=${age.toString()}s exceeds maxAge=${maxAge.toString()}s.`);
+    }
+    return publishTime;
+}
+export async function getFreshOraclePrice(client, poolId, chainIdOverride, maxAgeSec = DEFAULT_ORACLE_MAX_AGE_SEC) {
+    const oracle = await getOraclePrice(client, poolId, chainIdOverride);
+    const price = String(oracle?.price ?? "").trim();
+    if (!price) {
+        throw new Error(`Oracle price missing for poolId=${poolId}.`);
+    }
+    const publishTime = assertOracleFreshness(oracle?.publishTime, poolId, maxAgeSec);
+    return {
+        ...oracle,
+        price,
+        publishTime: publishTime.toString(),
+    };
+}
 export async function searchMarket(client, keyword, limit = 1000, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
     const normalizedKeyword = String(keyword ?? "").trim();

package/dist/services/poolService.js

@@ -1,10 +1,11 @@
 import { pool, quote, base } from "@myx-trade/sdk";
 import { getChainId, resolveClient } from "../auth/resolveClient.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
-import { ensureUnits } from "../utils/units.js";
+import { ensureUnits, parseUserUnits } from "../utils/units.js";
 import { normalizeAddress } from "../utils/address.js";
-import { Contract, parseUnits, MaxUint256 } from "ethers";
+import { Contract } from "ethers";
 import { logger } from "../utils/logger.js";
+import { assertOracleFreshness } from "./marketService.js";
 const LP_DECIMALS = 18;
 const POOL_MANAGER_BY_CHAIN = {
     421614: "0xf268D9FeD3Bd56fd9aBdb4FeEb993338613678A8",
@@ -202,10 +203,13 @@ async function buildOraclePricePayload(client, chainId, poolId, fallbackOracleTy
     if (!vaa || !vaa.startsWith("0x")) {
         throw new Error(`Oracle VAA unavailable for pool ${poolId}.`);
     }
-    const publishTime = toPositiveBigint(oracle?.publishTime) ?? BigInt(Math.floor(Date.now() / 1000));
+    const publishTime = assertOracleFreshness(oracle?.publishTime, poolId);
     const oracleType = Number.isFinite(Number(oracle?.oracleType)) ? Number(oracle.oracleType) : fallbackOracleType;
     const value = toPositiveBigint(oracle?.value) ?? 0n;
     const referencePrice30 = BigInt(ensureUnits(String(oracle?.price ?? "0"), 30, "oracle price"));
+    if (referencePrice30 <= 0n) {
+        throw new Error(`Oracle price must be positive for pool ${poolId}.`);
+    }
     return {
         prices: [[poolId, oracleType, publishTime, vaa]],
         value,
@@ -229,8 +233,7 @@ async function previewAmountOutForLiquidity(signer, chainId, poolId, poolType, a
         return toPositiveBigint(out) ?? 0n;
     }
     catch (error) {
-        logger.warn("LP preview call failed; fallback to minAmountOut=0.", extractErrorMessage(error));
-        return 0n;
+        throw new Error(`LP preview failed: ${extractErrorMessage(error)}`);
     }
 }
 async function executeLiquidityTxViaRouter(params) {
@@ -244,7 +247,7 @@ async function executeLiquidityTxViaRouter(params) {
     if (!Number.isFinite(decimals) || decimals < 0) {
         throw new Error(`Invalid decimals while preparing ${poolType} ${action} transaction.`);
     }
-    const amountIn = parseUnits(String(amount), decimals);
+    const amountIn = BigInt(parseUserUnits(String(amount), decimals, "amount"));
     if (amountIn <= 0n) {
         throw new Error(`Liquidity ${poolType.toLowerCase()} ${action} amount must be > 0.`);
     }
@@ -255,7 +258,7 @@ async function executeLiquidityTxViaRouter(params) {
         const allowance = toPositiveBigint(await tokenContract.allowance(address, addresses.router)) ?? 0n;
         if (allowance < amountIn) {
             logger.info(`[LP fallback] allowance insufficient for ${poolType} deposit, approving router. required=${amountIn.toString()}, current=${allowance.toString()}`);
-            const approveTx = await tokenContract.approve(addresses.router, MaxUint256);
+            const approveTx = await tokenContract.approve(addresses.router, amountIn);
             approvalTxHash = String(approveTx?.hash ?? "").trim() || null;
             const approveReceipt = await approveTx?.wait?.();
             if (approveReceipt && approveReceipt.status !== 1) {
@@ -351,10 +354,8 @@ async function resolvePositiveMarketPrice30(client, poolId, chainId) {
         return null;
     try {
         const oracle = await client.utils?.getOraclePrice?.(poolId, chainId);
-        const byValue = toPositiveBigint(oracle?.value);
+        assertOracleFreshness(oracle?.publishTime, poolId);
         const byPrice = toPositiveBigint(oracle?.price);
-        if (byValue)
-            return byValue;
         if (byPrice)
             return byPrice;
     }
@@ -481,80 +482,28 @@ export async function getLiquidityInfo(client, poolId, marketPrice, chainIdOverr
  */
 export async function quoteDeposit(poolId, amount, slippage, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
-    const txHashBefore = readLastMockTxHash();
-    try {
-        return await withMutedSdkAbiMismatchLogs(() => quote.deposit({ chainId, poolId, amount, slippage }));
-    }
-    catch (error) {
-        const message = extractErrorMessage(error);
-        const recovered = recoverSdkSubmittedTxHash(txHashBefore, message, { poolType: "QUOTE", action: "deposit" });
-        if (recovered)
-            return recovered;
-        if (!isAbiLengthMismatchError(message))
-            throw error;
-        logger.warn("quote.deposit hit SDK ABI mismatch; switching to explicit router path.");
-        return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "QUOTE", action: "deposit", amount, slippage });
-    }
+    return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "QUOTE", action: "deposit", amount, slippage });
 }
 /**
  * Quote 池 withdraw
  */
 export async function quoteWithdraw(poolId, amount, slippage, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
-    const txHashBefore = readLastMockTxHash();
-    try {
-        return await withMutedSdkAbiMismatchLogs(() => quote.withdraw({ chainId, poolId, amount, slippage }));
-    }
-    catch (error) {
-        const message = extractErrorMessage(error);
-        const recovered = recoverSdkSubmittedTxHash(txHashBefore, message, { poolType: "QUOTE", action: "withdraw" });
-        if (recovered)
-            return recovered;
-        if (!isAbiLengthMismatchError(message))
-            throw error;
-        logger.warn("quote.withdraw hit SDK ABI mismatch; switching to explicit router path.");
-        return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "QUOTE", action: "withdraw", amount, slippage });
-    }
+    return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "QUOTE", action: "withdraw", amount, slippage });
 }
 /**
  * Base 池 deposit
  */
 export async function baseDeposit(poolId, amount, slippage, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
-    const txHashBefore = readLastMockTxHash();
-    try {
-        return await withMutedSdkAbiMismatchLogs(() => base.deposit({ chainId, poolId, amount, slippage }));
-    }
-    catch (error) {
-        const message = extractErrorMessage(error);
-        const recovered = recoverSdkSubmittedTxHash(txHashBefore, message, { poolType: "BASE", action: "deposit" });
-        if (recovered)
-            return recovered;
-        if (!isAbiLengthMismatchError(message))
-            throw error;
-        logger.warn("base.deposit hit SDK ABI mismatch; switching to explicit router path.");
-        return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "BASE", action: "deposit", amount, slippage });
-    }
+    return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "BASE", action: "deposit", amount, slippage });
 }
 /**
  * Base 池 withdraw
  */
 export async function baseWithdraw(poolId, amount, slippage, chainIdOverride) {
     const chainId = chainIdOverride ?? getChainId();
-    const txHashBefore = readLastMockTxHash();
-    try {
-        return await withMutedSdkAbiMismatchLogs(() => base.withdraw({ chainId, poolId, amount, slippage }));
-    }
-    catch (error) {
-        const message = extractErrorMessage(error);
-        const recovered = recoverSdkSubmittedTxHash(txHashBefore, message, { poolType: "BASE", action: "withdraw" });
-        if (recovered)
-            return recovered;
-        if (!isAbiLengthMismatchError(message))
-            throw error;
-        logger.warn("base.withdraw hit SDK ABI mismatch; switching to explicit router path.");
-        return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "BASE", action: "withdraw", amount, slippage });
-    }
+    return executeLiquidityTxViaRouter({ chainId, poolId, poolType: "BASE", action: "withdraw", amount, slippage });
 }
 /**
  * 获取 LP 价格

package/dist/services/tradeService.js

@@ -7,6 +7,7 @@ import { normalizeSlippagePct4dp } from "../utils/slippage.js";
 import { finalizeMutationResult } from "../utils/mutationResult.js";
 import { extractErrorMessage } from "../utils/errorMessage.js";
 import { mapTimeInForce } from "../utils/mappings.js";
+import { getFreshOraclePrice } from "./marketService.js";
 function resolveDirection(direction) {
     if (typeof direction === "string") {
         const text = direction.trim().toUpperCase();
@@ -154,6 +155,37 @@ function validateIncreaseOrderEconomics(args) {
     const priceHuman = formatUnits(priceRawBig, 30);
     throw new Error(`Invalid size semantics: size is BASE quantity, not USD notional. collateralAmount*leverage implies ≈${targetHuman} quote, but size*price implies ≈${actualHuman} quote. At price ${priceHuman}, recommended size is ≈${recommendedSizeHuman}.`);
 }
+function countAdditionalExecutionOrders(args) {
+    let count = 1;
+    if (String(args.tpPrice ?? "").trim()) {
+        count += 1;
+    }
+    if (String(args.slPrice ?? "").trim()) {
+        count += 1;
+    }
+    return count;
+}
+async function getRequiredIncreaseSpendRaw(client, marketId, args, chainId) {
+    const collateralRaw = BigInt(args.collateralRaw);
+    const tradingFeeRaw = BigInt(args.tradingFeeRaw);
+    const executionOrderCount = countAdditionalExecutionOrders(args);
+    const networkFeeText = String(await client.utils.getNetworkFee(marketId, chainId) ?? "").trim();
+    if (!/^\d+$/.test(networkFeeText)) {
+        throw new Error(`Failed to resolve networkFee for marketId=${marketId}.`);
+    }
+    const baseNetworkFeeRaw = BigInt(networkFeeText);
+    if (baseNetworkFeeRaw <= 0n) {
+        throw new Error(`networkFee must be > 0 for marketId=${marketId}.`);
+    }
+    const networkFeeRaw = baseNetworkFeeRaw * BigInt(executionOrderCount);
+    return {
+        collateralRaw,
+        tradingFeeRaw,
+        networkFeeRaw,
+        executionOrderCount,
+        totalSpendRaw: collateralRaw + tradingFeeRaw + networkFeeRaw,
+    };
+}
 async function resolveDecimalsForUpdateOrder(client, chainId, marketId, poolIdHint) {
     let baseDecimals = 18;
     let quoteDecimals = getQuoteDecimals();
@@ -249,6 +281,18 @@ export async function openPosition(client, address, args) {
     const sizeRaw = ensureUnits(args.size, baseDecimals, "size", { allowImplicitRaw: false });
     const priceRaw = ensureUnits(args.price, 30, "price", { allowImplicitRaw: false });
     const tradingFeeRaw = ensureUnits(args.tradingFee, quoteDecimals, "tradingFee", { allowImplicitRaw: false });
+    const resolvedMarketId = String(args.marketId ?? poolData.marketId ?? "").trim();
+    if (!resolvedMarketId) {
+        throw new Error(`marketId is required to compute networkFee for poolId=${args.poolId}.`);
+    }
+    const spend = await getRequiredIncreaseSpendRaw(client, resolvedMarketId, {
+        collateralRaw,
+        tradingFeeRaw,
+        tpPrice: args.tpPrice,
+        tpSize: args.tpSize,
+        slPrice: args.slPrice,
+        slSize: args.slSize,
+    }, chainId);
     validateIncreaseOrderEconomics({
         collateralRaw,
         sizeRaw,
@@ -268,7 +312,7 @@ export async function openPosition(client, address, args) {
         marginBalanceRaw = toBigIntOrZero(marginInfo.data.freeMargin);
         walletBalanceRaw = toBigIntOrZero(marginInfo.data.walletBalance);
     }
-    const requiredRaw = BigInt(collateralRaw);
+    const requiredRaw = spend.totalSpendRaw;
     if (marginBalanceRaw < requiredRaw) {
         if (!allowAutoDeposit) {
             throw new Error(`Insufficient marginBalance (${marginBalanceRaw.toString()}) for required collateral (${requiredRaw.toString()}). ` +
@@ -459,9 +503,14 @@ export async function closeAllPositions(client, address) {
     const results = [];
     for (const pos of positions) {
         const dir = pos.direction === 0 ? Direction.LONG : Direction.SHORT;
-        // Get current price for slippage protection
-        const oracleData = await client.utils.getOraclePrice(pos.poolId, chainId);
-        const currentPrice30 = ensureUnits(oracleData.price, 30, "oracle price");
+        const marketDetailRes = await client.markets.getMarketDetail({ chainId, poolId: pos.poolId });
+        const marketDetail = marketDetailRes?.data || (marketDetailRes?.marketId ? marketDetailRes : null);
+        if (!marketDetail?.marketId) {
+            throw new Error(`Could not resolve market metadata for poolId=${pos.poolId}.`);
+        }
+        const baseDecimals = Number(marketDetail.baseDecimals ?? 18);
+        const oracleData = await getFreshOraclePrice(client, pos.poolId, chainId);
+        const currentPrice30 = ensureUnits(oracleData.price, 30, "oracle price", { allowImplicitRaw: false });
         // For LONG close (Decrease LONG): Price should be lower (e.g. 90% of current)
         // For SHORT close (Decrease SHORT): Price should be higher (e.g. 110% of current)
         // Here we use a safe 10% slippage price
@@ -472,7 +521,13 @@ export async function closeAllPositions(client, address) {
         else {
             slippagePrice30 = (BigInt(currentPrice30) * 110n) / 100n;
         }
-        const sizeWei = ensureUnits(pos.size, 18, "size");
+        const sizeInput = /^\d+$/.test(String(pos.sizeRaw ?? pos.positionSizeRaw ?? "").trim())
+            ? `raw:${String(pos.sizeRaw ?? pos.positionSizeRaw).trim()}`
+            : String(pos.size ?? pos.positionSize ?? "").trim();
+        if (!sizeInput) {
+            throw new Error(`Position size missing for positionId=${String(pos.positionId ?? "").trim()}.`);
+        }
+        const sizeWei = ensureUnits(sizeInput, baseDecimals, "size", { allowImplicitRaw: false });
         const res = await client.order.createDecreaseOrder({
             chainId,
             address,
@@ -485,7 +540,7 @@ export async function closeAllPositions(client, address) {
             size: sizeWei,
             price: slippagePrice30.toString(),
             postOnly: false,
-            slippagePct: "1000", // 10%
+            slippagePct: "100", // 1%
             executionFeeToken: getQuoteToken(),
             leverage: pos.userLeverage,
         });

package/dist/tools/accountTransfer.js

@@ -2,6 +2,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";
+import { fetchErc20Decimals } from "../utils/token.js";
 const MAX_UINT256 = "115792089237316195423570985008687907853269984665640564039457584007913129639935";
 function asBigintOrNull(value) {
     try {
@@ -52,11 +53,9 @@ export const accountDepositTool = {
             const chainId = getChainId();
             const tokenAddressInput = String(args.tokenAddress ?? "").trim() || getQuoteToken();
             const tokenAddress = normalizeAddress(tokenAddressInput, "tokenAddress");
-            // For deposit, we default to quote decimals (6) as it's the most common use case.
-            // ensureUnits handles 'raw:' prefix if absolute precision is needed.
             const { ensureUnits } = await import("../utils/units.js");
-            const { getQuoteDecimals } = await import("../auth/resolveClient.js");
-            const amount = ensureUnits(args.amount, getQuoteDecimals(), "amount", { allowImplicitRaw: false });
+            const tokenDecimals = await fetchErc20Decimals(signer.provider ?? signer, tokenAddress, "deposit token");
+            const amount = ensureUnits(args.amount, tokenDecimals, "amount", { allowImplicitRaw: false });
             let approval = null;
             const needApproval = await client.utils.needsApproval(address, chainId, tokenAddress, amount);
             if (needApproval) {
@@ -102,9 +101,17 @@ export const accountWithdrawTool = {
             const { client, address, signer } = await resolveClient();
             const chainId = getChainId();
             const { ensureUnits } = await import("../utils/units.js");
-            const { getQuoteDecimals } = await import("../auth/resolveClient.js");
-            // Assuming 18 decimals for base and quoteDecimals for quote
-            const decimals = args.isQuoteToken ? getQuoteDecimals() : 18;
+            const marketDetailRes = await client.markets.getMarketDetail({ chainId, poolId: args.poolId });
+            const marketDetail = marketDetailRes?.data || (marketDetailRes?.marketId ? marketDetailRes : null);
+            if (!marketDetail?.marketId) {
+                throw new Error(`Could not resolve market metadata for poolId=${args.poolId}.`);
+            }
+            const decimals = Number(Boolean(args.isQuoteToken)
+                ? marketDetail.quoteDecimals
+                : marketDetail.baseDecimals);
+            if (!Number.isFinite(decimals) || decimals < 0) {
+                throw new Error(`Invalid token decimals for withdraw on poolId=${args.poolId}.`);
+            }
             const amount = ensureUnits(args.amount, decimals, "amount", { allowImplicitRaw: false });
             const amountRaw = asBigintOrNull(amount);
             if (amountRaw === null || amountRaw <= 0n) {