@defisaver/positions-sdk 2.1.78-aave-v4-dev → 2.1.79

package/src/aaveV4/index.ts

@@ -1,291 +0,0 @@
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { getViemProvider } from '../services/viem';
-import {
-  AaveV4AccountData,
-  AaveV4HubAssetOnChainData,
-  AaveV4HubOnChainData,
-  AaveV4ReserveAssetData,
-  AaveV4ReserveAssetOnChain,
-  AaveV4SpokeData,
-  AaveV4SpokeInfo,
-  AaveV4UsedReserveAssets,
-  AaveV4AssetsData,
-  EthAddress,
-  EthereumProvider,
-  IncentiveData,
-  IncentiveKind,
-  NetworkNumber,
-} from '../types';
-import { AaveV4ViewContractViem } from '../contracts';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
-import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
-import { getAaveV4HubByAddress } from '../markets/aaveV4';
-import { aprToApy } from '../moneymarket';
-
-export * as lend from './lend';
-
-const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
-  const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
-  return {
-    assets: hubData.reduce((acc: Record<number, AaveV4HubAssetOnChainData>, assetOnChainData) => {
-      acc[assetOnChainData.assetId] = {
-        assetId: assetOnChainData.assetId,
-        drawnRate: assetOnChainData.drawnRate,
-        liquidity: assetOnChainData.liquidity,
-        liquidityFee: assetOnChainData.liquidityFee,
-        swept: assetOnChainData.swept,
-        totalDrawn: assetOnChainData.totalDrawn,
-        totalDrawnShares: assetOnChainData.totalDrawnShares,
-        totalPremiumShares: assetOnChainData.totalPremiumShares,
-      };
-      return acc;
-    }, {}),
-  };
-};
-
-// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
-const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData): number => {
-  type CollateralInfo = { riskBps: number; valueUsd: Dec };
-  type DebtInfo = { valueUsd: Dec };
-
-  const collaterals: CollateralInfo[] = [];
-  const debts: DebtInfo[] = [];
-
-  Object.entries(usedAssets).forEach(([identifier, asset]) => {
-    const reserveData = assetsData[identifier];
-    if (!reserveData) return;
-
-    const borrowedUsdDec = new Dec(asset.borrowedUsd || '0');
-    if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
-      debts.push({ valueUsd: borrowedUsdDec });
-    }
-
-    const suppliedUsdDec = new Dec(asset.suppliedUsd || '0');
-    const isActiveCollateral = asset.collateral
-      && asset.isSupplied
-      && asset.collateralFactor > 0
-      && suppliedUsdDec.gt(0);
-
-    if (isActiveCollateral) {
-      // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
-      const riskBps = new Dec(reserveData.collateralRisk).mul(10000).toNumber();
-      collaterals.push({
-        riskBps,
-        valueUsd: suppliedUsdDec,
-      });
-    }
-  });
-
-  const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new Dec(0));
-
-  if (totalDebtUsd.lte(0)) {
-    return 0;
-  }
-
-  // sort by risk ASC, value DESC
-  collaterals.sort((a, b) => {
-    if (a.riskBps !== b.riskBps) return a.riskBps - b.riskBps;
-    return b.valueUsd.comparedTo(a.valueUsd);
-  });
-
-  let debtLeftToCover = totalDebtUsd;
-  let numerator = new Dec(0); // sum(coveredUsd * riskBps)
-  let coveredDebt = new Dec(0); // sum(coveredUsd)
-
-  collaterals.forEach(({ riskBps, valueUsd }) => {
-    if (debtLeftToCover.lte(0)) return;
-
-    const coveredUsd = Dec.min(valueUsd, debtLeftToCover);
-
-    numerator = numerator.add(coveredUsd.mul(riskBps));
-    coveredDebt = coveredDebt.add(coveredUsd);
-
-    debtLeftToCover = debtLeftToCover.sub(coveredUsd);
-  });
-
-  if (coveredDebt.lte(0)) {
-    return 0;
-  }
-
-  const riskPremiumBps = numerator.div(coveredDebt);
-  return riskPremiumBps.toNumber();
-};
-
-const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, reserveId: number, oracleDecimals: number, network: NetworkNumber): Promise<AaveV4ReserveAssetData> => {
-  const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
-  const symbol = wethToEth(assetInfo.symbol);
-  const hubInfo = getAaveV4HubByAddress(network, reserveAsset.hub);
-  if (!hubInfo) {
-    throw new Error(`Hub not found with address: ${reserveAsset.hub}`);
-  }
-
-  const isStakingAsset = STAKING_ASSETS.includes(symbol);
-  const supplyIncentives: IncentiveData[] = [];
-  const borrowIncentives: IncentiveData[] = [];
-
-  if (isStakingAsset) {
-    const yieldApy = await getStakingApy(symbol, network as NetworkNumber);
-    supplyIncentives.push({
-      apy: yieldApy,
-      token: symbol,
-      incentiveKind: IncentiveKind.Staking,
-      description: `Native ${symbol} yield.`,
-    });
-    if (reserveAsset.borrowable) {
-      // When borrowing assets whose value increases over time
-      borrowIncentives.push({
-        apy: new Dec(yieldApy).mul(-1).toString(),
-        token: symbol,
-        incentiveKind: IncentiveKind.Reward,
-        description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
-      });
-    }
-  }
-
-  const totalSuppliedRaw = reserveAsset.totalSupplied ?? 0;
-  const totalDrawnRaw = reserveAsset.totalDrawn ?? 0;
-  const totalPremiumRaw = reserveAsset.totalPremium ?? 0;
-  const totalDebtRaw = reserveAsset.totalDebt ?? 0;
-  const supplyCapRaw = reserveAsset.supplyCap ?? 0;
-  const borrowCapRaw = reserveAsset.borrowCap ?? 0;
-  const totalSuppliedDec = new Dec(totalSuppliedRaw.toString());
-  const totalDrawnDec = new Dec(totalDrawnRaw.toString());
-  const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
-
-  /** @DEV Hub related calculations */
-  const drawnRate = new Dec(hubAsset.drawnRate.toString()).div(new Dec(10).pow(27));
-  const borrowApr = drawnRate.mul(100);
-  const totalDrawn = new Dec(hubAsset.totalDrawn.toString());
-  const liquidity = new Dec(hubAsset.liquidity.toString());
-  const swept = new Dec(hubAsset.swept.toString());
-  const hubUtilizationDenominator = totalDrawn.add(swept).add(liquidity);
-  const hubUtilization = hubUtilizationDenominator.isZero() ? new Dec(0) : totalDrawn.div(hubUtilizationDenominator);
-  const liquidityFee = new Dec(hubAsset.liquidityFee.toString()).div(new Dec(10).pow(4));
-  const totalDrawnShares = new Dec(hubAsset.totalDrawnShares.toString());
-  const totalPremiumShares = new Dec(hubAsset.totalPremiumShares.toString());
-  // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
-  // TODO JKJ@JK when we confirm that this is the right way to calculate it
-  const premiumMultiplier = totalDrawnShares.isZero() ? new Dec(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
-  const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
-
-  return ({
-    symbol,
-    underlying: reserveAsset.underlying,
-    hub: hubInfo.address,
-    hubName: hubInfo?.label,
-    assetId: reserveAsset.assetId,
-    reserveId,
-    paused: reserveAsset.paused,
-    frozen: reserveAsset.frozen,
-    borrowable: reserveAsset.borrowable,
-    collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
-    collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
-    liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
-    price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-    totalSupplied: assetAmountInEth(totalSuppliedRaw.toString(), symbol),
-    totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
-    totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
-    totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
-    supplyCap: assetAmountInEth(supplyCapRaw.toString(), symbol),
-    borrowCap: assetAmountInEth(borrowCapRaw.toString(), symbol),
-    spokeActive: reserveAsset.spokeActive,
-    spokeHalted: reserveAsset.spokeHalted,
-    drawnRate: drawnRate.toString(),
-    borrowRate: aprToApy(borrowApr.toString()),
-    supplyRate: aprToApy(supplyApr.toString()),
-    supplyIncentives,
-    borrowIncentives,
-    canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
-    canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
-    canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-    canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-    utilization,
-  });
-};
-
-export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
-  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
-
-  const hubsData: Record<EthAddress, AaveV4HubOnChainData> = {};
-  const [spokeData] = await Promise.all([
-    viewContract.read.getSpokeDataFull([market.address]),
-    ...market.hubs.map(async (hubAddress) => {
-      hubsData[hubAddress] = await fetchHubData(viewContract, hubAddress);
-    }),
-  ]);
-
-  const reserveAssetsArray = await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain, index: number) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], index, +spokeData[0].oracleDecimals.toString(), network)));
-
-  return {
-    assetsData: reserveAssetsArray.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
-      acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
-      return acc;
-    }, {}),
-    oracle: spokeData[0].oracle,
-    oracleDecimals: +spokeData[0].oracleDecimals.toString(),
-    address: market.address,
-  };
-}
-
-export async function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
-  return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
-}
-
-export async function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4AccountData> {
-  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
-
-  const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
-
-  const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
-  const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
-    const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
-    const reserveData = spokeData.assetsData[identifier];
-    const price = reserveData.price;
-    const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
-    const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
-    const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
-    const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
-    acc[identifier] = {
-      symbol: reserveData.symbol,
-      hubName: reserveData.hubName,
-      assetId: reserveData.assetId,
-      reserveId: +usedReserveAsset.reserveId.toString(),
-      supplied,
-      suppliedUsd: new Dec(supplied).mul(price).toString(),
-      drawn,
-      drawnUsd: new Dec(drawn).mul(price).toString(),
-      premium,
-      premiumUsd: new Dec(premium).mul(price).toString(),
-      borrowed,
-      borrowedUsd: new Dec(borrowed).mul(price).toString(),
-      isSupplied: !new Dec(supplied).eq(0),
-      isBorrowed: usedReserveAsset.isBorrowing,
-      collateral: usedReserveAsset.isUsingAsCollateral,
-      collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
-    };
-    return acc;
-  }, {});
-
-  const aggregated = aaveV4GetAggregatedPositionData({
-    usedAssets,
-    assetsData: spokeData.assetsData,
-    network,
-    useUserCollateralFactor: true,
-  });
-
-  const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, spokeData.assetsData);
-
-  return {
-    ...aggregated,
-    usedAssets,
-    healthFactor,
-    riskPremiumBps,
-  };
-}
-
-export async function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<any> {
-  return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
-}

