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

package/esm/liquityV2/index.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import { createViemContractFromConfigFunc, LiquityV2LegacyViewContractViem, LiquityV2ViewContractViem, } from '../contracts';
-import { NetworkNumber } from '../types/common';
+import { createViemContractFromConfigFunc, LiquityV2LegacyViewContractViem, LiquityV2sBoldVaultViem, LiquityV2ViewContractViem, } from '../contracts';
+import { NetworkNumber, } from '../types/common';
 import { LIQUITY_V2_TROVE_STATUS_ENUM, LiquityV2Versions, } 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';
 const getLiquityV2ViewContract = (provider, network, isLegacy) => {
@@ -286,164 +286,136 @@ export const getLiquityV2ClaimableCollateral = (collSurplusPoolAddress, account,
     const claimableCollateral = yield 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 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 = {
+    [LiquityV2Versions.LiquityV2Eth]: '0x5721cbbd64fc7Ae3Ef44A0A3F9a790A9264Cf9BF',
+    [LiquityV2Versions.LiquityV2WstEth]: '0x9502b7c397e9aa22fe9db7ef7daf21cd2aebe56b',
+    [LiquityV2Versions.LiquityV2REth]: '0xd442e41019b7f5c4dd78f50dc03726c446148695',
+    [LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+    [LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+    [LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+};
+const activePoolAddrForMarket = {
+    [LiquityV2Versions.LiquityV2Eth]: '0xeB5A8C825582965f1d84606E078620a84ab16AfE',
+    [LiquityV2Versions.LiquityV2WstEth]: '0x531a8f99c70d6a56a7cee02d6b4281650d7919a0',
+    [LiquityV2Versions.LiquityV2REth]: '0x9074d72cc82dad1e13e454755aa8f144c479532f',
+    [LiquityV2Versions.LiquityV2EthLegacy]: '0x',
+    [LiquityV2Versions.LiquityV2WstEthLegacy]: '0x',
+    [LiquityV2Versions.LiquityV2REthLegacy]: '0x',
+};
+function ceilDiv(a, b) {
+    return new Dec(a).add(new Dec(b).sub(1)).div(b).toString();
+}
+const SP_YIELD_SPLIT = new Dec(75).mul(Math.pow(10, 16)).toString(); // 75%
+const calcPendingSPYield = (aggWeightedDebtSum, lastAggUpdateTime, currentTime) => {
+    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) => {
+    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 = () => __awaiter(void 0, void 0, void 0, function* () {
+    const url = 'https://ydaemon.yearn.fi/1/vaults/0x23346B04a7f55b8760E5860AA5A77383D63491cD?strategiesDetails=withDetails&strategiesCondition=inQueue';
+    const yBoldData = yield fetch(url)
+        .then(res => res.json())
+        .catch(console.error);
+    return new Dec(yBoldData.apr.netAPR).mul(100).toString();
+});
+const calculateSPApy = (spYieldGainParams, spAPYs) => {
+    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 = (provider, network, market, user) => __awaiter(void 0, void 0, void 0, function* () {
+    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)(provider, network);
+    const [stabilityRewardColl, stabilityRewardYield, compoundedBoldDeposit, totalBoldDeposits, P, currentScale, yieldGainsPending, debtTokenBalance, aggWeightedDebtSum, lastAggUpdateTime,] = yield 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 = {
+        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 = (provider, network, markets, user) => __awaiter(void 0, void 0, void 0, function* () {
+    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,] = yield 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/esm/morphoBlue/index.js

@@ -155,15 +155,16 @@ export function _getMorphoBlueAccountData(provider, network, account, selectedMa
         ]));
         const usedAssets = {};
         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: '0',
+            supplied: loanTokenSupplied,
             borrowed: loanTokenBorrowed,
-            isSupplied: false,
+            isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
             isBorrowed: new Dec(loanInfo.borrowedInAssets.toString()).gt(0),
             collateral: false,
-            suppliedUsd: '0',
+            suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
             borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
         };
         const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];

package/esm/portfolio/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
-import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
@@ -24,6 +24,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';
@@ -45,6 +46,8 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         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: {
                 multicall: {
@@ -69,6 +72,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
         const compoundV2MarketsData = {};
         const crvUsdMarketsData = {};
         const llamaLendMarketsData = {};
+        const liquityV2MarketsData = {};
         const markets = {
             morphoMarketsData,
             compoundV3MarketsData,
@@ -79,6 +83,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
             compoundV2MarketsData,
             crvUsdMarketsData,
             llamaLendMarketsData,
+            liquityV2MarketsData,
         };
         const positions = {};
         const stakingPositions = {};
@@ -113,6 +118,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 aaveV2: {},
                 compoundV2: {},
                 liquity: {},
+                liquityV2: {},
                 fluid: {
                     error: '',
                     data: {},
@@ -166,6 +172,10 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                 const marketData = yield _getLlamaLendGlobalData(client, network, market);
                 llamaLendMarketsData[market.value] = marketData;
             })),
+            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                const marketData = yield _getLiquityV2MarketData(client, network, market);
+                liquityV2MarketsData[market.value] = marketData;
+            })),
             // === INDEPENDENT USER DATA (doesn't depend on market data) ===
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 if (!isMainnet)
@@ -240,6 +250,21 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                     stakingPositions[address.toLowerCase()].umbrella = { error: `Error fetching Umbrella staking data for address ${address}`, data: null };
                 }
             })),
+            // Liquity V2 staking
+            ...liquityV2MarketsStaking.map(market => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        stakingPositions[address.toLowerCase()].liquityV2[market.value] = { error: '', data: null };
+                        return;
+                    }
+                    const liquityV2StakingData = yield 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
             (() => __awaiter(this, void 0, void 0, function* () {
@@ -529,6 +554,20 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
                     positions[address.toLowerCase()].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((address) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data: null };
+                        return;
+                    }
+                    const data = yield getLiquitySAndYBold(client, network, stakingPositions[address.toLowerCase()].liquityV2, address);
+                    stakingPositions[address.toLowerCase()].liquityV2SBoldYBold = { error: '', data };
+                }
+                catch (error) {
+                    console.error(`Error fetching SBold/YBold data for address ${address}:`, error);
+                }
+            })),
         ]);
         return {
             positions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.0.14-dev-portfolio",
+  "version": "2.0.14-dev-portfolio2",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/config/contracts.ts

@@ -1191,7 +1191,7 @@ export const LiquityV2ActivePool = {
   "networks": {}
 } as const;
 export const LiquityV2sBoldVault = {
-  "abi": [{"inputs":[{"internalType":"uint256","name":"assets","type":"uint256"}],"name":"convertToShares","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"maxWithdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"sps","outputs":[{"internalType":"address","name":"sp","type":"address"},{"internalType":"uint96","name":"weight","type":"uint96"},{"internalType":"address","name":"coll","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalAssets","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
+  "abi": [{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"assets","type":"uint256"}],"name":"convertToShares","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"maxWithdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"sps","outputs":[{"internalType":"address","name":"sp","type":"address"},{"internalType":"uint96","name":"weight","type":"uint96"},{"internalType":"address","name":"coll","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalAssets","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
   "networks": {
     "1": {
       "address": "0x50bd66d59911f5e086ec87ae43c811e0d059dd11"