@defisaver/positions-sdk 0.0.18 → 0.0.19

package/cjs/helpers/aaveHelpers/index.js

@@ -114,6 +114,11 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.suppliedEth = new decimal_js_1.default(payload.suppliedUsd).div(assetsData.ETH.price).toString();
+    payload.borrowedEth = new decimal_js_1.default(payload.borrowedUsd).div(assetsData.ETH.price).toString();
+    payload.leftToBorrowEth = new decimal_js_1.default(payload.leftToBorrowUsd).div(assetsData.ETH.price).toString();
+    payload.borrowLimitEth = new decimal_js_1.default(payload.borrowLimitUsd).div(assetsData.ETH.price).toString();
+    payload.liquidationLimitEth = new decimal_js_1.default(payload.liquidationLimitUsd).div(assetsData.ETH.price).toString();
     return payload;
 };
 exports.aaveAnyGetAggregatedPositionData = aaveAnyGetAggregatedPositionData;

package/cjs/liquity/index.d.ts

@@ -4,4 +4,5 @@ import { LiquityTroveInfo } from '../types';
 export declare const LIQUITY_NORMAL_MODE_RATIO = 110;
 export declare const LIQUITY_RECOVERY_MODE_RATIO = 150;
 export declare const getLiquityAccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
+export declare const getDebtInFront: (viewContract: any, address: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
 export declare const getLiquityTroveInfo: (web3: Web3, network: NetworkNumber, address: string) => Promise<LiquityTroveInfo>;

package/cjs/liquity/index.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLiquityTroveInfo = exports.getLiquityAccountBalances = exports.LIQUITY_RECOVERY_MODE_RATIO = exports.LIQUITY_NORMAL_MODE_RATIO = void 0;
+exports.getLiquityTroveInfo = exports.getDebtInFront = exports.getLiquityAccountBalances = exports.LIQUITY_RECOVERY_MODE_RATIO = exports.LIQUITY_NORMAL_MODE_RATIO = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const multicall_1 = require("../multicall");
 const types_1 = require("../types");
+const constants_1 = require("../constants");
 exports.LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 exports.LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
 const getLiquityAccountBalances = (web3, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
@@ -41,6 +42,14 @@ const getLiquityAccountBalances = (web3, network, block, addressMapping, address
     return balances;
 });
 exports.getLiquityAccountBalances = getLiquityAccountBalances;
+const _getDebtInFront = (viewContract, address, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(address, accumulatedSum, iterations).call(); });
+const getDebtInFront = (viewContract, address, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
+    const { debt, next } = yield _getDebtInFront(viewContract, address, accumulatedSum, iterations);
+    if (next === constants_1.ZERO_ADDRESS)
+        return (0, tokens_1.assetAmountInEth)(debt, 'LUSD');
+    return (0, exports.getDebtInFront)(viewContract, next, debt, iterations);
+});
+exports.getDebtInFront = getDebtInFront;
 const getLiquityTroveInfo = (web3, network, address) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = (0, contracts_1.LiquityViewContract)(web3, network);
     const collSurplusPoolContract = (0, contracts_1.LiquityCollSurplusPoolContract)(web3, network);
@@ -79,7 +88,10 @@ const getLiquityTroveInfo = (web3, network, address) => __awaiter(void 0, void 0
             params: [],
         },
     ];
-    const multiRes = yield (0, multicall_1.multicall)(multicallData, web3, network);
+    const [multiRes, debtInFront] = yield Promise.all([
+        (0, multicall_1.multicall)(multicallData, web3, network),
+        (0, exports.getDebtInFront)(viewContract, address),
+    ]);
     const recoveryMode = multiRes[0][6];
     const totalETH = multiRes[4][0];
     const totalLUSD = multiRes[5][0];
