@defisaver/positions-sdk 0.0.201-fluid-dev-3 → 0.0.201-fluid-dev-4

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/cjs/fluid/index.d.ts +8 -0
  2. package/cjs/fluid/index.js +19 -1
  3. package/cjs/markets/fluid/index.d.ts +21 -0
  4. package/cjs/markets/fluid/index.js +82 -43
  5. package/cjs/markets/index.d.ts +1 -1
  6. package/cjs/markets/index.js +2 -1
  7. package/cjs/multicall/index.js +1 -0
  8. package/cjs/types/fluid.d.ts +4 -2
  9. package/cjs/types/fluid.js +2 -0
  10. package/esm/fluid/index.d.ts +8 -0
  11. package/esm/fluid/index.js +19 -2
  12. package/esm/markets/fluid/index.d.ts +21 -0
  13. package/esm/markets/fluid/index.js +80 -44
  14. package/esm/markets/index.d.ts +1 -1
  15. package/esm/markets/index.js +1 -1
  16. package/esm/multicall/index.js +1 -0
  17. package/esm/types/fluid.d.ts +4 -2
  18. package/esm/types/fluid.js +2 -0
  19. package/package.json +1 -1
  20. package/src/fluid/index.ts +22 -3
  21. package/src/markets/fluid/index.ts +87 -43
  22. package/src/markets/index.ts +3 -1
  23. package/src/multicall/index.ts +1 -0
  24. package/src/types/fluid.ts +2 -0
package/cjs/fluid/index.d.ts CHANGED
@@ -37,3 +37,11 @@ export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNu
37
37
  marketData: FluidMarketData;
38
38
  }>;
39
39
  export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
40
+ export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
41
+ fTokenAddress: any;
42
+ fTokenSymbol: string;
43
+ decimals: string;
44
+ totalDeposited: string;
45
+ withdrawable: string;
46
+ apy: string;
47
+ }>;
package/cjs/fluid/index.js CHANGED
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
15
+ exports.getFluidTokenData = exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
16
16
  const decimal_js_1 = __importDefault(require("decimal.js"));
17
17
  const tokens_1 = require("@defisaver/tokens");
18
18
  const common_1 = require("../types/common");
@@ -213,6 +213,24 @@ const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0
213
213
  params: [version.marketAddress],
214
214
  }));
215
215
  const data = yield (0, multicall_1.chunkAndMulticall)(calls, 10, 'latest', web3, network);
216
+ // @ts-ignore
216
217
  return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
217
218
  });
218
219
  exports.getAllFluidMarketDataChunked = getAllFluidMarketDataChunked;
220
+ const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
221
+ const view = (0, contracts_1.FluidViewContract)(web3, network);
222
+ const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
223
+ const data = yield view.methods.getFTokenData(fTokenAddress).call();
224
+ const supplyRate = new decimal_js_1.default(data.supplyRate).div(100).toString();
225
+ const decimals = data.decimals;
226
+ const rewardsRate = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(data.rewardsRate)).div(100).toString();
227
+ return {
228
+ fTokenAddress,
229
+ fTokenSymbol: data.symbol,
230
+ decimals,
231
+ totalDeposited: (0, utils_1.getEthAmountForDecimals)(data.totalAssets, decimals),
232
+ withdrawable: (0, utils_1.getEthAmountForDecimals)(data.withdrawable, decimals),
233
+ apy: new decimal_js_1.default(supplyRate).add(rewardsRate).toString(),
234
+ };
235
+ });
236
+ exports.getFluidTokenData = getFluidTokenData;
package/cjs/markets/fluid/index.d.ts CHANGED
@@ -198,3 +198,24 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
198
198
  };
199
199
  export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
200
200
  export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
