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

package/src/savings/index.ts

@@ -2,9 +2,6 @@ import {
   MakerDsrType,
   MorphoVaultType,
   SavingsData,
-  SavingsDataWithErrors,
-  SavingsErrors,
-  SavingsVaultKey,
   SkySavingsType,
   SparkSavingsVaultType,
   SummerVaultType,
@@ -30,16 +27,11 @@ export {
   yearnV3Vaults,
 };
 
-/**
- * Every savings vault of a network for the given accounts, and, for each vault that came back without data, why — so
- * a vault that failed is never mistaken for one the accounts have nothing in.
- */
-export const getSavingsDataWithErrors = async (
+export const getSavingsData = async (
   provider: EthereumProvider,
   network: NetworkNumber,
   accounts: EthAddress[],
-): Promise<SavingsDataWithErrors> => {
-  const isMainnet = network === NetworkNumber.Eth;
+) => {
   const morphoVaultsList = (Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS) as MorphoVaultType[])
     .filter((key) => morphoVaults.morphoVaultsOptions.getMorphoVault(key).network === network);
   const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS) as YearnVaultType[];
@@ -48,17 +40,7 @@ export const getSavingsDataWithErrors = async (
   const summerVaultsList = (Object.keys(summerVaults.summerVaultsOptions.SUMMER_VAULTS) as SummerVaultType[])
     .filter((key) => summerVaults.summerVaultsOptions.getSummerVault(key).network === network);
 
-  // Every vault read on this network, so one left without data or an error can still be reported.
-  const vaultKeys: SavingsVaultKey[] = [
-    ...morphoVaultsList,
-    ...(isMainnet ? [
-      ...yearnVaultsList, ...sparkSavingsVaultsList, ...yearnV3VaultsList, MakerDsrType.MakerDsrVault, SkySavingsType.SkySavings,
-    ] : []),
-    ...summerVaultsList,
-  ];
-
   const savingsData: SavingsData = {};
-  const errors: SavingsErrors = {};
 
   await Promise.all([
     ...(morphoVaultsList.length ? [
@@ -69,11 +51,10 @@ export const getSavingsDataWithErrors = async (
           Object.assign(savingsData, data);
         } catch (err) {
           console.error('[getSavingsData] Error fetching morpho vaults:', err);
-          morphoVaultsList.forEach((vaultKey) => { errors[vaultKey] = `Error fetching morpho vault ${vaultKey}`; });
         }
       })(),
     ] : []),
-    ...(isMainnet ? [
+    ...(network === NetworkNumber.Eth ? [
       ...yearnVaultsList.map(async (vaultKey) => {
         try {
           const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
@@ -81,7 +62,6 @@ export const getSavingsDataWithErrors = async (
           savingsData[vaultKey] = data;
         } catch (err) {
           console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
-          errors[vaultKey] = `Error fetching yearn vault ${vaultKey}`;
         }
       }),
       ...sparkSavingsVaultsList.map(async (vaultKey) => {
@@ -91,7 +71,6 @@ export const getSavingsDataWithErrors = async (
           savingsData[vaultKey] = data;
         } catch (err) {
           console.error(`[getSavingsData] Error fetching spark savings vault ${vaultKey}:`, err);
-          errors[vaultKey] = `Error fetching spark savings vault ${vaultKey}`;
         }
       }),
       ...yearnV3VaultsList.map(async (vaultKey) => {
@@ -101,7 +80,6 @@ export const getSavingsDataWithErrors = async (
           savingsData[vaultKey] = data;
         } catch (err) {
           console.error(`[getSavingsData] Error fetching yearn v3 vault ${vaultKey}:`, err);
-          errors[vaultKey] = `Error fetching yearn v3 vault ${vaultKey}`;
         }
       }),
       (async () => {
@@ -110,7 +88,6 @@ export const getSavingsDataWithErrors = async (
           savingsData[MakerDsrType.MakerDsrVault] = data;
         } catch (err) {
           console.error('[getSavingsData] Error fetching maker DSR data:', err);
-          errors[MakerDsrType.MakerDsrVault] = 'Error fetching maker DSR data';
         }
       })(),
       (async () => {
@@ -119,7 +96,6 @@ export const getSavingsDataWithErrors = async (
           savingsData[SkySavingsType.SkySavings] = data;
         } catch (err) {
           console.error('[getSavingsData] Error fetching Sky savings data:', err);
-          errors[SkySavingsType.SkySavings] = 'Error fetching Sky savings data';
         }
       })(),
     ] : []),
@@ -130,22 +106,9 @@ export const getSavingsDataWithErrors = async (
         savingsData[vaultKey] = data;
       } catch (err) {
         console.error(`[getSavingsData] Error fetching summer vault ${vaultKey}:`, err);
-        errors[vaultKey] = `Error fetching summer vault ${vaultKey}`;
       }
     }),
   ]);
 
-  // getMorphoVaultsData leaves out, without throwing, a vault whose on-chain reads failed or that the Morpho API did not return.
-  vaultKeys.forEach((vaultKey) => {
-    if (!savingsData[vaultKey] && !errors[vaultKey]) errors[vaultKey] = `No data returned for savings vault ${vaultKey}`;
-  });
-
-  return { data: savingsData, errors };
+  return savingsData;
 };
