@1delta/margin-fetcher 0.0.1

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

@@ -0,0 +1,218 @@
+import { Lender } from "@1delta/asset-registry";
+import { BaseYields, RewardsMap } from "../aave-v3-type/types";
+export type SerializedBigNumber = string;
+export type SerializedNumber = string;
+export interface LenderUserQuery {
+    lender: Lender;
+    account: string;
+}
+export interface AllowanceData {
+    allowanceWithdrawal: string;
+    allowanceBorrowingVariable: string;
+    allowanceBorrowingStable: string;
+}
+export interface UserLendingPosition extends AllowanceData {
+    deposits: number;
+    debt: number;
+    debtStable: number;
+    depositsUSD: number;
+    debtUSD: number;
+    debtStableUSD: number;
+    collateralActive: boolean;
+    claimableRewards: number;
+}
+export type UserRewardEntry = {
+    [asset: string]: {
+        totalRewards: number;
+        claimableRewards: number;
+    };
+};
+export interface LenderUserResponse {
+    chainId: string;
+    account: string;
+    lendingPositions: {
+        [lender: string]: {
+            [tokenSymbol: string]: UserLendingPosition;
+        };
+    };
+    rewards: UserRewardEntry;
+}
+export declare enum AaveV2TypeGetUserReserveData {
+    currentATokenBalance = 0,
+    currentStableDebt = 1,
+    currentVariableDebt = 2,
+    principalStableDebt = 3,
+    scaledVariableDebt = 4,
+    stableBorrowRate = 5,
+    liquidityRate = 6,
+    stableRateLastUpdated = 7,
+    usageAsCollateralEnabled = 8
+}
+export declare enum AaveV3TypeGetUserReserveData {
+    currentATokenBalance = 0,
+    currentStableDebt = 1,
+    currentVariableDebt = 2,
+    principalStableDebt = 3,
+    scaledVariableDebt = 4,
+    stableBorrowRate = 5,
+    liquidityRate = 6,
+    stableRateLastUpdated = 7,
+    usageAsCollateralEnabled = 8
+}
+export interface AaveV2UserReserveResponse {
+    chainId: string;
+    account: string;
+    lendingPositions: {
+        [id: string]: {
+            [tokenSymbol: string]: AavelendingPositions;
+        };
+    };
+    rewards: UserRewardEntry;
+}
+interface AavelendingPositions extends AllowanceData {
+    deposits: number;
+    debt: number;
+    debtStable: number;
+    depositsUSD: number;
+    debtUSD: number;
+    debtStableUSD: number;
+    collateralActive: boolean;
+    claimableRewards: number;
+}
+export interface AaveV3UserReserveResponse {
+    chainId: string;
+    lendingPositions: {
+        [id: string]: {
+            [tokenSymbol: string]: AavelendingPositions;
+        };
+    };
+    userEMode: number;
+    rewards?: any;
+    account: string;
+}
+export interface CompoundV3UserReserveResponse {
+    lendingPositions: {
+        [id: string]: {
+            [tokenSymbol: string]: {
+                deposits: number;
+                debt: number;
+                debtStable: number;
+                depositsUSD: number;
+                debtUSD: number;
+                debtStableUSD: number;
+                collateralActive: boolean;
+                depositsRaw: SerializedBigNumber;
+                isAllowed: boolean;
+            };
+        };
+    };
+    chainId: string;
+    baseAsset: string;
+    rewards: UserRewardEntry;
+    account: string;
+}
+export interface AaveV3Public extends LenderPublicBase {
+    lastUpdateTimestamp?: number;
+    usageAsCollateralEnabled?: boolean;
+    hasStable?: boolean;
+    isActive?: boolean;
+    isFrozen?: boolean;
+    eMode?: EModeData;
+    debtCeiling: number;
+    supplyCap: number;
+    borrowCap: number;
+    config: {
+        [modeId: number]: LenderConfigData;
+    };
+}
+/**
+ * Interface shared by all lenders
+ */
+export interface LenderPublicBase extends LenderYields, LenderTotalAmounts {
+    borrowingEnabled: boolean;
+    config: LenderConfigMap;
+}
+export interface LenderYields extends BaseYields {
+    stakingYield: number;
+    rewards?: RewardsMap;
+}
+export interface LenderTotalAmounts {
+    totalDebt: number;
+    totalDebtStable: number;
+    totalDeposits: number;
+    totalLiquidity: number;
+    /** USD values */
+    totalDebtUSD: number;
+    totalDebtStableUSD: number;
+    totalDepositsUSD: number;
+    totalLiquidityUSD: number;
+}
+export interface LenderConfigMap {
+    [modeId: number]: LenderConfigData;
+}
+/**
+ * The Mode-specific configuration for a lender asset
+ */
+export interface LenderConfigData {
+    category: number;
+    borrowCollateralFactor: number;
+    collateralFactor: number;
+    borrowFactor: number;
+}
+export interface ModeBase {
+    category: number;
+    label: string;
+}
+export interface EModeData extends ModeBase {
+    borrowCollateralFactor: number;
+    collateralFactor: number;
+    priceSource: string;
+}
+export interface AaveV2Public extends LenderPublicBase {
+    lastUpdateTimestamp?: number;
+    decimals?: number;
+    reserveFactor?: SerializedBigNumber;
+    usageAsCollateralEnabled?: boolean;
+    hasStable?: boolean;
+    isActive?: boolean;
+    isFrozen?: boolean;
+}
+export interface CompoundV3Public extends LenderPublicBase {
+    supplyCap: number;
+    utilization: number;
+}
+export interface UserApr {
+    apr: number;
+    borrowApr: number;
+    depositApr: number;
+}
+export interface InitUserReserveResponse {
+    chainId: string;
+    lendingPositions: {
+        [posId: string]: {
+            mode: number;
+            positions: {
+                [tokenSymbol: string]: {
+                    deposits: number;
+                    debt: number;
+                    depositsUSD: number;
+                    debtUSD: number;
+                    debtStable: 0;
+                    debtStableUSD: 0;
+                    collateralActive: boolean;
+                    isAllowed: boolean;
+                };
+            };
+        };
+    };
+    assets: string[];
+    account: string;
+}
+export interface InitPublic extends LenderPublicBase {
+    usageAsCollateralEnabled?: boolean;
+    debtCeiling: number;
+    supplyCap: number;
+    borrowCap: number;
+}
+export {};
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,26 @@
+// 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.d.ts

