@defisaver/positions-sdk 0.0.35 → 0.0.36
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.
- package/README.md +63 -63
- package/cjs/helpers/morphoBlueHelpers/index.d.ts +3 -3
- package/cjs/helpers/morphoBlueHelpers/index.js +6 -1
- package/cjs/markets/morphoBlue/index.js +2 -2
- package/cjs/morphoBlue/index.js +4 -4
- package/cjs/types/morphoBlue.d.ts +4 -0
- package/esm/helpers/morphoBlueHelpers/index.d.ts +3 -3
- package/esm/helpers/morphoBlueHelpers/index.js +6 -1
- package/esm/markets/morphoBlue/index.js +2 -2
- package/esm/morphoBlue/index.js +5 -5
- package/esm/types/morphoBlue.d.ts +4 -0
- package/package.json +40 -40
- package/src/aaveV2/index.ts +226 -226
- package/src/aaveV3/index.ts +561 -561
- package/src/assets/index.ts +60 -60
- package/src/chickenBonds/index.ts +123 -123
- package/src/compoundV2/index.ts +219 -219
- package/src/compoundV3/index.ts +273 -273
- package/src/config/contracts.js +817 -817
- package/src/constants/index.ts +5 -5
- package/src/contracts.ts +124 -124
- package/src/curveUsd/index.ts +228 -228
- package/src/exchange/index.ts +17 -17
- package/src/helpers/aaveHelpers/index.ts +134 -134
- package/src/helpers/chickenBondsHelpers/index.ts +23 -23
- package/src/helpers/compoundHelpers/index.ts +181 -181
- package/src/helpers/curveUsdHelpers/index.ts +40 -40
- package/src/helpers/index.ts +6 -6
- package/src/helpers/makerHelpers/index.ts +94 -94
- package/src/helpers/morphoBlueHelpers/index.ts +55 -46
- package/src/helpers/sparkHelpers/index.ts +106 -106
- package/src/index.ts +42 -42
- package/src/liquity/index.ts +116 -116
- package/src/maker/index.ts +101 -101
- package/src/markets/aave/index.ts +80 -80
- package/src/markets/aave/marketAssets.ts +24 -24
- package/src/markets/compound/index.ts +141 -141
- package/src/markets/compound/marketsAssets.ts +48 -48
- package/src/markets/curveUsd/index.ts +69 -69
- package/src/markets/index.ts +4 -4
- package/src/markets/morphoBlue/index.ts +36 -36
- package/src/markets/spark/index.ts +29 -29
- package/src/markets/spark/marketAssets.ts +10 -10
- package/src/moneymarket/moneymarketCommonService.ts +75 -75
- package/src/morphoAaveV2/index.ts +255 -255
- package/src/morphoAaveV3/index.ts +619 -619
- package/src/morphoBlue/index.ts +170 -170
- package/src/multicall/index.ts +22 -22
- package/src/services/dsrService.ts +15 -15
- package/src/services/priceService.ts +21 -21
- package/src/services/utils.ts +47 -47
- package/src/spark/index.ts +422 -422
- package/src/staking/staking.ts +167 -167
- package/src/types/aave.ts +256 -256
- package/src/types/chickenBonds.ts +45 -45
- package/src/types/common.ts +83 -83
- package/src/types/compound.ts +128 -128
- package/src/types/curveUsd.ts +118 -118
- package/src/types/index.ts +7 -7
- package/src/types/liquity.ts +30 -30
- package/src/types/maker.ts +50 -50
- package/src/types/morphoBlue.ts +84 -80
- package/src/types/spark.ts +106 -106
- package/yarn-error.log +0 -64
package/README.md
CHANGED
|
@@ -1,63 +1,63 @@
|
|
|
1
|
-
# DeFi Saver Positions SDK
|
|
2
|
-
|
|
3
|
-
Supported protocols:
|
|
4
|
-
- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
|
|
5
|
-
- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
|
|
6
|
-
- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
|
|
7
|
-
- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
|
|
8
|
-
- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
|
|
9
|
-
- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
|
|
10
|
-
- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
|
|
11
|
-
- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
|
|
12
|
-
- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
|
|
13
|
-
- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
|
|
14
|
-
- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
|
|
15
|
-
|
|
16
|
-
## Setup
|
|
17
|
-
Supported Node version is v10.
|
|
18
|
-
|
|
19
|
-
- run `npm install` (first time)
|
|
20
|
-
- run `npm run build`
|
|
21
|
-
|
|
22
|
-
`build` command will generate contracts and build ejs and esm folders
|
|
23
|
-
|
|
24
|
-
## How to use
|
|
25
|
-
[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
|
|
26
|
-
|
|
27
|
-
This is a Compound V3 example, and every other protocol is similar
|
|
28
|
-
```js
|
|
29
|
-
import Web3 from 'web3';
|
|
30
|
-
import { compoundV3 } from '@defisaver/positions-sdk';
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
// every protocol has market data and user data getters
|
|
34
|
-
const {
|
|
35
|
-
getCompoundV3MarketsData,
|
|
36
|
-
getCompoundV3AccountData,
|
|
37
|
-
} = compoundV3;
|
|
38
|
-
|
|
39
|
-
const provider = 'Your RPC provider';
|
|
40
|
-
const web3 = new Web3(provider);
|
|
41
|
-
|
|
42
|
-
const user = '0x123...';
|
|
43
|
-
|
|
44
|
-
const { assetsData } = await getCompoundV3MarketsData(
|
|
45
|
-
web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
|
|
46
|
-
1, // network
|
|
47
|
-
selectedMarket, // market object like in /src/markets/compound/index.ts
|
|
48
|
-
web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
|
|
49
|
-
);
|
|
50
|
-
|
|
51
|
-
const userData = await getCompoundV3AccountData(
|
|
52
|
-
web3,
|
|
53
|
-
1, // network
|
|
54
|
-
userAddress, // EOA or DSProxy
|
|
55
|
-
'', // proxy address of the user, or just empty string if checking for EOA
|
|
56
|
-
{
|
|
57
|
-
selectedMarket, // market object as in /src/markets/compound/index.ts
|
|
58
|
-
assetsData,
|
|
59
|
-
}
|
|
60
|
-
);
|
|
61
|
-
```
|
|
62
|
-
|
|
63
|
-
More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
|
|
1
|
+
# DeFi Saver Positions SDK
|
|
2
|
+
|
|
3
|
+
Supported protocols:
|
|
4
|
+
- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
|
|
5
|
+
- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
|
|
6
|
+
- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
|
|
7
|
+
- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
|
|
8
|
+
- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
|
|
9
|
+
- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
|
|
10
|
+
- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
|
|
11
|
+
- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
|
|
12
|
+
- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
|
|
13
|
+
- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
|
|
14
|
+
- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
|
|
15
|
+
|
|
16
|
+
## Setup
|
|
17
|
+
Supported Node version is v10.
|
|
18
|
+
|
|
19
|
+
- run `npm install` (first time)
|
|
20
|
+
- run `npm run build`
|
|
21
|
+
|
|
22
|
+
`build` command will generate contracts and build ejs and esm folders
|
|
23
|
+
|
|
24
|
+
## How to use
|
|
25
|
+
[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
|
|
26
|
+
|
|
27
|
+
This is a Compound V3 example, and every other protocol is similar
|
|
28
|
+
```js
|
|
29
|
+
import Web3 from 'web3';
|
|
30
|
+
import { compoundV3 } from '@defisaver/positions-sdk';
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
// every protocol has market data and user data getters
|
|
34
|
+
const {
|
|
35
|
+
getCompoundV3MarketsData,
|
|
36
|
+
getCompoundV3AccountData,
|
|
37
|
+
} = compoundV3;
|
|
38
|
+
|
|
39
|
+
const provider = 'Your RPC provider';
|
|
40
|
+
const web3 = new Web3(provider);
|
|
41
|
+
|
|
42
|
+
const user = '0x123...';
|
|
43
|
+
|
|
44
|
+
const { assetsData } = await getCompoundV3MarketsData(
|
|
45
|
+
web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
|
|
46
|
+
1, // network
|
|
47
|
+
selectedMarket, // market object like in /src/markets/compound/index.ts
|
|
48
|
+
web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
|
|
49
|
+
);
|
|
50
|
+
|
|
51
|
+
const userData = await getCompoundV3AccountData(
|
|
52
|
+
web3,
|
|
53
|
+
1, // network
|
|
54
|
+
userAddress, // EOA or DSProxy
|
|
55
|
+
'', // proxy address of the user, or just empty string if checking for EOA
|
|
56
|
+
{
|
|
57
|
+
selectedMarket, // market object as in /src/markets/compound/index.ts
|
|
58
|
+
assetsData,
|
|
59
|
+
}
|
|
60
|
+
);
|
|
61
|
+
```
|
|
62
|
+
|
|
63
|
+
More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MMUsedAssets } from '../../types/common';
|
|
2
|
-
import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData } from '../../types';
|
|
3
|
-
export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData,
|
|
2
|
+
import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketInfo } from '../../types';
|
|
3
|
+
export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, marketInfo }: {
|
|
4
4
|
usedAssets: MMUsedAssets;
|
|
5
5
|
assetsData: MorphoBlueAssetsData;
|
|
6
|
-
|
|
6
|
+
marketInfo: MorphoBlueMarketInfo;
|
|
7
7
|
}) => MorphoBlueAggregatedPositionData;
|
|
@@ -7,11 +7,12 @@ exports.getMorphoBlueAggregatedPositionData = void 0;
|
|
|
7
7
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
8
|
const moneymarket_1 = require("../../moneymarket");
|
|
9
9
|
const staking_1 = require("../../staking");
|
|
10
|
-
const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData,
|
|
10
|
+
const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
|
|
11
11
|
const payload = {};
|
|
12
12
|
payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
|
|
13
13
|
payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
|
|
14
14
|
payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
|
|
15
|
+
const { lltv, oracle, collateralToken, loanToken, } = marketInfo;
|
|
15
16
|
payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
|
|
16
17
|
const suppliedUsdAmount = suppliedUsd;
|
|
17
18
|
return new decimal_js_1.default(suppliedUsdAmount).mul(lltv);
|
|
@@ -19,11 +20,15 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, lltv }) =
|
|
|
19
20
|
payload.liquidationLimitUsd = payload.borrowLimitUsd;
|
|
20
21
|
const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
|
|
21
22
|
payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
|
|
23
|
+
payload.leftToBorrow = new decimal_js_1.default(usedAssets[collateralToken].supplied).mul(oracle).mul(lltv).sub(usedAssets[loanToken].borrowed)
|
|
24
|
+
.toString();
|
|
22
25
|
const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)(usedAssets, assetsData);
|
|
23
26
|
payload.netApy = netApy;
|
|
24
27
|
payload.incentiveUsd = incentiveUsd;
|
|
25
28
|
payload.totalInterestUsd = totalInterestUsd;
|
|
26
29
|
payload.ltv = new decimal_js_1.default(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
|
|
30
|
+
payload.ltv = new decimal_js_1.default(usedAssets[loanToken].borrowed).div(oracle).div(usedAssets[collateralToken].supplied).toString();
|
|
31
|
+
payload.ratio = new decimal_js_1.default(usedAssets[collateralToken].supplied).mul(oracle).div(usedAssets[loanToken].borrowed).toString();
|
|
27
32
|
const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
|
|
28
33
|
payload.leveragedType = leveragedType;
|
|
29
34
|
if (leveragedType !== '') {
|
|
@@ -8,7 +8,7 @@ const MORPHO_BLUE_WSTETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
|
8
8
|
label: 'Morpho Blue',
|
|
9
9
|
shortLabel: 'wstETH/ETH',
|
|
10
10
|
value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth,
|
|
11
|
-
url: '
|
|
11
|
+
url: 'wstETH/ETH',
|
|
12
12
|
loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
13
13
|
collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
|
|
14
14
|
oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
|
|
@@ -23,7 +23,7 @@ const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
|
23
23
|
label: 'Morpho Blue',
|
|
24
24
|
shortLabel: 'wstETH/USDC',
|
|
25
25
|
value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC,
|
|
26
|
-
url: '
|
|
26
|
+
url: 'wstETH/USDC',
|
|
27
27
|
loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
|
|
28
28
|
collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
|
|
29
29
|
oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
|
package/cjs/morphoBlue/index.js
CHANGED
|
@@ -126,8 +126,8 @@ function getMorphoBlueAccountData(web3, network, account, selectedMarket, market
|
|
|
126
126
|
const loanInfo = yield viewContract.methods.getUserInfo(marketObject, account).call();
|
|
127
127
|
const usedAssets = {};
|
|
128
128
|
const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
|
|
129
|
-
const loanTokenSupplied =
|
|
130
|
-
const loanTokenBorrowed =
|
|
129
|
+
const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets, marketInfo.loanToken);
|
|
130
|
+
const loanTokenBorrowed = (0, tokens_1.assetAmountInEth)(loanInfo.borrowedInAssets, marketInfo.loanToken);
|
|
131
131
|
usedAssets[marketInfo.loanToken] = {
|
|
132
132
|
symbol: loanTokenInfo.symbol,
|
|
133
133
|
supplied: loanTokenSupplied,
|
|
@@ -139,7 +139,7 @@ function getMorphoBlueAccountData(web3, network, account, selectedMarket, market
|
|
|
139
139
|
borrowedUsd: new decimal_js_1.default(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
|
|
140
140
|
};
|
|
141
141
|
const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
|
|
142
|
-
const collateralTokenSupplied =
|
|
142
|
+
const collateralTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.collateral, marketInfo.collateralToken);
|
|
143
143
|
usedAssets[marketInfo.collateralToken] = {
|
|
144
144
|
symbol: collateralTokenInfo.symbol,
|
|
145
145
|
supplied: collateralTokenSupplied,
|
|
@@ -150,7 +150,7 @@ function getMorphoBlueAccountData(web3, network, account, selectedMarket, market
|
|
|
150
150
|
suppliedUsd: new decimal_js_1.default(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
|
|
151
151
|
borrowedUsd: '0',
|
|
152
152
|
};
|
|
153
|
-
return Object.assign({ usedAssets }, (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({ usedAssets, assetsData: marketInfo.assetsData,
|
|
153
|
+
return Object.assign({ usedAssets }, (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }));
|
|
154
154
|
});
|
|
155
155
|
}
|
|
156
156
|
exports.getMorphoBlueAccountData = getMorphoBlueAccountData;
|
|
@@ -47,10 +47,12 @@ export interface MorphoBlueAggregatedPositionData {
|
|
|
47
47
|
borrowLimitUsd: string;
|
|
48
48
|
liquidationLimitUsd: string;
|
|
49
49
|
leftToBorrowUsd: string;
|
|
50
|
+
leftToBorrow: string;
|
|
50
51
|
netApy: string;
|
|
51
52
|
incentiveUsd: string;
|
|
52
53
|
totalInterestUsd: string;
|
|
53
54
|
ltv: string;
|
|
55
|
+
ratio: string;
|
|
54
56
|
leveragedType: string;
|
|
55
57
|
leveragedAsset?: string;
|
|
56
58
|
leveragedLsdAssetRatio?: string;
|
|
@@ -64,10 +66,12 @@ export interface MorphoBluePositionData {
|
|
|
64
66
|
borrowLimitUsd: string;
|
|
65
67
|
liquidationLimitUsd: string;
|
|
66
68
|
leftToBorrowUsd: string;
|
|
69
|
+
leftToBorrow: string;
|
|
67
70
|
netApy: string;
|
|
68
71
|
incentiveUsd: string;
|
|
69
72
|
totalInterestUsd: string;
|
|
70
73
|
ltv: string;
|
|
74
|
+
ratio: string;
|
|
71
75
|
leveragedType: string;
|
|
72
76
|
leveragedAsset?: string;
|
|
73
77
|
leveragedLsdAssetRatio?: string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MMUsedAssets } from '../../types/common';
|
|
2
|
-
import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData } from '../../types';
|
|
3
|
-
export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData,
|
|
2
|
+
import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketInfo } from '../../types';
|
|
3
|
+
export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, marketInfo }: {
|
|
4
4
|
usedAssets: MMUsedAssets;
|
|
5
5
|
assetsData: MorphoBlueAssetsData;
|
|
6
|
-
|
|
6
|
+
marketInfo: MorphoBlueMarketInfo;
|
|
7
7
|
}) => MorphoBlueAggregatedPositionData;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import Dec from 'decimal.js';
|
|
2
2
|
import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
|
|
3
3
|
import { calculateNetApy } from '../../staking';
|
|
4
|
-
export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData,
|
|
4
|
+
export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
|
|
5
5
|
const payload = {};
|
|
6
6
|
payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
|
|
7
7
|
payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
|
|
8
8
|
payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
|
|
9
|
+
const { lltv, oracle, collateralToken, loanToken, } = marketInfo;
|
|
9
10
|
payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
|
|
10
11
|
const suppliedUsdAmount = suppliedUsd;
|
|
11
12
|
return new Dec(suppliedUsdAmount).mul(lltv);
|
|
@@ -13,11 +14,15 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ll
|
|
|
13
14
|
payload.liquidationLimitUsd = payload.borrowLimitUsd;
|
|
14
15
|
const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
|
|
15
16
|
payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
|
|
17
|
+
payload.leftToBorrow = new Dec(usedAssets[collateralToken].supplied).mul(oracle).mul(lltv).sub(usedAssets[loanToken].borrowed)
|
|
18
|
+
.toString();
|
|
16
19
|
const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
|
|
17
20
|
payload.netApy = netApy;
|
|
18
21
|
payload.incentiveUsd = incentiveUsd;
|
|
19
22
|
payload.totalInterestUsd = totalInterestUsd;
|
|
20
23
|
payload.ltv = new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
|
|
24
|
+
payload.ltv = new Dec(usedAssets[loanToken].borrowed).div(oracle).div(usedAssets[collateralToken].supplied).toString();
|
|
25
|
+
payload.ratio = new Dec(usedAssets[collateralToken].supplied).mul(oracle).div(usedAssets[loanToken].borrowed).toString();
|
|
21
26
|
const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
|
|
22
27
|
payload.leveragedType = leveragedType;
|
|
23
28
|
if (leveragedType !== '') {
|
|
@@ -5,7 +5,7 @@ export const MORPHO_BLUE_WSTETH_ETH = (networkId = NetworkNumber.Eth) => ({
|
|
|
5
5
|
label: 'Morpho Blue',
|
|
6
6
|
shortLabel: 'wstETH/ETH',
|
|
7
7
|
value: MorphoBlueVersions.MorphoBlueWstEthEth,
|
|
8
|
-
url: '
|
|
8
|
+
url: 'wstETH/ETH',
|
|
9
9
|
loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
|
|
10
10
|
collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
|
|
11
11
|
oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
|
|
@@ -19,7 +19,7 @@ export const MORPHO_BLUE_WSTETH_USDC = (networkId = NetworkNumber.Eth) => ({
|
|
|
19
19
|
label: 'Morpho Blue',
|
|
20
20
|
shortLabel: 'wstETH/USDC',
|
|
21
21
|
value: MorphoBlueVersions.MorphoBlueWstEthUSDC,
|
|
22
|
-
url: '
|
|
22
|
+
url: 'wstETH/USDC',
|
|
23
23
|
loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
|
|
24
24
|
collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
|
|
25
25
|
oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
|
package/esm/morphoBlue/index.js
CHANGED
|
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import Dec from 'decimal.js';
|
|
11
|
-
import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
|
|
11
|
+
import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
|
|
12
12
|
import { MorphoBlueViewContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
|
|
13
13
|
import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
|
|
14
14
|
import { getStakingApy } from '../staking';
|
|
@@ -119,8 +119,8 @@ export function getMorphoBlueAccountData(web3, network, account, selectedMarket,
|
|
|
119
119
|
const loanInfo = yield viewContract.methods.getUserInfo(marketObject, account).call();
|
|
120
120
|
const usedAssets = {};
|
|
121
121
|
const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
|
|
122
|
-
const loanTokenSupplied =
|
|
123
|
-
const loanTokenBorrowed =
|
|
122
|
+
const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
|
|
123
|
+
const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
|
|
124
124
|
usedAssets[marketInfo.loanToken] = {
|
|
125
125
|
symbol: loanTokenInfo.symbol,
|
|
126
126
|
supplied: loanTokenSupplied,
|
|
@@ -132,7 +132,7 @@ export function getMorphoBlueAccountData(web3, network, account, selectedMarket,
|
|
|
132
132
|
borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
|
|
133
133
|
};
|
|
134
134
|
const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
|
|
135
|
-
const collateralTokenSupplied =
|
|
135
|
+
const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
|
|
136
136
|
usedAssets[marketInfo.collateralToken] = {
|
|
137
137
|
symbol: collateralTokenInfo.symbol,
|
|
138
138
|
supplied: collateralTokenSupplied,
|
|
@@ -143,6 +143,6 @@ export function getMorphoBlueAccountData(web3, network, account, selectedMarket,
|
|
|
143
143
|
suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
|
|
144
144
|
borrowedUsd: '0',
|
|
145
145
|
};
|
|
146
|
-
return Object.assign({ usedAssets }, getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData,
|
|
146
|
+
return Object.assign({ usedAssets }, getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }));
|
|
147
147
|
});
|
|
148
148
|
}
|
|
@@ -47,10 +47,12 @@ export interface MorphoBlueAggregatedPositionData {
|
|
|
47
47
|
borrowLimitUsd: string;
|
|
48
48
|
liquidationLimitUsd: string;
|
|
49
49
|
leftToBorrowUsd: string;
|
|
50
|
+
leftToBorrow: string;
|
|
50
51
|
netApy: string;
|
|
51
52
|
incentiveUsd: string;
|
|
52
53
|
totalInterestUsd: string;
|
|
53
54
|
ltv: string;
|
|
55
|
+
ratio: string;
|
|
54
56
|
leveragedType: string;
|
|
55
57
|
leveragedAsset?: string;
|
|
56
58
|
leveragedLsdAssetRatio?: string;
|
|
@@ -64,10 +66,12 @@ export interface MorphoBluePositionData {
|
|
|
64
66
|
borrowLimitUsd: string;
|
|
65
67
|
liquidationLimitUsd: string;
|
|
66
68
|
leftToBorrowUsd: string;
|
|
69
|
+
leftToBorrow: string;
|
|
67
70
|
netApy: string;
|
|
68
71
|
incentiveUsd: string;
|
|
69
72
|
totalInterestUsd: string;
|
|
70
73
|
ltv: string;
|
|
74
|
+
ratio: string;
|
|
71
75
|
leveragedType: string;
|
|
72
76
|
leveragedAsset?: string;
|
|
73
77
|
leveragedLsdAssetRatio?: string;
|
package/package.json
CHANGED
|
@@ -1,40 +1,40 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "@defisaver/positions-sdk",
|
|
3
|
-
"version": "0.0.
|
|
4
|
-
"description": "",
|
|
5
|
-
"main": "./cjs/index.js",
|
|
6
|
-
"module": "./esm/index.js",
|
|
7
|
-
"types": "./esm/index.d.ts",
|
|
8
|
-
"scripts": {
|
|
9
|
-
"build:esm": "rm -rf esm && tsc -p tsconfig.json",
|
|
10
|
-
"build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
|
|
11
|
-
"build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
|
|
12
|
-
"dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
|
|
13
|
-
"lint": "eslint src/ --fix",
|
|
14
|
-
"generate-contracts": "node scripts/generateContracts.js",
|
|
15
|
-
"test": "mocha tests/*",
|
|
16
|
-
"build-test": "npm run build && mocha tests/*"
|
|
17
|
-
},
|
|
18
|
-
"keywords": [],
|
|
19
|
-
"author": "",
|
|
20
|
-
"license": "ISC",
|
|
21
|
-
"dependencies": {
|
|
22
|
-
"@defisaver/tokens": "^1.5.5",
|
|
23
|
-
"@ethersproject/bignumber": "^5.7.0",
|
|
24
|
-
"@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
|
|
25
|
-
"decimal.js": "^10.4.3"
|
|
26
|
-
},
|
|
27
|
-
"devDependencies": {
|
|
28
|
-
"@defisaver/eslint-config": "^1.0.1",
|
|
29
|
-
"chai": "^4.3.8",
|
|
30
|
-
"dotenv": "^16.3.1",
|
|
31
|
-
"eslint": "^8.49.0",
|
|
32
|
-
"mocha": "^10.2.0",
|
|
33
|
-
"typechain": "^8.3.1",
|
|
34
|
-
"typechain-target-web3-v1-3mihai3": "^6.0.2",
|
|
35
|
-
"typescript": "^5.2.2"
|
|
36
|
-
},
|
|
37
|
-
"peerDependencies": {
|
|
38
|
-
"web3": "^1.10.2"
|
|
39
|
-
}
|
|
40
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "@defisaver/positions-sdk",
|
|
3
|
+
"version": "0.0.36",
|
|
4
|
+
"description": "",
|
|
5
|
+
"main": "./cjs/index.js",
|
|
6
|
+
"module": "./esm/index.js",
|
|
7
|
+
"types": "./esm/index.d.ts",
|
|
8
|
+
"scripts": {
|
|
9
|
+
"build:esm": "rm -rf esm && tsc -p tsconfig.json",
|
|
10
|
+
"build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
|
|
11
|
+
"build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
|
|
12
|
+
"dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
|
|
13
|
+
"lint": "eslint src/ --fix",
|
|
14
|
+
"generate-contracts": "node scripts/generateContracts.js",
|
|
15
|
+
"test": "mocha tests/*",
|
|
16
|
+
"build-test": "npm run build && mocha tests/*"
|
|
17
|
+
},
|
|
18
|
+
"keywords": [],
|
|
19
|
+
"author": "",
|
|
20
|
+
"license": "ISC",
|
|
21
|
+
"dependencies": {
|
|
22
|
+
"@defisaver/tokens": "^1.5.5",
|
|
23
|
+
"@ethersproject/bignumber": "^5.7.0",
|
|
24
|
+
"@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
|
|
25
|
+
"decimal.js": "^10.4.3"
|
|
26
|
+
},
|
|
27
|
+
"devDependencies": {
|
|
28
|
+
"@defisaver/eslint-config": "^1.0.1",
|
|
29
|
+
"chai": "^4.3.8",
|
|
30
|
+
"dotenv": "^16.3.1",
|
|
31
|
+
"eslint": "^8.49.0",
|
|
32
|
+
"mocha": "^10.2.0",
|
|
33
|
+
"typechain": "^8.3.1",
|
|
34
|
+
"typechain-target-web3-v1-3mihai3": "^6.0.2",
|
|
35
|
+
"typescript": "^5.2.2"
|
|
36
|
+
},
|
|
37
|
+
"peerDependencies": {
|
|
38
|
+
"web3": "^1.10.2"
|
|
39
|
+
}
|
|
40
|
+
}
|