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

package/cjs/types/spark.d.ts

@@ -46,21 +46,6 @@ export interface SparkAssetData extends MMAssetData {
     eModeCategory: number;
     liquidationBonus: string;
     liquidationRatio: string;
-    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 {
     [token: string]: SparkAssetData;
@@ -115,12 +100,7 @@ export interface SparkAggregatedPositionData {
     minHealthRatio: string;
     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/esm/portfolio/index.d.ts

@@ -1,9 +1,9 @@
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { PortfolioMarketsData, PortfolioPositionsData } from '../types';
+import { PortfolioPositionsData } from '../types';
 export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim?: boolean): Promise<{
     positions: PortfolioPositionsData;
     stakingPositions: any;
     rewardsData: any;
-    markets: PortfolioMarketsData;
+    markets: any;
 }>;
 export * from './discovery';

package/esm/portfolio/index.js

@@ -501,11 +501,9 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            // flatMap, not map: each CDP's fetch has to be one of the awaited promises, or getPortfolioData can return
-            // before a vault's data lands and the vault is missing from the result.
-            ...addresses.flatMap((address) => {
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
-                return ((_a = makerCdps[address.toLowerCase()]) !== null && _a !== void 0 ? _a : []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
                         if (cdpData) {
@@ -517,7 +515,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                         positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
                     }
                 }));
-            }),
+            })).flat(),
             ...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield _getAaveV2AccountData(client, network, address, aaveV2MarketsData[market.value].assetsData, market);

package/esm/savings/index.js

@@ -18,7 +18,8 @@ import * as summerVaults from './summerVaults';
 import * as yearnV3Vaults from './yearnV3Vaults';
 export { morphoVaults, yearnVaults, makerDsr, skyOptions, sparkSavingsVaults, summerVaults, yearnV3Vaults, };
 export const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0, void 0, function* () {
-    const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS);
+    const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS)
+        .filter((key) => morphoVaults.morphoVaultsOptions.getMorphoVault(key).network === network);
     const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS);
     const sparkSavingsVaultsList = Object.keys(sparkSavingsVaults.sparkSavingsVaultsOptions.SPARK_SAVINGS_VAULTS);
     const yearnV3VaultsList = Object.keys(yearnV3Vaults.yearnV3VaultsOptions.YEARN_V3_VAULTS);
