@defisaver/positions-sdk 2.1.168-stable-pair-dev → 2.1.169-portfolio-api-dev

package/esm/types/aaveV4.d.ts

@@ -191,3 +191,47 @@ export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
     healthFactor: string;
     riskPremiumBps: number;
 }
+/** One Aave V4 tokenized spoke (Lend vault) as the view contract returns it for a user. */
+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;
+}
+/** 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;
+}

package/esm/types/common.d.ts

@@ -22,7 +22,6 @@ export declare enum LeverageType {
     Short = "short",
     VolatilePair = "volatile-pair",
     VolatilePairReverse = "volatile-pair-reverse",
-    StablePair = "stable-pair",
     None = ""
 }
 export interface IncentiveData {

package/esm/types/common.js

@@ -27,7 +27,6 @@ export var LeverageType;
     LeverageType["Short"] = "short";
     LeverageType["VolatilePair"] = "volatile-pair";
     LeverageType["VolatilePairReverse"] = "volatile-pair-reverse";
-    LeverageType["StablePair"] = "stable-pair";
     LeverageType["None"] = "";
 })(LeverageType || (LeverageType = {}));
 export var NetworkNumber;

package/esm/types/compound.d.ts

@@ -52,6 +52,7 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
+    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -63,6 +64,17 @@ export interface CompoundV3AssetData extends CompoundAssetData {
     supplyCap: string;
     priceInBaseAsset: string;
     canBeWithdrawn: boolean;
+    tokenAddr?: EthAddress;
+    isBase?: boolean;
+    baseBorrowMin?: string;
+    baseTrackingBorrowRewardsSpeed?: string;
+    baseTrackingSupplyRewardsSpeed?: string;
+    borrowIndex?: string;
+    supplyIndex?: string;
+    trackingBorrowIndex?: string;
+    trackingSupplyIndex?: string;
+    rewardSupplySpeed?: string;
+    rewardBorrowSpeed?: string;
 }
 export interface CompoundAssetsData<T> {
     [token: string]: T;
@@ -125,9 +137,21 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     automationResubscribeRequired?: boolean;
 }
-export interface CompoundV2PositionData extends CompoundPositionData {
+/**
+ * Fields getCompoundV2AggregatedData adds to every Compound V2 position at runtime — a subset of
+ * CompoundAggregatedPositionData. Optional, so code that builds a position by hand keeps compiling.
+ */
+export type CompoundV2PositionAggregatedFields = Partial<Pick<CompoundAggregatedPositionData, 'suppliedCollateralUsd' | 'liquidationLimitUsd' | 'leftToBorrowUsd' | 'collRatio' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
+/**
+ * Fields getCompoundV3AggregatedData adds to every Compound V3 position at runtime, on top of those declared in
+ * CompoundPositionData. Optional, so code that builds a position by hand keeps compiling.
+ */
+export type CompoundV3PositionAggregatedFields = Partial<Omit<CompoundAggregatedPositionData, keyof MMPositionData | 'ratio' | 'minRatio' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
+export interface CompoundV2PositionData extends CompoundPositionData, CompoundV2PositionAggregatedFields {
     usedAssets: CompoundV2UsedAssets;
+    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData {
+export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
     usedAssets: CompoundV3UsedAssets;
+    isAllowed?: boolean;
 }

package/esm/types/curveUsd.d.ts

@@ -60,6 +60,7 @@ export interface CrvUSDGlobalMarketData {
     leftToBorrow: string;
     bands: BandData[];
     loanDiscount: string;
+    A?: bigint;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;
@@ -94,7 +95,8 @@ export interface CrvUSDUsedAsset {
 export interface CrvUSDUsedAssets {
     [key: string]: CrvUSDUsedAsset;
 }
-export interface CrvUSDUserData {
+export type CrvUSDPositionAggregatedFields = Partial<Pick<CrvUSDAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
+export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -119,4 +121,10 @@ export interface CrvUSDUserData {
     netApy: string;
     totalInterestUsd: string;
     incentiveUsd: string;
+    marketCollateralAmount?: bigint;
+    curveUsdCollateralAmount?: bigint;
+    N?: bigint;
+    bandRange?: readonly [bigint, bigint];
+    usersBands?: readonly [readonly bigint[], readonly bigint[]];
+    isInSoftLiquidation?: boolean;
 }

package/esm/types/fluid.d.ts

@@ -459,3 +459,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,4 +15,5 @@ export * from './merkl';
 export * from './savings';
 export * from './common';
 export * from './aaveV4';
+export * from './claiming';
 export * from './lendingSummary';

package/esm/types/index.js

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

package/esm/types/liquity.d.ts

@@ -32,3 +32,15 @@ export interface LiquityTroveInfo {
     totalInterestUsd: string;
     incentiveUsd: 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

@@ -123,3 +123,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/llamaLend.d.ts

@@ -138,7 +138,8 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-export interface LlamaLendUserData {
+export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice' | 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
+export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -157,4 +158,14 @@ export interface LlamaLendUserData {
     loanExists: boolean;
     borrowRate?: string;
     exposure: string;
+    collateralPrice?: bigint;
+    marketCollateralAmount?: bigint;
+    debtTokenCollateralAmount?: bigint;
+    N?: bigint;
+    bandRange?: readonly [bigint, bigint];
+    usersBands?: readonly [readonly bigint[], readonly bigint[]];
+    collRatio?: bigint;
+    isInSoftLiquidation?: boolean;
+    debtTokenSuppliedShares?: bigint;
+    debtTokenSuppliedAssets?: bigint;
 }

package/esm/types/morphoBlue.d.ts

@@ -215,6 +215,8 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
     exposure: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBlueEarnData {
     apy: string;

package/esm/types/portfolio.d.ts

@@ -1,20 +1,47 @@
-import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions } from './aave';
+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 { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
 import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidMarketData, FluidVaultData } from './fluid';
-import { LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData } from './liquityV2';
+import { FluidEarnPositionData, FluidMarketData, FluidVaultData } from './fluid';
+import { LiquityStakingData, LiquityTroveInfo } from './liquity';
+import { LiquityV2MarketData, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
 import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData, IlkInfo } from './maker';
-import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+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 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>;
@@ -56,10 +83,65 @@ 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>;
@@ -72,6 +154,44 @@ 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/esm/types/savings/index.d.ts

@@ -20,4 +20,12 @@ export interface SavingsVaultData {
     asset: string;
     optionType: string;
 }
-export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType, SavingsVaultData>>;
+/** 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;
+}

package/esm/types/spark.d.ts

@@ -46,6 +46,21 @@ 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;
@@ -101,7 +116,12 @@ export interface SparkAggregatedPositionData {
     minHealthRatio: string;
     exposure: string;
 }
-export interface SparkPositionData extends MMPositionData {
+/**
+ * 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 {
     ratio: string;
     minRatio: string;
     collRatio: string;

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.168-stable-pair-dev",
+  "version": "2.1.169-portfolio-api-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -31,6 +31,7 @@ import {
   EModeCategoriesData,
   EModeCategoryData,
   EModeCategoryDataMapping,
+  StakeAaveData,
 } from '../types';
 import {
   Blockish,
@@ -852,7 +853,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/aaveV4/lend.ts

@@ -7,26 +7,9 @@ import {
   EthereumProvider,
   NetworkNumber,
 } from '../types/common';
+import { 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 type { AaveV4TokenizationSpokeData, AaveV4TokenizationSpokeDataParsed } from '../types/aaveV4';
 
 export const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress> = {
   EURC_CORE: '0x6D9e2Cdd61CaF69af99b275704B6e272C41c6718',
@@ -102,34 +85,6 @@ 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]) => {
@@ -189,4 +144,3 @@ export async function getAaveV4TokenizationSpokesData(
   }).filter(item => item != null);
 }
 
-

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) => {