@defisaver/positions-sdk 2.1.160-pos-history-2-dev → 2.1.160-shifter-v2-dev

package/cjs/aaveV2/index.js

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

package/cjs/aaveV3/index.d.ts

@@ -32,45 +32,6 @@ export declare const EMPTY_AAVE_DATA: {
 };
 export declare const _getAaveV3AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getAaveV3AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export interface AaveV3ReserveTokenAddresses {
-    [symbol: string]: {
-        symbol: string;
-        underlyingAddress: EthAddress;
-        aTokenAddress: EthAddress;
-        stableDebtTokenAddress: EthAddress;
-        variableDebtTokenAddress: EthAddress;
-    };
-}
-export interface AaveV3HistoricalBalance {
-    block: number;
-    suppliedUsd: string;
-    borrowedUsd: string;
-    netUsd: string;
-}
-/**
- * Fetches the aToken / stable-debt / variable-debt token addresses for every asset in the market.
- * These are effectively immutable per reserve, so fetch once and reuse across all history points.
- */
-export declare const _getAaveV3ReserveTokenAddresses: (provider: Client, network: NetworkNumber, market: AaveMarketInfo) => Promise<AaveV3ReserveTokenAddresses>;
-export declare const getAaveV3ReserveTokenAddresses: (provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo) => Promise<AaveV3ReserveTokenAddresses>;
-/**
- * Resolves the price oracle the market's addresses provider points at (at `block`, or latest).
- * Aave can rotate the oracle over time, so a caller hoisting one address across many historical
- * points must resolve it at both ends of its block range and only reuse it when the two agree —
- * otherwise leave `oracleAddress` unset on _getAaveV3HistoricalBalance and it resolves per block.
- */
-export declare const _getAaveV3OracleAddress: (provider: Client, network: NetworkNumber, market: AaveMarketInfo, block?: Blockish) => Promise<EthAddress>;
-export declare const getAaveV3OracleAddress: (provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, block?: Blockish) => Promise<EthAddress>;
-/**
- * Computes a user's Aave v3 net USD balance (supplied collateral - borrowed debt) at a historical block,
- * without touching the AaveV3View contract. Pass `reserveTokens` (from getAaveV3ReserveTokenAddresses)
- * to avoid refetching token addresses for every point, and `oracleAddress` (from getAaveV3OracleAddress,
- * verified identical at both ends of the sampled range) to collapse the point into a single multicall —
- * with it the balances and all prices ride one request; without it the oracle is resolved at the block
- * inside the balance multicall and the active assets are priced in a second one.
- */
-export declare const _getAaveV3HistoricalBalance: (provider: Client, network: NetworkNumber, market: AaveMarketInfo, address: EthAddress, block: number, reserveTokens?: AaveV3ReserveTokenAddresses, oracleAddress?: EthAddress) => Promise<AaveV3HistoricalBalance>;
-export declare const getAaveV3HistoricalBalance: (provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, address: EthAddress, block: number, reserveTokens?: AaveV3ReserveTokenAddresses, oracleAddress?: EthAddress) => Promise<AaveV3HistoricalBalance>;
 export declare const _getAaveV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
 export declare const getAaveV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV3PositionData>;

package/cjs/aaveV3/index.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.getSghoData = exports.getMerkleCampaigns = exports.getMeritCampaigns = exports.getStakeAaveData = exports.fetchYearlyMeritApyForStakingGho = exports.REWARDABLE_ASSETS = exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports._getAaveV3AccountData = exports.getAaveV3HistoricalBalance = exports._getAaveV3HistoricalBalance = exports.getAaveV3OracleAddress = exports._getAaveV3OracleAddress = exports.getAaveV3ReserveTokenAddresses = exports._getAaveV3ReserveTokenAddresses = exports.getAaveV3AccountBalances = exports._getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.aaveV3EmodeCategoriesMapping = void 0;
+exports.getSghoData = exports.getMerkleCampaigns = exports.getMeritCampaigns = exports.getStakeAaveData = exports.fetchYearlyMeritApyForStakingGho = exports.REWARDABLE_ASSETS = exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports._getAaveV3AccountData = exports.getAaveV3AccountBalances = exports._getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.aaveV3EmodeCategoriesMapping = void 0;
 exports._getAaveV3MarketData = _getAaveV3MarketData;
 exports.getAaveV3MarketData = getAaveV3MarketData;
 const tokens_1 = require("@defisaver/tokens");