201
+ export declare const FluidFTokens: (networkId: NetworkNumber) => {
202
+ ETH: string;
203
+ USDC: string;
204
+ USDT: string;
205
+ wstETH: string;
206
+ GHO: string;
207
+ sUSDS: string;
208
+ } | {
209
+ ETH: string;
210
+ USDC: string;
211
+ USDT: string;
212
+ wstETH: string;
213
+ ARB: string;
214
+ } | {
215
+ ETH: string;
216
+ USDC: string;
217
+ EURC: string;
218
+ wstETH: string;
219
+ sUSDS: string;
220
+ };
221
+ export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;
package/cjs/markets/fluid/index.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.RSETH_WSTETH_79 = exports.RSETH_ETH_WSTETH_78 = exports.USDC_ETH_USDC_ETH_77 = exports.WEETH_ETH_WSTETH_74 = exports.GHO_USDC_GHO_USDC_61 = exports.SUSDS_GHO_58 = exports.WEETH_GHO_57 = exports.SUSDE_GHO_56 = exports.WSTETH_GHO_55 = exports.ETH_GHO_54 = exports.WBTC_CBBTC_USDT_53 = exports.WBTC_CBBTC_USDC_52 = exports.WBTC_CBBTC_WBTC_CBBTC_51 = exports.SUSDE_USDC_USDT_50 = exports.CBBTC_USDC_USDT_49 = exports.WBTC_USDC_USDT_48 = exports.WEETH_USDC_USDT_47 = exports.WSTETH_USDC_USDT_46 = exports.ETH_USDC_USDT_45 = exports.WSTETH_ETH_WSTETH_ETH_44 = exports.WEETH_CBBTC_32 = exports.ETH_CBBTC_31 = exports.CBBTC_USDT_30 = exports.CBBTC_USDC_29 = exports.CBBTC_ETH_28 = exports.WEETHS_WSTETH_27 = exports.WEETH_WBTC_26 = exports.WSTETH_WBTC_25 = exports.ETH_WBTC_24 = exports.WBTC_ETH_23 = exports.WBTC_USDT_22 = exports.WBTC_USDC_21 = exports.WEETH_USDT_20 = exports.WEETH_USDC_19 = exports.SUSDE_USDT_18 = exports.SUSDE_USDC_17 = exports.WEETH_WSTETH_16 = exports.WSTETH_USDT_15 = exports.WSTETH_USDC_14 = exports.WSTETH_ETH_13 = exports.ETH_USDT_12 = exports.ETH_USDC_11 = exports.WEETH_USDT_10 = exports.WEETH_USDC_9 = exports.WEETH_WSTETH_6 = exports.WSTETH_USDT_5 = exports.WSTETH_USDC_4 = exports.WSTETH_ETH_3 = exports.ETH_USDT_2 = exports.ETH_USDC_1 = void 0;
4
4
  exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.CBBTC_SUSDS_19_BASE = exports.WSTETH_SUSDS_18_BASE = exports.ETH_SUSDS_17_BASE = exports.WSTETH_CBBTC_16_BASE = exports.WEETH_CBBTC_15_BASE = exports.ETH_CBBTC_14_BASE = exports.CBBTC_ETH_13_BASE = exports.WSTETH_EURC_12_BASE = exports.WEETH_EURC_11_BASE = exports.ETH_EURC_10_BASE = exports.CBETH_EURC_9_BASE = exports.CBBTC_EURC_8_BASE = exports.CBBTC_USDC_7_BASE = exports.CBETH_USDC_6_BASE = exports.WEETH_USDC_5_BASE = exports.WEETH_WSTETH_4_BASE = exports.WSTETH_ETH_3_BASE = exports.WSTETH_USDC_2_BASE = exports.ETH_USDC_1_BASE = exports.WBTC_USDC_USDT_26_ARB = exports.WEETH_USDC_USDT_25_ARB = exports.WSTETH_USDC_USDT_24_ARB = exports.ETH_USDC_USDT_23_ARB = exports.USDC_ETH_USDC_ETH_22_ARB = exports.WEETH_WBTC_21_ARB = exports.WSTETH_WBTC_20_ARB = exports.ETH_WBTC_19_ARB = exports.WBTC_ETH_18_ARB = exports.WEETH_ETH_WSTETH_17_ARB = exports.WSTETH_ETH_WSTETH_ETH_16_ARB = exports.WBTC_USDT_13_ARB = exports.WBTC_USDC_12_ARB = exports.ARB_USDT_11_ARB = exports.ARB_USDC_10_ARB = exports.ETH_ARB_9_ARB = exports.WEETH_USDT_8_ARB = exports.WEETH_USDC_7_ARB = exports.WEETH_WSTETH_6_ARB = exports.WSTETH_ETH_5_ARB = exports.WSTETH_USDT_4_ARB = exports.WSTETH_USDC_3_ARB = exports.ETH_USDT_2_ARB = exports.ETH_USDC_1_ARB = exports.LBTC_CBBTC_WBTC_97 = exports.USDE_USDT_USDT_93 = exports.SUSDE_USDT_USDT_92 = exports.WEETHS_ETH_WSTETH_80 = void 0;
5
+ exports.getFTokenAddress = exports.FluidFTokens = void 0;
5
6
  const common_1 = require("../../types/common");
6
7
  const types_1 = require("../../types");
7
8
  const ETH_USDC_1 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -1042,7 +1043,7 @@ const ETH_USDC_1_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1042
1043
  shortLabel: 'ETH/USDC',
1043
1044
  value: types_1.FluidArbitrumVersion.ETH_USDC_1_ARB,
1044
1045
  url: 'eth-usdc-1-arb',
1045
- marketAddress: '',
1046
+ marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
1046
1047
  hasSmartCollateral: false,
1047
1048
  hasSmartDebt: false,
1048
1049
  collateralAsset: 'ETH',
@@ -1061,7 +1062,7 @@ const ETH_USDT_2_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1061
1062
  shortLabel: 'ETH/USDT',
1062
1063
  value: types_1.FluidArbitrumVersion.ETH_USDT_2_ARB,
1063
1064
  url: 'eth-usdt-2-arb',
1064
- marketAddress: '',
1065
+ marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
1065
1066
  hasSmartCollateral: false,
1066
1067
  hasSmartDebt: false,
1067
1068
  collateralAsset: 'ETH',
@@ -1080,7 +1081,7 @@ const WSTETH_USDC_3_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1080
1081
  shortLabel: 'wstETH/USDC',
1081
1082
  value: types_1.FluidArbitrumVersion.WSTETH_USDC_3_ARB,
1082
1083
  url: 'wsteth-usdc-3-arb',
1083
- marketAddress: '',
1084
+ marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
1084
1085
  hasSmartCollateral: false,
