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

package/esm/maker/index.js

@@ -8,14 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInEth, bytesToString, getAssetInfo, ilkToAsset, stringToBytes, } from '@defisaver/tokens';
+import { assetAmountInEth, bytesToString, getAssetInfo, ilkToAsset, } from '@defisaver/tokens';
 import { getConfigContractAddress, McdDogContractViem, McdGetCdpsContractViem, McdJugContractViem, McdSpotterContractViem, McdVatContractViem, McdViewContractViem, } from '../contracts';
-import { CdpType, } from '../types';
+import { CdpType } from '../types';
 import { wethToEth } from '../services/utils';
 import { parseCollateralInfo } from '../helpers/makerHelpers';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { getExposure } from '../moneymarket';
-import { calculateNetApyFromRates, getStakingApy, STAKING_ASSETS } from '../staking';
 export const _getMakerAccountBalances = (provider, network, block, addressMapping, cdpId, _managerAddress) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -39,7 +38,7 @@ export const _getMakerAccountBalances = (provider, network, block, addressMappin
     // [urn, owner, userAddr, ilk, collateral, debt]
     const cdpInfo = yield viewContract.read.getCdpInfo((needsIlk ? [managerAddress, cdpId, ilk] : [cdpId]), 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(setViemBlockNumber(block)),
         spotterContract.read.ilks(needsIlk ? [ilk] : [cdpInfo.ilk], setViemBlockNumber(block)),
         vatContract.read.ilks(needsIlk ? [ilk] : [cdpInfo.ilk], setViemBlockNumber(block)),
@@ -47,7 +46,7 @@ export const _getMakerAccountBalances = (provider, network, block, addressMappin
         jugContract.read.drip(needsIlk ? [ilk] : [cdpInfo.ilk], setViemBlockNumber(block)),
         dogContract.read.chop(needsIlk ? [ilk] : [cdpInfo.ilk], setViemBlockNumber(block)),
     ]);
-    const ilkInfo = 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 = 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 = wethToEth(ilkToAsset(needsIlk ? ilk : cdpInfo.ilk));
@@ -81,38 +80,22 @@ export const _getUserCdps = (provider, network, userAddress) => __awaiter(void 0
     return parsedStandardCdps;
 });
 export const getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void 0, void 0, function* () { return _getUserCdps(getViemProvider(provider, network), network, userAddress); });
-export const _getMakerIlksData = (provider, network, ilkLabels) => __awaiter(void 0, void 0, void 0, function* () {
+export const _getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, void 0, void 0, function* () {
     const vatContract = McdVatContractViem(provider, network);
     const spotterContract = McdSpotterContractViem(provider, network);
     const dogContract = McdDogContractViem(provider, network);
     const jugContract = 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 = 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 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]));
-});
-export const getMakerIlksData = (provider, network, ilkLabels) => __awaiter(void 0, void 0, void 0, function* () { return _getMakerIlksData(getViemProvider(provider, network, { batch: { multicall: true } }), network, ilkLabels); });
-/**
- * @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
- */
-export const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0, void 0, void 0, function* () {
-    const vatContract = 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 || _getMakerIlksData(provider, network, [cdp.ilkLabel]).then((ilks) => ilks[cdp.ilkLabel]),
-        STAKING_ASSETS.includes(cdp.asset) ? 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 = parseCollateralInfo(cdp.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
     const collateral = assetAmountInEth(ink.toString(), `MCD-${cdp.asset}`);
     const collateralUsd = new Dec(collateral).mul(collInfo.assetPrice).toString();
     const debt = new Dec(art).times(collInfo.currentRate).div(1e27).floor()
@@ -124,17 +107,7 @@ export const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(v
         .toString();
     if (new Dec(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 Dec(ratio).div(collInfo.liqPercent).mul(100).toString() : '0';
     const debtTooLow = new Dec(debt).gt(0) && new Dec(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 } = calculateNetApyFromRates({
-        suppliedUsd: collateralUsd,
-        borrowedUsd: assetAmountInEth(debt, 'DAI'),
-        borrowRate: collInfo.stabilityFee.toString(),
-        incentives: [{ apy: collStakingApy, amountUsd: collateralUsd }],
-    });
     return {
         owner: cdp.owner,
         id: cdp.id.toString(),
@@ -153,7 +126,6 @@ export const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(v
         debtAssetMarketPrice: '1',
         liquidationPrice,
         ratio,
-        safetyRatio,
         liqRatio: collInfo.liqRatio.toString(),
         liqPercent: parseFloat(collInfo.liqPercent.toString()),
         assetPrice: collInfo.assetPrice,
@@ -169,9 +141,6 @@ export const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(v
         liquidationFee: collInfo.liquidationFee,
         lastUpdated: Date.now(),
         exposure: getExposure(assetAmountInEth(debt, 'DAI'), collateralUsd),
-        netApy,
-        totalInterestUsd,
-        incentiveUsd,
     };
 });
 export const getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, void 0, void 0, function* () { return _getMakerCdpData(getViemProvider(provider, network), network, cdp); });

package/esm/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/esm/markets/index.js

@@ -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/esm/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/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, MakerActiveIlks, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, 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, _getMakerIlksData, _getUserCdps } from '../maker';
+import { _getMakerCdpData, _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 { _getAllFluidMarketDataPortfolio, _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
+import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
 import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
@@ -501,9 +501,11 @@ 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* () {
+            // 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 _getMakerCdpData(client, network, cdpInfo);
                         if (cdpData) {
@@ -515,7 +517,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                         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 +555,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, crvUsdMarketsData[market.value].borrowRate);
+                    const accData = yield _getCurveUsdUserData(client, network, address, market, crvUsdMarketsData[market.value].activeBand);
                     if (new Dec(accData.suppliedUsd).gt(0) || new Dec(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) {
@@ -599,275 +601,4 @@ 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]));
-                    if (new Dec(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 _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 });
-                    if (new Dec(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 _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,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/esm/staking/staking.js

@@ -182,23 +182,6 @@ 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

@@ -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/esm/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;