@1delta/margin-fetcher 0.0.13 → 0.0.15-0.1

package/dist/lending/user-data/morpho/userCallParseNoDeploy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"userCallParseNoDeploy.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParseNoDeploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAIpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,YAAY,EAAE,EACvB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CAoDvF,CAAA"}

package/dist/lending/user-data/morpho/userCallParseNoDeploy.js

@@ -1,112 +0,0 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets";
-import { createBaseTypeUserState } from "../utils";
-import { MorphoPositionParams } from "./types";
-import { parseRawAmount } from "../../../utils/parsing";
-import { toAssetsDown } from "./morphoLib";
-export const getMorphoUserDataConverter = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
-    const expectedNumberOfCalls = markets.length * 2;
-    return [
-        (data) => {
-            if (data.length !== expectedNumberOfCalls) {
-                return undefined;
-            }
-            let datas = {};
-            for (let i = 0; i < markets.length; i++) {
-                let totalDebt24h = 0;
-                let totalDeposits24h = 0;
-                const market = markets[i];
-                const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarket(i, data, chainId, market, prices, pricesHist);
-                if (!dataForMarket)
-                    continue;
-                totalDebt24h += addedDebt;
-                totalDeposits24h += addedDeposits;
-                const payload = {
-                    chainId,
-                    account,
-                    lendingPositions: { "0": dataForMarket },
-                    rewards: {},
-                };
-                const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h);
-                datas[market.lender] = {
-                    ...payload,
-                    ...userData,
-                    id: market.id
-                };
-            }
-            return datas;
-        },
-        expectedNumberOfCalls,
-    ];
-};
-function createMorphoEntryFromMarket(i, data, chainId, market, prices, pricesHist) {
-    const userPosition = data[2 * i];
-    const marketData = data[2 * i + 1];
-    const collateralBalance = userPosition[MorphoPositionParams.collateral]?.toString();
-    const currentLendShares = userPosition[MorphoPositionParams.supplyShares]?.toString();
-    const currentBorrowShares = userPosition[MorphoPositionParams.borrowShares]?.toString();
-    const totalSupplyShares = BigInt(marketData[MorphoPositionParams.collateral]?.toString() ?? 0n);
-    const totalSupplyAssets = BigInt(marketData[MorphoPositionParams.supplyShares]?.toString() ?? 0n);
-    const totalBorrowShares = BigInt(marketData[MorphoPositionParams.borrowShares]?.toString() ?? 0n);
-    const totalBorrowAssets = BigInt(marketData[MorphoPositionParams.borrowShares]?.toString() ?? 0n);
-    if (currentLendShares === "0" &&
-        currentBorrowShares === "0" &&
-        collateralBalance === "0") {
-        return {
-            dataForMarket: undefined,
-            addedDeposits: 0,
-            addedDebt: 0
-        };
-    }
-    const loanMeta = getAssetMeta(chainId, market.loanAddress);
-    const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(market.loanAddress, chainId);
-    // prices
-    const priceLoan = prices[loanKey] ?? 1;
-    const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan;
-    const deposits = toAssetsDown(currentLendShares, totalSupplyAssets, totalSupplyShares);
-    const borrow = toAssetsDown(currentBorrowShares, totalBorrowAssets, totalBorrowShares);
-    const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
-    const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
-    const dataForLoanAsset = {
-        poolId: market.loanAddress,
-        underlying: market.loanAddress,
-        deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
-        depositsRaw: deposits.toString(),
-        debtStable: "0",
-        debt: borrowDec,
-        depositsUSD: Number(depositDec) * priceLoan,
-        debtStableUSD: 0,
-        debtUSD: Number(borrowDec) * priceLoan,
-        stableBorrowRate: "0",
-        collateralActive: true,
-        claimableRewards: 0,
-    };
-    const assetMeta = getAssetMeta(chainId, market.collateralAddress);
-    const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18;
-    const collateralDec = parseRawAmount(collateralBalance, decimals);
-    const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(market.collateralAddress, chainId);
-    // prices
-    const price = prices[key] ?? 1;
-    const priceHist = pricesHist?.[key] ?? price;
-    const dataForCollateralAsset = {
-        poolId: market.collateralAddress,
-        underlying: market.collateralAddress,
-        deposits: collateralDec,
-        depositsRaw: collateralBalance,
-        debtStable: "0",
-        debt: "0",
-        depositsUSD: Number(collateralDec) * price,
-        debtStableUSD: 0,
-        debtUSD: 0,
-        stableBorrowRate: "0",
-        collateralActive: true,
-        claimableRewards: 0,
-    };
-    return {
-        dataForMarket: {
-            [market.loanAddress]: dataForLoanAsset,
-            [market.collateralAddress]: dataForCollateralAsset
-        },
-        addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
-        addedDebt: Number(borrowDec) * priceHistLoan
-    };
-}