1085
1086
  hasSmartDebt: false,
1086
1087
  collateralAsset: 'wstETH',
@@ -1099,7 +1100,7 @@ const WSTETH_USDT_4_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1099
1100
  shortLabel: 'wstETH/USDT',
1100
1101
  value: types_1.FluidArbitrumVersion.WSTETH_USDT_4_ARB,
1101
1102
  url: 'wsteth-usdt-4-arb',
1102
- marketAddress: '',
1103
+ marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
1103
1104
  hasSmartCollateral: false,
1104
1105
  hasSmartDebt: false,
1105
1106
  collateralAsset: 'wstETH',
@@ -1118,7 +1119,7 @@ const WSTETH_ETH_5_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1118
1119
  shortLabel: 'wstETH/ETH',
1119
1120
  value: types_1.FluidArbitrumVersion.WSTETH_ETH_5_ARB,
1120
1121
  url: 'wsteth-eth-5-arb',
1121
- marketAddress: '',
1122
+ marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
1122
1123
  hasSmartCollateral: false,
1123
1124
  hasSmartDebt: false,
1124
1125
  collateralAsset: 'wstETH',
@@ -1137,7 +1138,7 @@ const WEETH_WSTETH_6_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1137
1138
  shortLabel: 'weETH/wstETH',
1138
1139
  value: types_1.FluidArbitrumVersion.WEETH_WSTETH_6_ARB,
1139
1140
  url: 'weeth-wsteth-6-arb',
1140
- marketAddress: '',
1141
+ marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
1141
1142
  hasSmartCollateral: false,
1142
1143
  hasSmartDebt: false,
1143
1144
  collateralAsset: 'weETH',
@@ -1156,7 +1157,7 @@ const WEETH_USDC_7_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1156
1157
  shortLabel: 'weETH/USDC',
1157
1158
  value: types_1.FluidArbitrumVersion.WEETH_USDC_7_ARB,
1158
1159
  url: 'weeth-usdc-7-arb',
1159
- marketAddress: '',
1160
+ marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
1160
1161
  hasSmartCollateral: false,
1161
1162
  hasSmartDebt: false,
1162
1163
  collateralAsset: 'weETH',
@@ -1175,7 +1176,7 @@ const WEETH_USDT_8_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1175
1176
  shortLabel: 'weETH/USDT',
1176
1177
  value: types_1.FluidArbitrumVersion.WEETH_USDT_8_ARB,
1177
1178
  url: 'weeth-usdt-8-arb',
1178
- marketAddress: '',
1179
+ marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
1179
1180
  hasSmartCollateral: false,
1180
1181
  hasSmartDebt: false,
1181
1182
  collateralAsset: 'weETH',
@@ -1194,7 +1195,7 @@ const ETH_ARB_9_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1194
1195
  shortLabel: 'ETH/ARB',
1195
1196
  value: types_1.FluidArbitrumVersion.ETH_ARB_9_ARB,
1196
1197
  url: 'eth-arb-9-arb',
1197
- marketAddress: '',
1198
+ marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
1198
1199
  hasSmartCollateral: false,
1199
1200
  hasSmartDebt: false,
1200
1201
  collateralAsset: 'ETH',
@@ -1213,7 +1214,7 @@ const ARB_USDC_10_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1213
1214
  shortLabel: 'ARB/USDC',
1214
1215
  value: types_1.FluidArbitrumVersion.ARB_USDC_10_ARB,
1215
1216
  url: 'arb-usdc-10-arb',
1216
- marketAddress: '',
1217
+ marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
1217
1218
  hasSmartCollateral: false,
1218
1219
  hasSmartDebt: false,
1219
1220
  collateralAsset: 'ARB',
@@ -1232,7 +1233,7 @@ const ARB_USDT_11_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1232
1233
  shortLabel: 'ARB/USDT',
1233
1234
  value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
1234
1235
  url: 'arb-usdt-11-arb',
1235
- marketAddress: '',
1236
+ marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
1236
1237
  hasSmartCollateral: false,
1237
1238
  hasSmartDebt: false,
1238
1239
  collateralAsset: 'ARB',
@@ -1251,7 +1252,7 @@ const WBTC_USDC_12_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1251
1252
  shortLabel: 'WBTC/USDC',
1252
1253
  value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
1253
1254
  url: 'wbtc_usdc_12_arb',
1254
- marketAddress: '',
1255
+ marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
1255
1256
  hasSmartCollateral: false,
1256
1257
  hasSmartDebt: false,
1257
1258
  collateralAsset: 'WBTC',
@@ -1270,7 +1271,7 @@ const WBTC_USDT_13_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1270
1271
  shortLabel: 'WBTC/USDT',
1271
1272
  value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
1272
1273
  url: 'wbtc_usdc_13_arb',
1273
- marketAddress: '',
1274
+ marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
1274
1275
  hasSmartCollateral: false,
1275
1276
  hasSmartDebt: false,
1276
1277
  collateralAsset: 'WBTC',
@@ -1289,7 +1290,7 @@ const WSTETH_ETH_WSTETH_ETH_16_ARB = (networkId = common_1.NetworkNumber.Eth) =>
1289
1290
  shortLabel: 'wstETH/ETH',
