@defisaver/positions-sdk 0.0.187 → 0.0.188-dev-markets

package/src/helpers/eulerHelpers/index.ts

@@ -1,233 +1,233 @@
-import Dec from 'decimal.js';
-import Web3 from 'web3';
-import { assetAmountInWei } from '@defisaver/tokens';
-import {
-  EthAddress, NetworkNumber,
-} from '../../types/common';
-import {
-  calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS,
-} from '../../moneymarket';
-import { calculateInterestEarned } from '../../staking';
-import {
-  EulerV2AggregatedPositionData,
-  EulerV2AssetsData,
-  EulerV2Market,
-  EulerV2UsedAssets,
-} from '../../types';
-import { EulerV2ViewContract } from '../../contracts';
-import { borrowOperations } from '../../constants';
-import { multicall } from '../../multicall';
-
-export const isLeveragedPos = (usedAssets: EulerV2UsedAssets, dustLimit = 5) => {
-  let borrowUnstable = 0;
-  let supplyStable = 0;
-  let borrowStable = 0;
-  let supplyUnstable = 0;
-  let longAsset = '';
-  let shortAsset = '';
-  let leverageAssetVault = '';
-  Object.values(usedAssets).forEach(({
-    symbol, suppliedUsd, borrowedUsd, collateral, vaultAddress,
-  }) => {
-    const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
-    const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
-    if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
-    if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
-      borrowUnstable += 1;
-      shortAsset = symbol;
-      leverageAssetVault = vaultAddress;
-    }
-    if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
-      supplyUnstable += 1;
-      longAsset = symbol;
-      leverageAssetVault = vaultAddress;
-    }
-  });
-  const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
-  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-  // lsd -> liquid staking derivative
-  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
-  if (isLong) {
-    return {
-      leveragedType: 'long',
-      leveragedAsset: longAsset,
-      leveragedVault: leverageAssetVault,
-    };
-  }
-  if (isShort) {
-    return {
-      leveragedType: 'short',
-      leveragedAsset: shortAsset,
-      leveragedVault: leverageAssetVault,
-    };
-  }
-  if (isLsdLeveraged) {
-    return {
-      leveragedType: 'lsd-leverage',
-      leveragedAsset: longAsset,
-      leveragedVault: leverageAssetVault,
-    };
-  }
-  return {
-    leveragedType: '',
-    leveragedAsset: '',
-    leveragedVault: '',
-  };
-};
-
-export const calculateNetApy = (usedAssets: EulerV2UsedAssets, assetsData: EulerV2AssetsData) => {
-  const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
-    const acc = { ..._acc };
-    const assetData = assetsData[usedAsset.vaultAddress.toLowerCase()];
-
-    if (usedAsset.isSupplied) {
-      const amount = usedAsset.suppliedUsd;
-      acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
-      const rate = assetData.supplyRate;
-      const supplyInterest = calculateInterestEarned(amount, rate as string, 'year', true);
-      acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
-    }
-
-    if (usedAsset.isBorrowed) {
-      const amount = usedAsset.borrowedUsd;
-      acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
-      const rate = assetData.borrowRate;
-      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 getEulerV2AggregatedData = ({
-  usedAssets, assetsData, network, ...rest
-}: { usedAssets: EulerV2UsedAssets, assetsData: EulerV2AssetsData, network: NetworkNumber }) => {
-  const payload = {} as EulerV2AggregatedPositionData;
-  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
-  payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ vaultAddress, suppliedUsd }: { vaultAddress: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[vaultAddress.toLowerCase()].collateralFactor));
-  payload.liquidationLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ vaultAddress, suppliedUsd }: { vaultAddress: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[vaultAddress.toLowerCase()].liquidationRatio));
-  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
-  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
-  payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-  payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
-  payload.netApy = netApy;
-  payload.incentiveUsd = incentiveUsd;
-  payload.totalInterestUsd = totalInterestUsd;
-  payload.minRatio = '100';
-  payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
-  payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
-  const { leveragedType, leveragedAsset, leveragedVault } = isLeveragedPos(usedAssets);
-  payload.leveragedType = leveragedType;
-  if (leveragedType !== '') {
-    payload.leveragedAsset = leveragedAsset;
-    let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
-    if (leveragedType === 'lsd-leverage') {
-      const ethAsset = Object.values(assetsData).find((asset) => ['WETH', 'ETH'].includes(asset.symbol));
-      if (ethAsset) {
-        payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedVault.toLowerCase()].price).div(ethAsset.price).toString();
-        assetPrice = new Dec(assetPrice).div(ethAsset.price).toString();
-      }
-    }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
-  }
-  return payload;
-};
-
-export const getEulerV2BorrowRate = (interestRate: string) => {
-  const _interestRate = new Dec(interestRate).div(1e27).toString();
-  const secondsPerYear = 31556953;
-  const a = new Dec(1).plus(_interestRate).pow(secondsPerYear - 1).toString();
-  return new Dec(new Dec(a).minus(1)).mul(100).toString();
-};
-
-export const getUtilizationRate = (totalBorrows: string, totalAssets: string) => new Dec(totalBorrows).div(totalAssets).toString();
-
-export const getEulerV2SupplyRate = (borrowRate: string, utilizationRate: string, _interestFee: string) => {
-  const interestFee = new Dec(_interestFee).div(10000);
-  const fee = new Dec(1).minus(interestFee);
-  return new Dec(borrowRate).mul(utilizationRate).mul(fee).toString();
-};
-
-const getLiquidityChanges = (action: string, amount: string, isBorrowOperation: boolean) => {
-  let liquidityAdded;
-  let liquidityRemoved;
-  if (isBorrowOperation) {
-    liquidityAdded = action === 'payback' ? amount : '0';
-    liquidityRemoved = action === 'borrow' ? amount : '0';
-  } else {
-    liquidityAdded = action === 'collateral' ? amount : '0';
-    liquidityRemoved = action === 'withdraw' ? amount : '0';
-  }
-  return { liquidityAdded, liquidityRemoved };
-};
-
-export const getApyAfterValuesEstimationEulerV2 = async (actions: { action: string, amount: string, asset: string, vaultAddress: EthAddress }[], web3: Web3, network: NetworkNumber) => {
-  const eulerV2ViewContract = EulerV2ViewContract(web3, network);
-  const multicallData: any[] = [];
-  const apyAfterValuesEstimationParams: any[] = [];
-  actions.forEach(({
-    action, amount, asset, vaultAddress,
-  }) => {
-    const amountInWei = assetAmountInWei(amount, asset);
-    const isBorrowOperation = borrowOperations.includes(action);
-    const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amountInWei, isBorrowOperation);
-    apyAfterValuesEstimationParams.push([
-      vaultAddress,
-      borrowOperations.includes(action),
-      liquidityAdded,
-      liquidityRemoved,
-    ]);
-    multicallData.push({
-      target: eulerV2ViewContract.options.address,
-      abiItem: eulerV2ViewContract.options.jsonInterface.find(({ name }) => name === 'getVaultInfoFull'),
-      params: [vaultAddress],
-      // @DEV gas usage is HUGE if vault has a lot of collaterals, so be careful, this can break if they add more collaterals
-      gasLimit: 10_000_000,
-    });
-  });
-  multicallData.push({
-    target: eulerV2ViewContract.options.address,
-    abiItem: eulerV2ViewContract.options.jsonInterface.find(({ name }) => name === 'getApyAfterValuesEstimation'),
-    params: [apyAfterValuesEstimationParams],
-  });
-  const multicallRes = await multicall(multicallData, web3, network);
-  const numOfActions = actions.length;
-  const data: any = {};
-  for (let i = 0; i < numOfActions; i += 1) {
-    const _interestRate = multicallRes[numOfActions].estimatedBorrowRates[i];
-    const vaultInfo = multicallRes[i][0];
-    const decimals = vaultInfo.decimals;
-    const borrowRate = getEulerV2BorrowRate(_interestRate);
-
-    const amount = new Dec(actions[i].amount).mul(10 ** decimals).toString();
-    const action = actions[i].action;
-    const isBorrowOperation = borrowOperations.includes(action);
-    const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amount, isBorrowOperation);
-
-    const totalBorrows = new Dec(vaultInfo.totalBorrows).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
-    const totalAssets = new Dec(vaultInfo.totalAssets).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
-    const utilizationRate = getUtilizationRate(totalBorrows, totalAssets);
-    data[vaultInfo.vaultAddr.toLowerCase()] = {
-      borrowRate,
-      supplyRate: getEulerV2SupplyRate(borrowRate, utilizationRate, vaultInfo.interestFee),
-    };
-  }
-  return data;
+import Dec from 'decimal.js';
+import Web3 from 'web3';
+import { assetAmountInWei } from '@defisaver/tokens';
+import {
+  EthAddress, NetworkNumber,
+} from '../../types/common';
+import {
+  calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS,
+} from '../../moneymarket';
+import { calculateInterestEarned } from '../../staking';
+import {
+  EulerV2AggregatedPositionData,
+  EulerV2AssetsData,
+  EulerV2Market,
+  EulerV2UsedAssets,
+} from '../../types';
+import { EulerV2ViewContract } from '../../contracts';
+import { borrowOperations } from '../../constants';
+import { multicall } from '../../multicall';
+
+export const isLeveragedPos = (usedAssets: EulerV2UsedAssets, dustLimit = 5) => {
+  let borrowUnstable = 0;
+  let supplyStable = 0;
+  let borrowStable = 0;
+  let supplyUnstable = 0;
+  let longAsset = '';
+  let shortAsset = '';
+  let leverageAssetVault = '';
+  Object.values(usedAssets).forEach(({
+    symbol, suppliedUsd, borrowedUsd, collateral, vaultAddress,
+  }) => {
+    const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
+    const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
+    if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) supplyStable += 1;
+    if (isBorrowed && STABLE_ASSETS.includes(symbol)) borrowStable += 1;
+    if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
+      borrowUnstable += 1;
+      shortAsset = symbol;
+      leverageAssetVault = vaultAddress;
+    }
+    if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
+      supplyUnstable += 1;
+      longAsset = symbol;
+      leverageAssetVault = vaultAddress;
+    }
+  });
+  const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
+  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
+  // lsd -> liquid staking derivative
+  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH'].includes(longAsset);
+  if (isLong) {
+    return {
+      leveragedType: 'long',
+      leveragedAsset: longAsset,
+      leveragedVault: leverageAssetVault,
+    };
+  }
+  if (isShort) {
+    return {
+      leveragedType: 'short',
+      leveragedAsset: shortAsset,
+      leveragedVault: leverageAssetVault,
+    };
+  }
+  if (isLsdLeveraged) {
+    return {
+      leveragedType: 'lsd-leverage',
+      leveragedAsset: longAsset,
+      leveragedVault: leverageAssetVault,
+    };
+  }
+  return {
+    leveragedType: '',
+    leveragedAsset: '',
+    leveragedVault: '',
+  };
+};
+
+export const calculateNetApy = (usedAssets: EulerV2UsedAssets, assetsData: EulerV2AssetsData) => {
+  const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
+    const acc = { ..._acc };
+    const assetData = assetsData[usedAsset.vaultAddress.toLowerCase()];
+
+    if (usedAsset.isSupplied) {
+      const amount = usedAsset.suppliedUsd;
+      acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
+      const rate = assetData.supplyRate;
+      const supplyInterest = calculateInterestEarned(amount, rate as string, 'year', true);
+      acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
+    }
+
+    if (usedAsset.isBorrowed) {
+      const amount = usedAsset.borrowedUsd;
+      acc.borrowedUsd = new Dec(acc.borrowedUsd).add(amount).toString();
+      const rate = assetData.borrowRate;
+      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 getEulerV2AggregatedData = ({
+  usedAssets, assetsData, network, ...rest
+}: { usedAssets: EulerV2UsedAssets, assetsData: EulerV2AssetsData, network: NetworkNumber }) => {
+  const payload = {} as EulerV2AggregatedPositionData;
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+  payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ vaultAddress, suppliedUsd }: { vaultAddress: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[vaultAddress.toLowerCase()].collateralFactor));
+  payload.liquidationLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral, ({ vaultAddress, suppliedUsd }: { vaultAddress: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(assetsData[vaultAddress.toLowerCase()].liquidationRatio));
+  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+  payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+  payload.minRatio = '100';
+  payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
+  payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  const { leveragedType, leveragedAsset, leveragedVault } = isLeveragedPos(usedAssets);
+  payload.leveragedType = leveragedType;
+  if (leveragedType !== '') {
+    payload.leveragedAsset = leveragedAsset;
+    let assetPrice = assetsData[leveragedVault.toLowerCase()].price;
+    if (leveragedType === 'lsd-leverage') {
+      const ethAsset = Object.values(assetsData).find((asset) => ['WETH', 'ETH'].includes(asset.symbol));
+      if (ethAsset) {
+        payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedVault.toLowerCase()].price).div(ethAsset.price).toString();
+        assetPrice = new Dec(assetPrice).div(ethAsset.price).toString();
+      }
+    }
+    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+  }
+  return payload;
+};
+
+export const getEulerV2BorrowRate = (interestRate: string) => {
+  const _interestRate = new Dec(interestRate).div(1e27).toString();
+  const secondsPerYear = 31556953;
+  const a = new Dec(1).plus(_interestRate).pow(secondsPerYear - 1).toString();
+  return new Dec(new Dec(a).minus(1)).mul(100).toString();
+};
+
+export const getUtilizationRate = (totalBorrows: string, totalAssets: string) => new Dec(totalBorrows).div(totalAssets).toString();
+
+export const getEulerV2SupplyRate = (borrowRate: string, utilizationRate: string, _interestFee: string) => {
+  const interestFee = new Dec(_interestFee).div(10000);
+  const fee = new Dec(1).minus(interestFee);
+  return new Dec(borrowRate).mul(utilizationRate).mul(fee).toString();
+};
+
+const getLiquidityChanges = (action: string, amount: string, isBorrowOperation: boolean) => {
+  let liquidityAdded;
+  let liquidityRemoved;
+  if (isBorrowOperation) {
+    liquidityAdded = action === 'payback' ? amount : '0';
+    liquidityRemoved = action === 'borrow' ? amount : '0';
+  } else {
+    liquidityAdded = action === 'collateral' ? amount : '0';
+    liquidityRemoved = action === 'withdraw' ? amount : '0';
+  }
+  return { liquidityAdded, liquidityRemoved };
+};
+
+export const getApyAfterValuesEstimationEulerV2 = async (actions: { action: string, amount: string, asset: string, vaultAddress: EthAddress }[], web3: Web3, network: NetworkNumber) => {
+  const eulerV2ViewContract = EulerV2ViewContract(web3, network);
+  const multicallData: any[] = [];
+  const apyAfterValuesEstimationParams: any[] = [];
+  actions.forEach(({
+    action, amount, asset, vaultAddress,
+  }) => {
+    const amountInWei = assetAmountInWei(amount, asset);
+    const isBorrowOperation = borrowOperations.includes(action);
+    const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amountInWei, isBorrowOperation);
+    apyAfterValuesEstimationParams.push([
+      vaultAddress,
+      borrowOperations.includes(action),
+      liquidityAdded,
+      liquidityRemoved,
+    ]);
+    multicallData.push({
+      target: eulerV2ViewContract.options.address,
+      abiItem: eulerV2ViewContract.options.jsonInterface.find(({ name }) => name === 'getVaultInfoFull'),
+      params: [vaultAddress],
+      // @DEV gas usage is HUGE if vault has a lot of collaterals, so be careful, this can break if they add more collaterals
+      gasLimit: 10_000_000,
+    });
+  });
+  multicallData.push({
+    target: eulerV2ViewContract.options.address,
+    abiItem: eulerV2ViewContract.options.jsonInterface.find(({ name }) => name === 'getApyAfterValuesEstimation'),
+    params: [apyAfterValuesEstimationParams],
+  });
+  const multicallRes = await multicall(multicallData, web3, network);
+  const numOfActions = actions.length;
+  const data: any = {};
+  for (let i = 0; i < numOfActions; i += 1) {
+    const _interestRate = multicallRes[numOfActions].estimatedBorrowRates[i];
+    const vaultInfo = multicallRes[i][0];
+    const decimals = vaultInfo.decimals;
+    const borrowRate = getEulerV2BorrowRate(_interestRate);
+
+    const amount = new Dec(actions[i].amount).mul(10 ** decimals).toString();
+    const action = actions[i].action;
+    const isBorrowOperation = borrowOperations.includes(action);
+    const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amount, isBorrowOperation);
+
+    const totalBorrows = new Dec(vaultInfo.totalBorrows).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
+    const totalAssets = new Dec(vaultInfo.totalAssets).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
+    const utilizationRate = getUtilizationRate(totalBorrows, totalAssets);
+    data[vaultInfo.vaultAddr.toLowerCase()] = {
+      borrowRate,
+      supplyRate: getEulerV2SupplyRate(borrowRate, utilizationRate, vaultInfo.interestFee),
+    };
+  }
+  return data;
 };

package/src/helpers/index.ts

@@ -1,9 +1,9 @@
-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 chickenBondsHelpers from './chickenBondsHelpers';
-export * as morphoBlueHelpers from './morphoBlueHelpers';
-export * as llamaLendHelpers from './llamaLendHelpers';
+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 chickenBondsHelpers from './chickenBondsHelpers';
+export * as morphoBlueHelpers from './morphoBlueHelpers';
+export * as llamaLendHelpers from './llamaLendHelpers';
 export * as eulerV2Helpers from './eulerHelpers';

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;
+};