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

package/cjs/aaveV3/index.js

@@ -41,7 +41,10 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
             : !usedAssetsValues.filter(u => u.isBorrowed && !e.borrowAssets.includes(u.symbol)).length;
         const afterEnteringCategory = (0, aaveHelpers_1.aaveAnyGetAggregatedPositionData)(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: e.id }));
         const willStayOverCollateralized = new decimal_js_1.default(afterEnteringCategory.ratio === 'NaN' ? '0' : afterEnteringCategory.ratio).eq(0) || new decimal_js_1.default(afterEnteringCategory.ratio).gt(afterEnteringCategory.liqPercent);
-        const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized];
+        const collateralOnlyFromCategory = e.id === 0 || !e.isolated
+            ? true
+            : !usedAssetsValues.filter(u => u.isSupplied && u.collateral && !e.collateralAssets.includes(u.symbol)).length;
+        const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized, collateralOnlyFromCategory];
         categoriesMapping[e.id] = {
             enteringTerms,
             canEnterCategory: !enteringTerms.includes(false),
@@ -59,6 +62,7 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
 function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+        var _a;
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
@@ -92,6 +96,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
                     collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
                     ltvzeroBitmap: eModesInfo[i].ltvzeroBitmap.toString(),
+                    isolated: (_a = eModesInfo[i].isolated) !== null && _a !== void 0 ? _a : false,
                     borrowAssets: [],
                     collateralAssets: [],
                     ltvZeroAssets: [],
@@ -307,6 +312,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
             ltvZeroAssets: [],
+            isolated: false,
         };
         return { assetsData: payload, eModeCategoriesData };
     });

package/cjs/helpers/aaveHelpers/index.d.ts

@@ -1,4 +1,4 @@
-import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions } from '../../types';
+import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions, EModeCategoriesData } from '../../types';
 import { EthereumProvider, NetworkNumber } from '../../types/common';
 export declare const AAVE_V3_MARKETS: AaveVersions[];
 export declare const isAaveV2: ({ selectedMarket }: {
@@ -15,6 +15,14 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
     usedAssets: AaveV3UsedAssets;
     assetsData: AaveV3AssetsData;
 }) => boolean;
+export declare const aaveV3IsEmodeIsolated: ({ eModeCategory, eModeCategoriesData }: {
+    eModeCategory: number;
+    eModeCategoriesData?: EModeCategoriesData;
+}) => boolean;
+export declare const aaveV3CanBeCollateralInEmode: ({ eModeCategory, eModeCategoriesData }: {
+    eModeCategory: number;
+    eModeCategoriesData?: EModeCategoriesData;
+}, _asset: string) => boolean;
 export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: AaveV3UsedAssets;
 }) => AaveV3UsedAsset[];

package/cjs/helpers/aaveHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetUserReserveLtvAndLltv = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
+exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetUserReserveLtvAndLltv = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3CanBeCollateralInEmode = exports.aaveV3IsEmodeIsolated = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const types_1 = require("../../types");
@@ -43,6 +43,14 @@ const aaveV3IsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(us
 exports.aaveV3IsInIsolationMode = aaveV3IsInIsolationMode;
 const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, debt }) => debt && assetsData[symbol].isSiloed);
 exports.aaveV3IsInSiloedMode = aaveV3IsInSiloedMode;
+const aaveV3IsEmodeIsolated = ({ eModeCategory, eModeCategoriesData }) => { var _a; return eModeCategory !== 0 && !!((_a = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) === null || _a === void 0 ? void 0 : _a.isolated); };
+exports.aaveV3IsEmodeIsolated = aaveV3IsEmodeIsolated;
+const aaveV3CanBeCollateralInEmode = ({ eModeCategory, eModeCategoriesData }, _asset) => {
+    if (!(0, exports.aaveV3IsEmodeIsolated)({ eModeCategory, eModeCategoriesData }))
+        return true;
+    return eModeCategoriesData[eModeCategory].collateralAssets.includes((0, utils_1.getNativeAssetFromWrapped)(_asset));
+};
+exports.aaveV3CanBeCollateralInEmode = aaveV3CanBeCollateralInEmode;
 const aaveAnyGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets)
     .filter(({ isSupplied, collateral }) => isSupplied && collateral);
 exports.aaveAnyGetCollSuppliedAssets = aaveAnyGetCollSuppliedAssets;
