@defisaver/positions-sdk 0.0.166-dev4-liquity-v2 → 0.0.166-dev4

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 (142) hide show
  1. package/.mocharc.json +4 -4
  2. package/.nvmrc +1 -1
  3. package/README.md +69 -69
  4. package/cjs/config/contracts.d.ts +32 -3
  5. package/cjs/config/contracts.js +3 -3
  6. package/cjs/contracts.d.ts +1 -1
  7. package/cjs/contracts.js +2 -2
  8. package/cjs/eulerV2/index.d.ts +41 -0
  9. package/cjs/eulerV2/index.js +218 -0
  10. package/cjs/helpers/eulerHelpers/index.d.ts +27 -0
  11. package/cjs/helpers/eulerHelpers/index.js +232 -0
  12. package/cjs/helpers/index.d.ts +1 -1
  13. package/cjs/helpers/index.js +2 -2
  14. package/cjs/index.d.ts +2 -2
  15. package/cjs/index.js +3 -3
  16. package/cjs/markets/euler/index.d.ts +8 -0
  17. package/cjs/markets/euler/index.js +30 -0
  18. package/cjs/markets/index.d.ts +1 -1
  19. package/cjs/markets/index.js +3 -3
  20. package/cjs/moneymarket/moneymarketCommonService.js +1 -1
  21. package/cjs/services/utils.d.ts +2 -0
  22. package/cjs/services/utils.js +4 -1
  23. package/cjs/types/contracts/generated/EulerV2View.d.ts +345 -0
  24. package/cjs/types/contracts/generated/index.d.ts +1 -1
  25. package/cjs/types/euler.d.ts +149 -0
  26. package/cjs/types/euler.js +14 -0
  27. package/cjs/types/index.d.ts +1 -1
  28. package/cjs/types/index.js +1 -1
  29. package/esm/config/contracts.d.ts +32 -3
  30. package/esm/config/contracts.js +3 -3
  31. package/esm/contracts.d.ts +1 -1
  32. package/esm/contracts.js +1 -1
  33. package/esm/eulerV2/index.d.ts +41 -0
  34. package/esm/eulerV2/index.js +210 -0
  35. package/esm/helpers/eulerHelpers/index.d.ts +27 -0
  36. package/esm/helpers/eulerHelpers/index.js +219 -0
  37. package/esm/helpers/index.d.ts +1 -1
  38. package/esm/helpers/index.js +1 -1
  39. package/esm/index.d.ts +2 -2
  40. package/esm/index.js +2 -2
  41. package/esm/markets/euler/index.d.ts +8 -0
  42. package/esm/markets/euler/index.js +24 -0
  43. package/esm/markets/index.d.ts +1 -1
  44. package/esm/markets/index.js +1 -1
  45. package/esm/moneymarket/moneymarketCommonService.js +1 -1
  46. package/esm/services/utils.d.ts +2 -0
  47. package/esm/services/utils.js +2 -0
  48. package/esm/types/contracts/generated/EulerV2View.d.ts +345 -0
  49. package/esm/types/contracts/generated/index.d.ts +1 -1
  50. package/esm/types/euler.d.ts +149 -0
  51. package/esm/types/euler.js +11 -0
  52. package/esm/types/index.d.ts +1 -1
  53. package/esm/types/index.js +1 -1
  54. package/package.json +49 -49
  55. package/src/aaveV2/index.ts +227 -227
  56. package/src/aaveV3/index.ts +590 -590
  57. package/src/assets/index.ts +60 -60
  58. package/src/chickenBonds/index.ts +123 -123
  59. package/src/compoundV2/index.ts +219 -219
  60. package/src/compoundV3/index.ts +281 -281
  61. package/src/config/contracts.js +1040 -1040
  62. package/src/constants/index.ts +6 -6
  63. package/src/contracts.ts +130 -130
  64. package/src/curveUsd/index.ts +229 -229
  65. package/src/eulerV2/index.ts +301 -0
  66. package/src/exchange/index.ts +17 -17
  67. package/src/helpers/aaveHelpers/index.ts +194 -194
  68. package/src/helpers/chickenBondsHelpers/index.ts +23 -23
  69. package/src/helpers/compoundHelpers/index.ts +246 -246
  70. package/src/helpers/curveUsdHelpers/index.ts +40 -40
  71. package/src/helpers/eulerHelpers/index.ts +231 -0
  72. package/src/helpers/index.ts +9 -9
  73. package/src/helpers/llamaLendHelpers/index.ts +53 -53
  74. package/src/helpers/makerHelpers/index.ts +94 -94
  75. package/src/helpers/morphoBlueHelpers/index.ts +115 -115
  76. package/src/helpers/sparkHelpers/index.ts +150 -150
  77. package/src/index.ts +48 -48
  78. package/src/liquity/index.ts +116 -116
  79. package/src/llamaLend/index.ts +275 -275
  80. package/src/maker/index.ts +117 -117
  81. package/src/markets/aave/index.ts +152 -152
  82. package/src/markets/aave/marketAssets.ts +46 -46
  83. package/src/markets/compound/index.ts +173 -173
  84. package/src/markets/compound/marketsAssets.ts +64 -64
  85. package/src/markets/curveUsd/index.ts +69 -69
  86. package/src/markets/euler/index.ts +27 -0
  87. package/src/markets/index.ts +24 -23
  88. package/src/markets/llamaLend/contractAddresses.ts +141 -141
  89. package/src/markets/llamaLend/index.ts +235 -235
  90. package/src/markets/morphoBlue/index.ts +728 -728
  91. package/src/markets/spark/index.ts +29 -29
  92. package/src/markets/spark/marketAssets.ts +10 -10
  93. package/src/moneymarket/moneymarketCommonService.ts +80 -80
  94. package/src/morphoAaveV2/index.ts +256 -256
  95. package/src/morphoAaveV3/index.ts +630 -630
  96. package/src/morphoBlue/index.ts +171 -171
  97. package/src/multicall/index.ts +22 -22
  98. package/src/services/dsrService.ts +15 -15
  99. package/src/services/priceService.ts +21 -21
  100. package/src/services/utils.ts +57 -54
  101. package/src/setup.ts +8 -8
  102. package/src/spark/index.ts +424 -424
  103. package/src/staking/staking.ts +218 -218
  104. package/src/types/aave.ts +262 -262
  105. package/src/types/chickenBonds.ts +45 -45
  106. package/src/types/common.ts +84 -84
  107. package/src/types/compound.ts +129 -129
  108. package/src/types/contracts/generated/EulerV2View.ts +446 -0
  109. package/src/types/contracts/generated/index.ts +1 -1
  110. package/src/types/curveUsd.ts +118 -118
  111. package/src/types/euler.ts +172 -0
  112. package/src/types/index.ts +10 -10
  113. package/src/types/liquity.ts +30 -30
  114. package/src/types/llamaLend.ts +155 -155
  115. package/src/types/maker.ts +50 -50
  116. package/src/types/morphoBlue.ts +146 -146
  117. package/src/types/spark.ts +127 -127
  118. package/cjs/helpers/liquityV2Helpers/index.d.ts +0 -12
  119. package/cjs/helpers/liquityV2Helpers/index.js +0 -62
  120. package/cjs/liquityV2/index.d.ts +0 -10
  121. package/cjs/liquityV2/index.js +0 -99
  122. package/cjs/markets/liquityV2/index.d.ts +0 -8
  123. package/cjs/markets/liquityV2/index.js +0 -34
  124. package/cjs/types/contracts/generated/LiquityV2View.d.ts +0 -222
  125. package/cjs/types/liquityV2.d.ts +0 -84
  126. package/cjs/types/liquityV2.js +0 -8
  127. package/esm/helpers/liquityV2Helpers/index.d.ts +0 -12
  128. package/esm/helpers/liquityV2Helpers/index.js +0 -54
  129. package/esm/liquityV2/index.d.ts +0 -10
  130. package/esm/liquityV2/index.js +0 -91
  131. package/esm/markets/liquityV2/index.d.ts +0 -8
  132. package/esm/markets/liquityV2/index.js +0 -28
  133. package/esm/types/contracts/generated/LiquityV2View.d.ts +0 -222
  134. package/esm/types/liquityV2.d.ts +0 -84
  135. package/esm/types/liquityV2.js +0 -5
  136. package/src/helpers/liquityV2Helpers/index.ts +0 -79
  137. package/src/liquityV2/index.ts +0 -116
  138. package/src/markets/liquityV2/index.ts +0 -31
  139. package/src/types/contracts/generated/LiquityV2View.ts +0 -280
  140. package/src/types/liquityV2.ts +0 -90
  141. /package/cjs/types/contracts/generated/{LiquityV2View.js → EulerV2View.js} +0 -0
  142. /package/esm/types/contracts/generated/{LiquityV2View.js → EulerV2View.js} +0 -0
