@defisaver/positions-sdk 0.0.166-dev2-liquity-v2 → 0.0.166-dev3

package/src/helpers/morphoBlueHelpers/index.ts

@@ -1,116 +1,116 @@
-import Dec from 'decimal.js';
-import { assetAmountInWei } from '@defisaver/tokens';
-import Web3 from 'web3';
-import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
-import { calculateNetApy } from '../../staking';
-import { MMUsedAssets, NetworkNumber } from '../../types/common';
-import {
-  MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo,
-} from '../../types';
-import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
-import { MorphoBlueViewContract } from '../../contracts';
-import { MarketParamsStruct } from '../../types/contracts/generated/MorphoBlueView';
-
-export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, marketInfo: MorphoBlueMarketInfo }): MorphoBlueAggregatedPositionData => {
-  const payload = {} as MorphoBlueAggregatedPositionData;
-  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
-  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
-
-  const {
-    lltv, oracle, collateralToken, loanToken,
-  } = marketInfo;
-
-  payload.borrowLimitUsd = getAssetsTotal(
-    usedAssets,
-    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => {
-      const suppliedUsdAmount = suppliedUsd;
-
-      return new Dec(suppliedUsdAmount).mul(lltv);
-    },
-  );
-  payload.liquidationLimitUsd = payload.borrowLimitUsd;
-  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
-  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
-
-  payload.leftToBorrow = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).mul(lltv).sub(usedAssets[loanToken]?.borrowed || 0)
-    .toString();
-
-  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData as any);
-  payload.netApy = netApy;
-  payload.incentiveUsd = incentiveUsd;
-  payload.totalInterestUsd = totalInterestUsd;
-
-  payload.ltv = new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
-  payload.ltv = new Dec(usedAssets[loanToken]?.borrowed || 0).div(oracle).div(usedAssets[collateralToken]?.supplied || 1).toString(); // default to 1 because can't div 0
-  payload.ratio = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).div(usedAssets[loanToken]?.borrowed || 1).mul(100)
-    .toString();
-
-  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
-  payload.leveragedType = leveragedType;
-  if (leveragedType !== '') {
-    payload.leveragedAsset = leveragedAsset;
-    let assetPrice = assetsData[leveragedAsset].price;
-    if (leveragedType === 'lsd-leverage') {
-      // Treat ETH like a stablecoin in a long stETH position
-      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
-    }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
-  }
-
-  return payload;
-};
-
-const compound = (ratePerSeconds: string) => {
-  const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
-  const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
-  return new Dec(apyNumber).mul(WAD).floor().toString();
-};
-
-export const getSupplyRate = (totalSupplyAssets: string, totalBorrowAssets: string, borrowRate: string, fee: string) => {
-  if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
-    return '0';
-  }
-  const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
-    .toString();
-  const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
-    .toString();
-  const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
-    .toString();
-  return new Dec(compound(ratePerSecond)).div(1e18).mul(100).toString();
-};
-
-export const getBorrowRate = (borrowRate: string, totalBorrowShares: string) => {
-  if (totalBorrowShares === '0') {
-    return '0';
-  }
-  return new Dec(compound(borrowRate)).div(1e18).mul(100).toString();
-};
-
-export const getApyAfterValuesEstimation = async (selectedMarket: MorphoBlueMarketData, action: string, amount: string, asset: string, web3: Web3, network: NetworkNumber) => {
-  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
-  const lltvInWei = assetAmountInWei(selectedMarket.lltv, 'ETH');
-  const marketData: MarketParamsStruct = [selectedMarket.loanToken, selectedMarket.collateralToken, selectedMarket.oracle, selectedMarket.irm, lltvInWei];
-  const isBorrowOperation = borrowOperations.includes(action);
-  const amountInWei = assetAmountInWei(amount, asset);
-  let liquidityAdded;
-  let liquidityRemoved;
-  if (isBorrowOperation) {
-    liquidityAdded = action === 'payback' ? amountInWei : '0';
-    liquidityRemoved = action === 'borrow' ? amountInWei : '0';
-  } else {
-    liquidityAdded = action === 'collateral' ? amountInWei : '0';
-    liquidityRemoved = action === 'withdraw' ? amountInWei : '0';
-  }
-  const data = await morphoBlueViewContract.methods.getApyAfterValuesEstimation([
-    marketData,
-    isBorrowOperation,
-    liquidityAdded,
-    liquidityRemoved,
-  ]).call();
-  const borrowRate = getBorrowRate(data.borrowRate, data.market.totalBorrowShares);
-  const supplyRate = getSupplyRate(data.market.totalSupplyAssets, data.market.totalBorrowAssets, data.borrowRate, data.market.fee);
-  return { borrowRate, supplyRate };
+import Dec from 'decimal.js';
+import { assetAmountInWei } from '@defisaver/tokens';
+import Web3 from 'web3';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { calculateNetApy } from '../../staking';
+import { MMUsedAssets, NetworkNumber } from '../../types/common';
+import {
+  MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo,
+} from '../../types';
+import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
+import { MorphoBlueViewContract } from '../../contracts';
+import { MarketParamsStruct } from '../../types/contracts/generated/MorphoBlueView';
+
+export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, marketInfo: MorphoBlueMarketInfo }): MorphoBlueAggregatedPositionData => {
+  const payload = {} as MorphoBlueAggregatedPositionData;
+  payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
+  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
+
+  const {
+    lltv, oracle, collateralToken, loanToken,
+  } = marketInfo;
+
+  payload.borrowLimitUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => {
+      const suppliedUsdAmount = suppliedUsd;
+
+      return new Dec(suppliedUsdAmount).mul(lltv);
+    },
+  );
+  payload.liquidationLimitUsd = payload.borrowLimitUsd;
+  const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+  payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+
+  payload.leftToBorrow = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).mul(lltv).sub(usedAssets[loanToken]?.borrowed || 0)
+    .toString();
+
+  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData as any);
+  payload.netApy = netApy;
+  payload.incentiveUsd = incentiveUsd;
+  payload.totalInterestUsd = totalInterestUsd;
+
+  payload.ltv = new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
+  payload.ltv = new Dec(usedAssets[loanToken]?.borrowed || 0).div(oracle).div(usedAssets[collateralToken]?.supplied || 1).toString(); // default to 1 because can't div 0
+  payload.ratio = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).div(usedAssets[loanToken]?.borrowed || 1).mul(100)
+    .toString();
+
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+  payload.leveragedType = leveragedType;
+  if (leveragedType !== '') {
+    payload.leveragedAsset = leveragedAsset;
+    let assetPrice = assetsData[leveragedAsset].price;
+    if (leveragedType === 'lsd-leverage') {
+      // Treat ETH like a stablecoin in a long stETH position
+      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+    }
+    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+  }
+
+  return payload;
+};
+
+const compound = (ratePerSeconds: string) => {
+  const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
+  const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
+  return new Dec(apyNumber).mul(WAD).floor().toString();
+};
+
+export const getSupplyRate = (totalSupplyAssets: string, totalBorrowAssets: string, borrowRate: string, fee: string) => {
+  if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
+    return '0';
+  }
+  const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
+    .toString();
+  const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
+    .toString();
+  const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
+    .toString();
+  return new Dec(compound(ratePerSecond)).div(1e18).mul(100).toString();
+};
+
+export const getBorrowRate = (borrowRate: string, totalBorrowShares: string) => {
+  if (totalBorrowShares === '0') {
+    return '0';
+  }
+  return new Dec(compound(borrowRate)).div(1e18).mul(100).toString();
+};
+
+export const getApyAfterValuesEstimation = async (selectedMarket: MorphoBlueMarketData, action: string, amount: string, asset: string, web3: Web3, network: NetworkNumber) => {
+  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
+  const lltvInWei = assetAmountInWei(selectedMarket.lltv, 'ETH');
+  const marketData: MarketParamsStruct = [selectedMarket.loanToken, selectedMarket.collateralToken, selectedMarket.oracle, selectedMarket.irm, lltvInWei];
+  const isBorrowOperation = borrowOperations.includes(action);
+  const amountInWei = assetAmountInWei(amount, asset);
+  let liquidityAdded;
+  let liquidityRemoved;
+  if (isBorrowOperation) {
+    liquidityAdded = action === 'payback' ? amountInWei : '0';
+    liquidityRemoved = action === 'borrow' ? amountInWei : '0';
+  } else {
+    liquidityAdded = action === 'collateral' ? amountInWei : '0';
+    liquidityRemoved = action === 'withdraw' ? amountInWei : '0';
+  }
+  const data = await morphoBlueViewContract.methods.getApyAfterValuesEstimation([
+    marketData,
+    isBorrowOperation,
+    liquidityAdded,
+    liquidityRemoved,
+  ]).call();
+  const borrowRate = getBorrowRate(data.borrowRate, data.market.totalBorrowShares);
+  const supplyRate = getSupplyRate(data.market.totalSupplyAssets, data.market.totalBorrowAssets, data.borrowRate, data.market.fee);
+  return { borrowRate, supplyRate };
 };

