@defisaver/positions-sdk 2.1.169-portfolio-api-dev → 2.1.169

package/esm/types/savings/index.d.ts

@@ -20,12 +20,4 @@ export interface SavingsVaultData {
     asset: string;
     optionType: string;
 }
-/** The key of every savings vault getSavingsData reads. */
-export type SavingsVaultKey = MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType;
-export type SavingsData = Partial<Record<SavingsVaultKey, SavingsVaultData>>;
-/** Why each vault that was read for a network came back without data. */
-export type SavingsErrors = Partial<Record<SavingsVaultKey, string>>;
-export interface SavingsDataWithErrors {
-    data: SavingsData;
-    errors: SavingsErrors;
-}
+export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType, SavingsVaultData>>;

package/esm/types/spark.d.ts

@@ -46,21 +46,6 @@ export interface SparkAssetData extends MMAssetData {
     eModeCategory: number;
     liquidationBonus: string;
     liquidationRatio: string;
-    debtCeilingForIsolationMode?: string;
-    isSiloed?: boolean;
-    isolationModeTotalDebt?: string;
-    isolationModeBorrowingEnabled?: boolean;
-    assetId?: number;
-    borrowRateStable?: string;
-    supplyCap?: string;
-    isInactive?: boolean;
-    isFrozen?: boolean;
-    isPaused?: boolean;
-    canBeWithdrawn?: boolean;
-    canBePayBacked?: boolean;
-    disabledStableBorrowing?: boolean;
-    isFlashLoanEnabled?: boolean;
-    aTokenAddress?: EthAddress;
 }
 export interface SparkAssetsData {
     [token: string]: SparkAssetData;
@@ -116,12 +101,7 @@ export interface SparkAggregatedPositionData {
     minHealthRatio: string;
     exposure: string;
 }
-/**
- * Fields sparkGetAggregatedPositionData adds to every Spark position at runtime, on top of those declared below.
- * Optional, so code that builds a position by hand keeps compiling.
- */
-export type SparkPositionAggregatedFields = Partial<Omit<SparkAggregatedPositionData, keyof MMPositionData | 'ratio' | 'collRatio' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd' | 'suppliedCollateralUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
-export interface SparkPositionData extends MMPositionData, SparkPositionAggregatedFields {
+export interface SparkPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;

package/esm/umbrella/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.169-portfolio-api-dev",
+  "version": "2.1.169",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -22,7 +22,7 @@
   "repository": "https://github.com/defisaver/defisaver-positions-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.45",
+    "@defisaver/tokens": "^1.7.50",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV3/index.ts

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

package/src/aaveV3/sgho.ts

@@ -1,10 +1,25 @@
 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 type { SghoData, SghoUserData } from '../types/aave';
+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;
+}
 
 const EMPTY_SGHO_DATA: SghoData = {
   totalAssets: '0',

package/src/aaveV4/lend.ts

@@ -7,9 +7,26 @@ import {
   EthereumProvider,
   NetworkNumber,
 } from '../types/common';
-import { AaveV4TokenizationSpokeDataParsed } from '../types/aaveV4';
 
-export type { AaveV4TokenizationSpokeData, AaveV4TokenizationSpokeDataParsed } from '../types/aaveV4';
+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> = {
   EURC_CORE: '0x6D9e2Cdd61CaF69af99b275704B6e272C41c6718',
@@ -85,6 +102,34 @@ export const aaveV4GetTokenizedVaultAddress = (
   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;
+  // ---- Spoke ----
+  spokeActive: boolean;
+  spokeHalted: boolean;
+  /** Deposit cap in asset units (wei string) */
+  spokeDepositCap: string;
+  /** Total assets currently in spoke in asset units (wei string) */
+  spokeTotalAssets: string;
+  // ---- Hub ----
+  /** Available hub liquidity in asset units (wei string) */
+  hubLiquidity: string;
+  /** The conversion rate from assets to shares expressed in asset units. */
+  convertToShares: string;
+  // ---- User ----
+  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]) => {
@@ -144,3 +189,4 @@ export async function getAaveV4TokenizationSpokesData(
   }).filter(item => item != null);
 }
 
+

package/src/claiming/aaveV3.ts

@@ -1,9 +1,7 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
 import { EthAddress, NetworkNumber } from '../types';
-import {
-  AaveRewardsClaimableToken, ClaimableToken, ClaimType, MerklRewardsClaimableToken,
-} from '../types/claiming';
+import { ClaimableToken, ClaimType, MerklRewardsClaimableToken } from '../types/claiming';
 import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveRewardsControllerViem,
@@ -39,7 +37,7 @@ export async function getUnclaimedRewardsForAllMarkets(
   network: NetworkNumber,
   walletAddress: EthAddress,
   marketAddress: EthAddress,
-): Promise<AaveRewardsClaimableToken[]> {
+): Promise<ClaimableToken[]> {
   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, EthenaAirdropClaimableToken } from '../types/claiming';
+import { ClaimType } 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, EthenaAirdropClaimableToken[]>> => {
+export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]): Promise<Record<string, any[]>> => {
   const apiDataPromises = walletAddresses.map(address => fetchEthenaAirdropReward(address));
   const apiDataArray = await Promise.all(apiDataPromises);
 
-  const results: Record<string, EthenaAirdropClaimableToken[]> = {};
+  const results: Record<string, any[]> = {};
   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: EthenaAirdropClaimableToken[] = [];
+    const processedRewards = [];
     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 as EthAddress,
+        tokenAddress: assetInfo.address,
         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, KingRewardsClaimableToken } from '../types/claiming';
