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

package/cjs/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -40,6 +40,7 @@ export interface EModeCategoryData {
     borrowAssets: string[];
     ltvzeroBitmap?: string;
     ltvZeroAssets: string[];
+    isolated: boolean;
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];
@@ -84,8 +85,6 @@ export interface AaveV3AssetData extends AaveAssetData {
     liquidationBonus: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-    aTokenAddress?: EthAddress;
-    vTokenAddress?: EthAddress;
 }
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
 export type AaveAssetsData<T> = {
@@ -123,12 +122,7 @@ export type AaveUsedAssets<T> = {
 };
 export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
-/**
- * Fields aaveAnyGetAggregatedPositionData adds to every Aave V2/V3 position at runtime, on top of those declared
- * below. Optional, so code that builds a position by hand keeps compiling.
- */
-export type AavePositionAggregatedFields = Partial<Omit<AaveV3AggregatedPositionData, keyof MMPositionData | 'ratio' | 'collRatio' | 'safetyRatioWithLtvZeroFallback' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd' | 'suppliedCollateralUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
-export interface AavePositionData extends MMPositionData, AavePositionAggregatedFields {
+export interface AavePositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
@@ -145,12 +139,6 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
 }
 export interface AaveV2PositionData extends AavePositionData {
     usedAssets: AaveV2UsedAssets;
-    eModeCategory?: number;
-    isInIsolationMode?: boolean;
-    isInSiloedMode?: boolean;
-    eModeCategories?: {
-        [key: number]: EModeCategoryDataMapping;
-    };
 }
 export interface AaveV3PositionData extends AavePositionData {
     usedAssets: AaveV3UsedAssets;
@@ -198,86 +186,3 @@ 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/cjs/types/compound.d.ts

@@ -52,7 +52,6 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
-    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -64,17 +63,6 @@ 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;
@@ -135,21 +123,9 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     automationResubscribeRequired?: boolean;
 }
-/**
- * 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 {
+export interface CompoundV2PositionData extends CompoundPositionData {
     usedAssets: CompoundV2UsedAssets;
-    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
+export interface CompoundV3PositionData extends CompoundPositionData {
     usedAssets: CompoundV3UsedAssets;
-    isAllowed?: boolean;
 }

package/cjs/types/curveUsd.d.ts

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

package/cjs/types/fluid.d.ts

@@ -458,16 +458,3 @@ 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/cjs/types/index.d.ts

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

package/cjs/types/index.js

@@ -31,4 +31,3 @@ __exportStar(require("./merkl"), exports);
 __exportStar(require("./savings"), exports);
 __exportStar(require("./common"), exports);
 __exportStar(require("./aaveV4"), exports);
-__exportStar(require("./claiming"), exports);

package/cjs/types/liquity.d.ts

@@ -28,15 +28,3 @@ 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/cjs/types/liquityV2.d.ts

@@ -121,27 +121,3 @@ 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/cjs/types/llamaLend.d.ts

@@ -138,8 +138,7 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice' | 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
-export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
+export interface LlamaLendUserData {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -158,14 +157,4 @@ export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     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/cjs/types/morphoBlue.d.ts

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

package/cjs/types/portfolio.d.ts

@@ -1,33 +1,19 @@
-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 { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-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 { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidVaultData } from './fluid';
+import { LiquityTroveInfo } from './liquity';
+import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData } from './maker';
-import { MorphoBlueEarnData, MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
+import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { 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>;
@@ -73,67 +59,3 @@ 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/cjs/types/savings/morphoVaults.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '../common';
+import { EthAddress, NetworkNumber } from '../common';
 export declare enum MorphoVaultType {
     MorphoVaultFlagshipEth = "morpho_vault_flagship_eth",
     MorphoVaultGauntletUSDCCore = "morpho_vault_gauntlet_usdc_core",
@@ -17,13 +17,21 @@ export declare enum MorphoVaultType {
     MorphoVaultSteakhousePYUSD = "morpho_vault_steakhouse_pyusd",
     MorphoVaultSmokehouseUSDT = "morpho_vault_smokehouse_usdt",
     MorphoVaultSmokehouseUSDC = "morpho_vault_smokehouse_usdc",
-    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai"
+    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai",
+    MorphoVaultGauntletUSDGPremium = "morpho_vault_gauntlet_usdg_premium",
+    MorphoVaultSteakhouseUSDGPro = "morpho_vault_steakhouse_usdg_pro"
+}
+export declare enum MorphoVaultVersion {
+    V1 = 1,
+    V2 = 2
 }
 export interface MorphoVault {
     type: MorphoVaultType;
     name: string;
     address: EthAddress;
     asset: string;
+    network: NetworkNumber;
+    version: MorphoVaultVersion;
     deploymentBlock: number;
     isLegacy: boolean;
 }

package/cjs/types/savings/morphoVaults.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MorphoVaultType = void 0;
+exports.MorphoVaultVersion = exports.MorphoVaultType = void 0;
 var MorphoVaultType;
 (function (MorphoVaultType) {
     MorphoVaultType["MorphoVaultFlagshipEth"] = "morpho_vault_flagship_eth";
@@ -23,4 +23,12 @@ var MorphoVaultType;
     MorphoVaultType["MorphoVaultSmokehouseUSDT"] = "morpho_vault_smokehouse_usdt";
     MorphoVaultType["MorphoVaultSmokehouseUSDC"] = "morpho_vault_smokehouse_usdc";
     MorphoVaultType["MorphoVaultSmokehouseDAI"] = "morpho_vault_smokehouse_dai";
+    // Vault V2
+    MorphoVaultType["MorphoVaultGauntletUSDGPremium"] = "morpho_vault_gauntlet_usdg_premium";
+    MorphoVaultType["MorphoVaultSteakhouseUSDGPro"] = "morpho_vault_steakhouse_usdg_pro";
 })(MorphoVaultType || (exports.MorphoVaultType = MorphoVaultType = {}));
+var MorphoVaultVersion;
+(function (MorphoVaultVersion) {
+    MorphoVaultVersion[MorphoVaultVersion["V1"] = 1] = "V1";
+    MorphoVaultVersion[MorphoVaultVersion["V2"] = 2] = "V2";
+})(MorphoVaultVersion || (exports.MorphoVaultVersion = MorphoVaultVersion = {}));

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;
@@ -115,12 +100,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';
@@ -37,7 +37,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/index.js

@@ -31,7 +31,10 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
             : !usedAssetsValues.filter(u => u.isBorrowed && !e.borrowAssets.includes(u.symbol)).length;
         const afterEnteringCategory = aaveAnyGetAggregatedPositionData(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: e.id }));
         const willStayOverCollateralized = new Dec(afterEnteringCategory.ratio === 'NaN' ? '0' : afterEnteringCategory.ratio).eq(0) || new Dec(afterEnteringCategory.ratio).gt(afterEnteringCategory.liqPercent);
-        const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized];
+        const collateralOnlyFromCategory = e.id === 0 || !e.isolated
+            ? true
+            : !usedAssetsValues.filter(u => u.isSupplied && u.collateral && !e.collateralAssets.includes(u.symbol)).length;
+        const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized, collateralOnlyFromCategory];
         categoriesMapping[e.id] = {
             enteringTerms,
             canEnterCategory: !enteringTerms.includes(false),
@@ -48,6 +51,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 };
 export function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+        var _a;
         const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
@@ -81,6 +85,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
                     collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
                     ltvzeroBitmap: eModesInfo[i].ltvzeroBitmap.toString(),
+                    isolated: (_a = eModesInfo[i].isolated) !== null && _a !== void 0 ? _a : false,
                     borrowAssets: [],
                     collateralAssets: [],
                     ltvZeroAssets: [],
@@ -296,6 +301,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
             ltvZeroAssets: [],
+            isolated: false,
         };
         return { assetsData: payload, eModeCategoriesData };
     });

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/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[]>>;