@defisaver/positions-sdk 2.1.161-portfolio-api-2-dev → 2.1.161-portfolio-api-3-dev

package/src/savings/morphoVaults/options.ts

@@ -1,10 +1,14 @@
-import { MorphoVault, MorphoVaultType } from '../../types';
+import {
+  MorphoVault, MorphoVaultType, MorphoVaultVersion, NetworkNumber,
+} from '../../types';
 
 export const MORPHO_VAULT_FLAGSHIP_ETH: MorphoVault = {
   type: MorphoVaultType.MorphoVaultFlagshipEth,
   name: 'Flagship ETH',
   address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 18927491,
   isLegacy: true,
 };
@@ -14,6 +18,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_CORE: MorphoVault = {
   name: 'Gauntlet USDC Core',
   address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19777569,
   isLegacy: true,
 };
@@ -23,6 +29,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_PRIME: MorphoVault = {
   name: 'Gauntlet USDC Prime',
   address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19777569,
   isLegacy: true,
 };
@@ -32,6 +40,8 @@ export const MORPHO_VAULT_RE7_WETH: MorphoVault = {
   name: 'RE7 WETH',
   address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19121118,
   isLegacy: true,
 };
@@ -41,6 +51,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_CORE: MorphoVault = {
   name: 'Gauntlet WETH Core',
   address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19541126,
   isLegacy: true,
 };
@@ -50,6 +62,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_PRIME: MorphoVault = {
   name: 'Gauntlet WETH Prime',
   address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19372149,
   isLegacy: true,
 };
@@ -59,6 +73,8 @@ export const MORPHO_VAULT_BOOSTED_USDC: MorphoVault = {
   name: 'Boosted USDC',
   address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 20377233,
   isLegacy: true,
 };
@@ -68,6 +84,8 @@ export const MORPHO_VAULT_FLAGSHIP_USDT: MorphoVault = {
   name: 'Flagship USDT',
   address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19127039,
   isLegacy: true,
 };
@@ -77,6 +95,8 @@ export const MORPHO_VAULT_GAUNTLET_USDA_CORE: MorphoVault = {
   name: 'Gauntlet USDA Core',
   address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
   asset: 'USDA',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19633608,
   isLegacy: true,
 };
@@ -86,6 +106,8 @@ export const MORPHO_VAULT_GAUNTLET_USDT_PRIME: MorphoVault = {
   name: 'Gauntlet USDT Prime',
   address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19486541,
   isLegacy: true,
 };
@@ -95,6 +117,8 @@ export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC: MorphoVault = {
   name: 'Gauntlet Resolv USDC',
   address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21487882,
   isLegacy: true,
 };
@@ -106,6 +130,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT: MorphoVault = {
   name: 'Steakhouse USDT',
   address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19043398,
   isLegacy: false,
 };
@@ -115,6 +141,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDC: MorphoVault = {
   name: 'Steakhouse USDC',
   address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 18928285,
   isLegacy: false,
 };
@@ -124,6 +152,8 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH: MorphoVault = {
   name: 'Steakhouse WETH',
   address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19380443,
   isLegacy: false,
 };
@@ -133,6 +163,8 @@ export const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault = {
   name: 'Steakhouse PYUSD',
   address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
   asset: 'PYUSD',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19043398,
   isLegacy: false,
 };
@@ -144,6 +176,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDT: MorphoVault = {
   name: 'Smokehouse USDT',
   address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21522238,
   isLegacy: false,
 };
@@ -153,6 +187,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDC: MorphoVault = {
   name: 'Smokehouse USDC',
   address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21337719,
   isLegacy: false,
 };
@@ -162,10 +198,36 @@ export const MORPHO_VAULT_SMOKEHOUSE_DAI: MorphoVault = {
   name: 'Smokehouse DAI',
   address: '0xbeeFfF68CC520D68f82641EFF84330C631E2490E',
   asset: 'DAI',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21343808,
   isLegacy: false,
 };
 
