@myx-trade/sdk 0.1.133 → 0.1.135

package/dist/index.d.mts

@@ -1438,8 +1438,10 @@ declare class Account {
     /**
      * get tradable amount
      */
-    getTradableAmount({ poolId }: {
+    getTradableAmount({ poolId, chainId, address }: {
         poolId: string;
+        chainId: number;
+        address: string;
     }): Promise<{
         code: number;
         data: {
@@ -1451,6 +1453,11 @@ declare class Account {
         code: number;
         data?: undefined;
     }>;
+    getAvailableMarginBalance({ poolId, chainId, address }: {
+        poolId: string;
+        chainId: number;
+        address: string;
+    }): Promise<bigint>;
     getTradeFlow(params: GetHistoryOrdersParams): Promise<{
         code: number;
         data: TradeFlowItem[];
@@ -1678,7 +1685,7 @@ declare class Order {
         message: any;
         data?: undefined;
     }>;
-    closeAllPositions(chainId: number, params: PlaceOrderParams[]): Promise<{
+    closeAllPositions(chainId: number, params: PlaceOrderParams[], tradingFee: string): Promise<{
         code: number;
         message: string;
         data: ApiResponse<any>;
@@ -1712,7 +1719,7 @@ declare class Order {
         timestamp?: undefined;
         receipt?: undefined;
     }>;
-    createDecreaseOrder(params: PlaceOrderParams): Promise<{
+    createDecreaseOrder(params: PlaceOrderParams, tradingFee: string): Promise<{
         code: number;
         message: string;
         data: ApiResponse<any>;

package/dist/index.d.ts

@@ -1438,8 +1438,10 @@ declare class Account {
     /**
      * get tradable amount
      */
-    getTradableAmount({ poolId }: {
+    getTradableAmount({ poolId, chainId, address }: {
         poolId: string;
+        chainId: number;
+        address: string;
     }): Promise<{
         code: number;
         data: {
@@ -1451,6 +1453,11 @@ declare class Account {
         code: number;
         data?: undefined;
     }>;
+    getAvailableMarginBalance({ poolId, chainId, address }: {
+        poolId: string;
+        chainId: number;
+        address: string;
+    }): Promise<bigint>;
     getTradeFlow(params: GetHistoryOrdersParams): Promise<{
         code: number;
         data: TradeFlowItem[];
@@ -1678,7 +1685,7 @@ declare class Order {
         message: any;
         data?: undefined;
     }>;
-    closeAllPositions(chainId: number, params: PlaceOrderParams[]): Promise<{
+    closeAllPositions(chainId: number, params: PlaceOrderParams[], tradingFee: string): Promise<{
         code: number;
         message: string;
         data: ApiResponse<any>;
@@ -1712,7 +1719,7 @@ declare class Order {
         timestamp?: undefined;
         receipt?: undefined;
     }>;
-    createDecreaseOrder(params: PlaceOrderParams): Promise<{
+    createDecreaseOrder(params: PlaceOrderParams, tradingFee: string): Promise<{
         code: number;
         message: string;
         data: ApiResponse<any>;

package/dist/index.js

@@ -1822,7 +1822,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.133",
+  version: "0.1.135",
   private: false,
   publishConfig: {
     access: "public"
@@ -12251,11 +12251,9 @@ var getLpPrice = async (chainId, poolId) => {
     const pool = await getPoolInfo(chainId, poolId);
     const contract = await getBasePoolContract(chainId);
     let price = 0n;
-    if (!(Number(pool?.state) === 0 /* Cook */ || Number(pool?.state) === 1 /* Primed */)) {
-      const res = await getPriceData(chainId, poolId);
-      if (res?.price) {
-        price = (0, import_ethers13.parseUnits)(res.price, COMMON_PRICE_DECIMALS);
-      }
+    const res = await getPriceData(chainId, poolId);
+    if (res?.price) {
+      price = (0, import_ethers13.parseUnits)(res.price, COMMON_PRICE_DECIMALS);
     }
     const data = await contract.getPoolTokenPrice(poolId, price);
     return data;
@@ -12618,11 +12616,9 @@ var getLpPrice2 = async (chainId, poolId) => {
     const pool = await getPoolInfo(chainId, poolId);
     const contract = await getQuotePoolContract(chainId);
     let price = 0n;
-    if (!(Number(pool?.state) === 0 /* Cook */ || Number(pool?.state) === 1 /* Primed */)) {
-      const res = await getPriceData(chainId, poolId);
-      if (res?.price) {
-        price = (0, import_ethers19.parseUnits)(res.price, COMMON_PRICE_DECIMALS);
-      }
+    const res = await getPriceData(chainId, poolId);
+    if (res?.price) {
+      price = (0, import_ethers19.parseUnits)(res.price, COMMON_PRICE_DECIMALS);
     }
     const data = await contract.getPoolTokenPrice(poolId, price);
     return data;
@@ -14311,15 +14307,7 @@ var Order = class {
         params.executionFeeToken,
         params.collateralAmount
       );
-      const marginAccountBalanceRes = await this.account.getTradableAmount({ poolId: params.poolId });
-      const marginAccountBalance = marginAccountBalanceRes?.data;
-      if (marginAccountBalanceRes.code !== 0) {
-        return {
-          code: -1,
-          message: "Failed to get tradable amount or wallet balance"
-        };
-      }
-      const availableAccountMarginBalance = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0) + (!marginAccountBalance?.tradeableProfit ? BigInt(marginAccountBalance?.tradeableProfit) : BigInt(0));
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
       const needAmount = BigInt(tradingFee) + BigInt(params.collateralAmount) + totalNetWorkFee;
       let depositAmount = BigInt(0);
       const diff = needAmount - availableAccountMarginBalance;
@@ -14492,17 +14480,20 @@ var Order = class {
       };
     }
   }
-  async closeAllPositions(chainId, params) {
+  async closeAllPositions(chainId, params, tradingFee) {
     try {
       const config = this.configManager.getConfig();
-      if (!config.signer) {
-        throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
-      }
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params[0].poolId, chainId, address: params[0].address });
       const networkFee = await this.utils.getNetworkFee(
         params[0].executionFeeToken,
         chainId
       );
-      const depositAmount = BigInt(params.length) * BigInt(networkFee);
+      const tradingFeeAmount = BigInt(tradingFee) * BigInt(params.length);
+      const needAmount = tradingFeeAmount + BigInt(params.length) * BigInt(networkFee);
+      let depositAmount = BigInt(0);
+      if (availableAccountMarginBalance < needAmount) {
+        depositAmount = needAmount - availableAccountMarginBalance;
+      }
       const needsApproval = await this.utils.needsApproval(
         chainId,
         params[0].executionFeeToken,
@@ -14579,6 +14570,9 @@ var Order = class {
           data: rs
         };
       }
+      if (!config.signer) {
+        throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
+      }
       const brokerContract = await getBrokerSingerContract(
         chainId,
         this.configManager.getConfig().brokerAddress
@@ -14623,17 +14617,19 @@ var Order = class {
       };
     }
   }
-  async createDecreaseOrder(params) {
+  async createDecreaseOrder(params, tradingFee) {
     try {
       const config = this.configManager.getConfig();
-      const brokerContract = await getBrokerSingerContract(
-        params.chainId,
-        this.configManager.getConfig().brokerAddress
-      );
       const networkFee = await this.utils.getNetworkFee(
         params.executionFeeToken,
         params.chainId
       );
+      let depositAmount = BigInt(0);
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
+      const needAmount = BigInt(tradingFee) + BigInt(networkFee);
+      if (availableAccountMarginBalance < needAmount) {
+        depositAmount = needAmount - availableAccountMarginBalance;
+      }
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -14656,12 +14652,12 @@ var Order = class {
       };
       const depositData = {
         token: params.executionFeeToken,
-        amount: networkFee
+        amount: depositAmount.toString()
       };
       const needsApproval = await this.utils.needsApproval(
         params.chainId,
         params.executionFeeToken,
-        networkFee.toString()
+        depositAmount.toString()
       );
       const authorized = this.configManager.getConfig().seamlessAccount?.authorized;
       const seamlessWallet = this.configManager.getConfig().seamlessAccount?.wallet;
@@ -14712,13 +14708,16 @@ var Order = class {
         };
         this.logger.info("create decrease order forward tx params --->", forwardTxParams);
         const rs = await this.seamless.forwarderTx(forwardTxParams, params.chainId, seamlessWallet);
-        console.log("rs-->", rs);
         return {
           code: 0,
           message: "create decrease order success",
           data: rs
         };
       }
+      const brokerContract = await getBrokerSingerContract(
+        params.chainId,
+        this.configManager.getConfig().brokerAddress
+      );
       if (!config.signer) {
         throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
       }
@@ -14734,16 +14733,12 @@ var Order = class {
       }
       let transaction;
       if (!params.positionId) {
-        const depositData2 = {
-          token: params.executionFeeToken,
-          amount: networkFee
-        };
         const positionId = 1;
         this.logger.info("createDecreaseOrder salt position params--->", [positionId, { data }]);
-        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), depositData2, data);
+        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), depositData, data);
         transaction = await brokerContract.placeOrderWithSalt(
           positionId.toString(),
-          depositData2,
+          depositData,
           data,
           {
             gasLimit: gasLimit * 130n / 100n
@@ -21017,24 +21012,16 @@ var Account = class {
   /**
    * get tradable amount
    */
-  async getTradableAmount({ poolId }) {
-    const config = this.configManager.getConfig();
-    if (!config.signer) {
-      throw new MyxSDKError(
-        "INVALID_SIGNER" /* InvalidSigner */,
-        "Invalid signer"
-      );
-    }
-    const contractAddress = getContractAddressByChainId(config.chainId);
-    const provider = await getJSONProvider(config.chainId);
+  async getTradableAmount({ poolId, chainId, address }) {
+    const contractAddress = getContractAddressByChainId(chainId);
+    const provider = await getJSONProvider(chainId);
     const accountContract = new import_ethers26.ethers.Contract(
       contractAddress.Account,
       Account_default,
       provider
     );
     try {
-      const targetAddress = config.seamlessMode ? config.seamlessAccount?.masterAddress : config.signer?.getAddress();
-      const assets = await accountContract.getTradableAmount(targetAddress, poolId);
+      const assets = await accountContract.getTradableAmount(address, poolId);
       const data = {
         profitIsReleased: assets[0],
         freeAmount: assets[1],
@@ -21050,6 +21037,18 @@ var Account = class {
       };
     }
   }
+  async getAvailableMarginBalance({ poolId, chainId, address }) {
+    const marginAccountBalanceRes = await this.getTradableAmount({ poolId, chainId, address });
+    const marginAccountBalance = marginAccountBalanceRes?.data;
+    if (marginAccountBalanceRes.code !== 0) {
+      throw new MyxSDKError(
+        "INSUFFICIENT_MARGIN_BALANCE" /* InsufficientMarginBalance */,
+        "Insufficient margin balance"
+      );
+    }
+    const availableAccountMarginBalance = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0) + (!marginAccountBalance?.tradeableProfit ? BigInt(marginAccountBalance?.tradeableProfit) : BigInt(0));
+    return availableAccountMarginBalance;
+  }
   async getTradeFlow(params) {
     const accessToken = await this.configManager.getAccessToken();
     if (!accessToken) {

package/dist/index.mjs

@@ -1732,7 +1732,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.133",
+  version: "0.1.135",
   private: false,
   publishConfig: {
     access: "public"
@@ -12161,11 +12161,9 @@ var getLpPrice = async (chainId, poolId) => {
     const pool = await getPoolInfo(chainId, poolId);
     const contract = await getBasePoolContract(chainId);
     let price = 0n;
-    if (!(Number(pool?.state) === 0 /* Cook */ || Number(pool?.state) === 1 /* Primed */)) {
-      const res = await getPriceData(chainId, poolId);
-      if (res?.price) {
-        price = parseUnits10(res.price, COMMON_PRICE_DECIMALS);
-      }
+    const res = await getPriceData(chainId, poolId);
+    if (res?.price) {
+      price = parseUnits10(res.price, COMMON_PRICE_DECIMALS);
     }
     const data = await contract.getPoolTokenPrice(poolId, price);
     return data;
@@ -12528,11 +12526,9 @@ var getLpPrice2 = async (chainId, poolId) => {
     const pool = await getPoolInfo(chainId, poolId);
     const contract = await getQuotePoolContract(chainId);
     let price = 0n;
-    if (!(Number(pool?.state) === 0 /* Cook */ || Number(pool?.state) === 1 /* Primed */)) {
-      const res = await getPriceData(chainId, poolId);
-      if (res?.price) {
-        price = parseUnits16(res.price, COMMON_PRICE_DECIMALS);
-      }
+    const res = await getPriceData(chainId, poolId);
+    if (res?.price) {
+      price = parseUnits16(res.price, COMMON_PRICE_DECIMALS);
     }
     const data = await contract.getPoolTokenPrice(poolId, price);
     return data;
@@ -14221,15 +14217,7 @@ var Order = class {
         params.executionFeeToken,
         params.collateralAmount
       );
-      const marginAccountBalanceRes = await this.account.getTradableAmount({ poolId: params.poolId });
-      const marginAccountBalance = marginAccountBalanceRes?.data;
-      if (marginAccountBalanceRes.code !== 0) {
-        return {
-          code: -1,
-          message: "Failed to get tradable amount or wallet balance"
-        };
-      }
-      const availableAccountMarginBalance = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0) + (!marginAccountBalance?.tradeableProfit ? BigInt(marginAccountBalance?.tradeableProfit) : BigInt(0));
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
       const needAmount = BigInt(tradingFee) + BigInt(params.collateralAmount) + totalNetWorkFee;
       let depositAmount = BigInt(0);
       const diff = needAmount - availableAccountMarginBalance;
@@ -14402,17 +14390,20 @@ var Order = class {
       };
     }
   }
-  async closeAllPositions(chainId, params) {
+  async closeAllPositions(chainId, params, tradingFee) {
     try {
       const config = this.configManager.getConfig();
-      if (!config.signer) {
-        throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
-      }
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params[0].poolId, chainId, address: params[0].address });
       const networkFee = await this.utils.getNetworkFee(
         params[0].executionFeeToken,
         chainId
       );
-      const depositAmount = BigInt(params.length) * BigInt(networkFee);
+      const tradingFeeAmount = BigInt(tradingFee) * BigInt(params.length);
+      const needAmount = tradingFeeAmount + BigInt(params.length) * BigInt(networkFee);
+      let depositAmount = BigInt(0);
+      if (availableAccountMarginBalance < needAmount) {
+        depositAmount = needAmount - availableAccountMarginBalance;
+      }
       const needsApproval = await this.utils.needsApproval(
         chainId,
         params[0].executionFeeToken,
@@ -14489,6 +14480,9 @@ var Order = class {
           data: rs
         };
       }
+      if (!config.signer) {
+        throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
+      }
       const brokerContract = await getBrokerSingerContract(
         chainId,
         this.configManager.getConfig().brokerAddress
@@ -14533,17 +14527,19 @@ var Order = class {
       };
     }
   }
-  async createDecreaseOrder(params) {
+  async createDecreaseOrder(params, tradingFee) {
     try {
       const config = this.configManager.getConfig();
-      const brokerContract = await getBrokerSingerContract(
-        params.chainId,
-        this.configManager.getConfig().brokerAddress
-      );
       const networkFee = await this.utils.getNetworkFee(
         params.executionFeeToken,
         params.chainId
       );
+      let depositAmount = BigInt(0);
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
+      const needAmount = BigInt(tradingFee) + BigInt(networkFee);
+      if (availableAccountMarginBalance < needAmount) {
+        depositAmount = needAmount - availableAccountMarginBalance;
+      }
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -14566,12 +14562,12 @@ var Order = class {
       };
       const depositData = {
         token: params.executionFeeToken,
-        amount: networkFee
+        amount: depositAmount.toString()
       };
       const needsApproval = await this.utils.needsApproval(
         params.chainId,
         params.executionFeeToken,
-        networkFee.toString()
+        depositAmount.toString()
       );
       const authorized = this.configManager.getConfig().seamlessAccount?.authorized;
       const seamlessWallet = this.configManager.getConfig().seamlessAccount?.wallet;
@@ -14622,13 +14618,16 @@ var Order = class {
         };
         this.logger.info("create decrease order forward tx params --->", forwardTxParams);
         const rs = await this.seamless.forwarderTx(forwardTxParams, params.chainId, seamlessWallet);
-        console.log("rs-->", rs);
         return {
           code: 0,
           message: "create decrease order success",
           data: rs
         };
       }
+      const brokerContract = await getBrokerSingerContract(
+        params.chainId,
+        this.configManager.getConfig().brokerAddress
+      );
       if (!config.signer) {
         throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
       }
@@ -14644,16 +14643,12 @@ var Order = class {
       }
       let transaction;
       if (!params.positionId) {
-        const depositData2 = {
-          token: params.executionFeeToken,
-          amount: networkFee
-        };
         const positionId = 1;
         this.logger.info("createDecreaseOrder salt position params--->", [positionId, { data }]);
-        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), depositData2, data);
+        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), depositData, data);
         transaction = await brokerContract.placeOrderWithSalt(
           positionId.toString(),
-          depositData2,
+          depositData,
           data,
           {
             gasLimit: gasLimit * 130n / 100n
@@ -20927,24 +20922,16 @@ var Account = class {
   /**
    * get tradable amount
    */
-  async getTradableAmount({ poolId }) {
-    const config = this.configManager.getConfig();
-    if (!config.signer) {
-      throw new MyxSDKError(
-        "INVALID_SIGNER" /* InvalidSigner */,
-        "Invalid signer"
-      );
-    }
-    const contractAddress = getContractAddressByChainId(config.chainId);
-    const provider = await getJSONProvider(config.chainId);
+  async getTradableAmount({ poolId, chainId, address }) {
+    const contractAddress = getContractAddressByChainId(chainId);
+    const provider = await getJSONProvider(chainId);
     const accountContract = new ethers8.Contract(
       contractAddress.Account,
       Account_default,
       provider
     );
     try {
-      const targetAddress = config.seamlessMode ? config.seamlessAccount?.masterAddress : config.signer?.getAddress();
-      const assets = await accountContract.getTradableAmount(targetAddress, poolId);
+      const assets = await accountContract.getTradableAmount(address, poolId);
       const data = {
         profitIsReleased: assets[0],
         freeAmount: assets[1],
@@ -20960,6 +20947,18 @@ var Account = class {
       };
     }
   }
+  async getAvailableMarginBalance({ poolId, chainId, address }) {
+    const marginAccountBalanceRes = await this.getTradableAmount({ poolId, chainId, address });
+    const marginAccountBalance = marginAccountBalanceRes?.data;
+    if (marginAccountBalanceRes.code !== 0) {
+      throw new MyxSDKError(
+        "INSUFFICIENT_MARGIN_BALANCE" /* InsufficientMarginBalance */,
+        "Insufficient margin balance"
+      );
+    }
+    const availableAccountMarginBalance = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0) + (!marginAccountBalance?.tradeableProfit ? BigInt(marginAccountBalance?.tradeableProfit) : BigInt(0));
+    return availableAccountMarginBalance;
+  }
   async getTradeFlow(params) {
     const accessToken = await this.configManager.getAccessToken();
     if (!accessToken) {

package/package.json

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