@@ -51,13 +59,16 @@ const aaveAnyGetSuppliableAssets = (_a) => {
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = (0, exports.aaveAnyGetCollSuppliedAssets)(data);
     const marketAssets = Object.values(assetsData);
-    if (collAccountAssets.length === 0 || !(0, exports.isAaveV3)(data))
+    if (!(0, exports.isAaveV3)(data))
         return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+    const canBeCollateralInEmode = (symbol) => (0, exports.aaveV3CanBeCollateralInEmode)(data, symbol);
+    if (collAccountAssets.length === 0)
+        return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: canBeCollateralInEmode(symbol) }));
     if ((0, exports.aaveV3IsInIsolationMode)(data)) {
         const collAsset = collAccountAssets[0].symbol;
-        return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset }));
+        return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset && canBeCollateralInEmode(symbol) }));
     }
-    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
+    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated && canBeCollateralInEmode(symbol) }));
 };
 exports.aaveAnyGetSuppliableAssets = aaveAnyGetSuppliableAssets;
 const aaveAnyGetSuppliableAsCollAssets = (_a) => {
@@ -69,12 +80,15 @@ const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, asset
     const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
     const assetData = assetsData[asset];
     const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || {
-        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0',
+        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0', isolated: false,
     };
     if (eModeCategory === 0
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
+        if (eModeCategory !== 0 && eModeCategoryData.isolated && !eModeCategoryData.collateralAssets.includes(asset)) {
+            return ({ liquidationRatio, collateralFactor: '0' });
+        }
         return ({ liquidationRatio, collateralFactor });
     }
     if (eModeCategoryData.ltvZeroAssets.includes(asset))
@@ -110,7 +124,10 @@ const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, a
         || !eModeCategoryData
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
-        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+        const ltv = eModeCategory !== 0 && (eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.isolated) && !eModeCategoryData.collateralAssets.includes(asset)
+            ? '0'
+            : assetData.collateralFactor;
+        return { ltv, lltv: assetData.liquidationRatio };
     }
     const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
     return { ltv, lltv: eModeCategoryData.liquidationRatio };

package/cjs/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/cjs/portfolio/index.js

@@ -521,11 +521,9 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     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 (0, maker_1._getMakerCdpData)(client, network, cdpInfo);
                         if (cdpData) {
@@ -537,7 +535,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                         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 (0, aaveV2_1._getAaveV2AccountData)(client, network, address, aaveV2MarketsData[market.value].assetsData, market);

package/cjs/savings/index.js

@@ -60,7 +60,8 @@ exports.summerVaults = summerVaults;
 const yearnV3Vaults = __importStar(require("./yearnV3Vaults"));
 exports.yearnV3Vaults = yearnV3Vaults;
 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);
@@ -68,7 +69,7 @@ const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0
         .filter((key) => summerVaults.summerVaultsOptions.getSummerVault(key).network === network);
     const savingsData = {};
     yield Promise.all([
-        ...(network === common_1.NetworkNumber.Eth ? [
+        ...(morphoVaultsList.length ? [
             (() => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
@@ -79,6 +80,8 @@ const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0
                     console.error('[getSavingsData] Error fetching morpho vaults:', err);
                 }
             }))(),
+        ] : []),
+        ...(network === common_1.NetworkNumber.Eth ? [
             ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);

package/cjs/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/cjs/savings/morphoVaults/index.js

@@ -53,42 +53,50 @@ const graphql_request_1 = require("graphql-request");
 const tokens_1 = require("@defisaver/tokens");
 const morphoVaultsOptions = __importStar(require("./options"));
 exports.morphoVaultsOptions = morphoVaultsOptions;
+const types_1 = require("../../types");
 const viem_1 = require("../../services/viem");
 const contracts_1 = require("../../contracts");
 const constants_1 = require("../../constants");
 // 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 = {
+    [types_1.MorphoVaultVersion.V1]: { field: 'vaults', query: buildLiquidityQuery('vaults') },
+    [types_1.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.
  */
 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 = [];
+    [types_1.MorphoVaultVersion.V1, types_1.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 (0, graphql_request_1.request)(constants_1.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 (0, graphql_request_1.request)(constants_1.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);
             }
         });
     })));