1290
1291
  value: types_1.FluidArbitrumVersion.WSTETH_ETH_WSTETH_ETH_16_ARB,
1291
1292
  url: 'wsteth-eth-wsteth-eth-16-arb',
1292
- marketAddress: '',
1293
+ marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
1293
1294
  hasSmartCollateral: false,
1294
1295
  hasSmartDebt: false,
1295
1296
  collateralAsset: 'wstETH',
@@ -1308,7 +1309,7 @@ const WEETH_ETH_WSTETH_17_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1308
1309
  shortLabel: 'weETH/ETH',
1309
1310
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1310
1311
  url: 'weeth-eth-wsteth-17-arb',
1311
- marketAddress: '',
1312
+ marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
1312
1313
  hasSmartCollateral: false,
1313
1314
  hasSmartDebt: false,
1314
1315
  collateralAsset: 'weETH',
@@ -1327,7 +1328,7 @@ const WBTC_ETH_18_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1327
1328
  shortLabel: 'WBTC/ETH',
1328
1329
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1329
1330
  url: 'wbtc_eth_18_arb',
1330
- marketAddress: '',
1331
+ marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
1331
1332
  hasSmartCollateral: false,
1332
1333
  hasSmartDebt: false,
1333
1334
  collateralAsset: 'WBTC',
@@ -1346,7 +1347,7 @@ const ETH_WBTC_19_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1346
1347
  shortLabel: 'ETH/WBTC',
1347
1348
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1348
1349
  url: 'eth_wbtc_19_arb',
1349
- marketAddress: '',
1350
+ marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
1350
1351
  hasSmartCollateral: false,
1351
1352
  hasSmartDebt: false,
1352
1353
  collateralAsset: 'ETH',
@@ -1365,7 +1366,7 @@ const WSTETH_WBTC_20_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1365
1366
  shortLabel: 'wstETH/WBTC',
1366
1367
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1367
1368
  url: 'wsteth_wbtc_20_arb',
1368
- marketAddress: '',
1369
+ marketAddress: '0x92643E964CA4b2c165a95CA919b0A819acA6D5F1',
1369
1370
  hasSmartCollateral: false,
1370
1371
  hasSmartDebt: false,
1371
1372
  collateralAsset: 'wstETH',
@@ -1384,7 +1385,7 @@ const WEETH_WBTC_21_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1384
1385
  shortLabel: 'weETH/WBTC',
1385
1386
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1386
1387
  url: 'weeth_wbtc_21_arb',
1387
- marketAddress: '',
1388
+ marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
1388
1389
  hasSmartCollateral: false,
1389
1390
  hasSmartDebt: false,
1390
1391
  collateralAsset: 'weETH',
@@ -1403,7 +1404,7 @@ const USDC_ETH_USDC_ETH_22_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1403
1404
  shortLabel: 'weETH/WBTC',
1404
1405
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1405
1406
  url: 'usdc_eth_usdc_eth_22_arb',
1406
- marketAddress: '',
1407
+ marketAddress: '0x3A0b7c8840D74D39552EF53F586dD8c3d1234C40',
1407
1408
  hasSmartCollateral: false,
1408
1409
  hasSmartDebt: false,
1409
1410
  collateralAsset: 'weETH',
@@ -1422,7 +1423,7 @@ const ETH_USDC_USDT_23_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1422
1423
  shortLabel: 'ETH/USDC-USDT',
1423
1424
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1424
1425
  url: 'eth_usdc_usdt_23_arb',
1425
- marketAddress: '',
1426
+ marketAddress: '0xaD439b9D61b25af1ca4Cd211E3eCb9AfBaAEd84a',
1426
1427
  hasSmartCollateral: false,
1427
1428
  hasSmartDebt: false,
1428
1429
  collateralAsset: 'weETH',
@@ -1441,7 +1442,7 @@ const WSTETH_USDC_USDT_24_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1441
1442
  shortLabel: 'wstETH/USDC-USDT',
1442
1443
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1443
1444
  url: 'wsteth_usdc_usdt_23_arb',
1444
- marketAddress: '',
1445
+ marketAddress: '0x991416539E9DA46db233bCcbaEA38C4f852776D4',
1445
1446
  hasSmartCollateral: false,
1446
1447
  hasSmartDebt: false,
1447
1448
  collateralAsset: 'wstETH',
@@ -1460,7 +1461,7 @@ const WEETH_USDC_USDT_25_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1460
1461
  shortLabel: 'weETH/USDC-USDT',
1461
1462
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1462
1463
  url: 'weeth_usdc_usdt_25_arb',
1463
- marketAddress: '',
1464
+ marketAddress: '0x03271C337c86a6Fd89625A2820e48621DC2a128b',
1464
1465
  hasSmartCollateral: false,
1465
1466
  hasSmartDebt: false,
1466
1467
  collateralAsset: 'weETH',
@@ -1479,7 +1480,7 @@ const WBTC_USDC_USDT_26_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
1479
1480
  shortLabel: 'WBTC/USDC-USDT',
1480
1481
  value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
1481
1482
  url: 'wbtc_usdc_usdt_26_arb',
1482
- marketAddress: '',
1483
+ marketAddress: '0xF74cb9D69ada3559903149CFD60fD57cEAF95F30',
1483
1484
  hasSmartCollateral: false,
