@defisaver/positions-sdk 2.1.160-shifter-v2-dev → 2.1.161-aave-3.7-dev

package/cjs/maker/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMakerCdpData = exports._getMakerCdpData = exports.getMakerIlksData = exports._getMakerIlksData = exports.getUserCdps = exports._getUserCdps = exports.getMakerAccountBalances = exports._getMakerAccountBalances = void 0;
+exports.getMakerCdpData = exports._getMakerCdpData = exports.getUserCdps = exports._getUserCdps = exports.getMakerAccountBalances = exports._getMakerAccountBalances = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -21,7 +21,6 @@ const utils_1 = require("../services/utils");
 const makerHelpers_1 = require("../helpers/makerHelpers");
 const viem_1 = require("../services/viem");
 const moneymarket_1 = require("../moneymarket");
-const staking_1 = require("../staking");
 const _getMakerAccountBalances = (provider, network, block, addressMapping, cdpId, _managerAddress) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -45,7 +44,7 @@ const _getMakerAccountBalances = (provider, network, block, addressMapping, cdpI
     // [urn, owner, userAddr, ilk, collateral, debt]
     const cdpInfo = yield viewContract.read.getCdpInfo((needsIlk ? [managerAddress, cdpId, ilk] : [cdpId]), (0, viem_1.setViemBlockNumber)(block));
     cdpInfo.ilk = cdpInfo[3];
-    const [par, [_, mat], [artGlobal, rate, spot, line, dust], [duty], futureRate, chop,] = yield Promise.all([
+    const [par, [_, mat], [artGlobal, rate, spot, line], [duty], futureRate, chop,] = yield Promise.all([
         spotterContract.read.par((0, viem_1.setViemBlockNumber)(block)),
         spotterContract.read.ilks(needsIlk ? [ilk] : [cdpInfo.ilk], (0, viem_1.setViemBlockNumber)(block)),
         vatContract.read.ilks(needsIlk ? [ilk] : [cdpInfo.ilk], (0, viem_1.setViemBlockNumber)(block)),
@@ -53,7 +52,7 @@ const _getMakerAccountBalances = (provider, network, block, addressMapping, cdpI
         jugContract.read.drip(needsIlk ? [ilk] : [cdpInfo.ilk], (0, viem_1.setViemBlockNumber)(block)),
         dogContract.read.chop(needsIlk ? [ilk] : [cdpInfo.ilk], (0, viem_1.setViemBlockNumber)(block)),
     ]);
-    const ilkInfo = (0, makerHelpers_1.parseCollateralInfo)(needsIlk ? ilk : cdpInfo.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), dust.toString(), duty.toString(), futureRate.toString(), chop.toString());
+    const ilkInfo = (0, makerHelpers_1.parseCollateralInfo)(needsIlk ? ilk : cdpInfo.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
     const collateral = cdpInfo[4];
     const debt = cdpInfo[5];
     const asset = (0, utils_1.wethToEth)((0, tokens_1.ilkToAsset)(needsIlk ? ilk : cdpInfo.ilk));
@@ -91,40 +90,22 @@ const _getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void
 exports._getUserCdps = _getUserCdps;
 const getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getUserCdps)((0, viem_1.getViemProvider)(provider, network), network, userAddress); });
 exports.getUserCdps = getUserCdps;
-const _getMakerIlksData = (provider, network, ilkLabels) => __awaiter(void 0, void 0, void 0, function* () {
+const _getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, void 0, void 0, function* () {
     const vatContract = (0, contracts_1.McdVatContractViem)(provider, network);
     const spotterContract = (0, contracts_1.McdSpotterContractViem)(provider, network);
     const dogContract = (0, contracts_1.McdDogContractViem)(provider, network);
     const jugContract = (0, contracts_1.McdJugContractViem)(provider, network);
-    const par = yield spotterContract.read.par();
-    const ilksInfo = yield Promise.all(ilkLabels.map((ilkLabel) => __awaiter(void 0, void 0, void 0, function* () {
-        const ilk = (0, tokens_1.stringToBytes)(ilkLabel);
-        const [[_, mat], [artGlobal, rate, spot, line, dust], [duty], futureRate, chop,] = yield Promise.all([
-            spotterContract.read.ilks([ilk]),
-            vatContract.read.ilks([ilk]),
-            jugContract.read.ilks([ilk]),
-            jugContract.read.drip([ilk]),
-            dogContract.read.chop([ilk]),
-        ]);
-        return (0, makerHelpers_1.parseCollateralInfo)(ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), dust.toString(), duty.toString(), futureRate.toString(), chop.toString());
-    })));
-    return Object.fromEntries(ilksInfo.map((ilkInfo) => [ilkInfo.ilkLabel, ilkInfo]));
-});
-exports._getMakerIlksData = _getMakerIlksData;
-const getMakerIlksData = (provider, network, ilkLabels) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getMakerIlksData)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, ilkLabels); });
-exports.getMakerIlksData = getMakerIlksData;
-/**
- * @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
- */
-const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0, void 0, void 0, function* () {
-    const vatContract = (0, contracts_1.McdVatContractViem)(provider, network);
-    const [[ink, art], coll, fetchedIlkInfo, collStakingApy,] = yield Promise.all([
+    const [[ink, art], coll, par, [_, mat], [artGlobal, rate, spot, line], [duty], futureRate, chop,] = yield Promise.all([
         vatContract.read.urns([cdp.ilk, cdp.urn]),
         vatContract.read.gem([cdp.ilk, cdp.urn]),
-        ilkInfo || (0, exports._getMakerIlksData)(provider, network, [cdp.ilkLabel]).then((ilks) => ilks[cdp.ilkLabel]),
-        staking_1.STAKING_ASSETS.includes(cdp.asset) ? (0, staking_1.getStakingApy)(cdp.asset) : Promise.resolve('0'),
+        spotterContract.read.par(),
+        spotterContract.read.ilks([cdp.ilk]),
+        vatContract.read.ilks([cdp.ilk]),
+        jugContract.read.ilks([cdp.ilk]),
+        jugContract.read.drip([cdp.ilk]),
+        dogContract.read.chop([cdp.ilk]),
     ]);
-    const collInfo = fetchedIlkInfo;
+    const collInfo = (0, makerHelpers_1.parseCollateralInfo)(cdp.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
     const collateral = (0, tokens_1.assetAmountInEth)(ink.toString(), `MCD-${cdp.asset}`);
     const collateralUsd = new decimal_js_1.default(collateral).mul(collInfo.assetPrice).toString();
     const debt = new decimal_js_1.default(art).times(collInfo.currentRate).div(1e27).floor()
@@ -136,17 +117,7 @@ const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0,
         .toString();
     if (new decimal_js_1.default(debt).eq(0))
         ratio = '0';
-    // Collateral ratio rebased so 100 sits on the ilk's liquidation ratio (normalised safety ratio).
-    const safetyRatio = +collInfo.liqPercent > 0 ? new decimal_js_1.default(ratio).div(collInfo.liqPercent).mul(100).toString() : '0';
     const debtTooLow = new decimal_js_1.default(debt).gt(0) && new decimal_js_1.default((0, tokens_1.assetAmountInEth)(debt, 'DAI')).lt(collInfo.minDebt);
-    // DAI debt accrues the ilk's stability fee. Collateral earns nothing inside the vault, except for the
-    // native yield of staked collateral (e.g. wstETH), which is tracked as an incentive.
-    const { netApy, totalInterestUsd, incentiveUsd } = (0, staking_1.calculateNetApyFromRates)({
-        suppliedUsd: collateralUsd,
-        borrowedUsd: (0, tokens_1.assetAmountInEth)(debt, 'DAI'),
-        borrowRate: collInfo.stabilityFee.toString(),
-        incentives: [{ apy: collStakingApy, amountUsd: collateralUsd }],
-    });
     return {
         owner: cdp.owner,
         id: cdp.id.toString(),
@@ -165,7 +136,6 @@ const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0,
         debtAssetMarketPrice: '1',
         liquidationPrice,
         ratio,
-        safetyRatio,
         liqRatio: collInfo.liqRatio.toString(),
         liqPercent: parseFloat(collInfo.liqPercent.toString()),
         assetPrice: collInfo.assetPrice,
@@ -181,9 +151,6 @@ const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0,
         liquidationFee: collInfo.liquidationFee,
         lastUpdated: Date.now(),
         exposure: (0, moneymarket_1.getExposure)((0, tokens_1.assetAmountInEth)(debt, 'DAI'), collateralUsd),
-        netApy,
-        totalInterestUsd,
-        incentiveUsd,
     };
 });
 exports._getMakerCdpData = _getMakerCdpData;

package/cjs/markets/index.d.ts

@@ -8,4 +8,3 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
 export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';
-export { MakerActiveIlks } from './maker';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MakerActiveIlks = exports.findAaveV4SpokeByAddress = exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.morphoMidnightVisibleCollaterals = exports.morphoMidnightMarketCollateralParams = exports.isTenorMidnightMarket = exports.findMorphoMidnightMarket = exports.MorphoMidnightMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.findAaveV4SpokeByAddress = exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.morphoMidnightVisibleCollaterals = exports.morphoMidnightMarketCollateralParams = exports.isTenorMidnightMarket = exports.findMorphoMidnightMarket = exports.MorphoMidnightMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -42,5 +42,3 @@ Object.defineProperty(exports, "getFluidMarketInfoByAddress", { enumerable: true
 var aaveV4_1 = require("./aaveV4");
 Object.defineProperty(exports, "AaveV4Spokes", { enumerable: true, get: function () { return aaveV4_1.AaveV4Spokes; } });
 Object.defineProperty(exports, "findAaveV4SpokeByAddress", { enumerable: true, get: function () { return aaveV4_1.findAaveV4SpokeByAddress; } });
-var maker_1 = require("./maker");
-Object.defineProperty(exports, "MakerActiveIlks", { enumerable: true, get: function () { return maker_1.MakerActiveIlks; } });

package/cjs/portfolio/index.d.ts

@@ -1,13 +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: any;
 }>;
-export declare function getShifterPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim?: boolean): Promise<{
-    positions: PortfolioPositionsData;
-    markets: PortfolioMarketsData;
-}>;
 export * from './discovery';

package/cjs/portfolio/index.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortfolioData = getPortfolioData;
-exports.getShifterPortfolioData = getShifterPortfolioData;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const common_1 = require("../types/common");
 const markets_1 = require("../markets");
@@ -574,9 +573,9 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
             })),
             ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, crvUsdMarketsData[market.value].activeBand, crvUsdMarketsData[market.value].borrowRate);
