@defisaver/positions-sdk 0.0.200 → 0.0.201-fluid-dev

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 (125) 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 +43 -0
  5. package/cjs/config/contracts.js +6 -0
  6. package/cjs/contracts.d.ts +1 -0
  7. package/cjs/contracts.js +2 -1
  8. package/cjs/fluid/index.d.ts +38 -0
  9. package/cjs/fluid/index.js +163 -0
  10. package/cjs/helpers/fluidHelpers/index.d.ts +6 -0
  11. package/cjs/helpers/fluidHelpers/index.js +40 -0
  12. package/cjs/helpers/index.d.ts +1 -0
  13. package/cjs/helpers/index.js +2 -1
  14. package/cjs/helpers/morphoBlueHelpers/index.js +66 -66
  15. package/cjs/index.d.ts +2 -1
  16. package/cjs/index.js +3 -1
  17. package/cjs/markets/aave/marketAssets.js +1 -1
  18. package/cjs/markets/fluid/index.d.ts +174 -0
  19. package/cjs/markets/fluid/index.js +1286 -0
  20. package/cjs/markets/index.d.ts +1 -0
  21. package/cjs/markets/index.js +3 -1
  22. package/cjs/types/contracts/generated/FluidView.d.ts +318 -0
  23. package/cjs/types/contracts/generated/FluidView.js +5 -0
  24. package/cjs/types/contracts/generated/index.d.ts +1 -0
  25. package/cjs/types/fluid.d.ts +225 -0
  26. package/cjs/types/fluid.js +129 -0
  27. package/cjs/types/index.d.ts +1 -0
  28. package/cjs/types/index.js +1 -0
  29. package/esm/config/contracts.d.ts +43 -0
  30. package/esm/config/contracts.js +6 -0
  31. package/esm/contracts.d.ts +1 -0
  32. package/esm/contracts.js +1 -0
  33. package/esm/fluid/index.d.ts +38 -0
  34. package/esm/fluid/index.js +153 -0
  35. package/esm/helpers/fluidHelpers/index.d.ts +6 -0
  36. package/esm/helpers/fluidHelpers/index.js +33 -0
  37. package/esm/helpers/index.d.ts +1 -0
  38. package/esm/helpers/index.js +1 -0
  39. package/esm/helpers/morphoBlueHelpers/index.js +66 -66
  40. package/esm/index.d.ts +2 -1
  41. package/esm/index.js +2 -1
  42. package/esm/markets/aave/marketAssets.js +1 -1
  43. package/esm/markets/fluid/index.d.ts +174 -0
  44. package/esm/markets/fluid/index.js +1196 -0
  45. package/esm/markets/index.d.ts +1 -0
  46. package/esm/markets/index.js +1 -0
  47. package/esm/types/contracts/generated/FluidView.d.ts +318 -0
  48. package/esm/types/contracts/generated/FluidView.js +4 -0
  49. package/esm/types/contracts/generated/index.d.ts +1 -0
  50. package/esm/types/fluid.d.ts +225 -0
  51. package/esm/types/fluid.js +126 -0
  52. package/esm/types/index.d.ts +1 -0
  53. package/esm/types/index.js +1 -0
  54. package/package.json +49 -49
  55. package/src/aaveV2/index.ts +227 -227
  56. package/src/aaveV3/index.ts +625 -625
  57. package/src/assets/index.ts +60 -60
  58. package/src/chickenBonds/index.ts +123 -123
  59. package/src/compoundV2/index.ts +220 -220
  60. package/src/compoundV3/index.ts +291 -291
  61. package/src/config/contracts.js +1115 -1109
  62. package/src/constants/index.ts +6 -6
  63. package/src/contracts.ts +134 -133
  64. package/src/curveUsd/index.ts +229 -229
  65. package/src/eulerV2/index.ts +303 -303
  66. package/src/exchange/index.ts +17 -17
  67. package/src/fluid/index.ts +220 -0
  68. package/src/helpers/aaveHelpers/index.ts +198 -198
  69. package/src/helpers/chickenBondsHelpers/index.ts +23 -23
  70. package/src/helpers/compoundHelpers/index.ts +246 -246
  71. package/src/helpers/curveUsdHelpers/index.ts +40 -40
  72. package/src/helpers/eulerHelpers/index.ts +232 -232
  73. package/src/helpers/fluidHelpers/index.ts +54 -0
  74. package/src/helpers/index.ts +11 -10
  75. package/src/helpers/liquityV2Helpers/index.ts +79 -79
  76. package/src/helpers/llamaLendHelpers/index.ts +53 -53
  77. package/src/helpers/makerHelpers/index.ts +94 -94
  78. package/src/helpers/morphoBlueHelpers/index.ts +365 -365
  79. package/src/helpers/sparkHelpers/index.ts +150 -150
  80. package/src/index.ts +52 -50
  81. package/src/liquity/index.ts +116 -116
  82. package/src/liquityV2/index.ts +227 -227
  83. package/src/llamaLend/index.ts +275 -275
  84. package/src/maker/index.ts +117 -117
  85. package/src/markets/aave/index.ts +152 -152
  86. package/src/markets/aave/marketAssets.ts +44 -44
  87. package/src/markets/compound/index.ts +213 -213
  88. package/src/markets/compound/marketsAssets.ts +82 -82
  89. package/src/markets/curveUsd/index.ts +69 -69
  90. package/src/markets/euler/index.ts +26 -26
  91. package/src/markets/fluid/index.ts +1290 -0
  92. package/src/markets/index.ts +25 -24
  93. package/src/markets/liquityV2/index.ts +43 -43
  94. package/src/markets/llamaLend/contractAddresses.ts +141 -141
  95. package/src/markets/llamaLend/index.ts +235 -235
  96. package/src/markets/morphoBlue/index.ts +895 -895
  97. package/src/markets/spark/index.ts +29 -29
  98. package/src/markets/spark/marketAssets.ts +10 -10
  99. package/src/moneymarket/moneymarketCommonService.ts +80 -80
  100. package/src/morphoAaveV2/index.ts +256 -256
  101. package/src/morphoAaveV3/index.ts +631 -631
  102. package/src/morphoBlue/index.ts +204 -204
  103. package/src/multicall/index.ts +22 -22
  104. package/src/services/dsrService.ts +15 -15
  105. package/src/services/priceService.ts +62 -62
  106. package/src/services/utils.ts +56 -56
  107. package/src/setup.ts +8 -8
  108. package/src/spark/index.ts +461 -461
  109. package/src/staking/staking.ts +220 -220
  110. package/src/types/aave.ts +271 -271
  111. package/src/types/chickenBonds.ts +45 -45
  112. package/src/types/common.ts +84 -84
  113. package/src/types/compound.ts +131 -131
  114. package/src/types/contracts/generated/FluidView.ts +399 -0
  115. package/src/types/contracts/generated/index.ts +1 -0
  116. package/src/types/curveUsd.ts +118 -118
  117. package/src/types/euler.ts +171 -171
  118. package/src/types/fluid.ts +240 -0
  119. package/src/types/index.ts +12 -11
  120. package/src/types/liquity.ts +30 -30
  121. package/src/types/liquityV2.ts +118 -118
  122. package/src/types/llamaLend.ts +155 -155
  123. package/src/types/maker.ts +50 -50
  124. package/src/types/morphoBlue.ts +192 -192
  125. package/src/types/spark.ts +131 -131