1484
1485
  hasSmartDebt: false,
1485
1486
  collateralAsset: 'WBTC',
@@ -1498,7 +1499,7 @@ const ETH_USDC_1_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1498
1499
  shortLabel: 'ETH/USDC',
1499
1500
  value: types_1.FluidBaseVersions.ETH_USDC_1_BASE,
1500
1501
  url: 'eth-usdc-1-base',
1501
- marketAddress: '',
1502
+ marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
1502
1503
  hasSmartCollateral: false,
1503
1504
  hasSmartDebt: false,
1504
1505
  collateralAsset: 'ETH',
@@ -1517,7 +1518,7 @@ const WSTETH_USDC_2_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1517
1518
  shortLabel: 'wstETH/USDC',
1518
1519
  value: types_1.FluidBaseVersions.WSTETH_USDC_2_BASE,
1519
1520
  url: 'wsteth-usdc-2-base',
1520
- marketAddress: '',
1521
+ marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
1521
1522
  hasSmartCollateral: false,
1522
1523
  hasSmartDebt: false,
1523
1524
  collateralAsset: 'wstETH',
@@ -1536,7 +1537,7 @@ const WSTETH_ETH_3_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1536
1537
  shortLabel: 'wstETH/ETH',
1537
1538
  value: types_1.FluidBaseVersions.WSTETH_ETH_3_BASE,
1538
1539
  url: 'wsteth-eth-3-base',
1539
- marketAddress: '',
1540
+ marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
1540
1541
  hasSmartCollateral: false,
1541
1542
  hasSmartDebt: false,
1542
1543
  collateralAsset: 'wstETH',
@@ -1555,7 +1556,7 @@ const WEETH_WSTETH_4_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1555
1556
  shortLabel: 'weETH/wstETH',
1556
1557
  value: types_1.FluidBaseVersions.WEETH_WSTETH_4_BASE,
1557
1558
  url: 'weeth-wsteth-4-base',
1558
- marketAddress: '',
1559
+ marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
1559
1560
  hasSmartCollateral: false,
1560
1561
  hasSmartDebt: false,
1561
1562
  collateralAsset: 'weETH',
@@ -1574,7 +1575,7 @@ const WEETH_USDC_5_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1574
1575
  shortLabel: 'weETH/USDC',
1575
1576
  value: types_1.FluidBaseVersions.WEETH_USDC_5_BASE,
1576
1577
  url: 'weeth-usdc-5-base',
1577
- marketAddress: '',
1578
+ marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
1578
1579
  hasSmartCollateral: false,
1579
1580
  hasSmartDebt: false,
1580
1581
  collateralAsset: 'weETH',
@@ -1593,7 +1594,7 @@ const CBETH_USDC_6_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1593
1594
  shortLabel: 'CBETH/USDC',
1594
1595
  value: types_1.FluidBaseVersions.CBETH_USDC_6_BASE,
1595
1596
  url: 'cbeth-usdc-6-base',
1596
- marketAddress: '',
1597
+ marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
1597
1598
  hasSmartCollateral: false,
1598
1599
  hasSmartDebt: false,
1599
1600
  collateralAsset: 'CBETH',
@@ -1612,7 +1613,7 @@ const CBBTC_USDC_7_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1612
1613
  shortLabel: 'cbBTC/USDC',
1613
1614
  value: types_1.FluidBaseVersions.CBBTC_USDC_7_BASE,
1614
1615
  url: 'cbbtc-usdc-7-base',
1615
- marketAddress: '',
1616
+ marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
1616
1617
  hasSmartCollateral: false,
1617
1618
  hasSmartDebt: false,
1618
1619
  collateralAsset: 'cbBTC',
@@ -1631,7 +1632,7 @@ const CBBTC_EURC_8_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1631
1632
  shortLabel: 'cbBTC/EURC',
1632
1633
  value: types_1.FluidBaseVersions.CBBTC_EURC_8_BASE,
1633
1634
  url: 'cbbtc-eurc-8-base',
1634
- marketAddress: '',
1635
+ marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
1635
1636
  hasSmartCollateral: false,
1636
1637
  hasSmartDebt: false,
1637
1638
  collateralAsset: 'cbBTC',
@@ -1650,7 +1651,7 @@ const CBETH_EURC_9_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1650
1651
  shortLabel: 'CBETH/EURC',
1651
1652
  value: types_1.FluidBaseVersions.CBETH_EURC_9_BASE,
1652
1653
  url: 'cbeth-eurc-9-base',
1653
- marketAddress: '',
1654
+ marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
1654
1655
  hasSmartCollateral: false,
1655
1656
  hasSmartDebt: false,
1656
1657
  collateralAsset: 'CBETH',
@@ -1669,7 +1670,7 @@ const ETH_EURC_10_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1669
1670
  shortLabel: 'ETH/EURC',
1670
1671
  value: types_1.FluidBaseVersions.ETH_EURC_10_BASE,
1671
1672
  url: 'eth-eurc-10-base',
1672
- marketAddress: '',
1673
+ marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
1673
1674
  hasSmartCollateral: false,
1674
1675
  hasSmartDebt: false,
