@defisaver/positions-sdk 2.1.161-portfolio-api-1-dev → 2.1.161

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

@@ -236,9 +236,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 {

package/src/types/portfolio.ts

@@ -1,20 +1,16 @@
-import {
-  AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions,
-} from './aave';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
+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 { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
 import { FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData, LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
-import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
+import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData } from './maker';
-import { 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,
@@ -66,19 +62,4 @@ export interface PortfolioPositionsDataForAddress {
 
 export interface PortfolioPositionsData {
   [key: EthAddress]: PortfolioPositionsDataForAddress;
-}
-
-/** 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,