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

package/cjs/types/portfolio.d.ts

@@ -1,47 +1,20 @@
-import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions, StakeAaveData, UmbrellaStakingData } from './aave';
+import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions } from './aave';
 import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
-import { AaveRewardsClaimableToken, EthenaAirdropClaimableToken, KingRewardsClaimableToken, MerklRewardsClaimableToken, SparkAirdropClaimableToken, SparkRewardsClaimableToken, UniswapAirdropClaimableToken } from './claiming';
 import { EthAddress } from './common';
 import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
 import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidEarnPositionData, FluidMarketData, FluidVaultData } from './fluid';
-import { LiquityStakingData, LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
+import { FluidMarketData, FluidVaultData } from './fluid';
+import { LiquityTroveInfo } from './liquity';
+import { LiquityV2MarketData } from './liquityV2';
 import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData, IlkInfo } from './maker';
-import { MorphoBlueEarnData, MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { 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 markets. */
-export interface PortfolioDataOptions {
-    /** positions (lending); default true. With false it comes back as {} and no lending position is read. */
-    positions?: boolean;
-    /** stakingPositions; default true. With false it comes back as {} and no staking source is read. */
-    staking?: boolean;
-    /** rewardsData; default true. With false it comes back as {} and no rewards source is read. */
-    rewards?: boolean;
-    /**
-     * Liquity V2 troves in positions[address].liquityV2; default false, as the DeFi Saver app reads them on its own.
-     * Mainnet only: elsewhere liquityV2 is {}. Needs positions.
-     */
-    liquityV2?: boolean;
-}
-/** One Liquity V2 market's troves of an address, by trove id — with an error when the ids or any trove failed to load. */
-export interface PortfolioLiquityV2Troves {
-    error: string;
-    data: {
-        [troveId: string]: LiquityV2TroveData;
-    };
-}
 export interface PortfolioPositionsDataForAddress {
     aaveV3: {
         [key in AaveVersions]?: PortfolioProtocolData<AaveV3PositionData>;
@@ -83,65 +56,10 @@ export interface PortfolioPositionsDataForAddress {
     aaveV4: {
         [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
     };
-    /** Only with the liquityV2 option. Every trove the address holds, by market. */
-    liquityV2?: {
-        [key in LiquityV2Versions]?: PortfolioLiquityV2Troves;
-    };
 }
 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>;
@@ -154,44 +72,6 @@ export interface PortfolioMarketsData {
     llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
     liquityV2MarketsData: Record<string, LiquityV2MarketData>;
     aaveV4SpokesData: Record<string, AaveV4SpokeData>;
-}
-/**
- * The `markets` getShifterPortfolioData returns: the portfolio's markets, plus Fluid's and Maker's, which the shifter
- * offers as destinations. Kept apart from PortfolioMarketsData, which getPortfolioData does not fill these into.
- */
-export interface ShifterPortfolioMarketsData extends PortfolioMarketsData {
     fluidMarketsData: Record<string, FluidMarketData>;
     makerMarketsData: Record<string, IlkInfo>;
 }
-/** The markets that could not be read, by their key in PortfolioMarketsData, then by market or spoke: the error. */
-export type PortfolioMarketsErrors = {
-    [key in keyof PortfolioMarketsData]?: Record<string, string>;
-};
-/**
- * What the portfolio fetch could not read and has no `{ error, data }` entry of its own to report it in. A key is
- * present only when something under it failed; {} when everything was read.
- */
-export interface PortfolioErrors {
-    /** Markets missing from `markets`; every position on such a market is an entry with an error. */
-    markets?: PortfolioMarketsErrors;
-    /** Addresses whose Maker vault list could not be read: their `maker` is {}, which would otherwise read as "no vaults". */
-    makerCdps?: Record<EthAddress, string>;
-}
-/** getPortfolioMarketsData's result. */
-export interface PortfolioMarketsResult {
-    /** Every market read; one that failed is missing and named in `errors`. */
-    markets: PortfolioMarketsData;
-    errors: PortfolioMarketsErrors;
-}
-/** getPortfolioUserData's result: what is read per address. */
-export interface PortfolioUserData {
-    positions: PortfolioPositionsData;
-    stakingPositions: PortfolioStakingPositionsData;
-    rewardsData: PortfolioRewardsData;
-    errors: Pick<PortfolioErrors, 'makerCdps'>;
-}
-/** getPortfolioData's result. */
-export interface PortfolioData extends Omit<PortfolioUserData, 'errors'> {
-    markets: PortfolioMarketsData;
-    errors: PortfolioErrors;
-}

package/cjs/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/cjs/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/cjs/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/esm/aaveV3/index.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping, StakeAaveData } from '../types';
+import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 import { getMeritCampaigns } from './merit';
 import { getMerkleCampaigns } from './merkl';
@@ -76,7 +76,17 @@ export declare const getAaveV3AccountData: (provider: EthereumProvider, network:
 export declare const getAaveV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV3PositionData>;
 export declare const REWARDABLE_ASSETS: readonly ["0x028171bCA77440897B824Ca71D1c56caC55b68A3", "0x6C3c78838c761c6Ac7bE9F59fe808ea2A6E4379d", "0xD37EE7e4f452C6638c96536e68090De8cBcdb583", "0x279AF5b99540c1A3A7E3CDd326e19659401eF99e", "0xBcca60bB61934080951369a648Fb03DF4F96263C", "0x619beb58998eD2278e08620f97007e1116D5D25b", "0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811", "0x531842cEbbdD378f8ee36D171d6cC9C4fcf475Ec", "0x9ff58f4fFB29fA2266Ab25e75e2A8b3503311656", "0x9c39809Dec7F95F5e0713634a4D0701329B3b4d2", "0x030bA81f1c18d280636F32af80b9AAd02Cf0854e", "0xF63B34710400CAd3e044cFfDcAb00a0f32E33eCf", "0xa06bC25B5805d5F8d82847D191Cb4Af5A3e873E0", "0x0b8f12b1788BFdE65Aa1ca52E3e9F3Ba401be16D", "0x6C5024Cd4F8A59110119C56f8933403A539555EB", "0xdC6a3Ab17299D9C2A412B0e0a4C1f55446AE0817", "0x5165d24277cD063F5ac44Efd447B27025e888f37", "0x7EbD09022Be45AD993BAA1CEc61166Fcc8644d97", "0xF256CC7847E919FAc9B808cC216cAc87CCF2f47a", "0xfAFEDF95E21184E3d880bd56D4806c4b8d31c69A", "0xB9D7CB55f463405CDfBe4E90a6D2Df01C2B92BF1", "0x5BdB050A92CADcCfCDcCCBFC17204a1C9cC0Ab73", "0xc713e5E149D5D0715DcD1c156a020976e7E56B88", "0xba728eAd5e496BE00DCF66F650b6d7758eCB50f8", "0x101cc05f4A51C0319f570d5E146a8C625198e636", "0x01C0eb1f8c6F1C1bF74ae028697ce7AA2a8b0E92", "0xc9BC48c72154ef3e5425641a3c747242112a46AF", "0xB5385132EE8321977FfF44b60cDE9fE9AB0B4e6b", "0x272F97b7a56a387aE942350bBC7Df5700f8a4576", "0x13210D4Fe0d5402bd7Ecbc4B5bC5cFcA3b71adB0", "0x2e8f4bdbe3d47d7d7de490437aea9915d930f1a3", "0xfdb93b3b10936cf81fa59a02a7523b6e2149b2b7", "0xA361718326c15715591c299427c62086F69923D9", "0xbA429f7011c9fa04cDd46a2Da24dc0FF0aC6099c", "0xd4937682df3C8aEF4FE912A96A74121C0829E664", "0xfE8F19B17fFeF0fDbfe2671F248903055AFAA8Ca", "0x683923dB55Fead99A79Fa01A27EeC3cB19679cC3", "0xC2e10006AccAb7B45D9184FcF5b7EC7763f5BaAe", "0x8dAE6Cb04688C62d939ed9B68d32Bc62e49970b1", "0x00ad8eBF64F141f1C81e9f8f792d3d1631c6c684", "0x6F634c6135D2EBD550000ac92F494F9CB8183dAe", "0x4dDff5885a67E4EffeC55875a3977D7E60F82ae0"];
 export declare const fetchYearlyMeritApyForStakingGho: () => Promise<string>;
-export declare const getStakeAaveData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<StakeAaveData>;
+export declare const getStakeAaveData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+    activatedCooldown: string;
+    activatedCooldownAmount: string;
+    stkAaveRewardsBalance: string;
+    aaveRewardsBalance: string;
+    stkAaveBalance: string;
+    stkGhoBalance: string;
+    ghoMeritApy: string;
+    stkAaveApy: string;
+    sgho: import("./sgho").SghoData;
+}>;
 export { getMeritCampaigns, getMerkleCampaigns, };
 export { getSghoData } from './sgho';
 export type { SghoData, SghoUserData } from './sgho';

package/esm/aaveV3/sgho.d.ts

@@ -1,4 +1,18 @@
 import { EthAddress, NetworkNumber } from '../types/common';
-import { SghoData } from '../types/aave';
-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;
+}
 export declare const getSghoData: (network: NetworkNumber, address?: EthAddress) => Promise<SghoData>;

package/esm/aaveV4/lend.d.ts

@@ -1,12 +1,53 @@
 import { EthAddress, 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 declare const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress>;
 export declare const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>>;
 export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME' | 'PAXOS';
 export declare const aaveV4GetTokenizedHubKey: (hubNameOrKey?: string | null) => AaveV4TokenizedHubKey | null;
 export declare const aaveV4GetTokenizedVaultKey: (symbol: string, hubNameOrKey?: string | null) => string | null;
 export declare const aaveV4GetTokenizedVaultAddress: (network: NetworkNumber, symbol: string, hubNameOrKey?: string | null) => EthAddress | undefined;
+/** Parsed tokenization spoke data with human-readable supplied amounts for display */
+export interface AaveV4TokenizationSpokeDataParsed {
+    vaultAddress: EthAddress;
+    key: string | null;
+    symbol: string;
+    hubKey: string;
+    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;
+    /** Available hub liquidity in asset units (wei string) */
+    hubLiquidity: string;
+    /** The conversion rate from assets to shares expressed in asset units. */
+    convertToShares: string;
+    userSuppliedAssetsEth: string;
+    userSuppliedSharesEth: string;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+    underlyingAsset: EthAddress;
+    spoke: EthAddress;
+    decimals: number;
+}
 /**
  * Fetches tokenization vault data for the given user via getTokenizationSpokesData.
  * Returns parsed data including userSuppliedAssets in human-readable form for each vault.

package/esm/claiming/aaveV3.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types';
-import { AaveRewardsClaimableToken, ClaimableToken, MerklRewardsClaimableToken } from '../types/claiming';
-export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<AaveRewardsClaimableToken[]>;
+import { ClaimableToken, MerklRewardsClaimableToken } from '../types/claiming';
+export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
 export declare function getMerklUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<MerklRewardsClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/esm/claiming/aaveV3.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { ClaimType, } from '../types/claiming';
+import { ClaimType } from '../types/claiming';
 import { AaveIncentiveDataProviderV3ContractViem, AaveRewardsControllerViem, } from '../contracts';
 import { compareAddresses, getEthAmountForDecimals, LONGER_TIMEOUT } from '../services/utils';
 import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';

package/esm/claiming/ethena.d.ts

@@ -1,4 +1,3 @@
 import { EthAddress } from '../types/common';
-import { EthenaAirdropClaimableToken } from '../types/claiming';
 export declare const fetchEthenaAirdropReward: (address: EthAddress) => Promise<any>;
-export declare const fetchEthenaAirdropRewards: (walletAddresses: EthAddress[]) => Promise<Record<string, EthenaAirdropClaimableToken[]>>;
+export declare const fetchEthenaAirdropRewards: (walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;

package/esm/claiming/king.d.ts

@@ -1,5 +1,4 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { KingRewardsClaimableToken } from '../types/claiming';
 export declare const fetchKingRewards: (walletAddress: EthAddress) => Promise<any>;
-export declare const getKingRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, KingRewardsClaimableToken[]>>;
+export declare const getKingRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;

package/esm/claiming/spark.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { SparkAirdropClaimableToken, SparkRewardsClaimableToken } from '../types/claiming';
+import { SparkRewardsClaimableToken } from '../types/claiming';
 export declare const fetchSpkAirdropRewards: (walletAddress: EthAddress) => Promise<any>;
-export declare const fetchSparkAirdropRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, SparkAirdropClaimableToken[]>>;
+export declare const fetchSparkAirdropRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, any[]>>;
 export declare const fetchSparkRewards: (provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress) => Promise<SparkRewardsClaimableToken[]>;

package/esm/claiming/spark.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import Dec from 'decimal.js';
 import { createViemContractFromConfigFunc, SparkIncentiveDataProviderContractViem, SparkRewardsControllerViem, } from '../contracts';
-import { ClaimType, SparkAirdropType, } from '../types/claiming';
+import { ClaimType, SparkAirdropType } from '../types/claiming';
 import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
 const IGNITION_REWARDS = '0xCBA0C0a2a0B6Bb11233ec4EA85C5bFfea33e724d';
 const PFL3_REWARDS = '0x7ac96180C4d6b2A328D3a19ac059D0E7Fc3C6d41';

package/esm/fluid/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { FluidAssetsData, FluidEarnPositionData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
+import { FluidAssetsData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
 export { FluidMerklOpportunityType, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
@@ -71,10 +71,54 @@ export declare const getFluidTokenData: (provider: EthereumProvider, network: Ne
     depositRate: string;
     withdrawRate: string;
 }>;
-export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<FluidEarnPositionData>;
-export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<FluidEarnPositionData>;
-export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<FluidEarnPositionData[]>;
-export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<FluidEarnPositionData[]>;
+export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}>;
+export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}>;
+export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}[]>;
+export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
+    fTokenAddress: string | undefined;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+    depositRate: string;
+    withdrawRate: string;
+    deposited: string;
+    depositedShares: string;
+}[]>;
 export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
     marketData: FluidMarketData | undefined;
     userData: {

package/esm/liquity/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { LiquityStakingData, LiquityTroveInfo } from '../types';
+import { LiquityTroveInfo } from '../types';
 export declare const LIQUITY_NORMAL_MODE_RATIO = 110;
 export declare const LIQUITY_RECOVERY_MODE_RATIO = 150;
 export declare const _getLiquityAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
@@ -8,4 +8,14 @@ export declare const getLiquityAccountBalances: (provider: EthereumProvider, net
 export declare const getDebtInFront: (provider: EthereumProvider, address: EthAddress) => Promise<string>;
 export declare const _getLiquityTroveInfo: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
 export declare const getLiquityTroveInfo: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
-export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityStakingData>;
+export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
+    totalLUSDDeposited: string;
+    totalLQTYStaked: string;
+    stakedLQTY: string;
+    stakedLUSDBalance: string;
+    rewardETH: string;
+    rewardLUSD: string;
+    stabilityRewardETH: string;
+    stabilityRewardLQTY: string;
+    showStakingBalances: boolean;
+}>;

package/esm/liquityV2/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions } from '../types';
+import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2Versions } from '../types';
 export type SPYieldGainParameters = {
     P: string;
     aggWeightedDebtSum: string;
@@ -19,11 +19,6 @@ export declare const nftContractCreationBlockMapping: {
     liquityv2wstethlegacy: number;
     liquityv2rethlegacy: number;
 };
-/**
- * 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 declare const _getLiquityV2UsersTroveIds: (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, accounts: EthAddress[]) => Promise<Record<EthAddress, string[]>>;
 export declare const _getLiquityV2UserTroveIds: (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress) => Promise<{
     troves: {
         troveId: string;
@@ -57,5 +52,25 @@ export type sBoldYieldParameters = {
     wsETH: string;
     rETH: string;
 };
-export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<LiquityV2StakingData>;
-export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<LiquityV2SBoldYBoldData>;
+export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<{
+    totalBOLDDeposited: string;
+    stakedBOLDBalance: string;
+    stabilityRewardColl: string;
+    stabilityRewardYield: string;
+    showStakingBalances: boolean;
+    debtTokenBalance: string;
+    stabilityPoolApy: string;
+}>;
+export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<{
+    spApy: string;
+    yBoldApy: string;
+    totalBoldDepositedSBold: string;
+    boldRateSBold: string;
+    maxWithdrawSBold: string;
+    totalBoldDepositedYBold: string;
+    boldRateYBold: string;
+    maxWithdrawYBold: string;
+    sBoldBalance: string;
+    yBoldBalance: string;
+    stYBoldBalance: string;
+}>;

package/esm/liquityV2/index.js

@@ -121,53 +121,36 @@ export const nftContractCreationBlockMapping = {
     [LiquityV2Versions.LiquityV2WstEthLegacy]: 21686238,
     [LiquityV2Versions.LiquityV2REthLegacy]: 21686257,
 };
-/** Every Transfer of a market's trove NFT since the contract was created (or, on a fork, in the last 1000 blocks). */
-const getTroveTransfers = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market) => __awaiter(void 0, void 0, void 0, function* () {
+const getTransferredTroves = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market, account) => __awaiter(void 0, void 0, void 0, function* () {
     const nftContract = createViemContractFromConfigFunc('LiquityV2TroveNFT', troveNFTAddress)(provider, network);
     const nftContractCreationBlock = nftContractCreationBlockMapping[market];
     const currentBlock = +(yield provider.getBlockNumber()).toString();
     const _events = yield 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()),
     }));
-});
-/** The troves transferred to an account that it still holds: no later transfer of the same trove. */
-const getAccountTransferredTroves = (events, account) => 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 = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market, account) => __awaiter(void 0, void 0, void 0, function* () {
-    return (getAccountTransferredTroves(yield getTroveTransfers(provider, network, troveNFTAddress, limitBlocksForEventFetching, market), account));
-});
-/** The troves an account opened and still owns, then the ones transferred to it, each once. */
-const mergeTroveIds = (userTroves, userTransferredTroves) => {
-    const troves = [...userTroves.map(({ troveId }) => ({ troveId })), ...userTransferredTroves];
-    const filteredTroves = troves.filter((value, index, self) => index === self.findIndex((t) => (t.troveId === value.troveId)));
-    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));
-};
-/**
- * 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 = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, accounts) => __awaiter(void 0, void 0, void 0, function* () {
-    const [userTroves, events] = yield 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),
-    ]));
+    const userTransferredTroves = events.filter((event) => compareAddresses(event.to, 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 }));
 });
 export const _getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () {
     const [{ troves: userTroves, nextFreeTroveIndex }, userTransferredTroves] = yield 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 troves = [...userTroves.map(({ troveId }) => ({ troveId })), ...userTransferredTroves];
+    const filteredTroves = troves.filter((value, index, self) => index === self.findIndex((t) => (t.troveId === value.troveId)));
+    const troveIds = filteredTroves.map((trove) => trove.troveId);
+    const troveIdsSet = new Set(troveIds);
+    const troveIdsArray = Array.from(troveIdsSet);
+    const trovesNoDuplicates = troveIdsArray.map((troveId) => troves.find((trove) => trove.troveId === troveId));
+    return { troves: trovesNoDuplicates, nextFreeTroveIndex };
 });
 export const getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () { return _getLiquityV2UserTroveIds(getViemProvider(provider, network), network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account); });
 const getDebtInFrontForSingleMarketLiquityV2 = (provider_1, network_1, isLegacy_1, marketAddress_1, troveId_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, marketAddress_1, troveId_1, ...args_1], void 0, function* (provider, network, isLegacy, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) {

package/esm/markets/morphoBlue/index.d.ts

@@ -109,6 +109,7 @@ export declare const MORPHO_BLUE_AERO_USDC_625_BASE: (networkId?: NetworkNumber)
 export declare const MORPHO_BLUE_USDE_USDC_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_770_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBXRP_USDC_625_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBHYPE_USDC_625_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueWBTCUSDC_860_Arb: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_USDC_860_ARB: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -226,6 +227,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdeusdc_915_base: MorphoBlueMarketData;
     readonly morphobluecbethusdc_770_base: MorphoBlueMarketData;
     readonly morphobluecbxrpusdc_625_base: MorphoBlueMarketData;
+    readonly morphobluecbhypeusdc_625_base: MorphoBlueMarketData;
     readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_965_base: MorphoBlueMarketData;