@defisaver/positions-sdk 2.1.162 → 2.1.164

package/esm/portfolio/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
-import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MakerActiveIlks, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData } from '../morphoMidnight';
 import { AaveVersions, CompoundVersions, } from '../types';
@@ -19,13 +19,13 @@ import { _getCurveUsdGlobalData, _getCurveUsdUserData } from '../curveUsd';
 import { _getLlamaLendGlobalData, _getLlamaLendUserData } from '../llamaLend';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
 import { ZERO_ADDRESS } from '../constants';
-import { _getMakerCdpData, _getUserCdps } from '../maker';
+import { _getMakerCdpData, _getMakerIlksData, _getUserCdps } from '../maker';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getCompoundV2AccountData, _getCompoundV2MarketsData } from '../compoundV2';
 import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
 import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
-import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
+import { _getAllFluidMarketDataPortfolio, _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
 import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
@@ -501,21 +501,18 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...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 {
-                        const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
-                        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 };
+            ...addresses.map((address) => (makerCdps[address.toLowerCase()] || []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
+                    if (cdpData) {
+                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
                     }
-                }));
-            })).flat(),
+                }
+                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 _getAaveV2AccountData(client, network, address, aaveV2MarketsData[market.value].assetsData, market);
@@ -553,9 +550,9 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             })),
             ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
+                    const accData = yield _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand, crvUsdMarketsData[market.value].borrowRate);
                     if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: crvUsdMarketsData[market.value].borrowRate }) };
+                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: accData };
                     }
                 }
                 catch (error) {
@@ -599,4 +596,272 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         };
     });
 }
