@defisaver/positions-sdk 0.0.201-fluid-dev-2 → 0.0.201-fluid-dev-3
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.
- package/cjs/fluid/index.js +6 -4
- package/cjs/markets/fluid/index.d.ts +28 -0
- package/cjs/markets/fluid/index.js +282 -2
- package/cjs/types/fluid.d.ts +17 -2
- package/cjs/types/fluid.js +14 -0
- package/esm/fluid/index.js +4 -2
- package/esm/markets/fluid/index.d.ts +28 -0
- package/esm/markets/fluid/index.js +267 -1
- package/esm/types/fluid.d.ts +17 -2
- package/esm/types/fluid.js +14 -0
- package/package.json +1 -1
- package/src/fluid/index.ts +4 -2
- package/src/markets/fluid/index.ts +279 -1
- package/src/types/fluid.ts +15 -0
|
@@ -1170,6 +1170,42 @@ export const ARB_USDT_11_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
|
1170
1170
|
collateralAsset: 'ARB',
|
|
1171
1171
|
debtAsset: 'USDT',
|
|
1172
1172
|
});
|
|
1173
|
+
export const WBTC_USDC_12_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1174
|
+
stableBased: true,
|
|
1175
|
+
btcBased: true,
|
|
1176
|
+
wstETHBased: false,
|
|
1177
|
+
ethBased: false,
|
|
1178
|
+
type: FluidVaultType.T1,
|
|
1179
|
+
id: 12,
|
|
1180
|
+
chainIds: [NetworkNumber.Arb],
|
|
1181
|
+
label: 'WBTC / USDC Market 12',
|
|
1182
|
+
shortLabel: 'WBTC/USDC',
|
|
1183
|
+
value: FluidArbitrumVersion.ARB_USDT_11_ARB,
|
|
1184
|
+
url: 'wbtc_usdc_12_arb',
|
|
1185
|
+
marketAddress: '',
|
|
1186
|
+
hasSmartCollateral: false,
|
|
1187
|
+
hasSmartDebt: false,
|
|
1188
|
+
collateralAsset: 'WBTC',
|
|
1189
|
+
debtAsset: 'USDC',
|
|
1190
|
+
});
|
|
1191
|
+
export const WBTC_USDT_13_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1192
|
+
stableBased: true,
|
|
1193
|
+
btcBased: true,
|
|
1194
|
+
wstETHBased: false,
|
|
1195
|
+
ethBased: false,
|
|
1196
|
+
type: FluidVaultType.T1,
|
|
1197
|
+
id: 13,
|
|
1198
|
+
chainIds: [NetworkNumber.Arb],
|
|
1199
|
+
label: 'WBTC / USDT Market 13',
|
|
1200
|
+
shortLabel: 'WBTC/USDT',
|
|
1201
|
+
value: FluidArbitrumVersion.ARB_USDT_11_ARB,
|
|
1202
|
+
url: 'wbtc_usdc_13_arb',
|
|
1203
|
+
marketAddress: '',
|
|
1204
|
+
hasSmartCollateral: false,
|
|
1205
|
+
hasSmartDebt: false,
|
|
1206
|
+
collateralAsset: 'WBTC',
|
|
1207
|
+
debtAsset: 'USDT',
|
|
1208
|
+
});
|
|
1173
1209
|
export const WSTETH_ETH_WSTETH_ETH_16_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1174
1210
|
stableBased: false,
|
|
1175
1211
|
btcBased: false,
|
|
@@ -1193,7 +1229,7 @@ export const WEETH_ETH_WSTETH_17_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
|
1193
1229
|
btcBased: false,
|
|
1194
1230
|
wstETHBased: true,
|
|
1195
1231
|
ethBased: true,
|
|
1196
|
-
type: FluidVaultType.
|
|
1232
|
+
type: FluidVaultType.T2,
|
|
1197
1233
|
id: 17,
|
|
1198
1234
|
chainIds: [NetworkNumber.Arb],
|
|
1199
1235
|
label: 'weETH / ETH Market 17',
|
|
@@ -1206,6 +1242,168 @@ export const WEETH_ETH_WSTETH_17_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
|
1206
1242
|
collateralAsset: 'weETH',
|
|
1207
1243
|
debtAsset: 'ETH',
|
|
1208
1244
|
});
|
|
1245
|
+
export const WBTC_ETH_18_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1246
|
+
stableBased: false,
|
|
1247
|
+
btcBased: true,
|
|
1248
|
+
wstETHBased: false,
|
|
1249
|
+
ethBased: true,
|
|
1250
|
+
type: FluidVaultType.T1,
|
|
1251
|
+
id: 18,
|
|
1252
|
+
chainIds: [NetworkNumber.Arb],
|
|
1253
|
+
label: 'WBTC / ETH Market 18',
|
|
1254
|
+
shortLabel: 'WBTC/ETH',
|
|
1255
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1256
|
+
url: 'wbtc_eth_18_arb',
|
|
1257
|
+
marketAddress: '',
|
|
1258
|
+
hasSmartCollateral: false,
|
|
1259
|
+
hasSmartDebt: false,
|
|
1260
|
+
collateralAsset: 'WBTC',
|
|
1261
|
+
debtAsset: 'ETH',
|
|
1262
|
+
});
|
|
1263
|
+
export const ETH_WBTC_19_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1264
|
+
stableBased: false,
|
|
1265
|
+
btcBased: true,
|
|
1266
|
+
wstETHBased: false,
|
|
1267
|
+
ethBased: true,
|
|
1268
|
+
type: FluidVaultType.T1,
|
|
1269
|
+
id: 19,
|
|
1270
|
+
chainIds: [NetworkNumber.Arb],
|
|
1271
|
+
label: 'ETH / WBTC Market 19',
|
|
1272
|
+
shortLabel: 'ETH/WBTC',
|
|
1273
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1274
|
+
url: 'eth_wbtc_19_arb',
|
|
1275
|
+
marketAddress: '',
|
|
1276
|
+
hasSmartCollateral: false,
|
|
1277
|
+
hasSmartDebt: false,
|
|
1278
|
+
collateralAsset: 'ETH',
|
|
1279
|
+
debtAsset: 'WBTC',
|
|
1280
|
+
});
|
|
1281
|
+
export const WSTETH_WBTC_20_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1282
|
+
stableBased: false,
|
|
1283
|
+
btcBased: true,
|
|
1284
|
+
wstETHBased: true,
|
|
1285
|
+
ethBased: true,
|
|
1286
|
+
type: FluidVaultType.T1,
|
|
1287
|
+
id: 20,
|
|
1288
|
+
chainIds: [NetworkNumber.Arb],
|
|
1289
|
+
label: 'wstETH / WBTC Market 20',
|
|
1290
|
+
shortLabel: 'wstETH/WBTC',
|
|
1291
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1292
|
+
url: 'wsteth_wbtc_20_arb',
|
|
1293
|
+
marketAddress: '',
|
|
1294
|
+
hasSmartCollateral: false,
|
|
1295
|
+
hasSmartDebt: false,
|
|
1296
|
+
collateralAsset: 'wstETH',
|
|
1297
|
+
debtAsset: 'WBTC',
|
|
1298
|
+
});
|
|
1299
|
+
export const WEETH_WBTC_21_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1300
|
+
stableBased: false,
|
|
1301
|
+
btcBased: true,
|
|
1302
|
+
wstETHBased: false,
|
|
1303
|
+
ethBased: true,
|
|
1304
|
+
type: FluidVaultType.T1,
|
|
1305
|
+
id: 21,
|
|
1306
|
+
chainIds: [NetworkNumber.Arb],
|
|
1307
|
+
label: 'weETH / WBTC Market 21',
|
|
1308
|
+
shortLabel: 'weETH/WBTC',
|
|
1309
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1310
|
+
url: 'weeth_wbtc_21_arb',
|
|
1311
|
+
marketAddress: '',
|
|
1312
|
+
hasSmartCollateral: false,
|
|
1313
|
+
hasSmartDebt: false,
|
|
1314
|
+
collateralAsset: 'weETH',
|
|
1315
|
+
debtAsset: 'WBTC',
|
|
1316
|
+
});
|
|
1317
|
+
export const USDC_ETH_USDC_ETH_22_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1318
|
+
stableBased: true,
|
|
1319
|
+
btcBased: false,
|
|
1320
|
+
wstETHBased: false,
|
|
1321
|
+
ethBased: true,
|
|
1322
|
+
type: FluidVaultType.T4,
|
|
1323
|
+
id: 22,
|
|
1324
|
+
chainIds: [NetworkNumber.Arb],
|
|
1325
|
+
label: 'weETH / WBTC Market 22',
|
|
1326
|
+
shortLabel: 'weETH/WBTC',
|
|
1327
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1328
|
+
url: 'usdc_eth_usdc_eth_22_arb',
|
|
1329
|
+
marketAddress: '',
|
|
1330
|
+
hasSmartCollateral: false,
|
|
1331
|
+
hasSmartDebt: false,
|
|
1332
|
+
collateralAsset: 'weETH',
|
|
1333
|
+
debtAsset: 'WBTC',
|
|
1334
|
+
});
|
|
1335
|
+
export const ETH_USDC_USDT_23_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1336
|
+
stableBased: true,
|
|
1337
|
+
btcBased: false,
|
|
1338
|
+
wstETHBased: false,
|
|
1339
|
+
ethBased: true,
|
|
1340
|
+
type: FluidVaultType.T3,
|
|
1341
|
+
id: 23,
|
|
1342
|
+
chainIds: [NetworkNumber.Arb],
|
|
1343
|
+
label: 'ETH / USDC-USDT Market 23',
|
|
1344
|
+
shortLabel: 'ETH/USDC-USDT',
|
|
1345
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1346
|
+
url: 'eth_usdc_usdt_23_arb',
|
|
1347
|
+
marketAddress: '',
|
|
1348
|
+
hasSmartCollateral: false,
|
|
1349
|
+
hasSmartDebt: false,
|
|
1350
|
+
collateralAsset: 'weETH',
|
|
1351
|
+
debtAsset: 'WBTC',
|
|
1352
|
+
});
|
|
1353
|
+
export const WSTETH_USDC_USDT_24_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1354
|
+
stableBased: true,
|
|
1355
|
+
btcBased: false,
|
|
1356
|
+
wstETHBased: true,
|
|
1357
|
+
ethBased: true,
|
|
1358
|
+
type: FluidVaultType.T3,
|
|
1359
|
+
id: 23,
|
|
1360
|
+
chainIds: [NetworkNumber.Arb],
|
|
1361
|
+
label: 'wstETH / USDC-USDT Market 23',
|
|
1362
|
+
shortLabel: 'wstETH/USDC-USDT',
|
|
1363
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1364
|
+
url: 'wsteth_usdc_usdt_23_arb',
|
|
1365
|
+
marketAddress: '',
|
|
1366
|
+
hasSmartCollateral: false,
|
|
1367
|
+
hasSmartDebt: false,
|
|
1368
|
+
collateralAsset: 'wstETH',
|
|
1369
|
+
debtAsset: 'WBTC',
|
|
1370
|
+
});
|
|
1371
|
+
export const WEETH_USDC_USDT_25_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1372
|
+
stableBased: true,
|
|
1373
|
+
btcBased: false,
|
|
1374
|
+
wstETHBased: false,
|
|
1375
|
+
ethBased: true,
|
|
1376
|
+
type: FluidVaultType.T3,
|
|
1377
|
+
id: 25,
|
|
1378
|
+
chainIds: [NetworkNumber.Arb],
|
|
1379
|
+
label: 'weETH / USDC-USDT Market 25',
|
|
1380
|
+
shortLabel: 'weETH/USDC-USDT',
|
|
1381
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1382
|
+
url: 'weeth_usdc_usdt_25_arb',
|
|
1383
|
+
marketAddress: '',
|
|
1384
|
+
hasSmartCollateral: false,
|
|
1385
|
+
hasSmartDebt: false,
|
|
1386
|
+
collateralAsset: 'weETH',
|
|
1387
|
+
debtAsset: 'WBTC',
|
|
1388
|
+
});
|
|
1389
|
+
export const WBTC_USDC_USDT_26_ARB = (networkId = NetworkNumber.Eth) => ({
|
|
1390
|
+
stableBased: true,
|
|
1391
|
+
btcBased: true,
|
|
1392
|
+
wstETHBased: false,
|
|
1393
|
+
ethBased: false,
|
|
1394
|
+
type: FluidVaultType.T3,
|
|
1395
|
+
id: 26,
|
|
1396
|
+
chainIds: [NetworkNumber.Arb],
|
|
1397
|
+
label: 'WBTC / USDC-USDT Market 26',
|
|
1398
|
+
shortLabel: 'WBTC/USDC-USDT',
|
|
1399
|
+
value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1400
|
+
url: 'wbtc_usdc_usdt_26_arb',
|
|
1401
|
+
marketAddress: '',
|
|
1402
|
+
hasSmartCollateral: false,
|
|
1403
|
+
hasSmartDebt: false,
|
|
1404
|
+
collateralAsset: 'WBTC',
|
|
1405
|
+
debtAsset: 'WBTC',
|
|
1406
|
+
});
|
|
1209
1407
|
export const ETH_USDC_1_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
1210
1408
|
stableBased: true,
|
|
1211
1409
|
btcBased: false,
|
|
@@ -1494,6 +1692,60 @@ export const WSTETH_CBBTC_16_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
|
1494
1692
|
collateralAsset: 'wstETH',
|
|
1495
1693
|
debtAsset: 'cbBTC',
|
|
1496
1694
|
});
|
|
1695
|
+
export const ETH_SUSDS_17_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
1696
|
+
stableBased: true,
|
|
1697
|
+
btcBased: false,
|
|
1698
|
+
wstETHBased: false,
|
|
1699
|
+
ethBased: true,
|
|
1700
|
+
type: FluidVaultType.T1,
|
|
1701
|
+
id: 17,
|
|
1702
|
+
chainIds: [NetworkNumber.Base],
|
|
1703
|
+
label: 'ETH / sUSDS Market 17',
|
|
1704
|
+
shortLabel: 'ETH/sUSDS',
|
|
1705
|
+
value: FluidBaseVersions.ETH_SUSDS_17_BASE,
|
|
1706
|
+
url: 'eth-susds-17-base',
|
|
1707
|
+
marketAddress: '',
|
|
1708
|
+
hasSmartCollateral: false,
|
|
1709
|
+
hasSmartDebt: false,
|
|
1710
|
+
collateralAsset: 'ETH',
|
|
1711
|
+
debtAsset: 'sSUDS',
|
|
1712
|
+
});
|
|
1713
|
+
export const WSTETH_SUSDS_18_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
1714
|
+
stableBased: true,
|
|
1715
|
+
btcBased: false,
|
|
1716
|
+
wstETHBased: true,
|
|
1717
|
+
ethBased: true,
|
|
1718
|
+
type: FluidVaultType.T1,
|
|
1719
|
+
id: 18,
|
|
1720
|
+
chainIds: [NetworkNumber.Base],
|
|
1721
|
+
label: 'wstETH / sUSDS Market 18',
|
|
1722
|
+
shortLabel: 'wstETH/sUSDS',
|
|
1723
|
+
value: FluidBaseVersions.WSTETH_SUSDS_18_BASE,
|
|
1724
|
+
url: 'wsteth-susds-18-base',
|
|
1725
|
+
marketAddress: '',
|
|
1726
|
+
hasSmartCollateral: false,
|
|
1727
|
+
hasSmartDebt: false,
|
|
1728
|
+
collateralAsset: 'wstETH',
|
|
1729
|
+
debtAsset: 'sUSDS',
|
|
1730
|
+
});
|
|
1731
|
+
export const CBBTC_SUSDS_19_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
1732
|
+
stableBased: true,
|
|
1733
|
+
btcBased: false,
|
|
1734
|
+
wstETHBased: false,
|
|
1735
|
+
ethBased: false,
|
|
1736
|
+
type: FluidVaultType.T1,
|
|
1737
|
+
id: 19,
|
|
1738
|
+
chainIds: [NetworkNumber.Base],
|
|
1739
|
+
label: 'cbBTC / sUSDS Market 19',
|
|
1740
|
+
shortLabel: 'cbBTC/sUSDS',
|
|
1741
|
+
value: FluidBaseVersions.CBBTC_SUSDS_19_BASE,
|
|
1742
|
+
url: 'cbbtc-susds-19-base',
|
|
1743
|
+
marketAddress: '',
|
|
1744
|
+
hasSmartCollateral: false,
|
|
1745
|
+
hasSmartDebt: false,
|
|
1746
|
+
collateralAsset: 'cbBTC',
|
|
1747
|
+
debtAsset: 'sUSDS',
|
|
1748
|
+
});
|
|
1497
1749
|
export const FluidMarkets = (networkId) => ({
|
|
1498
1750
|
[FluidMainnetVersion.ETH_USDC_1]: ETH_USDC_1(networkId),
|
|
1499
1751
|
[FluidMainnetVersion.ETH_USDT_2]: ETH_USDT_2(networkId),
|
|
@@ -1561,8 +1813,19 @@ export const FluidMarkets = (networkId) => ({
|
|
|
1561
1813
|
[FluidArbitrumVersion.ETH_ARB_9_ARB]: ETH_ARB_9_ARB(networkId),
|
|
1562
1814
|
[FluidArbitrumVersion.ARB_USDC_10_ARB]: ARB_USDC_10_ARB(networkId),
|
|
1563
1815
|
[FluidArbitrumVersion.ARB_USDT_11_ARB]: ARB_USDT_11_ARB(networkId),
|
|
1816
|
+
[FluidArbitrumVersion.WBTC_USDC_12_ARB]: WBTC_USDC_12_ARB(networkId),
|
|
1817
|
+
[FluidArbitrumVersion.WBTC_USDT_13_ARB]: WBTC_USDT_13_ARB(networkId),
|
|
1564
1818
|
[FluidArbitrumVersion.WSTETH_ETH_WSTETH_ETH_16_ARB]: WSTETH_ETH_WSTETH_ETH_16_ARB(networkId),
|
|
1565
1819
|
[FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB]: WEETH_ETH_WSTETH_17_ARB(networkId),
|
|
1820
|
+
[FluidArbitrumVersion.WBTC_ETH_18_ARB]: WBTC_ETH_18_ARB(networkId),
|
|
1821
|
+
[FluidArbitrumVersion.ETH_WBTC_19_ARB]: ETH_WBTC_19_ARB(networkId),
|
|
1822
|
+
[FluidArbitrumVersion.WSTETH_WBTC_20_ARB]: WSTETH_WBTC_20_ARB(networkId),
|
|
1823
|
+
[FluidArbitrumVersion.WEETH_WBTC_21_ARB]: WEETH_WBTC_21_ARB(networkId),
|
|
1824
|
+
[FluidArbitrumVersion.USDC_ETH_USDC_ETH_22_ARB]: USDC_ETH_USDC_ETH_22_ARB(networkId),
|
|
1825
|
+
[FluidArbitrumVersion.ETH_USDC_USDT_23_ARB]: ETH_USDC_USDT_23_ARB(networkId),
|
|
1826
|
+
[FluidArbitrumVersion.WSTETH_USDC_USDT_24_ARB]: WSTETH_USDC_USDT_24_ARB(networkId),
|
|
1827
|
+
[FluidArbitrumVersion.WEETH_USDC_USDT_25_ARB]: WEETH_USDC_USDT_25_ARB(networkId),
|
|
1828
|
+
[FluidArbitrumVersion.WBTC_USDC_USDT_26_ARB]: WBTC_USDC_USDT_26_ARB(networkId),
|
|
1566
1829
|
// base
|
|
1567
1830
|
[FluidBaseVersions.ETH_USDC_1_BASE]: ETH_USDC_1_BASE(networkId),
|
|
1568
1831
|
[FluidBaseVersions.WSTETH_USDC_2_BASE]: WSTETH_USDC_2_BASE(networkId),
|
|
@@ -1580,6 +1843,9 @@ export const FluidMarkets = (networkId) => ({
|
|
|
1580
1843
|
[FluidBaseVersions.ETH_CBBTC_14_BASE]: ETH_CBBTC_14_BASE(networkId),
|
|
1581
1844
|
[FluidBaseVersions.WEETH_CBBTC_15_BASE]: WEETH_CBBTC_15_BASE(networkId),
|
|
1582
1845
|
[FluidBaseVersions.WSTETH_CBBTC_16_BASE]: WSTETH_CBBTC_16_BASE(networkId),
|
|
1846
|
+
[FluidBaseVersions.ETH_SUSDS_17_BASE]: ETH_SUSDS_17_BASE(networkId),
|
|
1847
|
+
[FluidBaseVersions.WSTETH_SUSDS_18_BASE]: WSTETH_SUSDS_18_BASE(networkId),
|
|
1848
|
+
[FluidBaseVersions.CBBTC_SUSDS_19_BASE]: CBBTC_SUSDS_19_BASE(networkId),
|
|
1583
1849
|
});
|
|
1584
1850
|
export const getFluidVersionsDataForNetwork = (network) => (Object.values(FluidMarkets(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === FluidVaultType.T1));
|
|
1585
1851
|
export const getFluidMarketInfoById = (vaultId, network = 1) => getFluidVersionsDataForNetwork(network).find(({ id }) => id === vaultId);
|
package/esm/types/fluid.d.ts
CHANGED
|
@@ -90,8 +90,19 @@ export declare enum FluidArbitrumVersion {
|
|
|
90
90
|
ETH_ARB_9_ARB = "ETH_ARB_9_ARB",
|
|
91
91
|
ARB_USDC_10_ARB = "ARB_USDC_10_ARB",
|
|
92
92
|
ARB_USDT_11_ARB = "ARB_USDT_11_ARB",
|
|
93
|
+
WBTC_USDC_12_ARB = "WBTC_USDC_12_ARB",
|
|
94
|
+
WBTC_USDT_13_ARB = "WBTC_USDT_13_ARB",
|
|
93
95
|
WSTETH_ETH_WSTETH_ETH_16_ARB = "WSTETH_ETH_WSTETH_ETH_16_ARB",
|
|
94
|
-
WEETH_ETH_WSTETH_17_ARB = "WEETH_ETH_WSTETH_17_ARB"
|
|
96
|
+
WEETH_ETH_WSTETH_17_ARB = "WEETH_ETH_WSTETH_17_ARB",
|
|
97
|
+
WBTC_ETH_18_ARB = "WBTC_ETH_18_ARB",
|
|
98
|
+
ETH_WBTC_19_ARB = "ETH_WBTC_19_ARB",
|
|
99
|
+
WSTETH_WBTC_20_ARB = "WSTETH_WBTC_20_ARB",
|
|
100
|
+
WEETH_WBTC_21_ARB = "WEETH_WBTC_21_ARB",
|
|
101
|
+
USDC_ETH_USDC_ETH_22_ARB = "USDC_ETH_USDC_ETH_22_ARB",
|
|
102
|
+
ETH_USDC_USDT_23_ARB = "ETH_USDC_USDT_23_ARB",
|
|
103
|
+
WSTETH_USDC_USDT_24_ARB = "WSTETH_USDC_USDT_24_ARB",
|
|
104
|
+
WEETH_USDC_USDT_25_ARB = "WEETH_USDC_USDT_25_ARB",
|
|
105
|
+
WBTC_USDC_USDT_26_ARB = "WBTC_USDC_USDT_26_ARB"
|
|
95
106
|
}
|
|
96
107
|
export declare enum FluidBaseVersions {
|
|
97
108
|
ETH_USDC_1_BASE = "ETH_USDC_1_BASE",
|
|
@@ -109,7 +120,10 @@ export declare enum FluidBaseVersions {
|
|
|
109
120
|
CBBTC_ETH_13_BASE = "CBBTC_ETH_13_BASE",
|
|
110
121
|
ETH_CBBTC_14_BASE = "ETH_CBBTC_14_BASE",
|
|
111
122
|
WEETH_CBBTC_15_BASE = "WEETH_CBBTC_15_BASE",
|
|
112
|
-
WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE"
|
|
123
|
+
WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE",
|
|
124
|
+
ETH_SUSDS_17_BASE = "ETH_SUSDS_17_BASE",
|
|
125
|
+
WSTETH_SUSDS_18_BASE = "WSTETH_SUSDS_18_BASE",
|
|
126
|
+
CBBTC_SUSDS_19_BASE = "CBBTC_SUSDS_19_BASE"
|
|
113
127
|
}
|
|
114
128
|
export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
|
|
115
129
|
export declare enum FluidMainnetDepositToken {
|
|
@@ -194,6 +208,7 @@ export interface InnerFluidMarketData {
|
|
|
194
208
|
minimumBorrowing: string;
|
|
195
209
|
supplyRate: string;
|
|
196
210
|
borrowRate: string;
|
|
211
|
+
liquidationMaxLimit: string;
|
|
197
212
|
}
|
|
198
213
|
export interface FluidMarketData {
|
|
199
214
|
assetsData: FluidAssetsData;
|
package/esm/types/fluid.js
CHANGED
|
@@ -74,8 +74,19 @@ export var FluidArbitrumVersion;
|
|
|
74
74
|
FluidArbitrumVersion["ETH_ARB_9_ARB"] = "ETH_ARB_9_ARB";
|
|
75
75
|
FluidArbitrumVersion["ARB_USDC_10_ARB"] = "ARB_USDC_10_ARB";
|
|
76
76
|
FluidArbitrumVersion["ARB_USDT_11_ARB"] = "ARB_USDT_11_ARB";
|
|
77
|
+
FluidArbitrumVersion["WBTC_USDC_12_ARB"] = "WBTC_USDC_12_ARB";
|
|
78
|
+
FluidArbitrumVersion["WBTC_USDT_13_ARB"] = "WBTC_USDT_13_ARB";
|
|
77
79
|
FluidArbitrumVersion["WSTETH_ETH_WSTETH_ETH_16_ARB"] = "WSTETH_ETH_WSTETH_ETH_16_ARB";
|
|
78
80
|
FluidArbitrumVersion["WEETH_ETH_WSTETH_17_ARB"] = "WEETH_ETH_WSTETH_17_ARB";
|
|
81
|
+
FluidArbitrumVersion["WBTC_ETH_18_ARB"] = "WBTC_ETH_18_ARB";
|
|
82
|
+
FluidArbitrumVersion["ETH_WBTC_19_ARB"] = "ETH_WBTC_19_ARB";
|
|
83
|
+
FluidArbitrumVersion["WSTETH_WBTC_20_ARB"] = "WSTETH_WBTC_20_ARB";
|
|
84
|
+
FluidArbitrumVersion["WEETH_WBTC_21_ARB"] = "WEETH_WBTC_21_ARB";
|
|
85
|
+
FluidArbitrumVersion["USDC_ETH_USDC_ETH_22_ARB"] = "USDC_ETH_USDC_ETH_22_ARB";
|
|
86
|
+
FluidArbitrumVersion["ETH_USDC_USDT_23_ARB"] = "ETH_USDC_USDT_23_ARB";
|
|
87
|
+
FluidArbitrumVersion["WSTETH_USDC_USDT_24_ARB"] = "WSTETH_USDC_USDT_24_ARB";
|
|
88
|
+
FluidArbitrumVersion["WEETH_USDC_USDT_25_ARB"] = "WEETH_USDC_USDT_25_ARB";
|
|
89
|
+
FluidArbitrumVersion["WBTC_USDC_USDT_26_ARB"] = "WBTC_USDC_USDT_26_ARB";
|
|
79
90
|
})(FluidArbitrumVersion || (FluidArbitrumVersion = {}));
|
|
80
91
|
export var FluidBaseVersions;
|
|
81
92
|
(function (FluidBaseVersions) {
|
|
@@ -95,6 +106,9 @@ export var FluidBaseVersions;
|
|
|
95
106
|
FluidBaseVersions["ETH_CBBTC_14_BASE"] = "ETH_CBBTC_14_BASE";
|
|
96
107
|
FluidBaseVersions["WEETH_CBBTC_15_BASE"] = "WEETH_CBBTC_15_BASE";
|
|
97
108
|
FluidBaseVersions["WSTETH_CBBTC_16_BASE"] = "WSTETH_CBBTC_16_BASE";
|
|
109
|
+
FluidBaseVersions["ETH_SUSDS_17_BASE"] = "ETH_SUSDS_17_BASE";
|
|
110
|
+
FluidBaseVersions["WSTETH_SUSDS_18_BASE"] = "WSTETH_SUSDS_18_BASE";
|
|
111
|
+
FluidBaseVersions["CBBTC_SUSDS_19_BASE"] = "CBBTC_SUSDS_19_BASE";
|
|
98
112
|
})(FluidBaseVersions || (FluidBaseVersions = {}));
|
|
99
113
|
export var FluidMainnetDepositToken;
|
|
100
114
|
(function (FluidMainnetDepositToken) {
|
package/package.json
CHANGED
package/src/fluid/index.ts
CHANGED
|
@@ -17,7 +17,7 @@ import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
|
|
|
17
17
|
import { getFluidAggregatedData } from '../helpers/fluidHelpers';
|
|
18
18
|
import { FluidView } from '../types/contracts/generated';
|
|
19
19
|
import { chunkAndMulticall } from '../multicall';
|
|
20
|
-
import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets
|
|
20
|
+
import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets';
|
|
21
21
|
import { USD_QUOTE } from '../constants';
|
|
22
22
|
import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
|
|
23
23
|
|
|
@@ -106,6 +106,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
|
|
|
106
106
|
const totalBorrowVault = getEthAmountForDecimals(data.totalBorrowVault, debtAsset.decimals);
|
|
107
107
|
|
|
108
108
|
const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
|
|
109
|
+
const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
|
|
109
110
|
const liqFactor = new Dec(data.liquidationThreshold).div(10_000).toString();
|
|
110
111
|
|
|
111
112
|
const marketData = {
|
|
@@ -127,7 +128,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
|
|
|
127
128
|
totalSupplyVault,
|
|
128
129
|
totalBorrowVault,
|
|
129
130
|
totalSupplyVaultUsd: new Dec(totalSupplyVault).mul(collAssetData.price).toString(),
|
|
130
|
-
totalBorrowVaultUsd: new Dec(
|
|
131
|
+
totalBorrowVaultUsd: new Dec(totalBorrowVault).mul(debtAssetData.price).toString(),
|
|
131
132
|
withdrawalLimit: getEthAmountForDecimals(data.withdrawalLimit, collAsset.decimals),
|
|
132
133
|
withdrawableUntilLimit: getEthAmountForDecimals(data.withdrawableUntilLimit, collAsset.decimals),
|
|
133
134
|
withdrawable: getEthAmountForDecimals(data.withdrawable, collAsset.decimals),
|
|
@@ -138,6 +139,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
|
|
|
138
139
|
maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
|
|
139
140
|
baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
|
|
140
141
|
minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
|
|
142
|
+
liquidationMaxLimit,
|
|
141
143
|
borrowRate,
|
|
142
144
|
supplyRate,
|
|
143
145
|
};
|