@@ -1,171 +1,171 @@
1
- import Web3 from 'web3';
2
- import Dec from 'decimal.js';
3
- import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
4
- import {
5
- Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
6
- } from '../types/common';
7
- import {
8
- FeedRegistryContract,
9
- MorphoBlueViewContract,
10
- } from '../contracts';
11
- import {
12
- MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
13
- } from '../types';
14
- import { WAD, USD_QUOTE } from '../constants';
15
- import { getStakingApy, STAKING_ASSETS } from '../staking';
16
- import { wethToEth } from '../services/utils';
17
- import { getBorrowRate, getMorphoBlueAggregatedPositionData, getSupplyRate } from '../helpers/morphoBlueHelpers';
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
- const lltvInWei = new Dec(lltv).mul(WAD).toString();
24
- const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
25
- const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
26
- let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
27
- if (loanTokenInfo.symbol === 'WETH') {
28
- const ethAddress = getAssetInfo('ETH').address;
29
- loanTokenFeedAddress = ethAddress;
30
- }
31
-
32
- const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
33
- const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
34
-
35
- const [loanTokenPrice, marketInfo] = await Promise.all([
36
- loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
37
- morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
38
- ]);
39
-
40
- const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
41
- const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
42
- const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
43
-
44
- const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
45
- const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
46
-
47
- const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
48
-
49
- const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
50
- const assetsData: MorphoBlueAssetsData = {};
51
- assetsData[wethToEth(loanTokenInfo.symbol)] = {
52
- symbol: wethToEth(loanTokenInfo.symbol),
53
- address: loanToken,
54
- price: new Dec(loanTokenPrice).div(1e8).toString(),
55
- supplyRate,
56
- borrowRate: compoundedBorrowRate,
57
- totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
58
- totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
59
- canBeSupplied: true,
60
- canBeBorrowed: true,
61
- };
62
-
63
- assetsData[wethToEth(collateralTokenInfo.symbol)] = {
64
- symbol: wethToEth(collateralTokenInfo.symbol),
65
- address: collateralToken,
66
- price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
67
- supplyRate: '0',
68
- borrowRate: '0',
69
- canBeSupplied: true,
70
- canBeBorrowed: false,
71
- };
72
- if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
73
- assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
74
- assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
75
- }
76
-
77
- return {
78
- id: marketInfo.id,
79
- fee: new Dec(marketInfo.fee).div(WAD).toString(),
80
- loanToken: wethToEth(loanTokenInfo.symbol),
81
- collateralToken: wethToEth(collateralTokenInfo.symbol),
82
- utillization,
83
- oracle: oracleRate,
84
- oracleType,
85
- lltv: new Dec(lltv).toString(),
86
- minRatio: new Dec(1).div(lltv).mul(100).toString(),
87
- assetsData,
88
- };
89
- }
90
-
91
- export const getMorphoBlueAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
92
- let balances: PositionBalances = {
93
- collateral: {},
94
- debt: {},
95
- };
96
-
97
- if (!address) {
98
- return balances;
99
- }
100
-
101
- const viewContract = MorphoBlueViewContract(web3, network, block);
102
- const {
103
- loanToken, collateralToken, oracle, irm, lltv,
104
- } = selectedMarket;
105
- const lltvInWei = new Dec(lltv).mul(WAD).toString();
106
- const marketObject = {
107
- loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
108
- };
109
-
110
- const loanInfo = await viewContract.methods.getUserInfo(marketObject, address).call({}, block);
111
- const loanTokenInfo = getAssetInfoByAddress(selectedMarket.loanToken, network);
112
- const collateralTokenInfo = getAssetInfoByAddress(selectedMarket.collateralToken, network);
113
-
114
- balances = {
115
- collateral: {
116
- [addressMapping ? collateralTokenInfo.address.toLowerCase() : wethToEth(collateralTokenInfo.symbol)]: assetAmountInEth(loanInfo.collateral, collateralTokenInfo.symbol),
117
- },
118
- debt: {
119
- [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(loanInfo.borrowedInAssets, loanTokenInfo.symbol),
120
- },
121
- };
122
-
123
- return balances;
124
- };
125
-
126
- export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
127
- const {
128
- loanToken, collateralToken, oracle, irm, lltv,
129
- } = selectedMarket;
130
- const lltvInWei = new Dec(lltv).mul(WAD).toString();
131
- const marketObject = {
132
- loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
133
- };
134
- const viewContract = MorphoBlueViewContract(web3, network);
135
- const loanInfo = await viewContract.methods.getUserInfo(marketObject, account).call();
136
- const usedAssets: MMUsedAssets = {};
137
-
138
- const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
139
- const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
140
- const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
141
- usedAssets[marketInfo.loanToken] = {
142
- symbol: loanTokenInfo.symbol,
143
- supplied: loanTokenSupplied,
144
- borrowed: loanTokenBorrowed,
145
- isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
146
- isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
147
- collateral: false,
148
- suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
149
- borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
150
- };
151
-
152
- const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
153
- const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
154
- usedAssets[marketInfo.collateralToken] = {
155
- symbol: collateralTokenInfo.symbol,
156
- supplied: collateralTokenSupplied,
157
- borrowed: '0',
158
- isSupplied: new Dec(loanInfo.collateral).gt(0),
159
- isBorrowed: false,
160
- collateral: true,
161
- suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
162
- borrowedUsd: '0',
163
- };
164
-
165
- return {
166
- supplyShares: loanInfo.supplyShares,
167
- borrowShares: loanInfo.borrowShares,
168
- usedAssets,
169
- ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
170
- };
171
- }
1
+ import Web3 from 'web3';
2
+ import Dec from 'decimal.js';
3
+ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
4
+ import {
5
+ Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
6
+ } from '../types/common';
7
+ import {
8
+ FeedRegistryContract,
9
+ MorphoBlueViewContract,
10
+ } from '../contracts';
11
+ import {
12
+ MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
13
+ } from '../types';
14
+ import { WAD, USD_QUOTE } from '../constants';
15
+ import { getStakingApy, STAKING_ASSETS } from '../staking';
16
+ import { wethToEth } from '../services/utils';
17
+ import { getBorrowRate, getMorphoBlueAggregatedPositionData, getSupplyRate } from '../helpers/morphoBlueHelpers';
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
+ const lltvInWei = new Dec(lltv).mul(WAD).toString();
24
+ const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
25
+ const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
26
+ let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
27
+ if (loanTokenInfo.symbol === 'WETH') {
28
+ const ethAddress = getAssetInfo('ETH').address;
29
+ loanTokenFeedAddress = ethAddress;
30
+ }
31
+
32
+ const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
33
+ const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
34
+
35
+ const [loanTokenPrice, marketInfo] = await Promise.all([
36
+ loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
37
+ morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
38
+ ]);
39
+
40
+ const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
41
+ const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
42
+ const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
43
+
44
+ const oracleScaleFactor = new Dec(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
45
+ const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
46
+
47
+ const scale = new Dec(10).pow(loanTokenInfo.decimals).toString();
48
+
49
+ const oracleRate = new Dec(marketInfo.oracle).div(oracleScale).toString();
50
+ const assetsData: MorphoBlueAssetsData = {};
51
+ assetsData[wethToEth(loanTokenInfo.symbol)] = {
52
+ symbol: wethToEth(loanTokenInfo.symbol),
53
+ address: loanToken,
54
+ price: new Dec(loanTokenPrice).div(1e8).toString(),
55
+ supplyRate,
56
+ borrowRate: compoundedBorrowRate,
57
+ totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
58
+ totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
59
+ canBeSupplied: true,
60
+ canBeBorrowed: true,
61
+ };
62
+
63
+ assetsData[wethToEth(collateralTokenInfo.symbol)] = {
64
+ symbol: wethToEth(collateralTokenInfo.symbol),
65
+ address: collateralToken,
66
+ price: new Dec(assetsData[wethToEth(loanTokenInfo.symbol)].price).mul(oracleRate).toString(),
67
+ supplyRate: '0',
68
+ borrowRate: '0',
69
+ canBeSupplied: true,
70
+ canBeBorrowed: false,
71
+ };
72
+ if (STAKING_ASSETS.includes(collateralTokenInfo.symbol)) {
73
+ assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = await getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
74
+ assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
75
+ }
76
+
77
+ return {
78
+ id: marketInfo.id,
79
+ fee: new Dec(marketInfo.fee).div(WAD).toString(),
80
+ loanToken: wethToEth(loanTokenInfo.symbol),
81
+ collateralToken: wethToEth(collateralTokenInfo.symbol),
82
+ utillization,
83
+ oracle: oracleRate,
84
+ oracleType,
85
+ lltv: new Dec(lltv).toString(),
86
+ minRatio: new Dec(1).div(lltv).mul(100).toString(),
87
+ assetsData,
88
+ };
89
+ }
90
+
91
+ export const getMorphoBlueAccountBalances = async (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
92
+ let balances: PositionBalances = {
93
+ collateral: {},
94
+ debt: {},
95
+ };
96
+
97
+ if (!address) {
98
+ return balances;
99
+ }
100
+
101
+ const viewContract = MorphoBlueViewContract(web3, network, block);
102
+ const {
103
+ loanToken, collateralToken, oracle, irm, lltv,
104
+ } = selectedMarket;
105
+ const lltvInWei = new Dec(lltv).mul(WAD).toString();
106
+ const marketObject = {
107
+ loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
108
+ };
109
+
110
+ const loanInfo = await viewContract.methods.getUserInfo(marketObject, address).call({}, block);
111
+ const loanTokenInfo = getAssetInfoByAddress(selectedMarket.loanToken, network);
112
+ const collateralTokenInfo = getAssetInfoByAddress(selectedMarket.collateralToken, network);
113
+
114
+ balances = {
115
+ collateral: {
116
+ [addressMapping ? collateralTokenInfo.address.toLowerCase() : wethToEth(collateralTokenInfo.symbol)]: assetAmountInEth(loanInfo.collateral, collateralTokenInfo.symbol),
117
+ },
118
+ debt: {
119
+ [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(loanInfo.borrowedInAssets, loanTokenInfo.symbol),
120
+ },
121
+ };
122
+
123
+ return balances;
124
+ };
125
+
126
+ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
127
+ const {
128
+ loanToken, collateralToken, oracle, irm, lltv,
129
+ } = selectedMarket;
130
+ const lltvInWei = new Dec(lltv).mul(WAD).toString();
131
+ const marketObject = {
132
+ loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
133
+ };
134
+ const viewContract = MorphoBlueViewContract(web3, network);
135
+ const loanInfo = await viewContract.methods.getUserInfo(marketObject, account).call();
136
+ const usedAssets: MMUsedAssets = {};
137
+
138
+ const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
139
+ const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
140
+ const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
141
+ usedAssets[marketInfo.loanToken] = {
142
+ symbol: loanTokenInfo.symbol,
143
+ supplied: loanTokenSupplied,
144
+ borrowed: loanTokenBorrowed,
145
+ isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
146
+ isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
147
+ collateral: false,
148
+ suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
149
+ borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
150
+ };
151
+
152
+ const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
153
+ const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
154
+ usedAssets[marketInfo.collateralToken] = {
155
+ symbol: collateralTokenInfo.symbol,
156
+ supplied: collateralTokenSupplied,
157
+ borrowed: '0',
158
+ isSupplied: new Dec(loanInfo.collateral).gt(0),
159
+ isBorrowed: false,
160
+ collateral: true,
161
+ suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
162
+ borrowedUsd: '0',
163
+ };
164
+
165
+ return {
166
+ supplyShares: loanInfo.supplyShares,
167
+ borrowShares: loanInfo.borrowShares,
168
+ usedAssets,
169
+ ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
170
+ };
171
+ }
@@ -1,23 +1,23 @@
1
- import Web3 from 'web3';
2
- import { UniMulticallContract } from '../contracts';
3
- import { NetworkNumber } from '../types/common';
4
-
5
- export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber = NetworkNumber.Eth, blockNumber: 'latest' | number = 'latest') => {
6
- const multicallContract = UniMulticallContract(web3, network);
7
- const formattedCalls = calls.map((call) => {
8
- const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
9
- return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1200000 };
10
- });
11
- const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
12
-
13
- let formattedResult: any[] = [];
14
-
15
- callResult.returnData.forEach(([success, gasUsed, result], i) => {
16
- const formattedRes = result !== '0x'
17
- ? web3.eth.abi.decodeParameters(calls[i].abiItem.outputs, result)
18
- : undefined;
19
- formattedResult = [...formattedResult, formattedRes];
20
- });
21
-
22
- return formattedResult;
1
+ import Web3 from 'web3';
2
+ import { UniMulticallContract } from '../contracts';
3
+ import { NetworkNumber } from '../types/common';
4
+
5
+ export const multicall = async (calls: any[], web3: Web3, network: NetworkNumber = NetworkNumber.Eth, blockNumber: 'latest' | number = 'latest') => {
6
+ const multicallContract = UniMulticallContract(web3, network);
7
+ const formattedCalls = calls.map((call) => {
8
+ const callData = web3.eth.abi.encodeFunctionCall(call.abiItem, call.params);
9
+ return { callData, target: call.target || '0x0', gasLimit: call.gasLimit || 1200000 };
10
+ });
11
+ const callResult = await multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, blockNumber);
12
+
13
+ let formattedResult: any[] = [];
14
+
15
+ callResult.returnData.forEach(([success, gasUsed, result], i) => {
16
+ const formattedRes = result !== '0x'
17
+ ? web3.eth.abi.decodeParameters(calls[i].abiItem.outputs, result)
18
+ : undefined;
19
+ formattedResult = [...formattedResult, formattedRes];
20
+ });
21
+
22
+ return formattedResult;
23
23
  };
