@defisaver/positions-sdk 0.0.20 → 0.0.22

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 (99) hide show
  1. package/README.md +63 -0
  2. package/cjs/aaveV2/index.js +9 -4
  3. package/cjs/aaveV3/index.js +9 -4
  4. package/cjs/compoundV2/index.d.ts +1 -0
  5. package/cjs/compoundV2/index.js +15 -8
  6. package/cjs/config/contracts.d.ts +373 -201
  7. package/cjs/config/contracts.js +22 -0
  8. package/cjs/helpers/aaveHelpers/index.js +0 -5
  9. package/cjs/helpers/compoundHelpers/index.js +2 -2
  10. package/cjs/markets/compound/index.d.ts +2 -0
  11. package/cjs/markets/compound/index.js +60 -13
  12. package/cjs/markets/compound/marketsAssets.d.ts +7 -1
  13. package/cjs/markets/compound/marketsAssets.js +12 -2
  14. package/cjs/morphoAaveV2/index.js +4 -3
  15. package/cjs/morphoAaveV3/index.js +9 -4
  16. package/cjs/spark/index.js +9 -4
  17. package/cjs/types/aave.d.ts +0 -5
  18. package/cjs/types/compound.d.ts +6 -4
  19. package/cjs/types/compound.js +1 -0
  20. package/cjs/types/contracts/generated/CUSDCev3.d.ts +441 -0
  21. package/cjs/types/contracts/generated/CUSDCev3.js +5 -0
  22. package/cjs/types/contracts/generated/CompV3USDCBulkerArb.d.ts +41 -0
  23. package/cjs/types/contracts/generated/CompV3USDCBulkerArb.js +5 -0
  24. package/cjs/types/contracts/generated/index.d.ts +2 -0
  25. package/esm/aaveV2/index.js +11 -6
  26. package/esm/aaveV3/index.js +11 -6
  27. package/esm/compoundV2/index.d.ts +1 -0
  28. package/esm/compoundV2/index.js +13 -7
  29. package/esm/config/contracts.d.ts +373 -201
  30. package/esm/config/contracts.js +22 -0
  31. package/esm/helpers/aaveHelpers/index.js +0 -5
  32. package/esm/helpers/compoundHelpers/index.js +2 -2
  33. package/esm/markets/compound/index.d.ts +2 -0
  34. package/esm/markets/compound/index.js +59 -13
  35. package/esm/markets/compound/marketsAssets.d.ts +7 -1
  36. package/esm/markets/compound/marketsAssets.js +11 -1
  37. package/esm/morphoAaveV2/index.js +4 -3
  38. package/esm/morphoAaveV3/index.js +9 -4
  39. package/esm/spark/index.js +11 -6
  40. package/esm/types/aave.d.ts +0 -5
  41. package/esm/types/compound.d.ts +6 -4
  42. package/esm/types/compound.js +1 -0
  43. package/esm/types/contracts/generated/CUSDCev3.d.ts +441 -0
  44. package/esm/types/contracts/generated/CUSDCev3.js +4 -0
  45. package/esm/types/contracts/generated/CompV3USDCBulkerArb.d.ts +41 -0
  46. package/esm/types/contracts/generated/CompV3USDCBulkerArb.js +4 -0
  47. package/esm/types/contracts/generated/index.d.ts +2 -0
  48. package/package.json +40 -40
  49. package/src/aaveV2/index.ts +226 -220
  50. package/src/aaveV3/index.ts +561 -554
  51. package/src/assets/index.ts +60 -60
  52. package/src/chickenBonds/index.ts +123 -123
  53. package/src/compoundV2/index.ts +219 -206
  54. package/src/compoundV3/index.ts +275 -275
  55. package/src/config/contracts.js +673 -651
  56. package/src/constants/index.ts +3 -3
  57. package/src/contracts.ts +100 -100
  58. package/src/curveUsd/index.ts +228 -228
  59. package/src/exchange/index.ts +17 -17
  60. package/src/helpers/aaveHelpers/index.ts +134 -141
  61. package/src/helpers/chickenBondsHelpers/index.ts +23 -23
  62. package/src/helpers/compoundHelpers/index.ts +181 -181
  63. package/src/helpers/curveUsdHelpers/index.ts +32 -32
  64. package/src/helpers/index.ts +5 -5
  65. package/src/helpers/makerHelpers/index.ts +94 -94
  66. package/src/helpers/sparkHelpers/index.ts +106 -106
  67. package/src/index.ts +40 -40
  68. package/src/liquity/index.ts +116 -116
  69. package/src/maker/index.ts +101 -101
  70. package/src/markets/aave/index.ts +80 -80
  71. package/src/markets/aave/marketAssets.ts +32 -32
  72. package/src/markets/compound/index.ts +141 -85
  73. package/src/markets/compound/marketsAssets.ts +46 -35
  74. package/src/markets/curveUsd/index.ts +69 -69
  75. package/src/markets/index.ts +3 -3
  76. package/src/markets/spark/index.ts +29 -29
  77. package/src/markets/spark/marketAssets.ts +9 -9
  78. package/src/moneymarket/moneymarketCommonService.ts +75 -75
  79. package/src/morpho/markets.ts +39 -39
  80. package/src/morphoAaveV2/index.ts +255 -254
  81. package/src/morphoAaveV3/index.ts +619 -614
  82. package/src/multicall/index.ts +22 -22
  83. package/src/services/dsrService.ts +15 -15
  84. package/src/services/priceService.ts +21 -21
  85. package/src/services/utils.ts +34 -34
  86. package/src/spark/index.ts +421 -413
  87. package/src/staking/staking.ts +167 -167
  88. package/src/types/aave.ts +256 -261
  89. package/src/types/chickenBonds.ts +45 -45
  90. package/src/types/common.ts +83 -83
  91. package/src/types/compound.ts +128 -122
  92. package/src/types/contracts/generated/CUSDCev3.ts +685 -0
  93. package/src/types/contracts/generated/CompV3USDCBulkerArb.ts +85 -0
  94. package/src/types/contracts/generated/index.ts +2 -0
  95. package/src/types/curveUsd.ts +112 -112
  96. package/src/types/index.ts +6 -6
  97. package/src/types/liquity.ts +30 -30
  98. package/src/types/maker.ts +50 -50
  99. package/src/types/spark.ts +106 -106