@@ -375,235 +375,6 @@ const _getAaveV3AccountBalances = (provider, network, block, addressMapping, add
 exports._getAaveV3AccountBalances = _getAaveV3AccountBalances;
 const getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV3AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address); });
 exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
-/**
- * Historical net-balance helpers that bypass the AaveV3View contract.
- *
- * The View contract (and therefore `getAaveV3AccountData` / `getAaveV3AccountBalances`) can only be
- * queried from its deployment block onwards, so it cannot read balances for positions older than that.
- * The aTokens/debt tokens, the ProtocolDataProvider and the Aave price oracle all exist from Aave v3
- * launch, so reading `balanceOf` on those tokens + the oracle price directly reaches much further back
- * and costs ~1 multicall per point. Used to build a position balance-history chart.
- */
-// matches morphoVaults' batchSize; stays under the 500k portfolio discovery allows on simulation fork RPCs
-const HISTORICAL_MULTICALL_BATCH_SIZE = 250000;
-// Minimal Aave price oracle ABI (getAssetPrice returns the asset price in the market base currency).
-const AAVE_ORACLE_ABI = [
-    {
-        inputs: [{ internalType: 'address', name: 'asset', type: 'address' }],
-        name: 'getAssetPrice',
-        outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }],
-        stateMutability: 'view',
-        type: 'function',
-    },
-];
-/**
- * Fetches the aToken / stable-debt / variable-debt token addresses for every asset in the market.
- * These are effectively immutable per reserve, so fetch once and reuse across all history points.
- */
-const _getAaveV3ReserveTokenAddresses = (provider, network, market) => __awaiter(void 0, void 0, void 0, function* () {
-    const symbols = market.assets;
-    const underlyingAddresses = symbols.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
-    // @ts-ignore market.protocolData is a valid config key at runtime
-    const dataProviderAbi = (0, contracts_1.getConfigContractAbi)(market.protocolData, network);
-    const contracts = underlyingAddresses.map((underlying) => ({
-        address: market.protocolDataAddress,
-        abi: dataProviderAbi,
-        functionName: 'getReserveTokensAddresses',
-        args: [underlying],
-    }));
-    // @ts-ignore
-    const results = yield provider.multicall({ contracts, allowFailure: true, batchSize: HISTORICAL_MULTICALL_BATCH_SIZE });
-    const mapping = {};
-    results.forEach((res, i) => {
-        if (res.status !== 'success' || !res.result)
-            return;
-        // outputs order: [aTokenAddress, stableDebtTokenAddress, variableDebtTokenAddress]
-        const [aTokenAddress, stableDebtTokenAddress, variableDebtTokenAddress] = res.result;
-        mapping[symbols[i]] = {
-            symbol: symbols[i],
-            underlyingAddress: underlyingAddresses[i],
-            aTokenAddress,
-            stableDebtTokenAddress,
-            variableDebtTokenAddress,
-        };
-    });
-    return mapping;
-});
-exports._getAaveV3ReserveTokenAddresses = _getAaveV3ReserveTokenAddresses;
-const getAaveV3ReserveTokenAddresses = (provider, network, market) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV3ReserveTokenAddresses)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, market); });
-exports.getAaveV3ReserveTokenAddresses = getAaveV3ReserveTokenAddresses;
-/**
- * Resolves the price oracle the market's addresses provider points at (at `block`, or latest).
- * Aave can rotate the oracle over time, so a caller hoisting one address across many historical
- * points must resolve it at both ends of its block range and only reuse it when the two agree —
- * otherwise leave `oracleAddress` unset on _getAaveV3HistoricalBalance and it resolves per block.
- */
-const _getAaveV3OracleAddress = (provider_1, network_1, market_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, market_1, ...args_1], void 0, function* (provider, network, market, block = 'latest') {
-    // @ts-ignore market.provider is a valid config key at runtime
-    const providerAbi = (0, contracts_1.getConfigContractAbi)(market.provider, network);
-    // @ts-ignore readContract exists on the public client returned by getViemProvider
-    const oracleAddress = yield provider.readContract(Object.assign({ address: market.providerAddress, abi: providerAbi, functionName: 'getPriceOracle' }, (0, viem_1.setViemBlockNumber)(block)));
-    if (!oracleAddress)
-        throw new Error(`AaveV3 oracle unavailable at block ${block}`);
-    return oracleAddress;
-});
-exports._getAaveV3OracleAddress = _getAaveV3OracleAddress;
-const getAaveV3OracleAddress = (provider_1, network_1, market_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, market_1, ...args_1], void 0, function* (provider, network, market, block = 'latest') { return (0, exports._getAaveV3OracleAddress)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, market, block); });
-exports.getAaveV3OracleAddress = getAaveV3OracleAddress;
-// supply = aToken.balanceOf, debt = variableDebtToken.balanceOf + stableDebtToken.balanceOf — three reads per reserve
-const getHistoricalBalanceContracts = (entries, address) => {
-    const erc20Abi = (0, contracts_1.getConfigContractAbi)('Erc20');
-    return entries.flatMap((e) => ([
-        {
-            address: e.aTokenAddress, abi: erc20Abi, functionName: 'balanceOf', args: [address],
-        },
-        {
-            address: e.variableDebtTokenAddress, abi: erc20Abi, functionName: 'balanceOf', args: [address],
-        },
-        {
-            address: e.stableDebtTokenAddress, abi: erc20Abi, functionName: 'balanceOf', args: [address],
-        },
-    ]));
-};
-const getAssetPriceContract = (oracle, underlyingAddress) => ({
-    address: oracle,
-    abi: AAVE_ORACLE_ABI,
-    functionName: 'getAssetPrice',
-    args: [underlyingAddress],
-});
-/**
- * Pairs each reserve with its three balance reads and keeps the assets the wallet actually held.
- * Throws when every read failed — a totally failed fetch must not masquerade as a real $0 balance,
- * so the caller can distinguish "fetch failed" (gap) from "position was empty" (genuine 0).
- */
-const toActiveHistoricalAssets = (entries, balanceResults, block) => {
-    const anyBalanceRead = balanceResults.some((r) => (r === null || r === void 0 ? void 0 : r.status) === 'success');
-    if (!anyBalanceRead)
-        throw new Error(`AaveV3 historical balance: all balance reads failed at block ${block}`);
-    return entries.map((e, i) => {
-        const supplyRes = balanceResults[i * 3];
-        const varDebtRes = balanceResults[(i * 3) + 1];
-        const stableDebtRes = balanceResults[(i * 3) + 2];
-        const supplied = (supplyRes === null || supplyRes === void 0 ? void 0 : supplyRes.status) === 'success' ? supplyRes.result.toString() : '0';
-        const varDebt = (varDebtRes === null || varDebtRes === void 0 ? void 0 : varDebtRes.status) === 'success' ? varDebtRes.result.toString() : '0';
-        const stableDebt = (stableDebtRes === null || stableDebtRes === void 0 ? void 0 : stableDebtRes.status) === 'success' ? stableDebtRes.result.toString() : '0';
-        const debt = new decimal_js_1.default(varDebt).add(stableDebt).toString();
-        return Object.assign(Object.assign({}, e), { supplied, debt });
-    }).filter((a) => a.supplied !== '0' || a.debt !== '0');
-};
-/**
- * Sums the active assets into the point's USD totals. Throws when every price read failed — the
- * oracle couldn't serve this block (pruned state, or a hoisted oracle that wasn't deployed yet back
- * then), and totalling it up anyway would return a fake near-$0 balance. A single asset's price
- * failure still just skips that asset, matching the live data path.
- */
-const sumHistoricalUsd = (activeAssets, priceResBySymbol, block) => {
-    const anyPriceRead = activeAssets.some((a) => { var _a; return ((_a = priceResBySymbol[a.symbol]) === null || _a === void 0 ? void 0 : _a.status) === 'success'; });
-    if (!anyPriceRead)
-        throw new Error(`AaveV3 historical balance: all price reads failed at block ${block}`);
-    let suppliedUsd = new decimal_js_1.default(0);
-    let borrowedUsd = new decimal_js_1.default(0);
-    activeAssets.forEach((a) => {
-        const priceRes = priceResBySymbol[a.symbol];
-        if ((priceRes === null || priceRes === void 0 ? void 0 : priceRes.status) !== 'success')
-            return;
-        const priceUsd = new decimal_js_1.default(priceRes.result.toString()).div(1e8); // Aave v3 base currency is USD with 8 decimals
-        if (a.supplied !== '0')
-            suppliedUsd = suppliedUsd.add(new decimal_js_1.default((0, tokens_1.assetAmountInEth)(a.supplied, a.symbol)).mul(priceUsd));
-        if (a.debt !== '0')
-            borrowedUsd = borrowedUsd.add(new decimal_js_1.default((0, tokens_1.assetAmountInEth)(a.debt, a.symbol)).mul(priceUsd));
-    });
-    return {
-        block,
-        suppliedUsd: suppliedUsd.toString(),
-        borrowedUsd: borrowedUsd.toString(),
-        netUsd: suppliedUsd.minus(borrowedUsd).toString(),
-    };
-};
-/**
- * Fast path, ONE multicall: balances plus a price read for every reserve through the caller-hoisted
- * oracle. Prices are read for all reserves because which assets are active isn't known until the
- * balances come back — extra reads inside an already-paid multicall are nearly free.
- */
-const fetchHistoricalPointWithOracle = (provider, entries, address, block, oracleAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const balanceContracts = getHistoricalBalanceContracts(entries, address);
-    const priceContracts = entries.map((e) => getAssetPriceContract(oracleAddress, e.underlyingAddress));
-    // @ts-ignore
-    const results = yield provider.multicall({
-        contracts: [...balanceContracts, ...priceContracts], allowFailure: true, blockNumber: BigInt(block), batchSize: HISTORICAL_MULTICALL_BATCH_SIZE,
-    });
-    const activeAssets = toActiveHistoricalAssets(entries, results.slice(0, balanceContracts.length), block);
-    const priceResBySymbol = {};
-    results.slice(balanceContracts.length).forEach((res, i) => {
-        priceResBySymbol[entries[i].symbol] = res;
-    });
-    return { activeAssets, priceResBySymbol };
-});
-/**
- * Fallback path, TWO multicalls: balances plus getPriceOracle (resolving the oracle that was active
- * AT the block — Aave can rotate it over time), then prices for just the active assets. The oracle
- * read has no fallback: if it fails (bad archive node, rate limit, ...) the failure must surface
- * rather than silently returning $0 — the caller renders a gap instead of a misleading zero.
- */
-const fetchHistoricalPointResolvingOracle = (provider, network, market, entries, address, block) => __awaiter(void 0, void 0, void 0, function* () {
-    const balanceContracts = getHistoricalBalanceContracts(entries, address);
-    // @ts-ignore market.provider is a valid config key at runtime
-    const providerAbi = (0, contracts_1.getConfigContractAbi)(market.provider, network);
-    const oracleContract = {
-        address: market.providerAddress,
-        abi: providerAbi,
-        functionName: 'getPriceOracle',
-    };
-    const blockNumber = BigInt(block);
-    // @ts-ignore
-    const results = yield provider.multicall({
-        contracts: [...balanceContracts, oracleContract], allowFailure: true, blockNumber, batchSize: HISTORICAL_MULTICALL_BATCH_SIZE,
-    });
-    const oracleRes = results[balanceContracts.length];
-    if ((oracleRes === null || oracleRes === void 0 ? void 0 : oracleRes.status) !== 'success' || !oracleRes.result)
-        throw new Error(`AaveV3 historical balance: oracle unavailable at block ${block}`);
-    const activeAssets = toActiveHistoricalAssets(entries, results.slice(0, balanceContracts.length), block);
-    if (!activeAssets.length)
-        return { activeAssets, priceResBySymbol: {} };
-    const priceContracts = activeAssets.map((a) => getAssetPriceContract(oracleRes.result, a.underlyingAddress));
-    // @ts-ignore
-    const priceResults = yield provider.multicall({
-        contracts: priceContracts, allowFailure: true, blockNumber, batchSize: HISTORICAL_MULTICALL_BATCH_SIZE,
-    });
-    const priceResBySymbol = {};
-    priceResults.forEach((res, i) => {
-        priceResBySymbol[activeAssets[i].symbol] = res;
-    });
-    return { activeAssets, priceResBySymbol };
-});
-/**
- * Computes a user's Aave v3 net USD balance (supplied collateral - borrowed debt) at a historical block,
- * without touching the AaveV3View contract. Pass `reserveTokens` (from getAaveV3ReserveTokenAddresses)
- * to avoid refetching token addresses for every point, and `oracleAddress` (from getAaveV3OracleAddress,
- * verified identical at both ends of the sampled range) to collapse the point into a single multicall —
- * with it the balances and all prices ride one request; without it the oracle is resolved at the block
- * inside the balance multicall and the active assets are priced in a second one.
- */
-const _getAaveV3HistoricalBalance = (provider, network, market, address, block, reserveTokens, oracleAddress) => __awaiter(void 0, void 0, void 0, function* () {
-    const empty = {
-        block, suppliedUsd: '0', borrowedUsd: '0', netUsd: '0',
-    };
-    if (!address)
-        return empty;
-    const tokens = reserveTokens || (yield (0, exports._getAaveV3ReserveTokenAddresses)(provider, network, market));
-    const entries = Object.values(tokens);
-    if (!entries.length)
-        return empty;
-    const { activeAssets, priceResBySymbol } = oracleAddress
-        ? yield fetchHistoricalPointWithOracle(provider, entries, address, block, oracleAddress)
-        : yield fetchHistoricalPointResolvingOracle(provider, network, market, entries, address, block);
-    if (!activeAssets.length)
-        return empty;
-    return sumHistoricalUsd(activeAssets, priceResBySymbol, block);
-});
-exports._getAaveV3HistoricalBalance = _getAaveV3HistoricalBalance;
-const getAaveV3HistoricalBalance = (provider, network, market, address, block, reserveTokens, oracleAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV3HistoricalBalance)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, market, address, block, reserveTokens, oracleAddress); });
-exports.getAaveV3HistoricalBalance = getAaveV3HistoricalBalance;
 const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') {
     const { selectedMarket: market, assetsData, eModeCategoriesData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });

package/cjs/curveUsd/index.d.ts

@@ -5,6 +5,9 @@ export declare const _getCurveUsdGlobalData: (provider: Client, network: Network
 export declare const getCurveUsdGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDGlobalMarketData>;
 export declare const _getCrvUsdAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
 export declare const getCrvUsdAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
-export declare const _getCurveUsdUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string) => Promise<CrvUSDUserData>;
-export declare const getCurveUsdUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string) => Promise<CrvUSDUserData>;
+/**
+ * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
+ */
+export declare const _getCurveUsdUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string) => Promise<CrvUSDUserData>;
+export declare const getCurveUsdUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string) => Promise<CrvUSDUserData>;
 export declare const getCurveUsdFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDUserData>;

package/cjs/curveUsd/index.js

@@ -22,6 +22,12 @@ const curveUsdHelpers_1 = require("../helpers/curveUsdHelpers");
 const markets_1 = require("../markets");
 const utils_1 = require("../services/utils");
 const viem_1 = require("../services/viem");
+const staking_1 = require("../staking");
+/** Converts a per-second AMM rate (wei, 18 decimals) into a yearly compounded borrow APY in %. */
+const ammRateToBorrowApy = (rateWei) => {
+    const exponent = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(rateWei)).mul(365).mul(86400);
+    return new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponent).minus(1)).mul(100).toString();
+};
 const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.CrvUSDViewContractViem)(provider, network);
     const minBand = parseInt(_minBand, 10);