-
-/** Every savings vault of a network for the given accounts. A vault that failed is left out: use getSavingsDataWithErrors to tell why. */
-export const getSavingsData = async (
-  provider: EthereumProvider,
-  network: NetworkNumber,
-  accounts: EthAddress[],
-): Promise<SavingsData> => (await getSavingsDataWithErrors(provider, network, accounts)).data;

package/src/types/aave.ts

@@ -1,5 +1,4 @@
 import {
-  EthAddress,
   IncentiveData,
   LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
@@ -98,9 +97,6 @@ export interface AaveV3AssetData extends AaveAssetData {
   liquidationBonus: string,
   supplyIncentives: IncentiveData[];
   borrowIncentives: IncentiveData[];
-  // Set by _getAaveV3MarketData. Optional, so objects built by hand still type-check.
-  aTokenAddress?: EthAddress,
-  vTokenAddress?: EthAddress,
 }
 
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
@@ -142,15 +138,7 @@ 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,
@@ -171,11 +159,6 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
 
 export interface AaveV2PositionData extends AavePositionData {
   usedAssets: AaveV2UsedAssets,
-  // Always their empty values: _getAaveV2AccountData starts from Aave V3's EMPTY_AAVE_DATA, which carries them.
-  eModeCategory?: number,
-  isInIsolationMode?: boolean,
-  isInSiloedMode?: boolean,
-  eModeCategories?: { [key: number]: EModeCategoryDataMapping },
 }
 
 export interface AaveV3PositionData extends AavePositionData {
@@ -223,89 +206,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,
-  // Passed through unconverted: the view's bigint, or '0' when the view returns none.
-  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/src/types/aaveV4.ts

@@ -207,52 +207,3 @@ 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;
-  // ---- 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;
-}

package/src/types/compound.ts

@@ -70,8 +70,6 @@ export interface CompoundAssetData extends MMAssetData {
 }
 
 export interface CompoundV2AssetData extends CompoundAssetData {
-  // Set by _getCompoundV2MarketsData. Optional, so objects built by hand still type-check.
-  exchangeRate?: string,
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
   borrowCollateralFactor: string,
@@ -83,20 +81,6 @@ export interface CompoundV3AssetData extends CompoundAssetData {
   supplyCap: string,
   priceInBaseAsset: string,
   canBeWithdrawn: boolean,
-  // The rest are set by formatMarketData and formatBaseData, which also spread in the view contract's raw asset
-  // data. Optional, so objects built by hand still type-check.
-  tokenAddr?: EthAddress,
-  // The base asset's only.
-  isBase?: boolean,
-  baseBorrowMin?: string,
-  baseTrackingBorrowRewardsSpeed?: string,
-  baseTrackingSupplyRewardsSpeed?: string,
-  borrowIndex?: string,
-  supplyIndex?: string,
-  trackingBorrowIndex?: string,
-  trackingSupplyIndex?: string,
-  rewardSupplySpeed?: string,
-  rewardBorrowSpeed?: string,
 }
 
 export interface CompoundAssetsData<T> {
@@ -159,30 +143,10 @@ export interface CompoundPositionData extends MMPositionData {
   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,
-  // Always false: _getCompoundV2AccountData starts from EMPTY_COMPOUND_DATA, which carries it.
-  borrowStableSupplyUnstable?: boolean,
 }
 
-export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
+export interface CompoundV3PositionData extends CompoundPositionData {
   usedAssets: CompoundV3UsedAssets,
-  // Whether the user's smart wallet is allowed to manage the account on Comet (Comet.isAllowed).
-  isAllowed?: boolean,
 }

package/src/types/curveUsd.ts

@@ -66,9 +66,6 @@ export interface CrvUSDGlobalMarketData {
   leftToBorrow: string,
   bands: BandData[],
   loanDiscount: string;
-  // crvUSDView's globalData field that _getCurveUsdGlobalData spreads in unconverted. Optional, so objects built by
-  // hand still type-check.
-  A?: bigint,
 }
 
 export interface CrvUSDAggregatedPositionData {
@@ -108,12 +105,7 @@ export interface CrvUSDUsedAssets {
   [key: string]: CrvUSDUsedAsset,
 }
 
-// Set by getCrvUsdAggregatedData, which _getCurveUsdUserData spreads in. Optional, so objects built by hand still
-// type-check.
-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,
@@ -138,12 +130,4 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
   netApy: string,
   totalInterestUsd: string,
   incentiveUsd: string,
-  // Fields of crvUSDView's userData that _getCurveUsdUserData spreads in unconverted. Optional, so objects built by
-  // hand still type-check.
-  marketCollateralAmount?: bigint,
-  curveUsdCollateralAmount?: bigint,
-  N?: bigint,
-  bandRange?: readonly [bigint, bigint],
-  usersBands?: readonly [readonly bigint[], readonly bigint[]],
-  isInSoftLiquidation?: boolean,
 }

package/src/types/fluid.ts

@@ -488,17 +488,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/src/types/index.ts

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

package/src/types/liquity.ts

@@ -35,16 +35,4 @@ export interface LiquityTroveInfo {
   netApy: string,
   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/src/types/liquityV2.ts

@@ -133,29 +133,4 @@ export interface LiquityV2TroveData {
   debtInFront: string,
   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/src/types/llamaLend.ts

@@ -141,13 +141,7 @@ export interface LlamaLendUsedAssets {
   [key: string]: LlamaLendUsedAsset,
 }
 
-// Set by getLlamaLendAggregatedData, which _getLlamaLendUserData spreads in. Optional, so objects built by hand still
-// type-check.
-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,
@@ -166,16 +160,4 @@ export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
   loanExists: boolean,
   borrowRate?: string,
   exposure: string,
-  // Fields of LlamaLendView's userData that _getLlamaLendUserData spreads in unconverted. Optional, so objects built
-  // by hand still type-check.
-  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/src/types/morphoBlue.ts

@@ -124,6 +124,7 @@ export enum MorphoBlueVersions {
   MorphoBlueUSDeUSDC_915_Base = 'morphoblueusdeusdc_915_base', // USDe/USDC 0.915
   MorphoBlueCbEthUSDC_770_Base = 'morphobluecbethusdc_770_base', // cbETH/USDC 0.77
   MorphoBlueCbXRPUSDC_625_Base = 'morphobluecbxrpusdc_625_base', // cbXRP/USDC 0.625
+  MorphoBlueCbHYPEUSDC_625_Base = 'morphobluecbhypeusdc_625_base', // cbHYPE/USDC 0.625
 
   // ARBITRUM
   MorphoBlueSyrupUSDCUSDC_915_Arb = 'morphobluesyrupusdcusdc_915_arb', // syrupUSDC/USDC
@@ -237,9 +238,6 @@ export interface MorphoBluePositionData {
   supplyShares: string,
   borrowShares: string,
   exposure: string,
-  // Set by getMorphoBlueAggregatedPositionData. Optional, so objects built by hand still type-check.
-  minCollRatio?: string,
-  collLiquidationRatio?: string,
 }
 
 export interface MorphoBlueEarnData {