@defisaver/positions-sdk 1.0.11-fluid-dev10 → 1.0.11-fluid-dev12

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 (80) hide show
  1. package/.mocharc.json +4 -4
  2. package/.nvmrc +1 -1
  3. package/README.md +69 -69
  4. package/cjs/fluid/index.js +60 -20
  5. package/cjs/helpers/fluidHelpers/index.js +21 -2
  6. package/cjs/helpers/morphoBlueHelpers/index.js +66 -66
  7. package/cjs/types/fluid.d.ts +4 -0
  8. package/esm/fluid/index.js +60 -20
  9. package/esm/helpers/fluidHelpers/index.js +21 -2
  10. package/esm/helpers/morphoBlueHelpers/index.js +66 -66
  11. package/esm/types/fluid.d.ts +4 -0
  12. package/package.json +54 -54
  13. package/src/aaveV2/index.ts +227 -227
  14. package/src/aaveV3/index.ts +624 -624
  15. package/src/assets/index.ts +60 -60
  16. package/src/chickenBonds/index.ts +123 -123
  17. package/src/compoundV2/index.ts +220 -220
  18. package/src/compoundV3/index.ts +291 -291
  19. package/src/config/contracts.js +1155 -1155
  20. package/src/constants/index.ts +6 -6
  21. package/src/contracts.ts +135 -135
  22. package/src/curveUsd/index.ts +239 -239
  23. package/src/eulerV2/index.ts +303 -303
  24. package/src/exchange/index.ts +17 -17
  25. package/src/fluid/index.ts +1289 -1241
  26. package/src/helpers/aaveHelpers/index.ts +203 -203
  27. package/src/helpers/chickenBondsHelpers/index.ts +23 -23
  28. package/src/helpers/compoundHelpers/index.ts +248 -248
  29. package/src/helpers/curveUsdHelpers/index.ts +40 -40
  30. package/src/helpers/eulerHelpers/index.ts +234 -234
  31. package/src/helpers/fluidHelpers/index.ts +325 -294
  32. package/src/helpers/index.ts +11 -11
  33. package/src/helpers/liquityV2Helpers/index.ts +80 -80
  34. package/src/helpers/llamaLendHelpers/index.ts +53 -53
  35. package/src/helpers/makerHelpers/index.ts +94 -94
  36. package/src/helpers/morphoBlueHelpers/index.ts +367 -367
  37. package/src/helpers/sparkHelpers/index.ts +154 -154
  38. package/src/index.ts +52 -52
  39. package/src/liquity/index.ts +116 -116
  40. package/src/liquityV2/index.ts +295 -295
  41. package/src/llamaLend/index.ts +275 -275
  42. package/src/maker/index.ts +117 -117
  43. package/src/markets/aave/index.ts +152 -152
  44. package/src/markets/aave/marketAssets.ts +46 -46
  45. package/src/markets/compound/index.ts +213 -213
  46. package/src/markets/compound/marketsAssets.ts +82 -82
  47. package/src/markets/curveUsd/index.ts +69 -69
  48. package/src/markets/euler/index.ts +26 -26
  49. package/src/markets/fluid/index.ts +2454 -2454
  50. package/src/markets/index.ts +27 -27
  51. package/src/markets/liquityV2/index.ts +54 -54
  52. package/src/markets/llamaLend/contractAddresses.ts +141 -141
  53. package/src/markets/llamaLend/index.ts +235 -235
  54. package/src/markets/morphoBlue/index.ts +895 -895
  55. package/src/markets/spark/index.ts +29 -29
  56. package/src/markets/spark/marketAssets.ts +10 -10
  57. package/src/moneymarket/moneymarketCommonService.ts +80 -80
  58. package/src/morphoAaveV2/index.ts +256 -256
  59. package/src/morphoAaveV3/index.ts +630 -630
  60. package/src/morphoBlue/index.ts +202 -202
  61. package/src/multicall/index.ts +33 -33
  62. package/src/services/priceService.ts +130 -130
  63. package/src/services/utils.ts +59 -59
  64. package/src/setup.ts +8 -8
  65. package/src/spark/index.ts +460 -460
  66. package/src/staking/staking.ts +217 -217
  67. package/src/types/aave.ts +275 -275
  68. package/src/types/chickenBonds.ts +45 -45
  69. package/src/types/common.ts +84 -84
  70. package/src/types/compound.ts +133 -133
  71. package/src/types/curveUsd.ts +119 -119
  72. package/src/types/euler.ts +173 -173
  73. package/src/types/fluid.ts +330 -325
  74. package/src/types/index.ts +11 -11
  75. package/src/types/liquity.ts +30 -30
  76. package/src/types/liquityV2.ts +119 -119
  77. package/src/types/llamaLend.ts +155 -155
  78. package/src/types/maker.ts +50 -50
  79. package/src/types/morphoBlue.ts +194 -194
  80. package/src/types/spark.ts +135 -135