@@ -71,14 +77,8 @@ const _getCurveUsdGlobalData = (provider, network, selectedMarket) => __awaiter(
     // all prices are in 18 decimals
     const totalDebt = (0, tokens_1.assetAmountInEth)(data.totalDebt.toString(), debtAsset);
     const ammPrice = (0, tokens_1.assetAmountInEth)(data.ammPrice.toString(), debtAsset);
-    const rate = (0, tokens_1.assetAmountInEth)(data.ammRate.toString());
-    const futureRate = (0, tokens_1.assetAmountInEth)(data.monetaryPolicyRate.toString());
-    const exponentRate = new decimal_js_1.default(rate).mul(365).mul(86400);
-    const exponentFutureRate = new decimal_js_1.default(futureRate).mul(365).mul(86400);
-    const borrowRate = new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponentRate).minus(1)).mul(100)
-        .toString();
-    const futureBorrowRate = new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponentFutureRate).minus(1)).mul(100)
-        .toString();
+    const borrowRate = ammRateToBorrowApy(data.ammRate.toString());
+    const futureBorrowRate = ammRateToBorrowApy(data.monetaryPolicyRate.toString());
     const bandsData = yield getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
     const leftToBorrow = new decimal_js_1.default(debtCeiling.toString()).minus(totalDebt).toString();
     const loanDiscount = (0, tokens_1.assetAmountInEth)(loanDiscountWei.toString(), debtAsset);
