@defisaver/positions-sdk 2.1.159 → 2.1.160-morpho-vault-dev

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, };
-const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
 // 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_BLUE_API, 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,6 @@ 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_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,22 @@ 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_VAULTS = {
     [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
     [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -166,5 +213,7 @@ 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,
 };
 export const getMorphoVault = (type) => MORPHO_VAULTS[type];

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

@@ -1,4 +1,4 @@
-import { EthAddress } from '../common';
+import { EthAddress, NetworkNumber } from '../common';
 export declare enum MorphoVaultType {
     MorphoVaultFlagshipEth = "morpho_vault_flagship_eth",
     MorphoVaultGauntletUSDCCore = "morpho_vault_gauntlet_usdc_core",
@@ -17,13 +17,20 @@ export declare enum MorphoVaultType {
     MorphoVaultSteakhousePYUSD = "morpho_vault_steakhouse_pyusd",
     MorphoVaultSmokehouseUSDT = "morpho_vault_smokehouse_usdt",
     MorphoVaultSmokehouseUSDC = "morpho_vault_smokehouse_usdc",
-    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai"
+    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai",
+    MorphoVaultGauntletUSDGPremium = "morpho_vault_gauntlet_usdg_premium"
+}
+export declare enum MorphoVaultVersion {
+    V1 = 1,
+    V2 = 2
 }
 export interface MorphoVault {
     type: MorphoVaultType;
     name: string;
     address: EthAddress;
     asset: string;
+    network: NetworkNumber;
+    version: MorphoVaultVersion;
     deploymentBlock: number;
     isLegacy: boolean;
 }

package/esm/types/savings/morphoVaults.js

@@ -20,4 +20,11 @@ export var MorphoVaultType;
     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 || (MorphoVaultType = {}));
+export var MorphoVaultVersion;
+(function (MorphoVaultVersion) {
+    MorphoVaultVersion[MorphoVaultVersion["V1"] = 1] = "V1";
+    MorphoVaultVersion[MorphoVaultVersion["V2"] = 2] = "V2";
+})(MorphoVaultVersion || (MorphoVaultVersion = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.159",
+  "version": "2.1.160-morpho-vault-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -9,4 +9,8 @@ export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
 export const ZERO_BYTES32 = '0x0000000000000000000000000000000000000000000000000000000000000000';
 export const WAD = 1e18;
 export const USD_QUOTE = '0x0000000000000000000000000000000000000348';
-export const borrowOperations = ['borrow', 'payback'];
+export const borrowOperations = ['borrow', 'payback'];
+
+// Proxies Morpho's GraphQL API through the DFS backend, which attaches the private API key
+// for better rate limits (DEV-13673)
+export const MORPHO_API_URL = 'https://fe.defisaver.com/api/morpho/graphql';

package/src/helpers/morphoBlueHelpers/index.ts

@@ -12,7 +12,9 @@ import {
   MorphoBluePublicAllocatorItem,
   MorphoBlueRealloactionMarketData,
 } from '../../types';
-import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
+import {
+  borrowOperations, MORPHO_API_URL, SECONDS_PER_YEAR, WAD,
+} from '../../constants';
 import { MorphoBlueViewContractViem } from '../../contracts';
 import { compareAddresses, LONGER_TIMEOUT, wethToEth } from '../../services/utils';
 import { getViemProvider } from '../../services/viem';
@@ -147,7 +149,6 @@ export const getApyAfterValuesEstimation = async (selectedMarket: MorphoBlueMark
   return { borrowRate, supplyRate };
 };
 
-const API_URL = 'https://api.morpho.org/graphql';
 // Morpho Blue ACRM (Adaptive Curve IRM) always targets 90% utilization — protocol constant
 const ACRM_TARGET_UTILIZATION = '900000000000000000';
 
@@ -226,7 +227,7 @@ const REWARDS_QUERY = `
 */
 export const getReallocatableLiquidity = async (marketId: string, network: NetworkNumber = NetworkNumber.Eth): Promise<{ reallocatableLiquidity: string, targetBorrowUtilization: string }> => {
   try {
-    const response = await fetch(API_URL, {
+    const response = await fetch(MORPHO_API_URL, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -291,7 +292,7 @@ export const getLiquidityToAllocate = (amountToBorrow: string, totalBorrow: stri
 export const getReallocation = async (market: MorphoBlueMarketData, assetsData: MorphoBlueAssetsData, amountToBorrow: string, network: NetworkNumber = NetworkNumber.Eth): Promise<{ vaults: string[], withdrawals: (string | string[])[][][] }> => {
   try {
     const { marketId, loanToken } = market;
-    const response = await fetch(API_URL, {
+    const response = await fetch(MORPHO_API_URL, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
@@ -382,7 +383,7 @@ export const getReallocation = async (market: MorphoBlueMarketData, assetsData:
 };
 
 export const getRewardsForMarket = async (marketId: string, network: NetworkNumber = NetworkNumber.Eth) => {
-  const response = await fetch(API_URL, {
+  const response = await fetch(MORPHO_API_URL, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({

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,52 +4,62 @@ 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 {
   morphoVaultsOptions,
 };
 
-const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
-
 // 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_BLUE_API, 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);
       }
     });
   }));
@@ -64,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> = {};
@@ -85,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)