@defisaver/positions-sdk 2.1.161-portfolio-api-dev → 2.1.161-portfolio-api-2-dev

package/esm/types/aave.d.ts

@@ -198,3 +198,86 @@ export interface AaveHelperCommon {
     selectedMarket: Partial<AaveMarketInfo>;
     network?: NetworkNumber;
 }
+export interface SghoUserData {
+    shares: string;
+    balance: string;
+    maxDeposit: string;
+    maxWithdraw: string;
+    underlyingBalance: string;
+}
+export interface SghoData {
+    totalAssets: string;
+    totalSupply: string;
+    supplyCap: string;
+    /** Target savings rate as an APY percent (e.g. "4.25" for 4.25%). */
+    targetRate: string;
+    paused: boolean;
+    user: SghoUserData;
+}
+/** stkAAVE, stkGHO and sGHO of an address, from getStakeAaveData. */
+export interface StakeAaveData {
+    activatedCooldown: string;
+    activatedCooldownAmount: string;
+    stkAaveRewardsBalance: string;
+    aaveRewardsBalance: string;
+    stkAaveBalance: string;
+    stkGhoBalance: string;
+    ghoMeritApy: string;
+    stkAaveApy: string;
+    sgho: SghoData;
+}
+export interface UmbrellaTokenInfo {
+    token: EthAddress;
+    /** USD, converted from the oracle's 8 decimals. */
+    price: string;
+    name: string;
+    symbol: string;
+    decimals: number;
+}
+export interface UmbrellaRewardTokenData {
+    rewardTokenData: UmbrellaTokenInfo;
+    maxEmissionPerSecond: bigint;
+    distributionEnd: bigint;
+}
+export interface UmbrellaStakingAccountData {
+    stakeUserBalance: string;
+    rewardsTokenUserData: {
+        reward: EthAddress;
+        currentReward: string;
+    }[];
+    userCooldownAmount: string;
+    userEndOfCooldown: bigint | string;
+    userWithdrawalWindow: bigint | string;
+}
+/**
+ * One Umbrella stake token of an address, from getUmbrellaData: the view contracts' structs merged, with the amounts
+ * the app reads converted to decimal strings. The bigint fields are the views' raw values, as the SDK passes them.
+ */
+export interface UmbrellaStakingTokenData {
+    stakeTokenData: UmbrellaTokenInfo;
+    totalAssets: string;
+    targetLiquidity: string;
+    isStakeConfigured: boolean;
+    rewardsTokenData: UmbrellaRewardTokenData[];
+    stakeToken: EthAddress;
+    stakeUserBalance: bigint;
+    rewardsTokenUserData: {
+        reward: EthAddress;
+        currentReward: bigint;
+    }[];
+    stkToken: EthAddress;
+    totalShares: string;
+    stkUnderlyingToken: EthAddress;
+    aToken: EthAddress;
+    cooldownPeriod: bigint;
+    unstakeWindow: bigint;
+    stkTokenToWaTokenRate: string;
+    waTokenToATokenRate: string;
+    rewardsEmissionRates: string[];
+    userCooldownAmount: bigint;
+    userEndOfCooldown: bigint;
+    userWithdrawalWindow: bigint;
+    account: UmbrellaStakingAccountData;
+}
+/** Keyed by Umbrella stake (UmbrellaGHO, UmbrellaUSDC, UmbrellaUSDT, UmbrellaETH). */
+export type UmbrellaStakingData = Record<string, UmbrellaStakingTokenData>;

package/esm/types/fluid.d.ts

@@ -458,3 +458,16 @@ export interface FluidFTokenDataStructOutput {
     rewardsRate: bigint;
     withdrawable: bigint;
 }
+/** One Fluid lending (fToken) deposit of an address, from getAllUserEarnPositionsWithFTokens and getFluidDepositData. */
+export interface FluidEarnPositionData {
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}

package/esm/types/index.d.ts

@@ -15,3 +15,4 @@ export * from './merkl';
 export * from './savings';
 export * from './common';
 export * from './aaveV4';