@@ -131,11 +131,20 @@ const _getCrvUsdAccountBalances = (provider, network, block, addressMapping, add
 exports._getCrvUsdAccountBalances = _getCrvUsdAccountBalances;
 const getCrvUsdAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCrvUsdAccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address, controllerAddress); });
 exports.getCrvUsdAccountBalances = getCrvUsdAccountBalances;
-const _getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
+ */
+const _getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand, borrowRate) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.CrvUSDViewContractViem)(provider, network);
-    const data = yield contract.read.userData([selectedMarket.controllerAddress, address]);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
+    const [data, collStakingApy, marketBorrowRate] = yield Promise.all([
+        contract.read.userData([selectedMarket.controllerAddress, address]),
+        staking_1.STAKING_ASSETS.includes(collAsset) ? (0, staking_1.getStakingApy)(collAsset) : Promise.resolve('0'),
+        borrowRate !== undefined
+            ? Promise.resolve(borrowRate)
+            : contract.read.globalData([selectedMarket.controllerAddress]).then((globalData) => ammRateToBorrowApy(globalData.ammRate.toString())),
+    ]);
     const health = (0, tokens_1.assetAmountInEth)(data.health.toString());
     const healthPercent = new decimal_js_1.default(health).mul(100).toString();
     const collPrice = (0, tokens_1.assetAmountInEth)(data.collateralPrice.toString(), debtAsset);
