@myx-trade/sdk 0.1.156 → 0.1.159

package/dist/index.js

@@ -1821,7 +1821,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.156",
+  version: "0.1.159",
   private: false,
   publishConfig: {
     access: "public"
@@ -14374,19 +14374,12 @@ var Order = class {
       );
       const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
       const totalCollateralAmount = BigInt(params.collateralAmount) + BigInt(tradingFee);
-      this.logger.info("availableAccountMarginBalance-->", availableAccountMarginBalance.toString());
-      this.logger.info("totalCollateralAmount-->", totalCollateralAmount.toString());
-      this.logger.info("totalNetWorkFee-->", totalNetWorkFee.toString());
       const needAmount = BigInt(tradingFee) + BigInt(params.collateralAmount) + totalNetWorkFee;
-      this.logger.info("needAmount-->", needAmount.toString());
       let depositAmount = BigInt(0);
-      this.logger.info("availableAccountMarginBalance-->", availableAccountMarginBalance.toString());
       const diff = needAmount - availableAccountMarginBalance;
-      this.logger.info("diff-->", diff.toString());
       if (diff > BigInt(0)) {
         depositAmount = diff;
       }
-      this.logger.info("depositAmount-->", depositAmount.toString());
       const depositData = {
         token: params.executionFeeToken,
         amount: depositAmount.toString()
@@ -21033,6 +21026,13 @@ var Account_default = [
 
 // src/manager/account/index.ts
 var import_dayjs3 = __toESM(require("dayjs"));
+
+// src/api/pool/index.ts
+var getPoolList = async () => {
+  return http.get(`${baseUrl}/openapi/gateway/scan/market/list`);
+};
+
+// src/manager/account/index.ts
 var Account = class {
   constructor(configManager, logger, utils, client2) {
     this.configManager = configManager;
@@ -21090,16 +21090,53 @@ var Account = class {
     }
   }
   async getAvailableMarginBalance({ poolId, chainId, address }) {
-    const marginAccountBalanceRes = await this.getTradableAmount({ poolId, chainId, address });
-    const marginAccountBalance = marginAccountBalanceRes?.data;
-    if (marginAccountBalanceRes.code !== 0) {
+    try {
+      const poolListRes = await getPoolList();
+      if (poolListRes.code !== 0) {
+        throw new MyxSDKError(
+          "REQUEST_FAILED" /* RequestFailed */,
+          "Failed to get pool list"
+        );
+      }
+      const poolList = poolListRes.data;
+      const pool = poolList?.find((pool2) => pool2.poolId === poolId);
+      const orderRes = await this.client.order.getOrders();
+      if (orderRes.code !== 0) {
+        throw new MyxSDKError(
+          "REQUEST_FAILED" /* RequestFailed */,
+          "Failed to get orders"
+        );
+      }
+      const orders = orderRes.data;
+      const openOrders = orders?.filter((order) => order.poolId === poolId);
+      const used = openOrders?.reduce((acc, order) => {
+        const prev = BigInt(acc);
+        const curr = BigInt(order.collateralAmount ?? 0) + prev;
+        return curr.toString();
+      }, "0");
+      const marginAccountBalanceRes = await this.getAccountInfo(chainId, address, poolId);
+      if (marginAccountBalanceRes.code !== 0) {
+        throw new MyxSDKError(
+          "REQUEST_FAILED" /* RequestFailed */,
+          "Failed to get account info"
+        );
+      }
+      const marginAccountBalance = marginAccountBalanceRes.data;
+      const usedMargin = import_ethers26.ethers.parseUnits(used ?? "0", pool?.quoteDecimals ?? 6);
+      const quoteProfit = BigInt(marginAccountBalance.quoteProfit ?? 0);
+      const freeAmount = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0);
+      const accountMargin = freeAmount + quoteProfit;
+      if (accountMargin < usedMargin) {
+        return BigInt(0);
+      }
+      const availableAccountMarginBalance = accountMargin - usedMargin;
+      return availableAccountMarginBalance;
+    } catch (error) {
       throw new MyxSDKError(
-        "INSUFFICIENT_MARGIN_BALANCE" /* InsufficientMarginBalance */,
-        "Insufficient margin balance"
+        "REQUEST_FAILED" /* RequestFailed */,
+        "Failed to get orders"
       );
     }
-    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();
@@ -21470,6 +21507,8 @@ var Seamless = class {
       throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Signer is required for permit");
     }
     const masterAddress = await config.signer.getAddress();
+    const forwarderContract = await getForwarderContract(chainId);
+    const forwarderAddress = forwarderContract.target;
     const brokerAddress = config.brokerAddress;
     const contractAddress = getContractAddressByChainId(chainId);
     const erc20Contract = new import_ethers27.ethers.Contract(
@@ -21490,6 +21529,17 @@ var Seamless = class {
         deadline.toString(),
         chainId
       );
+      const forwarderSignPermit = await signPermit(
+        config.signer,
+        // 使用 signer 而不是 provider
+        erc20Contract,
+        masterAddress,
+        forwarderAddress,
+        import_ethers27.ethers.MaxUint256.toString(),
+        (nonces + 1).toString(),
+        deadline.toString(),
+        chainId
+      );
       const brokerSeamlessUSDPermitParams = {
         token: erc20Contract.target,
         owner: masterAddress,
@@ -21500,7 +21550,17 @@ var Seamless = class {
         r: brokerSignPermit.r,
         s: brokerSignPermit.s
       };
-      return [brokerSeamlessUSDPermitParams];
+      const forwarderPermitParams = {
+        token: erc20Contract.target,
+        owner: masterAddress,
+        spender: forwarderAddress,
+        value: import_ethers27.ethers.MaxUint256,
+        deadline,
+        v: forwarderSignPermit.v,
+        r: forwarderSignPermit.r,
+        s: forwarderSignPermit.s
+      };
+      return [brokerSeamlessUSDPermitParams, forwarderPermitParams];
     } catch (error) {
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key generated");
     }
@@ -21731,14 +21791,6 @@ var Seamless = class {
         wallet,
         authorized: isAuthorized
       });
-      const forwarderContract = await getForwarderContract(chainId);
-      const erc20Address = getContractAddressByChainId(chainId).ERC20;
-      await this.utils.approveAuthorization({
-        chainId,
-        quoteAddress: erc20Address,
-        amount: import_ethers27.ethers.MaxUint256.toString(),
-        spenderAddress: forwarderContract.target
-      });
       return {
         code: 0,
         data: {

package/dist/index.mjs

@@ -1731,7 +1731,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.156",
+  version: "0.1.159",
   private: false,
   publishConfig: {
     access: "public"
@@ -14284,19 +14284,12 @@ var Order = class {
       );
       const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
       const totalCollateralAmount = BigInt(params.collateralAmount) + BigInt(tradingFee);
-      this.logger.info("availableAccountMarginBalance-->", availableAccountMarginBalance.toString());
-      this.logger.info("totalCollateralAmount-->", totalCollateralAmount.toString());
-      this.logger.info("totalNetWorkFee-->", totalNetWorkFee.toString());
       const needAmount = BigInt(tradingFee) + BigInt(params.collateralAmount) + totalNetWorkFee;
-      this.logger.info("needAmount-->", needAmount.toString());
       let depositAmount = BigInt(0);
-      this.logger.info("availableAccountMarginBalance-->", availableAccountMarginBalance.toString());
       const diff = needAmount - availableAccountMarginBalance;
-      this.logger.info("diff-->", diff.toString());
       if (diff > BigInt(0)) {
         depositAmount = diff;
       }
-      this.logger.info("depositAmount-->", depositAmount.toString());
       const depositData = {
         token: params.executionFeeToken,
         amount: depositAmount.toString()
@@ -20943,6 +20936,13 @@ var Account_default = [
 
 // src/manager/account/index.ts
 import dayjs3 from "dayjs";
+
+// src/api/pool/index.ts
+var getPoolList = async () => {
+  return http.get(`${baseUrl}/openapi/gateway/scan/market/list`);
+};
+
+// src/manager/account/index.ts
 var Account = class {
   constructor(configManager, logger, utils, client2) {
     this.configManager = configManager;
@@ -21000,16 +21000,53 @@ var Account = class {
     }
   }
   async getAvailableMarginBalance({ poolId, chainId, address }) {
-    const marginAccountBalanceRes = await this.getTradableAmount({ poolId, chainId, address });
-    const marginAccountBalance = marginAccountBalanceRes?.data;
-    if (marginAccountBalanceRes.code !== 0) {
+    try {
+      const poolListRes = await getPoolList();
+      if (poolListRes.code !== 0) {
+        throw new MyxSDKError(
+          "REQUEST_FAILED" /* RequestFailed */,
+          "Failed to get pool list"
+        );
+      }
+      const poolList = poolListRes.data;
+      const pool = poolList?.find((pool2) => pool2.poolId === poolId);
+      const orderRes = await this.client.order.getOrders();
+      if (orderRes.code !== 0) {
+        throw new MyxSDKError(
+          "REQUEST_FAILED" /* RequestFailed */,
+          "Failed to get orders"
+        );
+      }
+      const orders = orderRes.data;
+      const openOrders = orders?.filter((order) => order.poolId === poolId);
+      const used = openOrders?.reduce((acc, order) => {
+        const prev = BigInt(acc);
+        const curr = BigInt(order.collateralAmount ?? 0) + prev;
+        return curr.toString();
+      }, "0");
+      const marginAccountBalanceRes = await this.getAccountInfo(chainId, address, poolId);
+      if (marginAccountBalanceRes.code !== 0) {
+        throw new MyxSDKError(
+          "REQUEST_FAILED" /* RequestFailed */,
+          "Failed to get account info"
+        );
+      }
+      const marginAccountBalance = marginAccountBalanceRes.data;
+      const usedMargin = ethers8.parseUnits(used ?? "0", pool?.quoteDecimals ?? 6);
+      const quoteProfit = BigInt(marginAccountBalance.quoteProfit ?? 0);
+      const freeAmount = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0);
+      const accountMargin = freeAmount + quoteProfit;
+      if (accountMargin < usedMargin) {
+        return BigInt(0);
+      }
+      const availableAccountMarginBalance = accountMargin - usedMargin;
+      return availableAccountMarginBalance;
+    } catch (error) {
       throw new MyxSDKError(
-        "INSUFFICIENT_MARGIN_BALANCE" /* InsufficientMarginBalance */,
-        "Insufficient margin balance"
+        "REQUEST_FAILED" /* RequestFailed */,
+        "Failed to get orders"
       );
     }
-    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();
@@ -21380,6 +21417,8 @@ var Seamless = class {
       throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Signer is required for permit");
     }
     const masterAddress = await config.signer.getAddress();
+    const forwarderContract = await getForwarderContract(chainId);
+    const forwarderAddress = forwarderContract.target;
     const brokerAddress = config.brokerAddress;
     const contractAddress = getContractAddressByChainId(chainId);
     const erc20Contract = new ethers9.Contract(
@@ -21400,6 +21439,17 @@ var Seamless = class {
         deadline.toString(),
         chainId
       );
+      const forwarderSignPermit = await signPermit(
+        config.signer,
+        // 使用 signer 而不是 provider
+        erc20Contract,
+        masterAddress,
+        forwarderAddress,
+        ethers9.MaxUint256.toString(),
+        (nonces + 1).toString(),
+        deadline.toString(),
+        chainId
+      );
       const brokerSeamlessUSDPermitParams = {
         token: erc20Contract.target,
         owner: masterAddress,
@@ -21410,7 +21460,17 @@ var Seamless = class {
         r: brokerSignPermit.r,
         s: brokerSignPermit.s
       };
-      return [brokerSeamlessUSDPermitParams];
+      const forwarderPermitParams = {
+        token: erc20Contract.target,
+        owner: masterAddress,
+        spender: forwarderAddress,
+        value: ethers9.MaxUint256,
+        deadline,
+        v: forwarderSignPermit.v,
+        r: forwarderSignPermit.r,
+        s: forwarderSignPermit.s
+      };
+      return [brokerSeamlessUSDPermitParams, forwarderPermitParams];
     } catch (error) {
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key generated");
     }
@@ -21641,14 +21701,6 @@ var Seamless = class {
         wallet,
         authorized: isAuthorized
       });
-      const forwarderContract = await getForwarderContract(chainId);
-      const erc20Address = getContractAddressByChainId(chainId).ERC20;
-      await this.utils.approveAuthorization({
-        chainId,
-        quoteAddress: erc20Address,
-        amount: ethers9.MaxUint256.toString(),
-        spenderAddress: forwarderContract.target
-      });
       return {
         code: 0,
         data: {

package/package.json

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