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

package/src/types/portfolio.ts

@@ -1,53 +1,22 @@
-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, LiquityV2TroveData, 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 { LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
+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>;
@@ -93,73 +62,4 @@ 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>;
-  };
-  // Never filled; kept so the shape does not change under the app.
-  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>;
-}
-
-// A Record rather than an interface: the app casts getPortfolioData's result to its own Record<string, …> type, and an
-// interface with an address index signature is not comparable to one.
-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/src/types/savings/morphoVaults.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '../common';
+import { EthAddress, NetworkNumber } from '../common';
 
 export enum MorphoVaultType {
   MorphoVaultFlagshipEth = 'morpho_vault_flagship_eth',
@@ -21,6 +21,14 @@ export enum MorphoVaultType {
   MorphoVaultSmokehouseUSDT = 'morpho_vault_smokehouse_usdt',
   MorphoVaultSmokehouseUSDC = 'morpho_vault_smokehouse_usdc',
   MorphoVaultSmokehouseDAI = 'morpho_vault_smokehouse_dai',
+  // Vault V2
+  MorphoVaultGauntletUSDGPremium = 'morpho_vault_gauntlet_usdg_premium',
+  MorphoVaultSteakhouseUSDGPro = 'morpho_vault_steakhouse_usdg_pro',
+}
+
+export enum MorphoVaultVersion {
+  V1 = 1,
+  V2 = 2,
 }
 
 export interface MorphoVault {
@@ -28,6 +36,8 @@ export interface MorphoVault {
   name: string;
   address: EthAddress;
   asset: string;
+  network: NetworkNumber;
+  version: MorphoVaultVersion;
   deploymentBlock: number;
   isLegacy: boolean;
 }

package/src/types/spark.ts

@@ -57,22 +57,6 @@ export interface SparkAssetData extends MMAssetData {
   eModeCategory: number,
   liquidationBonus: string,
   liquidationRatio: string,
-  // Set by _getSparkMarketsData. Optional, so objects built by hand still type-check.
-  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 {
@@ -131,15 +115,7 @@ export interface SparkAggregatedPositionData {
   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/src/umbrella/index.ts

@@ -1,14 +1,13 @@
 import { Client } from 'viem';
 import { AaveUmbrellaViewViem, AaveV3ViewContractViem } from '../contracts';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { UmbrellaStakingData } from '../types/aave';
 import { compareAddresses, convertHybridArraysToObjects, getEthAmountForDecimals } from '../services/utils';
 import { findMatching, tokenEntries } from './umbrellaUtils';
 
 const umbrella = '0xD400fc38ED4732893174325693a63C30ee3881a8';
 const aaveOracle = '0x54586bE62E3c3580375aE3723C145253060Ca0C2';
 
-export const getUmbrellaData = async (provider: Client, network: NetworkNumber, address: EthAddress): Promise<UmbrellaStakingData> => {
+export const getUmbrellaData = async (provider: Client, network: NetworkNumber, address: EthAddress) => {
   const umbrellaView = AaveUmbrellaViewViem(provider, network);
   const aaveV3View = AaveV3ViewContractViem(provider, network);
   const [tokensAggregatedData, additionalUmbrellaStakingData, userAggregatedData] = await Promise.all([