@defisaver/positions-sdk 2.1.160-shifter-v2-dev → 2.1.161-portfolio-api-dev

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");
@@ -522,9 +521,11 @@ 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(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            // 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) => {
                 var _a;
-                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                return ((_a = makerCdps[address.toLowerCase()]) !== null && _a !== 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) {
@@ -536,7 +537,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);
@@ -574,9 +575,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 +621,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/staking/staking.d.ts

@@ -3,26 +3,6 @@ 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/cjs/staking/staking.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.calculateNetApy = exports.calculateNetApyFromRates = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
+exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const memoizee_1 = __importDefault(require("memoizee"));
 const common_1 = require("../types/common");
@@ -189,24 +189,6 @@ const calculateInterestEarned = (principal, interest, type, apy = false) => {
     return (+principal * (Math.pow(((1 + (+interest / 100) / constants_1.BLOCKS_IN_A_YEAR)), (constants_1.BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
 exports.calculateInterestEarned = calculateInterestEarned;
-/**
- * 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`.
- */
-const calculateNetApyFromRates = ({ suppliedUsd, borrowedUsd, supplyRate = '0', borrowRate = '0', incentives = [], }) => {
-    const supplyInterest = new decimal_js_1.default((0, exports.calculateInterestEarned)(suppliedUsd, supplyRate, 'year', true));
-    const borrowInterest = new decimal_js_1.default((0, exports.calculateInterestEarned)(borrowedUsd, borrowRate, 'year', true));
-    const incentiveUsd = incentives
-        .reduce((acc, { apy, amountUsd }) => acc.add((0, exports.calculateInterestEarned)(amountUsd, apy, 'year', true)), new decimal_js_1.default(0))
-        .toString();
-    const totalInterestUsd = supplyInterest.sub(borrowInterest).add(incentiveUsd).toString();
-    const balance = new decimal_js_1.default(suppliedUsd).sub(borrowedUsd);
-    const netApy = balance.isZero() ? '0' : new decimal_js_1.default(totalInterestUsd).div(balance).times(100).toString();
-    return { netApy, totalInterestUsd, incentiveUsd };
-};
-exports.calculateNetApyFromRates = calculateNetApyFromRates;
 const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);

package/cjs/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -84,6 +84,8 @@ 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> = {
@@ -121,12 +123,16 @@ export type AaveUsedAssets<T> = {
 };
 export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
-export interface AavePositionData extends MMPositionData {
+/**
+ * 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 {
     ratio: string;
     minRatio: string;
     collRatio: string;
     safetyRatioWithLtvZeroFallback?: string;
-    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -139,6 +145,12 @@ export interface AavePositionData extends MMPositionData {
 }
 export interface AaveV2PositionData extends AavePositionData {
     usedAssets: AaveV2UsedAssets;
+    eModeCategory?: number;
+    isInIsolationMode?: boolean;
+    isInSiloedMode?: boolean;
+    eModeCategories?: {
+        [key: number]: EModeCategoryDataMapping;
+    };
 }
 export interface AaveV3PositionData extends AavePositionData {
     usedAssets: AaveV3UsedAssets;
@@ -160,7 +172,6 @@ export interface AaveV3AggregatedPositionData {
     collRatio: string;
     borrowLimitWithLtvZeroFallbackUsd: string;
     safetyRatioWithLtvZeroFallback: string;
-    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/cjs/types/aaveV4.d.ts

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

package/cjs/types/compound.d.ts

@@ -52,6 +52,7 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
+    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -63,6 +64,17 @@ 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;
@@ -96,7 +108,6 @@ export interface CompoundAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
-    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -116,7 +127,6 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
-    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -125,9 +135,21 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     automationResubscribeRequired?: boolean;
 }
-export interface CompoundV2PositionData extends CompoundPositionData {
+/**
+ * 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 {
     usedAssets: CompoundV2UsedAssets;
+    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData {
+export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
     usedAssets: CompoundV3UsedAssets;
+    isAllowed?: boolean;
 }

package/cjs/types/curveUsd.d.ts

@@ -60,6 +60,7 @@ export interface CrvUSDGlobalMarketData {
     leftToBorrow: string;
     bands: BandData[];
     loanDiscount: string;
+    A?: bigint;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;
@@ -73,9 +74,6 @@ export interface CrvUSDAggregatedPositionData {
     collFactor: string;
     leveragedType: LeverageType;
     exposure: string;
-    netApy: string;
-    totalInterestUsd: string;
-    incentiveUsd: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }
@@ -94,7 +92,8 @@ export interface CrvUSDUsedAsset {
 export interface CrvUSDUsedAssets {
     [key: string]: CrvUSDUsedAsset;
 }
-export interface CrvUSDUserData {
+export type CrvUSDPositionAggregatedFields = Partial<Pick<CrvUSDAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
+export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -116,7 +115,10 @@ export interface CrvUSDUserData {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
-    netApy: string;
-    totalInterestUsd: string;
-    incentiveUsd: string;
+    marketCollateralAmount?: bigint;
+    curveUsdCollateralAmount?: bigint;
+    N?: bigint;
+    bandRange?: readonly [bigint, bigint];
+    usersBands?: readonly [readonly bigint[], readonly bigint[]];
+    isInSoftLiquidation?: boolean;
 }

package/cjs/types/fluid.d.ts

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

package/cjs/types/liquity.d.ts

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

package/cjs/types/liquityV2.d.ts

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

package/cjs/types/llamaLend.d.ts

@@ -138,7 +138,8 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-export interface LlamaLendUserData {
+export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice' | 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
+export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -157,4 +158,14 @@ export interface LlamaLendUserData {
     loanExists: boolean;
     borrowRate?: string;
     exposure: string;
+    collateralPrice?: bigint;
+    marketCollateralAmount?: bigint;
+    debtTokenCollateralAmount?: bigint;
+    N?: bigint;
+    bandRange?: readonly [bigint, bigint];
+    usersBands?: readonly [readonly bigint[], readonly bigint[]];
+    collRatio?: bigint;
+    isInSoftLiquidation?: boolean;
+    debtTokenSuppliedShares?: bigint;
+    debtTokenSuppliedAssets?: bigint;
 }

package/cjs/types/maker.d.ts

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

package/cjs/types/morphoBlue.d.ts

@@ -185,7 +185,6 @@ export interface MorphoBlueAggregatedPositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;
@@ -208,7 +207,6 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    safetyRatio?: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;
@@ -216,6 +214,8 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
     exposure: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBlueEarnData {
     apy: string;