+export 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 === NetworkNumber.Eth;
+        const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
+        const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
+        const compoundV3Markets = Object.values(CompoundMarkets(network)).filter((market) => market.chainIds.includes(network) && market.value !== CompoundVersions.CompoundV2);
+        const sparkMarkets = Object.values(SparkMarkets(network)).filter((market) => market.chainIds.includes(network));
+        const aaveV3Markets = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
+        const aaveV2Markets = [AaveVersions.AaveV2].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
+        const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
+        const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
+        const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
+        const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
+        const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
+        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
+        const client = getViemProvider(provider, ...args);
+        const defaultClient = 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 _getMorphoBluePortfolioMarketData(client, network, market);
+            })),
+            ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.compoundV3MarketsData[market.value] = yield _getCompoundV3MarketsData(client, network, market, defaultClient);
+            })),
+            ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.sparkMarketsData[market.value] = yield _getSparkMarketsData(client, network, market);
+            })),
+            ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.aaveV3MarketsData[market.value] = yield _getAaveV3MarketData(client, network, market);
+            })),
+            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
+                markets.aaveV4SpokesData[spoke.value] = yield _getAaveV4SpokeData(client, network, spoke);
+            })),
+            ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.aaveV2MarketsData[market.value] = yield _getAaveV2MarketsData(client, network, market);
+            })),
+            ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.compoundV2MarketsData[market.value] = yield _getCompoundV2MarketsData(client, network);
+            })),
+            ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.crvUsdMarketsData[market.value] = yield _getCurveUsdGlobalData(client, network, market);
+            })),
+            ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.llamaLendMarketsData[market.value] = yield _getLlamaLendGlobalData(client, network, market);
+            })),
+            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
+                markets.liquityV2MarketsData[market.value] = yield _getLiquityV2MarketData(client, network, market);
+            })),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                if (!isFluidSupported)
+                    return;
+                try {
+                    markets.fluidMarketsData = yield _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 _getMakerIlksData(client, network, 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 _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 _getUserPositionsPortfolio(client, network, address));
+                    for (const position of userPositions) {
+                        if (position.userData && new Dec(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 _getAaveV3AccountData(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]));
+                    // Always store the position (even with no supply) so the eMode category is available to the shifter
+                    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 _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address);
+                    if (new Dec(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 _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value]);
+                    if (new Dec(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 _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
+                    if (new Dec(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 _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
+                    // Always store the position (even with no supply) so the eMode category is available to the shifter
+                    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) => (makerCdps[address.toLowerCase()] || []).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 _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 _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
+                    if (new Dec(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 _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
+                    if (new Dec(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 _getLiquityTroveInfo(client, network, address);
+                    if (new Dec(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 _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate);
+                    if (new Dec(accData.suppliedUsd).gt(0) || new Dec(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 _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value]);
+                    if (new Dec(accData.suppliedUsd).gt(0) || new Dec(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,
+        };
+    });
+}
 export * from './discovery';

package/esm/staking/staking.d.ts

@@ -3,6 +3,26 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: ((asset: string, network?: number) => Promise<string>) & memoize.Memoized<(asset: string, network?: number) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
+/**
+ * Net APY for positions that have a single known borrow rate (and optionally a single supply rate)
+ * instead of per-asset `assetsData` to feed into `calculateNetApy` (Maker, crvUSD, Liquity v1).
+ * All rates are yearly percentages that are already compounded. `incentives` are extra yields
+ * (e.g. the native staking yield of the collateral) applied to their own USD base and summed into `incentiveUsd`.
+ */
+export declare const calculateNetApyFromRates: ({ suppliedUsd, borrowedUsd, supplyRate, borrowRate, incentives, }: {
+    suppliedUsd: string;
+    borrowedUsd: string;
+    supplyRate?: string;
+    borrowRate?: string;
+    incentives?: {
+        apy: string;
+        amountUsd: string;
+    }[];
+}) => {
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
+};
 export declare const calculateNetApy: ({ usedAssets, assetsData, optionalData, }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;

package/esm/staking/staking.js

@@ -182,6 +182,23 @@ export const calculateInterestEarned = (principal, interest, type, apy = false)
     }
     return (+principal * (Math.pow(((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)), (BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
+/**
+ * Net APY for positions that have a single known borrow rate (and optionally a single supply rate)
+ * instead of per-asset `assetsData` to feed into `calculateNetApy` (Maker, crvUSD, Liquity v1).
+ * All rates are yearly percentages that are already compounded. `incentives` are extra yields
+ * (e.g. the native staking yield of the collateral) applied to their own USD base and summed into `incentiveUsd`.
+ */
+export const calculateNetApyFromRates = ({ suppliedUsd, borrowedUsd, supplyRate = '0', borrowRate = '0', incentives = [], }) => {
+    const supplyInterest = new Dec(calculateInterestEarned(suppliedUsd, supplyRate, 'year', true));
+    const borrowInterest = new Dec(calculateInterestEarned(borrowedUsd, borrowRate, 'year', true));
+    const incentiveUsd = incentives
+        .reduce((acc, { apy, amountUsd }) => acc.add(calculateInterestEarned(amountUsd, apy, 'year', true)), new Dec(0))
+        .toString();
+    const totalInterestUsd = supplyInterest.sub(borrowInterest).add(incentiveUsd).toString();
+    const balance = new Dec(suppliedUsd).sub(borrowedUsd);
+    const netApy = balance.isZero() ? '0' : new Dec(totalInterestUsd).div(balance).times(100).toString();
+    return { netApy, totalInterestUsd, incentiveUsd };
+};
 export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);

package/esm/types/aave.d.ts

@@ -127,6 +127,7 @@ export interface AavePositionData extends MMPositionData {
     minRatio: string;
     collRatio: string;
     safetyRatioWithLtvZeroFallback?: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -160,6 +161,7 @@ export interface AaveV3AggregatedPositionData {
     collRatio: string;
     borrowLimitWithLtvZeroFallbackUsd: string;
     safetyRatioWithLtvZeroFallback: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/esm/types/aaveV4.d.ts

@@ -169,6 +169,7 @@ export interface AaveV4AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     liqRatio: string;
     liqPercent: string;
     leveragedType: LeverageType;

package/esm/types/compound.d.ts

@@ -96,6 +96,7 @@ export interface CompoundAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -115,6 +116,7 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/esm/types/curveUsd.d.ts

@@ -73,6 +73,9 @@ export interface CrvUSDAggregatedPositionData {
     collFactor: string;
     leveragedType: LeverageType;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }
@@ -113,4 +116,7 @@ export interface CrvUSDUserData {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/esm/types/fluid.d.ts

@@ -323,6 +323,7 @@ export interface FluidAggregatedVaultData {
     merklBorrowIncentives: IncentiveData[];
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     minRatio: string;
     totalInterestUsd: string;
     leveragedType?: LeverageType;

package/esm/types/liquity.d.ts

@@ -24,7 +24,11 @@ export interface LiquityTroveInfo {
     totalETH: string;
     totalLUSD: string;
     minCollateralRatio: number;
+    safetyRatio: string;
     priceForRecovery: string;
     debtInFront: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/esm/types/liquityV2.d.ts

@@ -94,6 +94,7 @@ export interface LiquityV2AggregatedTroveData {
     liquidationPrice: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     exposure: string;
 }
 export interface LiquityV2TroveData {
@@ -101,6 +102,7 @@ export interface LiquityV2TroveData {
     troveId: string;
     ratio: string;
     collRatio: string;
+    safetyRatio?: string;
     liqRatio: string;
     borrowLimitRatio: string;
     interestRate: string;

package/esm/types/maker.d.ts

@@ -43,6 +43,7 @@ export interface CdpData {
     debtAssetMarketPrice: string;
     liquidationPrice: string;
     ratio: string;
+    safetyRatio: string;
     liqRatio: string;
     liqPercent: number;
     assetPrice: string;
@@ -58,4 +59,7 @@ export interface CdpData {
     liquidationFee: string;
     lastUpdated: number;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/esm/types/morphoBlue.d.ts

@@ -185,6 +185,7 @@ export interface MorphoBlueAggregatedPositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
+    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;
@@ -207,6 +208,7 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
+    safetyRatio?: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/esm/types/morphoMidnight.d.ts

@@ -170,6 +170,7 @@ export interface MorphoMidnightAggregatedPositionData {
     ltv: string;
     ratio: string;
     healthRatio: string;
+    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/esm/types/portfolio.d.ts

@@ -1,15 +1,16 @@
-import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
-import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
+import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidVaultData } from './fluid';
+import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidMarketData, FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData } from './maker';
-import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkPositionData, SparkVersions } from './spark';
+import { LiquityV2MarketData } from './liquityV2';
+import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { CdpData, IlkInfo } from './maker';
+import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
     data: T | null;
@@ -59,3 +60,18 @@ export interface PortfolioPositionsDataForAddress {
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
+export interface PortfolioMarketsData {
+    morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
+    morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
+    compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
+    sparkMarketsData: Record<string, SparkMarketsData>;
+    aaveV3MarketsData: Record<string, AaveV3MarketData>;
+    aaveV2MarketsData: Record<string, AaveV2MarketData>;
+    compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
+    crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
+    llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
+    liquityV2MarketsData: Record<string, LiquityV2MarketData>;
+    aaveV4SpokesData: Record<string, AaveV4SpokeData>;
+    fluidMarketsData: Record<string, FluidMarketData>;
+    makerMarketsData: Record<string, IlkInfo>;
+}

package/esm/types/spark.d.ts

@@ -85,6 +85,7 @@ export interface SparkAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -104,6 +105,7 @@ export interface SparkPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.162",
+  "version": "2.1.164",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV2/index.ts

@@ -210,6 +210,8 @@ export const _getAaveV2AccountData = async (provider: Client, network: NetworkNu
   payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
     ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
     : '0';
+  // Aave v2 has no LTV-0 fallback (AaveV3View only), so its safety ratio is the plain ratio.
+  payload.safetyRatio = payload.ratio;
 
   // Calculate borrow limits per asset
   Object.values(payload.usedAssets).forEach((item) => {