@myx-trade/sdk 0.1.51 → 0.1.53

package/dist/index.d.mts

@@ -1422,11 +1422,68 @@ interface UpdateOrderParams {
     price: string;
 }
 
-declare class Order {
+declare class Account {
     private configManager;
     private logger;
     private utils;
     constructor(configManager: ConfigManager, logger: Logger, utils: Utils);
+    getWalletQuoteTokenBalance(): Promise<{
+        code: number;
+        data: any;
+    }>;
+    /**
+     * get tradable amount
+     */
+    getTradableAmount({ poolId }: {
+        poolId: string;
+    }): Promise<{
+        code: number;
+        data: {
+            profitIsReleased: any;
+            freeAmount: any;
+            tradeableProfit: any;
+        };
+    } | {
+        code: number;
+        data?: undefined;
+    }>;
+    getTradeFlow(params: GetHistoryOrdersParams): Promise<{
+        code: number;
+        data: TradeFlowItem[];
+    }>;
+    withdraw({ poolId, amount }: {
+        poolId: string;
+        amount: string;
+    }): Promise<{
+        code: number;
+        data: any;
+        message?: undefined;
+    } | {
+        code: number;
+        message: string;
+        data?: undefined;
+    }>;
+    deposit({ poolId, amount, tokenAddress }: {
+        poolId: string;
+        amount: string;
+        tokenAddress: string;
+    }): Promise<{
+        code: number;
+        data: any;
+        message?: undefined;
+    } | {
+        code: number;
+        message: string;
+        data?: undefined;
+    }>;
+}
+
+declare class Order {
+    private configManager;
+    private logger;
+    private utils;
+    private account;
+    constructor(configManager: ConfigManager, logger: Logger, utils: Utils, account: Account);
     createPositionId(poolId: string, user: Address$2, direction: Direction, salt: bigint): Promise<string>;
     createIncreaseOrder(params: PlaceOrderParams): Promise<{
         code: number;
@@ -1517,62 +1574,6 @@ declare class Order {
     }>;
 }
 
-declare class Account {
-    private configManager;
-    private logger;
-    private utils;
-    constructor(configManager: ConfigManager, logger: Logger, utils: Utils);
-    getWalletQuoteTokenBalance(): Promise<{
-        code: number;
-        data: any;
-    }>;
-    /**
-     * get tradable amount
-     */
-    getTradableAmount({ poolId }: {
-        poolId: string;
-    }): Promise<{
-        code: number;
-        data: {
-            profitIsReleased: any;
-            freeAmount: any;
-            tradeableProfit: any;
-        };
-    } | {
-        code: number;
-        data?: undefined;
-    }>;
-    getTradeFlow(params: GetHistoryOrdersParams): Promise<{
-        code: number;
-        data: TradeFlowItem[];
-    }>;
-    withdraw({ poolId, amount }: {
-        poolId: string;
-        amount: string;
-    }): Promise<{
-        code: number;
-        data: any;
-        message?: undefined;
-    } | {
-        code: number;
-        message: string;
-        data?: undefined;
-    }>;
-    deposit({ poolId, amount, tokenAddress }: {
-        poolId: string;
-        amount: string;
-        tokenAddress: string;
-    }): Promise<{
-        code: number;
-        data: any;
-        message?: undefined;
-    } | {
-        code: number;
-        message: string;
-        data?: undefined;
-    }>;
-}
-
 declare class MyxClient {
     /**
      * private properties

package/dist/index.d.ts

@@ -1422,11 +1422,68 @@ interface UpdateOrderParams {
     price: string;
 }
 
-declare class Order {
+declare class Account {
     private configManager;
     private logger;
     private utils;
     constructor(configManager: ConfigManager, logger: Logger, utils: Utils);
+    getWalletQuoteTokenBalance(): Promise<{
+        code: number;
+        data: any;
+    }>;
+    /**
+     * get tradable amount
+     */
+    getTradableAmount({ poolId }: {
+        poolId: string;
+    }): Promise<{
+        code: number;
+        data: {
+            profitIsReleased: any;
+            freeAmount: any;
+            tradeableProfit: any;
+        };
+    } | {
+        code: number;
+        data?: undefined;
+    }>;
+    getTradeFlow(params: GetHistoryOrdersParams): Promise<{
+        code: number;
+        data: TradeFlowItem[];
+    }>;
+    withdraw({ poolId, amount }: {
+        poolId: string;
+        amount: string;
+    }): Promise<{
+        code: number;
+        data: any;
+        message?: undefined;
+    } | {
+        code: number;
+        message: string;
+        data?: undefined;
+    }>;
+    deposit({ poolId, amount, tokenAddress }: {
+        poolId: string;
+        amount: string;
+        tokenAddress: string;
+    }): Promise<{
+        code: number;
+        data: any;
+        message?: undefined;
+    } | {
+        code: number;
+        message: string;
+        data?: undefined;
+    }>;
+}
+
+declare class Order {
+    private configManager;
+    private logger;
+    private utils;
+    private account;
+    constructor(configManager: ConfigManager, logger: Logger, utils: Utils, account: Account);
     createPositionId(poolId: string, user: Address$2, direction: Direction, salt: bigint): Promise<string>;
     createIncreaseOrder(params: PlaceOrderParams): Promise<{
         code: number;
@@ -1517,62 +1574,6 @@ declare class Order {
     }>;
 }
 
-declare class Account {
-    private configManager;
-    private logger;
-    private utils;
-    constructor(configManager: ConfigManager, logger: Logger, utils: Utils);
-    getWalletQuoteTokenBalance(): Promise<{
-        code: number;
-        data: any;
-    }>;
-    /**
-     * get tradable amount
-     */
-    getTradableAmount({ poolId }: {
-        poolId: string;
-    }): Promise<{
-        code: number;
-        data: {
-            profitIsReleased: any;
-            freeAmount: any;
-            tradeableProfit: any;
-        };
-    } | {
-        code: number;
-        data?: undefined;
-    }>;
-    getTradeFlow(params: GetHistoryOrdersParams): Promise<{
-        code: number;
-        data: TradeFlowItem[];
-    }>;
-    withdraw({ poolId, amount }: {
-        poolId: string;
-        amount: string;
-    }): Promise<{
-        code: number;
-        data: any;
-        message?: undefined;
-    } | {
-        code: number;
-        message: string;
-        data?: undefined;
-    }>;
-    deposit({ poolId, amount, tokenAddress }: {
-        poolId: string;
-        amount: string;
-        tokenAddress: string;
-    }): Promise<{
-        code: number;
-        data: any;
-        message?: undefined;
-    } | {
-        code: number;
-        message: string;
-        data?: undefined;
-    }>;
-}
-
 declare class MyxClient {
     /**
      * private properties

package/dist/index.js

@@ -1836,7 +1836,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.51",
+  version: "0.1.53",
   private: false,
   publishConfig: {
     access: "public"
@@ -13023,10 +13023,11 @@ var OrderStatus = {
 var import_ethers24 = require("ethers");
 var import_viem = require("viem");
 var Order = class {
-  constructor(configManager, logger, utils) {
+  constructor(configManager, logger, utils, account) {
     this.configManager = configManager;
     this.logger = logger;
     this.utils = utils;
+    this.account = account;
   }
   async createPositionId(poolId, user, direction, salt) {
     const encoded = (0, import_viem.encodeAbiParameters)((0, import_viem.parseAbiParameters)("bytes32 poolId, address user, uint8 direction, uint64 salt"), [
@@ -13063,6 +13064,26 @@ var Order = class {
           throw new Error(approvalResult.message);
         }
       }
+      const marginAccountBalanceRes = await this.account.getTradableAmount({ poolId: params.poolId });
+      const walletBalanceRes = await this.account.getWalletQuoteTokenBalance();
+      console.log("marginAccountBalance--->", marginAccountBalanceRes);
+      console.log("createIncreaseOrder walletBalance--->", walletBalanceRes);
+      const marginAccountBalance = marginAccountBalanceRes?.data;
+      const walletBalance = walletBalanceRes?.data;
+      if (marginAccountBalanceRes.code !== 0 || walletBalanceRes.code !== 0) {
+        return {
+          code: -1,
+          message: "Failed to get tradable amount or wallet balance"
+        };
+      }
+      let useAccountBalance = false;
+      const totalBalance = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0) + BigInt(marginAccountBalance?.tradeableProfit.toString() ?? 0);
+      let transferAmount = 0n;
+      if (totalBalance > 0) {
+        useAccountBalance = true;
+        transferAmount = collateralWithNetworkFee - totalBalance;
+      }
+      console.log("transferAmount-->", transferAmount);
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -13070,125 +13091,50 @@ var Order = class {
         triggerType: params.triggerType,
         operation: OperationType.INCREASE,
         direction: params.direction,
-        collateralAmount: collateralWithNetworkFee,
+        collateralAmount: collateralWithNetworkFee.toString(),
         size: params.size,
         price: params.price,
         timeInForce: TIME_IN_FORCE,
-        postOnly: params.postOnly,
-        slippagePct: params.slippagePct,
+        postOnly: params.postOnly ?? false,
+        slippagePct: params.slippagePct ?? "0",
         executionFeeToken: params.executionFeeToken,
-        leverage: params.leverage,
-        tpSize: params.tpSize ? params.tpSize : 0,
-        tpPrice: params.tpPrice ? params.tpPrice : 0,
-        slSize: params.slSize ? params.slSize : 0,
-        slPrice: params.slPrice ? params.slPrice : 0,
-        useAccountBalance: false
+        leverage: params.leverage ?? 0,
+        tpSize: params.tpSize ?? "0",
+        tpPrice: params.tpPrice ?? "0",
+        slSize: params.slSize ?? "0",
+        slPrice: params.slPrice ?? "0",
+        useAccountBalance
       };
-      this.logger.info("positionId", params.positionId);
       let transaction;
       if (!params.positionId) {
-        const positionId = 1;
-        this.logger.info("createIncreaseOrder salt position params--->", { ...data, positionId });
-        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), {
-          user: params.address,
-          poolId: params.poolId,
-          orderType: params.orderType,
-          triggerType: params.triggerType,
-          operation: OperationType.INCREASE,
-          direction: params.direction,
-          collateralAmount: collateralWithNetworkFee,
-          size: params.size,
-          price: params.price,
-          timeInForce: TIME_IN_FORCE,
-          postOnly: params.postOnly,
-          slippagePct: params.slippagePct,
-          executionFeeToken: params.executionFeeToken,
-          leverage: params.leverage,
-          tpSize: params.tpSize ? params.tpSize : 0,
-          tpPrice: params.tpPrice ? params.tpPrice : 0,
-          slSize: params.slSize ? params.slSize : 0,
-          slPrice: params.slPrice ? params.slPrice : 0,
-          useAccountBalance: false
-        });
+        const positionSalt = "1";
+        this.logger.info("createIncreaseOrder salt position params--->", { ...data, positionSalt });
+        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionSalt, data);
         transaction = await brokerContract.placeOrderWithSalt(
-          positionId.toString(),
-          {
-            user: params.address,
-            poolId: params.poolId,
-            orderType: params.orderType,
-            triggerType: params.triggerType,
-            operation: OperationType.INCREASE,
-            direction: params.direction,
-            collateralAmount: collateralWithNetworkFee,
-            size: params.size,
-            price: params.price,
-            timeInForce: TIME_IN_FORCE,
-            postOnly: params.postOnly,
-            slippagePct: params.slippagePct,
-            executionFeeToken: params.executionFeeToken,
-            leverage: params.leverage,
-            tpSize: params.tpSize ? params.tpSize : 0,
-            tpPrice: params.tpPrice ? params.tpPrice : 0,
-            slSize: params.slSize ? params.slSize : 0,
-            slPrice: params.slPrice ? params.slPrice : 0,
-            useAccountBalance: false
-          },
+          positionSalt,
+          data,
           {
             gasLimit: gasLimit * 120n / 100n
           }
         );
       } else {
         this.logger.info("createIncreaseOrder nft position params--->", { ...data, positionId: params.positionId });
-        const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(params.positionId.toString(), {
-          user: params.address,
-          poolId: params.poolId,
-          orderType: params.orderType,
-          triggerType: params.triggerType,
-          operation: OperationType.INCREASE,
-          direction: params.direction,
-          collateralAmount: collateralWithNetworkFee,
-          size: params.size,
-          price: params.price,
-          timeInForce: TIME_IN_FORCE,
-          postOnly: params.postOnly,
-          slippagePct: params.slippagePct,
-          executionFeeToken: params.executionFeeToken,
-          leverage: params.leverage,
-          tpSize: params.tpSize ? params.tpSize : 0,
-          tpPrice: params.tpPrice ? params.tpPrice : 0,
-          slSize: params.slSize ? params.slSize : 0,
-          slPrice: params.slPrice ? params.slPrice : 0,
-          useAccountBalance: false
-        });
+        const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(
+          params.positionId.toString(),
+          data
+        );
         transaction = await brokerContract.placeOrderWithPosition(
           params.positionId.toString(),
-          {
-            user: params.address,
-            poolId: params.poolId,
-            orderType: params.orderType,
-            triggerType: params.triggerType,
-            operation: OperationType.INCREASE,
-            direction: params.direction,
-            collateralAmount: collateralWithNetworkFee,
-            size: params.size,
-            price: params.price,
-            timeInForce: TIME_IN_FORCE,
-            postOnly: params.postOnly,
-            slippagePct: params.slippagePct,
-            executionFeeToken: params.executionFeeToken,
-            leverage: params.leverage,
-            tpSize: params.tpSize ? params.tpSize : 0,
-            tpPrice: params.tpPrice ? params.tpPrice : 0,
-            slSize: params.slSize ? params.slSize : 0,
-            slPrice: params.slPrice ? params.slPrice : 0,
-            useAccountBalance: false
-          },
+          data,
           {
             gasLimit: gasLimit * 120n / 100n
           }
         );
       }
+      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 = {
@@ -19113,10 +19059,10 @@ var MyxClient = class {
       logLevel: options.logLevel
     });
     this.utils = new Utils(this.configManager, this.logger);
+    this.account = new Account(this.configManager, this.logger, this.utils);
     this.markets = new Markets(this.configManager, this.utils);
     this.position = new Position(this.configManager, this.logger, this.utils);
-    this.order = new Order(this.configManager, this.logger, this.utils);
-    this.account = new Account(this.configManager, this.logger, this.utils);
+    this.order = new Order(this.configManager, this.logger, this.utils, this.account);
     this.subscription = new SubScription(this.configManager, this.logger);
     const lp = MxSDK.getInstance();
     lp.setConfigManager(this.configManager);

package/dist/index.mjs

@@ -1751,7 +1751,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.51",
+  version: "0.1.53",
   private: false,
   publishConfig: {
     access: "public"
@@ -12938,10 +12938,11 @@ var OrderStatus = {
 import { ethers as ethers6, keccak256 } from "ethers";
 import { encodeAbiParameters, parseAbiParameters } from "viem";
 var Order = class {
-  constructor(configManager, logger, utils) {
+  constructor(configManager, logger, utils, account) {
     this.configManager = configManager;
     this.logger = logger;
     this.utils = utils;
+    this.account = account;
   }
   async createPositionId(poolId, user, direction, salt) {
     const encoded = encodeAbiParameters(parseAbiParameters("bytes32 poolId, address user, uint8 direction, uint64 salt"), [
@@ -12978,6 +12979,26 @@ var Order = class {
           throw new Error(approvalResult.message);
         }
       }
+      const marginAccountBalanceRes = await this.account.getTradableAmount({ poolId: params.poolId });
+      const walletBalanceRes = await this.account.getWalletQuoteTokenBalance();
+      console.log("marginAccountBalance--->", marginAccountBalanceRes);
+      console.log("createIncreaseOrder walletBalance--->", walletBalanceRes);
+      const marginAccountBalance = marginAccountBalanceRes?.data;
+      const walletBalance = walletBalanceRes?.data;
+      if (marginAccountBalanceRes.code !== 0 || walletBalanceRes.code !== 0) {
+        return {
+          code: -1,
+          message: "Failed to get tradable amount or wallet balance"
+        };
+      }
+      let useAccountBalance = false;
+      const totalBalance = BigInt(marginAccountBalance?.freeAmount.toString() ?? 0) + BigInt(marginAccountBalance?.tradeableProfit.toString() ?? 0);
+      let transferAmount = 0n;
+      if (totalBalance > 0) {
+        useAccountBalance = true;
+        transferAmount = collateralWithNetworkFee - totalBalance;
+      }
+      console.log("transferAmount-->", transferAmount);
       const data = {
         user: params.address,
         poolId: params.poolId,
@@ -12985,125 +13006,50 @@ var Order = class {
         triggerType: params.triggerType,
         operation: OperationType.INCREASE,
         direction: params.direction,
-        collateralAmount: collateralWithNetworkFee,
+        collateralAmount: collateralWithNetworkFee.toString(),
         size: params.size,
         price: params.price,
         timeInForce: TIME_IN_FORCE,
-        postOnly: params.postOnly,
-        slippagePct: params.slippagePct,
+        postOnly: params.postOnly ?? false,
+        slippagePct: params.slippagePct ?? "0",
         executionFeeToken: params.executionFeeToken,
-        leverage: params.leverage,
-        tpSize: params.tpSize ? params.tpSize : 0,
-        tpPrice: params.tpPrice ? params.tpPrice : 0,
-        slSize: params.slSize ? params.slSize : 0,
-        slPrice: params.slPrice ? params.slPrice : 0,
-        useAccountBalance: false
+        leverage: params.leverage ?? 0,
+        tpSize: params.tpSize ?? "0",
+        tpPrice: params.tpPrice ?? "0",
+        slSize: params.slSize ?? "0",
+        slPrice: params.slPrice ?? "0",
+        useAccountBalance
       };
-      this.logger.info("positionId", params.positionId);
       let transaction;
       if (!params.positionId) {
-        const positionId = 1;
-        this.logger.info("createIncreaseOrder salt position params--->", { ...data, positionId });
-        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), {
-          user: params.address,
-          poolId: params.poolId,
-          orderType: params.orderType,
-          triggerType: params.triggerType,
-          operation: OperationType.INCREASE,
-          direction: params.direction,
-          collateralAmount: collateralWithNetworkFee,
-          size: params.size,
-          price: params.price,
-          timeInForce: TIME_IN_FORCE,
-          postOnly: params.postOnly,
-          slippagePct: params.slippagePct,
-          executionFeeToken: params.executionFeeToken,
-          leverage: params.leverage,
-          tpSize: params.tpSize ? params.tpSize : 0,
-          tpPrice: params.tpPrice ? params.tpPrice : 0,
-          slSize: params.slSize ? params.slSize : 0,
-          slPrice: params.slPrice ? params.slPrice : 0,
-          useAccountBalance: false
-        });
+        const positionSalt = "1";
+        this.logger.info("createIncreaseOrder salt position params--->", { ...data, positionSalt });
+        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionSalt, data);
         transaction = await brokerContract.placeOrderWithSalt(
-          positionId.toString(),
-          {
-            user: params.address,
-            poolId: params.poolId,
-            orderType: params.orderType,
-            triggerType: params.triggerType,
-            operation: OperationType.INCREASE,
-            direction: params.direction,
-            collateralAmount: collateralWithNetworkFee,
-            size: params.size,
-            price: params.price,
-            timeInForce: TIME_IN_FORCE,
-            postOnly: params.postOnly,
-            slippagePct: params.slippagePct,
-            executionFeeToken: params.executionFeeToken,
-            leverage: params.leverage,
-            tpSize: params.tpSize ? params.tpSize : 0,
-            tpPrice: params.tpPrice ? params.tpPrice : 0,
-            slSize: params.slSize ? params.slSize : 0,
-            slPrice: params.slPrice ? params.slPrice : 0,
-            useAccountBalance: false
-          },
+          positionSalt,
+          data,
           {
             gasLimit: gasLimit * 120n / 100n
           }
         );
       } else {
         this.logger.info("createIncreaseOrder nft position params--->", { ...data, positionId: params.positionId });
-        const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(params.positionId.toString(), {
-          user: params.address,
-          poolId: params.poolId,
-          orderType: params.orderType,
-          triggerType: params.triggerType,
-          operation: OperationType.INCREASE,
-          direction: params.direction,
-          collateralAmount: collateralWithNetworkFee,
-          size: params.size,
-          price: params.price,
-          timeInForce: TIME_IN_FORCE,
-          postOnly: params.postOnly,
-          slippagePct: params.slippagePct,
-          executionFeeToken: params.executionFeeToken,
-          leverage: params.leverage,
-          tpSize: params.tpSize ? params.tpSize : 0,
-          tpPrice: params.tpPrice ? params.tpPrice : 0,
-          slSize: params.slSize ? params.slSize : 0,
-          slPrice: params.slPrice ? params.slPrice : 0,
-          useAccountBalance: false
-        });
+        const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(
+          params.positionId.toString(),
+          data
+        );
         transaction = await brokerContract.placeOrderWithPosition(
           params.positionId.toString(),
-          {
-            user: params.address,
-            poolId: params.poolId,
-            orderType: params.orderType,
-            triggerType: params.triggerType,
-            operation: OperationType.INCREASE,
-            direction: params.direction,
-            collateralAmount: collateralWithNetworkFee,
-            size: params.size,
-            price: params.price,
-            timeInForce: TIME_IN_FORCE,
-            postOnly: params.postOnly,
-            slippagePct: params.slippagePct,
-            executionFeeToken: params.executionFeeToken,
-            leverage: params.leverage,
-            tpSize: params.tpSize ? params.tpSize : 0,
-            tpPrice: params.tpPrice ? params.tpPrice : 0,
-            slSize: params.slSize ? params.slSize : 0,
-            slPrice: params.slPrice ? params.slPrice : 0,
-            useAccountBalance: false
-          },
+          data,
           {
             gasLimit: gasLimit * 120n / 100n
           }
         );
       }
+      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 = {
@@ -19028,10 +18974,10 @@ var MyxClient = class {
       logLevel: options.logLevel
     });
     this.utils = new Utils(this.configManager, this.logger);
+    this.account = new Account(this.configManager, this.logger, this.utils);
     this.markets = new Markets(this.configManager, this.utils);
     this.position = new Position(this.configManager, this.logger, this.utils);
-    this.order = new Order(this.configManager, this.logger, this.utils);
-    this.account = new Account(this.configManager, this.logger, this.utils);
+    this.order = new Order(this.configManager, this.logger, this.utils, this.account);
     this.subscription = new SubScription(this.configManager, this.logger);
     const lp = MxSDK.getInstance();
     lp.setConfigManager(this.configManager);

package/package.json

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