@myx-trade/sdk 0.1.170 → 0.1.174

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.170",
+  version: "0.1.174",
   private: false,
   publishConfig: {
     access: "public"
@@ -14400,18 +14400,23 @@ var Order = class {
         params.executionFeeToken,
         params.collateralAmount
       );
-      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
       const totalCollateralAmount = BigInt(params.collateralAmount) + BigInt(tradingFee);
-      const needAmount = BigInt(tradingFee) + BigInt(params.collateralAmount) + totalNetWorkFee;
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
+      this.logger.info("createIncreaseOrder availableAccountMarginBalance-->", availableAccountMarginBalance);
+      const needAmount = totalCollateralAmount + totalNetWorkFee;
+      this.logger.info("createIncreaseOrder needAmount-->", needAmount);
       let depositAmount = BigInt(0);
       const diff = needAmount - availableAccountMarginBalance;
+      this.logger.info("createIncreaseOrder diff-->", diff);
       if (diff > BigInt(0)) {
         depositAmount = diff;
       }
+      this.logger.info("createIncreaseOrder depositAmount-->", depositAmount);
       const depositData = {
         token: params.executionFeeToken,
         amount: depositAmount.toString()
       };
+      this.logger.info("createIncreaseOrder depositData-->", depositData);
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -14538,11 +14543,7 @@ var Order = class {
           }
         );
       }
-      this.logger.info("Transaction sent:", transaction.hash);
-      this.logger.info("Waiting for confirmation...");
       const receipt = await transaction.wait();