+import { ClaimType } 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[]): Promise<Record<string, KingRewardsClaimableToken[]>> => {
+export const getKingRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => {
   // 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, KingRewardsClaimableToken[]> = {};
+  const results: Record<string, any[]> = {};
 
   for (let i = 0; i < walletAddresses.length; i++) {
     const walletAddress = walletAddresses[i];

package/src/claiming/spark.ts

@@ -7,9 +7,7 @@ import {
   SparkRewardsControllerViem,
 } from '../contracts';
 import { EthAddress, NetworkNumber } from '../types/common';
-import {
-  ClaimType, SparkAirdropClaimableToken, SparkAirdropType, SparkRewardsClaimableToken,
-} from '../types/claiming';
+import { ClaimType, SparkAirdropType, SparkRewardsClaimableToken } from '../types/claiming';
 import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
 
 const IGNITION_REWARDS = '0xCBA0C0a2a0B6Bb11233ec4EA85C5bFfea33e724d';
@@ -52,7 +50,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);
@@ -94,7 +92,7 @@ export const fetchSparkAirdropRewards = async (
   const cumulativeClaimedAmounts = await getCumulativeClaimedSpkAirdrop(provider, network, contractCallsData);
 
   // Process results
-  const results: Record<string, SparkAirdropClaimableToken[]> = {};
+  const results: Record<string, any[]> = {};
   let contractCallIndex = 0;
 
   for (const { walletAddress, data } of allClaimData) {
@@ -103,7 +101,7 @@ export const fetchSparkAirdropRewards = async (
       continue;
     }
 
-    const processedRewards: SparkAirdropClaimableToken[] = [];
+    const processedRewards = [];
     for (let i = 0; i < data.length; i++) {
       const rewardInfo = data[i];
       const assetInfo = getAssetInfoByAddress(rewardInfo.token_address);

package/src/fluid/index.ts

@@ -11,7 +11,6 @@ import {
   FluidAggregatedVaultData,
   FluidAssetData,
   FluidAssetsData,
-  FluidEarnPositionData,
   FluidFTokenDataStructOutput,
   FluidMarketData,
   FluidMarketInfo,
@@ -1599,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): FluidEarnPositionData => {
+const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string) => {
   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();
@@ -1647,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): Promise<FluidEarnPositionData[]> => {
+export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress) => {
   const view = FluidViewContractViem(provider, network);
   const [
     [userPositions, fTokensData],
@@ -1666,7 +1665,7 @@ export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, netw
     rewardsData = await rewardsApiResponse.json();
   }
 
-  const parsedRes = fTokensData.reduce<FluidEarnPositionData[]>((acc, fTokenData, i) => {
+  const parsedRes = fTokensData.reduce<ReturnType<typeof parseFDepositTokenData>[]>((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, LiquityStakingData, LiquityTroveInfo } from '../types';
+import { LIQUITY_TROVE_STATUS_ENUM, LiquityTroveInfo } from '../types';
 import { ZERO_ADDRESS } from '../constants';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { getEthAmountForDecimals } from '../services/utils';
@@ -127,7 +127,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): Promise<LiquityStakingData> => {
+export const getLiquityStakingData = async (provider: Client, network: NetworkNumber, address: EthAddress) => {
   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, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2UsedAssets,
+  LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2UsedAssets,
   LiquityV2Versions,
 } from '../types';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
@@ -162,35 +162,31 @@ export const nftContractCreationBlockMapping = {
   [LiquityV2Versions.LiquityV2REthLegacy]: 21686257,
 };
 
-interface TroveTransfer {
-  from?: EthAddress,
-  to?: EthAddress,
-  tokenId: string,
-  blockNumber: number,
-}
-
-/** Every Transfer of a market's trove NFT since the contract was created (or, on a fork, in the last 1000 blocks). */
-const getTroveTransfers = async (provider: PublicClient, network: NetworkNumber, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, market: LiquityV2Versions): Promise<TroveTransfer[]> => {
+const getTransferredTroves = async (provider: PublicClient, network: NetworkNumber, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, market: LiquityV2Versions, account: EthAddress): Promise<{ troveId: string }[]> => {
   const nftContract = createViemContractFromConfigFunc('LiquityV2TroveNFT', troveNFTAddress)(provider, network);
   const nftContractCreationBlock = nftContractCreationBlockMapping[market];
   const currentBlock = +(await provider.getBlockNumber()).toString();
   const _events = await nftContract.getEvents.Transfer({}, { fromBlock: limitBlocksForEventFetching ? BigInt(currentBlock - 1000) : BigInt(nftContractCreationBlock) });
-  return _events.map((event) => ({
+  const events = _events.map((event) => ({
     from: event.args.from, to: event.args.to, tokenId: event.args.tokenId!.toString(), blockNumber: +(event.blockNumber.toString()),
   }));
-};
+  const userTransferredTroves = events.filter((event) => compareAddresses(event.to, account));
 
-/** The troves transferred to an account that it still holds: no later transfer of the same trove. */
-const getAccountTransferredTroves = (events: TroveTransfer[], account: EthAddress): { troveId: string }[] => events
-  .filter((event) => compareAddresses(event.to, account))
-  .filter((event) => !events.some((e) => event.blockNumber < e.blockNumber && e.tokenId === event.tokenId))
-  .map((event) => ({ troveId: event.tokenId }));
-
-const getTransferredTroves = async (provider: PublicClient, network: NetworkNumber, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, market: LiquityV2Versions, account: EthAddress): Promise<{ troveId: string }[]> => (
-  getAccountTransferredTroves(await getTroveTransfers(provider, network, troveNFTAddress, limitBlocksForEventFetching, market), account));
+  // check if the last know transfer address is the user
+  userTransferredTroves.forEach((event, index) => {
+    const otherTransfers = events.filter((e) => event.blockNumber < e.blockNumber && e.tokenId === event.tokenId);
+    // @ts-ignore
+    userTransferredTroves[index].invalid = !!otherTransfers.length;
+  });
+  // @ts-ignore
+  return userTransferredTroves.filter((event) => !event.invalid).map((event) => ({ troveId: event.tokenId }));
+};
 
-/** The troves an account opened and still owns, then the ones transferred to it, each once. */
-const mergeTroveIds = (userTroves: { troveId: string }[], userTransferredTroves: { troveId: string }[]): { troveId: string }[] => {
+export const _getLiquityV2UserTroveIds = async (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress): Promise<{ troves: { troveId: string }[], nextFreeTroveIndex: string }> => {
+  const [{ troves: userTroves, nextFreeTroveIndex }, userTransferredTroves] = await Promise.all([
+    getUserTroves(provider, network, selectedMarket.isLegacy, account, selectedMarket.marketAddress),
+    getTransferredTroves(provider, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.value, account),
+  ]);
   const troves = [...userTroves.map(({ troveId }) => ({ troveId })), ...userTransferredTroves];
   const filteredTroves = troves.filter((value, index, self) => index === self.findIndex((t) => (
     t.troveId === value.troveId
@@ -199,30 +195,8 @@ const mergeTroveIds = (userTroves: { troveId: string }[], userTransferredTroves:
   const troveIds = filteredTroves.map((trove) => trove.troveId);
   const troveIdsSet = new Set(troveIds);
   const troveIdsArray = Array.from(troveIdsSet);
-  return troveIdsArray.map((troveId) => troves.find((trove) => trove.troveId === troveId)) as { troveId: string }[];
-};
-
-/**
- * The trove ids of several accounts in one market: the market's NFT transfers are read once for all of them, rather
- * than once per account as _getLiquityV2UserTroveIds does.
- */
-export const _getLiquityV2UsersTroveIds = async (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, accounts: EthAddress[]): Promise<Record<EthAddress, string[]>> => {
-  const [userTroves, events] = await Promise.all([
-    Promise.all(accounts.map((account) => getUserTroves(provider, network, selectedMarket.isLegacy, account, selectedMarket.marketAddress))),
-    getTroveTransfers(provider, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.value),
-  ]);
-  return Object.fromEntries(accounts.map((account, i) => [
-    account,
-    mergeTroveIds(userTroves[i].troves, getAccountTransferredTroves(events, account)).map(({ troveId }) => troveId),
-  ]));
-};
-
-export const _getLiquityV2UserTroveIds = async (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress): Promise<{ troves: { troveId: string }[], nextFreeTroveIndex: string }> => {
-  const [{ troves: userTroves, nextFreeTroveIndex }, userTransferredTroves] = await Promise.all([
-    getUserTroves(provider, network, selectedMarket.isLegacy, account, selectedMarket.marketAddress),
-    getTransferredTroves(provider, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.value, account),
-  ]);
-  return { troves: mergeTroveIds(userTroves, userTransferredTroves), nextFreeTroveIndex };
+  const trovesNoDuplicates = troveIdsArray.map((troveId) => troves.find((trove) => trove.troveId === troveId)) as { troveId: string }[];
+  return { troves: trovesNoDuplicates, nextFreeTroveIndex };
 };
 
 export const getLiquityV2UserTroveIds = async (
@@ -605,7 +579,7 @@ const calculateSPApy = (
   return apy;
 };
 
-export const getLiquityV2Staking = async (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress): Promise<LiquityV2StakingData> => {
+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);
 
@@ -664,7 +638,7 @@ export const getLiquityV2Staking = async (provider: Client, network: NetworkNumb
   };
 };
 
-export const getLiquitySAndYBold = async (provider: Client, network: NetworkNumber, markets: any, user: EthAddress): Promise<LiquityV2SBoldYBoldData> => {
+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);

package/src/markets/morphoBlue/index.ts

@@ -1659,6 +1659,21 @@ export const MORPHO_BLUE_CBXRP_USDC_625_BASE = (networkId: NetworkNumber = Netwo
   marketId: '0xd4a903dc6d949519060c7707f9604fdc9772c046e05c2e3a8fce0bd7196e4109',
   protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_CBHYPE_USDC_625_BASE = (networkId: NetworkNumber = NetworkNumber.Base): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'cbHYPE/USDC',
+  value: MorphoBlueVersions.MorphoBlueCbHYPEUSDC_625_Base,
+  url: 'cbhypeusdc-76629002',
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+  collateralToken: '0xB200000000000000000000451d033a5000cb479e',
+  oracle: '0x7FaD8B8De2DDb7b4B415e1Aa3613e45EeF9E4bFf',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.625,
+  marketId: '0x76629002c9fdb20fb2092053a4f22c5c65e04a81887218b9546f2a2d82b4c0a8',
+  protocolName: 'morpho-blue',
+});
 
 // ARBITRUM
 export const MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
@@ -1935,6 +1950,7 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueUSDeUSDC_915_Base]: MORPHO_BLUE_USDE_USDC_915_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbEthUSDC_770_Base]: MORPHO_BLUE_CBETH_USDC_770_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbXRPUSDC_625_Base]: MORPHO_BLUE_CBXRP_USDC_625_BASE(networkId),
+  [MorphoBlueVersions.MorphoBlueCbHYPEUSDC_625_Base]: MORPHO_BLUE_CBHYPE_USDC_625_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: MORPHO_BLUE_CBETH_ETH_945_BASE(networkId),
   [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),