package/dist/lending/user-data/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"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"}

package/dist/lending/user-data/types.js

@@ -1,38 +0,0 @@
-import { Lender } from '@1delta/asset-registry';
-/** Filter all morphos into one for querying */
-export function organizeUserQueries(queries) {
-    const morphos = queries.filter((q) => q.lender.startsWith('MORPHO_BLUE'));
-    const nonMorphos = queries.filter((q) => !q.lender.startsWith('MORPHO_BLUE'));
-    const morphosCollapsed = {
-        lender: Lender.MORPHO_BLUE,
-        account: queries[0].account,
-        params: morphos.map((p) => p.lender),
-    };
-    return [...nonMorphos, morphosCollapsed];
-}
-// Aave V2 specific enums
-export var AaveV2TypeGetUserReserveData;
-(function (AaveV2TypeGetUserReserveData) {
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["currentATokenBalance"] = 0] = "currentATokenBalance";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["currentStableDebt"] = 1] = "currentStableDebt";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["currentVariableDebt"] = 2] = "currentVariableDebt";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["principalStableDebt"] = 3] = "principalStableDebt";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["scaledVariableDebt"] = 4] = "scaledVariableDebt";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["stableBorrowRate"] = 5] = "stableBorrowRate";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["liquidityRate"] = 6] = "liquidityRate";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["stableRateLastUpdated"] = 7] = "stableRateLastUpdated";
-    AaveV2TypeGetUserReserveData[AaveV2TypeGetUserReserveData["usageAsCollateralEnabled"] = 8] = "usageAsCollateralEnabled";
-})(AaveV2TypeGetUserReserveData || (AaveV2TypeGetUserReserveData = {}));
-// Aave V3 specific enums
-export var AaveV3TypeGetUserReserveData;
-(function (AaveV3TypeGetUserReserveData) {
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["currentATokenBalance"] = 0] = "currentATokenBalance";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["currentStableDebt"] = 1] = "currentStableDebt";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["currentVariableDebt"] = 2] = "currentVariableDebt";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["principalStableDebt"] = 3] = "principalStableDebt";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["scaledVariableDebt"] = 4] = "scaledVariableDebt";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["stableBorrowRate"] = 5] = "stableBorrowRate";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["liquidityRate"] = 6] = "liquidityRate";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["stableRateLastUpdated"] = 7] = "stableRateLastUpdated";
-    AaveV3TypeGetUserReserveData[AaveV3TypeGetUserReserveData["usageAsCollateralEnabled"] = 8] = "usageAsCollateralEnabled";
-})(AaveV3TypeGetUserReserveData || (AaveV3TypeGetUserReserveData = {}));

package/dist/lending/user-data/utils/createGeneralUserState.js