@@ -0,0 +1,45 @@
+import { AaveV2Public, AaveV2UserReserveResponse, AaveV3Public, AaveV3UserReserveResponse, CompoundV3Public, CompoundV3UserReserveResponse } from "../types";
+type LenderUserData = AaveV3UserReserveResponse | AaveV2UserReserveResponse | CompoundV3UserReserveResponse;
+type LenderState = AaveV3Public | AaveV2Public | CompoundV3Public;
+export declare function createBaseTypeUserState(payload: LenderUserData, lenderData: {
+    [a: string]: LenderState;
+}, totalDeposits24h?: number, totalDebt24h?: number): {
+    account: string;
+    chainId: string;
+    balanceData: {
+        "0": {
+            rewards?: any;
+            borrowDiscountedCollateral: number;
+            collateral: number;
+            deposits: number;
+            debt: number;
+            adjustedDebt: number;
+            nav: number;
+            deposits24h: number;
+            debt24h: number;
+            nav24h: number;
+        };
+    };
+    aprData: {
+        "0": {
+            apr: number;
+            borrowApr: number;
+            depositApr: number;
+            rewards: any;
+            rewardApr: number;
+            rewardDepositApr: number;
+            rewardBorrowApr: number;
+            stakingApr: number;
+            stakingDepositApr: number;
+            stakingBorrowApr: number;
+        };
+    };
+    userConfigs: {
+        "0": {
+            selectedMode: number;
+            id: string;
+        };
+    };
+};
+export {};
+//# sourceMappingURL=createGeneralUserState.d.ts.map

package/dist/lending/user-data/utils/createGeneralUserState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createGeneralUserState.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/utils/createGeneralUserState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,YAAY,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AAG5J,KAAK,cAAc,GAAG,yBAAyB,GAAG,yBAAyB,GAAG,6BAA6B,CAAA;AAC3G,KAAK,WAAW,GAAG,YAAY,GAAG,YAAY,GAAG,gBAAgB,CAAA;AAEjE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,EACxC,gBAAgB,GAAE,MAAU,EAC5B,YAAY,GAAE,MAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0GzB"}

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

@@ -0,0 +1,98 @@
+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.d.ts

