@pendle/sdk-boros 0.1.47 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/dist/contracts/viemAbis.d.ts +546 -666
  2. package/dist/contracts/viemAbis.js +260 -345
  3. package/dist/contracts/viemAbis.js.map +1 -1
  4. package/dist/entities/agent/agent.js +2 -1
  5. package/dist/entities/agent/agent.js.map +1 -1
  6. package/dist/entities/amm/amm.d.ts +1 -1
  7. package/dist/entities/amm/amm.js +27 -25
  8. package/dist/entities/amm/amm.js.map +1 -1
  9. package/dist/entities/exchange/exchange.d.ts +424 -328
  10. package/dist/entities/exchange/utils.d.ts +118 -94
  11. package/dist/errors/PendleContractError/type.d.ts +6 -2
  12. package/dist/types/common.d.ts +2 -1
  13. package/dist/types/encoders.d.ts +32 -44
  14. package/dist/types/encoders.js +4 -32
  15. package/dist/types/encoders.js.map +1 -1
  16. package/dist/utils/index.d.ts +0 -1
  17. package/dist/utils/index.js +0 -1
  18. package/dist/utils/index.js.map +1 -1
  19. package/dist/utils/signing/sensitive.js +2 -1
  20. package/dist/utils/signing/sensitive.js.map +1 -1
  21. package/package.json +2 -2
  22. package/dist/utils/tickLib.d.ts +0 -6
  23. package/dist/utils/tickLib.js +0 -53
  24. package/dist/utils/tickLib.js.map +0 -1
package/dist/contracts/viemAbis.js CHANGED
@@ -802,7 +802,7 @@ exports.iMarketFactoryAbi = [
802
802
  },
803
803
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
804
804
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
805
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
805
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
806
806
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
807
807
  ],
808
808
  indexed: false,
@@ -855,7 +855,7 @@ exports.iMarketFactoryAbi = [
855
855
  },
856
856
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
857
857
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
858
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
858
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
859
859
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
860
860
  ],
861
861
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -886,15 +886,24 @@ exports.iMarketFactoryAbi = [
886
886
  },
887
887
  ];
