@defisaver/positions-sdk 2.1.48 → 2.1.49-aave-v4-dev-2

package/src/helpers/index.ts

@@ -1,10 +1,11 @@
-export * as aaveHelpers from './aaveHelpers';
-export * as compoundHelpers from './compoundHelpers';
-export * as sparkHelpers from './sparkHelpers';
-export * as curveUsdHelpers from './curveUsdHelpers';
-export * as makerHelpers from './makerHelpers';
-export * as morphoBlueHelpers from './morphoBlueHelpers';
-export * as llamaLendHelpers from './llamaLendHelpers';
-export * as liquityV2Helpers from './liquityV2Helpers';
-export * as eulerV2Helpers from './eulerHelpers';
-export * as fluidHelpers from './fluidHelpers';
+export * as aaveHelpers from './aaveHelpers';
+export * as compoundHelpers from './compoundHelpers';
+export * as sparkHelpers from './sparkHelpers';
+export * as curveUsdHelpers from './curveUsdHelpers';
+export * as makerHelpers from './makerHelpers';
+export * as morphoBlueHelpers from './morphoBlueHelpers';
+export * as llamaLendHelpers from './llamaLendHelpers';
+export * as liquityV2Helpers from './liquityV2Helpers';
+export * as eulerV2Helpers from './eulerHelpers';
+export * as fluidHelpers from './fluidHelpers';
+export * as aaveV4Helpers from './aaveV4Helpers';

package/src/helpers/liquityV2Helpers/index.ts

@@ -1,82 +1,82 @@
-import Dec from 'decimal.js';
-import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
-import {
-  LiquityV2AggregatedTroveData, LiquityV2AssetsData, LiquityV2UsedAsset, LiquityV2UsedAssets,
-} from '../../types';
-import { calculateInterestEarned } from '../../staking';
-
-export const calculateNetApyLiquityV2 = (usedAssets: LiquityV2UsedAssets, assetsData: LiquityV2AssetsData, interestRate: string) => {
-  const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
-    const acc = { ..._acc };
-    const assetData = assetsData[usedAsset.symbol];
-
-    if (usedAsset.suppliedUsd) {
-      const amount = usedAsset.suppliedUsd;
-      acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
-
-      for (const supplyIncentive of assetData.supplyIncentives) {
-        const { apy } = supplyIncentive;
-        const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-      }
-    }
-
-    if (usedAsset.borrowedUsd) {
-      const amount = usedAsset.borrowedUsd;
-      acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
-      const rate = interestRate;
-      const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);
-      acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-    }
-
-    return acc;
-  }, {
-    borrowInterest: '0', supplyInterest: '0', incentiveUsd: '0', borrowedUsd: '0', suppliedUsd: '0',
-  });
-
-  const {
-    borrowedUsd, suppliedUsd, borrowInterest, supplyInterest, incentiveUsd,
-  } = sumValues;
-
-  const totalInterestUsd = new Dec(borrowInterest).add(supplyInterest).add(incentiveUsd).toString();
-  const balance = new Dec(suppliedUsd).sub(borrowedUsd);
-  const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
-
-  return { netApy, totalInterestUsd, incentiveUsd };
-};
-
-export const getLiquityV2AggregatedPositionData = ({
-  usedAssets,
-  assetsData,
-  minCollRatio,
-  interestRate,
-}: {
-  usedAssets: LiquityV2UsedAssets
-  assetsData: LiquityV2AssetsData
-  minCollRatio: string
-  interestRate: string
-}): LiquityV2AggregatedTroveData => {
-  const payload = {} as LiquityV2AggregatedTroveData;
-  payload.suppliedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  payload.borrowedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
-  payload.borrowLimitUsd = new Dec(payload.suppliedUsd).div(minCollRatio).mul(100).toString();
-  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
-  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
-  payload.ratio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-  payload.collRatio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
-  payload.netApy = netApy;
-  payload.incentiveUsd = incentiveUsd;
-  payload.totalInterestUsd = totalInterestUsd;
-
-  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
-  payload.leveragedType = leveragedType;
-  payload.leveragedAsset = leveragedAsset;
-  payload.liquidationPrice = '';
-  if (leveragedType !== '') {
-    const assetPrice = assetsData[leveragedAsset].price;
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.borrowLimitUsd);
-  }
-
-  return payload;
-};
+import Dec from 'decimal.js';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import {
+  LiquityV2AggregatedTroveData, LiquityV2AssetsData, LiquityV2UsedAsset, LiquityV2UsedAssets,
+} from '../../types';
+import { calculateInterestEarned } from '../../staking';
+
+export const calculateNetApyLiquityV2 = (usedAssets: LiquityV2UsedAssets, assetsData: LiquityV2AssetsData, interestRate: string) => {
+  const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
+    const acc = { ..._acc };
+    const assetData = assetsData[usedAsset.symbol];
+
+    if (usedAsset.suppliedUsd) {
+      const amount = usedAsset.suppliedUsd;
+      acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
+
+      for (const supplyIncentive of assetData.supplyIncentives) {
+        const { apy } = supplyIncentive;
+        const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
+        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+      }
+    }
+
+    if (usedAsset.borrowedUsd) {
+      const amount = usedAsset.borrowedUsd;
+      acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
+      const rate = interestRate;
+      const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);
+      acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
+    }
+
+    return acc;
+  }, {
+    borrowInterest: '0', supplyInterest: '0', incentiveUsd: '0', borrowedUsd: '0', suppliedUsd: '0',
+  });
+
+  const {
+    borrowedUsd, suppliedUsd, borrowInterest, supplyInterest, incentiveUsd,
+  } = sumValues;
+
+  const totalInterestUsd = new Dec(borrowInterest).add(supplyInterest).add(incentiveUsd).toString();
+  const balance = new Dec(suppliedUsd).sub(borrowedUsd);
+  const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
+
+  return { netApy, totalInterestUsd, incentiveUsd };
+};
+
+export const getLiquityV2AggregatedPositionData = ({
+  usedAssets,
+  assetsData,
+  minCollRatio,
+  interestRate,
+}: {
+  usedAssets: LiquityV2UsedAssets
+  assetsData: LiquityV2AssetsData
+  minCollRatio: string
+  interestRate: string
+}): LiquityV2AggregatedTroveData => {
+  const payload = {} as LiquityV2AggregatedTroveData;
+  payload.suppliedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowedUsd = getAssetsTotal(usedAssets, (usedAsset: LiquityV2UsedAsset) => usedAsset, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+  payload.borrowLimitUsd = new Dec(payload.suppliedUsd).div(minCollRatio).mul(100).toString();
+  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+  payload.ratio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  payload.collRatio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+  payload.leveragedType = leveragedType;
+  payload.leveragedAsset = leveragedAsset;
+  payload.liquidationPrice = '';
+  if (leveragedType !== '') {
+    const assetPrice = assetsData[leveragedAsset].price;
+    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.borrowLimitUsd);
+  }
+
+  return payload;
+};

