@myx-trade/sdk 0.1.34 → 0.1.36

package/dist/index.js

@@ -1467,14 +1467,14 @@ function isSupportedChainFn(chainId2) {
 // src/config/address/ARB_TEST_SEPOLIA.ts
 var import_ethers = require("ethers");
 var ARB_TEST_SEPOLIA = {
-  USDC: "",
-  POOL_MANAGER: "0x29fA92d5f47051E49Ab9001A3cbd8091c34c5638",
-  Account: "0x900F3003c59b9c55A09CEB7b3134A53E511531C3",
+  USDC: "0x7E248Ec1721639413A280d9E82e2862Cae2E6E28",
+  POOL_MANAGER: "0xA4A1dfbe40cB725A79D34bd529f0C1b54AB46954",
+  Account: "0x6136899e8c77C452bc46AcD786aA2C09fD31f947",
   POOL_VIEW: "",
   HYPER_VAULT: import_ethers.ZeroAddress,
   FEE_COLLECTOR: "",
-  POSITION_MANAGER: "0x520435fA110549aE7eA1894839575a62cbF5A8D5",
-  ORDER_MANAGER: "0x4eDe4E20162551F293B9D6f33E8567314fb5612f",
+  POSITION_MANAGER: "0x002F28be205E9A1e279d2eeF1f5e472CeA1d910C",
+  ORDER_MANAGER: "0x3A3C7c4588Fb2aE46A4108994a47712E03F96B23",
   TRUSTED_FORWARDER: "",
   FRONT_FACET: "",
   // router address
@@ -1483,21 +1483,19 @@ var ARB_TEST_SEPOLIA = {
   FAUCET: "",
   UI_POOL_DATA_PROVIDER: "",
   UI_POSITION_DATA_PROVIDER: "",
-  PYTH: "0x4374e5a8b9C22271E9EB878A2AA31DE97DF15DAF",
+  PYTH: "0x361360Def495BfB4F0BE59AB11878D042c458155",
   // ！！！ 非Pyth Adapter
   MYX: import_ethers.ZeroAddress,
   ERC20: "0x7E248Ec1721639413A280d9E82e2862Cae2E6E28",
-  LIQUIDITY_ROUTER: "0x3533595E0546CCA3CEa58bD23f2733BbCE057F44",
-  BASE_POOL: "0x4b86814b748D2ae323a8449b98C5add6D07901F3",
-  QUOTE_POOL: "0x22342d91b372ED991aB5A93bdC31706E4971Cec2",
-  BROKER: "0x461A33C5E75c292A45f8c961ab816060a94AfbA0",
-  // MYXBroker
-  ORACLE: "0x38aC036082810F43f83c2bca0Ab2518703d74738",
+  LIQUIDITY_ROUTER: "0xd185C3f675d991735FCF6885Ff6BADE02A21313d",
+  BASE_POOL: "0x2c6AdaE4A01836487842b7369c1db3F441871E83",
+  QUOTE_POOL: "0xe1Ff495206635570A8Eaf9517125Ce66a2d09d32",
+  ORACLE: "0x574001F6cB520b15d5a6db9F7B7a0ebf1A8E25c0",
   // MYXOracle
-  EIP7702Delegation: "0xDec0Eb393c362e459B124F4A27E21BCD10D45B41",
-  MARKET_MANAGER: "0x26645ba85E6294f4AE4605C56967B0A16BcB9cBb",
-  DATA_PROVIDER: "0xc4472860fA175d0E8b5a73620778799469232763",
-  ORACLE_RESERVE: "0x513AE26EdD58E1fD209c68Ed790585fFb08Fd740"
+  EIP7702Delegation: "0x4e1B9aDf5Aa4a893f578c8502E6E28841b2403f3",
+  MARKET_MANAGER: "0x12AD75316A92a66b92c79080c555594314e7aFB3",
+  DATA_PROVIDER: "0x726A4978eDcb974B9889BC6f5Ee2Ec06D703038E",
+  ORACLE_RESERVE: "0xC46b81c38091933f4811EC16E93553f9801EB863"
 };
 
 // src/config/address.ts
@@ -1827,7 +1825,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.34",
+  version: "0.1.36",
   private: false,
   publishConfig: {
     access: "public"
@@ -1861,7 +1859,8 @@ var package_default = {
     "publish:patch": "node scripts/publish.js patch",
     "publish:minor": "node scripts/publish.js minor",
     "publish:major": "node scripts/publish.js major",
-    "publish:no-bump": "npm run build && npm publish --access public"
+    "publish:no-bump": "npm run build && npm publish --access public",
+    "type-check": "echo 'Skipping type-check for @myx-trade/sdk'"
   },
   keywords: [
     "trading",
@@ -5682,11 +5681,15 @@ var Broker_default = [
   },
   {
     type: "function",
-    name: "placeOrder",
+    name: "placeOrderWithPosition",
     constant: false,
     stateMutability: "payable",
     payable: true,
     inputs: [
+      {
+        type: "bytes32",
+        name: "positionId"
+      },
       {
         type: "tuple",
         name: "orderParams",
@@ -5700,8 +5703,100 @@ var Broker_default = [
             name: "poolId"
           },
           {
-            type: "uint64",
-            name: "userPositionSalt"
+            type: "uint8",
+            name: "orderType"
+          },
+          {
+            type: "uint8",
+            name: "triggerType"
+          },
+          {
+            type: "uint8",
+            name: "operation"
+          },
+          {
+            type: "uint8",
+            name: "direction"
+          },
+          {
+            type: "uint256",
+            name: "collateralAmount"
+          },
+          {
+            type: "uint256",
+            name: "size"
+          },
+          {
+            type: "uint256",
+            name: "price"
+          },
+          {
+            type: "uint8",
+            name: "timeInForce"
+          },
+          {
+            type: "bool",
+            name: "postOnly"
+          },
+          {
+            type: "uint16",
+            name: "slippagePct"
+          },
+          {
+            type: "address",
+            name: "executionFeeToken"
+          },
+          {
+            type: "uint16",
+            name: "leverage"
+          },
+          {
+            type: "uint256",
+            name: "tpSize"
+          },
+          {
+            type: "uint256",
+            name: "tpPrice"
+          },
+          {
+            type: "uint256",
+            name: "slSize"
+          },
+          {
+            type: "uint256",
+            name: "slPrice"
+          },
+          {
+            type: "bool",
+            name: "useAccountBalance"
+          }
+        ]
+      }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "placeOrderWithSalt",
+    constant: false,
+    stateMutability: "payable",
+    payable: true,
+    inputs: [
+      {
+        type: "uint64",
+        name: "userPositionSalt"
+      },
+      {
+        type: "tuple",
+        name: "orderParams",
+        components: [
+          {
+            type: "address",
+            name: "user"
+          },
+          {
+            type: "bytes32",
+            name: "poolId"
           },
           {
             type: "uint8",
@@ -5778,11 +5873,15 @@ var Broker_default = [
   },
   {
     type: "function",
-    name: "placeOrders",
+    name: "placeOrdersWithPosition",
     constant: false,
     stateMutability: "payable",
     payable: true,
     inputs: [
+      {
+        type: "bytes32[]",
+        name: "positionIds"
+      },
       {
         type: "tuple[]",
         name: "orderParams",
@@ -5796,8 +5895,100 @@ var Broker_default = [
             name: "poolId"
           },
           {
-            type: "uint64",
-            name: "userPositionSalt"
+            type: "uint8",
+            name: "orderType"
+          },
+          {
+            type: "uint8",
+            name: "triggerType"
+          },
+          {
+            type: "uint8",
+            name: "operation"
+          },
+          {
+            type: "uint8",
+            name: "direction"
+          },
+          {
+            type: "uint256",
+            name: "collateralAmount"
+          },
+          {
+            type: "uint256",
+            name: "size"
+          },
+          {
+            type: "uint256",
+            name: "price"
+          },
+          {
+            type: "uint8",
+            name: "timeInForce"
+          },
+          {
+            type: "bool",
+            name: "postOnly"
+          },
+          {
+            type: "uint16",
+            name: "slippagePct"
+          },
+          {
+            type: "address",
+            name: "executionFeeToken"
+          },
+          {
+            type: "uint16",
+            name: "leverage"
+          },
+          {
+            type: "uint256",
+            name: "tpSize"
+          },
+          {
+            type: "uint256",
+            name: "tpPrice"
+          },
+          {
+            type: "uint256",
+            name: "slSize"
+          },
+          {
+            type: "uint256",
+            name: "slPrice"
+          },
+          {
+            type: "bool",
+            name: "useAccountBalance"
+          }
+        ]
+      }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "placeOrdersWithSalt",
+    constant: false,
+    stateMutability: "payable",
+    payable: true,
+    inputs: [
+      {
+        type: "uint64[]",
+        name: "userPositionSalts"
+      },
+      {
+        type: "tuple[]",
+        name: "orderParams",
+        components: [
+          {
+            type: "address",
+            name: "user"
+          },
+          {
+            type: "bytes32",
+            name: "poolId"
           },
           {
             type: "uint8",
@@ -12078,6 +12269,13 @@ var SubScription = class {
 var ConfigManager = class {
   // accessToken 过期时间
   constructor(config) {
+    /**
+     * 获取有效的 accessToken，自动处理获取和刷新
+     * @param forceRefresh 是否强制刷新
+     * @returns Promise<string | null> 有效的 accessToken 或 null
+     */
+    this._getAccessTokenQueue = [];
+    this._isGettingAccessToken = false;
     const mergedConfig = {
       isTestnet: false,
       ...config
@@ -12118,13 +12316,36 @@ var ConfigManager = class {
         );
     }
   }
-  /**
-   * 获取有效的 accessToken，自动处理获取和刷新
-   * @param forceRefresh 是否强制刷新
-   * @returns Promise<string | null> 有效的 accessToken 或 null
-   */
   async getAccessToken(forceRefresh = false) {
+    return new Promise((resolve, reject) => {
+      this._getAccessTokenQueue.push({
+        resolve,
+        reject,
+        forceRefresh
+      });
+      this._processAccessTokenQueue();
+    });
+  }
+  _processAccessTokenQueue() {
+    if (this._isGettingAccessToken) {
+      return;
+    }
+    this._isGettingAccessToken = true;
+    const item = this._getAccessTokenQueue.shift();
+    if (item) {
+      this._getAccessToken(item.forceRefresh).then(item.resolve).catch(item.reject).finally(() => {
+        this._isGettingAccessToken = false;
+        if (this._getAccessTokenQueue.length > 0) {
+          this._processAccessTokenQueue();
+        }
+      });
+    } else {
+      this._isGettingAccessToken = false;
+    }
+  }
+  async _getAccessToken(forceRefresh = false) {
     if (!forceRefresh && this.isAccessTokenValid()) {
+      this._isGettingAccessToken = false;
       return this.accessToken;
     }
     if (!this.config.getAccessToken) {
@@ -12180,7 +12401,7 @@ var ConfigManager = class {
    * @returns boolean token 是否有效
    */
   isAccessTokenValid() {
-    if (!this.accessToken || !this.accessTokenExpiry) {
+    if (!this.accessToken || !this.accessTokenExpiry || !this.config.getAccessToken || !this.config.signer) {
       return false;
     }
     return Date.now() < this.accessTokenExpiry;
@@ -12575,7 +12796,7 @@ var Position = class {
         }
       }
       const brokerContract = getContract(
-        contractAddress.BROKER,
+        config.brokerAddress,
         Broker_default,
         config.signer
       );
@@ -12671,12 +12892,22 @@ var OrderStatus = {
 
 // src/manager/order/index.ts
 var import_ethers25 = require("ethers");
+var import_viem = require("viem");
 var Order = class {
   constructor(configManager, logger, utils) {
     this.configManager = configManager;
     this.logger = logger;
     this.utils = utils;
   }
+  async createPositionId(poolId, user, direction, salt) {
+    const encoded = (0, import_viem.encodeAbiParameters)((0, import_viem.parseAbiParameters)("bytes32 poolId, address user, uint8 direction, uint64 salt"), [
+      poolId,
+      user,
+      direction,
+      salt
+    ]);
+    return (0, import_ethers25.keccak256)(encoded);
+  }
   async createIncreaseOrder(params) {
     try {
       const config = this.configManager.getConfig();
@@ -12703,32 +12934,9 @@ var Order = class {
           throw new Error(approvalResult.message);
         }
       }
-      console.log("createIncreaseOrder params--->", {
-        user: params.address,
-        poolId: params.poolId,
-        userPositionSalt: params.userPositionSalt,
-        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.placeOrder.estimateGas({
+      const data = {
         user: params.address,
         poolId: params.poolId,
-        userPositionSalt: params.userPositionSalt,
         orderType: params.orderType,
         triggerType: params.triggerType,
         operation: OperationType.INCREASE,
@@ -12746,12 +12954,14 @@ var Order = class {
         slSize: params.slSize ? params.slSize : 0,
         slPrice: params.slPrice ? params.slPrice : 0,
         useAccountBalance: false
-      });
-      const transaction = await brokerContract.placeOrder(
-        {
+      };
+      let transaction;
+      if (!params.positionId) {
+        const positionId = await this.createPositionId(params.poolId, params.address, params.direction, BigInt(1));
+        this.logger.info("createIncreaseOrder salt position params--->", { ...data, positionId });
+        const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), {
           user: params.address,
           poolId: params.poolId,
-          userPositionSalt: params.userPositionSalt,
           orderType: params.orderType,
           triggerType: params.triggerType,
           operation: OperationType.INCREASE,
@@ -12769,11 +12979,85 @@ var Order = class {
           slSize: params.slSize ? params.slSize : 0,
           slPrice: params.slPrice ? params.slPrice : 0,
           useAccountBalance: false
-        },
-        {
-          gasLimit: gasLimit * 120n / 100n
-        }
-      );
+        });
+        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
+          },
+          {
+            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
+        });
+        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
+          },
+          {
+            gasLimit: gasLimit * 120n / 100n
+          }
+        );
+      }
       const receipt = await transaction.wait();
       this.logger.info("createIncreaseOrder receipt--->", receipt);
       const orderId = this.utils.getOrderIdFromTransaction(receipt);
@@ -12823,7 +13107,7 @@ var Order = class {
       console.log("createDecreaseOrder params--->", {
         user: params.address,
         poolId: params.poolId,
-        userPositionSalt: params.userPositionSalt,
+        positionId: params.positionId,
         orderType: params.orderType,
         triggerType: params.triggerType,
         operation: OperationType.DECREASE,
@@ -12837,10 +13121,9 @@ var Order = class {
         executionFeeToken: params.executionFeeToken,
         leverage: params.leverage
       });
-      const gasLimit = await brokerContract.placeOrder.estimateGas({
+      const data = {
         user: params.address,
         poolId: params.poolId,
-        userPositionSalt: params.userPositionSalt,
         orderType: params.orderType,
         triggerType: params.triggerType,
         operation: OperationType.DECREASE,
@@ -12858,12 +13141,14 @@ var Order = class {
         slSize: 0,
         slPrice: 0,
         useAccountBalance: false
-      });
-      const transaction = await brokerContract.placeOrder(
-        {
+      };
+      let transaction;
+      if (!params.positionId) {
+        const positionId = await this.createPositionId(params.poolId, params.address, params.direction, BigInt(1));
+        this.logger.info("createDecreaseOrder salt position params--->", { ...data, positionId });
+        const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(positionId.toString(), {
           user: params.address,
           poolId: params.poolId,
-          userPositionSalt: params.userPositionSalt,
           orderType: params.orderType,
           triggerType: params.triggerType,
           operation: OperationType.DECREASE,
@@ -12872,7 +13157,7 @@ var Order = class {
           size: params.size,
           price: params.price,
           timeInForce: TIME_IN_FORCE,
-          postOnly: false,
+          postOnly: params.postOnly,
           slippagePct: params.slippagePct,
           executionFeeToken: params.executionFeeToken,
           leverage: params.leverage,
@@ -12881,11 +13166,85 @@ var Order = class {
           slSize: 0,
           slPrice: 0,
           useAccountBalance: false
-        },
-        {
-          gasLimit: gasLimit * 130n / 100n
-        }
-      );
+        });
+        transaction = await brokerContract.placeOrderWithPosition(
+          params.positionId.toString(),
+          {
+            user: params.address,
+            poolId: params.poolId,
+            orderType: params.orderType,
+            triggerType: params.triggerType,
+            operation: OperationType.DECREASE,
+            direction: params.direction,
+            collateralAmount: collateralWithNetworkFee,
+            size: params.size,
+            price: params.price,
+            timeInForce: TIME_IN_FORCE,
+            postOnly: false,
+            slippagePct: params.slippagePct,
+            executionFeeToken: params.executionFeeToken,
+            leverage: params.leverage,
+            tpSize: 0,
+            tpPrice: 0,
+            slSize: 0,
+            slPrice: 0,
+            useAccountBalance: false
+          },
+          {
+            gasLimit: gasLimit * 130n / 100n
+          }
+        );
+      } else {
+        this.logger.info("createDecreaseOrder 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.DECREASE,
+          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: 0,
+          tpPrice: 0,
+          slSize: 0,
+          slPrice: 0,
+          useAccountBalance: false
+        });
+        transaction = await brokerContract.placeOrderWithPosition(
+          params.positionId.toString(),
+          {
+            user: params.address,
+            poolId: params.poolId,
+            orderType: params.orderType,
+            triggerType: params.triggerType,
+            operation: OperationType.DECREASE,
+            direction: params.direction,
+            collateralAmount: collateralWithNetworkFee,
+            size: params.size,
+            price: params.price,
+            timeInForce: TIME_IN_FORCE,
+            postOnly: false,
+            slippagePct: params.slippagePct,
+            executionFeeToken: params.executionFeeToken,
+            leverage: params.leverage,
+            tpSize: 0,
+            tpPrice: 0,
+            slSize: 0,
+            slPrice: 0,
+            useAccountBalance: false
+          },
+          {
+            gasLimit: gasLimit * 130n / 100n
+          }
+        );
+      }
       this.logger.info("Transaction sent:", transaction.hash);
       this.logger.info("Waiting for confirmation...");
       const receipt = await transaction.wait();
@@ -12938,7 +13297,6 @@ var Order = class {
             {
               user: params.address,
               poolId: params.poolId,
-              userPositionSalt: params.userPositionSalt,
               orderType: OrderType.STOP,
               triggerType: params.tpTriggerType,
               operation: OperationType.DECREASE,
@@ -12960,7 +13318,6 @@ var Order = class {
             {
               user: params.address,
               poolId: params.poolId,
-              userPositionSalt: params.userPositionSalt,
               orderType: OrderType.STOP,
               triggerType: params.slTriggerType,
               operation: OperationType.DECREASE,
@@ -12980,11 +13337,21 @@ var Order = class {
               useAccountBalance: false
             }
           ];
-          console.log("createPositionTpSlOrder data--->", data2);
-          const gasLimit2 = await brokerContract.placeOrders.estimateGas(data2);
-          const transaction2 = await brokerContract.placeOrders(data2, {
-            gasLimit: gasLimit2 * 120n / 100n
-          });
+          let transaction2;
+          if (!params.positionId) {
+            this.logger.info("createPositionTpSlOrder salt position data--->", data2);
+            const positionId = await this.createPositionId(params.poolId, params.address, params.direction, BigInt(1));
+            const gasLimit = await brokerContract.placeOrdersWithSalt.estimateGas([positionId.toString(), positionId.toString()], data2);
+            transaction2 = await brokerContract.placeOrdersWithSalt([positionId.toString(), positionId.toString()], data2, {
+              gasLimit: gasLimit * 120n / 100n
+            });
+          } else {
+            this.logger.info("createPositionTpSlOrder nft position data--->", data2);
+            const gasLimit = await brokerContract.placeOrdersWithPosition.estimateGas([params.positionId.toString(), params.positionId.toString()], data2);
+            transaction2 = await brokerContract.placeOrdersWithPosition([params.positionId.toString(), params.positionId.toString()], data2, {
+              gasLimit: gasLimit * 120n / 100n
+            });
+          }
           this.logger.info("Transaction sent:", transaction2.hash);
           this.logger.info("Waiting for confirmation...");
           const receipt2 = await transaction2.wait();
@@ -13018,7 +13385,6 @@ var Order = class {
         const data = {
           user: params.address,
           poolId: params.poolId,
-          userPositionSalt: params.userPositionSalt,
           orderType: OrderType.STOP,
           triggerType: params.tpSize !== "0" ? params.tpTriggerType : params.slTriggerType,
           operation: OperationType.DECREASE,
@@ -13037,11 +13403,21 @@ var Order = class {
           slPrice: "0",
           useAccountBalance: false
         };
-        console.log("createPositionTpSlOrder data--->", data);
-        const gasLimit = await brokerContract.placeOrder.estimateGas(data);
-        const transaction = await brokerContract.placeOrder(data, {
-          gasLimit: gasLimit * 120n / 100n
-        });
+        let transaction;
+        if (!params.positionId) {
+          this.logger.info("createPositionTpOrSlOrder salt position data--->", data);
+          const positionId = await this.createPositionId(params.poolId, params.address, params.direction, BigInt(1));
+          const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(params.positionId.toString(), data);
+          transaction = await brokerContract.placeOrderWithPosition(positionId.toString(), data, {
+            gasLimit: gasLimit * 120n / 100n
+          });
+        } else {
+          this.logger.info("createPositionTpOrSlOrder nft position data--->", data);
+          const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(params.positionId.toString(), data);
+          transaction = await brokerContract.placeOrderWithPosition(params.positionId.toString(), data, {
+            gasLimit: gasLimit * 120n / 100n
+          });
+        }
         this.logger.info("Transaction sent:", transaction.hash);
         this.logger.info("Waiting for confirmation...");
         const receipt = await transaction.wait();
@@ -13138,7 +13514,6 @@ var Order = class {
     if (!config.signer) {
       throw new MyxSDKError("INVALID_SIGNER" /* InvalidSigner */, "Invalid signer");
     }
-    console.log("updateOrderTpSl params", params);
     const brokerContract = await getBrokerSingerContract(
       config.chainId
     );
@@ -13157,18 +13532,17 @@ var Order = class {
         paymentType: 0
       }
     };
-    console.log(data);
+    this.logger.info("updateOrderTpSl params", data);
     try {
       const gasLimit = await brokerContract.updateOrder.estimateGas(data);
-      console.log("gaslimit->", gasLimit);
       const request = await brokerContract.updateOrder(data, {
         gasLimit: gasLimit * 120n / 100n
       });
       const receipt = await request?.wait();
-      console.log("updateOrderTpSl receipt", receipt);
+      this.logger.info("updateOrderTpSl receipt", receipt);
       return receipt;
     } catch (error) {
-      console.error("Error updating order:", error);
+      this.logger.error("Error updating order:", error);
       return {
         code: -1,
         message: "Failed to update order"
@@ -17020,9 +17394,7 @@ var Utils = class {
   }
   async getUserTradingFeeRate(assetClass) {
     const config = this.configManager.getConfig();
-    const brokerAddress = getContractAddressByChainId(
-      config.chainId
-    ).BROKER;
+    const brokerAddress = config.brokerAddress;
     const brokerContract = new import_ethers26.ethers.Contract(
       brokerAddress,
       Broker_default,