@@ -102,7 +110,19 @@ const getBatchedViemProvider = (provider, network) => (0, viem_1.getViemProvider
         },
     },
 });
-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 = (0, contracts_1.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 = (0, contracts_1.getMorphoVaultContractViem)(provider, morphoVault.address);
     const shares = {};
     const [totalAssets, totalSupply, decimals, decimalsOffset] = yield Promise.all([
@@ -119,11 +139,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 === types_1.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 = (0, tokens_1.assetAmountInEth)(totalAssets.toString(), morphoVault.asset);
     const liquidity = (0, tokens_1.assetAmountInEth)(liquidityUnderlying, morphoVault.asset);
     const supplied = {};
+    if (chainData.v2) {
+        const { totalAssets, suppliedAssets } = chainData.v2;
+        accounts.forEach((account, i) => {
+            supplied[account.toLowerCase()] = (0, tokens_1.assetAmountInEth)(suppliedAssets[i].toString(), morphoVault.asset);
+        });
+        return {
+            poolSize: (0, tokens_1.assetAmountInEth)(totalAssets.toString(), morphoVault.asset),
+            supplied,
+            liquidity,
+            asset: morphoVault.asset,
+            optionType: morphoVault.type,
+        };
+    }
+    const { totalAssets, totalSupply, decimals, decimalsOffset, shares, } = chainData.v1;
+    const poolSize = (0, tokens_1.assetAmountInEth)(totalAssets.toString(), morphoVault.asset);
     accounts.forEach((account) => {
         const share = shares[account] || BigInt(0);
         supplied[account.toLowerCase()] = new decimal_js_1.default(new decimal_js_1.default(share.toString()).mul(new decimal_js_1.default(totalAssets.toString()).add(1)).div(new decimal_js_1.default(totalSupply.toString()).add(Math.pow(10, decimalsOffset))).div(Math.pow(10, 18))

package/cjs/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/cjs/savings/morphoVaults/options.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMorphoVault = exports.MORPHO_VAULTS = exports.MORPHO_VAULT_SMOKEHOUSE_DAI = exports.MORPHO_VAULT_SMOKEHOUSE_USDC = exports.MORPHO_VAULT_SMOKEHOUSE_USDT = exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = exports.MORPHO_VAULT_STEAKHOUSE_ETH = exports.MORPHO_VAULT_STEAKHOUSE_USDC = exports.MORPHO_VAULT_STEAKHOUSE_USDT = exports.MORPHO_VAULT_GAUNTLET_RESOLV_USDC = exports.MORPHO_VAULT_GAUNTLET_USDT_PRIME = exports.MORPHO_VAULT_GAUNTLET_USDA_CORE = exports.MORPHO_VAULT_FLAGSHIP_USDT = exports.MORPHO_VAULT_BOOSTED_USDC = exports.MORPHO_VAULT_GAUNTLET_WETH_PRIME = exports.MORPHO_VAULT_GAUNTLET_WETH_CORE = exports.MORPHO_VAULT_RE7_WETH = exports.MORPHO_VAULT_GAUNTLET_USDC_PRIME = exports.MORPHO_VAULT_GAUNTLET_USDC_CORE = exports.MORPHO_VAULT_FLAGSHIP_ETH = void 0;
+exports.getMorphoVault = exports.MORPHO_VAULTS = exports.MORPHO_VAULT_STEAKHOUSE_USDG_PRO = exports.MORPHO_VAULT_GAUNTLET_USDG_PREMIUM = exports.MORPHO_VAULT_SMOKEHOUSE_DAI = exports.MORPHO_VAULT_SMOKEHOUSE_USDC = exports.MORPHO_VAULT_SMOKEHOUSE_USDT = exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = exports.MORPHO_VAULT_STEAKHOUSE_ETH = exports.MORPHO_VAULT_STEAKHOUSE_USDC = exports.MORPHO_VAULT_STEAKHOUSE_USDT = exports.MORPHO_VAULT_GAUNTLET_RESOLV_USDC = exports.MORPHO_VAULT_GAUNTLET_USDT_PRIME = exports.MORPHO_VAULT_GAUNTLET_USDA_CORE = exports.MORPHO_VAULT_FLAGSHIP_USDT = exports.MORPHO_VAULT_BOOSTED_USDC = exports.MORPHO_VAULT_GAUNTLET_WETH_PRIME = exports.MORPHO_VAULT_GAUNTLET_WETH_CORE = exports.MORPHO_VAULT_RE7_WETH = exports.MORPHO_VAULT_GAUNTLET_USDC_PRIME = exports.MORPHO_VAULT_GAUNTLET_USDC_CORE = exports.MORPHO_VAULT_FLAGSHIP_ETH = void 0;
 const types_1 = require("../../types");
 exports.MORPHO_VAULT_FLAGSHIP_ETH = {
     type: types_1.MorphoVaultType.MorphoVaultFlagshipEth,
     name: 'Flagship ETH',
     address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
     asset: 'WETH',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 18927491,
     isLegacy: true,
 };
@@ -15,6 +17,8 @@ exports.MORPHO_VAULT_GAUNTLET_USDC_CORE = {
     name: 'Gauntlet USDC Core',
     address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
     asset: 'USDC',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19777569,
     isLegacy: true,
 };
@@ -23,6 +27,8 @@ exports.MORPHO_VAULT_GAUNTLET_USDC_PRIME = {
     name: 'Gauntlet USDC Prime',
     address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
     asset: 'USDC',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19777569,
     isLegacy: true,
 };
@@ -31,6 +37,8 @@ exports.MORPHO_VAULT_RE7_WETH = {
     name: 'RE7 WETH',
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
     asset: 'WETH',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19121118,
     isLegacy: true,
 };
@@ -39,6 +47,8 @@ exports.MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     name: 'Gauntlet WETH Core',
     address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
     asset: 'WETH',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19541126,
     isLegacy: true,
 };
@@ -47,6 +57,8 @@ exports.MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     name: 'Gauntlet WETH Prime',
     address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
     asset: 'WETH',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19372149,
     isLegacy: true,
 };
@@ -55,6 +67,8 @@ exports.MORPHO_VAULT_BOOSTED_USDC = {
     name: 'Boosted USDC',
     address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
     asset: 'USDC',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 20377233,
     isLegacy: true,
 };
@@ -63,6 +77,8 @@ exports.MORPHO_VAULT_FLAGSHIP_USDT = {
     name: 'Flagship USDT',
     address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
     asset: 'USDT',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19127039,
     isLegacy: true,
 };
@@ -71,6 +87,8 @@ exports.MORPHO_VAULT_GAUNTLET_USDA_CORE = {
     name: 'Gauntlet USDA Core',
     address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
     asset: 'USDA',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19633608,
     isLegacy: true,
 };
@@ -79,6 +97,8 @@ exports.MORPHO_VAULT_GAUNTLET_USDT_PRIME = {
     name: 'Gauntlet USDT Prime',
     address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
     asset: 'USDT',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19486541,
     isLegacy: true,
 };
@@ -87,6 +107,8 @@ exports.MORPHO_VAULT_GAUNTLET_RESOLV_USDC = {
     name: 'Gauntlet Resolv USDC',
     address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
     asset: 'USDC',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 21487882,
     isLegacy: true,
 };
@@ -96,6 +118,8 @@ exports.MORPHO_VAULT_STEAKHOUSE_USDT = {
     name: 'Steakhouse USDT',
     address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
     asset: 'USDT',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -104,6 +128,8 @@ exports.MORPHO_VAULT_STEAKHOUSE_USDC = {
     name: 'Steakhouse USDC',
     address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
     asset: 'USDC',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 18928285,
     isLegacy: false,
 };
@@ -112,6 +138,8 @@ exports.MORPHO_VAULT_STEAKHOUSE_ETH = {
     name: 'Steakhouse WETH',
     address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
     asset: 'WETH',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19380443,
     isLegacy: false,
 };
@@ -120,6 +148,8 @@ exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     name: 'Steakhouse PYUSD',
     address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -129,6 +159,8 @@ exports.MORPHO_VAULT_SMOKEHOUSE_USDT = {
     name: 'Smokehouse USDT',
     address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
     asset: 'USDT',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 21522238,
     isLegacy: false,
 };
@@ -137,6 +169,8 @@ exports.MORPHO_VAULT_SMOKEHOUSE_USDC = {
     name: 'Smokehouse USDC',
     address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
     asset: 'USDC',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 21337719,
     isLegacy: false,
 };
@@ -145,9 +179,32 @@ exports.MORPHO_VAULT_SMOKEHOUSE_DAI = {
     name: 'Smokehouse DAI',
     address: '0xbeeFfF68CC520D68f82641EFF84330C631E2490E',
     asset: 'DAI',
+    network: types_1.NetworkNumber.Eth,
+    version: types_1.MorphoVaultVersion.V1,
     deploymentBlock: 21343808,
     isLegacy: false,
 };
+// Vault V2
+exports.MORPHO_VAULT_GAUNTLET_USDG_PREMIUM = {
+    type: types_1.MorphoVaultType.MorphoVaultGauntletUSDGPremium,
+    name: 'Gauntlet USDG Premium',
+    address: '0x390c1bb01F3F627144a40617e287d4cE3D5aBCfa',
+    asset: 'USDG',
+    network: types_1.NetworkNumber.Arb,
+    version: types_1.MorphoVaultVersion.V2,
+    deploymentBlock: 510799903,
+    isLegacy: false,
+};
+exports.MORPHO_VAULT_STEAKHOUSE_USDG_PRO = {
+    type: types_1.MorphoVaultType.MorphoVaultSteakhouseUSDGPro,
+    name: 'Steakhouse USDG Pro',
+    address: '0xbeeFf72B77e7584a450E887125F25E8D8819016a',
+    asset: 'USDG',
+    network: types_1.NetworkNumber.Arb,
+    version: types_1.MorphoVaultVersion.V2,
+    deploymentBlock: 512247107,
+    isLegacy: false,
+};
 exports.MORPHO_VAULTS = {
     [types_1.MorphoVaultType.MorphoVaultFlagshipEth]: exports.MORPHO_VAULT_FLAGSHIP_ETH,
     [types_1.MorphoVaultType.MorphoVaultGauntletUSDCCore]: exports.MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -169,6 +226,9 @@ exports.MORPHO_VAULTS = {
     [types_1.MorphoVaultType.MorphoVaultSmokehouseUSDT]: exports.MORPHO_VAULT_SMOKEHOUSE_USDT,
     [types_1.MorphoVaultType.MorphoVaultSmokehouseUSDC]: exports.MORPHO_VAULT_SMOKEHOUSE_USDC,
     [types_1.MorphoVaultType.MorphoVaultSmokehouseDAI]: exports.MORPHO_VAULT_SMOKEHOUSE_DAI,
+    // Vault V2
+    [types_1.MorphoVaultType.MorphoVaultGauntletUSDGPremium]: exports.MORPHO_VAULT_GAUNTLET_USDG_PREMIUM,
+    [types_1.MorphoVaultType.MorphoVaultSteakhouseUSDGPro]: exports.MORPHO_VAULT_STEAKHOUSE_USDG_PRO,
 };
 const getMorphoVault = (type) => exports.MORPHO_VAULTS[type];
 exports.getMorphoVault = getMorphoVault;

package/cjs/spark/index.js

@@ -88,6 +88,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             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 ({
             symbol: selectedMarket.assets[i],

package/cjs/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",
@@ -40,6 +40,7 @@ export interface EModeCategoryData {
     borrowAssets: string[];
     ltvzeroBitmap?: string;
     ltvZeroAssets: string[];
+    isolated: boolean;
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];
@@ -84,8 +85,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 +122,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 +139,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/cjs/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;
 }