@myx-trade/sdk 0.1.42 → 0.1.43

package/dist/index.js

@@ -1469,7 +1469,7 @@ var ARB_TEST_SEPOLIA = {
   POOL_MANAGER: "0xA4A1dfbe40cB725A79D34bd529f0C1b54AB46954",
   Account: "0x6136899e8c77C452bc46AcD786aA2C09fD31f947",
   POSITION_MANAGER: "0x002F28be205E9A1e279d2eeF1f5e472CeA1d910C",
-  ORDER_MANAGER: "0x3A3C7c4588Fb2aE46A4108994a47712E03F96B23",
+  ORDER_MANAGER: "0x4eDe4E20162551F293B9D6f33E8567314fb5612f",
   PYTH: "0x4374e5a8b9C22271E9EB878A2AA31DE97DF15DAF",
   // ！！！ 非Pyth Adapter
   ERC20: "0x7E248Ec1721639413A280d9E82e2862Cae2E6E28",
@@ -1813,7 +1813,7 @@ var RotationProvider = class extends import_providers.BaseProvider {
 // package.json
 var package_default = {
   name: "@myx-trade/sdk",
-  version: "0.1.42",
+  version: "0.1.43",
   private: false,
   publishConfig: {
     access: "public"
@@ -11128,7 +11128,7 @@ var withdraw2 = async (params) => {
     const _gasLimit = await contract["withdrawQuote((bytes32,uint8,uint256,bytes,uint64)[],(bytes32,uint256,uint256,address))"].estimateGas(price, data, { value });
     const gasLimit = bigintTradingGasToRatioCalculator(_gasLimit, chainInfo.gasLimitRatio);
     const { gasPrice } = await bigintTradingGasPriceWithRatio(chainId);
-    const request = await contract["withdrawQuote((bytes32,uint8,uint256,bytes,uint64)[],(bytes32,uint256,uint256,address))"]([], data, {
+    const request = await contract["withdrawQuote((bytes32,uint8,uint256,bytes,uint64)[],(bytes32,uint256,uint256,address))"](price, data, {
       gasLimit,
       gasPrice,
       value
@@ -13136,10 +13136,9 @@ var Order = class {
         slPrice: params.slPrice ? params.slPrice : 0,
         useAccountBalance: false
       };
-      this.logger.info("positionId", params.positionId);
       let transaction;
       if (!params.positionId) {
-        const positionId = 1;
+        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,
@@ -13326,7 +13325,7 @@ var Order = class {
       };
       let transaction;
       if (!params.positionId) {
-        const positionId = 1;
+        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,
@@ -13522,7 +13521,7 @@ var Order = class {
           let transaction2;
           if (!params.positionId) {
             this.logger.info("createPositionTpSlOrder salt position data--->", data2);
-            const positionId = 1;
+            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
@@ -13588,7 +13587,7 @@ var Order = class {
         let transaction;
         if (!params.positionId) {
           this.logger.info("createPositionTpOrSlOrder salt position data--->", data);
-          const positionId = 1;
+          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
@@ -13850,6 +13849,33 @@ var Emiter_default = [
       }
     ]
   },
+  {
+    type: "event",
+    anonymous: false,
+    name: "AddOnFeeTierUpdated",
+    inputs: [
+      {
+        type: "address",
+        name: "broker",
+        indexed: false
+      },
+      {
+        type: "uint8",
+        name: "tier",
+        indexed: false
+      },
+      {
+        type: "uint32",
+        name: "takerFeeRate",
+        indexed: false
+      },
+      {
+        type: "uint32",
+        name: "makerFeeRate",
+        indexed: false
+      }
+    ]
+  },
   {
     type: "event",
     anonymous: false,
@@ -13925,7 +13951,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -14036,7 +14062,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "int32",
+        type: "int16",
         name: "tradingFeeRate",
         indexed: false
       },
@@ -14192,11 +14218,6 @@ var Emiter_default = [
         type: "bytes32",
         name: "poolId",
         indexed: false
-      },
-      {
-        type: "string",
-        name: "reason",
-        indexed: false
       }
     ]
   },
@@ -14257,11 +14278,6 @@ var Emiter_default = [
         name: "orderId",
         indexed: false
       },
-      {
-        type: "bytes32",
-        name: "poolId",
-        indexed: false
-      },
       {
         type: "address",
         name: "executor",
@@ -14354,7 +14370,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -14407,21 +14423,6 @@ var Emiter_default = [
         type: "int256",
         name: "fundingFee",
         indexed: false
-      },
-      {
-        type: "address",
-        name: "executionFeeToken",
-        indexed: false
-      },
-      {
-        type: "uint256",
-        name: "executionFeeAmount",
-        indexed: false
-      },
-      {
-        type: "address",
-        name: "keeper",
-        indexed: false
       }
     ]
   },
@@ -14483,7 +14484,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -15108,7 +15109,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -15155,7 +15156,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -15212,7 +15213,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -15238,43 +15239,6 @@ var Emiter_default = [
       }
     ]
   },
-  {
-    type: "event",
-    anonymous: false,
-    name: "PositionNFTMinted",
-    inputs: [
-      {
-        type: "bytes32",
-        name: "poolId",
-        indexed: false
-      },
-      {
-        type: "bytes32",
-        name: "oldPositionId",
-        indexed: false
-      },
-      {
-        type: "bytes32",
-        name: "newPositionId",
-        indexed: false
-      },
-      {
-        type: "uint256",
-        name: "tokenId",
-        indexed: false
-      },
-      {
-        type: "address",
-        name: "owner",
-        indexed: false
-      },
-      {
-        type: "address",
-        name: "recipient",
-        indexed: false
-      }
-    ]
-  },
   {
     type: "event",
     anonymous: false,
@@ -15291,7 +15255,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       }
@@ -15313,7 +15277,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "bytes32",
+        type: "uint256",
         name: "positionId",
         indexed: false
       },
@@ -15510,43 +15474,6 @@ var Emiter_default = [
       }
     ]
   },
-  {
-    type: "event",
-    anonymous: false,
-    name: "TradingFeeTierUpdated",
-    inputs: [
-      {
-        type: "address",
-        name: "broker",
-        indexed: false
-      },
-      {
-        type: "uint8",
-        name: "feeType",
-        indexed: false
-      },
-      {
-        type: "uint8",
-        name: "tier",
-        indexed: false
-      },
-      {
-        type: "uint32",
-        name: "takerFeeRate",
-        indexed: false
-      },
-      {
-        type: "int32",
-        name: "makerFeeRate",
-        indexed: false
-      },
-      {
-        type: "bool",
-        name: "isEnabled",
-        indexed: false
-      }
-    ]
-  },
   {
     type: "event",
     anonymous: false,
@@ -15643,33 +15570,6 @@ var Emiter_default = [
       }
     ]
   },
-  {
-    type: "event",
-    anonymous: false,
-    name: "UserSpecialFeeTierUpdated",
-    inputs: [
-      {
-        type: "address",
-        name: "broker",
-        indexed: false
-      },
-      {
-        type: "address",
-        name: "user",
-        indexed: false
-      },
-      {
-        type: "uint8",
-        name: "oldTier",
-        indexed: false
-      },
-      {
-        type: "uint8",
-        name: "newTier",
-        indexed: false
-      }
-    ]
-  },
   {
     type: "function",
     name: "UPGRADE_INTERFACE_VERSION",
@@ -15685,7 +15585,7 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "emitCollateralAccepted",
+    name: "emitAddOnFeeTierUpdated",
     constant: false,
     payable: false,
     inputs: [
@@ -15694,28 +15594,20 @@ var Emiter_default = [
         name: "params",
         components: [
           {
-            type: "bytes32",
-            name: "poolId"
-          },
-          {
-            type: "uint256",
-            name: "quoteDebt"
-          },
-          {
-            type: "uint256",
-            name: "baseCollateral"
+            type: "address",
+            name: "broker"
           },
           {
-            type: "uint256",
-            name: "quoteCollateral"
+            type: "uint8",
+            name: "tier"
           },
           {
-            type: "uint256",
-            name: "totalQuoteDebt"
+            type: "uint32",
+            name: "takerFeeRate"
           },
           {
-            type: "uint256",
-            name: "totalBaseCollateral"
+            type: "uint32",
+            name: "makerFeeRate"
           }
         ]
       }
@@ -15724,7 +15616,7 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "emitCollateralAdjusted",
+    name: "emitCollateralAccepted",
     constant: false,
     payable: false,
     inputs: [
@@ -15732,29 +15624,29 @@ var Emiter_default = [
         type: "tuple",
         name: "params",
         components: [
-          {
-            type: "address",
-            name: "user"
-          },
           {
             type: "bytes32",
             name: "poolId"
           },
           {
-            type: "bytes32",
-            name: "positionId"
+            type: "uint256",
+            name: "quoteDebt"
           },
           {
-            type: "uint8",
-            name: "direction"
+            type: "uint256",
+            name: "baseCollateral"
           },
           {
             type: "uint256",
-            name: "beforeCollateralAmount"
+            name: "quoteCollateral"
           },
           {
             type: "uint256",
-            name: "afterCollateralAmount"
+            name: "totalQuoteDebt"
+          },
+          {
+            type: "uint256",
+            name: "totalBaseCollateral"
           }
         ]
       }
@@ -15934,10 +15826,6 @@ var Emiter_default = [
           {
             type: "bytes32",
             name: "poolId"
-          },
-          {
-            type: "string",
-            name: "reason"
           }
         ]
       }
@@ -16005,10 +15893,6 @@ var Emiter_default = [
             type: "uint256",
             name: "orderId"
           },
-          {
-            type: "bytes32",
-            name: "poolId"
-          },
           {
             type: "address",
             name: "executor"
@@ -16111,7 +15995,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "bytes32",
+            type: "uint256",
             name: "positionId"
           },
           {
@@ -16153,18 +16037,6 @@ var Emiter_default = [
           {
             type: "int256",
             name: "fundingFee"
-          },
-          {
-            type: "address",
-            name: "executionFeeToken"
-          },
-          {
-            type: "uint256",
-            name: "executionFeeAmount"
-          },
-          {
-            type: "address",
-            name: "keeper"
           }
         ]
       }
@@ -16233,7 +16105,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "bytes32",
+            type: "uint256",
             name: "positionId"
           },
           {
@@ -16882,7 +16754,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "bytes32",
+            type: "uint256",
             name: "positionId"
           },
           {
@@ -16929,7 +16801,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "bytes32",
+            type: "uint256",
             name: "positionId"
           },
           {
@@ -16976,7 +16848,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "bytes32",
+            type: "uint256",
             name: "positionId"
           },
           {
@@ -17002,7 +16874,7 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "emitPositionNFTMinted",
+    name: "emitPositionTransfer",
     constant: false,
     payable: false,
     inputs: [
@@ -17011,55 +16883,16 @@ var Emiter_default = [
         name: "params",
         components: [
           {
-            type: "bytes32",
-            name: "poolId"
-          },
-          {
-            type: "bytes32",
-            name: "oldPositionId"
-          },
-          {
-            type: "bytes32",
-            name: "newPositionId"
-          },
-          {
-            type: "uint256",
-            name: "tokenId"
+            type: "address",
+            name: "from"
           },
           {
             type: "address",
-            name: "owner"
+            name: "to"
           },
           {
-            type: "address",
-            name: "recipient"
-          }
-        ]
-      }
-    ],
-    outputs: []
-  },
-  {
-    type: "function",
-    name: "emitPositionTransfer",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "tuple",
-        name: "params",
-        components: [
-          {
-            type: "address",
-            name: "from"
-          },
-          {
-            type: "address",
-            name: "to"
-          },
-          {
-            type: "bytes32",
-            name: "positionId"
+            type: "uint256",
+            name: "positionId"
           }
         ]
       }
@@ -17085,7 +16918,7 @@ var Emiter_default = [
             name: "owner"
           },
           {
-            type: "bytes32",
+            type: "uint256",
             name: "positionId"
           },
           {
@@ -17274,45 +17107,6 @@ var Emiter_default = [
     ],
     outputs: []
   },
-  {
-    type: "function",
-    name: "emitTradingFeeTierUpdated",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "tuple",
-        name: "params",
-        components: [
-          {
-            type: "address",
-            name: "broker"
-          },
-          {
-            type: "uint8",
-            name: "feeType"
-          },
-          {
-            type: "uint8",
-            name: "tier"
-          },
-          {
-            type: "uint32",
-            name: "takerFeeRate"
-          },
-          {
-            type: "int32",
-            name: "makerFeeRate"
-          },
-          {
-            type: "bool",
-            name: "isEnabled"
-          }
-        ]
-      }
-    ],
-    outputs: []
-  },
   {
     type: "function",
     name: "emitUserFeeDataUpdated",
@@ -17395,7 +17189,7 @@ var Emiter_default = [
             name: "fundingFee"
           },
           {
-            type: "int32",
+            type: "int16",
             name: "tradingFeeRate"
           },
           {
@@ -17435,37 +17229,6 @@ var Emiter_default = [
     ],
     outputs: []
   },
-  {
-    type: "function",
-    name: "emitUserSpecialFeeTierUpdated",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "tuple",
-        name: "params",
-        components: [
-          {
-            type: "address",
-            name: "broker"
-          },
-          {
-            type: "address",
-            name: "user"
-          },
-          {
-            type: "uint8",
-            name: "oldTier"
-          },
-          {
-            type: "uint8",
-            name: "newTier"
-          }
-        ]
-      }
-    ],
-    outputs: []
-  },
   {
     type: "function",
     name: "getAddressManager",
@@ -17497,6 +17260,24 @@ var Emiter_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "getDependencyIdentifier",
+    constant: true,
+    stateMutability: "view",
+    payable: false,
+    inputs: [
+      {
+        type: "address",
+        name: "contractAddress"
+      }
+    ],
+    outputs: [
+      {
+        type: "bytes32"
+      }
+    ]
+  },
   {
     type: "function",
     name: "getImplementation",
@@ -17567,6 +17348,19 @@ var Emiter_default = [
     ],
     outputs: []
   },
+  {
+    type: "function",
+    name: "registerDependencies",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "bytes32[]",
+        name: "identifiers"
+      }
+    ],
+    outputs: []
+  },
   {
     type: "function",
     name: "sequencer",
@@ -17580,6 +17374,36 @@ var Emiter_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "unregisterDependencies",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "bytes32[]",
+        name: "identifiers"
+      }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "update",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "bytes32",
+        name: "identifier"
+      },
+      {
+        type: "address",
+        name: "newAddress"
+      }
+    ],
+    outputs: []
+  },
   {
     type: "function",
     name: "upgradeTo",
@@ -17923,11 +17747,6 @@ var Account_default = [
     name: "InvalidInitialization",
     inputs: []
   },
-  {
-    type: "error",
-    name: "NotAddressManager",
-    inputs: []
-  },
   {
     type: "error",
     name: "NotDependencyManager",
@@ -18137,19 +17956,6 @@ var Account_default = [
       }
     ]
   },