@@ -1,105 +0,0 @@
-import { divideAccrualsToAprs } from '.';
-import { safeDivide } from './formatting';
-export function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
-    let assetKeys = Object.keys(payload.lendingPositions['0'] ?? {});
-    const { chainId, account } = payload;
-    const mode = Number(payload.userEMode ?? 0);
-    // organic yields
-    let depositInterest = 0;
-    let borrowInterest = 0;
-    // rewards
-    let rewardDepositAccrual = 0;
-    let rewardBorrowAccrual = 0;
-    // staking
-    let stakingDepositAccrual = 0;
-    let stakingBorrowAccrual = 0;
-    // amountrs
-    let deposits = 0;
-    let debt = 0;
-    let collateral = 0;
-    let borrowDiscountedCollateral = 0;
-    let rewardsPerAsset = {};
-    // main user data
-    for (let i = 0; i < assetKeys.length; i++) {
-        const asset = assetKeys[i];
-        if (!lenderData?.[asset])
-            continue;
-        const { depositsUSD, debtStableUSD, debtUSD, collateralActive } = payload.lendingPositions['0'][asset];
-        const { depositRate, stakingYield, variableBorrowRate, stableBorrowRate, rewards, } = lenderData[asset];
-        // amounts
-        deposits += depositsUSD;
-        debt += debtStableUSD;
-        debt += debtUSD;
-        // rewards
-        Object.entries(rewards ?? {}).forEach(([key, rewardData]) => {
-            rewardDepositAccrual += rewardData.depositRate * depositsUSD;
-            rewardBorrowAccrual +=
-                rewardData.variableBorrowRate * debtUSD +
-                    (rewardData.stableBorrowRate ?? 0) * debtStableUSD;
-            // totals
-            const rewDepo = rewardData.depositRate * depositsUSD;
-            const rewDebt = rewardData.variableBorrowRate * debtUSD +
-                (rewardData.stableBorrowRate ?? 0) * (debtStableUSD ?? 0);
-            if (!rewardsPerAsset[key])
-                rewardsPerAsset[key] = { depositApr: 0, borrowApr: 0 };
-            if (rewDepo > 0)
-                rewardsPerAsset[key].depositApr += rewDepo;
-            if (rewDebt > 0)
-                rewardsPerAsset[key].borrowApr += rewDebt;
-        });
-        // staking
-        stakingDepositAccrual += (stakingYield ?? 0) * depositsUSD;
-        stakingBorrowAccrual += (stakingYield ?? 0) * (debtStableUSD + debtUSD);
-        if (collateralActive) {
-            // risk adjusted
-            collateral +=
-                (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
-            borrowDiscountedCollateral +=
-                (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) *
-                    depositsUSD;
-        }
-        // IRs
-        depositInterest += depositRate * depositsUSD;
-        borrowInterest +=
-            debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
-    }
-    const nav = deposits - debt;
-    // aggregated balance data
-    const balanceData = {
-        '0': {
-            borrowDiscountedCollateral,
-            collateral,
-            deposits,
-            debt,
-            adjustedDebt: debt,
-            nav,
-            deposits24h: totalDeposits24h,
-            debt24h: totalDebt24h,
-            nav24h: totalDeposits24h - totalDebt24h,
-            ...(payload.rewards ? { rewards: payload.rewards } : {}),
-        },
-    };
-    // aggregated apr data
-    const aprData = {
-        '0': {
-            apr: safeDivide(depositInterest - borrowInterest, nav),
-            borrowApr: safeDivide(borrowInterest, debt),
-            depositApr: safeDivide(depositInterest, deposits),
-            rewards: divideAccrualsToAprs(rewardsPerAsset, nav, deposits, debt),
-            rewardApr: safeDivide(rewardDepositAccrual + rewardBorrowAccrual, nav),
-            rewardDepositApr: safeDivide(rewardDepositAccrual, deposits),
-            rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
-            stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
-            stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
-            stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt),
-        },
-    };
-    const userConfigs = { '0': { selectedMode: mode, id: account } };
-    return {
-        account,
-        chainId,
-        balanceData,
-        aprData,
-        userConfigs,
-    };
-}

package/dist/lending/user-data/utils/createMultiAccountStyleUserState.js

