@myx-trade/sdk 0.1.43 → 0.1.44

package/dist/index.js

@@ -1469,7 +1469,7 @@ var ARB_TEST_SEPOLIA = {
   POOL_MANAGER: "0xA4A1dfbe40cB725A79D34bd529f0C1b54AB46954",
   Account: "0x6136899e8c77C452bc46AcD786aA2C09fD31f947",
   POSITION_MANAGER: "0x002F28be205E9A1e279d2eeF1f5e472CeA1d910C",
-  ORDER_MANAGER: "0x4eDe4E20162551F293B9D6f33E8567314fb5612f",
+  ORDER_MANAGER: "0x3A3C7c4588Fb2aE46A4108994a47712E03F96B23",
   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.43",
+  version: "0.1.44",
   private: false,
   publishConfig: {
     access: "public"
@@ -13136,9 +13136,10 @@ var Order = class {
         slPrice: params.slPrice ? params.slPrice : 0,
         useAccountBalance: false
       };
+      this.logger.info("positionId", params.positionId);
       let transaction;
       if (!params.positionId) {
-        const positionId = await this.createPositionId(params.poolId, params.address, params.direction, BigInt(1));
+        const positionId = 1;
         this.logger.info("createIncreaseOrder salt position params--->", { ...data, positionId });
         const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), {
           user: params.address,
@@ -13325,7 +13326,7 @@ var Order = class {
       };
       let transaction;
       if (!params.positionId) {
-        const positionId = await this.createPositionId(params.poolId, params.address, params.direction, BigInt(1));
+        const positionId = 1;
         this.logger.info("createDecreaseOrder salt position params--->", { ...data, positionId });
         const gasLimit = await brokerContract.placeOrderWithPosition.estimateGas(positionId.toString(), {
           user: params.address,
@@ -13521,7 +13522,7 @@ var Order = class {
           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 positionId = 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
@@ -13587,9 +13588,9 @@ var Order = class {
         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, {
+          const positionId = 1;
+          const gasLimit = await brokerContract.placeOrderWithSalt.estimateGas(positionId.toString(), data);
+          transaction = await brokerContract.placeOrderWithSalt(positionId.toString(), data, {
             gasLimit: gasLimit * 120n / 100n
           });
         } else {
@@ -13849,33 +13850,6 @@ 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,
@@ -13951,7 +13925,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -14062,7 +14036,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "int16",
+        type: "int32",
         name: "tradingFeeRate",
         indexed: false
       },
@@ -14218,6 +14192,11 @@ var Emiter_default = [
         type: "bytes32",
         name: "poolId",
         indexed: false
+      },
+      {
+        type: "string",
+        name: "reason",
+        indexed: false
       }
     ]
   },
@@ -14278,6 +14257,11 @@ var Emiter_default = [
         name: "orderId",
         indexed: false
       },
+      {
+        type: "bytes32",
+        name: "poolId",
+        indexed: false
+      },
       {
         type: "address",
         name: "executor",
@@ -14370,7 +14354,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -14423,6 +14407,21 @@ 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
       }
     ]
   },
@@ -14484,7 +14483,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -15109,7 +15108,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -15156,7 +15155,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -15213,7 +15212,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -15239,6 +15238,43 @@ 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,
@@ -15255,7 +15291,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       }
@@ -15277,7 +15313,7 @@ var Emiter_default = [
         indexed: false
       },
       {
-        type: "uint256",
+        type: "bytes32",
         name: "positionId",
         indexed: false
       },
@@ -15474,6 +15510,43 @@ 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,
@@ -15570,6 +15643,33 @@ 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",
@@ -15585,7 +15685,7 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "emitAddOnFeeTierUpdated",
+    name: "emitCollateralAccepted",
     constant: false,
     payable: false,
     inputs: [
@@ -15594,20 +15694,28 @@ var Emiter_default = [
         name: "params",
         components: [
           {
-            type: "address",
-            name: "broker"
+            type: "bytes32",
+            name: "poolId"
           },
           {
-            type: "uint8",
-            name: "tier"
+            type: "uint256",
+            name: "quoteDebt"
           },
           {
-            type: "uint32",
-            name: "takerFeeRate"
+            type: "uint256",
+            name: "baseCollateral"
           },
           {
-            type: "uint32",
-            name: "makerFeeRate"
+            type: "uint256",
+            name: "quoteCollateral"
+          },
+          {
+            type: "uint256",
+            name: "totalQuoteDebt"
+          },
+          {
+            type: "uint256",
+            name: "totalBaseCollateral"
           }
         ]
       }
@@ -15616,7 +15724,7 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "emitCollateralAccepted",
+    name: "emitCollateralAdjusted",
     constant: false,
     payable: false,
     inputs: [
@@ -15625,28 +15733,28 @@ var Emiter_default = [
         name: "params",
         components: [
           {
-            type: "bytes32",
-            name: "poolId"
+            type: "address",
+            name: "user"
           },
           {
-            type: "uint256",
-            name: "quoteDebt"
+            type: "bytes32",
+            name: "poolId"
           },
           {
-            type: "uint256",
-            name: "baseCollateral"
+            type: "bytes32",
+            name: "positionId"
           },
           {
-            type: "uint256",
-            name: "quoteCollateral"
+            type: "uint8",
+            name: "direction"
           },
           {
             type: "uint256",
-            name: "totalQuoteDebt"
+            name: "beforeCollateralAmount"
           },
           {
             type: "uint256",
-            name: "totalBaseCollateral"
+            name: "afterCollateralAmount"
           }
         ]
       }
@@ -15826,6 +15934,10 @@ var Emiter_default = [
           {
             type: "bytes32",
             name: "poolId"
+          },
+          {
+            type: "string",
+            name: "reason"
           }
         ]
       }
@@ -15893,6 +16005,10 @@ var Emiter_default = [
             type: "uint256",
             name: "orderId"
           },
+          {
+            type: "bytes32",
+            name: "poolId"
+          },
           {
             type: "address",
             name: "executor"
@@ -15995,7 +16111,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "uint256",
+            type: "bytes32",
             name: "positionId"
           },
           {
@@ -16037,6 +16153,18 @@ var Emiter_default = [
           {
             type: "int256",
             name: "fundingFee"
+          },
+          {
+            type: "address",
+            name: "executionFeeToken"
+          },
+          {
+            type: "uint256",
+            name: "executionFeeAmount"
+          },
+          {
+            type: "address",
+            name: "keeper"
           }
         ]
       }
@@ -16105,7 +16233,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "uint256",
+            type: "bytes32",
             name: "positionId"
           },
           {
@@ -16754,7 +16882,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "uint256",
+            type: "bytes32",
             name: "positionId"
           },
           {
@@ -16801,7 +16929,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "uint256",
+            type: "bytes32",
             name: "positionId"
           },
           {
@@ -16848,7 +16976,7 @@ var Emiter_default = [
             name: "poolId"
           },
           {
-            type: "uint256",
+            type: "bytes32",
             name: "positionId"
           },
           {
@@ -16874,7 +17002,7 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "emitPositionTransfer",
+    name: "emitPositionNFTMinted",
     constant: false,
     payable: false,
     inputs: [
@@ -16883,16 +17011,55 @@ var Emiter_default = [
         name: "params",
         components: [
           {
-            type: "address",
-            name: "from"
+            type: "bytes32",
+            name: "poolId"
           },
           {
-            type: "address",
-            name: "to"
+            type: "bytes32",
+            name: "oldPositionId"
+          },
+          {
+            type: "bytes32",
+            name: "newPositionId"
           },
           {
             type: "uint256",
-            name: "positionId"
+            name: "tokenId"
+          },
+          {
+            type: "address",
+            name: "owner"
+          },
+          {
+            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"
           }
         ]
       }
@@ -16918,7 +17085,7 @@ var Emiter_default = [
             name: "owner"
           },
           {
-            type: "uint256",
+            type: "bytes32",
             name: "positionId"
           },
           {
@@ -17107,6 +17274,45 @@ 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",
@@ -17189,7 +17395,7 @@ var Emiter_default = [
             name: "fundingFee"
           },
           {
-            type: "int16",
+            type: "int32",
             name: "tradingFeeRate"
           },
           {
@@ -17231,29 +17437,42 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "getAddressManager",
-    constant: true,
-    stateMutability: "view",
+    name: "emitUserSpecialFeeTierUpdated",
+    constant: false,
     payable: false,
-    inputs: [],
-    outputs: [
+    inputs: [
       {
-        type: "address"
+        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: "getDependencyAddress",
+    name: "getAddressManager",
     constant: true,
     stateMutability: "view",
     payable: false,
-    inputs: [
-      {
-        type: "bytes32",
-        name: "identifier"
-      }
-    ],
+    inputs: [],
     outputs: [
       {
         type: "address"
@@ -17262,19 +17481,19 @@ var Emiter_default = [
   },
   {
     type: "function",
-    name: "getDependencyIdentifier",
+    name: "getDependencyAddress",
     constant: true,
     stateMutability: "view",
     payable: false,
     inputs: [
       {
-        type: "address",
-        name: "contractAddress"
+        type: "bytes32",
+        name: "identifier"
       }
     ],
     outputs: [
       {
-        type: "bytes32"
+        type: "address"
       }
     ]
   },
@@ -17348,19 +17567,6 @@ var Emiter_default = [
     ],
     outputs: []
   },
-  {
-    type: "function",
-    name: "registerDependencies",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "bytes32[]",
-        name: "identifiers"
-      }
-    ],
-    outputs: []
-  },
   {
     type: "function",
     name: "sequencer",
@@ -17374,36 +17580,6 @@ 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",
@@ -17747,6 +17923,11 @@ var Account_default = [
     name: "InvalidInitialization",
     inputs: []
   },
+  {
+    type: "error",
+    name: "NotAddressManager",
+    inputs: []
+  },
   {
     type: "error",
     name: "NotDependencyManager",
@@ -17956,6 +18137,19 @@ var Account_default = [
       }
     ]
   },
+  {
+    type: "function",
+    name: "__ERC2771ContextUpgradeable_init",
+    constant: false,
+    payable: false,
+    inputs: [
+      {
+        type: "address",
+        name: "trustedForwarder_"
+      }
+    ],
+    outputs: []
+  },
   {
     type: "function",
     name: "deposit",
@@ -18008,24 +18202,6 @@ 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",
@@ -18067,6 +18243,28 @@ 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",
@@ -18108,6 +18306,24 @@ 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",
@@ -18172,19 +18388,6 @@ var Account_default = [
       }
     ]
   },
-  {
-    type: "function",
-    name: "registerDependencies",
-    constant: false,
-    payable: false,
-    inputs: [
-      {
-        type: "bytes32[]",
-        name: "identifiers"
-      }
-    ],
-    outputs: []
-  },
   {
     type: "function",
     name: "releaseFromProfitUnlock",
@@ -18221,8 +18424,66 @@ var Account_default = [
         name: "user"
       },
       {
-        type: "bytes32",
-        name: "poolId"
+        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: "uint256",
@@ -18245,16 +18506,16 @@ var Account_default = [
   },
   {
     type: "function",
-    name: "unregisterDependencies",
-    constant: false,
+    name: "trustedForwarder",
+    constant: true,
+    stateMutability: "view",
     payable: false,
-    inputs: [
+    inputs: [],
+    outputs: [
       {
-        type: "bytes32[]",
-        name: "identifiers"
+        type: "address"
       }
-    ],
-    outputs: []
+    ]
   },
   {
     type: "function",
@@ -18306,6 +18567,10 @@ var Account_default = [
         type: "address",
         name: "receiver"
       },
+      {
+        type: "bool",
+        name: "isQuoteToken"
+      },
       {
         type: "uint256",
         name: "amount"
@@ -18926,7 +19191,7 @@ var Account = class {
     try {
       const account = await config.signer?.getAddress() ?? "";
       console.log("withdraw", account, amount, poolId);
-      const rs = await accountContract.withdraw(poolId, account, amount);
+      const rs = await accountContract.withdraw(poolId, account, true, amount);
       const receipt = await rs?.wait(1);
       return {
         code: 0,