1675
1676
  collateralAsset: 'ETH',
@@ -1688,7 +1689,7 @@ const WEETH_EURC_11_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1688
1689
  shortLabel: 'weETH/EURC',
1689
1690
  value: types_1.FluidBaseVersions.WEETH_EURC_11_BASE,
1690
1691
  url: 'weeth-eurc-11-base',
1691
- marketAddress: '',
1692
+ marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
1692
1693
  hasSmartCollateral: false,
1693
1694
  hasSmartDebt: false,
1694
1695
  collateralAsset: 'weETH',
@@ -1707,7 +1708,7 @@ const WSTETH_EURC_12_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1707
1708
  shortLabel: 'wstETH/EURC',
1708
1709
  value: types_1.FluidBaseVersions.WSTETH_EURC_12_BASE,
1709
1710
  url: 'wsteth-eurc-12-base',
1710
- marketAddress: '',
1711
+ marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
1711
1712
  hasSmartCollateral: false,
1712
1713
  hasSmartDebt: false,
1713
1714
  collateralAsset: 'wstETH',
@@ -1726,7 +1727,7 @@ const CBBTC_ETH_13_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1726
1727
  shortLabel: 'cbBTC/ETH',
1727
1728
  value: types_1.FluidBaseVersions.CBBTC_ETH_13_BASE,
1728
1729
  url: 'cbbtc-eth-13-base',
1729
- marketAddress: '',
1730
+ marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
1730
1731
  hasSmartCollateral: false,
1731
1732
  hasSmartDebt: false,
1732
1733
  collateralAsset: 'cbBTC',
@@ -1745,7 +1746,7 @@ const ETH_CBBTC_14_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1745
1746
  shortLabel: 'ETH/cbBTC',
1746
1747
  value: types_1.FluidBaseVersions.ETH_CBBTC_14_BASE,
1747
1748
  url: 'eth-cbbtc-14-base',
1748
- marketAddress: '',
1749
+ marketAddress: '0x1982CC7b1570C2503282d0A0B41F69b3B28fdcc3',
1749
1750
  hasSmartCollateral: false,
1750
1751
  hasSmartDebt: false,
1751
1752
  collateralAsset: 'ETH',
@@ -1764,7 +1765,7 @@ const WEETH_CBBTC_15_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1764
1765
  shortLabel: 'weETH/cbBTC',
1765
1766
  value: types_1.FluidBaseVersions.WEETH_CBBTC_15_BASE,
1766
1767
  url: 'weeth-cbbtc-15-base',
1767
- marketAddress: '',
1768
+ marketAddress: '0xb4F3bf2d96139563777C0231899cE06EE95Cc946',
1768
1769
  hasSmartCollateral: false,
1769
1770
  hasSmartDebt: false,
1770
1771
  collateralAsset: 'weETH',
@@ -1783,7 +1784,7 @@ const WSTETH_CBBTC_16_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1783
1784
  shortLabel: 'wstETH/cbBTC',
1784
1785
  value: types_1.FluidBaseVersions.WSTETH_CBBTC_16_BASE,
1785
1786
  url: 'wsteth-cbbtc-16-base',
1786
- marketAddress: '',
1787
+ marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
1787
1788
  hasSmartCollateral: false,
1788
1789
  hasSmartDebt: false,
1789
1790
  collateralAsset: 'wstETH',
@@ -1802,7 +1803,7 @@ const ETH_SUSDS_17_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1802
1803
  shortLabel: 'ETH/sUSDS',
1803
1804
  value: types_1.FluidBaseVersions.ETH_SUSDS_17_BASE,
1804
1805
  url: 'eth-susds-17-base',
1805
- marketAddress: '',
1806
+ marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
1806
1807
  hasSmartCollateral: false,
1807
1808
  hasSmartDebt: false,
1808
1809
  collateralAsset: 'ETH',
@@ -1821,7 +1822,7 @@ const WSTETH_SUSDS_18_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1821
1822
  shortLabel: 'wstETH/sUSDS',
1822
1823
  value: types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE,
1823
1824
  url: 'wsteth-susds-18-base',
1824
- marketAddress: '',
1825
+ marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
1825
1826
  hasSmartCollateral: false,
1826
1827
  hasSmartDebt: false,
1827
1828
  collateralAsset: 'wstETH',
@@ -1840,7 +1841,7 @@ const CBBTC_SUSDS_19_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
1840
1841
  shortLabel: 'cbBTC/sUSDS',
1841
1842
  value: types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE,
1842
1843
  url: 'cbbtc-susds-19-base',
1843
- marketAddress: '',
1844
+ marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
1844
1845
  hasSmartCollateral: false,
1845
1846
  hasSmartDebt: false,
1846
1847
  collateralAsset: 'cbBTC',