@@ -1,96 +0,0 @@
-import { LENDER_MODE_NO_MODE } from "../../../assets";
-import { safeDivide } from "./formatting";
-export function createMultiAccountTypeUserState(payload, lenderData, histData) {
-    const positionKeys = Object.keys(payload.lendingPositions ?? {});
-    let assetKeys = payload.assets;
-    const { chainId, account } = payload;
-    let userConfigs = {};
-    let balanceData = {};
-    let aprData = {};
-    // main user data
-    for (let j = 0; j < positionKeys.length; j++) {
-        const posId = positionKeys[j];
-        const position = payload.lendingPositions[posId];
-        const { mode: posMode } = position;
-        // position mode can be undefined
-        // in this case we default to no mode
-        const mode = posMode ?? LENDER_MODE_NO_MODE;
-        userConfigs[posId] = {
-            id: posId,
-            selectedMode: mode,
-        };
-        // organic yields
-        let depositInterest = 0;
-        let borrowInterest = 0;
-        // rewards
-        let rewardDepositAccrual = 0;
-        let rewardBorrowAccrual = 0;
-        // staking
-        let stakingDepositAccrual = 0;
-        let stakingBorrowAccrual = 0;
-        // amountrs
-        let deposits = 0;
-        let debt = 0;
-        let collateral = 0;
-        let borrowDiscountedCollateral = 0;
-        let adjustedDebt = 0;
-        for (let i = 0; i < assetKeys.length; i++) {
-            const asset = assetKeys[i];
-            const { depositsUSD, debtUSD } = payload.lendingPositions[posId][asset];
-            if (!lenderData?.[asset])
-                continue;
-            const { depositRate, stakingYield, variableBorrowRate, rewards } = lenderData[asset];
-            // amounts
-            deposits += depositsUSD;
-            debt += debtUSD;
-            // rewards
-            Object.entries(rewards ?? {}).map(([key, rewardData]) => {
-                rewardDepositAccrual += rewardData.depositRate * depositsUSD;
-                rewardBorrowAccrual += rewardData.variableBorrowRate * debtUSD + rewardData.stableBorrowRate * debtUSD;
-            });
-            // staking
-            stakingDepositAccrual += (stakingYield ?? 0) * depositsUSD;
-            stakingBorrowAccrual += (stakingYield ?? 0) * debtUSD;
-            const config = lenderData[asset].config[mode];
-            // risk adjusted
-            collateral += (config?.collateralFactor ?? 1) * depositsUSD;
-            borrowDiscountedCollateral += (config?.borrowCollateralFactor ?? 1) * depositsUSD;
-            adjustedDebt += (config?.borrowFactor ?? 1) * debtUSD;
-            // IRs
-            depositInterest += depositRate * depositsUSD;
-            borrowInterest += debtUSD * variableBorrowRate;
-        }
-        const nav = deposits - debt;
-        // aggregated balance data
-        balanceData[posId] = {
-            borrowDiscountedCollateral,
-            collateral,
-            deposits,
-            debt,
-            adjustedDebt,
-            nav,
-            deposits24h: histData[posId]?.totalDeposits24h,
-            debt24h: histData[posId]?.totalDebt24h,
-            nav24h: histData[posId]?.totalDeposits24h - histData[posId]?.totalDebt24h,
-        };
-        // aggregated apr data
-        aprData[posId] = {
-            apr: safeDivide(depositInterest - borrowInterest, nav),
-            borrowApr: safeDivide(borrowInterest, debt),
-            depositApr: safeDivide(depositInterest, deposits),
-            rewardApr: safeDivide(rewardDepositAccrual + rewardBorrowAccrual, nav),
-            rewardDepositApr: safeDivide(rewardDepositAccrual, deposits),
-            rewardBorrowApr: safeDivide(rewardBorrowAccrual, debt),
-            stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
-            stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
-            stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt),
-        };
-    }
-    return {
-        account,
-        chainId,
-        balanceData,
-        aprData,
-        userConfigs
-    };
-}

package/dist/lending/user-data/utils/formatting/generalFormatters.js

