@myx-trade/sdk 0.1.6 → 0.1.9

package/dist/index.d.mts

@@ -522,6 +522,8 @@ interface MarketDetailResponse {
     feedId: string;
     activeTime: number;
     capType: MarketCapType;
+    baseReserveRatio: string;
+    quoteReserveRatio: string;
 }
 
 declare class Address {
@@ -538,6 +540,7 @@ declare class Address {
 interface GetHistoryOrdersParams {
     limit?: number;
     chainId?: number;
+    poolId?: string;
 }
 declare enum OrderTypeEnum {
     Market = 0,
@@ -592,6 +595,9 @@ interface HistoryOrderItem {
     tradingFee: string;
     fundingFee: string;
     realizedPnl: string;
+    baseSymbol: string;
+    quoteSymbol: string;
+    leverage: number;
 }
 /**
  * Get history orders
@@ -614,6 +620,9 @@ interface PositionHistoryItem {
     openTime: number;
     closeTime: number;
     realizedPnl: string;
+    baseSymbol: string;
+    quoteSymbol: string;
+    leverage: number;
 }
 declare const getPositionHistory: ({ accessToken, ...params }: GetHistoryOrdersParams & AccessTokenRequest) => Promise<ApiResponse<PositionHistoryItem[]>>;
 /**
@@ -632,6 +641,9 @@ interface TradeFlowItem {
     afterCollateralAmount: string;
     txHash: string;
     txTime: number;
+    baseSymbol: string;
+    quoteSymbol: string;
+    leverage: number;
 }
 declare const getTradeFlow: ({ accessToken, ...params }: GetHistoryOrdersParams & AccessTokenRequest) => Promise<ApiResponse<TradeFlowItem[]>>;
 
@@ -1469,12 +1481,26 @@ declare class Account {
     private logger;
     private utils;
     constructor(configManager: ConfigManager, logger: Logger, utils: Utils);
+    getWalletQuoteTokenBalance(quoteAddress: string): Promise<{
+        code: number;
+        data: any;
+    }>;
     /**
      * get tradable amount
      */
     getTradableAmount({ poolId }: {
         poolId: string;
-    }): Promise<any>;
+    }): Promise<{
+        code: number;
+        data: {
+            profitIsReleased: any;
+            freeAmount: any;
+            tradeableProfit: any;
+        };
+    } | {
+        code: number;
+        data?: undefined;
+    }>;
     getTradeFlow(params: GetHistoryOrdersParams): Promise<{
         code: number;
         data: TradeFlowItem[];

package/dist/index.d.ts

@@ -522,6 +522,8 @@ interface MarketDetailResponse {
     feedId: string;
     activeTime: number;
     capType: MarketCapType;
+    baseReserveRatio: string;
+    quoteReserveRatio: string;
 }
 
 declare class Address {
@@ -538,6 +540,7 @@ declare class Address {
 interface GetHistoryOrdersParams {
     limit?: number;
     chainId?: number;
+    poolId?: string;
 }
 declare enum OrderTypeEnum {
     Market = 0,
@@ -592,6 +595,9 @@ interface HistoryOrderItem {
     tradingFee: string;
     fundingFee: string;
     realizedPnl: string;
+    baseSymbol: string;
+    quoteSymbol: string;
+    leverage: number;
 }
 /**
  * Get history orders
@@ -614,6 +620,9 @@ interface PositionHistoryItem {
     openTime: number;
     closeTime: number;
     realizedPnl: string;
+    baseSymbol: string;
+    quoteSymbol: string;
+    leverage: number;
 }
 declare const getPositionHistory: ({ accessToken, ...params }: GetHistoryOrdersParams & AccessTokenRequest) => Promise<ApiResponse<PositionHistoryItem[]>>;
 /**
@@ -632,6 +641,9 @@ interface TradeFlowItem {
     afterCollateralAmount: string;
     txHash: string;
     txTime: number;
+    baseSymbol: string;
+    quoteSymbol: string;
+    leverage: number;
 }
 declare const getTradeFlow: ({ accessToken, ...params }: GetHistoryOrdersParams & AccessTokenRequest) => Promise<ApiResponse<TradeFlowItem[]>>;
 
@@ -1469,12 +1481,26 @@ declare class Account {
     private logger;
     private utils;
     constructor(configManager: ConfigManager, logger: Logger, utils: Utils);
+    getWalletQuoteTokenBalance(quoteAddress: string): Promise<{
+        code: number;
+        data: any;
+    }>;
     /**
      * get tradable amount
      */
     getTradableAmount({ poolId }: {
         poolId: string;
-    }): Promise<any>;
+    }): Promise<{
+        code: number;
+        data: {
+            profitIsReleased: any;
+            freeAmount: any;
+            tradeableProfit: any;
+        };
+    } | {
+        code: number;
+        data?: undefined;
+    }>;
     getTradeFlow(params: GetHistoryOrdersParams): Promise<{
         code: number;
         data: TradeFlowItem[];

package/dist/index.js

@@ -62,7 +62,7 @@ __export(index_exports, {
   bigintAmountSlipperCalculator: () => bigintAmountSlipperCalculator,
   bigintTradingGasPriceWithRatio: () => bigintTradingGasPriceWithRatio,
   bigintTradingGasToRatioCalculator: () => bigintTradingGasToRatioCalculator,
-  formatUnits: () => import_ethers24.formatUnits,
+  formatUnits: () => import_ethers23.formatUnits,
   getAllTickers: () => getAllTickers,
   getAllowanceApproved: () => getAllowanceApproved,
   getBalanceOf: () => getBalanceOf,
@@ -86,7 +86,7 @@ __export(index_exports, {
   getTokenInfo: () => getTokenInfo,
   getTradeFlow: () => getTradeFlow,
   market: () => market_exports,
-  parseUnits: () => import_ethers24.parseUnits,
+  parseUnits: () => import_ethers23.parseUnits,
   pool: () => pool_exports,
   quote: () => quote_exports,
   removeFavorite: () => removeFavorite,
@@ -1827,7 +1827,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.6",
+  version: "0.1.9",
   private: false,
   publishConfig: {
     access: "public"
@@ -9615,6 +9615,7 @@ var import_wretch = __toESM(require("wretch"));
 var client = (0, import_wretch.default)();
 var buildQueryOptions = (url, params) => {
   if (params) {
+    params = JSON.parse(JSON.stringify(params));
     if (url.includes("?")) {
       return url + "&" + new URLSearchParams(params).toString();
     }
@@ -10872,7 +10873,6 @@ __export(pool_exports, {
 });
 
 // src/lp/pool/get.ts
-var import_ethers21 = require("ethers");
 var getMarketInfo = (chainId2) => {
   const marketId2 = Market[chainId2].marketId;
   return marketId2;
@@ -10892,7 +10892,7 @@ var getMarketPoolId = async ({
     const contract = await getPoolManagerContract(chainId2);
     const data = [marketId2, baseToken];
     const request = await contract.getMarketPool(marketId2, baseToken);
-    return request.poolId === import_ethers21.ZeroAddress || !request.poolId ? void 0 : request.poolId;
+    return request.poolId === "0x0000000000000000000000000000000000000000000000000000000000000000" || !request.poolId ? void 0 : request.poolId;
   } catch (error) {
     console.error(error);
     throw typeof error === "string" ? error : await getErrorTextFormError(error);
@@ -11062,7 +11062,7 @@ var cancelTpSl = async (params) => {
 };
 
 // src/common/tokenInfo.ts
-var import_ethers22 = require("ethers");
+var import_ethers21 = require("ethers");
 async function checkImageExists(url) {
   try {
     const res = await fetch(url, { method: "HEAD" });
@@ -11082,14 +11082,14 @@ var getTokenInfo = async (chainId2, tokenAddress, account) => {
       token.decimals(),
       token.totalSupply()
     ]);
-    const normalized = import_ethers22.ethers.getAddress(tokenAddress);
+    const normalized = import_ethers21.ethers.getAddress(tokenAddress);
     const iconUrl = `https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/${chainId2}/assets/${normalized}/logo.png`;
     const fallbackIcon = "";
     const icon = await checkImageExists(iconUrl) ? iconUrl : fallbackIcon;
     let balance;
     if (account) {
       const rawBalance = await token.balanceOf(account);
-      balance = Number(import_ethers22.ethers.formatUnits(rawBalance, decimals));
+      balance = Number(import_ethers21.ethers.formatUnits(rawBalance, decimals));
     }
     return {
       address: tokenAddress,
@@ -11097,7 +11097,7 @@ var getTokenInfo = async (chainId2, tokenAddress, account) => {
       symbol,
       decimals,
       icon,
-      totalSupply: Number(import_ethers22.ethers.formatUnits(totalSupply, decimals)),
+      totalSupply: Number(import_ethers21.ethers.formatUnits(totalSupply, decimals)),
       ...account ? { balance } : {}
     };
   } catch (e) {
@@ -11144,7 +11144,7 @@ var getOracleFee = async (chainId2, marketId2) => {
 };
 
 // src/lp/pool/reprime.ts
-var import_ethers23 = require("ethers");
+var import_ethers22 = require("ethers");
 var reprime = async (chainId2, poolId) => {
   try {
     await checkParams({ chainId: chainId2 });
@@ -11158,14 +11158,14 @@ var reprime = async (chainId2, poolId) => {
     if (!_amount) {
       throw new Error("Invalid Market");
     }
-    console.log(Number((0, import_ethers23.formatUnits)(_amount, pool.quoteDecimals)));
+    console.log(Number((0, import_ethers22.formatUnits)(_amount, pool.quoteDecimals)));
     await checkParams({
       tokenAddress: pool.quoteToken,
       contractAddress: address_default[chainId2].ORACLE_RESERVE,
       decimals: pool.quoteDecimals,
       account,
       chainId: chainId2,
-      amount: Number((0, import_ethers23.formatUnits)(_amount, pool.quoteDecimals))
+      amount: Number((0, import_ethers22.formatUnits)(_amount, pool.quoteDecimals))
     });
     const chainInfo = CHAIN_INFO[chainId2];
     const contract = await getPoolManagerContract(chainId2);
@@ -11215,7 +11215,7 @@ var TriggerType = /* @__PURE__ */ ((TriggerType3) => {
 })(TriggerType || {});
 
 // src/lp/index.ts
-var import_ethers24 = require("ethers");
+var import_ethers23 = require("ethers");
 
 // src/manager/subscription/websocket/socket.ts
 var import_mitt = __toESM(require("mitt"));
@@ -11425,7 +11425,7 @@ var MyxWebSocketClient = class {
    */
   connect() {
     return new Promise((resolve, reject) => {
-      if (this.ws?.readyState === WebSocket.OPEN) {
+      if (this.ws?.readyState === WebSocket.OPEN || this.ws?.readyState === WebSocket.CONNECTING) {
         resolve();
         return;
       }
@@ -11579,10 +11579,10 @@ var MyxWebSocketClient = class {
         "WebSocket is not connected"
       );
     }
-    if (this.ws.readyState !== WebSocket.OPEN) {
+    if (this.ws.readyState !== WebSocket.OPEN && this.ws.readyState !== WebSocket.CONNECTING) {
       this.reconnect();
     }
-    this.ws?.send(message);
+    this.ws.send(message);
   }
   /**
    * disconnect
@@ -11599,7 +11599,9 @@ var MyxWebSocketClient = class {
    */
   reconnect() {
     if (this.ws) {
-      this.ws.reconnect();
+      if (this.ws.readyState !== WebSocket.CONNECTING) {
+        this.ws.reconnect();
+      }
     } else {
       this.connect().catch((err) => {
         this.logger.error(err);
@@ -12218,7 +12220,7 @@ var getContractAddressByChainId = (chainId2) => {
 };
 
 // src/manager/position/index.ts
-var import_ethers25 = require("ethers");
+var import_ethers24 = require("ethers");
 var Position = class {
   constructor(configManager, logger, utils) {
     this.configManager = configManager;
@@ -12403,7 +12405,7 @@ var Position = class {
       }
       const updateParams = {
         poolId,
-        referencePrice: import_ethers25.ethers.parseUnits(priceData?.price ?? "0", 30),
+        referencePrice: import_ethers24.ethers.parseUnits(priceData?.price ?? "0", 30),
         oracleUpdateData: priceData?.vaa ?? "0",
         publishTime: priceData.publishTime
       };
@@ -12425,12 +12427,12 @@ var Position = class {
         if (needsApproval) {
           this.logger.debug("adjust collateral approve-->", {
             quoteToken,
-            amount: import_ethers25.ethers.MaxUint256.toString(),
+            amount: import_ethers24.ethers.MaxUint256.toString(),
             spenderAddress: contractAddress.POSITION_MANAGER
           });
           const approvalResult = await this.utils.approveAuthorization({
             quoteAddress: quoteToken,
-            amount: import_ethers25.ethers.MaxUint256.toString(),
+            amount: import_ethers24.ethers.MaxUint256.toString(),
             spenderAddress: contractAddress.POSITION_MANAGER
           });
           if (approvalResult.code !== 0) {
@@ -12992,7 +12994,8 @@ var Order = class {
         slPrice: params.slPrice,
         executionFeeToken: params.executionFeeToken,
         useOrderCollateral: true,
-        useAccountBalance: false
+        useAccountBalance: false,
+        paymentType: 0
       }
     };
     console.log(data);
@@ -13053,7 +13056,7 @@ var Order = class {
 };
 
 // src/manager/utils/index.ts
-var import_ethers26 = require("ethers");
+var import_ethers25 = require("ethers");
 
 // src/abi/Emiter.json
 var Emiter_default = [
@@ -16735,7 +16738,7 @@ var Utils = class {
     if (!receipt || !receipt.logs) {
       return null;
     }
-    const emiterInterface = new import_ethers26.ethers.Interface(Emiter_default);
+    const emiterInterface = new import_ethers25.ethers.Interface(Emiter_default);
     const orderPlacedEvent = Emiter_default.find(
       (item) => item.type === "event" && item.name === "OrderPlaced"
     );
@@ -16743,7 +16746,7 @@ var Utils = class {
       this.logger.error("OrderPlaced event not found in Emiter ABI");
       return null;
     }
-    const eventTopic = import_ethers26.ethers.id(
+    const eventTopic = import_ethers25.ethers.id(
       "OrderPlaced(address,address,bytes32,uint256,uint256,uint8,uint8,uint8,uint8,uint256,uint256,uint256,uint8,bool,uint16,address,uint256,uint16)"
     );
     this.logger.info("Looking for OrderPlaced events with topic:", eventTopic);
@@ -16787,7 +16790,7 @@ var Utils = class {
       const config = this.configManager.getConfig();
       const owner = await config.signer.getAddress();
       const spender = spenderAddress ?? getContractAddressByChainId(config.chainId).ORDER_MANAGER;
-      const tokenContract = new import_ethers26.ethers.Contract(
+      const tokenContract = new import_ethers25.ethers.Contract(
         quoteAddress,
         erc20Abi,
         config.signer
@@ -16809,8 +16812,8 @@ var Utils = class {
         spenderAddress
       );
       const currentAllowance = currentAllowanceRes.data;
-      const allowanceBigInt = import_ethers26.ethers.getBigInt(currentAllowance);
-      const requiredBigInt = import_ethers26.ethers.getBigInt(requiredAmount);
+      const allowanceBigInt = import_ethers25.ethers.getBigInt(currentAllowance);
+      const requiredBigInt = import_ethers25.ethers.getBigInt(requiredAmount);
       const needsApproval = allowanceBigInt < requiredBigInt;
       return needsApproval;
     } catch (error) {
@@ -16828,12 +16831,12 @@ var Utils = class {
         "function approve(address spender, uint256 amount) external returns (bool)"
       ];
       const config = this.configManager.getConfig();
-      const usdcContract = new import_ethers26.ethers.Contract(
+      const usdcContract = new import_ethers25.ethers.Contract(
         quoteAddress,
         erc20Abi,
         config.signer
       );
-      const approveAmount = amount ?? import_ethers26.ethers.MaxUint256;
+      const approveAmount = amount ?? import_ethers25.ethers.MaxUint256;
       const spender = spenderAddress ?? getContractAddressByChainId(config.chainId).ORDER_MANAGER;
       const tx = await usdcContract.approve(spender, approveAmount);
       await tx.wait();
@@ -16855,7 +16858,7 @@ var Utils = class {
     const orderManagerAddress = getContractAddressByChainId(
       config.chainId
     ).ORDER_MANAGER;
-    const orderManagerContract = new import_ethers26.ethers.Contract(
+    const orderManagerContract = new import_ethers25.ethers.Contract(
       orderManagerAddress,
       OrderManager_default,
       config.signer
@@ -16935,7 +16938,7 @@ var Utils = class {
 };
 
 // src/manager/account/index.ts
-var import_ethers27 = require("ethers");
+var import_ethers26 = require("ethers");
 
 // src/abi/Account.json
 var Account_default = [
@@ -17568,19 +17571,46 @@ var Account = class {
     this.logger = logger;
     this.utils = utils;
   }
+  async getWalletQuoteTokenBalance(quoteAddress) {
+    const config = this.configManager.getConfig();
+    const erc20Contract = new import_ethers26.ethers.Contract(
+      quoteAddress,
+      IERC20Metadata_default,
+      config.signer
+    );
+    const balance = await erc20Contract.balanceOf(config.signer.getAddress());
+    return {
+      code: 0,
+      data: balance
+    };
+  }
   /**
    * get tradable amount
    */
   async getTradableAmount({ poolId }) {
     const config = this.configManager.getConfig();
     const contractAddress = getContractAddressByChainId(config.chainId);
-    const accountContract = new import_ethers27.ethers.Contract(
+    const accountContract = new import_ethers26.ethers.Contract(
       contractAddress.Account,
       Account_default,
       config.signer
     );
-    const assets = await accountContract.getTradableAmount(config.signer.getAddress(), poolId);
-    return assets;
+    try {
+      const assets = await accountContract.getTradableAmount(config.signer.getAddress(), poolId);
+      const data = {
+        profitIsReleased: assets[0],
+        freeAmount: assets[1],
+        tradeableProfit: assets[2]
+      };
+      return {
+        code: 0,
+        data
+      };
+    } catch (error) {
+      return {
+        code: -1
+      };
+    }
   }
   async getTradeFlow(params) {
     const accessToken = await this.configManager.getAccessToken();
@@ -17599,7 +17629,7 @@ var Account = class {
 };
 
 // src/manager/index.ts
-var import_ethers28 = require("ethers");
+var import_ethers27 = require("ethers");
 var MyxClient = class {
   /**
    * 获取配置管理器（用于访问 accessToken 相关方法）
@@ -17620,7 +17650,7 @@ var MyxClient = class {
     this.subscription = new SubScription(this.configManager, this.logger);
     const lp = MxSDK.getInstance();
     if (options.walletClient?.transport) {
-      const provider = new import_ethers28.BrowserProvider(options.walletClient?.transport);
+      const provider = new import_ethers27.BrowserProvider(options.walletClient?.transport);
       if (provider) {
         lp.setProvider(provider);
       }

package/dist/index.mjs

@@ -1741,7 +1741,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.6",
+  version: "0.1.9",
   private: false,
   publishConfig: {
     access: "public"
@@ -9529,6 +9529,7 @@ import wretch from "wretch";
 var client = wretch();
 var buildQueryOptions = (url, params) => {
   if (params) {
+    params = JSON.parse(JSON.stringify(params));
     if (url.includes("?")) {
       return url + "&" + new URLSearchParams(params).toString();
     }
@@ -10786,7 +10787,6 @@ __export(pool_exports, {
 });
 
 // src/lp/pool/get.ts
-import { ZeroAddress as ZeroAddress3 } from "ethers";
 var getMarketInfo = (chainId2) => {
   const marketId2 = Market[chainId2].marketId;
   return marketId2;
@@ -10806,7 +10806,7 @@ var getMarketPoolId = async ({
     const contract = await getPoolManagerContract(chainId2);
     const data = [marketId2, baseToken];
     const request = await contract.getMarketPool(marketId2, baseToken);
-    return request.poolId === ZeroAddress3 || !request.poolId ? void 0 : request.poolId;
+    return request.poolId === "0x0000000000000000000000000000000000000000000000000000000000000000" || !request.poolId ? void 0 : request.poolId;
   } catch (error) {
     console.error(error);
     throw typeof error === "string" ? error : await getErrorTextFormError(error);
@@ -11339,7 +11339,7 @@ var MyxWebSocketClient = class {
    */
   connect() {
     return new Promise((resolve, reject) => {
-      if (this.ws?.readyState === WebSocket.OPEN) {
+      if (this.ws?.readyState === WebSocket.OPEN || this.ws?.readyState === WebSocket.CONNECTING) {
         resolve();
         return;
       }
@@ -11493,10 +11493,10 @@ var MyxWebSocketClient = class {
         "WebSocket is not connected"
       );
     }
-    if (this.ws.readyState !== WebSocket.OPEN) {
+    if (this.ws.readyState !== WebSocket.OPEN && this.ws.readyState !== WebSocket.CONNECTING) {
       this.reconnect();
     }
-    this.ws?.send(message);
+    this.ws.send(message);
   }
   /**
    * disconnect
@@ -11513,7 +11513,9 @@ var MyxWebSocketClient = class {
    */
   reconnect() {
     if (this.ws) {
-      this.ws.reconnect();
+      if (this.ws.readyState !== WebSocket.CONNECTING) {
+        this.ws.reconnect();
+      }
     } else {
       this.connect().catch((err) => {
         this.logger.error(err);
@@ -12906,7 +12908,8 @@ var Order = class {
         slPrice: params.slPrice,
         executionFeeToken: params.executionFeeToken,
         useOrderCollateral: true,
-        useAccountBalance: false
+        useAccountBalance: false,
+        paymentType: 0
       }
     };
     console.log(data);
@@ -17482,6 +17485,19 @@ var Account = class {
     this.logger = logger;
     this.utils = utils;
   }
+  async getWalletQuoteTokenBalance(quoteAddress) {
+    const config = this.configManager.getConfig();
+    const erc20Contract = new ethers7.Contract(
+      quoteAddress,
+      IERC20Metadata_default,
+      config.signer
+    );
+    const balance = await erc20Contract.balanceOf(config.signer.getAddress());
+    return {
+      code: 0,
+      data: balance
+    };
+  }
   /**
    * get tradable amount
    */
@@ -17493,8 +17509,22 @@ var Account = class {
       Account_default,
       config.signer
     );
-    const assets = await accountContract.getTradableAmount(config.signer.getAddress(), poolId);
-    return assets;
+    try {
+      const assets = await accountContract.getTradableAmount(config.signer.getAddress(), poolId);
+      const data = {
+        profitIsReleased: assets[0],
+        freeAmount: assets[1],
+        tradeableProfit: assets[2]
+      };
+      return {
+        code: 0,
+        data
+      };
+    } catch (error) {
+      return {
+        code: -1
+      };
+    }
   }
   async getTradeFlow(params) {
     const accessToken = await this.configManager.getAccessToken();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myx-trade/sdk",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "private": false,
   "publishConfig": {
     "access": "public"