+                    const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
                     if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: accData };
+                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: crvUsdMarketsData[market.value].borrowRate }) };
                     }
                 }
                 catch (error) {
@@ -620,275 +619,4 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         };
     });
 }
-function getShifterPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
-        const isMainnet = network === common_1.NetworkNumber.Eth;
-        const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
-        const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
-        const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const aaveV3Markets = [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
-        const aaveV2Markets = [types_1.AaveVersions.AaveV2].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
-        const compoundV2Markets = [types_1.CompoundVersions.CompoundV2].map((version) => (0, markets_1.CompoundMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
-        const crvUsdMarkets = Object.values((0, markets_1.CrvUsdMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
-        const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
-        const aaveV4Spokes = Object.values((0, markets_1.AaveV4Spokes)(network)).filter((market) => market.chainIds.includes(network));
-        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
-        const client = (0, viem_1.getViemProvider)(provider, ...args);
-        const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
-        const markets = {
-            morphoMarketsData: {},
-            morphoMidnightMarketsData: {}, // Morpho Midnight is not fetched for the shifter; key kept so the payload shape is stable
-            compoundV3MarketsData: {},
-            sparkMarketsData: {},
-            aaveV3MarketsData: {},
-            aaveV2MarketsData: {},
-            compoundV2MarketsData: {},
-            crvUsdMarketsData: {},
-            llamaLendMarketsData: {},
-            liquityV2MarketsData: {},
-            aaveV4SpokesData: {},
-            fluidMarketsData: {},
-            makerMarketsData: {},
-        };
-        const makerCdps = {};
-        const positions = {};
-        for (const address of addresses) {
-            positions[address.toLowerCase()] = {
-                aaveV3: {},
-                aaveV4: {},
-                morphoBlue: {},
-                morphoMidnight: {}, // not fetched for the shifter (see markets above)
-                compoundV3: {},
-                spark: {},
-                maker: {},
-                aaveV2: {},
-                compoundV2: {},
-                liquity: {},
-                crvUsd: {},
-                llamaLend: {},
-                fluid: {
-                    error: '',
-                    data: {},
-                },
-            };
-        }
-        yield Promise.allSettled([
-            // === MARKET DATA (needs to be fetched first) ===
-            ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.morphoMarketsData[market.value] = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
-            })),
-            ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.compoundV3MarketsData[market.value] = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
-            })),
-            ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.sparkMarketsData[market.value] = yield (0, spark_1._getSparkMarketsData)(client, network, market);
-            })),
-            ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV3MarketsData[market.value] = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, market);
-            })),
-            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV4SpokesData[spoke.value] = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke);
-            })),
-            ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV2MarketsData[market.value] = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
-            })),
-            ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.compoundV2MarketsData[market.value] = yield (0, compoundV2_1._getCompoundV2MarketsData)(client, network);
-            })),
-            ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.crvUsdMarketsData[market.value] = yield (0, curveUsd_1._getCurveUsdGlobalData)(client, network, market);
-            })),
-            ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.llamaLendMarketsData[market.value] = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market);
-            })),
-            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.liquityV2MarketsData[market.value] = yield (0, liquityV2_1._getLiquityV2MarketData)(client, network, market);
-            })),
-            (() => __awaiter(this, void 0, void 0, function* () {
-                if (!isFluidSupported)
-                    return;
-                try {
-                    markets.fluidMarketsData = yield (0, fluid_1._getAllFluidMarketDataPortfolio)(client, network);
-                }
-                catch (error) {
-                    console.error('Error fetching Fluid markets data:', error);
-                }
-            }))(),
-            (() => __awaiter(this, void 0, void 0, function* () {
-                if (!isMainnet)
-                    return; // Maker CDPs are only available on mainnet
-                try {
-                    markets.makerMarketsData = yield (0, maker_1._getMakerIlksData)(client, network, markets_1.MakerActiveIlks);
-                }
-                catch (error) {
-                    console.error('Error fetching Maker ilks data:', error);
-                }
-            }))(),
-            // === INDEPENDENT USER DATA (doesn't depend on market data) ===
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                if (!isMainnet)
-                    return; // Maker CDPs are only available on mainnet
-                const makerCdp = yield (0, maker_1._getUserCdps)(client, network, address);
-                makerCdps[address.toLowerCase()] = makerCdp;
-            })),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isFluidSupported)
-                        return; // Fluid is not available on Optimism
-                    const userPositions = (yield (0, fluid_1._getUserPositionsPortfolio)(client, network, address));
-                    for (const position of userPositions) {
-                        if (position.userData && new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
-                            positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
-                        }
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching Fluid positions for address ${address}:`, error);
-                    positions[address.toLowerCase()].fluid = {
-                        error: `Error fetching Fluid positions for address ${address}`,
-                        data: {},
-                    };
-                }
-            })),
-        ]);
-        yield Promise.all([
-            ...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]));
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...aaveV4Spokes.map((spoke) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, aaveV4_1._getAaveV4AccountData)(client, network, markets.aaveV4SpokesData[spoke.value], address);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
-                    positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
-                }
-            }))).flat(),
-            ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, markets.morphoMarketsData[market.value]);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].compoundV3[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        // reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
-                        const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
-                        if (cdpData) {
-                            positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
-                        }
-                    }
-                    catch (error) {
-                        console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
-                        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, markets.aaveV2MarketsData[market.value].assetsData, market);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV2[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
-                    positions[address.toLowerCase()].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
-                }
-            }))).flat(),
-            ...compoundV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].compoundV2[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
-                    positions[address.toLowerCase()].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
-                }
-            }))).flat(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet)
-                        return; // Liquity trove info is only available on mainnet
-                    const troveInfo = yield (0, liquity_1._getLiquityTroveInfo)(client, network, address);
-                    if (new decimal_js_1.default(troveInfo.collateral).gt(0))
-                        positions[address.toLowerCase()].liquity = { error: '', data: troveInfo };
-                }
-                catch (error) {
-                    console.error(`Error fetching Liquity trove info for address ${address}:`, error);
-                    positions[address.toLowerCase()].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
-                }
-            })),
-            ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: accData };
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, markets.llamaLendMarketsData[market.value]);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-        ]);
-        return {
-            positions,
-            markets,
-        };
-    });
-}
 __exportStar(require("./discovery"), exports);

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;