+// Vault V2
+
+export const MORPHO_VAULT_GAUNTLET_USDG_PREMIUM: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletUSDGPremium,
+  name: 'Gauntlet USDG Premium',
+  address: '0x390c1bb01F3F627144a40617e287d4cE3D5aBCfa',
+  asset: 'USDG',
+  network: NetworkNumber.Arb,
+  version: MorphoVaultVersion.V2,
+  deploymentBlock: 510799903,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_STEAKHOUSE_USDG_PRO: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSteakhouseUSDGPro,
+  name: 'Steakhouse USDG Pro',
+  address: '0xbeeFf72B77e7584a450E887125F25E8D8819016a',
+  asset: 'USDG',
+  network: NetworkNumber.Arb,
+  version: MorphoVaultVersion.V2,
+  deploymentBlock: 512247107,
+  isLegacy: false,
+};
+
 export const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault> = {
   [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
   [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -189,6 +251,10 @@ export const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault> = {
   [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,
 };
 
 export const getMorphoVault = (type: MorphoVaultType): MorphoVault => MORPHO_VAULTS[type];

package/src/spark/index.ts

@@ -108,6 +108,7 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
         collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
         borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
         ltvZeroAssets: [],
+        isolated: false,
       };
 
       return ({

package/src/staking/staking.ts

@@ -137,6 +137,34 @@ export const calculateInterestEarned = (principal: string, interest: string, typ
   return (+principal * (((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)) ** (BLOCKS_IN_A_YEAR * interval))) - +principal; // eslint-disable-line
 };
 
+/**
+ * Net APY for positions that have a single known borrow rate (and optionally a single supply rate)
+ * instead of per-asset `assetsData` to feed into `calculateNetApy` (Maker, crvUSD, Liquity v1).
+ * All rates are yearly percentages that are already compounded. `incentives` are extra yields
+ * (e.g. the native staking yield of the collateral) applied to their own USD base and summed into `incentiveUsd`.
+ */
+export const calculateNetApyFromRates = ({
+  suppliedUsd, borrowedUsd, supplyRate = '0', borrowRate = '0', incentives = [],
+}: {
+  suppliedUsd: string,
+  borrowedUsd: string,
+  supplyRate?: string,
+  borrowRate?: string,
+  incentives?: { apy: string, amountUsd: string }[],
+}) => {
+  const supplyInterest = new Dec(calculateInterestEarned(suppliedUsd, supplyRate, 'year', true));
+  const borrowInterest = new Dec(calculateInterestEarned(borrowedUsd, borrowRate, 'year', true));
+  const incentiveUsd = incentives
+    .reduce((acc, { apy, amountUsd }) => acc.add(calculateInterestEarned(amountUsd, apy, 'year', true)), new Dec(0))
+    .toString();
+
+  const totalInterestUsd = supplyInterest.sub(borrowInterest).add(incentiveUsd).toString();
+  const balance = new Dec(suppliedUsd).sub(borrowedUsd);
+  const netApy = balance.isZero() ? '0' : new Dec(totalInterestUsd).div(balance).times(100).toString();
+
+  return { netApy, totalInterestUsd, incentiveUsd };
+};
+
 export const calculateNetApy = ({
   usedAssets, assetsData, optionalData,
 }: { usedAssets: MMUsedAssets, assetsData: MMAssetsData, optionalData?: any }) => {

package/src/types/aave.ts

@@ -49,6 +49,7 @@ export interface EModeCategoryData {
   borrowAssets: string[],
   ltvzeroBitmap?: string,
   ltvZeroAssets: string[],
+  isolated: boolean,
 }
 export interface EModeCategoryDataMapping {
   enteringTerms: boolean[],
@@ -155,6 +156,8 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
   collRatio: string,
   // Safety ratio as evaluated by automation bots (LTV-0 collateral credited at LLTV - 5%). Aave v3 only.
   safetyRatioWithLtvZeroFallback?: string,
+  // Normalised safety ratio (100 = liquidation on every protocol). Aave v3: the LTV-0 fallback ratio, Aave v2: `ratio`.
+  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,
@@ -194,6 +197,7 @@ export interface AaveV3AggregatedPositionData {
   collRatio: string,
   borrowLimitWithLtvZeroFallbackUsd: string,
   safetyRatioWithLtvZeroFallback: string,
+  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,

package/src/types/aaveV4.ts

@@ -183,6 +183,7 @@ export interface AaveV4AggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   liqRatio: string,
   liqPercent: string,
   leveragedType: LeverageType,
@@ -206,3 +207,52 @@ 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

@@ -128,6 +128,7 @@ export interface CompoundAggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,
@@ -148,6 +149,7 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
+  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,

package/src/types/curveUsd.ts

@@ -83,6 +83,10 @@ export interface CrvUSDAggregatedPositionData {
   collFactor: string,
   leveragedType: LeverageType,
   exposure: string,
+  // Yearly net return (%) on the position's equity: market borrow rate on crvUSD debt vs native yield of staked collateral.
+  netApy: string,
+  totalInterestUsd: string,
+  incentiveUsd: string,
   leveragedAsset?: string,
   liquidationPrice?: string,
 }
@@ -131,6 +135,9 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
   collateralPrice: string,
   collRatio: string,
   exposure: string,
+  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,

package/src/types/fluid.ts

@@ -344,6 +344,7 @@ export interface FluidAggregatedVaultData {
   merklBorrowIncentives: IncentiveData[],
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   minRatio: string,
   totalInterestUsd: string,
   leveragedType?: LeverageType,

package/src/types/liquity.ts

@@ -26,9 +26,15 @@ export interface LiquityTroveInfo {
   totalETH: string,
   totalLUSD: string,
   minCollateralRatio: number,
+  // Collateral ratio rebased so 100 sits on `minCollateralRatio` (normalised safety ratio).
+  safetyRatio: string,
   priceForRecovery: string,
   debtInFront: string,
   exposure: string,
+  // Always '0' for Liquity v1: LUSD debt is interest free (one-off borrowing fee only) and ETH collateral earns no yield.
+  netApy: string,
+  totalInterestUsd: string,
+  incentiveUsd: string,
 }
 /** LQTY staking and the LUSD stability pool deposit of an address, from getLiquityStakingData. */
 export interface LiquityStakingData {

package/src/types/liquityV2.ts

@@ -104,6 +104,7 @@ export interface LiquityV2AggregatedTroveData {
   liquidationPrice: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   exposure: string,
 }
 
@@ -112,6 +113,7 @@ export interface LiquityV2TroveData {
   troveId: string,
   ratio: string,
   collRatio: string,
+  safetyRatio?: string,
   liqRatio: string,
   borrowLimitRatio: string,
   interestRate: string,

package/src/types/maker.ts

@@ -47,6 +47,8 @@ export interface CdpData {
   debtAssetMarketPrice: string,
   liquidationPrice: string,
   ratio: string,
+  // Collateral ratio rebased so 100 sits on `liqPercent` (normalised safety ratio).
+  safetyRatio: string,
   liqRatio: string,
   liqPercent: number,
   assetPrice: string,
@@ -62,4 +64,8 @@ export interface CdpData {
   liquidationFee: string,
   lastUpdated: number,
   exposure: string,
+  // Yearly net return (%) on the vault's equity: stability fee on DAI debt vs native yield of staked collateral.
+  netApy: string,
+  totalInterestUsd: string,
+  incentiveUsd: string,
 }

package/src/types/morphoBlue.ts

@@ -206,6 +206,7 @@ export interface MorphoBlueAggregatedPositionData {
   totalInterestUsd: string,
   ltv: string,
   ratio: string,
+  safetyRatio: string, // borrowLimitUsd / borrowedUsd as a percentage (100 = liquidation)
   leveragedType: LeverageType,
   leveragedAsset?: string,
   currentVolatilePairRatio?: string,
@@ -229,6 +230,7 @@ export interface MorphoBluePositionData {
   totalInterestUsd: string,
   ltv: string,
   ratio: string,
+  safetyRatio?: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
   currentVolatilePairRatio?: string,

package/src/types/morphoMidnight.ts

@@ -191,6 +191,7 @@ export interface MorphoMidnightAggregatedPositionData {
   ltv: string,
   ratio: string, // health ratio as a percentage (from MidnightView.ratio, 1e18-scaled)
   healthRatio: string, // liquidationLimitUsd / borrowedUsd
+  safetyRatio: string, // borrowLimitUsd / borrowedUsd as a percentage (100 = liquidation)
   leveragedType: LeverageType,
   leveragedAsset?: string,
   currentVolatilePairRatio?: string,

package/src/types/portfolio.ts

@@ -16,13 +16,13 @@ import {
   CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions,
 } from './compound';
 import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidEarnPositionData, FluidVaultData } from './fluid';
+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 } from './maker';
+import { CdpData, IlkInfo } from './maker';
 import {
   MorphoBlueEarnData, MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions,
 } from './morphoBlue';
@@ -40,12 +40,27 @@ export interface PortfolioProtocolError {
   data: null,
 }
 
-/** What getPortfolioData reads besides positions and markets. Both default to true. */
+/** What getPortfolioData reads besides markets. */
 export interface PortfolioDataOptions {
-  /** stakingPositions; with false it comes back as {} and no staking source is read. */
+  /** 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; with false it comes back as {} and no rewards source is read. */
+  /** 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 {
@@ -89,6 +104,10 @@ 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 {
@@ -162,4 +181,50 @@ 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/src/types/savings/index.ts

@@ -23,4 +23,15 @@ export interface SavingsVaultData {
   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/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

@@ -115,6 +115,7 @@ export interface SparkAggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,
@@ -143,6 +144,7 @@ export interface SparkPositionData extends MMPositionData, SparkPositionAggregat
   ratio: string,
   minRatio: string,
   collRatio: string,
+  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,