@@ -94,6 +106,7 @@ const getLiquityTroveInfo = (web3, network, address) => __awaiter(void 0, void 0
         assetPrice: (0, tokens_1.assetAmountInEth)(multiRes[3][0]),
         totalETH,
         totalLUSD,
+        debtInFront,
         minCollateralRatio: recoveryMode ? exports.LIQUITY_RECOVERY_MODE_RATIO : exports.LIQUITY_NORMAL_MODE_RATIO,
         priceForRecovery: new decimal_js_1.default(recoveryMode ? exports.LIQUITY_RECOVERY_MODE_RATIO : exports.LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
             .toString(),

package/cjs/types/aave.d.ts

@@ -199,11 +199,16 @@ export interface AaveV3IncentiveData {
 }
 export interface AaveV3AggregatedPositionData {
     suppliedUsd: string;
+    suppliedEth: string;
     suppliedCollateralUsd: string;
     borrowedUsd: string;
+    borrowedEth: string;
     borrowLimitUsd: string;
+    borrowLimitEth: string;
     liquidationLimitUsd: string;
+    liquidationLimitEth: string;
     leftToBorrowUsd: string;
+    leftToBorrowEth: string;
     ratio: string;
     collRatio: string;
     netApy: string;

package/cjs/types/liquity.d.ts

@@ -25,4 +25,5 @@ export interface LiquityTroveInfo {
     totalLUSD: string;
     minCollateralRatio: number;
     priceForRecovery: string;
+    debtInFront: string;
 }

package/esm/helpers/aaveHelpers/index.js

@@ -98,5 +98,10 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.suppliedEth = new Dec(payload.suppliedUsd).div(assetsData.ETH.price).toString();
+    payload.borrowedEth = new Dec(payload.borrowedUsd).div(assetsData.ETH.price).toString();
+    payload.leftToBorrowEth = new Dec(payload.leftToBorrowUsd).div(assetsData.ETH.price).toString();
+    payload.borrowLimitEth = new Dec(payload.borrowLimitUsd).div(assetsData.ETH.price).toString();
+    payload.liquidationLimitEth = new Dec(payload.liquidationLimitUsd).div(assetsData.ETH.price).toString();
     return payload;
 };

package/esm/liquity/index.d.ts

@@ -4,4 +4,5 @@ import { LiquityTroveInfo } from '../types';
 export declare const LIQUITY_NORMAL_MODE_RATIO = 110;
 export declare const LIQUITY_RECOVERY_MODE_RATIO = 150;
 export declare const getLiquityAccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
+export declare const getDebtInFront: (viewContract: any, address: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
 export declare const getLiquityTroveInfo: (web3: Web3, network: NetworkNumber, address: string) => Promise<LiquityTroveInfo>;

package/esm/liquity/index.js

@@ -12,6 +12,7 @@ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { LiquityActivePoolContract, LiquityCollSurplusPoolContract, LiquityPriceFeedContract, LiquityTroveManagerContract, LiquityViewContract, } from '../contracts';
 import { multicall } from '../multicall';
 import { LIQUITY_TROVE_STATUS_ENUM } from '../types';
+import { ZERO_ADDRESS } from '../constants';
 export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
 export const getLiquityAccountBalances = (web3, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
@@ -34,6 +35,13 @@ export const getLiquityAccountBalances = (web3, network, block, addressMapping,
     };
     return balances;
 });
+const _getDebtInFront = (viewContract, address, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(address, accumulatedSum, iterations).call(); });
+export const getDebtInFront = (viewContract, address, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
+    const { debt, next } = yield _getDebtInFront(viewContract, address, accumulatedSum, iterations);
+    if (next === ZERO_ADDRESS)
+        return assetAmountInEth(debt, 'LUSD');
+    return getDebtInFront(viewContract, next, debt, iterations);
+});
 export const getLiquityTroveInfo = (web3, network, address) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = LiquityViewContract(web3, network);
     const collSurplusPoolContract = LiquityCollSurplusPoolContract(web3, network);
@@ -72,7 +80,10 @@ export const getLiquityTroveInfo = (web3, network, address) => __awaiter(void 0,
             params: [],
         },
     ];
-    const multiRes = yield multicall(multicallData, web3, network);
+    const [multiRes, debtInFront] = yield Promise.all([
+        multicall(multicallData, web3, network),
+        getDebtInFront(viewContract, address),
+    ]);
     const recoveryMode = multiRes[0][6];
     const totalETH = multiRes[4][0];
     const totalLUSD = multiRes[5][0];
