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

package/src/liquityV2/index.ts

@@ -4,9 +4,12 @@ import { Client, PublicClient } from 'viem';
 import {
   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,
@@ -15,9 +18,12 @@ import {
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getLiquityV2AggregatedPositionData } from '../helpers/liquityV2Helpers';
 import {
-  compareAddresses, ethToWeth, MAXUINT,
+  compareAddresses,
+  ethToWeth,
+  getEthAmountForDecimals,
+  MAXUINT,
 } from '../services/utils';
-import { ZERO_ADDRESS } from '../constants';
+import { SECONDS_PER_YEAR, ZERO_ADDRESS } from '../constants';
 import { LiquityV2Markets } from '../markets';
 import { getViemProvider } from '../services/viem';
 
@@ -420,164 +426,220 @@ export const getLiquityV2ClaimableCollateral = async (collSurplusPoolAddress: Et
   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 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 sBold = LiquityV2sBoldVaultViem(provider, network);
-//   const yBold = createViemContractFromConfigFunc('Erc4626', '0x9F4330700a36B29952869fac9b33f45EEdd8A3d8')(provider, network);
-//   const stYBold = createViemContractFromConfigFunc('Erc4626', '0x23346B04a7f55b8760E5860AA5A77383D63491cD')(provider, network);
-//
-//   const debtTokenInfo = getAssetInfo(LiquityV2Markets(network)[market].debtToken);
-//   const debtTokenContract = createViemContractFromConfigFunc('Erc20', debtTokenInfo.address)(provider, network);
-//
-//   const [
-//     stabilityRewardColl,
-//     stabilityRewardYield,
-//     compoundedBoldDeposit,
-//     totalBoldDeposits,
-//     P,
-//     currentScale,
-//     yieldGainsPending,
-//     debtTokenBalance,
-//
-//     aggWeightedDebtSum,
-//     lastAggUpdateTime,
-//
-//     sBoldTotalAssets,
-//     sBoldConvertToShares,
-//     sBoldMaxWithdraw,
-//
-//     wethApy,
-//     wsETHApy,
-//     rETHApy,
-//
-//     yBoldTotalAssets,
-//     yBoldMaxWithdraw,
-//     stYBoldConvertToShares,
-//   ] = 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(),
-//
-//     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)]),
-//   ]);
-//
-//
-//   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);
-//
-//   const accountData = {
-//     totalBOLDDeposited: getEthAmountForDecimals(totalBoldDeposits.toString(), 18),
-//     stakedBOLDBalance: stakedBOLDBalanceForUser,
-//     stabilityRewardColl: stabilityRewardCollForUser,
-//     stabilityRewardYield: stabilityRewardYieldForUser,
-//     showStakingBalances: !!(+stakedBOLDBalanceForUser || +stabilityRewardCollForUser || +stabilityRewardYieldForUser),
-//     debtTokenBalance: getEthAmountForDecimals(debtTokenBalance.toString(), debtTokenInfo.decimals),
-//   };
-//
-//
-//   const yBoldApy = await getYBoldApyApi();
-//
-//   return yBoldApy;
-// };
+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/portfolio/index.ts

@@ -5,6 +5,7 @@ import {
   CompoundMarkets,
   CrvUsdMarkets,
   EulerV2Markets,
+  LiquityV2Markets,
   LlamaLendMarkets,
   MorphoBlueMarkets,
   SparkMarkets,
@@ -20,6 +21,7 @@ import {
   CompoundVersions,
   CrvUSDGlobalMarketData,
   EulerV2FullMarketData,
+  LiquityV2MarketData,
   LlamaLendGlobalMarketData,
   MorphoBlueMarketInfo,
   PortfolioPositionsData,
@@ -37,6 +39,7 @@ import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getCompoundV2AccountData, _getCompoundV2MarketsData } from '../compoundV2';
 import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
+import { getLiquityV2Staking, _getLiquityV2MarketData, getLiquitySAndYBold } from '../liquityV2';
 import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
 import { getUmbrellaData } from '../umbrella';
@@ -64,6 +67,8 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
   const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
   const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
+  const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
+  const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
 
   const client = getViemProvider(provider, network, {
     batch: {
@@ -90,6 +95,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const compoundV2MarketsData: Record<string, CompoundV2MarketsData> = {};
   const crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData> = {};
   const llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData> = {};
+  const liquityV2MarketsData: Record<string, LiquityV2MarketData> = {};
 
   const markets = {
     morphoMarketsData,
@@ -101,6 +107,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     compoundV2MarketsData,
     crvUsdMarketsData,
     llamaLendMarketsData,
+    liquityV2MarketsData,
   };
 
   const positions: PortfolioPositionsData = {};
@@ -138,6 +145,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       aaveV2: {},
       compoundV2: {},
       liquity: {},
+      liquityV2: {},
       fluid: {
         error: '',
         data: {},
@@ -193,6 +201,10 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       const marketData = await _getLlamaLendGlobalData(client, network, market);
       llamaLendMarketsData[market.value] = marketData;
     }),
+    ...liquityV2Markets.map(async (market) => {
+      const marketData = await _getLiquityV2MarketData(client, network, market);
+      liquityV2MarketsData[market.value] = marketData;
+    }),
 
     // === INDEPENDENT USER DATA (doesn't depend on market data) ===
     ...addresses.map(async (address) => {
@@ -258,6 +270,20 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         stakingPositions[address.toLowerCase()].umbrella = { error: `Error fetching Umbrella staking data for address ${address}`, data: null };
       }
     }),
+    // Liquity V2 staking
+    ...liquityV2MarketsStaking.map(market => addresses.map(async (address) => {
+      try {
+        if (!isMainnet) {
+          stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
+          return;
+        }
+        const liquityV2StakingData = await getLiquityV2Staking(client, network, market.value, address);
+        stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: liquityV2StakingData };
+      } catch (error) {
+        console.error(`Error fetching Liquity V2 staking data for address ${address}, market ${market.value}:`, error);
+        stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: `Error fetching Liquity V2 staking data for address ${address}`, data: null };
+      }
+    })).flat(),
 
     // === REWARDS DATA (independent of market data) ===
     // Batch King rewards
@@ -522,6 +548,19 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         positions[address.toLowerCase() as EthAddress].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
       }
     })).flat(),
+    // liquity sBold/yBold and staking options
+    ...addresses.map(async (address) => {
+      try {
+        if (!isMainnet) {
+          stakingPositions[address.toLowerCase() as EthAddress].liquityV2SBoldYBold = { error: '', data: null };
+          return;
+        }
+        const data = await getLiquitySAndYBold(client, network, stakingPositions[address.toLowerCase()].liquityV2, address);
+        stakingPositions[address.toLowerCase() as EthAddress].liquityV2SBoldYBold = { error: '', data };
+      } catch (error) {
+        console.error(`Error fetching SBold/YBold data for address ${address}:`, error);
+      }
+    }),
   ]);
 
   return {