@@ -1953,3 +1954,41 @@ const getFluidVersionsDataForNetwork = (network) => (Object.values((0, exports.F
1953
1954
  exports.getFluidVersionsDataForNetwork = getFluidVersionsDataForNetwork;
1954
1955
  const getFluidMarketInfoById = (vaultId, network = 1) => (0, exports.getFluidVersionsDataForNetwork)(network).find(({ id }) => id === vaultId);
1955
1956
  exports.getFluidMarketInfoById = getFluidMarketInfoById;
1957
+ const FluidMainnetFTokenAddresses = {
1958
+ [types_1.FluidMainnetDepositToken.ETH]: '0x90551c1795392094FE6D29B758EcCD233cFAa260',
1959
+ [types_1.FluidMainnetDepositToken.USDC]: '0x9Fb7b4477576Fe5B32be4C1843aFB1e55F251B33',
1960
+ [types_1.FluidMainnetDepositToken.USDT]: '0x5C20B550819128074FD538Edf79791733ccEdd18',
1961
+ [types_1.FluidMainnetDepositToken.wstETH]: '0x2411802D8BEA09be0aF8fD8D08314a63e706b29C',
1962
+ [types_1.FluidMainnetDepositToken.GHO]: '0x6A29A46E21C730DcA1d8b23d637c101cec605C5B',
1963
+ [types_1.FluidMainnetDepositToken.sUSDS]: '0x2BBE31d63E6813E3AC858C04dae43FB2a72B0D11',
1964
+ };
1965
+ const FluidArbitrumFTokenAddresses = {
1966
+ [types_1.FluidArbitrumDepositToken.ETH]: '0x45Df0656F8aDf017590009d2f1898eeca4F0a205',
1967
+ [types_1.FluidArbitrumDepositToken.USDC]: '0x1A996cb54bb95462040408C06122D45D6Cdb6096',
1968
+ [types_1.FluidArbitrumDepositToken.USDT]: '0x4A03F37e7d3fC243e3f99341d36f4b829BEe5E03',
1969
+ [types_1.FluidArbitrumDepositToken.wstETH]: '0x66C25Cd75EBdAA7E04816F643d8E46cecd3183c9',
1970
+ [types_1.FluidArbitrumDepositToken.ARB]: '0xbE3860FD4c3facDf8ad57Aa8c1A36D6dc4390a49',
1971
+ };
1972
+ const FluidBaseFTokenAddresses = {
1973
+ [types_1.FluidBaseDepositToken.ETH]: '0x9272D6153133175175Bc276512B2336BE3931CE9',
1974
+ [types_1.FluidBaseDepositToken.USDC]: '0xf42f5795D9ac7e9D757dB633D693cD548Cfd9169',
1975
+ [types_1.FluidBaseDepositToken.EURC]: '0x1943FA26360f038230442525Cf1B9125b5DCB401',
1976
+ [types_1.FluidBaseDepositToken.wstETH]: '0x896E39f0E9af61ECA9dD2938E14543506ef2c2b5',
1977
+ [types_1.FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
1978
+ };
1979
+ const FluidFTokens = (networkId) => {
1980
+ switch (networkId) {
1981
+ case common_1.NetworkNumber.Eth:
1982
+ return FluidMainnetFTokenAddresses;
1983
+ case common_1.NetworkNumber.Arb:
1984
+ return FluidArbitrumFTokenAddresses;
1985
+ case common_1.NetworkNumber.Base:
1986
+ return FluidBaseFTokenAddresses;
1987
+ default:
1988
+ throw new Error('Invalid network id');
1989
+ }
1990
+ };
1991
+ exports.FluidFTokens = FluidFTokens;
1992
+ // @ts-ignore
1993
+ const getFTokenAddress = (token, networkId) => (0, exports.FluidFTokens)(networkId)[token];
1994
+ exports.getFTokenAddress = getFTokenAddress;
package/cjs/markets/index.d.ts CHANGED
@@ -6,4 +6,4 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
6
6
  export { LlamaLendMarkets } from './llamaLend';
7
7
  export { LiquityV2Markets } from './liquityV2';
8
8
  export { EulerV2Markets } from './euler';
9
- export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById } from './fluid';
9
+ export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, } from './fluid';
package/cjs/markets/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
3
+ exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
4
4
  var aave_1 = require("./aave");
5
5
  Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
6
6
  Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -34,3 +34,4 @@ var fluid_1 = require("./fluid");
34
34
  Object.defineProperty(exports, "FluidMarkets", { enumerable: true, get: function () { return fluid_1.FluidMarkets; } });
35
35
  Object.defineProperty(exports, "getFluidVersionsDataForNetwork", { enumerable: true, get: function () { return fluid_1.getFluidVersionsDataForNetwork; } });
36
36
  Object.defineProperty(exports, "getFluidMarketInfoById", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoById; } });
37
+ Object.defineProperty(exports, "getFTokenAddress", { enumerable: true, get: function () { return fluid_1.getFTokenAddress; } });
package/cjs/multicall/index.js CHANGED
@@ -32,6 +32,7 @@ const multicall = (calls, web3, network = common_1.NetworkNumber.Eth, blockNumbe
32
32
  exports.multicall = multicall;
33
33
  const chunkAndMulticall = (calls, chunkSize, blockNumber = 'latest', web3, network = common_1.NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
34
34
  const chunkedCalls = (0, lodash_1.chunk)(calls, chunkSize);
35
+ // @ts-ignore
35
36
  const results = yield Promise.all(chunkedCalls.map((cnk) => (0, exports.multicall)(cnk, web3, network, blockNumber)));
36
37
  return results.flat(1);
37
38
  });