@@ -1,80 +1,80 @@
1
- import Dec from 'decimal.js';
2
- import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
3
- import {
4
- LiquityV2AggregatedTroveData, LiquityV2AssetsData, LiquityV2UsedAsset, LiquityV2UsedAssets,
5
- } from '../../types';
6
- import { calculateInterestEarned } from '../../staking';
7
-
8
- export const calculateNetApyLiquityV2 = (usedAssets: LiquityV2UsedAssets, assetsData: LiquityV2AssetsData, interestRate: string) => {
9
- const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
10
- const acc = { ..._acc };
11
- const assetData = assetsData[usedAsset.symbol];
12
-
13
- if (usedAsset.suppliedUsd) {
14
- const amount = usedAsset.suppliedUsd;
15
- acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
16
- if (assetData.incentiveSupplyApy) {
17
- const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveSupplyApy, 'year', true);
18
- acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
19
- }
20
- }
21
-
22
- if (usedAsset.borrowedUsd) {
23
- const amount = usedAsset.borrowedUsd;
24
- acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
25
- const rate = interestRate;
26
- const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);
27
- acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
28
- }
29
-
30
- return acc;
31
- }, {
32
- borrowInterest: '0', supplyInterest: '0', incentiveUsd: '0', borrowedUsd: '0', suppliedUsd: '0',
33
- });
34
-
35
- const {
36
- borrowedUsd, suppliedUsd, borrowInterest, supplyInterest, incentiveUsd,
37
- } = sumValues;
38
-
39
- const totalInterestUsd = new Dec(borrowInterest).add(supplyInterest).add(incentiveUsd).toString();
40
- const balance = new Dec(suppliedUsd).sub(borrowedUsd);
41
- const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
42
-
43
- return { netApy, totalInterestUsd, incentiveUsd };
44
- };
45
-
46
- export const getLiquityV2AggregatedPositionData = ({
47
- usedAssets,
48
- assetsData,
49
- minCollRatio,
50
- interestRate,
51
- }: {
52
- usedAssets: LiquityV2UsedAssets
53
- assetsData: LiquityV2AssetsData
54
- minCollRatio: string
55
- interestRate: string
56
- }): LiquityV2AggregatedTroveData => {
57
- const payload = {} as LiquityV2AggregatedTroveData;
58
- payload.suppliedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
59
- payload.borrowedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
60
- payload.borrowLimitUsd = new Dec(payload.suppliedUsd).div(minCollRatio).mul(100).toString();
61
- const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
62
- payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
63
- payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
64
- payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
65
- const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
66
- payload.netApy = netApy;
67
- payload.incentiveUsd = incentiveUsd;
68
- payload.totalInterestUsd = totalInterestUsd;
69
-
70
- const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
71
- payload.leveragedType = leveragedType;
72
- payload.leveragedAsset = leveragedAsset;
73
- payload.liquidationPrice = '';
74
- if (leveragedType !== '') {
75
- const assetPrice = assetsData[leveragedAsset].price;
76
- payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.borrowLimitUsd);
77
- }
78
-
79
- return payload;
1
+ import Dec from 'decimal.js';
2
+ import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
3
+ import {
4
+ LiquityV2AggregatedTroveData, LiquityV2AssetsData, LiquityV2UsedAsset, LiquityV2UsedAssets,
5
+ } from '../../types';
6
+ import { calculateInterestEarned } from '../../staking';
7
+
8
+ export const calculateNetApyLiquityV2 = (usedAssets: LiquityV2UsedAssets, assetsData: LiquityV2AssetsData, interestRate: string) => {
9
+ const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
10
+ const acc = { ..._acc };
11
+ const assetData = assetsData[usedAsset.symbol];
12
+
13
+ if (usedAsset.suppliedUsd) {
14
+ const amount = usedAsset.suppliedUsd;
15
+ acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
16
+ if (assetData.incentiveSupplyApy) {
17
+ const incentiveInterest = calculateInterestEarned(amount, assetData.incentiveSupplyApy, 'year', true);
18
+ acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
19
+ }
20
+ }
21
+
22
+ if (usedAsset.borrowedUsd) {
23
+ const amount = usedAsset.borrowedUsd;
24
+ acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
25
+ const rate = interestRate;
26
+ const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);
27
+ acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
28
+ }
29
+
30
+ return acc;
31
+ }, {
32
+ borrowInterest: '0', supplyInterest: '0', incentiveUsd: '0', borrowedUsd: '0', suppliedUsd: '0',
33
+ });
34
+
35
+ const {
36
+ borrowedUsd, suppliedUsd, borrowInterest, supplyInterest, incentiveUsd,
37
+ } = sumValues;
38
+
39
+ const totalInterestUsd = new Dec(borrowInterest).add(supplyInterest).add(incentiveUsd).toString();
40
+ const balance = new Dec(suppliedUsd).sub(borrowedUsd);
41
+ const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
42
+
43
+ return { netApy, totalInterestUsd, incentiveUsd };
44
+ };
45
+
46
+ export const getLiquityV2AggregatedPositionData = ({
47
+ usedAssets,
48
+ assetsData,
49
+ minCollRatio,
50
+ interestRate,
51
+ }: {
52
+ usedAssets: LiquityV2UsedAssets
53
+ assetsData: LiquityV2AssetsData
54
+ minCollRatio: string
55
+ interestRate: string
56
+ }): LiquityV2AggregatedTroveData => {
57
+ const payload = {} as LiquityV2AggregatedTroveData;
58
+ payload.suppliedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
59
+ payload.borrowedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
60
+ payload.borrowLimitUsd = new Dec(payload.suppliedUsd).div(minCollRatio).mul(100).toString();
61
+ const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
62
+ payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
63
+ payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
64
+ payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
65
+ const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
66
+ payload.netApy = netApy;
67
+ payload.incentiveUsd = incentiveUsd;
68
+ payload.totalInterestUsd = totalInterestUsd;
69
+
70
+ const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
71
+ payload.leveragedType = leveragedType;
72
+ payload.leveragedAsset = leveragedAsset;
73
+ payload.liquidationPrice = '';
74
+ if (leveragedType !== '') {
75
+ const assetPrice = assetsData[leveragedAsset].price;
76
+ payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.borrowLimitUsd);
77
+ }
78
+
79
+ return payload;
80
80
  };