+export * from './claiming';

package/esm/types/index.js

@@ -15,3 +15,4 @@ export * from './merkl';
 export * from './savings';
 export * from './common';
 export * from './aaveV4';
+export * from './claiming';

package/esm/types/liquity.d.ts

@@ -28,3 +28,15 @@ export interface LiquityTroveInfo {
     debtInFront: string;
     exposure: string;
 }
+/** LQTY staking and the LUSD stability pool deposit of an address, from getLiquityStakingData. */
+export interface LiquityStakingData {
+    totalLUSDDeposited: string;
+    totalLQTYStaked: string;
+    stakedLQTY: string;
+    stakedLUSDBalance: string;
+    rewardETH: string;
+    rewardLUSD: string;
+    stabilityRewardETH: string;
+    stabilityRewardLQTY: string;
+    showStakingBalances: boolean;
+}

package/esm/types/liquityV2.d.ts

@@ -121,3 +121,27 @@ export interface LiquityV2TroveData {
     lastInterestRateAdjTime: string;
     exposure: string;
 }
+/** The stability pool deposit of an address in one market, from getLiquityV2Staking. */
+export interface LiquityV2StakingData {
+    totalBOLDDeposited: string;
+    stakedBOLDBalance: string;
+    stabilityRewardColl: string;
+    stabilityRewardYield: string;
+    showStakingBalances: boolean;
+    debtTokenBalance: string;
+    stabilityPoolApy: string;
+}
+/** sBOLD, yBOLD and stYBOLD of an address, from getLiquitySAndYBold. */
+export interface LiquityV2SBoldYBoldData {
+    spApy: string;
+    yBoldApy: string;
+    totalBoldDepositedSBold: string;
+    boldRateSBold: string;
+    maxWithdrawSBold: string;
+    totalBoldDepositedYBold: string;
+    boldRateYBold: string;
+    maxWithdrawYBold: string;
+    sBoldBalance: string;
+    yBoldBalance: string;
+    stYBoldBalance: string;
+}

package/esm/types/portfolio.d.ts

@@ -1,19 +1,33 @@
-import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
-import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
+import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions, StakeAaveData, UmbrellaStakingData } from './aave';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
+import { AaveRewardsClaimableToken, EthenaAirdropClaimableToken, KingRewardsClaimableToken, MerklRewardsClaimableToken, SparkAirdropClaimableToken, SparkRewardsClaimableToken, UniswapAirdropClaimableToken } from './claiming';
 import { EthAddress } from './common';
-import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidVaultData } from './fluid';
-import { LiquityTroveInfo } from './liquity';
-import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidEarnPositionData, FluidVaultData } from './fluid';
+import { LiquityStakingData, LiquityTroveInfo } from './liquity';
+import { LiquityV2MarketData, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2Versions } from './liquityV2';
+import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData } from './maker';
-import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkPositionData, SparkVersions } from './spark';
+import { MorphoBlueEarnData, MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
     data: T | null;
 }
