@myx-trade/sdk 0.1.140 → 0.1.142

package/dist/index.d.mts

@@ -1508,7 +1508,7 @@ declare class Seamless {
     onCheckRelayer(account: string, relayer: string, chainId: number): Promise<boolean>;
     getUSDPermitParams(deadline: number, chainId: number): Promise<{
         token: string | ethers$1.Addressable;
-        owner: Promise<string> | undefined;
+        owner: string;
         spender: string;
         value: bigint;
         deadline: number;

package/dist/index.d.ts

@@ -1508,7 +1508,7 @@ declare class Seamless {
     onCheckRelayer(account: string, relayer: string, chainId: number): Promise<boolean>;
     getUSDPermitParams(deadline: number, chainId: number): Promise<{
         token: string | ethers$1.Addressable;
-        owner: Promise<string> | undefined;
+        owner: string;
         spender: string;
         value: bigint;
         deadline: number;

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.140",
+  version: "0.1.142",
   private: false,
   publishConfig: {
     access: "public"
@@ -12712,7 +12712,6 @@ var getPoolInfo2 = async (chainId, poolId, marketPrice = 0n) => {
         poolEntryPrice: request.oi.poolEntryPrice
       }
     };
-    console.log(info);
     return info;
   } catch (error) {
     console.error(error);
@@ -13271,13 +13270,10 @@ var MyxWebSocketClient = class {
    */
   subscribe(subscription, callback) {
     const subscriptionList = Array.isArray(subscription) ? subscription : [subscription];
-    console.log("sinscribes:", subscriptionList);
-    this.logger.debug("subscriptionList:", subscriptionList);
     const newSubscriptionIds = [];
     const processedIds = /* @__PURE__ */ new Set();
     subscriptionList.forEach((subscriptionItem) => {
       const subscriptionId = generateListenerId(subscriptionItem);
-      this.logger.debug("subscriptionId:", subscriptionId);
       if (processedIds.has(subscriptionId)) {
         return;
       }
@@ -13285,9 +13281,6 @@ var MyxWebSocketClient = class {
       if (this.subscriptions.has(subscriptionId)) {
         const existingSubscription = this.subscriptions.get(subscriptionId);
         existingSubscription.callbacks.add(callback);
-        this.logger.debug(
-          `add callback to existing subscription: ${subscriptionId}`
-        );
       } else {
         const subscriptionObj = {
           id: subscriptionId,
@@ -13590,7 +13583,6 @@ var SubScription = class {
    * tickers subscription methods
    */
   subscribeTickers(globalIds, callback) {
-    this.logger.debug(`subscribe tickers ${globalIds}`);
     const globalIdsList = Array.isArray(globalIds) ? globalIds : [globalIds];
     this.wsClient.subscribe(
       globalIdsList.map((globalId) => ({
@@ -13601,7 +13593,6 @@ var SubScription = class {
     );
   }
   unsubscribeTickers(globalIds, callback) {
-    this.logger.debug(`unsubscribe tickers ${globalIds}`);
     const globalIdsList = Array.isArray(globalIds) ? globalIds : [globalIds];
     this.wsClient.unsubscribe(
       globalIdsList.map((globalId) => ({
@@ -14306,6 +14297,7 @@ var Order = class {
         params.executionFeeToken,
         params.collateralAmount
       );
+      const totalCollateralAmount = BigInt(params.collateralAmount) + BigInt(tradingFee);
       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);
@@ -14324,7 +14316,7 @@ var Order = class {
         triggerType: params.triggerType,
         operation: OperationType.INCREASE,
         direction: params.direction,
-        collateralAmount: params.collateralAmount,
+        collateralAmount: totalCollateralAmount.toString(),
         size: params.size,
         price: params.price,
         timeInForce: TIME_IN_FORCE,
@@ -21395,7 +21387,10 @@ var Seamless = class {
   }
   async getUSDPermitParams(deadline, chainId) {
     const config = this.configManager.getConfig();
-    const masterAddress = config.signer?.getAddress();
+    if (!config.signer) {
+      throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Signer is required for permit");
+    }
+    const masterAddress = await config.signer.getAddress();
     const brokerAddress = config.brokerAddress;
     const contractAddress = getContractAddressByChainId(chainId);
     const erc20Contract = new import_ethers27.ethers.Contract(
@@ -21403,17 +21398,16 @@ var Seamless = class {
       ERC20Token_default,
       config.signer
     );
-    const walletProvider = await getWalletProvider(chainId);
     try {
       const nonces = await erc20Contract.nonces(masterAddress);
       const brokerSignPermit = await signPermit(
-        // @ts-ignore
-        walletProvider,
+        config.signer,
+        // 使用 signer 而不是 provider
         erc20Contract,
         masterAddress,
         brokerAddress,
-        import_ethers27.ethers.MaxUint256,
-        nonces,
+        import_ethers27.ethers.MaxUint256.toString(),
+        nonces.toString(),
         deadline.toString(),
         chainId
       );
@@ -21427,10 +21421,8 @@ var Seamless = class {
         r: brokerSignPermit.r,
         s: brokerSignPermit.s
       };
-      console.log("brokerSeamlessUSDPermitParams-->", brokerSeamlessUSDPermitParams);
       return [brokerSeamlessUSDPermitParams];
     } catch (error) {
-      this.logger.error("getUSDPermitParams error-->", error);
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key generated");
     }
   }

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.140",
+  version: "0.1.142",
   private: false,
   publishConfig: {
     access: "public"
@@ -12622,7 +12622,6 @@ var getPoolInfo2 = async (chainId, poolId, marketPrice = 0n) => {
         poolEntryPrice: request.oi.poolEntryPrice
       }
     };
-    console.log(info);
     return info;
   } catch (error) {
     console.error(error);
@@ -13181,13 +13180,10 @@ var MyxWebSocketClient = class {
    */
   subscribe(subscription, callback) {
     const subscriptionList = Array.isArray(subscription) ? subscription : [subscription];
-    console.log("sinscribes:", subscriptionList);
-    this.logger.debug("subscriptionList:", subscriptionList);
     const newSubscriptionIds = [];
     const processedIds = /* @__PURE__ */ new Set();
     subscriptionList.forEach((subscriptionItem) => {
       const subscriptionId = generateListenerId(subscriptionItem);
-      this.logger.debug("subscriptionId:", subscriptionId);
       if (processedIds.has(subscriptionId)) {
         return;
       }
@@ -13195,9 +13191,6 @@ var MyxWebSocketClient = class {
       if (this.subscriptions.has(subscriptionId)) {
         const existingSubscription = this.subscriptions.get(subscriptionId);
         existingSubscription.callbacks.add(callback);
-        this.logger.debug(
-          `add callback to existing subscription: ${subscriptionId}`
-        );
       } else {
         const subscriptionObj = {
           id: subscriptionId,
@@ -13500,7 +13493,6 @@ var SubScription = class {
    * tickers subscription methods
    */
   subscribeTickers(globalIds, callback) {
-    this.logger.debug(`subscribe tickers ${globalIds}`);
     const globalIdsList = Array.isArray(globalIds) ? globalIds : [globalIds];
     this.wsClient.subscribe(
       globalIdsList.map((globalId) => ({
@@ -13511,7 +13503,6 @@ var SubScription = class {
     );
   }
   unsubscribeTickers(globalIds, callback) {
-    this.logger.debug(`unsubscribe tickers ${globalIds}`);
     const globalIdsList = Array.isArray(globalIds) ? globalIds : [globalIds];
     this.wsClient.unsubscribe(
       globalIdsList.map((globalId) => ({
@@ -14216,6 +14207,7 @@ var Order = class {
         params.executionFeeToken,
         params.collateralAmount
       );
+      const totalCollateralAmount = BigInt(params.collateralAmount) + BigInt(tradingFee);
       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);
@@ -14234,7 +14226,7 @@ var Order = class {
         triggerType: params.triggerType,
         operation: OperationType.INCREASE,
         direction: params.direction,
-        collateralAmount: params.collateralAmount,
+        collateralAmount: totalCollateralAmount.toString(),
         size: params.size,
         price: params.price,
         timeInForce: TIME_IN_FORCE,
@@ -21305,7 +21297,10 @@ var Seamless = class {
   }
   async getUSDPermitParams(deadline, chainId) {
     const config = this.configManager.getConfig();
-    const masterAddress = config.signer?.getAddress();
+    if (!config.signer) {
+      throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Signer is required for permit");
+    }
+    const masterAddress = await config.signer.getAddress();
     const brokerAddress = config.brokerAddress;
     const contractAddress = getContractAddressByChainId(chainId);
     const erc20Contract = new ethers9.Contract(
@@ -21313,17 +21308,16 @@ var Seamless = class {
       ERC20Token_default,
       config.signer
     );
-    const walletProvider = await getWalletProvider(chainId);
     try {
       const nonces = await erc20Contract.nonces(masterAddress);
       const brokerSignPermit = await signPermit(
-        // @ts-ignore
-        walletProvider,
+        config.signer,
+        // 使用 signer 而不是 provider
         erc20Contract,
         masterAddress,
         brokerAddress,
-        ethers9.MaxUint256,
-        nonces,
+        ethers9.MaxUint256.toString(),
+        nonces.toString(),
         deadline.toString(),
         chainId
       );
@@ -21337,10 +21331,8 @@ var Seamless = class {
         r: brokerSignPermit.r,
         s: brokerSignPermit.s
       };
-      console.log("brokerSeamlessUSDPermitParams-->", brokerSeamlessUSDPermitParams);
       return [brokerSeamlessUSDPermitParams];
     } catch (error) {
-      this.logger.error("getUSDPermitParams error-->", error);
       throw new MyxSDKError("INVALID_PRIVATE_KEY" /* InvalidPrivateKey */, "Invalid private key generated");
     }
   }

package/package.json

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