@@ -166,7 +175,7 @@ const _getCurveUsdUserData = (provider, network, address, selectedMarket, active
             isBorrowed: new decimal_js_1.default(debtBorrowed).gt('0'),
             symbol: 'crvUSD',
             price: '1',
-            interestRate: '0',
+            interestRate: marketBorrowRate,
         },
     } : {};
     const priceHigh = (0, tokens_1.assetAmountInEth)(data.priceHigh.toString());
@@ -178,16 +187,22 @@ const _getCurveUsdUserData = (provider, network, address, selectedMarket, active
         healthPercent,
         priceHigh,
         priceLow, liquidationDiscount: (0, tokens_1.assetAmountInEth)(data.liquidationDiscount.toString()), numOfBands: data.N.toString(), usedAssets,
-        status }), (0, curveUsdHelpers_1.getCrvUsdAggregatedData)({
-        loanExists: data.loanExists, usedAssets, network: common_1.NetworkNumber.Eth, selectedMarket, numOfBands: data.N.toString(),
+        status, borrowRate: marketBorrowRate }), (0, curveUsdHelpers_1.getCrvUsdAggregatedData)({
+        loanExists: data.loanExists,
+        usedAssets,
+        network: common_1.NetworkNumber.Eth,
+        selectedMarket,
+        numOfBands: data.N.toString(),
+        borrowRate: marketBorrowRate,
+        collStakingApy,
     })), { userBands });
 });
 exports._getCurveUsdUserData = _getCurveUsdUserData;
-const getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCurveUsdUserData)((0, viem_1.getViemProvider)(provider, network), network, address, selectedMarket, activeBand); });
+const getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand, borrowRate) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getCurveUsdUserData)((0, viem_1.getViemProvider)(provider, network), network, address, selectedMarket, activeBand, borrowRate); });
 exports.getCurveUsdUserData = getCurveUsdUserData;
 const getCurveUsdFullPositionData = (provider, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getCurveUsdGlobalData)(provider, network, selectedMarket);
-    const positionData = yield (0, exports.getCurveUsdUserData)(provider, network, address, selectedMarket, marketData.activeBand);
+    const positionData = yield (0, exports.getCurveUsdUserData)(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate);
     return positionData;
 });
 exports.getCurveUsdFullPositionData = getCurveUsdFullPositionData;

package/cjs/fluid/index.d.ts

@@ -133,6 +133,7 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
+        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -167,6 +168,7 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
+        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -201,6 +203,7 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
+        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -221,3 +224,5 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         nftId: string;
     } | undefined;
 }[]>;
+export declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
+export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;

package/cjs/fluid/index.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._getUserPositionsPortfolio = exports.getUserPositions = exports._getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports._getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports._getFluidDepositData = exports.getFluidTokenData = exports._getFluidTokenData = exports.getAllFluidMarketDataChunked = exports._getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports._getFluidPositionWithMarket = exports.getFluidPosition = exports._getFluidPosition = exports.getFluidVaultIdsForUser = exports._getFluidVaultIdsForUser = exports.getFluidMarketData = exports._getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
+exports.getAllFluidMarketDataPortfolio = exports._getAllFluidMarketDataPortfolio = exports._getUserPositionsPortfolio = exports.getUserPositions = exports._getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports._getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports._getFluidDepositData = exports.getFluidTokenData = exports._getFluidTokenData = exports.getAllFluidMarketDataChunked = exports._getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports._getFluidPositionWithMarket = exports.getFluidPosition = exports._getFluidPosition = exports.getFluidVaultIdsForUser = exports._getFluidVaultIdsForUser = exports.getFluidMarketData = exports._getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -1410,3 +1410,38 @@ const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0
     })).filter(md => md.marketData !== undefined);
 });
 exports._getUserPositionsPortfolio = _getUserPositionsPortfolio;