@@ -1,16 +1,16 @@
1
- import Dec from 'decimal.js';
2
- import Web3 from 'web3';
3
- import { NetworkNumber } from '../types/common';
4
- import { SECONDS_PER_YEAR } from '../constants';
5
- import { PotContract } from '../contracts';
6
-
7
-
8
- export const getDsrApy = async (web3: Web3, network: NetworkNumber) => {
9
- const potContract = PotContract(web3, network);
10
- return new Dec(await potContract.methods.dsr().call())
11
- .div(new Dec(1e27))
12
- .pow(SECONDS_PER_YEAR)
13
- .sub(1)
14
- .mul(100)
15
- .toString();
1
+ import Dec from 'decimal.js';
2
+ import Web3 from 'web3';
3
+ import { NetworkNumber } from '../types/common';
4
+ import { SECONDS_PER_YEAR } from '../constants';
5
+ import { PotContract } from '../contracts';
6
+
7
+
8
+ export const getDsrApy = async (web3: Web3, network: NetworkNumber) => {
9
+ const potContract = PotContract(web3, network);
10
+ return new Dec(await potContract.methods.dsr().call())
11
+ .div(new Dec(1e27))
12
+ .pow(SECONDS_PER_YEAR)
13
+ .sub(1)
14
+ .mul(100)
15
+ .toString();
16
16
  };
@@ -1,22 +1,22 @@
1
- import Web3 from 'web3';
2
- import Dec from 'decimal.js';
3
- import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract } from '../contracts';
4
- import { NetworkNumber } from '../types/common';
5
-
6
- export const getEthPrice = async (web3: Web3) => {
7
- const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
8
- const price = await contract.methods.latestAnswer().call();
9
- return new Dec(price).div(1e8).toString();
10
- };
11
-
12
- export const getUSDCPrice = async (web3: Web3) => {
13
- const contract = USDCPriceFeedContract(web3, NetworkNumber.Eth);
14
- const price = await contract.methods.latestAnswer().call();
15
- return new Dec(price).div(1e8).toString();
16
- };
17
-
18
- export const getCompPrice = async (web3: Web3) => {
19
- const contract = COMPPriceFeedContract(web3, NetworkNumber.Eth);
20
- const price = await contract.methods.latestAnswer().call();
21
- return new Dec(price).div(1e8).toString();
1
+ import Web3 from 'web3';
2
+ import Dec from 'decimal.js';
3
+ import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract } from '../contracts';
4
+ import { NetworkNumber } from '../types/common';
5
+
6
+ export const getEthPrice = async (web3: Web3) => {
7
+ const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
8
+ const price = await contract.methods.latestAnswer().call();
9
+ return new Dec(price).div(1e8).toString();
10
+ };
11
+
12
+ export const getUSDCPrice = async (web3: Web3) => {
13
+ const contract = USDCPriceFeedContract(web3, NetworkNumber.Eth);
14
+ const price = await contract.methods.latestAnswer().call();
15
+ return new Dec(price).div(1e8).toString();
16
+ };
17
+
18
+ export const getCompPrice = async (web3: Web3) => {
19
+ const contract = COMPPriceFeedContract(web3, NetworkNumber.Eth);
20
+ const price = await contract.methods.latestAnswer().call();
21
+ return new Dec(price).div(1e8).toString();
22
22
  };