888
888
  exports.iRouterAbi = [
889
+ {
890
+ anonymous: false,
891
+ inputs: [
892
+ { indexed: false, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
893
+ { indexed: false, internalType: 'MarketAcc', name: 'amm', type: 'bytes26' },
894
+ ],
895
+ name: 'AMMIdToAccUpdated',
896
+ type: 'event',
897
+ },
889
898
  {
890
899
  anonymous: false,
891
900
  inputs: [
892
901
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
893
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
902
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
894
903
  { indexed: false, internalType: 'int256', name: 'exactSizeIn', type: 'int256' },
895
904
  { indexed: false, internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
896
- { indexed: false, internalType: 'int256', name: 'mintCashIn', type: 'int256' },
897
- { indexed: false, internalType: 'int256', name: 'netCashUsed', type: 'int256' },
905
+ { indexed: false, internalType: 'int256', name: 'netCashIn', type: 'int256' },
906
+ { indexed: false, internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
898
907
  ],
899
908
  name: 'AddLiquidityDualToAmm',
900
909
  type: 'event',
@@ -903,10 +912,11 @@ exports.iRouterAbi = [
903
912
  anonymous: false,
904
913
  inputs: [
905
914
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
906
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
915
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
907
916
  { indexed: false, internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
908
- { indexed: false, internalType: 'int256', name: 'netCashUsed', type: 'int256' },
909
- { indexed: false, internalType: 'int256', name: 'netSizeInterm', type: 'int256' },
917
+ { indexed: false, internalType: 'int256', name: 'netCashIn', type: 'int256' },
918
+ { indexed: false, internalType: 'uint256', name: 'totalTakerOtcFee', type: 'uint256' },
919
+ { indexed: false, internalType: 'int256', name: 'swapSizeInterm', type: 'int256' },
910
920
  ],
911
921
  name: 'AddLiquiditySingleCashToAmm',
912
922
  type: 'event',
@@ -933,10 +943,10 @@ exports.iRouterAbi = [
933
943
  {
934
944
  anonymous: false,
935
945
  inputs: [
936
- { indexed: false, internalType: 'MarketId', name: 'marketId', type: 'uint24' },
937
- { indexed: false, internalType: 'MarketAcc', name: 'amm', type: 'bytes26' },
946
+ { indexed: false, internalType: 'uint256', name: 'newMaxIteration', type: 'uint256' },
947
+ { indexed: false, internalType: 'uint256', name: 'newEps', type: 'uint256' },
938
948
  ],
939
- name: 'MarketIdAmmSet',
949
+ name: 'MaxIterationAndEpsUpdated',
940
950
  type: 'event',
941
951
  },
942
952
  {
@@ -958,11 +968,11 @@ exports.iRouterAbi = [
958
968
  anonymous: false,
959
969
  inputs: [
960
970
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
961
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
971
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
962
972
  { indexed: false, internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
963
- { indexed: false, internalType: 'int256', name: 'burnCashOut', type: 'int256' },
964
- { indexed: false, internalType: 'int256', name: 'netSizeOut', type: 'int256' },
965
973
  { indexed: false, internalType: 'int256', name: 'netCashOut', type: 'int256' },
974
+ { indexed: false, internalType: 'int256', name: 'netSizeOut', type: 'int256' },
975
+ { indexed: false, internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
966
976
  ],
967
977
  name: 'RemoveLiquidityDualFromAmm',
968
978
  type: 'event',
@@ -971,9 +981,10 @@ exports.iRouterAbi = [
971
981
  anonymous: false,
972
982
  inputs: [
973
983
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
974
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
984
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
975
985
  { indexed: false, internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
976
986
  { indexed: false, internalType: 'int256', name: 'netCashOut', type: 'int256' },
987
+ { indexed: false, internalType: 'uint256', name: 'netTakerOtcFee', type: 'uint256' },
977
988
  { indexed: false, internalType: 'int256', name: 'netSizeInterm', type: 'int256' },
978
989
  ],
979
990
  name: 'RemoveLiquiditySingleCashFromAmm',
@@ -1003,9 +1014,8 @@ exports.iRouterAbi = [
1003
1014
  {
1004
1015
  components: [
1005
1016
  { internalType: 'bool', name: 'cross', type: 'bool' },
1006
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1007
- { internalType: 'address', name: 'ammAddr', type: 'address' },
1008
- { internalType: 'int256', name: 'desiredCashIn', type: 'int256' },
1017
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
1018
+ { internalType: 'int256', name: 'maxCashIn', type: 'int256' },
1009
1019
  { internalType: 'int256', name: 'exactSizeIn', type: 'int256' },
1010
1020
  { internalType: 'uint256', name: 'minLpOut', type: 'uint256' },
1011
1021
  ],
@@ -1017,7 +1027,7 @@ exports.iRouterAbi = [
1017
1027
  name: 'addLiquidityDualToAmm',
1018
1028
  outputs: [
1019
1029
  { internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
1020
- { internalType: 'int256', name: 'netCashUsed', type: 'int256' },
1030
+ { internalType: 'int256', name: 'netCashIn', type: 'int256' },
1021
1031
  { internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
1022
1032
  ],
1023
1033
  stateMutability: 'nonpayable',
@@ -1028,12 +1038,9 @@ exports.iRouterAbi = [
1028
1038
  {
1029
1039
  components: [
1030
1040
  { internalType: 'bool', name: 'cross', type: 'bool' },
1031
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1032
- { internalType: 'address', name: 'ammAddr', type: 'address' },
1033
- { internalType: 'int256', name: 'desiredCashIn', type: 'int256' },
1041
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
1042
+ { internalType: 'int256', name: 'netCashIn', type: 'int256' },
1034
1043
  { internalType: 'uint256', name: 'minLpOut', type: 'uint256' },
1035
- { internalType: 'uint256', name: 'maxIteration', type: 'uint256' },
1036
- { internalType: 'uint256', name: 'eps', type: 'uint256' },
1037
1044
  ],
1038
1045
  internalType: 'struct IRouterEventsAndTypes.AddLiquiditySingleCashToAmmReq',
1039
1046
  name: 'req',
@@ -1044,7 +1051,8 @@ exports.iRouterAbi = [
1044
1051
  outputs: [
1045
1052
  { internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
1046
1053
  { internalType: 'int256', name: 'netCashUsed', type: 'int256' },
1047
- { internalType: 'uint256', name: 'netTakerOtcFee', type: 'uint256' },
1054
+ { internalType: 'uint256', name: 'totalTakerOtcFee', type: 'uint256' },
1055
+ { internalType: 'int256', name: 'swapSizeOut', type: 'int256' },
1048
1056
  ],
1049
1057
  stateMutability: 'nonpayable',
1050
1058
  type: 'function',
@@ -1080,11 +1088,19 @@ exports.iRouterAbi = [
1080
1088
  stateMutability: 'view',
1081
1089
  type: 'function',
1082
1090
  },
1091
+ {
1092
+ inputs: [{ internalType: 'AMMId', name: 'ammId', type: 'uint24' }],
1093
+ name: 'ammIdToAcc',
1094
+ outputs: [{ internalType: 'MarketAcc', name: '', type: 'bytes26' }],
1095
+ stateMutability: 'view',
1096
+ type: 'function',
1097
+ },
1083
1098
  {
1084
1099
  inputs: [
1085
1100
  {
1086
1101
  components: [
1087
- { internalType: 'Account', name: 'account', type: 'bytes21' },
1102
+ { internalType: 'address', name: 'root', type: 'address' },
1103
+ { internalType: 'uint8', name: 'accountId', type: 'uint8' },
1088
1104
  { internalType: 'address', name: 'agent', type: 'address' },
1089
1105
  { internalType: 'uint64', name: 'expiry', type: 'uint64' },
1090
1106
  { internalType: 'uint64', name: 'nonce', type: 'uint64' },
@@ -1155,31 +1171,6 @@ exports.iRouterAbi = [
1155
1171
  stateMutability: 'nonpayable',
1156
1172
  type: 'function',
1157
1173
  },
1158
- {
1159
- inputs: [
1160
- {
1161
- components: [
1162
- { internalType: 'bool', name: 'cross', type: 'bool' },
1163
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1164
- { internalType: 'OrderId[]', name: 'idsToCancel', type: 'uint64[]' },
1165
- { internalType: 'Side', name: 'side', type: 'uint8' },
1166
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
1167
- { internalType: 'uint256[]', name: 'sizes', type: 'uint256[]' },
1168
- { internalType: 'int16[]', name: 'limitTicks', type: 'int16[]' },
1169
- ],
1170
- internalType: 'struct IRouterEventsAndTypes.BulkModify',
1171
- name: 'req',
1172
- type: 'tuple',
1173
- },
1174
- ],
1175
- name: 'bulkModifies',
1176
- outputs: [
1177
- { internalType: 'Trade', name: 'matched', type: 'uint256' },
1178
- { internalType: 'uint256', name: 'takerFee', type: 'uint256' },
1179
- ],
1180
- stateMutability: 'nonpayable',
1181
- type: 'function',
1182
- },
1183
1174
  {
1184
1175
  inputs: [
1185
1176
  {
@@ -1190,6 +1181,8 @@ exports.iRouterAbi = [
1190
1181
  { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
1191
1182
  { internalType: 'uint256[]', name: 'sizes', type: 'uint256[]' },
1192
1183
  { internalType: 'int16[]', name: 'limitTicks', type: 'int16[]' },
1184
+ { internalType: 'OrderId[]', name: 'idsToStrictCancel', type: 'uint64[]' },
1185
+ { internalType: 'int128', name: 'desiredMatchRate', type: 'int128' },
1193
1186
  ],
1194
1187
  internalType: 'struct IRouterEventsAndTypes.BulkOrders',
1195
1188
  name: 'req',
@@ -1209,8 +1202,7 @@ exports.iRouterAbi = [
1209
1202
  {
1210
1203
  components: [
1211
1204
  { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1212
- { internalType: 'uint256', name: 'amount', type: 'uint256' },
1213
- { internalType: 'bool', name: 'isDeposit', type: 'bool' },
1205
+ { internalType: 'int256', name: 'signedAmount', type: 'int256' },
1214
1206
  ],
1215
1207
  internalType: 'struct IRouterEventsAndTypes.CashTransferReq',
1216
1208
  name: 'transfer',
@@ -1227,56 +1219,15 @@ exports.iRouterAbi = [
1227
1219
  {
1228
1220
  components: [
1229
1221
  { internalType: 'bool', name: 'cross', type: 'bool' },
1230
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1231
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
1232
- { internalType: 'Side', name: 'side', type: 'uint8' },
1233
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
1234
- { internalType: 'int16', name: 'tick', type: 'int16' },
1235
- { internalType: 'uint256', name: 'size', type: 'uint256' },
1236
- ],
1237
- internalType: 'struct IRouterEventsAndTypes.Order',
1238
- name: 'order',
1239
- type: 'tuple',
1240
- },
1241
- ],
1242
- name: 'closeIsolatedPosition',
1243
- outputs: [
1244
- { internalType: 'Trade', name: 'matched', type: 'uint256' },
1245
- { internalType: 'int256', name: 'amountOut', type: 'int256' },
1246
- ],
1247
- stateMutability: 'nonpayable',
1248
- type: 'function',
1249
- },
1250
- {
1251
- inputs: [
1252
- {
1253
- components: [
1254
- { internalType: 'bool', name: 'cross', type: 'bool' },
1255
- { internalType: 'MarketId[]', name: 'marketIds', type: 'uint24[]' },
1256
- ],
1257
- internalType: 'struct IRouterEventsAndTypes.EnterMarketsReq',
1258
- name: 'req',
1259
- type: 'tuple',
1260
- },
1261
- ],
1262
- name: 'enterMarkets',
1263
- outputs: [],
1264
- stateMutability: 'nonpayable',
1265
- type: 'function',
1266
- },
1267
- {
1268
- inputs: [
1269
- {
1270
- components: [
1271
- { internalType: 'bool', name: 'cross', type: 'bool' },
1222
+ { internalType: 'bool', name: 'isEnter', type: 'bool' },
1272
1223
  { internalType: 'MarketId[]', name: 'marketIds', type: 'uint24[]' },
1273
1224
  ],
1274
- internalType: 'struct IRouterEventsAndTypes.ExitMarketsReq',
1225
+ internalType: 'struct IRouterEventsAndTypes.EnterExitMarketsReq',
1275
1226
  name: 'req',
1276
1227
  type: 'tuple',
1277
1228
  },
1278
1229
  ],
1279
- name: 'exitMarkets',
1230
+ name: 'enterExitMarkets',
1280
1231
  outputs: [],
1281
1232
  stateMutability: 'nonpayable',
1282
1233
  type: 'function',
@@ -1308,40 +1259,13 @@ exports.iRouterAbi = [
1308
1259
  type: 'function',
1309
1260
  },
1310
1261
  {
1311
- inputs: [{ internalType: 'MarketId', name: 'marketId', type: 'uint24' }],
1312
- name: 'marketIdAmm',
1313
- outputs: [{ internalType: 'MarketAcc', name: '', type: 'bytes26' }],
1314
- stateMutability: 'view',
1315
- type: 'function',
1316
- },
1317
- {
1318
- inputs: [
1319
- {
1320
- components: [
1321
- { internalType: 'OrderId', name: 'idToCancel', type: 'uint64' },
1322
- {
1323
- components: [
1324
- { internalType: 'bool', name: 'cross', type: 'bool' },
1325
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1326
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
1327
- { internalType: 'Side', name: 'side', type: 'uint8' },
1328
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
1329
- { internalType: 'int16', name: 'tick', type: 'int16' },
1330
- { internalType: 'uint256', name: 'size', type: 'uint256' },
1331
- ],
1332
- internalType: 'struct IRouterEventsAndTypes.Order',
1333
- name: 'newOrder',
1334
- type: 'tuple',
1335
- },
1336
- ],
1337
- internalType: 'struct IRouterEventsAndTypes.ModifyOrderReq',
1338
- name: 'req',
1339
- type: 'tuple',
1340
- },
1262
+ inputs: [],
1263
+ name: 'maxIterationAndEps',
1264
+ outputs: [
1265
+ { internalType: 'uint256', name: 'maxIteration', type: 'uint256' },
1266
+ { internalType: 'uint256', name: 'eps', type: 'uint256' },
1341
1267
  ],
1342
- name: 'modifyOrder',
1343
- outputs: [{ internalType: 'Trade', name: 'matched', type: 'uint256' }],
1344
- stateMutability: 'nonpayable',
1268
+ stateMutability: 'view',
1345
1269
  type: 'function',
1346
1270
  },
1347
1271
  {
@@ -1359,48 +1283,33 @@ exports.iRouterAbi = [
1359
1283
  components: [
1360
1284
  { internalType: 'bool', name: 'cross', type: 'bool' },
1361
1285
  { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1362
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
1286
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
1363
1287
  { internalType: 'Side', name: 'side', type: 'uint8' },
1364
1288
  { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
1365
- { internalType: 'int16', name: 'tick', type: 'int16' },
1366
1289
  { internalType: 'uint256', name: 'size', type: 'uint256' },
1290
+ { internalType: 'int16', name: 'tick', type: 'int16' },
1367
1291
  ],
1368
1292
  internalType: 'struct IRouterEventsAndTypes.Order',
1369
1293
  name: 'order',
1370
1294
  type: 'tuple',
1371
1295
  },
1372
- { internalType: 'uint256', name: 'cashIn', type: 'uint256' },
1373
1296
  { internalType: 'bool', name: 'enterMarket', type: 'bool' },
1297
+ { internalType: 'OrderId', name: 'idToStrictCancel', type: 'uint64' },
1298
+ { internalType: 'bool', name: 'exitMarket', type: 'bool' },
1299
+ { internalType: 'uint256', name: 'isolated_cashIn', type: 'uint256' },
1300
+ { internalType: 'bool', name: 'isolated_cashTransferAll', type: 'bool' },
1301
+ { internalType: 'int128', name: 'desiredMatchRate', type: 'int128' },
1374
1302
  ],
1375
- internalType: 'struct IRouterEventsAndTypes.OpenIsolatedPositionRequest',
1303
+ internalType: 'struct IRouterEventsAndTypes.SingleOrderReq',
1376
1304
  name: 'req',
1377
1305
  type: 'tuple',
1378
1306
  },
1379
1307
  ],
1380
- name: 'openIsolatedPosition',
1381
- outputs: [{ internalType: 'Trade', name: 'matched', type: 'uint256' }],
1382
- stateMutability: 'nonpayable',
1383
- type: 'function',
1384
- },
1385
- {
1386
- inputs: [
1387
- {
1388
- components: [
1389
- { internalType: 'bool', name: 'cross', type: 'bool' },
1390
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1391
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
1392
- { internalType: 'Side', name: 'side', type: 'uint8' },
1393
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
1394
- { internalType: 'int16', name: 'tick', type: 'int16' },
1395
- { internalType: 'uint256', name: 'size', type: 'uint256' },
1396
- ],
1397
- internalType: 'struct IRouterEventsAndTypes.Order',
1398
- name: 'order',
1399
- type: 'tuple',
1400
- },
1308
+ name: 'placeSingleOrder',
1309
+ outputs: [
1310
+ { internalType: 'Trade', name: 'matched', type: 'uint256' },
1311
+ { internalType: 'int256', name: 'cashWithdrawn', type: 'int256' },
1401
1312
  ],
1402
- name: 'placeOrder',
1403
- outputs: [{ internalType: 'Trade', name: 'matched', type: 'uint256' }],
1404
1313
  stateMutability: 'nonpayable',
1405
1314
  type: 'function',
1406
1315
  },
@@ -1409,11 +1318,11 @@ exports.iRouterAbi = [
1409
1318
  {
1410
1319
  components: [
1411
1320
  { internalType: 'bool', name: 'cross', type: 'bool' },
1412
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1413
- { internalType: 'address', name: 'ammAddr', type: 'address' },
1321
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
1414
1322
  { internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
1415
1323
  { internalType: 'int256', name: 'minCashOut', type: 'int256' },
1416
- { internalType: 'int256', name: 'desiredSizeOut', type: 'int256' },
1324
+ { internalType: 'int256', name: 'minSizeOut', type: 'int256' },
1325
+ { internalType: 'int256', name: 'maxSizeOut', type: 'int256' },
1417
1326
  ],
1418
1327
  internalType: 'struct IRouterEventsAndTypes.RemoveLiquidityDualFromAmmReq',
1419
1328
  name: 'req',
@@ -1434,8 +1343,7 @@ exports.iRouterAbi = [
1434
1343
  {
1435
1344
  components: [
1436
1345
  { internalType: 'bool', name: 'cross', type: 'bool' },
1437
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1438
- { internalType: 'address', name: 'ammAddr', type: 'address' },
1346
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
1439
1347
  { internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
1440
1348
  { internalType: 'int256', name: 'minCashOut', type: 'int256' },
1441
1349
  ],
@@ -1448,6 +1356,7 @@ exports.iRouterAbi = [
1448
1356
  outputs: [
1449
1357
  { internalType: 'int256', name: 'netCashOut', type: 'int256' },
1450
1358
  { internalType: 'uint256', name: 'netTakerOtcFee', type: 'uint256' },
1359
+ { internalType: 'int256', name: 'swapSizeInterm', type: 'int256' },
1451
1360
  ],
1452
1361
  stateMutability: 'nonpayable',
1453
1362
  type: 'function',
@@ -1456,11 +1365,12 @@ exports.iRouterAbi = [
1456
1365
  inputs: [
1457
1366
  {
1458
1367
  components: [
1459
- { internalType: 'Account', name: 'account', type: 'bytes21' },
1368
+ { internalType: 'address', name: 'root', type: 'address' },
1369
+ { internalType: 'uint8', name: 'accountId', type: 'uint8' },
1460
1370
  { internalType: 'address[]', name: 'agents', type: 'address[]' },
1461
1371
  { internalType: 'uint64', name: 'nonce', type: 'uint64' },
1462
1372
  ],
1463
- internalType: 'struct IRouterEventsAndTypes.RevokeAgentMessage',
1373
+ internalType: 'struct IRouterEventsAndTypes.RevokeAgentsMessage',
1464
1374
  name: 'data',
1465
1375
  type: 'tuple',
1466
1376
  },
@@ -1471,11 +1381,19 @@ exports.iRouterAbi = [
1471
1381
  stateMutability: 'nonpayable',
1472
1382
  type: 'function',
1473
1383
  },
1384
+ {
1385
+ inputs: [{ internalType: 'address', name: 'amm', type: 'address' }],
1386
+ name: 'setAMMIdToAcc',
1387
+ outputs: [],
1388
+ stateMutability: 'nonpayable',
1389
+ type: 'function',
1390
+ },
1474
1391
  {
1475
1392
  inputs: [
1476
1393
  {
1477
1394
  components: [
1478
- { internalType: 'Account', name: 'account', type: 'bytes21' },
1395
+ { internalType: 'address', name: 'root', type: 'address' },
1396
+ { internalType: 'uint8', name: 'accountId', type: 'uint8' },
1479
1397
  { internalType: 'address', name: 'accManager', type: 'address' },
1480
1398
  { internalType: 'uint64', name: 'nonce', type: 'uint64' },
1481
1399
  ],
@@ -1492,10 +1410,10 @@ exports.iRouterAbi = [
1492
1410
  },
1493
1411
  {
1494
1412
  inputs: [
1495
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1496
- { internalType: 'MarketAcc', name: 'amm', type: 'bytes26' },
1413
+ { internalType: 'uint256', name: 'newMaxIteration', type: 'uint256' },
1414
+ { internalType: 'uint256', name: 'newEps', type: 'uint256' },
1497
1415
  ],
1498
- name: 'setMarketIdAmm',
1416
+ name: 'setMaxIterationAndEps',
1499
1417
  outputs: [],
1500
1418
  stateMutability: 'nonpayable',
1501
1419
  type: 'function',
@@ -1560,10 +1478,9 @@ exports.iRouterAbi = [
1560
1478
  {
1561
1479
  components: [
1562
1480
  { internalType: 'bool', name: 'cross', type: 'bool' },
1563
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
1564
- { internalType: 'address', name: 'ammAddr', type: 'address' },
1481
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
1565
1482
  { internalType: 'int256', name: 'signedSize', type: 'int256' },
1566
- { internalType: 'int256', name: 'maxCost', type: 'int256' },
1483
+ { internalType: 'int128', name: 'desiredSwapRate', type: 'int128' },
1567
1484
  ],
1568
1485
  internalType: 'struct IRouterEventsAndTypes.SwapWithAmmReq',
1569
1486
  name: 'req',
@@ -1573,7 +1490,7 @@ exports.iRouterAbi = [
1573
1490
  name: 'swapWithAmm',
1574
1491
  outputs: [
1575
1492
  { internalType: 'Trade', name: 'matched', type: 'uint256' },
1576
- { internalType: 'uint256', name: 'otcFee', type: 'uint256' },
1493
+ { internalType: 'uint256', name: 'takerOtcFee', type: 'uint256' },
1577
1494
  ],
1578
1495
  stateMutability: 'nonpayable',
1579
1496
  type: 'function',
@@ -1741,7 +1658,7 @@ exports.iMarketAllEventsAndTypesAbi = [
1741
1658
  },
1742
1659
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
1743
1660
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
1744
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
1661
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
1745
1662
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
1746
1663
  ],
1747
1664
  indexed: false,
@@ -1907,7 +1824,7 @@ exports.iMarketAbi = [
1907
1824
  },
1908
1825
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
1909
1826
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
1910
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
1827
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
1911
1828
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
1912
1829
  ],
1913
1830
  indexed: false,
@@ -2109,7 +2026,7 @@ exports.iMarketAbi = [
2109
2026
  },
2110
2027
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
2111
2028
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
2112
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2029
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
2113
2030
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
2114
2031
  ],
2115
2032
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -2236,7 +2153,7 @@ exports.iMarketAbi = [
2236
2153
  },
2237
2154
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
2238
2155
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
2239
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2156
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
2240
2157
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
2241
2158
  ],
2242
2159
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -2393,7 +2310,7 @@ exports.iMarketOffAbi = [
2393
2310
  },
2394
2311
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
2395
2312
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
2396
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2313
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
2397
2314
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
2398
2315
  ],
2399
2316
  indexed: false,
@@ -2655,7 +2572,7 @@ exports.iMarketOffAbi = [
2655
2572
  },
2656
2573
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
2657
2574
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
2658
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2575
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
2659
2576
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
2660
2577
  ],
2661
2578
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -2770,7 +2687,7 @@ exports.iMarketOffAbi = [
2770
2687
  },
2771
2688
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
2772
2689
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
2773
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2690
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
2774
2691
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
2775
2692
  ],
2776
2693
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -2911,7 +2828,7 @@ exports.iMarketOffAbi = [
2911
2828
  },
2912
2829
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
2913
2830
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
2914
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2831
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
2915
2832
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
2916
2833
  ],
2917
2834
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -3075,7 +2992,7 @@ exports.iMarketOrderAndOtcAbi = [
3075
2992
  },
3076
2993
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
3077
2994
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
3078
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
2995
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
3079
2996
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
3080
2997
  ],
3081
2998
  indexed: false,
@@ -3292,7 +3209,7 @@ exports.iMarketSettingAbi = [
3292
3209
  },
3293
3210
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
3294
3211
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
3295
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
3212
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
3296
3213
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
3297
3214
  ],
3298
3215
  indexed: false,
@@ -3392,7 +3309,7 @@ exports.iMarketSettingAbi = [
3392
3309
  },
3393
3310
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
3394
3311
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
3395
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
3312
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
3396
3313
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
3397
3314
  ],
3398
3315
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -3442,7 +3359,7 @@ exports.iMarketSettingAbi = [
3442
3359
  },
3443
3360
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
3444
3361
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
3445
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
3362
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
3446
3363
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
3447
3364
  ],
3448
3365
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -3585,7 +3502,7 @@ exports.iMarketEntryAbi = [
3585
3502
  },
3586
3503
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
3587
3504
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
3588
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
3505
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
3589
3506
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
3590
3507
  ],
3591
3508
  indexed: false,
@@ -3894,7 +3811,7 @@ exports.iMarketOffViewOnlyAbi = [
3894
3811
  },
3895
3812
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
3896
3813
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
3897
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
3814
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
3898
3815
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
3899
3816
  ],
3900
3817
  indexed: false,
@@ -4068,7 +3985,7 @@ exports.iMarketOffViewOnlyAbi = [
4068
3985
  },
4069
3986
  { internalType: 'uint64', name: 'IMFactor', type: 'uint64' },
4070
3987
  { internalType: 'uint64', name: 'MMFactor', type: 'uint64' },
4071
- { internalType: 'uint128', name: 'minMarginIndexRate', type: 'uint128' },
3988
+ { internalType: 'uint16', name: 'minMarginIndexTick', type: 'uint16' },
4072
3989
  { internalType: 'uint32', name: 'minMarginIndexDuration', type: 'uint32' },
4073
3990
  ],
4074
3991
  internalType: 'struct IMarketAllTypes.MarketConfigStruct',
@@ -4408,7 +4325,7 @@ exports.iExplorerAbi = [
4408
4325
  type: 'function',
4409
4326
  },
4410
4327
  {
4411
- inputs: [{ internalType: 'contract IMarketOff', name: 'market', type: 'address' }],
4328
+ inputs: [{ internalType: 'MarketId', name: 'marketId', type: 'uint24' }],
4412
4329
  name: 'getMarketInfo',
4413
4330
  outputs: [
4414
4331
  {
@@ -4436,7 +4353,7 @@ exports.iExplorerAbi = [
4436
4353
  },
4437
4354
  {
4438
4355
  inputs: [
4439
- { internalType: 'contract IMarketOff', name: 'market', type: 'address' },
4356
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4440
4357
  { internalType: 'Side', name: 'side', type: 'uint8' },
4441
4358
  { internalType: 'int16', name: 'from', type: 'int16' },
4442
4359
  { internalType: 'int16', name: 'to', type: 'int16' },
@@ -4455,7 +4372,7 @@ exports.iExplorerAbi = [
4455
4372
  { internalType: 'int256', name: 'totalCash', type: 'int256' },
4456
4373
  {
4457
4374
  components: [
4458
- { internalType: 'address', name: 'market', type: 'address' },
4375
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4459
4376
  { internalType: 'int256', name: 'signedSize', type: 'int256' },
4460
4377
  { internalType: 'int256', name: 'positionValue', type: 'int256' },
4461
4378
  { internalType: 'int256', name: 'liquidationApr', type: 'int256' },
@@ -4492,7 +4409,7 @@ exports.iExplorerAbi = [
4492
4409
  {
4493
4410
  inputs: [
4494
4411
  { internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
4495
- { internalType: 'contract IMarketOff', name: 'market', type: 'address' },
4412
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4496
4413
  { internalType: 'bool', name: 'cancelAll', type: 'bool' },
4497
4414
  { internalType: 'OrderId[]', name: 'orderIds', type: 'uint64[]' },
4498
4415
  ],
@@ -4503,7 +4420,7 @@ exports.iExplorerAbi = [
4503
4420
  { internalType: 'int256', name: 'totalCash', type: 'int256' },
4504
4421
  {
4505
4422
  components: [
4506
- { internalType: 'address', name: 'market', type: 'address' },
4423
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4507
4424
  { internalType: 'int256', name: 'signedSize', type: 'int256' },
4508
4425
  { internalType: 'int256', name: 'positionValue', type: 'int256' },
4509
4426
  { internalType: 'int256', name: 'liquidationApr', type: 'int256' },
@@ -4538,7 +4455,7 @@ exports.iExplorerAbi = [
4538
4455
  { internalType: 'int256', name: 'totalCash', type: 'int256' },
4539
4456
  {
4540
4457
  components: [
4541
- { internalType: 'address', name: 'market', type: 'address' },
4458
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4542
4459
  { internalType: 'int256', name: 'signedSize', type: 'int256' },
4543
4460
  { internalType: 'int256', name: 'positionValue', type: 'int256' },
4544
4461
  { internalType: 'int256', name: 'liquidationApr', type: 'int256' },
@@ -4575,12 +4492,13 @@ exports.iExplorerAbi = [
4575
4492
  {
4576
4493
  inputs: [
4577
4494
  { internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
4578
- { internalType: 'contract IMarketOff', name: 'market', type: 'address' },
4579
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
4495
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4496
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
4580
4497
  { internalType: 'Side', name: 'side', type: 'uint8' },
4581
4498
  { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4582
4499
  { internalType: 'uint256', name: 'size', type: 'uint256' },
4583
4500
  { internalType: 'int16', name: 'tick', type: 'int16' },
4501
+ { internalType: 'int128', name: 'desiredMatchRate', type: 'int128' },
4584
4502
  ],
4585
4503
  name: 'getUserInfoAfterPlaceOrder',
4586
4504
  outputs: [
@@ -4589,7 +4507,7 @@ exports.iExplorerAbi = [
4589
4507
  { internalType: 'int256', name: 'totalCash', type: 'int256' },
4590
4508
  {
4591
4509
  components: [
4592
- { internalType: 'address', name: 'market', type: 'address' },
4510
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4593
4511
  { internalType: 'int256', name: 'signedSize', type: 'int256' },
4594
4512
  { internalType: 'int256', name: 'positionValue', type: 'int256' },
4595
4513
  { internalType: 'int256', name: 'liquidationApr', type: 'int256' },
@@ -4624,7 +4542,7 @@ exports.iExplorerAbi = [
4624
4542
  { internalType: 'int256', name: 'totalCash', type: 'int256' },
4625
4543
  {
4626
4544
  components: [
4627
- { internalType: 'address', name: 'market', type: 'address' },
4545
+ { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4628
4546
  { internalType: 'int256', name: 'signedSize', type: 'int256' },
4629
4547
  { internalType: 'int256', name: 'positionValue', type: 'int256' },
4630
4548
  { internalType: 'int256', name: 'liquidationApr', type: 'int256' },
@@ -4675,11 +4593,11 @@ exports.iTradeModuleAbi = [
4675
4593
  anonymous: false,
4676
4594
  inputs: [
4677
4595
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
4678
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4596
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
4679
4597
  { indexed: false, internalType: 'int256', name: 'exactSizeIn', type: 'int256' },
4680
4598
  { indexed: false, internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
4681
- { indexed: false, internalType: 'int256', name: 'mintCashIn', type: 'int256' },
4682
- { indexed: false, internalType: 'int256', name: 'netCashUsed', type: 'int256' },
4599
+ { indexed: false, internalType: 'int256', name: 'netCashIn', type: 'int256' },
4600
+ { indexed: false, internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
4683
4601
  ],
4684
4602
  name: 'AddLiquidityDualToAmm',
4685
4603
  type: 'event',
@@ -4688,10 +4606,11 @@ exports.iTradeModuleAbi = [
4688
4606
  anonymous: false,
4689
4607
  inputs: [
4690
4608
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
4691
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4609
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
4692
4610
  { indexed: false, internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
4693
- { indexed: false, internalType: 'int256', name: 'netCashUsed', type: 'int256' },
4694
- { indexed: false, internalType: 'int256', name: 'netSizeInterm', type: 'int256' },
4611
+ { indexed: false, internalType: 'int256', name: 'netCashIn', type: 'int256' },
4612
+ { indexed: false, internalType: 'uint256', name: 'totalTakerOtcFee', type: 'uint256' },
4613
+ { indexed: false, internalType: 'int256', name: 'swapSizeInterm', type: 'int256' },
4695
4614
  ],
4696
4615
  name: 'AddLiquiditySingleCashToAmm',
4697
4616
  type: 'event',
@@ -4728,11 +4647,11 @@ exports.iTradeModuleAbi = [
4728
4647
  anonymous: false,
4729
4648
  inputs: [
4730
4649
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
4731
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4650
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
4732
4651
  { indexed: false, internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
4733
- { indexed: false, internalType: 'int256', name: 'burnCashOut', type: 'int256' },
4734
- { indexed: false, internalType: 'int256', name: 'netSizeOut', type: 'int256' },
4735
4652
  { indexed: false, internalType: 'int256', name: 'netCashOut', type: 'int256' },
4653
+ { indexed: false, internalType: 'int256', name: 'netSizeOut', type: 'int256' },
4654
+ { indexed: false, internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
4736
4655
  ],
4737
4656
  name: 'RemoveLiquidityDualFromAmm',
4738
4657
  type: 'event',
@@ -4741,9 +4660,10 @@ exports.iTradeModuleAbi = [
4741
4660
  anonymous: false,
4742
4661
  inputs: [
4743
4662
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
4744
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4663
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
4745
4664
  { indexed: false, internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
4746
4665
  { indexed: false, internalType: 'int256', name: 'netCashOut', type: 'int256' },
4666
+ { indexed: false, internalType: 'uint256', name: 'netTakerOtcFee', type: 'uint256' },
4747
4667
  { indexed: false, internalType: 'int256', name: 'netSizeInterm', type: 'int256' },
4748
4668
  ],
4749
4669
  name: 'RemoveLiquiditySingleCashFromAmm',
@@ -4768,31 +4688,6 @@ exports.iTradeModuleAbi = [
4768
4688
  stateMutability: 'nonpayable',
4769
4689
  type: 'function',
4770
4690
  },
4771
- {
4772
- inputs: [
4773
- {
4774
- components: [
4775
- { internalType: 'bool', name: 'cross', type: 'bool' },
4776
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4777
- { internalType: 'OrderId[]', name: 'idsToCancel', type: 'uint64[]' },
4778
- { internalType: 'Side', name: 'side', type: 'uint8' },
4779
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4780
- { internalType: 'uint256[]', name: 'sizes', type: 'uint256[]' },
4781
- { internalType: 'int16[]', name: 'limitTicks', type: 'int16[]' },
4782
- ],
4783
- internalType: 'struct IRouterEventsAndTypes.BulkModify',
4784
- name: 'req',
4785
- type: 'tuple',
4786
- },
4787
- ],
4788
- name: 'bulkModifies',
4789
- outputs: [
4790
- { internalType: 'Trade', name: 'matched', type: 'uint256' },
4791
- { internalType: 'uint256', name: 'takerFee', type: 'uint256' },
4792
- ],
4793
- stateMutability: 'nonpayable',
4794
- type: 'function',
4795
- },
4796
4691
  {
4797
4692
  inputs: [
4798
4693
  {
@@ -4803,6 +4698,8 @@ exports.iTradeModuleAbi = [
4803
4698
  { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4804
4699
  { internalType: 'uint256[]', name: 'sizes', type: 'uint256[]' },
4805
4700
  { internalType: 'int16[]', name: 'limitTicks', type: 'int16[]' },
4701
+ { internalType: 'OrderId[]', name: 'idsToStrictCancel', type: 'uint64[]' },
4702
+ { internalType: 'int128', name: 'desiredMatchRate', type: 'int128' },
4806
4703
  ],
4807
4704
  internalType: 'struct IRouterEventsAndTypes.BulkOrders',
4808
4705
  name: 'req',
@@ -4822,8 +4719,7 @@ exports.iTradeModuleAbi = [
4822
4719
  {
4823
4720
  components: [
4824
4721
  { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4825
- { internalType: 'uint256', name: 'amount', type: 'uint256' },
4826
- { internalType: 'bool', name: 'isDeposit', type: 'bool' },
4722
+ { internalType: 'int256', name: 'signedAmount', type: 'int256' },
4827
4723
  ],
4828
4724
  internalType: 'struct IRouterEventsAndTypes.CashTransferReq',
4829
4725
  name: 'transfer',
@@ -4840,56 +4736,15 @@ exports.iTradeModuleAbi = [
4840
4736
  {
4841
4737
  components: [
4842
4738
  { internalType: 'bool', name: 'cross', type: 'bool' },
4843
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4844
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
4845
- { internalType: 'Side', name: 'side', type: 'uint8' },
4846
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4847
- { internalType: 'int16', name: 'tick', type: 'int16' },
4848
- { internalType: 'uint256', name: 'size', type: 'uint256' },
4849
- ],
4850
- internalType: 'struct IRouterEventsAndTypes.Order',
4851
- name: 'order',
4852
- type: 'tuple',
4853
- },
4854
- ],
4855
- name: 'closeIsolatedPosition',
4856
- outputs: [
4857
- { internalType: 'Trade', name: 'matched', type: 'uint256' },
4858
- { internalType: 'int256', name: 'amountOut', type: 'int256' },
4859
- ],
4860
- stateMutability: 'nonpayable',
4861
- type: 'function',
4862
- },
4863
- {
4864
- inputs: [
4865
- {
4866
- components: [
4867
- { internalType: 'bool', name: 'cross', type: 'bool' },
4739
+ { internalType: 'bool', name: 'isEnter', type: 'bool' },
4868
4740
  { internalType: 'MarketId[]', name: 'marketIds', type: 'uint24[]' },
4869
4741
  ],
4870
- internalType: 'struct IRouterEventsAndTypes.EnterMarketsReq',
4742
+ internalType: 'struct IRouterEventsAndTypes.EnterExitMarketsReq',
4871
4743
  name: 'req',
4872
4744
  type: 'tuple',
4873
4745
  },
4874
4746
  ],
4875
- name: 'enterMarkets',
4876
- outputs: [],
4877
- stateMutability: 'nonpayable',
4878
- type: 'function',
4879
- },
4880
- {
4881
- inputs: [
4882
- {
4883
- components: [
4884
- { internalType: 'bool', name: 'cross', type: 'bool' },
4885
- { internalType: 'MarketId[]', name: 'marketIds', type: 'uint24[]' },
4886
- ],
4887
- internalType: 'struct IRouterEventsAndTypes.ExitMarketsReq',
4888
- name: 'req',
4889
- type: 'tuple',
4890
- },
4891
- ],
4892
- name: 'exitMarkets',
4747
+ name: 'enterExitMarkets',
4893
4748
  outputs: [],
4894
4749
  stateMutability: 'nonpayable',
4895
4750
  type: 'function',
@@ -4913,82 +4768,37 @@ exports.iTradeModuleAbi = [
4913
4768
  inputs: [
4914
4769
  {
4915
4770
  components: [
4916
- { internalType: 'OrderId', name: 'idToCancel', type: 'uint64' },
4917
4771
  {
4918
4772
  components: [
4919
4773
  { internalType: 'bool', name: 'cross', type: 'bool' },
4920
4774
  { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4921
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
4775
+ { internalType: 'AMMId', name: 'ammId', type: 'uint24' },
4922
4776
  { internalType: 'Side', name: 'side', type: 'uint8' },
4923
4777
  { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4924
- { internalType: 'int16', name: 'tick', type: 'int16' },
4925
4778
  { internalType: 'uint256', name: 'size', type: 'uint256' },
4926
- ],
4927
- internalType: 'struct IRouterEventsAndTypes.Order',
4928
- name: 'newOrder',
4929
- type: 'tuple',
4930
- },
4931
- ],
4932
- internalType: 'struct IRouterEventsAndTypes.ModifyOrderReq',
4933
- name: 'req',
4934
- type: 'tuple',
4935
- },
4936
- ],
4937
- name: 'modifyOrder',
4938
- outputs: [{ internalType: 'Trade', name: 'matched', type: 'uint256' }],
4939
- stateMutability: 'nonpayable',
4940
- type: 'function',
4941
- },
4942
- {
4943
- inputs: [
4944
- {
4945
- components: [
4946
- {
4947
- components: [
4948
- { internalType: 'bool', name: 'cross', type: 'bool' },
4949
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4950
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
4951
- { internalType: 'Side', name: 'side', type: 'uint8' },
4952
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4953
4779
  { internalType: 'int16', name: 'tick', type: 'int16' },
4954
- { internalType: 'uint256', name: 'size', type: 'uint256' },
4955
4780
  ],
4956
4781
  internalType: 'struct IRouterEventsAndTypes.Order',
4957
4782
  name: 'order',
4958
4783
  type: 'tuple',
4959
4784
  },
4960
- { internalType: 'uint256', name: 'cashIn', type: 'uint256' },
4961
4785
  { internalType: 'bool', name: 'enterMarket', type: 'bool' },
4786
+ { internalType: 'OrderId', name: 'idToStrictCancel', type: 'uint64' },
4787
+ { internalType: 'bool', name: 'exitMarket', type: 'bool' },
4788
+ { internalType: 'uint256', name: 'isolated_cashIn', type: 'uint256' },
4789
+ { internalType: 'bool', name: 'isolated_cashTransferAll', type: 'bool' },
4790
+ { internalType: 'int128', name: 'desiredMatchRate', type: 'int128' },
4962
4791
  ],
4963
- internalType: 'struct IRouterEventsAndTypes.OpenIsolatedPositionRequest',
4792
+ internalType: 'struct IRouterEventsAndTypes.SingleOrderReq',
4964
4793
  name: 'req',
4965
4794
  type: 'tuple',
4966
4795
  },
4967
4796
  ],
4968
- name: 'openIsolatedPosition',
4969
- outputs: [{ internalType: 'Trade', name: 'matched', type: 'uint256' }],
4970
- stateMutability: 'nonpayable',
4971
- type: 'function',
4972
- },
4973
- {
4974
- inputs: [
4975
- {
4976
- components: [
4977
- { internalType: 'bool', name: 'cross', type: 'bool' },
4978
- { internalType: 'MarketId', name: 'marketId', type: 'uint24' },
4979
- { internalType: 'bool', name: 'useAmm', type: 'bool' },
4980
- { internalType: 'Side', name: 'side', type: 'uint8' },
4981
- { internalType: 'enum TimeInForce', name: 'tif', type: 'uint8' },
4982
- { internalType: 'int16', name: 'tick', type: 'int16' },
4983
- { internalType: 'uint256', name: 'size', type: 'uint256' },
4984
- ],
4985
- internalType: 'struct IRouterEventsAndTypes.Order',
4986
- name: 'order',
4987
- type: 'tuple',
4988
- },
4797
+ name: 'placeSingleOrder',
4798
+ outputs: [
4799
+ { internalType: 'Trade', name: 'matched', type: 'uint256' },
4800
+ { internalType: 'int256', name: 'cashWithdrawn', type: 'int256' },
4989
4801
  ],
4990
- name: 'placeOrder',
4991
- outputs: [{ internalType: 'Trade', name: 'matched', type: 'uint256' }],
4992
4802
  stateMutability: 'nonpayable',
4993
4803
  type: 'function',
4994
4804
  },
@@ -5028,11 +4838,11 @@ exports.iAuthModuleAbi = [
5028
4838
  anonymous: false,
5029
4839
  inputs: [
5030
4840
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
5031
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4841
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
5032
4842
  { indexed: false, internalType: 'int256', name: 'exactSizeIn', type: 'int256' },
5033
4843
  { indexed: false, internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
5034
- { indexed: false, internalType: 'int256', name: 'mintCashIn', type: 'int256' },
5035
- { indexed: false, internalType: 'int256', name: 'netCashUsed', type: 'int256' },
4844
+ { indexed: false, internalType: 'int256', name: 'netCashIn', type: 'int256' },
4845
+ { indexed: false, internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
5036
4846
  ],
5037
4847
  name: 'AddLiquidityDualToAmm',
5038
4848
  type: 'event',
@@ -5041,10 +4851,11 @@ exports.iAuthModuleAbi = [
5041
4851
  anonymous: false,
5042
4852
  inputs: [
5043
4853
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
5044
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4854
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
5045
4855
  { indexed: false, internalType: 'uint256', name: 'netLpOut', type: 'uint256' },
5046
- { indexed: false, internalType: 'int256', name: 'netCashUsed', type: 'int256' },
5047
- { indexed: false, internalType: 'int256', name: 'netSizeInterm', type: 'int256' },
4856
+ { indexed: false, internalType: 'int256', name: 'netCashIn', type: 'int256' },
4857
+ { indexed: false, internalType: 'uint256', name: 'totalTakerOtcFee', type: 'uint256' },
4858
+ { indexed: false, internalType: 'int256', name: 'swapSizeInterm', type: 'int256' },
5048
4859
  ],
5049
4860
  name: 'AddLiquiditySingleCashToAmm',
5050
4861
  type: 'event',
@@ -5081,11 +4892,11 @@ exports.iAuthModuleAbi = [
5081
4892
  anonymous: false,
5082
4893
  inputs: [
5083
4894
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
5084
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4895
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
5085
4896
  { indexed: false, internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
5086
- { indexed: false, internalType: 'int256', name: 'burnCashOut', type: 'int256' },
5087
- { indexed: false, internalType: 'int256', name: 'netSizeOut', type: 'int256' },
5088
4897
  { indexed: false, internalType: 'int256', name: 'netCashOut', type: 'int256' },
4898
+ { indexed: false, internalType: 'int256', name: 'netSizeOut', type: 'int256' },
4899
+ { indexed: false, internalType: 'uint256', name: 'netOtcFee', type: 'uint256' },
5089
4900
  ],
5090
4901
  name: 'RemoveLiquidityDualFromAmm',
5091
4902
  type: 'event',
@@ -5094,14 +4905,22 @@ exports.iAuthModuleAbi = [
5094
4905
  anonymous: false,
5095
4906
  inputs: [
5096
4907
  { indexed: true, internalType: 'MarketAcc', name: 'user', type: 'bytes26' },
5097
- { indexed: true, internalType: 'address', name: 'ammAddr', type: 'address' },
4908
+ { indexed: true, internalType: 'AMMId', name: 'ammId', type: 'uint24' },
5098
4909
  { indexed: false, internalType: 'uint256', name: 'lpToRemove', type: 'uint256' },
5099
4910
  { indexed: false, internalType: 'int256', name: 'netCashOut', type: 'int256' },
4911
+ { indexed: false, internalType: 'uint256', name: 'netTakerOtcFee', type: 'uint256' },
5100
4912
  { indexed: false, internalType: 'int256', name: 'netSizeInterm', type: 'int256' },
5101
4913
  ],
5102
4914
  name: 'RemoveLiquiditySingleCashFromAmm',
5103
4915
  type: 'event',
5104
4916
  },
4917
+ {
4918
+ inputs: [{ internalType: 'Account', name: 'acc', type: 'bytes21' }],
4919
+ name: 'accountManager',
4920
+ outputs: [{ internalType: 'address', name: '', type: 'address' }],
4921
+ stateMutability: 'view',
4922
+ type: 'function',
4923
+ },
5105
4924
  {
5106
4925
  inputs: [
5107
4926
  { internalType: 'address', name: 'agent', type: 'address' },
@@ -5123,6 +4942,84 @@ exports.iAuthModuleAbi = [
5123
4942
  stateMutability: 'nonpayable',
5124
4943
  type: 'function',
5125
4944
  },
4945
+ {
4946
+ inputs: [
4947
+ { internalType: 'Account', name: 'acc', type: 'bytes21' },
4948
+ { internalType: 'address', name: 'agent', type: 'address' },
4949
+ ],
4950
+ name: 'agentExpiry',
4951
+ outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
4952
+ stateMutability: 'view',
4953
+ type: 'function',
4954
+ },
4955
+ {
4956
+ inputs: [
4957
+ {
4958
+ components: [
4959
+ { internalType: 'address', name: 'root', type: 'address' },
4960
+ { internalType: 'uint8', name: 'accountId', type: 'uint8' },
4961
+ { internalType: 'address', name: 'agent', type: 'address' },
4962
+ { internalType: 'uint64', name: 'expiry', type: 'uint64' },
4963
+ { internalType: 'uint64', name: 'nonce', type: 'uint64' },
4964
+ ],
4965
+ internalType: 'struct IRouterEventsAndTypes.ApproveAgentMessage',
4966
+ name: 'data',
4967
+ type: 'tuple',
4968
+ },
4969
+ { internalType: 'bytes', name: 'signature', type: 'bytes' },
4970
+ ],
4971
+ name: 'approveAgent',
4972
+ outputs: [],
4973
+ stateMutability: 'nonpayable',
4974
+ type: 'function',
4975
+ },
4976
+ {
4977
+ inputs: [
4978
+ {
4979
+ components: [
4980
+ { internalType: 'address', name: 'root', type: 'address' },
4981
+ { internalType: 'uint8', name: 'accountId', type: 'uint8' },
4982
+ { internalType: 'address[]', name: 'agents', type: 'address[]' },
4983
+ { internalType: 'uint64', name: 'nonce', type: 'uint64' },
4984
+ ],
4985
+ internalType: 'struct IRouterEventsAndTypes.RevokeAgentsMessage',
4986
+ name: 'data',
4987
+ type: 'tuple',
4988
+ },
4989
+ { internalType: 'bytes', name: 'signature', type: 'bytes' },
4990
+ ],
4991
+ name: 'revokeAgent',
4992
+ outputs: [],
4993
+ stateMutability: 'nonpayable',
4994
+ type: 'function',
4995
+ },
4996
+ {
4997
+ inputs: [
4998
+ {
4999
+ components: [
5000
+ { internalType: 'address', name: 'root', type: 'address' },
5001
+ { internalType: 'uint8', name: 'accountId', type: 'uint8' },
5002
+ { internalType: 'address', name: 'accManager', type: 'address' },
5003
+ { internalType: 'uint64', name: 'nonce', type: 'uint64' },
5004
+ ],
5005
+ internalType: 'struct IRouterEventsAndTypes.SetAccManagerMessage',
5006
+ name: 'data',
5007
+ type: 'tuple',
5008
+ },
5009
+ { internalType: 'bytes', name: 'signature', type: 'bytes' },
5010
+ ],
5011
+ name: 'setAccManager',
5012
+ outputs: [],
5013
+ stateMutability: 'nonpayable',
5014
+ type: 'function',
5015
+ },
5016
+ {
5017
+ inputs: [{ internalType: 'address', name: 'signer', type: 'address' }],
5018
+ name: 'signerNonce',
5019
+ outputs: [{ internalType: 'uint64', name: '', type: 'uint64' }],
5020
+ stateMutability: 'view',
5021
+ type: 'function',
5022
+ },
5126
5023
  {
5127
5024
  inputs: [
5128
5025
  {
@@ -5145,6 +5042,16 @@ exports.iAuthModuleAbi = [
5145
5042
  stateMutability: 'nonpayable',
5146
5043
  type: 'function',
5147
5044
  },
5045
+ {
5046
+ inputs: [
5047
+ { internalType: 'Account[]', name: 'accounts', type: 'bytes21[]' },
5048
+ { internalType: 'address[]', name: 'agents', type: 'address[]' },
5049
+ ],
5050
+ name: 'systemRevokeAgent',
5051
+ outputs: [],
5052
+ stateMutability: 'nonpayable',
5053
+ type: 'function',
5054
+ },
5148
5055
  {
5149
5056
  inputs: [
5150
5057
  {
@@ -5326,6 +5233,13 @@ exports.iAMMAbi = [
5326
5233
  name: 'Swap',
5327
5234
  type: 'event',
5328
5235
  },
5236
+ {
5237
+ inputs: [],
5238
+ name: 'AMM_ID',
5239
+ outputs: [{ internalType: 'AMMId', name: '', type: 'uint24' }],
5240
+ stateMutability: 'view',
5241
+ type: 'function',
5242
+ },
5329
5243
  {
5330
5244
  inputs: [],
5331
5245
  name: 'MARKET',
@@ -5396,6 +5310,7 @@ exports.iAMMAbi = [
5396
5310
  outputs: [
5397
5311
  { internalType: 'int256', name: 'netCashOut', type: 'int256' },
5398
5312
  { internalType: 'int256', name: 'netSizeOut', type: 'int256' },
5313
+ { internalType: 'bool', name: 'isMatured', type: 'bool' },
5399
5314
  ],
5400
5315
  stateMutability: 'nonpayable',
5401
5316
  type: 'function',
@@ -5433,7 +5348,7 @@ exports.iAMMAbi = [
5433
5348
  { internalType: 'MarketAcc', name: 'receiver', type: 'bytes26' },
5434
5349
  { internalType: 'int256', name: 'totalCash', type: 'int256' },
5435
5350
  { internalType: 'int256', name: 'totalSize', type: 'int256' },
5436
- { internalType: 'int256', name: 'desiredCashIn', type: 'int256' },
5351
+ { internalType: 'int256', name: 'maxCashIn', type: 'int256' },
5437
5352
  { internalType: 'int256', name: 'exactSizeIn', type: 'int256' },
5438
5353
  ],
5439
5354
  name: 'mintByBorosRouter',