@@ -1,202 +1,202 @@
1
- import Web3 from 'web3';
2
- import Dec from 'decimal.js';
3
- import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
4
- import {
5
- Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
6
- } from '../types/common';
7
- import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
8
- import {
9
- MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
10
- } from '../types';
11
- import { USD_QUOTE, WAD } from '../constants';
12
- import { getStakingApy, STAKING_ASSETS } from '../staking';
13
- import { isMainnetNetwork, wethToEth } from '../services/utils';
14
- import {
15
- getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
16
- } from '../helpers/morphoBlueHelpers';
17
- import { getChainlinkAssetAddress } from '../services/priceService';
18
-
19
- export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
20
- const {
21
- loanToken, collateralToken, oracle, irm, lltv, oracleType,
22
- } = selectedMarket;
23
-
24
- const lltvInWei = new Dec(lltv).mul(WAD).toString();
25
- const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
26
- const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
27
-
28
- const loanTokenFeedAddress = getChainlinkAssetAddress(loanTokenInfo.symbol, network);
29
-
30
- const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
31
-
32
- let marketInfo;
33
- let loanTokenPrice;
34
- const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
35
- const isMainnet = isMainnetNetwork(network);
36
- if (isMainnet) {
37
- const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
38
- const [_loanTokenPrice, _marketInfo] = await Promise.all([
39
- isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
40
- morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
41
- ]);
42
- marketInfo = _marketInfo;
43
- loanTokenPrice = _loanTokenPrice;
44
- } else {
45
- // Currently only base network is supported
46
- const feedRegistryContract = DFSFeedRegistryContract(web3, network);
47
-
48
- const [loanTokenPriceRound, _marketInfo] = await Promise.all([
49
- isTokenUSDA ? Promise.resolve({ answer: '100000000' }) // Normalize to match the expected object structure
50
- : feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call(),
51
- morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
52
- ]);
53
- marketInfo = _marketInfo;
54
- loanTokenPrice = loanTokenPriceRound.answer;
55
- }
56
-
57
- let morphoSupplyApy = '0';
58
- let morphoBorrowApy = '0';
59
- try {
60
- const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
61
- morphoSupplyApy = _morphoSupplyApy;
62
- morphoBorrowApy = _morphoBorrowApy;
63
- } catch (e) {
64
- console.error(e);
65
- }
66
-
67
- const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
68
- const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
69
- const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
70
-
71
- const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
72
- const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
73
-
74
- const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
75
-
76
- const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
77
- const assetsData: MorphoBlueAssetsData = {};
78
- assetsData[wethToEth(loanTokenInfo.symbol)] = {
79
- symbol: wethToEth(loanTokenInfo.symbol),
80
- address: loanToken,
81
- price: new Dec(loanTokenPrice).div(1e8).toString(),
82
- supplyRate,
83
- borrowRate: compoundedBorrowRate,
84
- totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
85
- totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
86
- canBeSupplied: true,
87
- canBeBorrowed: true,
88
- incentiveSupplyApy: morphoSupplyApy,
89
- incentiveBorrowApy: morphoBorrowApy,
90
- incentiveSupplyToken: 'MORPHO',
91
- incentiveBorrowToken: 'MORPHO',
92
- };
93
-
94
- assetsData[wethToEth(collateralTokenInfo.symbol)] = {
95
- symbol: wethToEth(collateralTokenInfo.symbol),
96
- address: collateralToken,
97
- price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
98
- supplyRate: '0',
99
- borrowRate: '0',
100
- canBeSupplied: true,
101
- canBeBorrowed: false,
102
- };
103
- if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
104
- assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
105
- assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
106
- }
107
-
108
- return {
109
- id: marketInfo.id,
110
- fee: new Dec(marketInfo.fee).div(WAD).toString(),
111
- loanToken: wethToEth(loanTokenInfo.symbol),
112
- collateralToken: wethToEth(collateralTokenInfo.symbol),
113
- utillization,
114
- oracle: oracleRate,
115
- oracleType,
116
- lltv: new Dec(lltv).toString(),
117
- minRatio: new Dec(1).div(lltv).mul(100).toString(),
118
- assetsData,
119
- };
120
- }
121
-
122
- export const getMorphoBlueAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
123
- let balances: PositionBalances = {
124
- collateral: {},
125
- debt: {},
126
- };
127
-
128
- if (!address) {
129
- return balances;
130
- }
131
-
132
- const viewContract = MorphoBlueViewContract(web3, network, block);
133
- const {
134
- loanToken, collateralToken, oracle, irm, lltv,
135
- } = selectedMarket;
136
- const lltvInWei = new Dec(lltv).mul(WAD).toString();
137
- const marketObject = {
138
- loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
139
- };
140
-
141
- const loanInfo = await viewContract.methods.getUserInfo(marketObject, address).call({}, block);
142
- const loanTokenInfo = getAssetInfoByAddress(selectedMarket.loanToken, network);
143
- const collateralTokenInfo = getAssetInfoByAddress(selectedMarket.collateralToken, network);
144
-
145
- balances = {
146
- collateral: {
147
- [addressMapping ? collateralTokenInfo.address.toLowerCase() : wethToEth(collateralTokenInfo.symbol)]: assetAmountInEth(loanInfo.collateral, collateralTokenInfo.symbol),
148
- },
149
- debt: {
150
- [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(loanInfo.borrowedInAssets, loanTokenInfo.symbol),
151
- },
152
- };
153
-
154
- return balances;
155
- };
156
-
157
- export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
158
- const {
159
- loanToken, collateralToken, oracle, irm, lltv,
160
- } = selectedMarket;
161
- const lltvInWei = new Dec(lltv).mul(WAD).toString();
162
- const marketObject = {
163
- loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
164
- };
165
- const viewContract = MorphoBlueViewContract(web3, network);
166
- const loanInfo = await viewContract.methods.getUserInfo(marketObject, account).call();
167
- const usedAssets: MMUsedAssets = {};
168
-
169
- const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
170
- const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
171
- const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
172
- usedAssets[marketInfo.loanToken] = {
173
- symbol: loanTokenInfo.symbol,
174
- supplied: loanTokenSupplied,
175
- borrowed: loanTokenBorrowed,
176
- isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
177
- isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
178
- collateral: false,
179
- suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
180
- borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
181
- };
182
-
183
- const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
184
- const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
185
- usedAssets[marketInfo.collateralToken] = {
186
- symbol: collateralTokenInfo.symbol,
187
- supplied: collateralTokenSupplied,
188
- borrowed: '0',
189
- isSupplied: new Dec(loanInfo.collateral).gt(0),
190
- isBorrowed: false,
191
- collateral: true,
192
- suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
193
- borrowedUsd: '0',
194
- };
195
-
196
- return {
197
- supplyShares: loanInfo.supplyShares,
198
- borrowShares: loanInfo.borrowShares,
199
- usedAssets,
200
- ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
201
- };
202
- }
1
+ import Web3 from 'web3';
2
+ import Dec from 'decimal.js';
3
+ import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
4
+ import {
5
+ Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
6
+ } from '../types/common';
7
+ import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
8
+ import {
9
+ MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
10
+ } from '../types';
11
+ import { USD_QUOTE, WAD } from '../constants';
12
+ import { getStakingApy, STAKING_ASSETS } from '../staking';
13
+ import { isMainnetNetwork, wethToEth } from '../services/utils';
14
+ import {
15
+ getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
16
+ } from '../helpers/morphoBlueHelpers';
17
+ import { getChainlinkAssetAddress } from '../services/priceService';
18
+
19
+ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
20
+ const {
21
+ loanToken, collateralToken, oracle, irm, lltv, oracleType,
22
+ } = selectedMarket;
23
+
24
+ const lltvInWei = new Dec(lltv).mul(WAD).toString();
25
+ const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
26
+ const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
27
+
28
+ const loanTokenFeedAddress = getChainlinkAssetAddress(loanTokenInfo.symbol, network);
29
+
30
+ const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
31
+
32
+ let marketInfo;
33
+ let loanTokenPrice;
34
+ const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
35
+ const isMainnet = isMainnetNetwork(network);
36
+ if (isMainnet) {
37
+ const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
38
+ const [_loanTokenPrice, _marketInfo] = await Promise.all([
39
+ isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
40
+ morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
41
+ ]);
42
+ marketInfo = _marketInfo;
43
+ loanTokenPrice = _loanTokenPrice;
44
+ } else {
45
+ // Currently only base network is supported
46
+ const feedRegistryContract = DFSFeedRegistryContract(web3, network);
47
+
48
+ const [loanTokenPriceRound, _marketInfo] = await Promise.all([
49
+ isTokenUSDA ? Promise.resolve({ answer: '100000000' }) // Normalize to match the expected object structure
50
+ : feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call(),
51
+ morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
52
+ ]);
53
+ marketInfo = _marketInfo;
54
+ loanTokenPrice = loanTokenPriceRound.answer;
55
+ }
56
+
57
+ let morphoSupplyApy = '0';
58
+ let morphoBorrowApy = '0';
59
+ try {
60
+ const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await getRewardsForMarket(selectedMarket.marketId, network);
61
+ morphoSupplyApy = _morphoSupplyApy;
62
+ morphoBorrowApy = _morphoBorrowApy;
63
+ } catch (e) {
64
+ console.error(e);
65
+ }
66
+
67
+ const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
68
+ const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
69
+ const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
70
+
71
+ const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
72
+ const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
73
+
74
+ const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
75
+
76
+ const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
77
+ const assetsData: MorphoBlueAssetsData = {};
78
+ assetsData[wethToEth(loanTokenInfo.symbol)] = {
79
+ symbol: wethToEth(loanTokenInfo.symbol),
80
+ address: loanToken,
81
+ price: new Dec(loanTokenPrice).div(1e8).toString(),
82
+ supplyRate,
83
+ borrowRate: compoundedBorrowRate,
84
+ totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
85
+ totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
86
+ canBeSupplied: true,
87
+ canBeBorrowed: true,
88
+ incentiveSupplyApy: morphoSupplyApy,
89
+ incentiveBorrowApy: morphoBorrowApy,
90
+ incentiveSupplyToken: 'MORPHO',
91
+ incentiveBorrowToken: 'MORPHO',
92
+ };
93
+
94
+ assetsData[wethToEth(collateralTokenInfo.symbol)] = {
95
+ symbol: wethToEth(collateralTokenInfo.symbol),
96
+ address: collateralToken,
97
+ price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
98
+ supplyRate: '0',
99
+ borrowRate: '0',
100
+ canBeSupplied: true,
101
+ canBeBorrowed: false,
102
+ };
103
+ if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
104
+ assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
105
+ assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
106
+ }
107
+
108
+ return {
109
+ id: marketInfo.id,
110
+ fee: new Dec(marketInfo.fee).div(WAD).toString(),
111
+ loanToken: wethToEth(loanTokenInfo.symbol),
112
+ collateralToken: wethToEth(collateralTokenInfo.symbol),
113
+ utillization,
114
+ oracle: oracleRate,
115
+ oracleType,
116
+ lltv: new Dec(lltv).toString(),
117
+ minRatio: new Dec(1).div(lltv).mul(100).toString(),
118
+ assetsData,
119
+ };
120
+ }
121
+
122
+ export const getMorphoBlueAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
123
+ let balances: PositionBalances = {
124
+ collateral: {},
125
+ debt: {},
126
+ };
127
+
128
+ if (!address) {
129
+ return balances;
130
+ }
131
+
132
+ const viewContract = MorphoBlueViewContract(web3, network, block);
133
+ const {
134
+ loanToken, collateralToken, oracle, irm, lltv,
135
+ } = selectedMarket;
136
+ const lltvInWei = new Dec(lltv).mul(WAD).toString();
137
+ const marketObject = {
138
+ loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
139
+ };
140
+
141
+ const loanInfo = await viewContract.methods.getUserInfo(marketObject, address).call({}, block);
142
+ const loanTokenInfo = getAssetInfoByAddress(selectedMarket.loanToken, network);
143
+ const collateralTokenInfo = getAssetInfoByAddress(selectedMarket.collateralToken, network);
144
+
145
+ balances = {
146
+ collateral: {
147
+ [addressMapping ? collateralTokenInfo.address.toLowerCase() : wethToEth(collateralTokenInfo.symbol)]: assetAmountInEth(loanInfo.collateral, collateralTokenInfo.symbol),
148
+ },
149
+ debt: {
150
+ [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(loanInfo.borrowedInAssets, loanTokenInfo.symbol),
151
+ },
152
+ };
153
+
154
+ return balances;
155
+ };
156
+
157
+ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
158
+ const {
159
+ loanToken, collateralToken, oracle, irm, lltv,
160
+ } = selectedMarket;
161
+ const lltvInWei = new Dec(lltv).mul(WAD).toString();
162
+ const marketObject = {
163
+ loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
164
+ };
165
+ const viewContract = MorphoBlueViewContract(web3, network);
166
+ const loanInfo = await viewContract.methods.getUserInfo(marketObject, account).call();
167
+ const usedAssets: MMUsedAssets = {};
168
+
169
+ const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
170
+ const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
171
+ const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
172
+ usedAssets[marketInfo.loanToken] = {
173
+ symbol: loanTokenInfo.symbol,
174
+ supplied: loanTokenSupplied,
175
+ borrowed: loanTokenBorrowed,
176
+ isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
177
+ isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
178
+ collateral: false,
179
+ suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
180
+ borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
181
+ };
182
+
183
+ const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
184
+ const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
185
+ usedAssets[marketInfo.collateralToken] = {
186
+ symbol: collateralTokenInfo.symbol,
187
+ supplied: collateralTokenSupplied,
188
+ borrowed: '0',
189
+ isSupplied: new Dec(loanInfo.collateral).gt(0),
190
+ isBorrowed: false,
191
+ collateral: true,
192
+ suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
193
+ borrowedUsd: '0',
194
+ };
195
+
196
+ return {
197
+ supplyShares: loanInfo.supplyShares,
198
+ borrowShares: loanInfo.borrowShares,
199
+ usedAssets,
200
+ ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
201
+ };
202
+ }
@@ -1,33 +1,33 @@
1
- import Web3 from 'web3';
2
- import { chunk } from 'lodash';
3
- import { UniMulticallContract } from '../contracts';
4
- import { NetworkNumber } from '../types/common';
5
-
6
- export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber = NetworkNumber.Eth, blockNumber: 'latest' | number = 'latest') => {
7
- const multicallContract = UniMulticallContract(web3, network);
8
- const formattedCalls = calls.map((call) => {
9
- const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
10
- return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1200000 };
11
- });
12
- const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
13
-
14
- let formattedResult: any[] = [];
15
-
16
- callResult.returnData.forEach(([success, gasUsed, result], i) => {
17
- const formattedRes = result !== '0x'
18
- ? web3.eth.abi.decodeParameters(calls[i].abiItem.outputs, result)
19
- : undefined;
20
- formattedResult = [...formattedResult, formattedRes];
21
- });
22
-
23
- return formattedResult;
24
- };
25
-
26
- export const chunkAndMulticall = async (calls: any[], chunkSize: number, blockNumber: 'latest' | number = 'latest', web3: Web3, network: NetworkNumber = NetworkNumber.Eth) => {
27
- const chunkedCalls = chunk(calls, chunkSize);
28
-
29
- // @ts-ignore
30
- const results = await Promise.all(chunkedCalls.map((cnk) => multicall(cnk, web3, network, blockNumber)));
31
-
32
- return results.flat(1);
33
- };
1
+ import Web3 from 'web3';
2
+ import { chunk } from 'lodash';
3
+ import { UniMulticallContract } from '../contracts';
4
+ import { NetworkNumber } from '../types/common';
5
+
6
+ export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber = NetworkNumber.Eth, blockNumber: 'latest' | number = 'latest') => {
7
+ const multicallContract = UniMulticallContract(web3, network);
8
+ const formattedCalls = calls.map((call) => {
9
+ const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
10
+ return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1200000 };
11
+ });
12
+ const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
13
+
14
+ let formattedResult: any[] = [];
15
+
16
+ callResult.returnData.forEach(([success, gasUsed, result], i) => {
17
+ const formattedRes = result !== '0x'
18
+ ? web3.eth.abi.decodeParameters(calls[i].abiItem.outputs, result)
19
+ : undefined;
20
+ formattedResult = [...formattedResult, formattedRes];
21
+ });
22
+
23
+ return formattedResult;
24
+ };
25
+
26
+ export const chunkAndMulticall = async (calls: any[], chunkSize: number, blockNumber: 'latest' | number = 'latest', web3: Web3, network: NetworkNumber = NetworkNumber.Eth) => {
27
+ const chunkedCalls = chunk(calls, chunkSize);
28
+
29
+ // @ts-ignore
30
+ const results = await Promise.all(chunkedCalls.map((cnk) => multicall(cnk, web3, network, blockNumber)));
31
+
32
+ return results.flat(1);
33
+ };