@@ -1,109 +0,0 @@
-import _ from 'lodash';
-export const safeDivide = (a, b) => {
-    return a === 0 || isNaN(a) ? 0 : b !== 0 ? a / b : Infinity;
-};
-export function capitalizeFirstLetter(data) {
-    if (!data)
-        return '';
-    return data.charAt(0).toUpperCase() + data.slice(1);
-}
-/**
- * Formats e.g. 0.04 to 4%
- * @param n ratio
- * @param decs decimals to show
- * @returns percent as string
- */
-export const formatRatioToPercent = (n, decs) => {
-    return `${n >= 0 ? '+' : ''}${roundNumber(n * 100, decs)}%`;
-};
-/**
- * Formats e.g. 0.04 to 4%, adds a + if positive
- * @param n ratio
- * @param decs decimals to show
- * @returns percent as string
- */
-export const formatSignedRatioToPercent = (n, decs) => {
-    if (n > 1e7)
-        return '>100K%'; // we ceil percentages at 100k and abbreviate
-    return `${n > 0 ? '+' : ''}${roundNumber(n * 100, decs)}%`; // we assume no lower values that -100%
-};
-export const formatSignedRatioToPercentSign = (n, decs, skipSign = false) => {
-    if (n > 1e7)
-        return '>100K%'; // we ceil percentages at 100k and abbreviate
-    // Skip the sign when icons are used
-    return `${skipSign ? '' : n > 0 ? '+' : ''}${roundNumber(Math.abs(n * 100), decs)}%`;
-};
-/**
- * Formats e.g. 4 to 4%
- * @param n percent number
- * @param decs decimals to show
- * @returns percent as string
- */
-export const formatNumberToPercent = (n, decs = 2) => {
-    if (!n)
-        return '0%';
-    if (isNaN(n))
-        return '';
-    return `${roundNumber(Number(n ?? 0), decs)}%`;
-};
-export const formatPercentagePoints = (n, decs) => {
-    return `${roundNumber(n * 100, decs)}pp`;
-};
-export const formatNumber = (n, decs) => {
-    if (!n)
-        return '0';
-    if (isNaN(n))
-        return '';
-    return roundNumber(n, decs).toLocaleString();
-};
-/**
- * Round using lodash
- * @param n number to round
- * @param decs decimals
- * @returns number
- */
-export const roundNumber = (n, decs) => {
-    return _.round(n, decs);
-};
-/**
- * Converts a colateral factor e.g. 0.8 to 1/(1-0.8) = 5
- * @param n amount
- * @param decs decimals to show
- * @returns leverage as string
- */
-export const convertCollateralFactorToLeverage = (n, decs) => {
-    return roundNumber(1 / (1 - n), decs);
-};
-export const parseToTimes = (n) => `${n}×`;
-export const parseToTimesPrefix = (n) => `×${n}`;
-export const parseLeverage = (cf, decs = 2) => parseToTimes(convertCollateralFactorToLeverage(cf, decs));
-export const parseLeverageRange = (config) => {
-    const levs = _.uniq(Object.values(config ?? {}).map((cfg) => convertCollateralFactorToLeverage(cfg.borrowCollateralFactor, 2)));
-    if (!levs)
-        return '';
-    if (levs.length === 1)
-        return parseToTimes(levs[0]);
-    return `${_.min(levs)}-${parseToTimes(Number(_.max(levs)))}`;
-};
-/**
- * Get apr from intinsic interest and reward
- * @param apr apr number
- * @param reward reward [per year] number
- * @returns number, validated for NaN
- */
-export const getApr = (apr, reward, staking) => {
-    const aprClean = !isNaN(apr) ? apr : 0;
-    const rewardClean = !isNaN(reward) ? reward : 0;
-    const stakingClean = !isNaN(staking) ? staking : 0;
-    if (aprClean + rewardClean + stakingClean < 0.01 && aprClean + rewardClean + stakingClean > -0.01)
-        return '-';
-    return `${(aprClean + rewardClean + stakingClean).toFixed(2)}%`;
-};
-// Converters from apy to apr and reversed
-const SECONDS_PER_YEAR = 31536000;
-export const aprToApy = (apr) => {
-    return (1 + apr / SECONDS_PER_YEAR) ** SECONDS_PER_YEAR - 1;
-};
-export const apyToApr = (apy) => {
-    return ((apy + 1) ** (1 / SECONDS_PER_YEAR) - 1) * SECONDS_PER_YEAR;
-};

package/dist/lending/user-data/utils/formatting/index.js

@@ -1 +0,0 @@
-export * from "./generalFormatters";

package/dist/lending/user-data/utils/index.js

@@ -1,17 +0,0 @@
-import { safeDivide } from "./formatting";
-export * from "./createGeneralUserState";
-export * from "./formatting";
-export * from "./createMultiAccountStyleUserState";
-export function divideAccrualsToAprs(aprs, nav, deposits, debt) {
-    if (nav === 0)
-        return {};
-    let d = {};
-    Object.entries(aprs).map(([k, data]) => {
-        d[k] = {
-            apr: safeDivide(data.borrowApr + data.depositApr, nav),
-            borrowApr: safeDivide(data.borrowApr, debt),
-            depositApr: safeDivide(data.depositApr, deposits),
-        };
-    });
-    return d;
-}