@myx-trade/sdk 0.1.19 → 0.1.21

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as ethers from 'ethers';
-import { ZeroAddress, AddressLike, Signer } from 'ethers';
+import { ZeroAddress, AddressLike, Signer, ethers as ethers$1 } from 'ethers';
 export { formatUnits, parseUnits } from 'ethers';
 import { Options, Event } from 'reconnecting-websocket';
 import { WalletClient } from 'viem';
@@ -1420,7 +1420,7 @@ declare class Order {
             status: string;
             confirmations: number;
             timestamp: number;
-            receipt: ethers.ContractTransactionReceipt | null;
+            receipt: ethers$1.ContractTransactionReceipt | null;
         };
     } | {
         code: number;
@@ -1439,7 +1439,7 @@ declare class Order {
             status: string;
             confirmations: number;
             timestamp: number;
-            receipt: ethers.ContractTransactionReceipt | null;
+            receipt: ethers$1.ContractTransactionReceipt | null;
         };
     } | {
         code: number;
@@ -1458,7 +1458,7 @@ declare class Order {
             status: string;
             confirmations: number;
             timestamp: number;
-            receipt: ethers.ContractTransactionReceipt | null;
+            receipt: ethers$1.ContractTransactionReceipt | null;
         };
     } | {
         code: number;
@@ -1473,7 +1473,7 @@ declare class Order {
         code: number;
         message: any;
     }>;
-    updateOrderTpSl(params: UpdateOrderParams): Promise<ethers.ContractTransactionReceipt | {
+    updateOrderTpSl(params: UpdateOrderParams): Promise<ethers$1.ContractTransactionReceipt | {
         code: number;
         message: string;
     } | null>;
@@ -1521,6 +1521,30 @@ declare class Account {
         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 }: {
+        poolId: string;
+        amount: string;
+    }): Promise<{
+        code: number;
+        data: any;
+        message?: undefined;
+    } | {
+        code: number;
+        message: string;
+        data?: undefined;
+    }>;
 }
 
 declare class MyxClient {
@@ -1546,7 +1570,7 @@ declare class MyxClient {
     /**
      * auth the client
      */
-    auth(params: Pick<MyxClientConfig, "signer" | "getAccessToken" | "walletClient">): void;
+    auth(params: Required<Pick<MyxClientConfig, "signer" | "getAccessToken" | "walletClient">>): void;
     /**
      * close the client
      */

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as ethers from 'ethers';
-import { ZeroAddress, AddressLike, Signer } from 'ethers';
+import { ZeroAddress, AddressLike, Signer, ethers as ethers$1 } from 'ethers';
 export { formatUnits, parseUnits } from 'ethers';
 import { Options, Event } from 'reconnecting-websocket';
 import { WalletClient } from 'viem';
@@ -1420,7 +1420,7 @@ declare class Order {
             status: string;
             confirmations: number;
             timestamp: number;
-            receipt: ethers.ContractTransactionReceipt | null;
+            receipt: ethers$1.ContractTransactionReceipt | null;
         };
     } | {
         code: number;
@@ -1439,7 +1439,7 @@ declare class Order {
             status: string;
             confirmations: number;
             timestamp: number;
-            receipt: ethers.ContractTransactionReceipt | null;
+            receipt: ethers$1.ContractTransactionReceipt | null;
         };
     } | {
         code: number;
@@ -1458,7 +1458,7 @@ declare class Order {
             status: string;
             confirmations: number;
             timestamp: number;
-            receipt: ethers.ContractTransactionReceipt | null;
+            receipt: ethers$1.ContractTransactionReceipt | null;
         };
     } | {
         code: number;
@@ -1473,7 +1473,7 @@ declare class Order {
         code: number;
         message: any;
     }>;
-    updateOrderTpSl(params: UpdateOrderParams): Promise<ethers.ContractTransactionReceipt | {
+    updateOrderTpSl(params: UpdateOrderParams): Promise<ethers$1.ContractTransactionReceipt | {
         code: number;
         message: string;
     } | null>;
@@ -1521,6 +1521,30 @@ declare class Account {
         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 }: {
+        poolId: string;
+        amount: string;
+    }): Promise<{
+        code: number;
+        data: any;
+        message?: undefined;
+    } | {
+        code: number;
+        message: string;
+        data?: undefined;
+    }>;
 }
 
 declare class MyxClient {
@@ -1546,7 +1570,7 @@ declare class MyxClient {
     /**
      * auth the client
      */
-    auth(params: Pick<MyxClientConfig, "signer" | "getAccessToken" | "walletClient">): void;
+    auth(params: Required<Pick<MyxClientConfig, "signer" | "getAccessToken" | "walletClient">>): void;
     /**
      * close the client
      */

package/dist/index.js

@@ -1827,7 +1827,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.19",
+  version: "0.1.21",
   private: false,
   publishConfig: {
     access: "public"
@@ -1958,7 +1958,7 @@ if (typeof window !== "undefined") {
 }
 var getWalletProvider = async (chainId2) => {
   try {
-    const walletClient = sdk.getConfigManager()?.getConfig().walletClient;
+    const walletClient = sdk.getConfigManager()?.getConfig()?.walletClient;
     const provider = new import_ethers3.BrowserProvider(walletClient?.transport);
     if (!provider) {
       throw new Error("missing provider");
@@ -9167,9 +9167,9 @@ var getERC20Contract = async (chainId2, tokenAddress) => {
   return getContract(tokenAddress, IERC20Metadata_default, provider);
 };
 var getAccount = async (chainId2) => {
-  const provider = await getWalletProvider(chainId2);
-  const accounts = await provider.send("eth_requestAccounts", []);
-  return accounts?.[0] ?? void 0;
+  const provider = await getSignerProvider(chainId2);
+  const account = await provider?.getAddress();
+  return account ?? void 0;
 };
 var getLiquidityRouterContract = async (chainId2) => {
   const addresses = address_default[chainId2];
@@ -12493,6 +12493,7 @@ var OrderStatus = {
 };
 
 // src/manager/order/index.ts
+var import_ethers25 = require("ethers");
 var Order = class {
   constructor(configManager, logger, utils) {
     this.configManager = configManager;
@@ -12513,6 +12514,21 @@ var Order = class {
         params.executionFeeToken
       );
       const collateralWithNetworkFee = BigInt(params.collateralAmount) + BigInt(networkFee);
+      const needsApproval = await this.utils.needsApproval(
+        params.executionFeeToken,
+        collateralWithNetworkFee.toString(),
+        config.brokerAddress
+      );
+      if (needsApproval) {
+        const approvalResult = await this.utils.approveAuthorization({
+          quoteAddress: params.executionFeeToken,
+          amount: import_ethers25.ethers.MaxUint256.toString(),
+          spenderAddress: config.brokerAddress
+        });
+        if (approvalResult.code !== 0) {
+          throw new Error(approvalResult.message);
+        }
+      }
       console.log("createIncreaseOrder params--->", {
         user: params.address,
         poolId: params.poolId,
@@ -12532,7 +12548,8 @@ var Order = class {
         tpSize: params.tpSize ? params.tpSize : 0,
         tpPrice: params.tpPrice ? params.tpPrice : 0,
         slSize: params.slSize ? params.slSize : 0,
-        slPrice: params.slPrice ? params.slPrice : 0
+        slPrice: params.slPrice ? params.slPrice : 0,
+        useAccountBalance: false
       });
       const gasLimit = await brokerContract.placeOrder.estimateGas({
         user: params.address,
@@ -12583,10 +12600,7 @@ var Order = class {
           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 = {
@@ -13032,7 +13046,7 @@ var Order = class {
 };
 
 // src/manager/utils/index.ts
-var import_ethers25 = require("ethers");
+var import_ethers26 = require("ethers");
 
 // src/abi/Emiter.json
 var Emiter_default = [
@@ -16714,7 +16728,7 @@ var Utils = class {
     if (!receipt || !receipt.logs) {
       return null;
     }
-    const emiterInterface = new import_ethers25.ethers.Interface(Emiter_default);
+    const emiterInterface = new import_ethers26.ethers.Interface(Emiter_default);
     const orderPlacedEvent = Emiter_default.find(
       (item) => item.type === "event" && item.name === "OrderPlaced"
     );
@@ -16722,7 +16736,7 @@ var Utils = class {
       this.logger.error("OrderPlaced event not found in Emiter ABI");
       return null;
     }
-    const eventTopic = import_ethers25.ethers.id(
+    const eventTopic = import_ethers26.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);
@@ -16772,7 +16786,7 @@ var Utils = class {
       }
       const owner = await config.signer.getAddress();
       const spender = spenderAddress ?? getContractAddressByChainId(config.chainId).ORDER_MANAGER;
-      const tokenContract = new import_ethers25.ethers.Contract(
+      const tokenContract = new import_ethers26.ethers.Contract(
         quoteAddress,
         erc20Abi,
         config.signer
@@ -16794,8 +16808,8 @@ var Utils = class {
         spenderAddress
       );
       const currentAllowance = currentAllowanceRes.data;
-      const allowanceBigInt = import_ethers25.ethers.getBigInt(currentAllowance);
-      const requiredBigInt = import_ethers25.ethers.getBigInt(requiredAmount);
+      const allowanceBigInt = import_ethers26.ethers.getBigInt(currentAllowance);
+      const requiredBigInt = import_ethers26.ethers.getBigInt(requiredAmount);
       const needsApproval = allowanceBigInt < requiredBigInt;
       return needsApproval;
     } catch (error) {
@@ -16813,12 +16827,12 @@ var Utils = class {
         "function approve(address spender, uint256 amount) external returns (bool)"
       ];
       const config = this.configManager.getConfig();
-      const usdcContract = new import_ethers25.ethers.Contract(
+      const usdcContract = new import_ethers26.ethers.Contract(
         quoteAddress,
         erc20Abi,
         config.signer
       );
-      const approveAmount = amount ?? import_ethers25.ethers.MaxUint256;
+      const approveAmount = amount ?? import_ethers26.ethers.MaxUint256;
       const spender = spenderAddress ?? getContractAddressByChainId(config.chainId).ORDER_MANAGER;
       const tx = await usdcContract.approve(spender, approveAmount);
       await tx.wait();
@@ -16840,7 +16854,7 @@ var Utils = class {
     const orderManagerAddress = getContractAddressByChainId(
       config.chainId
     ).ORDER_MANAGER;
-    const orderManagerContract = new import_ethers25.ethers.Contract(
+    const orderManagerContract = new import_ethers26.ethers.Contract(
       orderManagerAddress,
       OrderManager_default,
       config.signer
@@ -16920,7 +16934,7 @@ var Utils = class {
 };
 
 // src/manager/account/index.ts
-var import_ethers26 = require("ethers");
+var import_ethers27 = require("ethers");
 
 // src/abi/Account.json
 var Account_default = [
@@ -18087,7 +18101,7 @@ var Account = class {
       );
     }
     const contractAddress = getContractAddressByChainId(config.chainId);
-    const erc20Contract = new import_ethers26.ethers.Contract(
+    const erc20Contract = new import_ethers27.ethers.Contract(
       contractAddress.ERC20,
       ERC20Token_default,
       config.signer
@@ -18110,7 +18124,7 @@ var Account = class {
       );
     }
     const contractAddress = getContractAddressByChainId(config.chainId);
-    const accountContract = new import_ethers26.ethers.Contract(
+    const accountContract = new import_ethers27.ethers.Contract(
       contractAddress.Account,
       Account_default,
       config.signer
@@ -18146,6 +18160,50 @@ var Account = class {
       data: res.data
     };
   }
+  async withdraw({ poolId, amount }) {
+    const config = this.configManager.getConfig();
+    const contractAddress = getContractAddressByChainId(config.chainId);
+    const accountContract = new import_ethers27.ethers.Contract(
+      contractAddress.Account,
+      Account_default,
+      config.signer
+    );
+    try {
+      const rs = await accountContract.withdraw(poolId, amount, config.signer?.getAddress() ?? "");
+      const receipt = await rs?.wait(1);
+      return {
+        code: 0,
+        data: receipt
+      };
+    } catch (error) {
+      return {
+        code: -1,
+        message: error.message
+      };
+    }
+  }
+  async deposit({ poolId, amount }) {
+    const config = this.configManager.getConfig();
+    const contractAddress = getContractAddressByChainId(config.chainId);
+    const accountContract = new import_ethers27.ethers.Contract(
+      contractAddress.Account,
+      Account_default,
+      config.signer
+    );
+    try {
+      const rs = await accountContract.deposit(config.signer?.getAddress() ?? "", poolId, amount);
+      const receipt = await rs?.wait(1);
+      return {
+        code: 0,
+        data: receipt
+      };
+    } catch (error) {
+      return {
+        code: -1,
+        message: error.message
+      };
+    }
+  }
 };
 
 // src/manager/index.ts

package/dist/index.mjs

@@ -1742,7 +1742,7 @@ var RotationProvider = class extends BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.19",
+  version: "0.1.21",
   private: false,
   publishConfig: {
     access: "public"
@@ -1873,7 +1873,7 @@ if (typeof window !== "undefined") {
 }
 var getWalletProvider = async (chainId2) => {
   try {
-    const walletClient = sdk.getConfigManager()?.getConfig().walletClient;
+    const walletClient = sdk.getConfigManager()?.getConfig()?.walletClient;
     const provider = new BrowserProvider(walletClient?.transport);
     if (!provider) {
       throw new Error("missing provider");
@@ -9082,9 +9082,9 @@ var getERC20Contract = async (chainId2, tokenAddress) => {
   return getContract(tokenAddress, IERC20Metadata_default, provider);
 };
 var getAccount = async (chainId2) => {
-  const provider = await getWalletProvider(chainId2);
-  const accounts = await provider.send("eth_requestAccounts", []);
-  return accounts?.[0] ?? void 0;
+  const provider = await getSignerProvider(chainId2);
+  const account = await provider?.getAddress();
+  return account ?? void 0;
 };
 var getLiquidityRouterContract = async (chainId2) => {
   const addresses = address_default[chainId2];
@@ -12408,6 +12408,7 @@ var OrderStatus = {
 };
 
 // src/manager/order/index.ts
+import { ethers as ethers6 } from "ethers";
 var Order = class {
   constructor(configManager, logger, utils) {
     this.configManager = configManager;
@@ -12428,6 +12429,21 @@ var Order = class {
         params.executionFeeToken
       );
       const collateralWithNetworkFee = BigInt(params.collateralAmount) + BigInt(networkFee);
+      const needsApproval = await this.utils.needsApproval(
+        params.executionFeeToken,
+        collateralWithNetworkFee.toString(),
+        config.brokerAddress
+      );
+      if (needsApproval) {
+        const approvalResult = await this.utils.approveAuthorization({
+          quoteAddress: params.executionFeeToken,
+          amount: ethers6.MaxUint256.toString(),
+          spenderAddress: config.brokerAddress
+        });
+        if (approvalResult.code !== 0) {
+          throw new Error(approvalResult.message);
+        }
+      }
       console.log("createIncreaseOrder params--->", {
         user: params.address,
         poolId: params.poolId,
@@ -12447,7 +12463,8 @@ var Order = class {
         tpSize: params.tpSize ? params.tpSize : 0,
         tpPrice: params.tpPrice ? params.tpPrice : 0,
         slSize: params.slSize ? params.slSize : 0,
-        slPrice: params.slPrice ? params.slPrice : 0
+        slPrice: params.slPrice ? params.slPrice : 0,
+        useAccountBalance: false
       });
       const gasLimit = await brokerContract.placeOrder.estimateGas({
         user: params.address,
@@ -12498,10 +12515,7 @@ var Order = class {
           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 = {
@@ -12947,7 +12961,7 @@ var Order = class {
 };
 
 // src/manager/utils/index.ts
-import { ethers as ethers6 } from "ethers";
+import { ethers as ethers7 } from "ethers";
 
 // src/abi/Emiter.json
 var Emiter_default = [
@@ -16629,7 +16643,7 @@ var Utils = class {
     if (!receipt || !receipt.logs) {
       return null;
     }
-    const emiterInterface = new ethers6.Interface(Emiter_default);
+    const emiterInterface = new ethers7.Interface(Emiter_default);
     const orderPlacedEvent = Emiter_default.find(
       (item) => item.type === "event" && item.name === "OrderPlaced"
     );
@@ -16637,7 +16651,7 @@ var Utils = class {
       this.logger.error("OrderPlaced event not found in Emiter ABI");
       return null;
     }
-    const eventTopic = ethers6.id(
+    const eventTopic = ethers7.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);
@@ -16687,7 +16701,7 @@ var Utils = class {
       }
       const owner = await config.signer.getAddress();
       const spender = spenderAddress ?? getContractAddressByChainId(config.chainId).ORDER_MANAGER;
-      const tokenContract = new ethers6.Contract(
+      const tokenContract = new ethers7.Contract(
         quoteAddress,
         erc20Abi,
         config.signer
@@ -16709,8 +16723,8 @@ var Utils = class {
         spenderAddress
       );
       const currentAllowance = currentAllowanceRes.data;
-      const allowanceBigInt = ethers6.getBigInt(currentAllowance);
-      const requiredBigInt = ethers6.getBigInt(requiredAmount);
+      const allowanceBigInt = ethers7.getBigInt(currentAllowance);
+      const requiredBigInt = ethers7.getBigInt(requiredAmount);
       const needsApproval = allowanceBigInt < requiredBigInt;
       return needsApproval;
     } catch (error) {
@@ -16728,12 +16742,12 @@ var Utils = class {
         "function approve(address spender, uint256 amount) external returns (bool)"
       ];
       const config = this.configManager.getConfig();
-      const usdcContract = new ethers6.Contract(
+      const usdcContract = new ethers7.Contract(
         quoteAddress,
         erc20Abi,
         config.signer
       );
-      const approveAmount = amount ?? ethers6.MaxUint256;
+      const approveAmount = amount ?? ethers7.MaxUint256;
       const spender = spenderAddress ?? getContractAddressByChainId(config.chainId).ORDER_MANAGER;
       const tx = await usdcContract.approve(spender, approveAmount);
       await tx.wait();
@@ -16755,7 +16769,7 @@ var Utils = class {
     const orderManagerAddress = getContractAddressByChainId(
       config.chainId
     ).ORDER_MANAGER;
-    const orderManagerContract = new ethers6.Contract(
+    const orderManagerContract = new ethers7.Contract(
       orderManagerAddress,
       OrderManager_default,
       config.signer
@@ -16835,7 +16849,7 @@ var Utils = class {
 };
 
 // src/manager/account/index.ts
-import { ethers as ethers7 } from "ethers";
+import { ethers as ethers8 } from "ethers";
 
 // src/abi/Account.json
 var Account_default = [
@@ -18002,7 +18016,7 @@ var Account = class {
       );
     }
     const contractAddress = getContractAddressByChainId(config.chainId);
-    const erc20Contract = new ethers7.Contract(
+    const erc20Contract = new ethers8.Contract(
       contractAddress.ERC20,
       ERC20Token_default,
       config.signer
@@ -18025,7 +18039,7 @@ var Account = class {
       );
     }
     const contractAddress = getContractAddressByChainId(config.chainId);
-    const accountContract = new ethers7.Contract(
+    const accountContract = new ethers8.Contract(
       contractAddress.Account,
       Account_default,
       config.signer
@@ -18061,6 +18075,50 @@ var Account = class {
       data: res.data
     };
   }
+  async withdraw({ poolId, amount }) {
+    const config = this.configManager.getConfig();
+    const contractAddress = getContractAddressByChainId(config.chainId);
+    const accountContract = new ethers8.Contract(
+      contractAddress.Account,
+      Account_default,
+      config.signer
+    );
+    try {
+      const rs = await accountContract.withdraw(poolId, amount, config.signer?.getAddress() ?? "");
+      const receipt = await rs?.wait(1);
+      return {
+        code: 0,
+        data: receipt
+      };
+    } catch (error) {
+      return {
+        code: -1,
+        message: error.message
+      };
+    }
+  }
+  async deposit({ poolId, amount }) {
+    const config = this.configManager.getConfig();
+    const contractAddress = getContractAddressByChainId(config.chainId);
+    const accountContract = new ethers8.Contract(
+      contractAddress.Account,
+      Account_default,
+      config.signer
+    );
+    try {
+      const rs = await accountContract.deposit(config.signer?.getAddress() ?? "", poolId, amount);
+      const receipt = await rs?.wait(1);
+      return {
+        code: 0,
+        data: receipt
+      };
+    } catch (error) {
+      return {
+        code: -1,
+        message: error.message
+      };
+    }
+  }
 };
 
 // src/manager/index.ts

package/package.json

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