+const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
+    if (versions.length === 0)
+        return {};
+    const view = (0, contracts_1.FluidViewContractViem)(provider, network);
+    const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
+    const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
+        const vaultTokens = [(0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken0, network).symbol, (0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken0, network).symbol];
+        if (vaultData.supplyToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.supplyToken1))
+            vaultTokens.push((0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken1, network).symbol);
+        if (vaultData.borrowToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.borrowToken1))
+            vaultTokens.push((0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken1, network).symbol);
+        return vaultTokens;
+    }).flat()));
+    // ETH and WBTC needed for other tokens prices
+    if (!tokens.includes('ETH'))
+        tokens.push('ETH');
+    if (!tokens.includes('WBTC'))
+        tokens.push('WBTC');
+    const [tokenPrices, merklCampaigns] = yield Promise.all([
+        getTokensPricesForPortfolio(tokens, provider, network),
+        (0, merkl_1.getFluidMerklCampaigns)(network),
+    ]);
+    const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); })));
+    const marketsData = {};
+    parsedMarketsData.forEach((marketData, i) => {
+        if (!marketData)
+            return;
+        marketsData[versions[i].value] = (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns);
+    });
+    return marketsData;
+});
+exports._getAllFluidMarketDataPortfolio = _getAllFluidMarketDataPortfolio;
+const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllFluidMarketDataPortfolio)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network); });
+exports.getAllFluidMarketDataPortfolio = getAllFluidMarketDataPortfolio;

package/cjs/helpers/aaveHelpers/index.js

@@ -140,6 +140,9 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         return new decimal_js_1.default(suppliedUsd).mul(effectiveLtv);
     });
     payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    // Normalised safety ratio (100 = liquidation on every protocol): the automation ratio above, falling back
+    // to the regular ratio when the fallback carries its '0' placeholder.
+    payload.safetyRatio = +payload.safetyRatioWithLtvZeroFallback ? payload.safetyRatioWithLtvZeroFallback : payload.ratio;
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);

package/cjs/helpers/aaveV4Helpers/index.js

@@ -219,6 +219,7 @@ const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useU
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.minRatio = '100';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = (0, exports.isLeveragedPosAaveV4)(usedAssets);

package/cjs/helpers/compoundHelpers/index.js