-      this.logger.info("Transaction confirmed in block:", receipt?.blockNumber);
-      this.logger.info("createIncreaseOrder receipt--->", receipt);
       const orderId = this.utils.getOrderIdFromTransaction(receipt);
       const result = {
         success: true,
@@ -14712,6 +14713,16 @@ var Order = class {
   async createDecreaseOrder(params) {
     try {
       const config = this.configManager.getConfig();
+      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(networkFee);
+      if (availableAccountMarginBalance < needAmount) {
+        depositAmount = needAmount - availableAccountMarginBalance;
+      }
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -14733,8 +14744,13 @@ var Order = class {
       };
       const depositData = {
         token: params.executionFeeToken,
-        amount: "0"
+        amount: depositAmount.toString()
       };
+      const needsApproval = await this.utils.needsApproval(
+        params.chainId,
+        params.executionFeeToken,
+        depositAmount.toString()
+      );
       const authorized = this.configManager.getConfig().seamlessAccount?.authorized;
       const seamlessWallet = this.configManager.getConfig().seamlessAccount?.wallet;
       if (config.seamlessMode && authorized && seamlessWallet) {
@@ -14786,11 +14802,20 @@ var Order = class {
         params.chainId,
         this.configManager.getConfig().brokerAddress
       );
-      console.log("data-->", data);
+      if (needsApproval) {
+        const approvalResult = await this.utils.approveAuthorization({
+          chainId: params.chainId,
+          quoteAddress: params.executionFeeToken,
+          amount: import_ethers24.ethers.MaxUint256.toString()
+        });
+        if (approvalResult.code !== 0) {
+          throw new Error(approvalResult.message);
+        }
+      }
       let transaction;
       if (!params.positionId) {
         const positionId = 1;
-        this.logger.info("createDecreaseOrder salt position params--->", [positionId, { data }]);
+        this.logger.info("createDecreaseOrder salt position params--->", [positionId, depositData, { data }]);
         const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), depositData, data);
         transaction = await brokerContract.placeOrderWithSalt(
           positionId.toString(),
@@ -14801,7 +14826,7 @@ var Order = class {
           }
         );
       } else {
-        this.logger.info("createDecreaseOrder nft position params--->", [params.positionId, { data }]);
+        this.logger.info("createDecreaseOrder nft position params--->", [params.positionId, depositData, { data }]);
         const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(params.positionId.toString(), depositData, data);
         transaction = await brokerContract.placeOrderWithPosition(
           params.positionId.toString(),
@@ -14812,11 +14837,7 @@ var Order = class {
           }
         );
       }
-      this.logger.info("Transaction sent:", transaction.hash);
-      this.logger.info("Waiting for confirmation...");
       const receipt = await transaction.wait();
-      this.logger.info("Transaction confirmed in block:", receipt?.blockNumber);
-      this.logger.info("createDecreaseOrder receipt--->", receipt);
       const orderId = this.utils.getOrderIdFromTransaction(receipt);
       const result = {
         success: true,
@@ -21149,15 +21170,20 @@ var Account = class {
           "Failed to get account info"
         );
       }
+      this.logger.info("getAvailableMarginBalance used-->", used);
       const marginAccountBalance = marginAccountBalanceRes.data;
       const usedMargin = BigInt(used ?? "0");
       const quoteProfit = BigInt(marginAccountBalance.quoteProfit ?? 0);
+      this.logger.info("getAvailableMarginBalance quoteProfit-->", quoteProfit.toString);
       const freeAmount = BigInt(marginAccountBalance?.freeMargin ?? 0);
+      this.logger.info("getAvailableMarginBalance freeAmount-->", freeAmount.toString());
       const accountMargin = freeAmount + quoteProfit;
+      this.logger.info("getAvailableMarginBalance accountMargin-->", accountMargin.toString());
       if (accountMargin < usedMargin) {
         return BigInt(0);
       }
       const availableAccountMarginBalance = accountMargin - usedMargin;
+      this.logger.info("getAvailableMarginBalance availableAccountMarginBalance-->", availableAccountMarginBalance.toString());
       return availableAccountMarginBalance;
     } catch (error) {
       this.logger.info("getAvailableMarginBalance error-->", error);

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.170",
+  version: "0.1.174",
   private: false,
   publishConfig: {
     access: "public"
@@ -14310,18 +14310,23 @@ var Order = class {
         params.executionFeeToken,
         params.collateralAmount
       );
-      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
       const totalCollateralAmount = BigInt(params.collateralAmount) + BigInt(tradingFee);
-      const needAmount = BigInt(tradingFee) + BigInt(params.collateralAmount) + totalNetWorkFee;
+      const availableAccountMarginBalance = await this.account.getAvailableMarginBalance({ poolId: params.poolId, chainId: params.chainId, address: params.address });
+      this.logger.info("createIncreaseOrder availableAccountMarginBalance-->", availableAccountMarginBalance);
+      const needAmount = totalCollateralAmount + totalNetWorkFee;
+      this.logger.info("createIncreaseOrder needAmount-->", needAmount);
       let depositAmount = BigInt(0);
       const diff = needAmount - availableAccountMarginBalance;
+      this.logger.info("createIncreaseOrder diff-->", diff);
       if (diff > BigInt(0)) {
         depositAmount = diff;
       }
+      this.logger.info("createIncreaseOrder depositAmount-->", depositAmount);
       const depositData = {
         token: params.executionFeeToken,
         amount: depositAmount.toString()
       };
+      this.logger.info("createIncreaseOrder depositData-->", depositData);
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -14448,11 +14453,7 @@ var Order = class {
           }
         );
       }
-      this.logger.info("Transaction sent:", transaction.hash);
-      this.logger.info("Waiting for confirmation...");
       const receipt = await transaction.wait();
-      this.logger.info("Transaction confirmed in block:", receipt?.blockNumber);
-      this.logger.info("createIncreaseOrder receipt--->", receipt);
       const orderId = this.utils.getOrderIdFromTransaction(receipt);
       const result = {
         success: true,
@@ -14622,6 +14623,16 @@ var Order = class {
   async createDecreaseOrder(params) {
     try {
       const config = this.configManager.getConfig();
+      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(networkFee);
+      if (availableAccountMarginBalance < needAmount) {
+        depositAmount = needAmount - availableAccountMarginBalance;
+      }
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -14643,8 +14654,13 @@ var Order = class {
       };
       const depositData = {
         token: params.executionFeeToken,
-        amount: "0"
+        amount: depositAmount.toString()
       };
+      const needsApproval = await this.utils.needsApproval(
+        params.chainId,
+        params.executionFeeToken,
+        depositAmount.toString()
+      );
       const authorized = this.configManager.getConfig().seamlessAccount?.authorized;
       const seamlessWallet = this.configManager.getConfig().seamlessAccount?.wallet;
       if (config.seamlessMode && authorized && seamlessWallet) {
@@ -14696,11 +14712,20 @@ var Order = class {
         params.chainId,
         this.configManager.getConfig().brokerAddress
       );
-      console.log("data-->", data);
+      if (needsApproval) {
+        const approvalResult = await this.utils.approveAuthorization({
+          chainId: params.chainId,
+          quoteAddress: params.executionFeeToken,
+          amount: ethers6.MaxUint256.toString()
+        });
+        if (approvalResult.code !== 0) {
+          throw new Error(approvalResult.message);
+        }
+      }
       let transaction;
       if (!params.positionId) {
         const positionId = 1;
-        this.logger.info("createDecreaseOrder salt position params--->", [positionId, { data }]);
+        this.logger.info("createDecreaseOrder salt position params--->", [positionId, depositData, { data }]);
         const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), depositData, data);
         transaction = await brokerContract.placeOrderWithSalt(
           positionId.toString(),
@@ -14711,7 +14736,7 @@ var Order = class {
           }
         );
       } else {
-        this.logger.info("createDecreaseOrder nft position params--->", [params.positionId, { data }]);
+        this.logger.info("createDecreaseOrder nft position params--->", [params.positionId, depositData, { data }]);
         const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(params.positionId.toString(), depositData, data);
         transaction = await brokerContract.placeOrderWithPosition(
           params.positionId.toString(),
@@ -14722,11 +14747,7 @@ var Order = class {
           }
         );
       }
-      this.logger.info("Transaction sent:", transaction.hash);
-      this.logger.info("Waiting for confirmation...");
       const receipt = await transaction.wait();
-      this.logger.info("Transaction confirmed in block:", receipt?.blockNumber);
-      this.logger.info("createDecreaseOrder receipt--->", receipt);
       const orderId = this.utils.getOrderIdFromTransaction(receipt);
       const result = {
         success: true,
@@ -21059,15 +21080,20 @@ var Account = class {
           "Failed to get account info"
         );
       }
+      this.logger.info("getAvailableMarginBalance used-->", used);
       const marginAccountBalance = marginAccountBalanceRes.data;
       const usedMargin = BigInt(used ?? "0");
       const quoteProfit = BigInt(marginAccountBalance.quoteProfit ?? 0);
+      this.logger.info("getAvailableMarginBalance quoteProfit-->", quoteProfit.toString);
       const freeAmount = BigInt(marginAccountBalance?.freeMargin ?? 0);
+      this.logger.info("getAvailableMarginBalance freeAmount-->", freeAmount.toString());
       const accountMargin = freeAmount + quoteProfit;
+      this.logger.info("getAvailableMarginBalance accountMargin-->", accountMargin.toString());
       if (accountMargin < usedMargin) {
         return BigInt(0);
       }
       const availableAccountMarginBalance = accountMargin - usedMargin;
+      this.logger.info("getAvailableMarginBalance availableAccountMarginBalance-->", availableAccountMarginBalance.toString());
       return availableAccountMarginBalance;
     } catch (error) {
       this.logger.info("getAvailableMarginBalance error-->", error);

package/package.json

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