@@ -87,6 +98,7 @@ export const getLiquityTroveInfo = (web3, network, address) => __awaiter(void 0,
         assetPrice: assetAmountInEth(multiRes[3][0]),
         totalETH,
         totalLUSD,
+        debtInFront,
         minCollateralRatio: recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO,
         priceForRecovery: new Dec(recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
             .toString(),

package/esm/types/aave.d.ts

@@ -199,11 +199,16 @@ export interface AaveV3IncentiveData {
 }
 export interface AaveV3AggregatedPositionData {
     suppliedUsd: string;
+    suppliedEth: string;
     suppliedCollateralUsd: string;
     borrowedUsd: string;
+    borrowedEth: string;
     borrowLimitUsd: string;
+    borrowLimitEth: string;
     liquidationLimitUsd: string;
+    liquidationLimitEth: string;
     leftToBorrowUsd: string;
+    leftToBorrowEth: string;
     ratio: string;
     collRatio: string;
     netApy: string;

package/esm/types/liquity.d.ts

@@ -25,4 +25,5 @@ export interface LiquityTroveInfo {
     totalLUSD: string;
     minCollateralRatio: number;
     priceForRecovery: string;
+    debtInFront: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/helpers/aaveHelpers/index.ts

@@ -131,5 +131,12 @@ export const aaveAnyGetAggregatedPositionData = ({
     }
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
+
+  payload.suppliedEth = new Dec(payload.suppliedUsd).div(assetsData.ETH.price).toString();
+  payload.borrowedEth = new Dec(payload.borrowedUsd).div(assetsData.ETH.price).toString();
+  payload.leftToBorrowEth = new Dec(payload.leftToBorrowUsd).div(assetsData.ETH.price).toString();
+  payload.borrowLimitEth = new Dec(payload.borrowLimitUsd).div(assetsData.ETH.price).toString();
+  payload.liquidationLimitEth = new Dec(payload.liquidationLimitUsd).div(assetsData.ETH.price).toString();
+
   return payload;
 };

package/src/liquity/index.ts

@@ -9,6 +9,7 @@ import {
 } from '../contracts';
 import { multicall } from '../multicall';
 import { LIQUITY_TROVE_STATUS_ENUM, LiquityTroveInfo } from '../types';
+import { ZERO_ADDRESS } from '../constants';
 
 export const LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 export const LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
@@ -38,6 +39,14 @@ export const getLiquityAccountBalances = async (web3: Web3, network: NetworkNumb
   return balances;
 };
 
+const _getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000) => viewContract.methods.getDebtInFront(address, accumulatedSum, iterations).call();
+
+export const getDebtInFront = async (viewContract: any, address: string, accumulatedSum = '0', iterations = 2000): Promise<string> => {
+  const { debt, next } = await _getDebtInFront(viewContract, address, accumulatedSum, iterations);
+  if (next === ZERO_ADDRESS) return assetAmountInEth(debt, 'LUSD');
+  return getDebtInFront(viewContract, next, debt, iterations);
+};
+
 export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, address: string): Promise<LiquityTroveInfo> => {
   const viewContract = LiquityViewContract(web3, network);
   const collSurplusPoolContract = LiquityCollSurplusPoolContract(web3, network);
@@ -78,7 +87,10 @@ export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, ad
     },
   ];
 
-  const multiRes = await multicall(multicallData, web3, network);
+  const [multiRes, debtInFront] = await Promise.all([
+    multicall(multicallData, web3, network),
+    getDebtInFront(viewContract, address),
+  ]);
 
   const recoveryMode = multiRes[0][6];
   const totalETH = multiRes[4][0];
@@ -95,6 +107,7 @@ export const getLiquityTroveInfo = async (web3: Web3, network: NetworkNumber, ad
     assetPrice: assetAmountInEth(multiRes[3][0]),
     totalETH,
     totalLUSD,
+    debtInFront,
     minCollateralRatio: recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO,
     priceForRecovery: new Dec(recoveryMode ? LIQUITY_RECOVERY_MODE_RATIO : LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
       .toString(),

package/src/types/aave.ts

@@ -222,11 +222,16 @@ export interface AaveV3IncentiveData {
 
 export interface AaveV3AggregatedPositionData {
   suppliedUsd: string,
+  suppliedEth: string,
   suppliedCollateralUsd: string,
   borrowedUsd: string,
+  borrowedEth: string,
   borrowLimitUsd: string,
+  borrowLimitEth: string,
   liquidationLimitUsd: string,
+  liquidationLimitEth: string,
   leftToBorrowUsd: string,
+  leftToBorrowEth: string,
   ratio: string,
   collRatio: string,
   netApy: string,

package/src/types/liquity.ts

@@ -27,4 +27,5 @@ export interface LiquityTroveInfo {
   totalLUSD: string,
   minCollateralRatio: number,
   priceForRecovery: string,
+  debtInFront: string,
 }