package/src/aaveV4/lend.ts

@@ -1,180 +0,0 @@
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { AaveV4ViewContractViem } from '../contracts';
-import { getViemProvider } from '../services/viem';
-import { wethToEth } from '../services/utils';
-import {
-  EthAddress,
-  EthereumProvider,
-  NetworkNumber,
-} from '../types/common';
-
-export interface AaveV4TokenizationSpokeData {
-  underlyingAsset: EthAddress;
-  assetId: string;
-  decimals: number;
-  spoke: EthAddress;
-  spokeActive: boolean;
-  spokeHalted: boolean;
-  spokeDepositCap: string;
-  spokeTotalAssets: string;
-  spokeTotalShares: string;
-  hub: EthAddress;
-  hubLiquidity: string;
-  hubDrawnRate: string;
-  convertToShares: string;
-  convertToAssets: string;
-  user: EthAddress;
-  userSuppliedAssets: string;
-  userSuppliedShares: string;
-}
-
-export const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress> = {
-  AAVE_CORE: '0x08309234884cF7E015b07Bf22569017Aa035cdeF',
-  EURC_CORE: '0x73596dED4B2Eb0aC85e477b3c8dB56FC427E6774',
-  GHO_CORE: '0xf7E1f1b43922527e5054bD77E7f863Cf182b194D',
-  GHO_PRIME: '0xeF1cAd5c6a2C9cb83c952b4B96bbD35b3F61F18f',
-  LBTC_CORE: '0x8f4D423590F22833131e3493bf67A27213398f8e',
-  LINK_CORE: '0xBE1197750b423e30137E97d9183065d33E903BE6',
-  PT_USDe_PLUS: '0x8cA27Ab284F2aA2BcF33D9129e11c101aD2d16de',
-  PT_sUSDe_PLUS: '0xb8A464EC56071a98c854f30fE19CfeCc41FA6233',
-  PYUSD_CORE: '0x203FB463087005698d50768FcA837047f738632d',
-  RLUSD_CORE: '0xa9afdd0c54fb153CaE39cE86E49626B5e9d15513',
-  USDC_CORE: '0xa2e476f4cbB06C7bFA8Ad51bCcbF198cd32CfD35',
-  USDC_PLUS: '0x320Bec4fB7a25e64c003A007D0AeF7AB3D6C30d7',
-  USDC_PRIME: '0x0A0507F7A1129892b5cf74b8B4e911442c466b87',
-  USDG_CORE: '0x87c224256f09a014C1BC3e9FbB094C3AdD8fBaCC',
-  USDT_CORE: '0x3f12BD5999b9172550893FF52691c980676f9E73',
-  USDT_PLUS: '0xa4E74a78bED2d3ab8971e8AB26fb39f26DD8eEd9',
-  USDT_PRIME: '0xF565fB55bc96d65561887898bfeb25C1dE7e06d2',
-  USDe_PLUS: '0xA0d346ab2699B689AC67aba5174164A84206BB73',
-  WBTC_CORE: '0x837Ab872A665e0CF467d41cF56a054031b4A38bc',
-  WBTC_PRIME: '0xeae98b8a1798738182B2123DF1eB93d97BD29F34',
-  WETH_CORE: '0x3961a75099E986F59a1a31c6f945061641dFD2b2',
-  WETH_PRIME: '0xa411826a6ef5d289c0FAa7d5B45FE8aAB52257F6',
-  XAUt_CORE: '0x470341bC0e2B833C54D0120642713BdF762A494F',
-  cbBTC_CORE: '0xe8D5E595d5b6b5EFf84B7064765fd0e8DfD214C9',
-  cbBTC_PRIME: '0x0E986545150DcDDe46Ea9df355D0fD2af33bd75D',
-  frxUSD_CORE: '0x00C8A6a42947Cc4E7B6f27963Cab0143ccaaD2B5',
-  frxUSD_PLUS: '0xCAB288d37CAb5a9db7b503F086455276Dcde61F1',
-  rsETH_CORE: '0x6eEce89caE2163584bA7Ff9743861B9633c245E0',
-  sUSDe_PLUS: '0xdf47fc43c88B06edC47753b7d647ff18037D2F3d',
-  weETH_CORE: '0xB67F20bFF413C8E5d633B54BD28899c4c9e33ed0',
-  wstETH_CORE: '0x474602394d0B02F43AC3D7C8c5cFc0814b03fd40',
-  wstETH_PRIME: '0xAcCdAb49ECB9A801CfF62a92fc80D52339b33770',
-};
-
-export const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>> = {
-  [NetworkNumber.Eth]: Object.values(AAVE_V4_TOKENIZED_SPOKES),
-};
-
-export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME';
-
-export const aaveV4GetTokenizedHubKey = (hubNameOrKey?: string | null): AaveV4TokenizedHubKey | null => {
-  if (!hubNameOrKey) return null;
-  const normalized = hubNameOrKey.trim().toUpperCase();
-
-  // TODO AaveV4 Maybe turn into constants
-  if (normalized === 'CORE' || normalized === 'CORE HUB') return 'CORE';
-  if (normalized === 'PLUS' || normalized === 'PLUS HUB') return 'PLUS';
-  if (normalized === 'PRIME' || normalized === 'PRIME HUB') return 'PRIME';
-
-  if (normalized.includes('CORE')) return 'CORE';
-  if (normalized.includes('PLUS')) return 'PLUS';
-  if (normalized.includes('PRIME')) return 'PRIME';
-
-  return null;
-};
-
-export const aaveV4GetTokenizedVaultKey = (
-  symbol: string,
-  hubNameOrKey?: string | null,
-): string | null => {
-  if (!symbol) return null;
-  const hubKey = aaveV4GetTokenizedHubKey(hubNameOrKey);
-  if (!hubKey) return null;
-
-  const normalizedSymbol = symbol.trim().replace(/-/g, '_');
-
-  return `${normalizedSymbol}_${hubKey}`;
-};
-
-export const aaveV4GetTokenizedVaultAddress = (
-  network: NetworkNumber,
-  symbol: string,
-  hubNameOrKey?: string | null,
-): EthAddress | undefined => {
-  if (network !== NetworkNumber.Eth) return undefined;
-  const key = aaveV4GetTokenizedVaultKey(symbol, hubNameOrKey);
-  if (!key) return undefined;
-  return AAVE_V4_TOKENIZED_SPOKES[key];
-};
-
-/** Parsed tokenization spoke data with human-readable supplied amounts for display */
-export interface AaveV4TokenizationSpokeDataParsed {
-  vaultAddress: EthAddress;
-  key: string | null;
-  symbol: string;
-  hubKey: string;
-  userSuppliedAssetsEth: string;
-  userSuppliedSharesEth: string;
-  userSuppliedAssets: string;
-  userSuppliedShares: string;
-  underlyingAsset: EthAddress;
-  spoke: EthAddress;
-  decimals: number;
-}
-
-const AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY: Record<string, string> = Object.entries(
-  AAVE_V4_TOKENIZED_SPOKES,
-).reduce((acc, [k, v]) => {
-  acc[v.toLowerCase()] = k;
-  return acc;
-}, {} as Record<string, string>);
-
-/**
- * Fetches tokenization vault data for the given user via getTokenizationSpokesData.
- * Returns parsed data including userSuppliedAssets in human-readable form for each vault.
- */
-export async function getAaveV4TokenizationSpokesData(
-  provider: EthereumProvider,
-  network: NetworkNumber,
-  userAddress: EthAddress,
-): Promise<AaveV4TokenizationSpokeDataParsed[]> {
-  const spokes = AAVE_V4_TOKENIZED_SPOKE_ADDRESSES[network] ?? [];
-  if (spokes.length === 0) return [];
-
-  const client = getViemProvider(provider, network);
-  const viewContract = AaveV4ViewContractViem(client, network);
-  const raw = await viewContract.read.getTokenizationSpokesData([spokes, userAddress]);
-
-  return raw.map((r: any, i: number) => {
-    const vaultAddress = spokes[i];
-    const key = AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY[vaultAddress.toLowerCase()] ?? null;
-    const symbol = wethToEth(getAssetInfoByAddress(r.underlyingAsset, network).symbol);
-    if (symbol === '?') { // unsupported asset
-      return null;
-    }
-    const hubKey = key ? key.split('_').pop() ?? '' : '';
-    const decimals = Number(r.decimals ?? 18);
-    const userSuppliedAssetsRaw = r.userSuppliedAssets ?? 0;
-    const userSuppliedSharesRaw = r.userSuppliedShares ?? 0;
-
-    const userSuppliedAssetsEth = assetAmountInEth(userSuppliedAssetsRaw.toString(), symbol);
-    const userSuppliedSharesEth = assetAmountInEth(userSuppliedSharesRaw.toString(), symbol);
-    return {
-      vaultAddress,
-      key,
-      symbol,
-      hubKey,
-      userSuppliedAssetsEth,
-      userSuppliedSharesEth,
-      userSuppliedAssets: userSuppliedAssetsRaw.toString(),
-      userSuppliedShares: userSuppliedSharesRaw.toString(),
-      underlyingAsset: r.underlyingAsset,
-      spoke: r.spoke,
-      decimals,
-    };
-  }).filter(item => item != null);
-}
-
-