-  {
-    type: "function",
-    name: "__ERC2771ContextUpgradeable_init",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "trustedForwarder_"
-      }
-    ],
-    outputs: []
-  },
   {
     type: "function",
     name: "deposit",
@@ -18202,6 +18008,24 @@ var Account_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "getDependencyIdentifier",
+    constant: true,
+    stateMutability: "view",
+    payable: false,
+    inputs: [
+      {
+        type: "address",
+        name: "contractAddress"
+      }
+    ],
+    outputs: [
+      {
+        type: "bytes32"
+      }
+    ]
+  },
   {
     type: "function",
     name: "getImplementation",
@@ -18243,28 +18067,6 @@ var Account_default = [
       }
     ]
   },
-  {
-    type: "function",
-    name: "getUserAsset",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "account"
-      },
-      {
-        type: "bytes32",
-        name: "marketId"
-      }
-    ],
-    outputs: [
-      {
-        type: "uint256"
-      }
-    ]
-  },
   {
     type: "function",
     name: "getUserAssets",
@@ -18306,24 +18108,6 @@ var Account_default = [
     ],
     outputs: []
   },
-  {
-    type: "function",
-    name: "isTrustedForwarder",
-    constant: true,
-    stateMutability: "view",
-    payable: false,
-    inputs: [
-      {
-        type: "address",
-        name: "forwarder"
-      }
-    ],
-    outputs: [
-      {
-        type: "bool"
-      }
-    ]
-  },
   {
     type: "function",
     name: "payWithPrincipal",
@@ -18388,6 +18172,19 @@ var Account_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "registerDependencies",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "bytes32[]",
+        name: "identifiers"
+      }
+    ],
+    outputs: []
+  },
   {
     type: "function",
     name: "releaseFromProfitUnlock",
@@ -18424,66 +18221,8 @@ var Account_default = [
         name: "user"
       },
       {
-        type: "tuple",
-        name: "pool",
-        components: [
-          {
-            type: "bytes32",
-            name: "marketId"
-          },
-          {
-            type: "bytes32",
-            name: "poolId"
-          },
-          {
-            type: "address",
-            name: "baseToken"
-          },
-          {
-            type: "address",
-            name: "quoteToken"
-          },
-          {
-            type: "uint8",
-            name: "riskTier"
-          },
-          {
-            type: "uint8",
-            name: "state"
-          },
-          {
-            type: "address",
-            name: "basePoolToken"
-          },
-          {
-            type: "address",
-            name: "quotePoolToken"
-          },
-          {
-            type: "uint16",
-            name: "maxPriceDeviation"
-          },
-          {
-            type: "bool",
-            name: "compoundEnabled"
-          },
-          {
-            type: "uint64",
-            name: "windowCapUsd"
-          },
-          {
-            type: "address",
-            name: "poolVault"
-          },
-          {
-            type: "address",
-            name: "settler"
-          },
-          {
-            type: "address",
-            name: "tradingVault"
-          }
-        ]
+        type: "bytes32",
+        name: "poolId"
       },
       {
         type: "uint256",
@@ -18506,16 +18245,16 @@ var Account_default = [
   },
   {
     type: "function",
-    name: "trustedForwarder",
-    constant: true,
-    stateMutability: "view",
+    name: "unregisterDependencies",
+    constant: false,
     payable: false,
-    inputs: [],
-    outputs: [
+    inputs: [
       {
-        type: "address"
+        type: "bytes32[]",
+        name: "identifiers"
       }
-    ]
+    ],
+    outputs: []
   },
   {
     type: "function",
@@ -18567,10 +18306,6 @@ var Account_default = [
         type: "address",
         name: "receiver"
       },
-      {
-        type: "bool",
-        name: "isQuoteToken"
-      },
       {
         type: "uint256",
         name: "amount"
@@ -19191,7 +18926,7 @@ var Account = class {
     try {
       const account = await config.signer?.getAddress() ?? "";
       console.log("withdraw", account, amount, poolId);
-      const rs = await accountContract.withdraw(poolId, account, true, amount);
+      const rs = await accountContract.withdraw(poolId, account, amount);
       const receipt = await rs?.wait(1);
       return {
         code: 0,