@defisaver/positions-sdk 0.0.41 → 0.0.42

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 (4) hide show
  1. package/cjs/helpers/morphoBlueHelpers/index.js +4 -3
  2. package/esm/helpers/morphoBlueHelpers/index.js +4 -3
  3. package/package.json +1 -1
  4. package/src/helpers/morphoBlueHelpers/index.ts +3 -3
package/cjs/helpers/morphoBlueHelpers/index.js CHANGED
@@ -8,6 +8,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
8
8
  const moneymarket_1 = require("../../moneymarket");
9
9
  const staking_1 = require("../../staking");
10
10
  const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
11
+ var _a, _b, _c, _d, _e, _f;
11
12
  const payload = {};
12
13
  payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
13
14
  payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
@@ -20,15 +21,15 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInf
20
21
  payload.liquidationLimitUsd = payload.borrowLimitUsd;
21
22
  const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
22
23
  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
+ payload.leftToBorrow = new decimal_js_1.default(((_a = usedAssets[collateralToken]) === null || _a === void 0 ? void 0 : _a.supplied) || 0).mul(oracle).mul(lltv).sub(((_b = usedAssets[loanToken]) === null || _b === void 0 ? void 0 : _b.borrowed) || 0)
24
25
  .toString();
25
26
  const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)(usedAssets, assetsData);
26
27
  payload.netApy = netApy;
27
28
  payload.incentiveUsd = incentiveUsd;
28
29
  payload.totalInterestUsd = totalInterestUsd;
29
30
  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).mul(100)
31
+ payload.ltv = new decimal_js_1.default(((_c = usedAssets[loanToken]) === null || _c === void 0 ? void 0 : _c.borrowed) || 0).div(oracle).div(((_d = usedAssets[collateralToken]) === null || _d === void 0 ? void 0 : _d.supplied) || 1).toString(); // default to 1 because can't div 0
32
+ payload.ratio = new decimal_js_1.default(((_e = usedAssets[collateralToken]) === null || _e === void 0 ? void 0 : _e.supplied) || 0).mul(oracle).div(((_f = usedAssets[loanToken]) === null || _f === void 0 ? void 0 : _f.borrowed) || 1).mul(100)
32
33
  .toString();
33
34
  const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
34
35
  payload.leveragedType = leveragedType;
package/esm/helpers/morphoBlueHelpers/index.js CHANGED
@@ -2,6 +2,7 @@ import Dec from 'decimal.js';
2
2
  import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
3
3
  import { calculateNetApy } from '../../staking';
4
4
  export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
5
+ var _a, _b, _c, _d, _e, _f;
5
6
  const payload = {};
6
7
  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
7
8
  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
@@ -14,15 +15,15 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
14
15
  payload.liquidationLimitUsd = payload.borrowLimitUsd;
15
16
  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
16
17
  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
+ payload.leftToBorrow = new Dec(((_a = usedAssets[collateralToken]) === null || _a === void 0 ? void 0 : _a.supplied) || 0).mul(oracle).mul(lltv).sub(((_b = usedAssets[loanToken]) === null || _b === void 0 ? void 0 : _b.borrowed) || 0)
18
19
  .toString();
19
20
  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
20
21
  payload.netApy = netApy;
21
22
  payload.incentiveUsd = incentiveUsd;
22
23
  payload.totalInterestUsd = totalInterestUsd;
23
24
  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).mul(100)
25
+ payload.ltv = new Dec(((_c = usedAssets[loanToken]) === null || _c === void 0 ? void 0 : _c.borrowed) || 0).div(oracle).div(((_d = usedAssets[collateralToken]) === null || _d === void 0 ? void 0 : _d.supplied) || 1).toString(); // default to 1 because can't div 0
26
+ payload.ratio = new Dec(((_e = usedAssets[collateralToken]) === null || _e === void 0 ? void 0 : _e.supplied) || 0).mul(oracle).div(((_f = usedAssets[loanToken]) === null || _f === void 0 ? void 0 : _f.borrowed) || 1).mul(100)
26
27
  .toString();
27
28
  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
28
29
  payload.leveragedType = leveragedType;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.41",
3
+ "version": "0.0.42",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/helpers/morphoBlueHelpers/index.ts CHANGED
@@ -27,7 +27,7 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
27
27
  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
28
28
  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
29
29
 
30
- payload.leftToBorrow = new Dec(usedAssets[collateralToken].supplied).mul(oracle).mul(lltv).sub(usedAssets[loanToken].borrowed)
30
+ payload.leftToBorrow = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).mul(lltv).sub(usedAssets[loanToken]?.borrowed || 0)
31
31
  .toString();
32
32
 
33
33
  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData as any);
@@ -36,8 +36,8 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
36
36
  payload.totalInterestUsd = totalInterestUsd;
37
37
 
38
38
  payload.ltv = new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
39
- payload.ltv = new Dec(usedAssets[loanToken].borrowed).div(oracle).div(usedAssets[collateralToken].supplied).toString();
40
- payload.ratio = new Dec(usedAssets[collateralToken].supplied).mul(oracle).div(usedAssets[loanToken].borrowed).mul(100)
39
+ payload.ltv = new Dec(usedAssets[loanToken]?.borrowed || 0).div(oracle).div(usedAssets[collateralToken]?.supplied || 1).toString(); // default to 1 because can't div 0
40
+ payload.ratio = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).div(usedAssets[loanToken]?.borrowed || 1).mul(100)
41
41
  .toString();
42
42
 
43
43
  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);