@defisaver/positions-sdk 2.0.13 → 2.0.14-dev-portfolio1

package/src/liquityV2/index.ts

@@ -2,9 +2,14 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { Client, PublicClient } from 'viem';
 import {
-  createViemContractFromConfigFunc, LiquityV2LegacyViewContractViem, LiquityV2ViewContractViem,
+  createViemContractFromConfigFunc,
+  LiquityV2LegacyViewContractViem,
+  LiquityV2sBoldVaultViem,
+  LiquityV2ViewContractViem,
 } from '../contracts';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import {
+  EthAddress, EthereumProvider, HexString, NetworkNumber,
+} from '../types/common';
 import {
   LIQUITY_V2_TROVE_STATUS_ENUM,
   LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2UsedAssets,
@@ -12,11 +17,25 @@ import {
 } from '../types';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getLiquityV2AggregatedPositionData } from '../helpers/liquityV2Helpers';
-import { compareAddresses, ethToWeth, MAXUINT } from '../services/utils';
-import { ZERO_ADDRESS } from '../constants';
+import {
+  compareAddresses,
+  ethToWeth,
+  getEthAmountForDecimals,
+  MAXUINT,
+} from '../services/utils';
+import { SECONDS_PER_YEAR, ZERO_ADDRESS } from '../constants';
 import { LiquityV2Markets } from '../markets';
 import { getViemProvider } from '../services/viem';
 