@@ -0,0 +1,16 @@
+import { InitPublic, InitUserReserveResponse } from "../types";
+export declare function createMultiAccountTypeUserState(payload: InitUserReserveResponse, lenderData: {
+    [a: string]: InitPublic;
+}, histData: {
+    [a: string]: {
+        totalDebt24h: number;
+        totalDeposits24h: number;
+    };
+}): {
+    account: string;
+    chainId: string;
+    balanceData: any;
+    aprData: any;
+    userConfigs: any;
+};
+//# sourceMappingURL=createMultiAccountStyleUserState.d.ts.map

package/dist/lending/user-data/utils/createMultiAccountStyleUserState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createMultiAccountStyleUserState.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/utils/createMultiAccountStyleUserState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAG9D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,uBAAuB,EAChC,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,EACvC,QAAQ,EAAE;IACR,CAAC,CAAC,EAAE,MAAM,GAAG;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,gBAAgB,EAAE,MAAM,CAAA;KACzB,CAAA;CACF;;;;;;EAoGF"}

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

@@ -0,0 +1,96 @@
+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].positions[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.d.ts

@@ -0,0 +1,55 @@
+import { LenderConfigMap } from '../../types';
+export declare const safeDivide: (a: number, b: number) => number;
+export declare function capitalizeFirstLetter(data: string): string;
+/**
+ * Formats e.g. 0.04 to 4%
+ * @param n ratio
+ * @param decs decimals to show
+ * @returns percent as string
+ */
+export declare const formatRatioToPercent: (n: number, decs: number) => string;
+/**
+ * Formats e.g. 0.04 to 4%, adds a + if positive
+ * @param n ratio
+ * @param decs decimals to show
+ * @returns percent as string
+ */
+export declare const formatSignedRatioToPercent: (n: number, decs: number) => string;
+export declare const formatSignedRatioToPercentSign: (n: number, decs: number, skipSign?: boolean) => string;
+/**
+ * Formats e.g. 4 to 4%
+ * @param n percent number
+ * @param decs decimals to show
+ * @returns percent as string
+ */
+export declare const formatNumberToPercent: (n: number | undefined, decs?: number) => string;
+export declare const formatPercentagePoints: (n: number, decs: number) => string;
+export declare const formatNumber: (n: number, decs: number) => string;
+/**
+ * Round using lodash
+ * @param n number to round
+ * @param decs decimals
+ * @returns number
+ */
+export declare const roundNumber: (n: number, decs: number) => number;
+/**
+ * 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 declare const convertCollateralFactorToLeverage: (n: number, decs: number) => number;
+export declare const parseToTimes: (n: number) => string;
+export declare const parseToTimesPrefix: (n: number) => string;
+export declare const parseLeverage: (cf: number, decs?: number) => string;
+export declare const parseLeverageRange: (config: LenderConfigMap) => string;
+/**
+ * Get apr from intinsic interest and reward
+ * @param apr apr number
+ * @param reward reward [per year] number
+ * @returns number, validated for NaN
+ */
+export declare const getApr: (apr: number, reward: number, staking: number) => string;
+export declare const aprToApy: (apr: number) => number;
+export declare const apyToApr: (apy: number) => number;
+//# sourceMappingURL=generalFormatters.d.ts.map

package/dist/lending/user-data/utils/formatting/generalFormatters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generalFormatters.d.ts","sourceRoot":"","sources":["../../../../../src/lending/user-data/utils/formatting/generalFormatters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,eAAO,MAAM,UAAU,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,WAE9C,CAAA;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,UAGjD;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,WAE3D,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,WAGjE,CAAA;AAED,eAAO,MAAM,8BAA8B,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,EAAE,kBAAgB,WAIvF,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,GAAG,MAAM,GAAG,SAAS,EAAE,aAAQ,WAIpE,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,WAE7D,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,WAInD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,WAElD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,KAAG,MAE3E,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,GAAG,MAAM,WAAY,CAAA;AAElD,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,WAAY,CAAA;AAExD,eAAO,MAAM,aAAa,GAAI,IAAI,MAAM,EAAE,aAAQ,WAA8D,CAAA;AAEhH,eAAO,MAAM,kBAAkB,GAAI,QAAQ,eAAe,WAOzD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,MAAM,GAAI,KAAK,MAAM,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,WAMlE,CAAA;AAMD,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,WAEnC,CAAA"}