package/src/helpers/llamaLendHelpers/index.ts

@@ -1,53 +1,53 @@
-import Dec from 'decimal.js';
-import {
-  LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets,
-} from '../../types';
-import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../../types/common';
-import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
-import { mapRange } from '../../services/utils';
-import { calculateNetApy } from '../../staking';
-
-export const getLlamaLendAggregatedData = ({
-  loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest
-}:{
-  loanExists: boolean, usedAssets: LlamaLendUsedAssets, network: NetworkNumber, selectedMarket: LlamaLendMarketData, numOfBands: number | string, assetsData: LlamaLendAssetsData,
-}): LlamaLendAggregatedPositionData => {
-  const collAsset = selectedMarket.collAsset;
-  const debtAsset = selectedMarket.baseAsset;
-  const payload = {} as LlamaLendAggregatedPositionData;
-
-  // payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied);
-  // payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowed }: { borrowed: string }) => borrowed);
-  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ collateral }: { collateral: boolean }) => collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
-  payload.suppliedForYieldUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedForYield }: { suppliedForYield?: string }) => suppliedForYield || '0');
-
-  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
-  payload.netApy = netApy;
-  payload.incentiveUsd = incentiveUsd;
-  payload.totalInterestUsd = totalInterestUsd;
-
-  payload.ratio = loanExists
-    ? new Dec(payload.suppliedUsd)
-      .dividedBy(payload.borrowedUsd)
-      .times(100)
-      .toString()
-    : '0';
-
-  // this is all approximation
-  payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
-  payload.collFactor = new Dec(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
-  // only take in consideration collAsset
-  payload.borrowLimitUsd = usedAssets?.[collAsset]?.isSupplied
-    ? new Dec(usedAssets[collAsset].suppliedUsd).mul(payload.collFactor).toString()
-    : '0';
-
-  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets as unknown as MMUsedAssets);
-  payload.leveragedType = leveragedType;
-  if (leveragedType !== '') {
-    payload.leveragedAsset = leveragedAsset;
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
-  }
-
-  return payload;
-};
+import Dec from 'decimal.js';
+import {
+  LlamaLendAggregatedPositionData, LlamaLendAssetsData, LlamaLendMarketData, LlamaLendUsedAssets,
+} from '../../types';
+import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../../types/common';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { mapRange } from '../../services/utils';
+import { calculateNetApy } from '../../staking';
+
+export const getLlamaLendAggregatedData = ({
+  loanExists, usedAssets, network, selectedMarket, numOfBands, assetsData, ...rest
+}:{
+  loanExists: boolean, usedAssets: LlamaLendUsedAssets, network: NetworkNumber, selectedMarket: LlamaLendMarketData, numOfBands: number | string, assetsData: LlamaLendAssetsData,
+}): LlamaLendAggregatedPositionData => {
+  const collAsset = selectedMarket.collAsset;
+  const debtAsset = selectedMarket.baseAsset;
+  const payload = {} as LlamaLendAggregatedPositionData;
+
+  // payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied);
+  // payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowed }: { borrowed: string }) => borrowed);
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ collateral }: { collateral: boolean }) => collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+  payload.suppliedForYieldUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedForYield }: { suppliedForYield?: string }) => suppliedForYield || '0');
+
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+
+  payload.ratio = loanExists
+    ? new Dec(payload.suppliedUsd)
+      .dividedBy(payload.borrowedUsd)
+      .times(100)
+      .toString()
+    : '0';
+
+  // this is all approximation
+  payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
+  payload.collFactor = new Dec(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
+  // only take in consideration collAsset
+  payload.borrowLimitUsd = usedAssets?.[collAsset]?.isSupplied
+    ? new Dec(usedAssets[collAsset].suppliedUsd).mul(payload.collFactor).toString()
+    : '0';
+
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets as unknown as MMUsedAssets);
+  payload.leveragedType = leveragedType;
+  if (leveragedType !== '') {
+    payload.leveragedAsset = leveragedAsset;
+    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
+  }
+
+  return payload;
+};

