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

package/src/savings/index.ts

@@ -32,7 +32,8 @@ export const getSavingsData = async (
   network: NetworkNumber,
   accounts: EthAddress[],
 ) => {
-  const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS) as MorphoVaultType[];
+  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[];
   const sparkSavingsVaultsList = Object.keys(sparkSavingsVaults.sparkSavingsVaultsOptions.SPARK_SAVINGS_VAULTS) as SparkSavingsVaultType[];
   const yearnV3VaultsList = Object.keys(yearnV3Vaults.yearnV3VaultsOptions.YEARN_V3_VAULTS) as YearnV3VaultType[];
@@ -42,7 +43,7 @@ export const getSavingsData = async (
   const savingsData: SavingsData = {};
 
   await Promise.all([
-    ...(network === NetworkNumber.Eth ? [
+    ...(morphoVaultsList.length ? [
       (async () => {
         try {
           const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
@@ -52,6 +53,8 @@ export const getSavingsData = async (
           console.error('[getSavingsData] Error fetching morpho vaults:', err);
         }
       })(),
+    ] : []),
+    ...(network === NetworkNumber.Eth ? [
       ...yearnVaultsList.map(async (vaultKey) => {
         try {
           const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);

package/src/savings/morphoVaults/index.ts

@@ -4,10 +4,10 @@ import { request as graphqlRequest } from 'graphql-request';
 import { assetAmountInEth } from '@defisaver/tokens';
 import * as morphoVaultsOptions from './options';
 import {
-  EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, SavingsVaultData,
+  EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, MorphoVaultVersion, SavingsVaultData,
 } from '../../types';
 import { getViemProvider } from '../../services/viem';
-import { getMorphoVaultContractViem } from '../../contracts';
+import { getErc4626ContractViem, getMorphoVaultContractViem } from '../../contracts';
 import { MORPHO_API_URL } from '../../constants';
 
 export {
@@ -17,38 +17,49 @@ export {
 // Morpho API caps list page size at 100 items
 const MORPHO_API_PAGE_SIZE = 100;
 
-const vaultsLiquidityQuery = `
+const buildLiquidityQuery = (listField: 'vaults' | 'vaultV2s') => `
   query VaultsLiquidity($addresses: [String!], $chainIds: [Int!]) {
-    vaults(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
+    ${listField}(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
       items {
         address
-        liquidity {
-          underlying
-        }
+        liquidity${listField === 'vaults' ? ' {\n          underlying\n        }' : ''}
       }
     }
 }`;
 
+const liquidityQueries = {
+  [MorphoVaultVersion.V1]: { field: 'vaults', query: buildLiquidityQuery('vaults') },
+  [MorphoVaultVersion.V2]: { field: 'vaultV2s', query: buildLiquidityQuery('vaultV2s') },
+} as const;
+
+type LiquidityItem = { address: string, liquidity: { underlying: string | number | null } | string | number | null };
+
 /**
- * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
+ * Fetches liquidity for all given vaults, one API request per vault version (chunked if over the page cap),
  * returned as a map keyed by lowercased vault address. A vault missing from the API response is
  * absent from the map.
  */
 export const fetchMorphoVaultsLiquidity = async (network: NetworkNumber, vaults: MorphoVault[]): Promise<Record<string, string>> => {
-  const chunks: MorphoVault[][] = [];
-  for (let i = 0; i < vaults.length; i += MORPHO_API_PAGE_SIZE) chunks.push(vaults.slice(i, i + MORPHO_API_PAGE_SIZE));
+  const requests: { version: MorphoVaultVersion, chunk: MorphoVault[] }[] = [];
+  [MorphoVaultVersion.V1, MorphoVaultVersion.V2].forEach((version) => {
+    const versionVaults = vaults.filter((vault) => vault.version === version);
+    for (let i = 0; i < versionVaults.length; i += MORPHO_API_PAGE_SIZE) requests.push({ version, chunk: versionVaults.slice(i, i + MORPHO_API_PAGE_SIZE) });
+  });
 
   const liquidityByAddress: Record<string, string> = {};
-  await Promise.all(chunks.map(async (chunk) => {
-    const data = await graphqlRequest(MORPHO_API_URL, vaultsLiquidityQuery, {
+  await Promise.all(requests.map(async ({ version, chunk }) => {
+    const { field, query } = liquidityQueries[version];
+    const data = await graphqlRequest(MORPHO_API_URL, query, {
       addresses: chunk.map((vault) => vault.address),
       chainIds: [network],
     // the BigInt scalar serializes as a JSON number when it fits in Number.MAX_SAFE_INTEGER, a string otherwise
-    }) as { vaults: { items: { address: string, liquidity: { underlying: string | number | null } | null }[] | null } };
+    }) as Record<string, { items: LiquidityItem[] | null }>;
 
-    (data.vaults.items || []).forEach((item) => {
-      if (item?.liquidity?.underlying !== undefined && item.liquidity?.underlying !== null) {
-        liquidityByAddress[item.address.toLowerCase()] = String(item.liquidity.underlying);
+    (data[field].items || []).forEach((item) => {
+      // V1 exposes liquidity as { underlying }, V2 as a plain BigInt scalar
+      const underlying = item?.liquidity !== null && typeof item?.liquidity === 'object' ? item.liquidity.underlying : item?.liquidity;
+      if (underlying !== undefined && underlying !== null) {
+        liquidityByAddress[item.address.toLowerCase()] = String(underlying);
       }
     });
   }));
@@ -63,7 +74,22 @@ const getBatchedViemProvider = (provider: EthereumProvider, network: NetworkNumb
   },
 });
 
-const getMorphoVaultChainData = async (provider: Client, morphoVault: MorphoVault, accounts: EthAddress[]) => {
+// Vault V2 is ERC-4626 but has no decimals offset, so shares are converted with convertToAssets
+const getMorphoVaultV2ChainData = async (provider: Client, morphoVault: MorphoVault, accounts: EthAddress[]) => {
+  const vaultContract = getErc4626ContractViem(provider, morphoVault.address);
+
+  const [totalAssets, suppliedAssets] = await Promise.all([
+    vaultContract.read.totalAssets(),
+    Promise.all(accounts.map(async (account) => {
+      const share = await vaultContract.read.balanceOf([account]);
+      return share === BigInt(0) ? BigInt(0) : vaultContract.read.convertToAssets([share]);
+    })),
+  ]);
+
+  return { totalAssets, suppliedAssets };
+};
+
+const getMorphoVaultV1ChainData = async (provider: Client, morphoVault: MorphoVault, accounts: EthAddress[]) => {
   const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
 
   const shares: Record<EthAddress, bigint> = {};
@@ -84,20 +110,46 @@ const getMorphoVaultChainData = async (provider: Client, morphoVault: MorphoVaul
   };
 };
 
+type MorphoVaultChainData = {
+  v1?: Awaited<ReturnType<typeof getMorphoVaultV1ChainData>>,
+  v2?: Awaited<ReturnType<typeof getMorphoVaultV2ChainData>>,
+};
+
+const getMorphoVaultChainData = async (provider: Client, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<MorphoVaultChainData> => (
+  morphoVault.version === MorphoVaultVersion.V2
+    ? { v2: await getMorphoVaultV2ChainData(provider, morphoVault, accounts) }
+    : { v1: await getMorphoVaultV1ChainData(provider, morphoVault, accounts) }
+);
+
 const formatMorphoVaultData = (
   morphoVault: MorphoVault,
-  chainData: Awaited<ReturnType<typeof getMorphoVaultChainData>>,
+  chainData: MorphoVaultChainData,
   liquidityUnderlying: string,
   accounts: EthAddress[],
 ): SavingsVaultData => {
+  const liquidity = assetAmountInEth(liquidityUnderlying, morphoVault.asset);
+  const supplied: Record<EthAddress, string> = {};
+
+  if (chainData.v2) {
+    const { totalAssets, suppliedAssets } = chainData.v2;
+    accounts.forEach((account, i) => {
+      supplied[account.toLowerCase() as EthAddress] = assetAmountInEth(suppliedAssets[i].toString(), morphoVault.asset);
+    });
+    return {
+      poolSize: assetAmountInEth(totalAssets.toString(), morphoVault.asset),
+      supplied,
+      liquidity,
+      asset: morphoVault.asset,
+      optionType: morphoVault.type,
+    };
+  }
+
   const {
     totalAssets, totalSupply, decimals, decimalsOffset, shares,
-  } = chainData;
+  } = chainData.v1!;
 
   const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
-  const liquidity = assetAmountInEth(liquidityUnderlying, morphoVault.asset);
 
-  const supplied: Record<EthAddress, string> = {};
   accounts.forEach((account) => {
     const share = shares[account] || BigInt(0);
     supplied[account.toLowerCase() as EthAddress] = new Dec(new Dec(share.toString()).mul(new Dec(totalAssets.toString()).add(1)).div(new Dec(totalSupply.toString()).add(10 ** decimalsOffset)).div(10 ** 18)

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/types/aave.ts

@@ -1,5 +1,4 @@
 import {
-  EthAddress,
   IncentiveData,
   LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
@@ -49,6 +48,7 @@ export interface EModeCategoryData {
   borrowAssets: string[],
   ltvzeroBitmap?: string,
   ltvZeroAssets: string[],
+  isolated: boolean,
 }
 export interface EModeCategoryDataMapping {
   enteringTerms: boolean[],
@@ -97,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>;
@@ -141,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,
@@ -168,11 +157,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 {

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> {
@@ -157,30 +141,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 {
@@ -104,12 +101,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,
@@ -131,12 +123,4 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
   collateralPrice: string,
   collRatio: string,
   exposure: 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/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;
 }