@@ -102,6 +102,7 @@ const getCompoundV2AggregatedData = (_a) => {
     payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
         ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
         : '0';
+    payload.safetyRatio = payload.ratio;
     // Calculate borrow limits per asset
     Object.values(usedAssets).forEach((item) => {
         if (item.isBorrowed) {
@@ -144,6 +145,7 @@ const getCompoundV3AggregatedData = (_a) => {
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
     payload.minRatio = '100';
+    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     payload.minDebt = assetsData[selectedMarket.baseAsset].minDebt;

package/cjs/helpers/curveUsdHelpers/index.d.ts

@@ -1,9 +1,11 @@
 import { CrvUSDAggregatedPositionData, CrvUSDMarketData, CrvUSDUsedAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const getCrvUsdAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest }: {
+export declare const getCrvUsdAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, borrowRate, collStakingApy, ...rest }: {
     loanExists: boolean;
     usedAssets: CrvUSDUsedAssets;
     network: NetworkNumber;
     selectedMarket: CrvUSDMarketData;
     numOfBands: number | string;
+    borrowRate?: string;
+    collStakingApy?: string;
 }) => CrvUSDAggregatedPositionData;

package/cjs/helpers/curveUsdHelpers/index.js

@@ -18,9 +18,10 @@ exports.getCrvUsdAggregatedData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
 const utils_1 = require("../../services/utils");
+const staking_1 = require("../../staking");
 const getCrvUsdAggregatedData = (_a) => {
-    var _b;
-    var { loanExists, usedAssets, network, selectedMarket, numOfBands } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands"]);
+    var _b, _c;
+    var { loanExists, usedAssets, network, selectedMarket, numOfBands, borrowRate = '0', collStakingApy = '0' } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands", "borrowRate", "collStakingApy"]);
     const payload = {};
     payload.supplied = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
     payload.borrowed = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
@@ -34,6 +35,8 @@ const getCrvUsdAggregatedData = (_a) => {
         : '0';
     // this is all approximation
     payload.minAllowedRatio = (0, utils_1.mapRange)(numOfBands, 4, 50, 115, 140); // collateral ratio
+    // Collateral ratio rebased so 100 sits on the band-derived minimum (normalised safety ratio, same scale as the other protocols).
+    payload.safetyRatio = loanExists && payload.minAllowedRatio ? new decimal_js_1.default(payload.ratio).div(payload.minAllowedRatio).mul(100).toString() : '0';
     payload.collFactor = new decimal_js_1.default(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
     // only take in consideration collAsset
     payload.borrowLimitUsd = ((_b = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[selectedMarket.collAsset]) === null || _b === void 0 ? void 0 : _b.isSupplied)
@@ -47,6 +50,17 @@ const getCrvUsdAggregatedData = (_a) => {
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, usedAssets[selectedMarket.collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
     }
     payload.exposure = (0, moneymarket_1.getExposure)(payload.borrowedUsd, payload.suppliedUsd);
+    // crvUSD debt accrues the market borrow rate. Collateral (including crvUSD held during soft liquidation) earns
+    // nothing from the protocol itself; only the native yield of staked collateral is counted, as an incentive.
+    const { netApy, totalInterestUsd, incentiveUsd } = (0, staking_1.calculateNetApyFromRates)({
+        suppliedUsd: payload.suppliedUsd,
+        borrowedUsd: payload.borrowedUsd,
+        borrowRate,
+        incentives: [{ apy: collStakingApy, amountUsd: ((_c = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[selectedMarket.collAsset]) === null || _c === void 0 ? void 0 : _c.suppliedUsd) || '0' }],
+    });
+    payload.netApy = netApy;
+    payload.totalInterestUsd = totalInterestUsd;
+    payload.incentiveUsd = incentiveUsd;
     return payload;
 };
 exports.getCrvUsdAggregatedData = getCrvUsdAggregatedData;

package/cjs/helpers/fluidHelpers/index.js

@@ -85,6 +85,7 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.minRatio = marketData.minRatio;
+    payload.safetyRatio = payload.ratio;
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
     payload.leveragedType = leveragedType;
     payload.liquidationPrice = '';

package/cjs/helpers/liquityV2Helpers/index.js

@@ -48,6 +48,7 @@ const getLiquityV2AggregatedPositionData = ({ usedAssets, assetsData, minCollRat
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.safetyRatio = payload.ratio;
     const { netApy, incentiveUsd, totalInterestUsd } = (0, exports.calculateNetApyLiquityV2)(usedAssets, assetsData, interestRate);
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/helpers/llamaLendHelpers/index.js

@@ -42,6 +42,8 @@ const getLlamaLendAggregatedData = (_a) => {
         : '0';
     // this is all approximation
     payload.minAllowedRatio = (0, utils_1.mapRange)(numOfBands, 4, 50, 115, 140); // collateral ratio
+    // Collateral ratio rebased so 100 sits on the band-derived minimum (normalised safety ratio, same scale as the other protocols).
+    payload.safetyRatio = loanExists && payload.minAllowedRatio ? new decimal_js_1.default(payload.ratio).div(payload.minAllowedRatio).mul(100).toString() : '0';
     payload.collFactor = new decimal_js_1.default(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
     // only take in consideration collAsset
     payload.borrowLimitUsd = ((_b = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[collAsset]) === null || _b === void 0 ? void 0 : _b.isSupplied)

package/cjs/helpers/makerHelpers/index.d.ts

@@ -1,4 +1,4 @@
-export declare const parseCollateralInfo: (ilk: string, _par: string, _mat: string, _art: string, _rate: string, _spot: string, _line: string, _duty: string, _futureRate: string, _chop: string) => {
+export declare const parseCollateralInfo: (ilk: string, _par: string, _mat: string, _art: string, _rate: string, _spot: string, _line: string, _dust: string, _duty: string, _futureRate: string, _chop: string) => {
     ilkLabel: string;
     currentRate: string;
     futureRate: string;