package/src/helpers/sparkHelpers/index.ts

@@ -1,151 +1,151 @@
-import Dec from 'decimal.js';
-import Web3 from 'web3';
-import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import {
-  aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos,
-} from '../../moneymarket';
-import {
-  SparkAggregatedPositionData,
-  SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAssets,
-} from '../../types';
-import { calculateNetApy } from '../../staking';
-import { ethToWeth, wethToEth } from '../../services/utils';
-import { SparkViewContract } from '../../contracts';
-import { NetworkNumber } from '../../types/common';
-import { borrowOperations } from '../../constants';
-
-export const sparkIsInIsolationMode = ({ usedAssets, assetsData }: { usedAssets: SparkUsedAssets, assetsData: SparkAssetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
-
-export const sparkGetCollSuppliedAssets = ({ usedAssets }: { usedAssets: SparkUsedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
-
-export const sparkGetSuppliableAssets = ({
-  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest
-}: SparkHelperCommon) => {
-  const data = {
-    usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
-  };
-
-  const collAccountAssets = sparkGetCollSuppliedAssets(data);
-  const marketAssets = Object.values(assetsData);
-
-  if (sparkIsInIsolationMode(data)) {
-    const collAsset = collAccountAssets[0].symbol;
-    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset }));
-  }
-
-  return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
-};
-
-export const sparkGetSuppliableAsCollAssets = ({
-  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest
-}: SparkHelperCommon) => sparkGetSuppliableAssets({
-  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
-}).filter(({ canBeCollateral }) => canBeCollateral);
-
-export const sparkGetEmodeMutableProps = ({
-  eModeCategory,
-  assetsData,
-}: SparkHelperCommon,
-_asset: string) => {
-  const asset = wethToEth(_asset);
-
-  const assetData = assetsData[asset];
-  if (
-    eModeCategory === 0
-    || assetData.eModeCategory !== eModeCategory
-    || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
-  ) {
-    const { liquidationRatio, collateralFactor } = assetData;
-    return ({ liquidationRatio, collateralFactor });
-  }
-  const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
-  return ({ liquidationRatio, collateralFactor });
-};
-
-export const sparkGetAggregatedPositionData = ({
-  usedAssets,
-  eModeCategory,
-  eModeCategories,
-  assetsData,
-  selectedMarket,
-  network,
-  ...rest
-}: SparkHelperCommon): SparkAggregatedPositionData => {
-  const data = {
-    usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
-  };
-  const payload = {} as SparkAggregatedPositionData;
-  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,
-    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(sparkGetEmodeMutableProps(data, symbol).collateralFactor),
-  );
-  payload.liquidationLimitUsd = getAssetsTotal(
-    usedAssets,
-    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(sparkGetEmodeMutableProps(data, symbol).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.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
-  payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
-  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
-  payload.leveragedType = leveragedType;
-  if (leveragedType !== '') {
-    payload.leveragedAsset = leveragedAsset;
-    let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
-    if (leveragedType === 'lsd-leverage') {
-      // Treat ETH like a stablecoin in a long stETH position
-      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
-      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
-    }
-    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
-  }
-  return payload;
-};
-
-export const getApyAfterValuesEstimation = async (selectedMarket: SparkMarketData, actions: [{ action: string, amount: string, asset: string }], web3: Web3) => {
-  const sparkViewContract = SparkViewContract(web3, NetworkNumber.Eth);
-  const params = actions.map(({ action, asset, amount }: { action: string, amount: string, asset: string }) => {
-    const isDebtAsset = borrowOperations.includes(action);
-    const amountInWei = assetAmountInWei(amount, asset);
-    const assetInfo = getAssetInfo(ethToWeth(asset));
-    let liquidityAdded;
-    let liquidityTaken;
-    if (isDebtAsset) {
-      liquidityAdded = action === 'payback' ? amountInWei : '0';
-      liquidityTaken = action === 'borrow' ? amountInWei : '0';
-    } else {
-      liquidityAdded = action === 'collateral' ? amountInWei : '0';
-      liquidityTaken = action === 'withdraw' ? amountInWei : '0';
-    }
-    return {
-      reserveAddress: assetInfo.address,
-      liquidityAdded,
-      liquidityTaken,
-      isDebtAsset,
-    };
-  });
-  const data = await sparkViewContract.methods.getApyAfterValuesEstimation(
-    selectedMarket.providerAddress,
-    params,
-  ).call();
-  const rates: { [key: string]: { supplyRate: string, borrowRate: string } } = {};
-  data.forEach((d) => {
-    const asset = wethToEth(getAssetInfoByAddress(d.reserveAddress).symbol);
-    rates[asset] = {
-      supplyRate: aprToApy(new Dec(d.supplyRate.toString()).div(1e25).toString()),
-      borrowRate: aprToApy(new Dec(d.variableBorrowRate.toString()).div(1e25).toString()),
-    };
-  });
-  return rates;
+import Dec from 'decimal.js';
+import Web3 from 'web3';
+import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import {
+  aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos,
+} from '../../moneymarket';
+import {
+  SparkAggregatedPositionData,
+  SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAssets,
+} from '../../types';
+import { calculateNetApy } from '../../staking';
+import { ethToWeth, wethToEth } from '../../services/utils';
+import { SparkViewContract } from '../../contracts';
+import { NetworkNumber } from '../../types/common';
+import { borrowOperations } from '../../constants';
+
+export const sparkIsInIsolationMode = ({ usedAssets, assetsData }: { usedAssets: SparkUsedAssets, assetsData: SparkAssetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
+
+export const sparkGetCollSuppliedAssets = ({ usedAssets }: { usedAssets: SparkUsedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
+
+export const sparkGetSuppliableAssets = ({
+  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest
+}: SparkHelperCommon) => {
+  const data = {
+    usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
+  };
+
+  const collAccountAssets = sparkGetCollSuppliedAssets(data);
+  const marketAssets = Object.values(assetsData);
+
+  if (sparkIsInIsolationMode(data)) {
+    const collAsset = collAccountAssets[0].symbol;
+    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset }));
+  }
+
+  return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
+};
+
+export const sparkGetSuppliableAsCollAssets = ({
+  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest
+}: SparkHelperCommon) => sparkGetSuppliableAssets({
+  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
+}).filter(({ canBeCollateral }) => canBeCollateral);
+
+export const sparkGetEmodeMutableProps = ({
+  eModeCategory,
+  assetsData,
+}: SparkHelperCommon,
+_asset: string) => {
+  const asset = wethToEth(_asset);
+
+  const assetData = assetsData[asset];
+  if (
+    eModeCategory === 0
+    || assetData.eModeCategory !== eModeCategory
+    || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
+  ) {
+    const { liquidationRatio, collateralFactor } = assetData;
+    return ({ liquidationRatio, collateralFactor });
+  }
+  const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+  return ({ liquidationRatio, collateralFactor });
+};
+
+export const sparkGetAggregatedPositionData = ({
+  usedAssets,
+  eModeCategory,
+  eModeCategories,
+  assetsData,
+  selectedMarket,
+  network,
+  ...rest
+}: SparkHelperCommon): SparkAggregatedPositionData => {
+  const data = {
+    usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
+  };
+  const payload = {} as SparkAggregatedPositionData;
+  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,
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(sparkGetEmodeMutableProps(data, symbol).collateralFactor),
+  );
+  payload.liquidationLimitUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral,
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => new Dec(suppliedUsd).mul(sparkGetEmodeMutableProps(data, symbol).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.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
+  payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+  const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+  payload.leveragedType = leveragedType;
+  if (leveragedType !== '') {
+    payload.leveragedAsset = leveragedAsset;
+    let assetPrice = data.assetsData[leveragedAsset].price; // TODO sparkPrice or price??
+    if (leveragedType === 'lsd-leverage') {
+      // Treat ETH like a stablecoin in a long stETH position
+      payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+      assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+    }
+    payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+  }
+  return payload;
+};
+
+export const getApyAfterValuesEstimation = async (selectedMarket: SparkMarketData, actions: [{ action: string, amount: string, asset: string }], web3: Web3) => {
+  const sparkViewContract = SparkViewContract(web3, NetworkNumber.Eth);
+  const params = actions.map(({ action, asset, amount }: { action: string, amount: string, asset: string }) => {
+    const isDebtAsset = borrowOperations.includes(action);
+    const amountInWei = assetAmountInWei(amount, asset);
+    const assetInfo = getAssetInfo(ethToWeth(asset));
+    let liquidityAdded;
+    let liquidityTaken;
+    if (isDebtAsset) {
+      liquidityAdded = action === 'payback' ? amountInWei : '0';
+      liquidityTaken = action === 'borrow' ? amountInWei : '0';
+    } else {
+      liquidityAdded = action === 'collateral' ? amountInWei : '0';
+      liquidityTaken = action === 'withdraw' ? amountInWei : '0';
+    }
+    return {
+      reserveAddress: assetInfo.address,
+      liquidityAdded,
+      liquidityTaken,
+      isDebtAsset,
+    };
+  });
+  const data = await sparkViewContract.methods.getApyAfterValuesEstimation(
+    selectedMarket.providerAddress,
+    params,
+  ).call();
+  const rates: { [key: string]: { supplyRate: string, borrowRate: string } } = {};
+  data.forEach((d) => {
+    const asset = wethToEth(getAssetInfoByAddress(d.reserveAddress).symbol);
+    rates[asset] = {
+      supplyRate: aprToApy(new Dec(d.supplyRate.toString()).div(1e25).toString()),
+      borrowRate: aprToApy(new Dec(d.variableBorrowRate.toString()).div(1e25).toString()),
+    };
+  });
+  return rates;
 };

package/src/index.ts

@@ -1,48 +1,48 @@
-import './setup';
-
-import * as aaveV3 from './aaveV3';
-import * as morphoAaveV3 from './morphoAaveV3';
-import * as aaveV2 from './aaveV2';
-import * as morphoAaveV2 from './morphoAaveV2';
-import * as compoundV3 from './compoundV3';
-import * as compoundV2 from './compoundV2';
-import * as spark from './spark';
-import * as curveUsd from './curveUsd';
-import * as liquity from './liquity';
-import * as liquityV2 from './liquityV2';
-import * as maker from './maker';
-import * as staking from './staking';
-import * as multicall from './multicall';
-import * as moneymarket from './moneymarket';
-import * as assets from './assets';
-import * as markets from './markets';
-import * as helpers from './helpers';
-import * as chickenBonds from './chickenBonds';
-import * as exchange from './exchange';
-import * as morphoBlue from './morphoBlue';
-import * as llamaLend from './llamaLend';
-
-export * from './types';
-
-export {
-  aaveV2,
-  aaveV3,
-  morphoAaveV2,
-  morphoAaveV3,
-  compoundV2,
-  compoundV3,
-  spark,
-  curveUsd,
-  liquity,
-  liquityV2,
-  maker,
-  chickenBonds,
-  exchange,
-  staking,
-  multicall,
-  moneymarket,
-  markets,
-  helpers,
-  morphoBlue,
-  llamaLend,
-};
+import './setup';
+
+import * as aaveV3 from './aaveV3';
+import * as morphoAaveV3 from './morphoAaveV3';
+import * as aaveV2 from './aaveV2';
+import * as morphoAaveV2 from './morphoAaveV2';
+import * as compoundV3 from './compoundV3';
+import * as compoundV2 from './compoundV2';
+import * as spark from './spark';
+import * as curveUsd from './curveUsd';
+import * as liquity from './liquity';
+import * as maker from './maker';
+import * as staking from './staking';
+import * as multicall from './multicall';
+import * as moneymarket from './moneymarket';
+import * as assets from './assets';
+import * as markets from './markets';
+import * as helpers from './helpers';
+import * as chickenBonds from './chickenBonds';
+import * as exchange from './exchange';
+import * as morphoBlue from './morphoBlue';
+import * as llamaLend from './llamaLend';
+import * as eulerV2 from './eulerV2';
+
+export * from './types';
+
+export {
+  aaveV2,
+  aaveV3,
+  morphoAaveV2,
+  morphoAaveV3,
+  compoundV2,
+  compoundV3,
+  spark,
+  curveUsd,
+  liquity,
+  maker,
+  chickenBonds,
+  exchange,
+  staking,
+  multicall,
+  moneymarket,
+  markets,
+  helpers,
+  morphoBlue,
+  llamaLend,
+  eulerV2,
+};