+/** A failed fetch of a protocol that, when it succeeds, getPortfolioData returns unwrapped rather than as `{ error, data }`. */
+export interface PortfolioProtocolError {
+    error: string;
+    data: null;
+}
+/** What getPortfolioData reads besides positions and markets. Both default to true. */
+export interface PortfolioDataOptions {
+    /** stakingPositions; with false it comes back as {} and no staking source is read. */
+    staking?: boolean;
+    /** rewardsData; with false it comes back as {} and no rewards source is read. */
+    rewards?: boolean;
+}
 export interface PortfolioPositionsDataForAddress {
     aaveV3: {
         [key in AaveVersions]?: PortfolioProtocolData<AaveV3PositionData>;
@@ -59,3 +73,67 @@ export interface PortfolioPositionsDataForAddress {
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
+/**
+ * The staking positions getPortfolioData returns for an address. The shapes are uneven, and the DeFi Saver app
+ * parses them as they are: a protocol read once per address comes back unwrapped on success, as
+ * `{ error, data: null }` on failure, and as {} (or Fluid's `{ error: '', data: {} }`) on a network it is not read on.
+ */
+export interface PortfolioStakingPositionsDataForAddress {
+    /** stkAAVE, stkGHO and sGHO; mainnet only. */
+    aaveV3: StakeAaveData | PortfolioProtocolError | {};
+    /** Morpho Blue supply without a borrow (Earn), by market; only markets with a deposit or an error. */
+    morphoBlue: {
+        [key in MorphoBlueVersions]?: PortfolioProtocolData<MorphoBlueEarnData>;
+    };
+    compoundV3: Record<string, never>;
+    spark: Record<string, never>;
+    aaveV2: Record<string, never>;
+    compoundV2: Record<string, never>;
+    /** LQTY staking and the LUSD stability pool; mainnet only. */
+    liquity: LiquityStakingData | PortfolioProtocolError | {};
+    /** Stability pool deposits, by market; mainnet only, legacy markets left out. */
+    liquityV2: {
+        [key in LiquityV2Versions]?: PortfolioProtocolData<LiquityV2StakingData>;
+    };
+    /** Fluid lending (fToken) deposits; `{ error: '', data: {} }` on a network without Fluid. */
+    fluid: FluidEarnPositionData[] | PortfolioProtocolError | {
+        error: string;
+        data: Record<string, never>;
+    };
+    /** Umbrella stakes; absent off mainnet. */
+    umbrella?: UmbrellaStakingData | PortfolioProtocolError;
+    /** sBOLD, yBOLD and stYBOLD; data is null off mainnet. */
+    liquityV2SBoldYBold: PortfolioProtocolData<LiquityV2SBoldYBoldData>;
+}
+export type PortfolioStakingPositionsData = Record<EthAddress, PortfolioStakingPositionsDataForAddress>;
+/** The claimable rewards getPortfolioData returns for an address. Off mainnet only Merkl and Aave V3 are read. */
+export interface PortfolioRewardsDataForAddress {
+    merkl: PortfolioProtocolData<MerklRewardsClaimableToken[]>;
+    aaveV3: {
+        [key in AaveVersions]?: PortfolioProtocolData<AaveRewardsClaimableToken[]>;
+    };
+    spark: {
+        [key in SparkVersions]?: PortfolioProtocolData<SparkRewardsClaimableToken[]>;
+    };
+    /** The SPK airdrop. */
+    spk: PortfolioProtocolData<SparkAirdropClaimableToken[]>;
+    king: PortfolioProtocolData<KingRewardsClaimableToken[]>;
+    /** {} off mainnet. */
+    ethena: PortfolioProtocolData<EthenaAirdropClaimableToken[]> | {};
+    uniswap: PortfolioProtocolData<UniswapAirdropClaimableToken[]>;
+}
+export type PortfolioRewardsData = Record<EthAddress, PortfolioRewardsDataForAddress>;
+/** The `markets` getPortfolioData returns: every market it read, by protocol, keyed by market or spoke. */
+export interface PortfolioMarketsData {
+    morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
+    morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
+    compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
+    sparkMarketsData: Record<string, SparkMarketsData>;
+    aaveV3MarketsData: Record<string, AaveV3MarketData>;
+    aaveV2MarketsData: Record<string, AaveV2MarketData>;
+    compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
+    crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
+    llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
+    liquityV2MarketsData: Record<string, LiquityV2MarketData>;
+    aaveV4SpokesData: Record<string, AaveV4SpokeData>;
+}

package/esm/umbrella/index.d.ts

@@ -1,5 +1,4 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getUmbrellaData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
-    [k: string]: any;
-}>;
+import { UmbrellaStakingData } from '../types/aave';
+export declare const getUmbrellaData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<UmbrellaStakingData>;

package/package.json

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

package/src/aaveV3/index.ts

@@ -30,6 +30,7 @@ import {
   EModeCategoriesData,
   EModeCategoryData,
   EModeCategoryDataMapping,
+  StakeAaveData,
 } from '../types';
 import {
   Blockish,
@@ -608,7 +609,7 @@ export const fetchYearlyMeritApyForStakingGho = async () => {
   }
 };
 
-export const getStakeAaveData = async (provider: Client, network: NetworkNumber, address: EthAddress) => {
+export const getStakeAaveData = async (provider: Client, network: NetworkNumber, address: EthAddress): Promise<StakeAaveData> => {
   const stkGhoAddress = getAssetInfo('stkGHO').address as HexString;
   const stkAaveAddress = getAssetInfo('stkAAVE').address as HexString;
 

package/src/aaveV3/sgho.ts

@@ -1,25 +1,10 @@
 import Dec from 'decimal.js';
 import { EthAddress, NetworkNumber } from '../types/common';
+import { SghoData } from '../types/aave';
 import { DEFAULT_TIMEOUT } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 
-export interface SghoUserData {
-  shares: string;
-  balance: string;
-  maxDeposit: string;
-  maxWithdraw: string;
-  underlyingBalance: string;
-}
-
-export interface SghoData {
-  totalAssets: string;
-  totalSupply: string;
-  supplyCap: string;
-  /** Target savings rate as an APY percent (e.g. "4.25" for 4.25%). */
-  targetRate: string;
-  paused: boolean;
-  user: SghoUserData;
-}
+export type { SghoData, SghoUserData } from '../types/aave';
 
 const EMPTY_SGHO_DATA: SghoData = {
   totalAssets: '0',

package/src/claiming/aaveV3.ts

@@ -1,7 +1,9 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
 import { EthAddress, NetworkNumber } from '../types';
-import { ClaimableToken, ClaimType, MerklRewardsClaimableToken } from '../types/claiming';
+import {
+  AaveRewardsClaimableToken, ClaimableToken, ClaimType, MerklRewardsClaimableToken,
+} from '../types/claiming';
 import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveRewardsControllerViem,
@@ -37,7 +39,7 @@ export async function getUnclaimedRewardsForAllMarkets(
   network: NetworkNumber,
   walletAddress: EthAddress,
   marketAddress: EthAddress,
-): Promise<ClaimableToken[]> {
+): Promise<AaveRewardsClaimableToken[]> {
   const contract = AaveIncentiveDataProviderV3ContractViem(provider, network);
   const tokensData = await contract.read.getUserReservesIncentivesData([marketAddress, walletAddress]);
   const allTokensDataArrays = tokensData.reduce((acc: any[], val) => {

package/src/claiming/ethena.ts

@@ -2,7 +2,7 @@ import { getAssetInfo } from '@defisaver/tokens';
 import Dec from 'decimal.js';
 import { getAddress } from 'viem';
 import { EthAddress } from '../types/common';
-import { ClaimType } from '../types/claiming';
+import { ClaimType, EthenaAirdropClaimableToken } from '../types/claiming';
 import { getEthAmountForDecimals } from '../services/utils';
 
 export const fetchEthenaAirdropReward = async (address: EthAddress) => {
@@ -23,11 +23,11 @@ export const fetchEthenaAirdropReward = async (address: EthAddress) => {
   }
 };
 
-export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]): Promise<Record<string, any[]>> => {
+export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]): Promise<Record<string, EthenaAirdropClaimableToken[]>> => {
   const apiDataPromises = walletAddresses.map(address => fetchEthenaAirdropReward(address));
   const apiDataArray = await Promise.all(apiDataPromises);
 
-  const results: Record<string, any[]> = {};
+  const results: Record<string, EthenaAirdropClaimableToken[]> = {};
   for (let i = 0; i < walletAddresses.length; i++) {
     const walletAddress = walletAddresses[i];
     const data = apiDataArray[i];
@@ -36,7 +36,7 @@ export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]):
       continue;
     }
 
-    const processedRewards = [];
+    const processedRewards: EthenaAirdropClaimableToken[] = [];
     const assetInfo = getAssetInfo('sENA');
 
     const amount = getEthAmountForDecimals(data.events[0].awardAmount, assetInfo.decimals);
@@ -47,7 +47,7 @@ export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]):
         underlyingSymbol: assetInfo.symbol,
         amount,
         claimType: ClaimType.ETHENA_AIRDROP,
-        tokenAddress: assetInfo.address,
+        tokenAddress: assetInfo.address as EthAddress,
         walletAddress,
         label: 'Ethena Airdrop',
       });