@@ -1,54 +1,57 @@
1
- import Dec from 'decimal.js';
2
- import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
3
- import { NetworkNumber } from '../types/common';
4
-
5
- export const isLayer2Network = (networkId: NetworkNumber) => [10, 42161, 8453].includes(+networkId);
6
-
7
- export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
8
-
9
- export const ethToWeth = (maybeEth: any) => maybeEth?.replace(/^ETH$/, 'WETH');
10
-
11
- export const wethToEth = (maybeWeth: any) => maybeWeth?.replace(/^WETH$/, 'ETH');
12
-
13
- export const stEthToWstEth = (maybeStEth: any) => maybeStEth?.replace(/^stETH$/, 'wstETH');
14
-
15
- export const wstEthToStEth = (maybeStEth: any) => maybeStEth?.replace(/^wstETH$/, 'stETH');
16
-
17
- export const getAbiItem = (abi: any, methodName: string) => abi.find((i: any) => i.name === methodName);
18
-
19
- export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
20
- export const isAddress = (address: string) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
21
-
22
- export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
23
-
24
- export const getWeiAmountForDecimals = (amount: string | number, decimals: number) => new Dec(amount).mul(10 ** decimals).floor().toString();
25
-
26
- export const getEthAmountForDecimals = (amount: string | number, decimals: string | number) => new Dec(amount).div(10 ** +decimals).toString();
27
-
28
- export const handleWbtcLegacy = (asset: string) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
29
-
30
- export const wethToEthByAddress = (maybeWethAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
31
-
32
- export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
33
-
34
- export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
35
- .toString()
36
- // eslint-disable-next-line no-control-regex
37
- .replace(/\x00/g, '');
38
-
39
- /**
40
- * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
41
- */
42
- export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
43
- // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
44
- const inputDiff = new Dec(maxInput).minus(minInput);
45
- const outputDiff = new Dec(maxOutput).minus(minOutput);
46
- const slope = new Dec(outputDiff).div(inputDiff);
47
-
48
- // output = output_start + slope * (input - input_start)
49
- return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
50
- };
51
-
52
- // eslint-disable-next-line no-bitwise
53
- export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
54
-
1
+ import Dec from 'decimal.js';
2
+ import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
3
+ import { NetworkNumber } from '../types/common';
4
+
5
+ export const isLayer2Network = (networkId: NetworkNumber) => [10, 42161, 8453].includes(+networkId);
6
+
7
+ export const addToObjectIf = (condition: any, item: any) => (condition ? item : {});
8
+
9
+ export const ethToWeth = (maybeEth: any) => maybeEth?.replace(/^ETH$/, 'WETH');
10
+
11
+ export const wethToEth = (maybeWeth: any) => maybeWeth?.replace(/^WETH$/, 'ETH');
12
+
13
+ export const stEthToWstEth = (maybeStEth: any) => maybeStEth?.replace(/^stETH$/, 'wstETH');
14
+
15
+ export const wstEthToStEth = (maybeStEth: any) => maybeStEth?.replace(/^wstETH$/, 'stETH');
16
+
17
+ export const getAbiItem = (abi: any, methodName: string) => abi.find((i: any) => i.name === methodName);
18
+
19
+ export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
20
+ export const isAddress = (address: string) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
21
+
22
+ export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
23
+
24
+ export const getWeiAmountForDecimals = (amount: string | number, decimals: number) => new Dec(amount).mul(10 ** decimals).floor().toString();
25
+
26
+ export const getEthAmountForDecimals = (amount: string | number, decimals: string | number) => new Dec(amount).div(10 ** +decimals).toString();
27
+
28
+ export const handleWbtcLegacy = (asset: string) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);
29
+
30
+ export const wethToEthByAddress = (maybeWethAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(wethToEth(getAssetInfoByAddress(maybeWethAddr, chainId).symbol), chainId).address;
31
+
32
+ export const ethToWethByAddress = (maybeEthAddr: string, chainId = NetworkNumber.Eth) => getAssetInfo(ethToWeth(getAssetInfoByAddress(maybeEthAddr, chainId).symbol), chainId).address;
33
+
34
+ export const bytesToString = (hex: string) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
35
+ .toString()
36
+ // eslint-disable-next-line no-control-regex
37
+ .replace(/\x00/g, '');
38
+
39
+ /**
40
+ * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
41
+ */
42
+ export const mapRange = (input: number | string, minInput: number | string, maxInput: number | string, minOutput:number | string, maxOutput: number | string) => {
43
+ // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
44
+ const inputDiff = new Dec(maxInput).minus(minInput);
45
+ const outputDiff = new Dec(maxOutput).minus(minOutput);
46
+ const slope = new Dec(outputDiff).div(inputDiff);
47
+
48
+ // output = output_start + slope * (input - input_start)
49
+ return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
50
+ };
51
+
52
+ // eslint-disable-next-line no-bitwise
53
+ export const isEnabledOnBitmap = (bitmap: number, assetId: number) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
54
+
55
+ export const MAXUINT:string = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
56
+
57
+ export const isMaxuint = (amount: string) => compareAddresses(MAXUINT, amount);
package/src/setup.ts CHANGED
@@ -1,8 +1,8 @@
1
- import Decimal from 'decimal.js';
2
-
3
- Decimal.set({
4
- rounding: Decimal.ROUND_DOWN,
5
- toExpPos: 9e15,
6
- toExpNeg: -9e15,
7
- precision: 50,
8
- });
1
+ import Decimal from 'decimal.js';
2
+
3
+ Decimal.set({
4
+ rounding: Decimal.ROUND_DOWN,
5
+ toExpPos: 9e15,
6
+ toExpNeg: -9e15,
7
+ precision: 50,
8
+ });