@@ -1,53 +1,53 @@
1
- import Dec from 'decimal.js';
2
- import {
3
- LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets,
4
- } from '../../types';
5
- import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../../types/common';
6
- import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
7
- import { mapRange } from '../../services/utils';
8
- import { calculateNetApy } from '../../staking';
9
-
10
- export const getLlamaLendAggregatedData = ({
11
- loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest
12
- }:{
13
- loanExists: boolean, usedAssets: LlamaLendUsedAssets, network: NetworkNumber, selectedMarket: LlamaLendMarketData, numOfBands: number | string, assetsData: LlamaLendAssetsData,
14
- }): LlamaLendAggregatedPositionData => {
15
- const collAsset = selectedMarket.collAsset;
16
- const debtAsset = selectedMarket.baseAsset;
17
- const payload = {} as LlamaLendAggregatedPositionData;
18
-
19
- // payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied);
20
- // payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowed }: { borrowed: string }) => borrowed);
21
- payload.suppliedUsd = getAssetsTotal(usedAssets, ({ collateral }: { collateral: boolean }) => collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
22
- payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
23
- payload.suppliedForYieldUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedForYield }: { suppliedForYield?: string }) => suppliedForYield || '0');
24
-
25
- const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
26
- payload.netApy = netApy;
27
- payload.incentiveUsd = incentiveUsd;
28
- payload.totalInterestUsd = totalInterestUsd;
29
-
30
- payload.ratio = loanExists
31
- ? new Dec(payload.suppliedUsd)
32
- .dividedBy(payload.borrowedUsd)
33
- .times(100)
34
- .toString()
35
- : '0';
36
-
37
- // this is all approximation
38
- payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
39
- payload.collFactor = new Dec(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
40
- // only take in consideration collAsset
41
- payload.borrowLimitUsd = usedAssets?.[collAsset]?.isSupplied
42
- ? new Dec(usedAssets[collAsset].suppliedUsd).mul(payload.collFactor).toString()
43
- : '0';
44
-
45
- const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets as unknown as MMUsedAssets);
46
- payload.leveragedType = leveragedType;
47
- if (leveragedType !== '') {
48
- payload.leveragedAsset = leveragedAsset;
49
- payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
50
- }
51
-
52
- return payload;
53
- };
1
+ import Dec from 'decimal.js';
2
+ import {
3
+ LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets,
4
+ } from '../../types';
5
+ import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../../types/common';
6
+ import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
7
+ import { mapRange } from '../../services/utils';
8
+ import { calculateNetApy } from '../../staking';
9
+
10
+ export const getLlamaLendAggregatedData = ({
11
+ loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest
12
+ }:{
13
+ loanExists: boolean, usedAssets: LlamaLendUsedAssets, network: NetworkNumber, selectedMarket: LlamaLendMarketData, numOfBands: number | string, assetsData: LlamaLendAssetsData,
14
+ }): LlamaLendAggregatedPositionData => {
15
+ const collAsset = selectedMarket.collAsset;
16
+ const debtAsset = selectedMarket.baseAsset;
17
+ const payload = {} as LlamaLendAggregatedPositionData;
18
+
19
+ // payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied);
20
+ // payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowed }: { borrowed: string }) => borrowed);
21
+ payload.suppliedUsd = getAssetsTotal(usedAssets, ({ collateral }: { collateral: boolean }) => collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
22
+ payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
23
+ payload.suppliedForYieldUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedForYield }: { suppliedForYield?: string }) => suppliedForYield || '0');
24
+
25
+ const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
26
+ payload.netApy = netApy;
27
+ payload.incentiveUsd = incentiveUsd;
28
+ payload.totalInterestUsd = totalInterestUsd;
29
+
30
+ payload.ratio = loanExists
31
+ ? new Dec(payload.suppliedUsd)
32
+ .dividedBy(payload.borrowedUsd)
33
+ .times(100)
34
+ .toString()
35
+ : '0';
36
+
37
+ // this is all approximation
38
+ payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
39
+ payload.collFactor = new Dec(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
40
+ // only take in consideration collAsset
41
+ payload.borrowLimitUsd = usedAssets?.[collAsset]?.isSupplied
42
+ ? new Dec(usedAssets[collAsset].suppliedUsd).mul(payload.collFactor).toString()
43
+ : '0';
44
+
45
+ const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets as unknown as MMUsedAssets);
46
+ payload.leveragedType = leveragedType;
47
+ if (leveragedType !== '') {
48
+ payload.leveragedAsset = leveragedAsset;
49
+ payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
50
+ }
51
+
52
+ return payload;
53
+ };
@@ -1,95 +1,95 @@
1
- import Web3 from 'web3';
2
- import Dec from 'decimal.js';
3
- import { Blockish, NetworkNumber } from '../../types/common';
4
- import {
5
- McdDogContract, McdJugContract, McdSpotterContract, McdVatContract,
6
- } from '../../contracts';
7
- import { multicall } from '../../multicall';
8
- import { SECONDS_PER_YEAR } from '../../constants';
9
- import { bytesToString } from '../../services/utils';
10
- import { IlkInfo } from '../../types';
11
-
12
- export const getUnclaimedCollateral = async (web3: Web3, network: NetworkNumber, urn: string, ilk: string) => {
13
- const vatContract = McdVatContract(web3, network);
14
- const coll = await vatContract.methods.gem(ilk, urn).call();
15
- return coll;
16
- };
17
-
18
- export const getCollateralInfo = async (ilk: string, web3: Web3, network: NetworkNumber, block: Blockish = 'latest'): Promise<IlkInfo> => {
19
- const spotterContract = McdSpotterContract(web3, network);
20
- const vatContract = McdVatContract(web3, network);
21
- const dogContract = McdDogContract(web3, network);
22
- const jugContract = McdJugContract(web3, network);
23
-
24
- const multicallData = [
25
- {
26
- target: spotterContract.options.address,
27
- abiItem: spotterContract.options.jsonInterface.find(({ name }) => name === 'par'),
28
- params: [],
29
- },
30
- {
31
- target: spotterContract.options.address,
32
- abiItem: spotterContract.options.jsonInterface.find(({ name }) => name === 'ilks'),
33
- params: [ilk],
34
- },
35
- {
36
- target: vatContract.options.address,
37
- abiItem: vatContract.options.jsonInterface.find(({ name }) => name === 'ilks'),
38
- params: [ilk],
39
- },
40
- {
41
- target: jugContract.options.address,
42
- abiItem: jugContract.options.jsonInterface.find(({ name }) => name === 'ilks'),
43
- params: [ilk],
44
- },
45
- {
46
- target: jugContract.options.address,
47
- abiItem: jugContract.options.jsonInterface.find(({ name }) => name === 'drip'),
48
- params: [ilk],
49
- },
50
- {
51
- target: dogContract.options.address,
52
- abiItem: dogContract.options.jsonInterface.find(({ name }) => name === 'chop'),
53
- params: [ilk],
54
- },
55
- ];
56
-
57
- const multiRes = await multicall(multicallData, web3, network, block);
58
-
59
- const par = new Dec(multiRes[0][0].toString()).div(1e27).toString();
60
- const mat = new Dec(multiRes[1][1].toString()).div(1e27).toString();
61
- const art = new Dec(multiRes[2][0].toString()).toString();
62
- const rate = new Dec(multiRes[2][1].toString()).toString();
63
- const spot = new Dec(multiRes[2][2].toString()).div(1e27).toString();
64
- const line = new Dec(multiRes[2][3].toString()).div(1e45).toString();
65
- const dust = new Dec(multiRes[2][1].toString()).div(1e45).toString();
66
- const duty = new Dec(multiRes[3][0].toString()).toString();
67
- const futureRate = new Dec(multiRes[4][0].toString()).toString();
68
- const chop = new Dec(multiRes[5][0].toString()).div(1e18).toString();
69
-
70
- const stabilityFee = new Dec(duty.toString())
71
- .div(1e27)
72
- .pow(SECONDS_PER_YEAR)
73
- .minus(1)
74
- .mul(100)
75
- .toNumber();
76
- const liquidationFee = new Dec(chop).mul(100).sub(100).toString();
77
- const globalDebtCurrent = new Dec(art).div(1e18).mul(new Dec(futureRate).div(1e27)).toString();
78
- const globalDebtCeiling = line;
79
- const creatableDebt = new Dec(globalDebtCeiling).sub(globalDebtCurrent).toString();
80
-
81
- return {
82
- ilkLabel: bytesToString(ilk),
83
- currentRate: rate,
84
- futureRate,
85
- minDebt: dust,
86
- globalDebtCurrent,
87
- globalDebtCeiling,
88
- assetPrice: new Dec(spot).times(par).times(mat).toString(),
89
- liqRatio: mat,
90
- liqPercent: +mat * 100,
91
- stabilityFee,
92
- liquidationFee: new Dec(liquidationFee).lt(0) ? '0' : liquidationFee,
93
- creatableDebt,
94
- };
1
+ import Web3 from 'web3';
2
+ import Dec from 'decimal.js';
3
+ import { Blockish, NetworkNumber } from '../../types/common';
4
+ import {
5
+ McdDogContract, McdJugContract, McdSpotterContract, McdVatContract,
6
+ } from '../../contracts';
7
+ import { multicall } from '../../multicall';
8
+ import { SECONDS_PER_YEAR } from '../../constants';
9
+ import { bytesToString } from '../../services/utils';
10
+ import { IlkInfo } from '../../types';
11
+
12
+ export const getUnclaimedCollateral = async (web3: Web3, network: NetworkNumber, urn: string, ilk: string) => {
13
+ const vatContract = McdVatContract(web3, network);
14
+ const coll = await vatContract.methods.gem(ilk, urn).call();
15
+ return coll;
16
+ };
17
+
18
+ export const getCollateralInfo = async (ilk: string, web3: Web3, network: NetworkNumber, block: Blockish = 'latest'): Promise<IlkInfo> => {
19
+ const spotterContract = McdSpotterContract(web3, network);
20
+ const vatContract = McdVatContract(web3, network);
21
+ const dogContract = McdDogContract(web3, network);
22
+ const jugContract = McdJugContract(web3, network);
23
+
24
+ const multicallData = [
25
+ {
26
+ target: spotterContract.options.address,
27
+ abiItem: spotterContract.options.jsonInterface.find(({ name }) => name === 'par'),
28
+ params: [],
29
+ },
30
+ {
31
+ target: spotterContract.options.address,
32
+ abiItem: spotterContract.options.jsonInterface.find(({ name }) => name === 'ilks'),
33
+ params: [ilk],
34
+ },
35
+ {
36
+ target: vatContract.options.address,
37
+ abiItem: vatContract.options.jsonInterface.find(({ name }) => name === 'ilks'),
38
+ params: [ilk],
39
+ },
40
+ {
41
+ target: jugContract.options.address,
42
+ abiItem: jugContract.options.jsonInterface.find(({ name }) => name === 'ilks'),
43
+ params: [ilk],
44
+ },
45
+ {
46
+ target: jugContract.options.address,
47
+ abiItem: jugContract.options.jsonInterface.find(({ name }) => name === 'drip'),
48
+ params: [ilk],
49
+ },
50
+ {
51
+ target: dogContract.options.address,
52
+ abiItem: dogContract.options.jsonInterface.find(({ name }) => name === 'chop'),
53
+ params: [ilk],
54
+ },
55
+ ];
56
+
57
+ const multiRes = await multicall(multicallData, web3, network, block);
58
+
59
+ const par = new Dec(multiRes[0][0].toString()).div(1e27).toString();
60
+ const mat = new Dec(multiRes[1][1].toString()).div(1e27).toString();
61
+ const art = new Dec(multiRes[2][0].toString()).toString();
62
+ const rate = new Dec(multiRes[2][1].toString()).toString();
63
+ const spot = new Dec(multiRes[2][2].toString()).div(1e27).toString();
64
+ const line = new Dec(multiRes[2][3].toString()).div(1e45).toString();
65
+ const dust = new Dec(multiRes[2][1].toString()).div(1e45).toString();
66
+ const duty = new Dec(multiRes[3][0].toString()).toString();
67
+ const futureRate = new Dec(multiRes[4][0].toString()).toString();
68
+ const chop = new Dec(multiRes[5][0].toString()).div(1e18).toString();
69
+
70
+ const stabilityFee = new Dec(duty.toString())
71
+ .div(1e27)
72
+ .pow(SECONDS_PER_YEAR)
73
+ .minus(1)
74
+ .mul(100)
75
+ .toNumber();
76
+ const liquidationFee = new Dec(chop).mul(100).sub(100).toString();
77
+ const globalDebtCurrent = new Dec(art).div(1e18).mul(new Dec(futureRate).div(1e27)).toString();
78
+ const globalDebtCeiling = line;
79
+ const creatableDebt = new Dec(globalDebtCeiling).sub(globalDebtCurrent).toString();
80
+
81
+ return {
82
+ ilkLabel: bytesToString(ilk),
83
+ currentRate: rate,
84
+ futureRate,
85
+ minDebt: dust,
86
+ globalDebtCurrent,
87
+ globalDebtCeiling,
88
+ assetPrice: new Dec(spot).times(par).times(mat).toString(),
89
+ liqRatio: mat,
90
+ liqPercent: +mat * 100,
91
+ stabilityFee,
92
+ liquidationFee: new Dec(liquidationFee).lt(0) ? '0' : liquidationFee,
93
+ creatableDebt,
94
+ };
95
95
  };