@@ -26,7 +27,7 @@ export const getSavingsData = (provider, network, accounts) => __awaiter(void 0,
         .filter((key) => summerVaults.summerVaultsOptions.getSummerVault(key).network === network);
     const savingsData = {};
     yield Promise.all([
-        ...(network === NetworkNumber.Eth ? [
+        ...(morphoVaultsList.length ? [
             (() => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
@@ -37,6 +38,8 @@ export const getSavingsData = (provider, network, accounts) => __awaiter(void 0,
                     console.error('[getSavingsData] Error fetching morpho vaults:', err);
                 }
             }))(),
+        ] : []),
+        ...(network === NetworkNumber.Eth ? [
             ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);

package/esm/savings/morphoVaults/index.d.ts

@@ -3,7 +3,7 @@ import * as morphoVaultsOptions from './options';
 import { EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, SavingsVaultData } from '../../types';
 export { morphoVaultsOptions, };
 /**
- * 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.
  */

package/esm/savings/morphoVaults/index.js

@@ -11,43 +11,51 @@ import Dec from 'decimal.js';
 import { request as graphqlRequest } from 'graphql-request';
 import { assetAmountInEth } from '@defisaver/tokens';
 import * as morphoVaultsOptions from './options';
+import { MorphoVaultVersion, } from '../../types';
 import { getViemProvider } from '../../services/viem';
-import { getMorphoVaultContractViem } from '../../contracts';
+import { getErc4626ContractViem, getMorphoVaultContractViem } from '../../contracts';
 import { MORPHO_API_URL } from '../../constants';
 export { morphoVaultsOptions, };
 // Morpho API caps list page size at 100 items
 const MORPHO_API_PAGE_SIZE = 100;
-const vaultsLiquidityQuery = `
+const buildLiquidityQuery = (listField) => `
   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') },
+};
 /**
- * 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 = (network, vaults) => __awaiter(void 0, void 0, void 0, function* () {
-    const chunks = [];
-    for (let i = 0; i < vaults.length; i += MORPHO_API_PAGE_SIZE)
-        chunks.push(vaults.slice(i, i + MORPHO_API_PAGE_SIZE));
+    const requests = [];
+    [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 = {};
-    yield Promise.all(chunks.map((chunk) => __awaiter(void 0, void 0, void 0, function* () {
-        const data = yield graphqlRequest(MORPHO_API_URL, vaultsLiquidityQuery, {
+    yield Promise.all(requests.map((_a) => __awaiter(void 0, [_a], void 0, function* ({ version, chunk }) {
+        const { field, query } = liquidityQueries[version];
+        const data = yield 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
         });
-        (data.vaults.items || []).forEach((item) => {
-            var _a, _b;
-            if (((_a = item === null || item === void 0 ? void 0 : item.liquidity) === null || _a === void 0 ? void 0 : _a.underlying) !== undefined && ((_b = item.liquidity) === null || _b === void 0 ? void 0 : _b.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 === null || item === void 0 ? void 0 : item.liquidity) !== null && typeof (item === null || item === void 0 ? void 0 : item.liquidity) === 'object' ? item.liquidity.underlying : item === null || item === void 0 ? void 0 : item.liquidity;
+            if (underlying !== undefined && underlying !== null) {
+                liquidityByAddress[item.address.toLowerCase()] = String(underlying);
             }
         });
     })));
@@ -60,7 +68,19 @@ const getBatchedViemProvider = (provider, network) => getViemProvider(provider,
         },
     },
 });
-const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+// Vault V2 is ERC-4626 but has no decimals offset, so shares are converted with convertToAssets
+const getMorphoVaultV2ChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+    const vaultContract = getErc4626ContractViem(provider, morphoVault.address);
+    const [totalAssets, suppliedAssets] = yield Promise.all([
+        vaultContract.read.totalAssets(),
+        Promise.all(accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
+            const share = yield vaultContract.read.balanceOf([account]);
+            return share === BigInt(0) ? BigInt(0) : vaultContract.read.convertToAssets([share]);
+        }))),
+    ]);
+    return { totalAssets, suppliedAssets };
+});
+const getMorphoVaultV1ChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
     const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
     const shares = {};
     const [totalAssets, totalSupply, decimals, decimalsOffset] = yield Promise.all([
@@ -77,11 +97,29 @@ const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(v
         totalAssets, totalSupply, decimals, decimalsOffset, shares,
     };
 });
+const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+    return (morphoVault.version === MorphoVaultVersion.V2
+        ? { v2: yield getMorphoVaultV2ChainData(provider, morphoVault, accounts) }
+        : { v1: yield getMorphoVaultV1ChainData(provider, morphoVault, accounts) });
+});
 const formatMorphoVaultData = (morphoVault, chainData, liquidityUnderlying, accounts) => {
-    const { totalAssets, totalSupply, decimals, decimalsOffset, shares, } = chainData;
-    const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
     const liquidity = assetAmountInEth(liquidityUnderlying, morphoVault.asset);
     const supplied = {};
+    if (chainData.v2) {
+        const { totalAssets, suppliedAssets } = chainData.v2;
+        accounts.forEach((account, i) => {
+            supplied[account.toLowerCase()] = 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.v1;
+    const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
     accounts.forEach((account) => {
         const share = shares[account] || BigInt(0);
         supplied[account.toLowerCase()] = new Dec(new Dec(share.toString()).mul(new Dec(totalAssets.toString()).add(1)).div(new Dec(totalSupply.toString()).add(Math.pow(10, decimalsOffset))).div(Math.pow(10, 18))

package/esm/savings/morphoVaults/options.d.ts

@@ -17,5 +17,7 @@ export declare const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault;
 export declare const MORPHO_VAULT_SMOKEHOUSE_USDT: MorphoVault;
 export declare const MORPHO_VAULT_SMOKEHOUSE_USDC: MorphoVault;
 export declare const MORPHO_VAULT_SMOKEHOUSE_DAI: MorphoVault;
+export declare const MORPHO_VAULT_GAUNTLET_USDG_PREMIUM: MorphoVault;
+export declare const MORPHO_VAULT_STEAKHOUSE_USDG_PRO: MorphoVault;
 export declare const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault>;
 export declare const getMorphoVault: (type: MorphoVaultType) => MorphoVault;

package/esm/savings/morphoVaults/options.js

@@ -1,9 +1,11 @@
-import { MorphoVaultType } from '../../types';
+import { MorphoVaultType, MorphoVaultVersion, NetworkNumber, } from '../../types';
 export const MORPHO_VAULT_FLAGSHIP_ETH = {
     type: MorphoVaultType.MorphoVaultFlagshipEth,
     name: 'Flagship ETH',
     address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 18927491,
     isLegacy: true,
 };
@@ -12,6 +14,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_CORE = {
     name: 'Gauntlet USDC Core',
     address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19777569,
     isLegacy: true,
 };
@@ -20,6 +24,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_PRIME = {
     name: 'Gauntlet USDC Prime',
     address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19777569,
     isLegacy: true,
 };
@@ -28,6 +34,8 @@ export const MORPHO_VAULT_RE7_WETH = {
     name: 'RE7 WETH',
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19121118,
     isLegacy: true,
 };
@@ -36,6 +44,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     name: 'Gauntlet WETH Core',
     address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19541126,
     isLegacy: true,
 };
@@ -44,6 +54,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     name: 'Gauntlet WETH Prime',
     address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19372149,
     isLegacy: true,
 };
@@ -52,6 +64,8 @@ export const MORPHO_VAULT_BOOSTED_USDC = {
     name: 'Boosted USDC',
     address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 20377233,
     isLegacy: true,
 };
@@ -60,6 +74,8 @@ export const MORPHO_VAULT_FLAGSHIP_USDT = {
     name: 'Flagship USDT',
     address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19127039,
     isLegacy: true,
 };
@@ -68,6 +84,8 @@ export const MORPHO_VAULT_GAUNTLET_USDA_CORE = {
     name: 'Gauntlet USDA Core',
     address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
     asset: 'USDA',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19633608,
     isLegacy: true,
 };
@@ -76,6 +94,8 @@ export const MORPHO_VAULT_GAUNTLET_USDT_PRIME = {
     name: 'Gauntlet USDT Prime',
     address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19486541,
     isLegacy: true,
 };
@@ -84,6 +104,8 @@ export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC = {
     name: 'Gauntlet Resolv USDC',
     address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 21487882,
     isLegacy: true,
 };
@@ -93,6 +115,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT = {
     name: 'Steakhouse USDT',
     address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -101,6 +125,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDC = {
     name: 'Steakhouse USDC',
     address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 18928285,
     isLegacy: false,
 };
@@ -109,6 +135,8 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH = {
     name: 'Steakhouse WETH',
     address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19380443,
     isLegacy: false,
 };
@@ -117,6 +145,8 @@ export const MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     name: 'Steakhouse PYUSD',
     address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -126,6 +156,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDT = {
     name: 'Smokehouse USDT',
     address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 21522238,
     isLegacy: false,
 };
@@ -134,6 +166,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDC = {
     name: 'Smokehouse USDC',
     address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 21337719,
     isLegacy: false,
 };
@@ -142,9 +176,32 @@ export const MORPHO_VAULT_SMOKEHOUSE_DAI = {
     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 = {
+    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 = {
+    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 = {
     [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
     [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -166,5 +223,8 @@ export const MORPHO_VAULTS = {
     [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) => MORPHO_VAULTS[type];

package/esm/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -84,8 +84,6 @@ export interface AaveV3AssetData extends AaveAssetData {
     liquidationBonus: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-    aTokenAddress?: EthAddress;
-    vTokenAddress?: EthAddress;
 }
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
 export type AaveAssetsData<T> = {
@@ -123,12 +121,7 @@ export type AaveUsedAssets<T> = {
 };
 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;
@@ -145,12 +138,6 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
 }
 export interface AaveV2PositionData extends AavePositionData {
     usedAssets: AaveV2UsedAssets;
-    eModeCategory?: number;
-    isInIsolationMode?: boolean;
-    isInSiloedMode?: boolean;
-    eModeCategories?: {
-        [key: number]: EModeCategoryDataMapping;
-    };
 }
 export interface AaveV3PositionData extends AavePositionData {
     usedAssets: AaveV3UsedAssets;

package/esm/types/compound.d.ts

@@ -52,7 +52,6 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
-    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -64,17 +63,6 @@ export interface CompoundV3AssetData extends CompoundAssetData {
     supplyCap: string;
     priceInBaseAsset: string;
     canBeWithdrawn: boolean;
-    tokenAddr?: EthAddress;
-    isBase?: boolean;
-    baseBorrowMin?: string;
-    baseTrackingBorrowRewardsSpeed?: string;
-    baseTrackingSupplyRewardsSpeed?: string;
-    borrowIndex?: string;
-    supplyIndex?: string;
-    trackingBorrowIndex?: string;
-    trackingSupplyIndex?: string;
-    rewardSupplySpeed?: string;
-    rewardBorrowSpeed?: string;
 }
 export interface CompoundAssetsData<T> {
     [token: string]: T;
@@ -135,21 +123,9 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     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;
-    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
+export interface CompoundV3PositionData extends CompoundPositionData {
     usedAssets: CompoundV3UsedAssets;
-    isAllowed?: boolean;
 }

package/esm/types/curveUsd.d.ts

@@ -60,7 +60,6 @@ export interface CrvUSDGlobalMarketData {
     leftToBorrow: string;
     bands: BandData[];
     loanDiscount: string;
-    A?: bigint;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;
@@ -92,8 +91,7 @@ export interface CrvUSDUsedAsset {
 export interface CrvUSDUsedAssets {
     [key: string]: CrvUSDUsedAsset;
 }
-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;
@@ -115,10 +113,4 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
-    marketCollateralAmount?: bigint;
-    curveUsdCollateralAmount?: bigint;
-    N?: bigint;
-    bandRange?: readonly [bigint, bigint];
-    usersBands?: readonly [readonly bigint[], readonly bigint[]];
-    isInSoftLiquidation?: boolean;
 }

package/esm/types/llamaLend.d.ts

@@ -138,8 +138,7 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-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;
@@ -158,14 +157,4 @@ export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     loanExists: boolean;
     borrowRate?: string;
     exposure: string;
-    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/esm/types/morphoBlue.d.ts

@@ -214,8 +214,6 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
     exposure: string;
-    minCollRatio?: string;
-    collLiquidationRatio?: string;
 }
 export interface MorphoBlueEarnData {
     apy: string;

package/esm/types/portfolio.d.ts

@@ -1,16 +1,15 @@
-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 } from './liquityV2';
-import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+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;
     data: T | null;
@@ -60,17 +59,3 @@ 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>;
-}