package/src/helpers/makerHelpers/index.ts

@@ -1,53 +1,53 @@
-import Dec from 'decimal.js';
-import { SECONDS_PER_YEAR } from '../../constants';
-import { bytesToString } from '../../services/utils';
-
-export const parseCollateralInfo = (
-  ilk: string,
-  _par: string,
-  _mat: string,
-  _art: string,
-  _rate: string,
-  _spot: string,
-  _line: string,
-  _duty: string,
-  _futureRate: string,
-  _chop: string,
-) => {
-  const par = new Dec(_par).div(1e27).toString();
-  const mat = new Dec(_mat).div(1e27).toString();
-  const art = new Dec(_art).toString();
-  const rate = new Dec(_rate).toString();
-  const spot = new Dec(_spot).div(1e27).toString();
-  const line = new Dec(_line).div(1e45).toString();
-  const dust = new Dec(_rate).div(1e45).toString();
-  const duty = new Dec(_duty).toString();
-  const futureRate = new Dec(_futureRate).toString();
-  const chop = new Dec(_chop).div(1e18).toString();
-
-  const stabilityFee = new Dec(duty.toString())
-    .div(1e27)
-    .pow(SECONDS_PER_YEAR)
-    .minus(1)
-    .mul(100)
-    .toNumber();
-  const liquidationFee = new Dec(chop).mul(100).sub(100).toString();
-  const globalDebtCurrent = new Dec(art).div(1e18).mul(new Dec(futureRate).div(1e27)).toString();
-  const globalDebtCeiling = line;
-  const creatableDebt = new Dec(globalDebtCeiling).sub(globalDebtCurrent).toString();
-
-  return {
-    ilkLabel: bytesToString(ilk),
-    currentRate: rate,
-    futureRate,
-    minDebt: dust,
-    globalDebtCurrent,
-    globalDebtCeiling,
-    assetPrice: new Dec(spot).times(par).times(mat).toString(),
-    liqRatio: mat,
-    liqPercent: +mat * 100,
-    stabilityFee,
-    liquidationFee: new Dec(liquidationFee).lt(0) ? '0' : liquidationFee,
-    creatableDebt,
-  };
+import Dec from 'decimal.js';
+import { SECONDS_PER_YEAR } from '../../constants';
+import { bytesToString } from '../../services/utils';
+
+export const parseCollateralInfo = (
+  ilk: string,
+  _par: string,
+  _mat: string,
+  _art: string,
+  _rate: string,
+  _spot: string,
+  _line: string,
+  _duty: string,
+  _futureRate: string,
+  _chop: string,
+) => {
+  const par = new Dec(_par).div(1e27).toString();
+  const mat = new Dec(_mat).div(1e27).toString();
+  const art = new Dec(_art).toString();
+  const rate = new Dec(_rate).toString();
+  const spot = new Dec(_spot).div(1e27).toString();
+  const line = new Dec(_line).div(1e45).toString();
+  const dust = new Dec(_rate).div(1e45).toString();
+  const duty = new Dec(_duty).toString();
+  const futureRate = new Dec(_futureRate).toString();
+  const chop = new Dec(_chop).div(1e18).toString();
+
+  const stabilityFee = new Dec(duty.toString())
+    .div(1e27)
+    .pow(SECONDS_PER_YEAR)
+    .minus(1)
+    .mul(100)
+    .toNumber();
+  const liquidationFee = new Dec(chop).mul(100).sub(100).toString();
+  const globalDebtCurrent = new Dec(art).div(1e18).mul(new Dec(futureRate).div(1e27)).toString();
+  const globalDebtCeiling = line;
+  const creatableDebt = new Dec(globalDebtCeiling).sub(globalDebtCurrent).toString();
+
+  return {
+    ilkLabel: bytesToString(ilk),
+    currentRate: rate,
+    futureRate,
+    minDebt: dust,
+    globalDebtCurrent,
+    globalDebtCeiling,
+    assetPrice: new Dec(spot).times(par).times(mat).toString(),
+    liqRatio: mat,
+    liqPercent: +mat * 100,
+    stabilityFee,
+    liquidationFee: new Dec(liquidationFee).lt(0) ? '0' : liquidationFee,
+    creatableDebt,
+  };
 };