package/src/claiming/king.ts

@@ -3,7 +3,7 @@ import { assetAmountInEth } from '@defisaver/tokens';
 import { Client } from 'viem';
 import { UUPSViem } from '../contracts';
 import { EthAddress, HexString, NetworkNumber } from '../types/common';
-import { ClaimType } from '../types/claiming';
+import { ClaimType, KingRewardsClaimableToken } from '../types/claiming';
 
 export const fetchKingRewards = async (walletAddress: EthAddress) => {
   try {
@@ -19,7 +19,7 @@ export const fetchKingRewards = async (walletAddress: EthAddress) => {
   }
 };
 
-export const getKingRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => {
+export const getKingRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]): Promise<Record<string, KingRewardsClaimableToken[]>> => {
   // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
   const apiDataPromises = walletAddresses.map(address => fetchKingRewards(address));
   const apiDataArray = await Promise.all(apiDataPromises);
@@ -31,7 +31,7 @@ export const getKingRewards = async (provider: Client, network: NetworkNumber, w
   const cumulativeResults = await Promise.all(cumulativePromises);
 
   // Process results
-  const results: Record<string, any[]> = {};
+  const results: Record<string, KingRewardsClaimableToken[]> = {};
 
   for (let i = 0; i < walletAddresses.length; i++) {
     const walletAddress = walletAddresses[i];

package/src/claiming/spark.ts

@@ -7,7 +7,9 @@ import {
   SparkRewardsControllerViem,
 } from '../contracts';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { ClaimType, SparkAirdropType, SparkRewardsClaimableToken } from '../types/claiming';
+import {
+  ClaimType, SparkAirdropClaimableToken, SparkAirdropType, SparkRewardsClaimableToken,
+} from '../types/claiming';
 import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
 
 const IGNITION_REWARDS = '0xCBA0C0a2a0B6Bb11233ec4EA85C5bFfea33e724d';
@@ -50,7 +52,7 @@ export const fetchSparkAirdropRewards = async (
   provider: Client,
   network: NetworkNumber,
   walletAddresses: EthAddress[],
-) => {
+): Promise<Record<string, SparkAirdropClaimableToken[]>> => {
   // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
   const apiDataPromises = walletAddresses.map(address => fetchSpkAirdropRewards(address));
   const apiDataArray = await Promise.all(apiDataPromises);
@@ -92,7 +94,7 @@ export const fetchSparkAirdropRewards = async (
   const cumulativeClaimedAmounts = await getCumulativeClaimedSpkAirdrop(provider, network, contractCallsData);
 
   // Process results
-  const results: Record<string, any[]> = {};
+  const results: Record<string, SparkAirdropClaimableToken[]> = {};
   let contractCallIndex = 0;
 
   for (const { walletAddress, data } of allClaimData) {
@@ -101,7 +103,7 @@ export const fetchSparkAirdropRewards = async (
       continue;
     }
 
-    const processedRewards = [];
+    const processedRewards: SparkAirdropClaimableToken[] = [];
     for (let i = 0; i < data.length; i++) {
       const rewardInfo = data[i];
       const assetInfo = getAssetInfoByAddress(rewardInfo.token_address);

package/src/fluid/index.ts

@@ -10,6 +10,7 @@ import {
   FluidAggregatedVaultData,
   FluidAssetData,
   FluidAssetsData,
+  FluidEarnPositionData,
   FluidFTokenDataStructOutput,
   FluidMarketData,
   FluidMarketInfo,
@@ -1597,7 +1598,7 @@ export const getFluidTokenData = async (
   token: string,
 ) => _getFluidTokenData(getViemProvider(provider, network), network, token);
 
-const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string) => {
+const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string): FluidEarnPositionData => {
   const decimals = fTokenData.decimals.toString();
   const depositRate = new Dec(getEthAmountForDecimals(fTokenData.convertToShares.toString(), decimals)).toString();
   const withdrawRate = new Dec(getEthAmountForDecimals(fTokenData.convertToAssets.toString(), decimals)).toString();
@@ -1645,7 +1646,7 @@ export const getFluidDepositData = async (
   address: EthAddress,
 ) => _getFluidDepositData(getViemProvider(provider, network), network, token, address);
 
-export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress) => {
+export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress): Promise<FluidEarnPositionData[]> => {
   const view = FluidViewContractViem(provider, network);
   const [
     [userPositions, fTokensData],
@@ -1664,7 +1665,7 @@ export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, netw
     rewardsData = await rewardsApiResponse.json();
   }
 
-  const parsedRes = fTokensData.reduce<ReturnType<typeof parseFDepositTokenData>[]>((acc, fTokenData, i) => {
+  const parsedRes = fTokensData.reduce<FluidEarnPositionData[]>((acc, fTokenData, i) => {
     const userPosition = userPositions[i];
     const deposited = userPosition?.underlyingAssets;
 

package/src/liquity/index.ts

@@ -13,7 +13,7 @@ import {
   LiquityTroveManagerContractViem,
   LiquityViewContractViem,
 } from '../contracts';
-import { LIQUITY_TROVE_STATUS_ENUM, LiquityTroveInfo } from '../types';
+import { LIQUITY_TROVE_STATUS_ENUM, LiquityStakingData, LiquityTroveInfo } from '../types';
 import { ZERO_ADDRESS } from '../constants';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { getEthAmountForDecimals } from '../services/utils';
@@ -113,7 +113,7 @@ export const _getLiquityTroveInfo = async (provider: Client, network: NetworkNum
 
 export const getLiquityTroveInfo = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress): Promise<LiquityTroveInfo> => _getLiquityTroveInfo(getViemProvider(provider, network, { batch: { multicall: true } }), network, address);
 
-export const getLiquityStakingData = async (provider: Client, network: NetworkNumber, address: EthAddress) => {
+export const getLiquityStakingData = async (provider: Client, network: NetworkNumber, address: EthAddress): Promise<LiquityStakingData> => {
   const lqtyStakingView = LiquityLQTYStakingViem(provider, network);
   const stabilityPoolView = LiquityStabilityPoolViem(provider, network);
   const [

package/src/liquityV2/index.ts

@@ -12,7 +12,7 @@ import {
 } from '../types/common';
 import {
   LIQUITY_V2_TROVE_STATUS_ENUM,
-  LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2UsedAssets,
+  LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2UsedAssets,
   LiquityV2Versions,
 } from '../types';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
@@ -579,7 +579,7 @@ const calculateSPApy = (
   return apy;
 };
 
-export const getLiquityV2Staking = async (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => {
+export const getLiquityV2Staking = async (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress): Promise<LiquityV2StakingData> => {
   const stabilityPoolView = createViemContractFromConfigFunc('LiquityV2StabilityPool', stabilityPoolAddrForMarket[market])(provider, network);
   const activePoolView = createViemContractFromConfigFunc('LiquityV2ActivePool', activePoolAddrForMarket[market])(provider, network);
 
@@ -638,7 +638,7 @@ export const getLiquityV2Staking = async (provider: Client, network: NetworkNumb
   };
 };
 
-export const getLiquitySAndYBold = async (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => {
+export const getLiquitySAndYBold = async (provider: Client, network: NetworkNumber, markets: any, user: EthAddress): Promise<LiquityV2SBoldYBoldData> => {
   const sBold = LiquityV2sBoldVaultViem(provider, network);
   const yBold = createViemContractFromConfigFunc('Erc4626', '0x9F4330700a36B29952869fac9b33f45EEdd8A3d8')(provider, network);
   const stYBold = createViemContractFromConfigFunc('Erc4626', '0x23346B04a7f55b8760E5860AA5A77383D63491cD')(provider, network);