package/cjs/types/fluid.d.ts CHANGED
@@ -131,7 +131,8 @@ export declare enum FluidMainnetDepositToken {
131
131
  wstETH = "wstETH",
132
132
  USDC = "USDC",
133
133
  USDT = "USDT",
134
- GHO = "GHO"
134
+ GHO = "GHO",
135
+ sUSDS = "sUSDS"
135
136
  }
136
137
  export declare enum FluidArbitrumDepositToken {
137
138
  ETH = "ETH",
@@ -144,7 +145,8 @@ export declare enum FluidBaseDepositToken {
144
145
  ETH = "ETH",
145
146
  USDC = "USDC",
146
147
  wstETH = "wstETH",
147
- EURC = "EURC"
148
+ EURC = "EURC",
149
+ sUSDS = "sUSDS"
148
150
  }
149
151
  export type FluidDepositTokenByNetwork = {
150
152
  [NetworkNumber.Eth]: FluidMainnetDepositToken;
package/cjs/types/fluid.js CHANGED
@@ -120,6 +120,7 @@ var FluidMainnetDepositToken;
120
120
  FluidMainnetDepositToken["USDC"] = "USDC";
121
121
  FluidMainnetDepositToken["USDT"] = "USDT";
122
122
  FluidMainnetDepositToken["GHO"] = "GHO";
123
+ FluidMainnetDepositToken["sUSDS"] = "sUSDS";
123
124
  })(FluidMainnetDepositToken || (exports.FluidMainnetDepositToken = FluidMainnetDepositToken = {}));
124
125
  var FluidArbitrumDepositToken;
125
126
  (function (FluidArbitrumDepositToken) {
@@ -135,6 +136,7 @@ var FluidBaseDepositToken;
135
136
  FluidBaseDepositToken["USDC"] = "USDC";
136
137
  FluidBaseDepositToken["wstETH"] = "wstETH";
137
138
  FluidBaseDepositToken["EURC"] = "EURC";
139
+ FluidBaseDepositToken["sUSDS"] = "sUSDS";
138
140
  })(FluidBaseDepositToken || (exports.FluidBaseDepositToken = FluidBaseDepositToken = {}));
139
141
  var FluidVaultType;
140
142
  (function (FluidVaultType) {
package/esm/fluid/index.d.ts CHANGED
@@ -37,3 +37,11 @@ export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNu
37
37
  marketData: FluidMarketData;
38
38
  }>;
39
39
  export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
40
+ export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
41
+ fTokenAddress: any;
42
+ fTokenSymbol: string;
43
+ decimals: string;
44
+ totalDeposited: string;
45
+ withdrawable: string;
46
+ apy: string;
47
+ }>;
package/esm/fluid/index.js CHANGED
@@ -8,14 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  });
9
9
  };
10
10
  import Dec from 'decimal.js';
11
- import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
11
+ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
12
12
  import { NetworkNumber } from '../types/common';
13
13
  import { FluidVaultType, } from '../types';
14
14
  import { DFSFeedRegistryContract, FeedRegistryContract, FluidViewContract } from '../contracts';
15
15
  import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
16
16
  import { getFluidAggregatedData } from '../helpers/fluidHelpers';
17
17
  import { chunkAndMulticall } from '../multicall';
18
- import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets';
18
+ import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
19
19
  import { USD_QUOTE } from '../constants';
20
20
  import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
21
21
  export const EMPTY_USED_ASSET = {
@@ -203,5 +203,22 @@ export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0,
203
203
  params: [version.marketAddress],
204
204
  }));
205
205
  const data = yield chunkAndMulticall(calls, 10, 'latest', web3, network);
206
+ // @ts-ignore
206
207
  return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
207
208
  });
209
+ export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
210
+ const view = FluidViewContract(web3, network);
211
+ const fTokenAddress = getFTokenAddress(token, network);
212
+ const data = yield view.methods.getFTokenData(fTokenAddress).call();
213
+ const supplyRate = new Dec(data.supplyRate).div(100).toString();
214
+ const decimals = data.decimals;
215
+ const rewardsRate = new Dec(assetAmountInEth(data.rewardsRate)).div(100).toString();
216
+ return {
217
+ fTokenAddress,
218
+ fTokenSymbol: data.symbol,
219
+ decimals,
220
+ totalDeposited: getEthAmountForDecimals(data.totalAssets, decimals),
221
+ withdrawable: getEthAmountForDecimals(data.withdrawable, decimals),
222
+ apy: new Dec(supplyRate).add(rewardsRate).toString(),
223
+ };
224
+ });
package/esm/markets/fluid/index.d.ts CHANGED
@@ -198,3 +198,24 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
198
198
  };
199
199
  export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
200
200
  export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
201
+ export declare const FluidFTokens: (networkId: NetworkNumber) => {
202
+ ETH: string;
203
+ USDC: string;
204
+ USDT: string;
205
+ wstETH: string;
206
+ GHO: string;
207
+ sUSDS: string;
208
+ } | {
209
+ ETH: string;
210
+ USDC: string;
211
+ USDT: string;
212
+ wstETH: string;
213
+ ARB: string;
214
+ } | {
215
+ ETH: string;
216
+ USDC: string;
217
+ EURC: string;
218
+ wstETH: string;
219
+ sUSDS: string;
220
+ };
221
+ export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;