@@ -1,414 +1,422 @@
1
- import Web3 from 'web3';
2
- import Dec from 'decimal.js';
3
- import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
4
- import {
5
- Blockish, EthAddress, NetworkNumber, PositionBalances,
6
- } from '../types/common';
7
- import {
8
- ethToWeth, getAbiItem, isLayer2Network, wethToEth,
9
- } from '../services/utils';
10
- import {
11
- calculateNetApy, getCbETHApr, getREthApr, getStETHApr,
12
- } from '../staking';
13
- import { getDsrApy } from '../services/dsrService';
14
- import {
15
- SparkIncentiveDataProviderContract,
16
- SparkViewContract,
17
- getConfigContractAbi,
18
- } from '../contracts';
19
- import {
20
- EModeCategoryDataMapping,
21
- SparkAssetData,
22
- SparkAssetsData,
23
- SparkMarketData,
24
- SparkMarketsData,
25
- SparkPositionData,
26
- SparkUsedAsset,
27
- SparkUsedAssets,
28
- } from '../types';
29
- import { multicall } from '../multicall';
30
- import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
31
- import { calculateBorrowingAssetLimit } from '../moneymarket';
32
- import { SPARK_V1 } from '../markets/spark';
33
-
34
- export const sparkEmodeCategoriesMapping = (extractedState: { assetsData: SparkAssetsData }, usedAssets: SparkUsedAssets) => {
35
- const { assetsData } = extractedState;
36
- const usedAssetsValues = Object.values(usedAssets);
37
-
38
- const categoriesMapping: { [key: number]: EModeCategoryDataMapping } = {};
39
- Object.values(assetsData).forEach((a) => {
40
- const borrowingOnlyFromCategory = a.eModeCategory === 0
41
- ? true
42
- : !usedAssetsValues.filter(u => u.isBorrowed && u.eModeCategory !== a.eModeCategory).length;
43
- const afterEnteringCategory = sparkGetAggregatedPositionData({
44
- ...extractedState, usedAssets, eModeCategory: a.eModeCategory,
45
- });
46
- const willStayOverCollateralized = new Dec(afterEnteringCategory.ratio).eq(0) || new Dec(afterEnteringCategory.ratio).gt(afterEnteringCategory.liqPercent);
47
- const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized];
48
-
49
- categoriesMapping[a.eModeCategory] = {
50
- enteringTerms,
51
- canEnterCategory: !enteringTerms.includes(false),
52
- id: a.eModeCategory,
53
- data: a.eModeCategoryData,
54
- assets: a.eModeCategory === 0 ? [] : [...(categoriesMapping[a.eModeCategory]?.assets || []), a.symbol],
55
- enabledData: {
56
- ratio: afterEnteringCategory.ratio,
57
- liqRatio: afterEnteringCategory.liqRatio,
58
- liqPercent: afterEnteringCategory.liqPercent,
59
- collRatio: afterEnteringCategory.collRatio,
60
- },
61
- };
62
- });
63
- return categoriesMapping;
64
- };
65
-
66
- export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: SparkMarketData, mainnetWeb3: Web3): Promise<SparkMarketsData> => {
67
- const marketAddress = selectedMarket.providerAddress;
68
-
69
- let rewardInfo: any[] = [];
70
- if (network === 10) {
71
- const sparkIncentivesContract = SparkIncentiveDataProviderContract(web3, network);
72
- rewardInfo = await sparkIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
73
- rewardInfo = rewardInfo.reduce((all, market) => {
74
- // eslint-disable-next-line no-param-reassign
75
- all[market.underlyingAsset] = market;
76
- return all;
77
- }, {});
78
- }
79
-
80
- const loanInfoContract = SparkViewContract(web3, network);
81
-
82
- const loanInfo = await loanInfoContract.methods.getFullTokensInfo(
83
- marketAddress,
84
- selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address),
85
- ).call();
86
-
87
- const assetsData: SparkAssetData[] = loanInfo
88
- .map((market, i) => ({
89
- symbol: selectedMarket.assets[i],
90
- isIsolated: new Dec(market.debtCeilingForIsolationMode).gt(0),
91
- debtCeilingForIsolationMode: new Dec(market.debtCeilingForIsolationMode).div(100).toString(),
92
- isSiloed: market.isSiloedForBorrowing,
93
- eModeCategory: +market.emodeCategory,
94
- isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
95
- assetId: Number(market.assetId),
96
- underlyingTokenAddress: market.underlyingTokenAddress,
97
- supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
98
- borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
99
- borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
100
- collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
101
- liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
102
- marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
103
- .sub(market.totalBorrow.toString())
104
- .toString(), selectedMarket.assets[i]),
105
- utilization: new Dec(market.totalBorrow.toString())
106
- .div(new Dec(market.totalSupply.toString()))
107
- .times(100)
108
- .toString(),
109
- usageAsCollateralEnabled: market.usageAsCollateralEnabled,
110
- supplyCap: market.supplyCap,
111
- borrowCap: market.borrowCap,
112
- totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
113
- isInactive: !market.isActive,
114
- isFrozen: market.isFrozen,
115
- isPaused: market.isPaused,
116
- canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
117
- canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
118
- canBeWithdrawn: market.isActive && !market.isPaused,
119
- canBePayBacked: market.isActive && !market.isPaused,
120
- disabledStableBorrowing: !market.stableBorrowRateEnabled,
121
- totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
122
- totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
123
- price: new Dec(market.price.toString()).div(1e8).toString(), // is actually price in USD
124
- isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
125
- isFlashLoanEnabled: market.isFlashLoanEnabled,
126
- eModeCategoryData: {
127
- label: market.label,
128
- liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
129
- liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
130
- collateralFactor: new Dec(market.ltv).div(10000).toString(),
131
- priceSource: market.priceSource,
132
- },
133
- }));
134
-
135
- await Promise.all(assetsData.map(async (market) => {
136
- /* eslint-disable no-param-reassign */
137
- const rewardForMarket = (rewardInfo as any)[market.underlyingTokenAddress];
138
- if (market.symbol === 'wstETH') {
139
- market.incentiveSupplyApy = await getStETHApr(mainnetWeb3);
140
- market.incentiveSupplyToken = 'wstETH';
141
- }
142
-
143
- if (market.symbol === 'cbETH' && !isLayer2Network(network)) {
144
- market.incentiveSupplyApy = await getCbETHApr(mainnetWeb3);
145
- market.incentiveSupplyToken = 'cbETH';
146
- }
147
-
148
- if (market.symbol === 'rETH') {
149
- market.incentiveSupplyApy = await getREthApr(mainnetWeb3);
150
- market.incentiveSupplyToken = 'rETH';
151
- }
152
-
153
- if (market.symbol === 'sDAI') {
154
- market.incentiveSupplyApy = await getDsrApy(web3, network);
155
- market.incentiveSupplyToken = 'sDAI';
156
- }
157
-
158
- if (market.canBeBorrowed && market.incentiveSupplyApy) {
159
- market.incentiveBorrowApy = `-${market.incentiveSupplyApy}`;
160
- market.incentiveBorrowToken = market.incentiveSupplyToken;
161
- }
162
-
163
- if (!rewardForMarket) return;
164
- const supplyRewardData = rewardForMarket.aIncentiveData.rewardsTokenInformation[0];
165
- if (supplyRewardData) {
166
- if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
167
- market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
168
- const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
169
- const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(10 ** supplyRewardData.priceFeedDecimals).toString();
170
- market.incentiveSupplyApy = new Dec(supplyEmissionPerSecond).div((10 ** supplyRewardData.rewardTokenDecimals) / 100)
171
- .mul(365 * 24 * 3600)
172
- .mul(supplyRewardPrice)
173
- .div(market.price)
174
- .div(market.totalSupply)
175
- .toString();
176
- }
177
- const borrowRewardData = rewardForMarket.vIncentiveData.rewardsTokenInformation[0];
178
- if (borrowRewardData) {
179
- if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
180
- market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
181
- const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
182
- const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** borrowRewardData.priceFeedDecimals).toString();
183
- market.incentiveBorrowApy = new Dec(supplyEmissionPerSecond).div((10 ** borrowRewardData.rewardTokenDecimals) / 100)
184
- .mul(365 * 24 * 3600)
185
- .mul(supplyRewardPrice)
186
- .div(market.price)
187
- .div(market.totalBorrowVar)
188
- .toString();
189
- }
190
- /* eslint-enable no-param-reassign */
191
- }));
192
-
193
- const payload: SparkAssetsData = {};
194
- // Sort by market size
195
- assetsData
196
- .sort((a, b) => {
197
- const aMarket = new Dec(a.price).times(a.totalSupply).toString();
198
- const bMarket = new Dec(b.price).times(b.totalSupply).toString();
199
-
200
- return new Dec(bMarket).minus(aMarket).toNumber();
201
- })
202
- .forEach((assetData: SparkAssetData, i) => {
203
- payload[assetData.symbol] = { ...assetData, sortIndex: i };
204
- });
205
-
206
- return { assetsData: payload };
207
- };
208
-
209
- export const EMPTY_SPARK_DATA = {
210
- usedAssets: {},
211
- suppliedUsd: '0',
212
- borrowedUsd: '0',
213
- borrowLimitUsd: '0',
214
- leftToBorrowUsd: '0',
215
- ratio: '0',
216
- minRatio: '0',
217
- netApy: '0',
218
- incentiveUsd: '0',
219
- totalInterestUsd: '0',
220
- eModeCategory: 0,
221
- isInIsolationMode: false,
222
- isInSiloedMode: false,
223
- collRatio: '0',
224
- suppliedCollateralUsd: '0',
225
- totalSupplied: '0',
226
- eModeCategories: [],
227
- };
228
-
229
- export const getSparkAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
230
- let balances: PositionBalances = {
231
- collateral: {},
232
- debt: {},
233
- };
234
-
235
- if (!address) {
236
- return balances;
237
- }
238
-
239
- const loanInfoContract = SparkViewContract(web3, network, block);
240
-
241
- const market = SPARK_V1(network);
242
- const marketAddress = market.providerAddress;
243
- const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
244
-
245
- // split addresses in half to avoid gas limit by multicall
246
- const middleAddressIndex = Math.floor(_addresses.length / 2);
247
-
248
- const multicallData = [
249
- {
250
- target: loanInfoContract.options.address,
251
- abiItem: loanInfoContract.options.jsonInterface.find(({ name }) => name === 'getTokenBalances'),
252
- params: [marketAddress, address, _addresses.slice(0, middleAddressIndex)],
253
- },
254
- {
255
- target: loanInfoContract.options.address,
256
- abiItem: loanInfoContract.options.jsonInterface.find(({ name }) => name === 'getTokenBalances'),
257
- params: [marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)],
258
- },
259
- ];
260
-
261
- const multicallRes = await multicall(multicallData, web3, network, block);
262
-
263
- const loanInfo = [...multicallRes[0][0], ...multicallRes[1][0]];
264
-
265
- loanInfo.forEach((tokenInfo: any, i: number) => {
266
- const asset = wethToEth(market.assets[i]);
267
-
268
- balances = {
269
- collateral: {
270
- ...balances.collateral,
271
- [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: tokenInfo.balance.toString(),
272
- },
273
- debt: {
274
- ...balances.debt,
275
- [addressMapping ? getAssetInfo(asset, network).address.toLowerCase() : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
276
- },
277
- };
278
- });
279
-
280
- return balances;
281
- };
282
-
283
- export const getSparkAccountData = async (web3: Web3, network: NetworkNumber, address: string, extractedState: { selectedMarket: SparkMarketData, assetsData: SparkAssetsData }) => {
284
- const {
285
- selectedMarket: market, assetsData,
286
- } = extractedState;
287
- let payload: SparkPositionData = {
288
- ...EMPTY_SPARK_DATA,
289
- lastUpdated: Date.now(),
290
- };
291
- if (!address) {
292
- // structure that this function returns is complex and dynamic so i didnt want to hardcode it in EMPTY_SPARK_DATA
293
- // This case only triggers if user doesnt have proxy and data is refetched once proxy is created
294
- // TODO when refactoring spark figure out if this is the best solution.
295
- payload.eModeCategories = sparkEmodeCategoriesMapping(extractedState, {});
296
-
297
- return payload;
298
- }
299
-
300
- const loanInfoContract = SparkViewContract(web3, network);
301
- const marketAddress = market.providerAddress;
302
- const _addresses = market.assets.map((a) => getAssetInfo(ethToWeth(a)).address);
303
-
304
- const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
305
-
306
- const LendingPoolAbi = getConfigContractAbi(market.lendingPool);
307
-
308
- const multicallData = [
309
- {
310
- target: market.lendingPoolAddress,
311
- abiItem: LendingPoolAbi.find(({ name }) => name === 'getUserEMode'),
312
- params: [address],
313
- },
314
- {
315
- target: loanInfoContract.options.address,
316
- abiItem: getAbiItem(loanInfoContract.options.jsonInterface, 'getTokenBalances'),
317
- params: [marketAddress, address, _addresses.slice(0, middleAddressIndex)],
318
- },
319
- {
320
- target: loanInfoContract.options.address,
321
- abiItem: getAbiItem(loanInfoContract.options.jsonInterface, 'getTokenBalances'),
322
- params: [marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)],
323
- },
324
- ];
325
-
326
- const multicallRes = await multicall(multicallData, web3, network);
327
-
328
- const loanInfo = [...multicallRes[1][0], ...multicallRes[2][0]];
329
-
330
- const usedAssets = {} as SparkUsedAssets;
331
- loanInfo.forEach((tokenInfo, i) => {
332
- const asset = market.assets[i];
333
- const isSupplied = tokenInfo.balance.toString() !== '0';
334
- const isBorrowed = tokenInfo.borrowsStable.toString() !== '0' || tokenInfo.borrowsVariable.toString() !== '0';
335
- if (!isSupplied && !isBorrowed) return;
336
-
337
- const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
338
- const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
339
- const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
340
- const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
341
- let interestMode;
342
- if (borrowedVariable === '0' && borrowedStable !== '0') {
343
- interestMode = '1';
344
- } else if (borrowedVariable !== '0' && borrowedStable === '0') {
345
- interestMode = '2';
346
- } else {
347
- interestMode = 'both';
348
- }
349
- if (!usedAssets[asset]) usedAssets[asset] = {} as SparkUsedAsset;
350
- usedAssets[asset] = {
351
- ...usedAssets[asset],
352
- symbol: asset,
353
- supplied,
354
- suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
355
- isSupplied,
356
- collateral: enabledAsCollateral,
357
- stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
358
- borrowedStable,
359
- borrowedVariable,
360
- borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),
361
- borrowedUsdVariable: new Dec(borrowedVariable).mul(assetsData[asset].price).toString(),
362
- borrowed: new Dec(borrowedStable).add(borrowedVariable).toString(),
363
- borrowedUsd: new Dec(new Dec(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(),
364
- isBorrowed,
365
- eModeCategory: assetsData[asset].eModeCategory,
366
- interestMode,
367
- };
368
- });
369
-
370
- payload.eModeCategory = +multicallRes[0][0];
371
- payload = {
372
- ...payload,
373
- usedAssets,
374
- ...sparkGetAggregatedPositionData({
375
- ...extractedState, usedAssets, eModeCategory: payload.eModeCategory,
376
- }),
377
- };
378
- payload.eModeCategories = sparkEmodeCategoriesMapping(extractedState, usedAssets);
379
- payload.isInIsolationMode = sparkIsInIsolationMode({ usedAssets, assetsData });
380
- payload.isInSiloedMode = sparkIsInIsolationMode({ usedAssets, assetsData });
381
-
382
- payload.ratio = payload.borrowedUsd && payload.borrowedUsd !== '0'
383
- ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString()
384
- : '0';
385
- payload.minRatio = '100';
386
- payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
387
- ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
388
- : '0';
389
-
390
- // Calculate borrow limits per asset
391
- Object.values(payload.usedAssets).forEach((item) => {
392
- if (item.isBorrowed) {
393
- // eslint-disable-next-line no-param-reassign
394
- item.stableLimit = calculateBorrowingAssetLimit(item.borrowedUsdStable, payload.borrowLimitUsd);
395
- // eslint-disable-next-line no-param-reassign
396
- item.variableLimit = calculateBorrowingAssetLimit(item.borrowedUsdVariable, payload.borrowLimitUsd);
397
- // eslint-disable-next-line no-param-reassign
398
- item.limit = calculateBorrowingAssetLimit(item.borrowedUsd, payload.borrowLimitUsd);
399
- }
400
- });
401
-
402
- const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
403
- payload.netApy = netApy;
404
- payload.incentiveUsd = incentiveUsd;
405
- payload.totalInterestUsd = totalInterestUsd;
406
-
407
- return payload;
408
- };
409
-
410
- export const getSparkFullPositionData = async (web3: Web3, network: NetworkNumber, address: string, market: SparkMarketData, mainnetWeb3: Web3): Promise<SparkPositionData> => {
411
- const marketData = await getSparkMarketsData(web3, network, market, mainnetWeb3);
412
- const positionData = await getSparkAccountData(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
413
- return positionData;
1
+ import Web3 from 'web3';
2
+ import Dec from 'decimal.js';
3
+ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
4
+ import {
5
+ Blockish, EthAddress, NetworkNumber, PositionBalances,
6
+ } from '../types/common';
7
+ import {
8
+ ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress,
9
+ } from '../services/utils';
10
+ import {
11
+ calculateNetApy, getCbETHApr, getREthApr, getStETHApr,
12
+ } from '../staking';
13
+ import { getDsrApy } from '../services/dsrService';
14
+ import {
15
+ SparkIncentiveDataProviderContract,
16
+ SparkViewContract,
17
+ getConfigContractAbi,
18
+ createContractWrapper,
19
+ } from '../contracts';
20
+ import {
21
+ EModeCategoryDataMapping,
22
+ SparkAssetData,
23
+ SparkAssetsData,
24
+ SparkMarketData,
25
+ SparkMarketsData,
26
+ SparkPositionData,
27
+ SparkUsedAsset,
28
+ SparkUsedAssets,
29
+ } from '../types';
30
+ import { multicall } from '../multicall';
31
+ import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
32
+ import { calculateBorrowingAssetLimit } from '../moneymarket';
33
+ import { SPARK_V1 } from '../markets/spark';
34
+
35
+ export const sparkEmodeCategoriesMapping = (extractedState: { assetsData: SparkAssetsData }, usedAssets: SparkUsedAssets) => {
36
+ const { assetsData } = extractedState;
37
+ const usedAssetsValues = Object.values(usedAssets);
38
+
39
+ const categoriesMapping: { [key: number]: EModeCategoryDataMapping } = {};
40
+ Object.values(assetsData).forEach((a) => {
41
+ const borrowingOnlyFromCategory = a.eModeCategory === 0
42
+ ? true
43
+ : !usedAssetsValues.filter(u => u.isBorrowed && u.eModeCategory !== a.eModeCategory).length;
44
+ const afterEnteringCategory = sparkGetAggregatedPositionData({
45
+ ...extractedState, usedAssets, eModeCategory: a.eModeCategory,
46
+ });
47
+ const willStayOverCollateralized = new Dec(afterEnteringCategory.ratio).eq(0) || new Dec(afterEnteringCategory.ratio).gt(afterEnteringCategory.liqPercent);
48
+ const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized];
49
+
50
+ categoriesMapping[a.eModeCategory] = {
51
+ enteringTerms,
52
+ canEnterCategory: !enteringTerms.includes(false),
53
+ id: a.eModeCategory,
54
+ data: a.eModeCategoryData,
55
+ assets: a.eModeCategory === 0 ? [] : [...(categoriesMapping[a.eModeCategory]?.assets || []), a.symbol],
56
+ enabledData: {
57
+ ratio: afterEnteringCategory.ratio,
58
+ liqRatio: afterEnteringCategory.liqRatio,
59
+ liqPercent: afterEnteringCategory.liqPercent,
60
+ collRatio: afterEnteringCategory.collRatio,
61
+ },
62
+ };
63
+ });
64
+ return categoriesMapping;
65
+ };
66
+
67
+ export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, selectedMarket: SparkMarketData, mainnetWeb3: Web3): Promise<SparkMarketsData> => {
68
+ const marketAddress = selectedMarket.providerAddress;
69
+
70
+ let rewardInfo: any[] = [];
71
+ if (network === 10) {
72
+ const sparkIncentivesContract = SparkIncentiveDataProviderContract(web3, network);
73
+ rewardInfo = await sparkIncentivesContract.methods.getReservesIncentivesData(marketAddress).call();
74
+ rewardInfo = rewardInfo.reduce((all, market) => {
75
+ // eslint-disable-next-line no-param-reassign
76
+ all[market.underlyingAsset] = market;
77
+ return all;
78
+ }, {});
79
+ }
80
+
81
+ const loanInfoContract = SparkViewContract(web3, network);
82
+
83
+ const loanInfo = await loanInfoContract.methods.getFullTokensInfo(
84
+ marketAddress,
85
+ selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address),
86
+ ).call();
87
+
88
+ const assetsData: SparkAssetData[] = loanInfo
89
+ .map((market, i) => ({
90
+ symbol: selectedMarket.assets[i],
91
+ isIsolated: new Dec(market.debtCeilingForIsolationMode).gt(0),
92
+ debtCeilingForIsolationMode: new Dec(market.debtCeilingForIsolationMode).div(100).toString(),
93
+ isSiloed: market.isSiloedForBorrowing,
94
+ eModeCategory: +market.emodeCategory,
95
+ isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
96
+ assetId: Number(market.assetId),
97
+ underlyingTokenAddress: market.underlyingTokenAddress,
98
+ supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
99
+ borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
100
+ borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
101
+ collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
102
+ liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
103
+ marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
104
+ .sub(market.totalBorrow.toString())
105
+ .toString(), selectedMarket.assets[i]),
106
+ utilization: new Dec(market.totalBorrow.toString())
107
+ .div(new Dec(market.totalSupply.toString()))
108
+ .times(100)
109
+ .toString(),
110
+ usageAsCollateralEnabled: market.usageAsCollateralEnabled,
111
+ supplyCap: market.supplyCap,
112
+ borrowCap: market.borrowCap,
113
+ totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
114
+ isInactive: !market.isActive,
115
+ isFrozen: market.isFrozen,
116
+ isPaused: market.isPaused,
117
+ canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
118
+ canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
119
+ canBeWithdrawn: market.isActive && !market.isPaused,
120
+ canBePayBacked: market.isActive && !market.isPaused,
121
+ disabledStableBorrowing: !market.stableBorrowRateEnabled,
122
+ totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
123
+ totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
124
+ price: new Dec(market.price.toString()).div(1e8).toString(), // is actually price in USD
125
+ isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
126
+ isFlashLoanEnabled: market.isFlashLoanEnabled,
127
+ eModeCategoryData: {
128
+ label: market.label,
129
+ liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
130
+ liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
131
+ collateralFactor: new Dec(market.ltv).div(10000).toString(),
132
+ priceSource: market.priceSource,
133
+ },
134
+ }));
135
+
136
+ await Promise.all(assetsData.map(async (market) => {
137
+ /* eslint-disable no-param-reassign */
138
+ const rewardForMarket = (rewardInfo as any)[market.underlyingTokenAddress];
139
+ if (market.symbol === 'wstETH') {
140
+ market.incentiveSupplyApy = await getStETHApr(mainnetWeb3);
141
+ market.incentiveSupplyToken = 'wstETH';
142
+ }
143
+
144
+ if (market.symbol === 'cbETH' && !isLayer2Network(network)) {
145
+ market.incentiveSupplyApy = await getCbETHApr(mainnetWeb3);
146
+ market.incentiveSupplyToken = 'cbETH';
147
+ }
148
+
149
+ if (market.symbol === 'rETH') {
150
+ market.incentiveSupplyApy = await getREthApr(mainnetWeb3);
151
+ market.incentiveSupplyToken = 'rETH';
152
+ }
153
+
154
+ if (market.symbol === 'sDAI') {
155
+ market.incentiveSupplyApy = await getDsrApy(web3, network);
156
+ market.incentiveSupplyToken = 'sDAI';
157
+ }
158
+
159
+ if (market.canBeBorrowed && market.incentiveSupplyApy) {
160
+ market.incentiveBorrowApy = `-${market.incentiveSupplyApy}`;
161
+ market.incentiveBorrowToken = market.incentiveSupplyToken;
162
+ }
163
+
164
+ if (!rewardForMarket) return;
165
+ const supplyRewardData = rewardForMarket.aIncentiveData.rewardsTokenInformation[0];
166
+ if (supplyRewardData) {
167
+ if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
168
+ market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
169
+ const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
170
+ const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(10 ** supplyRewardData.priceFeedDecimals).toString();
171
+ market.incentiveSupplyApy = new Dec(supplyEmissionPerSecond).div((10 ** supplyRewardData.rewardTokenDecimals) / 100)
172
+ .mul(365 * 24 * 3600)
173
+ .mul(supplyRewardPrice)
174
+ .div(market.price)
175
+ .div(market.totalSupply)
176
+ .toString();
177
+ }
178
+ const borrowRewardData = rewardForMarket.vIncentiveData.rewardsTokenInformation[0];
179
+ if (borrowRewardData) {
180
+ if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
181
+ market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
182
+ const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
183
+ const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** borrowRewardData.priceFeedDecimals).toString();
184
+ market.incentiveBorrowApy = new Dec(supplyEmissionPerSecond).div((10 ** borrowRewardData.rewardTokenDecimals) / 100)
185
+ .mul(365 * 24 * 3600)
186
+ .mul(supplyRewardPrice)
187
+ .div(market.price)
188
+ .div(market.totalBorrowVar)
189
+ .toString();
190
+ }
191
+ /* eslint-enable no-param-reassign */
192
+ }));
193
+
194
+ const payload: SparkAssetsData = {};
195
+ // Sort by market size
196
+ assetsData
197
+ .sort((a, b) => {
198
+ const aMarket = new Dec(a.price).times(a.totalSupply).toString();
199
+ const bMarket = new Dec(b.price).times(b.totalSupply).toString();
200
+
201
+ return new Dec(bMarket).minus(aMarket).toNumber();
202
+ })
203
+ .forEach((assetData: SparkAssetData, i) => {
204
+ payload[assetData.symbol] = { ...assetData, sortIndex: i };
205
+ });
206
+
207
+ return { assetsData: payload };
208
+ };
209
+
210
+ export const EMPTY_SPARK_DATA = {
211
+ usedAssets: {},
212
+ suppliedUsd: '0',
213
+ borrowedUsd: '0',
214
+ borrowLimitUsd: '0',
215
+ leftToBorrowUsd: '0',
216
+ ratio: '0',
217
+ minRatio: '0',
218
+ netApy: '0',
219
+ incentiveUsd: '0',
220
+ totalInterestUsd: '0',
221
+ eModeCategory: 0,
222
+ isInIsolationMode: false,
223
+ isInSiloedMode: false,
224
+ collRatio: '0',
225
+ suppliedCollateralUsd: '0',
226
+ totalSupplied: '0',
227
+ eModeCategories: [],
228
+ };
229
+
230
+ export const getSparkAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
231
+ let balances: PositionBalances = {
232
+ collateral: {},
233
+ debt: {},
234
+ };
235
+
236
+ if (!address) {
237
+ return balances;
238
+ }
239
+
240
+ const loanInfoContract = SparkViewContract(web3, network, block);
241
+
242
+ const market = SPARK_V1(network);
243
+ const marketAddress = market.providerAddress;
244
+ // @ts-ignore
245
+ const protocolDataProviderContract = createContractWrapper(web3, network, market.protocolData, market.protocolDataAddress);
246
+
247
+ const reserveTokens = await protocolDataProviderContract.methods.getAllReservesTokens().call({}, block);
248
+ const symbols = reserveTokens.map(({ symbol }: { symbol: string }) => symbol);
249
+ const _addresses = reserveTokens.map(({ tokenAddress }: { tokenAddress: EthAddress }) => tokenAddress);
250
+
251
+
252
+ // split addresses in half to avoid gas limit by multicall
253
+ const middleAddressIndex = Math.floor(_addresses.length / 2);
254
+
255
+ const multicallData = [
256
+ {
257
+ target: loanInfoContract.options.address,
258
+ abiItem: loanInfoContract.options.jsonInterface.find(({ name }) => name === 'getTokenBalances'),
259
+ params: [marketAddress, address, _addresses.slice(0, middleAddressIndex)],
260
+ },
261
+ {
262
+ target: loanInfoContract.options.address,
263
+ abiItem: loanInfoContract.options.jsonInterface.find(({ name }) => name === 'getTokenBalances'),
264
+ params: [marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)],
265
+ },
266
+ ];
267
+
268
+ const multicallRes = await multicall(multicallData, web3, network, block);
269
+
270
+ const loanInfo = [...multicallRes[0][0], ...multicallRes[1][0]];
271
+
272
+ loanInfo.forEach((tokenInfo: any, i: number) => {
273
+ const asset = wethToEth(symbols[i]);
274
+ const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
275
+
276
+ balances = {
277
+ collateral: {
278
+ ...balances.collateral,
279
+ [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString(),
280
+ },
281
+ debt: {
282
+ ...balances.debt,
283
+ [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
284
+ },
285
+ };
286
+ });
287
+
288
+ return balances;
289
+ };
290
+
291
+ export const getSparkAccountData = async (web3: Web3, network: NetworkNumber, address: string, extractedState: { selectedMarket: SparkMarketData, assetsData: SparkAssetsData }) => {
292
+ const {
293
+ selectedMarket: market, assetsData,
294
+ } = extractedState;
295
+ let payload: SparkPositionData = {
296
+ ...EMPTY_SPARK_DATA,
297
+ lastUpdated: Date.now(),
298
+ };
299
+ if (!address) {
300
+ // structure that this function returns is complex and dynamic so i didnt want to hardcode it in EMPTY_SPARK_DATA
301
+ // This case only triggers if user doesnt have proxy and data is refetched once proxy is created
302
+ // TODO when refactoring spark figure out if this is the best solution.
303
+ payload.eModeCategories = sparkEmodeCategoriesMapping(extractedState, {});
304
+
305
+ return payload;
306
+ }
307
+
308
+ const loanInfoContract = SparkViewContract(web3, network);
309
+ const marketAddress = market.providerAddress;
310
+ const _addresses = market.assets.map((a) => getAssetInfo(ethToWeth(a)).address);
311
+
312
+ const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
313
+
314
+ const LendingPoolAbi = getConfigContractAbi(market.lendingPool);
315
+
316
+ const multicallData = [
317
+ {
318
+ target: market.lendingPoolAddress,
319
+ abiItem: LendingPoolAbi.find(({ name }) => name === 'getUserEMode'),
320
+ params: [address],
321
+ },
322
+ {
323
+ target: loanInfoContract.options.address,
324
+ abiItem: getAbiItem(loanInfoContract.options.jsonInterface, 'getTokenBalances'),
325
+ params: [marketAddress, address, _addresses.slice(0, middleAddressIndex)],
326
+ },
327
+ {
328
+ target: loanInfoContract.options.address,
329
+ abiItem: getAbiItem(loanInfoContract.options.jsonInterface, 'getTokenBalances'),
330
+ params: [marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)],
331
+ },
332
+ ];
333
+
334
+ const multicallRes = await multicall(multicallData, web3, network);
335
+
336
+ const loanInfo = [...multicallRes[1][0], ...multicallRes[2][0]];
337
+
338
+ const usedAssets = {} as SparkUsedAssets;
339
+ loanInfo.forEach((tokenInfo, i) => {
340
+ const asset = market.assets[i];
341
+ const isSupplied = tokenInfo.balance.toString() !== '0';
342
+ const isBorrowed = tokenInfo.borrowsStable.toString() !== '0' || tokenInfo.borrowsVariable.toString() !== '0';
343
+ if (!isSupplied && !isBorrowed) return;
344
+
345
+ const supplied = assetAmountInEth(tokenInfo.balance.toString(), asset);
346
+ const borrowedStable = assetAmountInEth(tokenInfo.borrowsStable.toString(), asset);
347
+ const borrowedVariable = assetAmountInEth(tokenInfo.borrowsVariable.toString(), asset);
348
+ const enabledAsCollateral = assetsData[asset].usageAsCollateralEnabled ? tokenInfo.enabledAsCollateral : false;
349
+ let interestMode;
350
+ if (borrowedVariable === '0' && borrowedStable !== '0') {
351
+ interestMode = '1';
352
+ } else if (borrowedVariable !== '0' && borrowedStable === '0') {
353
+ interestMode = '2';
354
+ } else {
355
+ interestMode = 'both';
356
+ }
357
+ if (!usedAssets[asset]) usedAssets[asset] = {} as SparkUsedAsset;
358
+ usedAssets[asset] = {
359
+ ...usedAssets[asset],
360
+ symbol: asset,
361
+ supplied,
362
+ suppliedUsd: new Dec(supplied).mul(assetsData[asset].price).toString(),
363
+ isSupplied,
364
+ collateral: enabledAsCollateral,
365
+ stableBorrowRate: new Dec(tokenInfo.stableBorrowRate).div(1e25).toString(),
366
+ borrowedStable,
367
+ borrowedVariable,
368
+ borrowedUsdStable: new Dec(borrowedStable).mul(assetsData[asset].price).toString(),
369
+ borrowedUsdVariable: new Dec(borrowedVariable).mul(assetsData[asset].price).toString(),
370
+ borrowed: new Dec(borrowedStable).add(borrowedVariable).toString(),
371
+ borrowedUsd: new Dec(new Dec(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(),
372
+ isBorrowed,
373
+ eModeCategory: assetsData[asset].eModeCategory,
374
+ interestMode,
375
+ };
376
+ });
377
+
378
+ payload.eModeCategory = +multicallRes[0][0];
379
+ payload = {
380
+ ...payload,
381
+ usedAssets,
382
+ ...sparkGetAggregatedPositionData({
383
+ ...extractedState, usedAssets, eModeCategory: payload.eModeCategory,
384
+ }),
385
+ };
386
+ payload.eModeCategories = sparkEmodeCategoriesMapping(extractedState, usedAssets);
387
+ payload.isInIsolationMode = sparkIsInIsolationMode({ usedAssets, assetsData });
388
+ payload.isInSiloedMode = sparkIsInIsolationMode({ usedAssets, assetsData });
389
+
390
+ payload.ratio = payload.borrowedUsd && payload.borrowedUsd !== '0'
391
+ ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString()
392
+ : '0';
393
+ payload.minRatio = '100';
394
+ payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
395
+ ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
396
+ : '0';
397
+
398
+ // Calculate borrow limits per asset
399
+ Object.values(payload.usedAssets).forEach((item) => {
400
+ if (item.isBorrowed) {
401
+ // eslint-disable-next-line no-param-reassign
402
+ item.stableLimit = calculateBorrowingAssetLimit(item.borrowedUsdStable, payload.borrowLimitUsd);
403
+ // eslint-disable-next-line no-param-reassign
404
+ item.variableLimit = calculateBorrowingAssetLimit(item.borrowedUsdVariable, payload.borrowLimitUsd);
405
+ // eslint-disable-next-line no-param-reassign
406
+ item.limit = calculateBorrowingAssetLimit(item.borrowedUsd, payload.borrowLimitUsd);
407
+ }
408
+ });
409
+
410
+ const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
411
+ payload.netApy = netApy;
412
+ payload.incentiveUsd = incentiveUsd;
413
+ payload.totalInterestUsd = totalInterestUsd;
414
+
415
+ return payload;
416
+ };
417
+
418
+ export const getSparkFullPositionData = async (web3: Web3, network: NetworkNumber, address: string, market: SparkMarketData, mainnetWeb3: Web3): Promise<SparkPositionData> => {
419
+ const marketData = await getSparkMarketsData(web3, network, market, mainnetWeb3);
420
+ const positionData = await getSparkAccountData(web3, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
421
+ return positionData;
414
422
  };