package/src/helpers/aaveV4Helpers/index.ts

@@ -1,133 +0,0 @@
-import Dec from 'decimal.js';
-import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
-import {
-  AaveV4AggregatedPositionData,
-  AaveV4AssetsData,
-  AaveV4ReserveAssetData,
-  AaveV4UsedReserveAsset,
-  AaveV4UsedReserveAssets,
-  LeverageType,
-  NetworkNumber,
-} from '../../types';
-
-export const aaveV4GetCollateralFactor = (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor: boolean = false): number => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
-
-export const isLeveragedPosAaveV4 = (usedAssets: AaveV4UsedReserveAssets, dustLimit = 5) => {
-  let borrowUnstable = 0;
-  let supplyStable = 0;
-  let borrowStable = 0;
-  let supplyUnstable = 0;
-  let longAsset = '';
-  let shortAsset = '';
-  Object.values(usedAssets).forEach(({
-    symbol, suppliedUsd, borrowedUsd, collateral, reserveId,
-  }) => {
-    const spokeAsset = `${symbol}-${reserveId}`;
-    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 = spokeAsset;
-    }
-    if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
-      supplyUnstable += 1;
-      longAsset = spokeAsset;
-    }
-  });
-  const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
-  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
-  const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
-  if (isLong) {
-    return {
-      leveragedType: LeverageType.Long,
-      leveragedAsset: longAsset,
-    };
-  }
-  if (isShort) {
-    return {
-      leveragedType: LeverageType.Short,
-      leveragedAsset: shortAsset,
-    };
-  }
-  if (isVolatilePair) {
-    return {
-      leveragedType: LeverageType.VolatilePair,
-      leveragedAsset: longAsset,
-    };
-  }
-  return {
-    leveragedType: LeverageType.None,
-    leveragedAsset: '',
-  };
-};
-
-export const aaveV4GetAggregatedPositionData = ({
-  usedAssets,
-  assetsData,
-  network,
-  useUserCollateralFactor = false,
-}: {
-  usedAssets: AaveV4UsedReserveAssets,
-  assetsData: AaveV4AssetsData,
-  network: NetworkNumber,
-  useUserCollateralFactor?: boolean,
-}): AaveV4AggregatedPositionData => {
-  const payload = {} as AaveV4AggregatedPositionData;
-  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.borrowLimitUsd = getAssetsTotal(
-    usedAssets,
-    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd, reserveId }: { symbol: string, suppliedUsd: string, reserveId: number }) => new Dec(suppliedUsd).mul(aaveV4GetCollateralFactor(assetsData[`${symbol}-${reserveId}`], usedAssets[`${symbol}-${reserveId}`], useUserCollateralFactor)),
-  );
-  payload.liquidationLimitUsd = payload.borrowLimitUsd;
-  payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
-  payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ drawnUsd }: { drawnUsd: string }) => drawnUsd);
-  payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ premiumUsd }: { premiumUsd: string }) => premiumUsd);
-  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';
-  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 } = isLeveragedPosAaveV4(usedAssets);
-  payload.leveragedType = leveragedType;
-  payload.leveragedAsset = leveragedAsset;
-  payload.liquidationPrice = '';
-  if (leveragedType !== '') {
-    const leveragedAssetData = assetsData[leveragedAsset];
-    let assetPrice = leveragedAssetData?.price || '0';
-    if (leveragedType === LeverageType.VolatilePair) {
-      const borrowedAsset = (Object.values(usedAssets) as AaveV4UsedReserveAsset[]).find(({ borrowedUsd }: { borrowedUsd: string }) => +borrowedUsd > 0);
-      const borrowedAssetPrice = assetsData[`${borrowedAsset!.symbol}-${borrowedAsset!.reserveId}`].price;
-      const leveragedAssetPrice = assetsData[leveragedAsset].price;
-      const isReverse = new Dec(leveragedAssetPrice).lt(borrowedAssetPrice);
-      if (isReverse) {
-        payload.leveragedType = LeverageType.VolatilePairReverse;
-        payload.currentVolatilePairRatio = new Dec(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
-        assetPrice = new Dec(borrowedAssetPrice).div(assetPrice).toString();
-      } else {
-        assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
-        payload.currentVolatilePairRatio = new Dec(leveragedAssetPrice).div(borrowedAssetPrice).toDP(18).toString();
-      }
-    }
-    payload.liquidationPrice = calcLeverageLiqPrice(payload.leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
-  }
-  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
-  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
-  //   payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
-  payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
-
-  // TODO: Re-implement netApy calculation
-  //   const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({
-  //     usedAssets,
-  //     assetsData,
-  //     optionalData: { healthRatio: payload.healthRatio },
-  //   });
-  payload.netApy = '0';
-  payload.incentiveUsd = '0';
-  payload.totalInterestUsd = '0';
-  return payload;
-};