+export type SPYieldGainParameters = {
+  P: string;
+  aggWeightedDebtSum: string;
+  currentScale: string;
+  lastAggUpdateTime: string;
+  totalBoldDeposits: string;
+  yieldGainsPending: string;
+};
+
 const getLiquityV2ViewContract = (provider: Client, network: NetworkNumber, isLegacy: boolean) => {
   if (isLegacy) return LiquityV2LegacyViewContractViem(provider, network);
   return LiquityV2ViewContractViem(provider, network);
@@ -406,3 +425,221 @@ export const getLiquityV2ClaimableCollateral = async (collSurplusPoolAddress: Et
   const claimableCollateral = await collSurplusPoolContract.read.getCollateral([account]);
   return claimableCollateral.toString();
 };
+
+const stabilityPoolAddrForMarket: Record<LiquityV2Versions, EthAddress> = {
+  [LiquityV2Versions.LiquityV2Eth]: '0x5721cbbd64fc7Ae3Ef44A0A3F9a790A9264Cf9BF',
+  [LiquityV2Versions.LiquityV2WstEth]: '0x9502b7c397e9aa22fe9db7ef7daf21cd2aebe56b',
+  [LiquityV2Versions.LiquityV2REth]: '0xd442e41019b7f5c4dd78f50dc03726c446148695',
+  [LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+  [LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+  [LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+};
+const activePoolAddrForMarket: Record<LiquityV2Versions, EthAddress> = {
+  [LiquityV2Versions.LiquityV2Eth]: '0xeB5A8C825582965f1d84606E078620a84ab16AfE',
+  [LiquityV2Versions.LiquityV2WstEth]: '0x531a8f99c70d6a56a7cee02d6b4281650d7919a0',
+  [LiquityV2Versions.LiquityV2REth]: '0x9074d72cc82dad1e13e454755aa8f144c479532f',
+  [LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+  [LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+  [LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+};
+
+function ceilDiv(a: string, b: string) {
+  return new Dec(a).add(new Dec(b).sub(1)).div(b).toString();
+}
+const SP_YIELD_SPLIT = new Dec(75).mul(10 ** 16).toString(); // 75%
+
+const calcPendingSPYield = (
+  aggWeightedDebtSum: string,
+  lastAggUpdateTime: string,
+  currentTime: string,
+) => {
+  const a = new Dec(aggWeightedDebtSum).mul(
+    new Dec(currentTime).sub(new Dec(lastAggUpdateTime)),
+  ).toString();
+  const b = new Dec(SECONDS_PER_YEAR).mul(1000).mul(1e18).toString();
+  return new Dec(ceilDiv(a, b)).mul(SP_YIELD_SPLIT).div(1e18).toString();
+};
+
+
+const calculateStabilityPoolApy = (
+  spYieldGainParams: SPYieldGainParameters,
+) => {
+  const {
+    aggWeightedDebtSum, totalBoldDeposits, lastAggUpdateTime, yieldGainsPending,
+  } = spYieldGainParams;
+
+  if (new Dec(totalBoldDeposits).eq(0)) {
+    return '0';
+  }
+
+  const now = Date.now().toString();
+  const lastAggUpdateTimeScaled = new Dec(lastAggUpdateTime).mul(1000).toString();
+
+  const pendingSPYield = new Dec(calcPendingSPYield(
+    aggWeightedDebtSum,
+    lastAggUpdateTimeScaled,
+    now,
+  )).add(yieldGainsPending).toString();
+
+  const annualizedYield = new Dec(pendingSPYield).mul(SECONDS_PER_YEAR).mul(1000).div(new Dec(now).minus(lastAggUpdateTimeScaled))
+    .toString();
+  return new Dec(annualizedYield).div(totalBoldDeposits).mul(100).toString();
+};
+
+const getYBoldApyApi = async () => {
+  const url = 'https://ydaemon.yearn.fi/1/vaults/0x23346B04a7f55b8760E5860AA5A77383D63491cD?strategiesDetails=withDetails&strategiesCondition=inQueue';
+
+  const yBoldData = await fetch(url)
+    .then(res => res.json())
+    .catch(console.error);
+
+  return new Dec(yBoldData.apr.netAPR).mul(100).toString();
+};
+
+export type sBoldYieldParameters = {
+  WETH: string;
+  wsETH: string;
+  rETH: string;
+};
+
+const calculateSPApy = (
+  spYieldGainParams: sBoldYieldParameters, spAPYs: { apyEth: Dec.Value; apyWstEth: Dec.Value; apyREth: Dec.Value; },
+) => {
+  const {
+    WETH, wsETH, rETH,
+  } = spYieldGainParams;
+
+  const apy = new Dec(WETH).mul(spAPYs.apyEth).add(new Dec(wsETH).mul(spAPYs.apyWstEth)).add(new Dec(rETH).mul(spAPYs.apyREth))
+    .toString();
+  return apy;
+};
+
+export const getLiquityV2Staking = async (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => {
+  const stabilityPoolView = createViemContractFromConfigFunc('LiquityV2StabilityPool', stabilityPoolAddrForMarket[market])(provider, network);
+  const activePoolView = createViemContractFromConfigFunc('LiquityV2ActivePool', activePoolAddrForMarket[market])(provider, network);
+
+  const debtTokenInfo = getAssetInfo(LiquityV2Markets(network)[market].debtToken, network);
+  const debtTokenContract = createViemContractFromConfigFunc('Erc20', debtTokenInfo.address as HexString)(provider, network);
+
+  const [
+    stabilityRewardColl,
+    stabilityRewardYield,
+    compoundedBoldDeposit,
+    totalBoldDeposits,
+    P,
+    currentScale,
+    yieldGainsPending,
+    debtTokenBalance,
+
+    aggWeightedDebtSum,
+    lastAggUpdateTime,
+  ] = await Promise.all([
+    stabilityPoolView.read.getDepositorCollGain([user]),
+    stabilityPoolView.read.getDepositorYieldGain([user]),
+    stabilityPoolView.read.getCompoundedBoldDeposit([user]),
+    stabilityPoolView.read.getTotalBoldDeposits(),
+    stabilityPoolView.read.P(),
+    stabilityPoolView.read.currentScale(),
+    stabilityPoolView.read.getYieldGainsPending(),
+    debtTokenContract.read.balanceOf([user]),
+
+    activePoolView.read.aggWeightedDebtSum(),
+    activePoolView.read.lastAggUpdateTime(),
+  ]);
+
+  const stabilityPoolYieldParams: SPYieldGainParameters = {
+    aggWeightedDebtSum: aggWeightedDebtSum.toString(),
+    lastAggUpdateTime: lastAggUpdateTime.toString(),
+    P: P.toString(),
+    currentScale: currentScale.toString(),
+    yieldGainsPending: yieldGainsPending.toString(),
+    totalBoldDeposits: totalBoldDeposits.toString(),
+  };
+
+  const stabilityPoolApy = calculateStabilityPoolApy(stabilityPoolYieldParams);
+
+  const stakedBOLDBalanceForUser = getEthAmountForDecimals(compoundedBoldDeposit.toString(), 18);
+  const stabilityRewardCollForUser = getEthAmountForDecimals(stabilityRewardColl.toString(), 18);
+  const stabilityRewardYieldForUser = getEthAmountForDecimals(stabilityRewardYield.toString(), 18);
+
+  return {
+    totalBOLDDeposited: getEthAmountForDecimals(totalBoldDeposits.toString(), 18),
+    stakedBOLDBalance: stakedBOLDBalanceForUser,
+    stabilityRewardColl: stabilityRewardCollForUser,
+    stabilityRewardYield: stabilityRewardYieldForUser,
+    showStakingBalances: !!(+stakedBOLDBalanceForUser || +stabilityRewardCollForUser || +stabilityRewardYieldForUser),
+    debtTokenBalance: getEthAmountForDecimals(debtTokenBalance.toString(), debtTokenInfo.decimals),
+    stabilityPoolApy,
+  };
+};
+
+export const getLiquitySAndYBold = async (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => {
+  const sBold = LiquityV2sBoldVaultViem(provider, network);
+  const yBold = createViemContractFromConfigFunc('Erc4626', '0x9F4330700a36B29952869fac9b33f45EEdd8A3d8')(provider, network);
+  const stYBold = createViemContractFromConfigFunc('Erc4626', '0x23346B04a7f55b8760E5860AA5A77383D63491cD')(provider, network);
+  const spAPYs = {
+    apyEth: markets[LiquityV2Versions.LiquityV2Eth].data.stabilityPoolApy,
+    apyWstEth: markets[LiquityV2Versions.LiquityV2WstEth].data.stabilityPoolApy,
+    apyREth: markets[LiquityV2Versions.LiquityV2REth].data.stabilityPoolApy,
+  };
+
+  const [
+    sBoldTotalAssets,
+    sBoldConvertToShares,
+    sBoldMaxWithdraw,
+
+    wethApy,
+    wsETHApy,
+    rETHApy,
+
+    yBoldTotalAssets,
+    yBoldMaxWithdraw,
+    stYBoldConvertToShares,
+
+    yBoldApy,
+
+    sBoldBalance,
+    yBoldBalance,
+    stYBoldBalance,
+  ] = await Promise.all([
+    sBold.read.totalAssets(),
+    sBold.read.convertToShares([BigInt(1e18)]),
+    sBold.read.maxWithdraw([user]),
+
+    sBold.read.sps([BigInt(0)]),
+    sBold.read.sps([BigInt(1)]),
+    sBold.read.sps([BigInt(2)]),
+
+    yBold.read.totalAssets(),
+    yBold.read.maxWithdraw([user]),
+    stYBold.read.convertToShares([BigInt(1e18)]),
+    getYBoldApyApi(),
+
+    sBold.read.balanceOf([user]),
+    yBold.read.balanceOf([user]),
+    stYBold.read.balanceOf([user]),
+  ]);
+
+  const spMarketRes = {
+    WETH: new Dec(wethApy[1]).div(10000).toString(),
+    wsETH: new Dec(wsETHApy[1]).div(10000).toString(),
+    rETH: new Dec(rETHApy[1]).div(10000).toString(),
+  };
+
+  const spApy = calculateSPApy(spMarketRes, spAPYs);
+
+  return {
+    spApy,
+    yBoldApy,
+    totalBoldDepositedSBold: assetAmountInEth(sBoldTotalAssets.toString(), 'sBOLD'),
+    boldRateSBold: assetAmountInEth(sBoldConvertToShares.toString(), 'sBOLD'),
+    maxWithdrawSBold: assetAmountInEth(sBoldMaxWithdraw.toString(), 'sBOLD'),
+    totalBoldDepositedYBold: assetAmountInEth(yBoldTotalAssets.toString(), 'yBOLD'),
+    boldRateYBold: assetAmountInEth(stYBoldConvertToShares.toString(), 'yBOLD'),
+    maxWithdrawYBold: assetAmountInEth(yBoldMaxWithdraw.toString(), 'yBOLD'),
+
+    sBoldBalance: assetAmountInEth(sBoldBalance.toString(), 'sBOLD'),
+    yBoldBalance: assetAmountInEth(yBoldBalance.toString(), 'yBOLD'),
+    stYBoldBalance: assetAmountInEth(stYBoldBalance.toString(), 'yBOLD'),
+  };
+};

package/src/markets/aave/marketAssets.ts

@@ -10,7 +10,7 @@ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', '
 
 export const aaveV3AssetsDefaultMarketEth = [
   'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov',
+  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
   'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/src/markets/compound/marketsAssets.ts

@@ -6,7 +6,7 @@ export const compoundV2CollateralAssets: AssetData[] = [
   'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => getAssetInfo(symbol));
 
-export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'weETH', 'deUSD', 'sdeUSD'];
+export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'weETH', 'deUSD', 'sdeUSD', 'rsETH'];
 export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH', 'wUSDM'];
 export const v3USDCCollAssetsBase = ['cbETH', 'ETH', 'wstETH', 'cbBTC', 'tBTC'];
 export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
@@ -56,7 +56,7 @@ export const v3USDbCCollAssets = {
   [NetworkNumber.Linea]: [],
 };
 
-export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
+export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH', 'weETH', 'sdeUSD', 'deUSD'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
 export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 

package/src/markets/spark/marketAssets.ts

@@ -1,6 +1,6 @@
 import { NetworkNumber } from '../../types/common';
 
-export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH'];
+export const sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS', 'LBTC', 'tBTC', 'ezETH', 'rsETH', 'PYUSD'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const sparkAssetsDefaultMarket = {

package/src/morphoBlue/index.ts

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { Client } from 'viem';
 import {
-  Blockish, EthAddress, EthereumProvider, MMUsedAssets, NetworkNumber, PositionBalances,
+  Blockish, EthAddress, EthereumProvider, MMAssetsData, MMUsedAssets, NetworkNumber, PositionBalances,
 } from '../types/common';
 import {
   DFSFeedRegistryContractViem, FeedRegistryContractViem, MorphoBlueViewContractViem,
@@ -11,7 +11,7 @@ import {
   MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
 } from '../types';
 import { USD_QUOTE, WAD } from '../constants';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
 import { isMainnetNetwork, wethToEth } from '../services/utils';
 import {
   getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate,
@@ -184,16 +184,15 @@ export async function _getMorphoBlueAccountData(provider: Client, network: Netwo
   const usedAssets: MMUsedAssets = {};
 
   const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-  const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
   const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets.toString(), marketInfo.loanToken);
   usedAssets[marketInfo.loanToken] = {
     symbol: loanTokenInfo.symbol,
-    supplied: loanTokenSupplied,
+    supplied: '0',
     borrowed: loanTokenBorrowed,
-    isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
+    isSupplied: false,
     isBorrowed: new Dec(loanInfo.borrowedInAssets.toString()).gt(0),
     collateral: false,
-    suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
+    suppliedUsd: '0',
     borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
   };
 
@@ -220,4 +219,42 @@ export async function _getMorphoBlueAccountData(provider: Client, network: Netwo
 
 export async function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData> {
   return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
+}
+
+export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{ apy: string, amount: string, amountUsd: string }> {
+  const {
+    loanToken, collateralToken, oracle, irm, lltv,
+  } = selectedMarket;
+  const lltvInWei = new Dec(lltv).mul(WAD).toString();
+
+  const viewContract = MorphoBlueViewContractViem(provider, network);
+  const loanInfo = (await viewContract.read.getUserInfo([
+    {
+      loanToken, collateralToken, oracle, irm, lltv: BigInt(lltvInWei),
+    },
+    account]));
+
+  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+  const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
+  const loanTokenSuppliedUsd = new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString();
+  const usedAssets: MMUsedAssets = {
+    [marketInfo.loanToken]: {
+      symbol: loanTokenInfo.symbol,
+      supplied: loanTokenSupplied,
+      borrowed: '0',
+      isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
+      isBorrowed: false,
+      collateral: false,
+      suppliedUsd: loanTokenSuppliedUsd,
+      borrowedUsd: '0',
+    },
+  };
+
+  const { netApy } = calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData as unknown as MMAssetsData });
+
+  return {
+    apy: netApy,
+    amount: loanTokenSupplied,
+    amountUsd: loanTokenSuppliedUsd,
+  };
 }