@defisaver/positions-sdk 2.1.109-ltv-0-automations-dev → 2.1.110

package/cjs/aaveV4/index.d.ts

@@ -1,9 +1,11 @@
 import { Client } from 'viem';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber, Blockish, PositionBalances } from '../types';
 export * as lend from './lend';
 export { getAaveV4MerkleCampaigns } from './merkl';
 export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;
 export declare function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;
+export declare const _getAaveV4AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, spokeAddress: EthAddress, spokeData?: AaveV4SpokeData) => Promise<PositionBalances>;
+export declare const getAaveV4AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, spokeAddress: EthAddress, spokeData?: AaveV4SpokeData) => Promise<PositionBalances>;
 export declare function getAaveV4UnderlyingFromReserveId(provider: EthereumProvider, network: NetworkNumber, spoke: EthAddress, reserveId: number): Promise<any>;

package/cjs/aaveV4/index.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV4MerkleCampaigns = exports.lend = void 0;
+exports.getAaveV4AccountBalances = exports._getAaveV4AccountBalances = exports.getAaveV4MerkleCampaigns = exports.lend = void 0;
 exports._getAaveV4SpokeData = _getAaveV4SpokeData;
 exports.getAaveV4SpokeData = getAaveV4SpokeData;
 exports._getAaveV4AccountData = _getAaveV4AccountData;
@@ -285,6 +285,46 @@ function getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {
         return _getAaveV4AccountData((0, viem_1.getViemProvider)(provider, network), network, marketData, address, blockNumber);
     });
 }
+const _getAaveV4AccountBalances = (provider, network, block, addressMapping, address, spokeAddress, spokeData) => __awaiter(void 0, void 0, void 0, function* () {
+    const balances = {
+        collateral: {},
+        debt: {},
+    };
+    if (!address || !spokeAddress) {
+        return balances;
+    }
+    const blockNumber = block === 'latest' ? 'latest' : Number(block);
+    let resolvedSpokeData = spokeData;
+    if (!resolvedSpokeData) {
+        const spokeInfo = (0, aaveV4_1.findAaveV4SpokeByAddress)(network, spokeAddress);
+        if (!spokeInfo) {
+            return balances;
+        }
+        resolvedSpokeData = yield _getAaveV4SpokeData(provider, network, spokeInfo, blockNumber);
+    }
+    const accountData = yield _getAaveV4AccountData(provider, network, resolvedSpokeData, address, blockNumber);
+    const finalSpokeData = resolvedSpokeData;
+    Object.entries(accountData.usedAssets).forEach(([key, asset]) => {
+        const reserveData = finalSpokeData.assetsData[key];
+        if (!reserveData)
+            return;
+        const balanceKey = addressMapping
+            ? (0, utils_1.wethToEthByAddress)(reserveData.underlying, network).toLowerCase()
+            : (0, utils_1.wethToEth)(asset.symbol);
+        if (asset.isSupplied && new decimal_js_1.default(asset.supplied || 0).gt(0)) {
+            balances.collateral[balanceKey] = (0, tokens_1.assetAmountInWei)(asset.supplied, asset.symbol);
+        }
+        if (asset.isBorrowed && new decimal_js_1.default(asset.borrowed || 0).gt(0)) {
+            balances.debt[balanceKey] = (0, tokens_1.assetAmountInWei)(asset.borrowed, asset.symbol);
+        }
+    });
+    return balances;
+});
+exports._getAaveV4AccountBalances = _getAaveV4AccountBalances;
+const getAaveV4AccountBalances = (provider, network, block, addressMapping, address, spokeAddress, spokeData) => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, exports._getAaveV4AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address, spokeAddress, spokeData);
+});
+exports.getAaveV4AccountBalances = getAaveV4AccountBalances;
 const _getAaveV4UnderlyingFromReserveId = (provider, network, spoke, reserveId) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network);
     const reserveData = yield viewContract.read.getReserveData([spoke, BigInt(reserveId)]);

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

@@ -30,17 +30,6 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, eModeCategor
     liquidationRatio: any;
     collateralFactor: any;
 };
-/**
- * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
- * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
- * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
- * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
- * built on this matches the regular safety ratio whenever no collateral is LTV-0.
- */
-export declare const aaveAnyGetUserReserveLtvAndLltv: ({ eModeCategory, eModeCategoriesData, assetsData, }: AaveHelperCommon, _asset: string) => {
-    ltv: string;
-    lltv: string;
-};
 export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
     action: string;

package/cjs/helpers/aaveHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetUserReserveLtvAndLltv = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
+exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const types_1 = require("../../types");
@@ -83,33 +83,6 @@ const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, asset
     return ({ liquidationRatio, collateralFactor });
 };
 exports.aaveAnyGetEmodeMutableProps = aaveAnyGetEmodeMutableProps;
-/**
- * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
- * in the safety-ratio fallback. Matches AaveV3View.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
- * Values are fractions (e.g. 0.8), so 5% === 0.05.
- */
-const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
-/**
- * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
- * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
- * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
- * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
- * built on this matches the regular safety ratio whenever no collateral is LTV-0.
- */
-const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
-    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
-    const assetData = assetsData[asset];
-    const eModeCategoryData = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory];
-    if (eModeCategory === 0
-        || !eModeCategoryData
-        || !eModeCategoryData.collateralAssets.includes(asset)
-        || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
-        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
-    }
-    const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
-    return { ltv, lltv: eModeCategoryData.liquidationRatio };
-};
-exports.aaveAnyGetUserReserveLtvAndLltv = aaveAnyGetUserReserveLtvAndLltv;
 const aaveAnyGetAggregatedPositionData = (_a) => {
     var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
@@ -123,17 +96,6 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     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.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-    // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
-    // instead of 0 (AaveV3View.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
-    // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
-    payload.borrowLimitWithLtvZeroFallbackUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
-        const { ltv, lltv } = (0, exports.aaveAnyGetUserReserveLtvAndLltv)(data, symbol);
-        const effectiveLtv = new decimal_js_1.default(ltv).eq(0)
-            ? decimal_js_1.default.max(0, new decimal_js_1.default(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
-            : new decimal_js_1.default(ltv);
-        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';
     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/markets/aaveV4/index.d.ts

@@ -32,3 +32,4 @@ export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_main_spoke: AaveV4SpokeInfo;
 };
 export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;
+export declare const findAaveV4SpokeByAddress: (networkId: NetworkNumber, address: string) => AaveV4SpokeInfo | undefined;

package/cjs/markets/aaveV4/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV4SpokeTypeInfo = exports.AaveV4Spokes = exports.AAVE_V4_MAIN_SPOKE = exports.AAVE_V4_LOMBARD_BTC_SPOKE = exports.AAVE_V4_LIDO_SPOKE = exports.AAVE_V4_KELP_SPOKE = exports.AAVE_V4_GOLD_SPOKE = exports.AAVE_V4_FOREX_SPOKE = exports.AAVE_V4_ETHERFI_SPOKE = exports.AAVE_V4_ETHENA_ECOSYSTEM_SPOKE = exports.AAVE_V4_ETHENA_CORRELATED_SPOKE = exports.AAVE_V4_BLUECHIP_SPOKE = exports.getAaveV4HubByAddress = exports.getAaveV4HubTypeInfo = exports.AaveV4Hubs = exports.AAVE_V4_PRIME_HUB = exports.AAVE_V4_PLUS_HUB = exports.AAVE_V4_CORE_HUB = void 0;
+exports.findAaveV4SpokeByAddress = exports.getAaveV4SpokeTypeInfo = exports.AaveV4Spokes = exports.AAVE_V4_MAIN_SPOKE = exports.AAVE_V4_LOMBARD_BTC_SPOKE = exports.AAVE_V4_LIDO_SPOKE = exports.AAVE_V4_KELP_SPOKE = exports.AAVE_V4_GOLD_SPOKE = exports.AAVE_V4_FOREX_SPOKE = exports.AAVE_V4_ETHERFI_SPOKE = exports.AAVE_V4_ETHENA_ECOSYSTEM_SPOKE = exports.AAVE_V4_ETHENA_CORRELATED_SPOKE = exports.AAVE_V4_BLUECHIP_SPOKE = exports.getAaveV4HubByAddress = exports.getAaveV4HubTypeInfo = exports.AaveV4Hubs = exports.AAVE_V4_PRIME_HUB = exports.AAVE_V4_PLUS_HUB = exports.AAVE_V4_CORE_HUB = void 0;
 const types_1 = require("../../types");
 // HUBS
 const AAVE_V4_CORE_HUB = (networkId) => ({
@@ -180,3 +180,5 @@ const AaveV4Spokes = (networkId) => ({
 exports.AaveV4Spokes = AaveV4Spokes;
 const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Spokes)(network !== null && network !== void 0 ? network : types_1.NetworkNumber.Eth))[type]);
 exports.getAaveV4SpokeTypeInfo = getAaveV4SpokeTypeInfo;
+const findAaveV4SpokeByAddress = (networkId, address) => Object.values((0, exports.AaveV4Spokes)(networkId)).find(spoke => spoke.address.toLowerCase() === address.toLowerCase());
+exports.findAaveV4SpokeByAddress = findAaveV4SpokeByAddress;

package/cjs/markets/index.d.ts

@@ -7,4 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
-export { AaveV4Spokes } from './aaveV4';
+export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.findAaveV4SpokeByAddress = exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -37,3 +37,4 @@ Object.defineProperty(exports, "getFTokenAddress", { enumerable: true, get: func
 Object.defineProperty(exports, "getFluidMarketInfoByAddress", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoByAddress; } });
 var aaveV4_1 = require("./aaveV4");
 Object.defineProperty(exports, "AaveV4Spokes", { enumerable: true, get: function () { return aaveV4_1.AaveV4Spokes; } });
+Object.defineProperty(exports, "findAaveV4SpokeByAddress", { enumerable: true, get: function () { return aaveV4_1.findAaveV4SpokeByAddress; } });

package/cjs/types/aave.d.ts

@@ -125,7 +125,6 @@ export interface AavePositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
-    safetyRatioWithLtvZeroFallback?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -157,8 +156,6 @@ export interface AaveV3AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
-    borrowLimitWithLtvZeroFallbackUsd: string;
-    safetyRatioWithLtvZeroFallback: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/esm/aaveV4/index.d.ts

@@ -1,9 +1,11 @@
 import { Client } from 'viem';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber, Blockish, PositionBalances } from '../types';
 export * as lend from './lend';
 export { getAaveV4MerkleCampaigns } from './merkl';
 export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;
 export declare function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;
+export declare const _getAaveV4AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, spokeAddress: EthAddress, spokeData?: AaveV4SpokeData) => Promise<PositionBalances>;
+export declare const getAaveV4AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, spokeAddress: EthAddress, spokeData?: AaveV4SpokeData) => Promise<PositionBalances>;
 export declare function getAaveV4UnderlyingFromReserveId(provider: EthereumProvider, network: NetworkNumber, spoke: EthAddress, reserveId: number): Promise<any>;

package/esm/aaveV4/index.js

@@ -8,14 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, assetAmountInWei, getAssetInfoByAddress } from '@defisaver/tokens';
 import { getViemProvider } from '../services/viem';
 import { IncentiveKind, } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { isMaxUint, wethToEth } from '../services/utils';
+import { isMaxUint, wethToEth, wethToEthByAddress } from '../services/utils';
 import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
-import { getAaveV4HubByAddress } from '../markets/aaveV4';
+import { findAaveV4SpokeByAddress, getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
 import { attachAaveV4MerklIncentives, getAaveV4MerkleCampaigns } from './merkl';
 export * as lend from './lend';
@@ -240,6 +240,44 @@ export function getAaveV4AccountData(provider_1, network_1, marketData_1, addres
         return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
     });
 }
+export const _getAaveV4AccountBalances = (provider, network, block, addressMapping, address, spokeAddress, spokeData) => __awaiter(void 0, void 0, void 0, function* () {
+    const balances = {
+        collateral: {},
+        debt: {},
+    };
+    if (!address || !spokeAddress) {
+        return balances;
+    }
+    const blockNumber = block === 'latest' ? 'latest' : Number(block);
+    let resolvedSpokeData = spokeData;
+    if (!resolvedSpokeData) {
+        const spokeInfo = findAaveV4SpokeByAddress(network, spokeAddress);
+        if (!spokeInfo) {
+            return balances;
+        }
+        resolvedSpokeData = yield _getAaveV4SpokeData(provider, network, spokeInfo, blockNumber);
+    }
+    const accountData = yield _getAaveV4AccountData(provider, network, resolvedSpokeData, address, blockNumber);
+    const finalSpokeData = resolvedSpokeData;
+    Object.entries(accountData.usedAssets).forEach(([key, asset]) => {
+        const reserveData = finalSpokeData.assetsData[key];
+        if (!reserveData)
+            return;
+        const balanceKey = addressMapping
+            ? wethToEthByAddress(reserveData.underlying, network).toLowerCase()
+            : wethToEth(asset.symbol);
+        if (asset.isSupplied && new Dec(asset.supplied || 0).gt(0)) {
+            balances.collateral[balanceKey] = assetAmountInWei(asset.supplied, asset.symbol);
+        }
+        if (asset.isBorrowed && new Dec(asset.borrowed || 0).gt(0)) {
+            balances.debt[balanceKey] = assetAmountInWei(asset.borrowed, asset.symbol);
+        }
+    });
+    return balances;
+});
+export const getAaveV4AccountBalances = (provider, network, block, addressMapping, address, spokeAddress, spokeData) => __awaiter(void 0, void 0, void 0, function* () {
+    return _getAaveV4AccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, spokeAddress, spokeData);
+});
 const _getAaveV4UnderlyingFromReserveId = (provider, network, spoke, reserveId) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = AaveV4ViewContractViem(provider, network);
     const reserveData = yield viewContract.read.getReserveData([spoke, BigInt(reserveId)]);

package/esm/helpers/aaveHelpers/index.d.ts

@@ -30,17 +30,6 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, eModeCategor
     liquidationRatio: any;
     collateralFactor: any;
 };
-/**
- * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
- * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
- * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
- * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
- * built on this matches the regular safety ratio whenever no collateral is LTV-0.
- */
-export declare const aaveAnyGetUserReserveLtvAndLltv: ({ eModeCategory, eModeCategoriesData, assetsData, }: AaveHelperCommon, _asset: string) => {
-    ltv: string;
-    lltv: string;
-};
 export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
     action: string;

package/esm/helpers/aaveHelpers/index.js

@@ -69,32 +69,6 @@ export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData
     const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
-/**
- * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
- * in the safety-ratio fallback. Matches AaveV3View.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
- * Values are fractions (e.g. 0.8), so 5% === 0.05.
- */
-const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
-/**
- * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
- * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
- * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
- * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
- * built on this matches the regular safety ratio whenever no collateral is LTV-0.
- */
-export const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
-    const asset = getNativeAssetFromWrapped(_asset);
-    const assetData = assetsData[asset];
-    const eModeCategoryData = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory];
-    if (eModeCategory === 0
-        || !eModeCategoryData
-        || !eModeCategoryData.collateralAssets.includes(asset)
-        || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)) {
-        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
-    }
-    const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
-    return { ltv, lltv: eModeCategoryData.liquidationRatio };
-};
 export const aaveAnyGetAggregatedPositionData = (_a) => {
     var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
@@ -108,17 +82,6 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-    // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
-    // instead of 0 (AaveV3View.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
-    // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
-    payload.borrowLimitWithLtvZeroFallbackUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
-        const { ltv, lltv } = aaveAnyGetUserReserveLtvAndLltv(data, symbol);
-        const effectiveLtv = new Dec(ltv).eq(0)
-            ? Dec.max(0, new Dec(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
-            : new Dec(ltv);
-        return new Dec(suppliedUsd).mul(effectiveLtv);
-    });
-    payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);

package/esm/markets/aaveV4/index.d.ts

@@ -32,3 +32,4 @@ export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_main_spoke: AaveV4SpokeInfo;
 };
 export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;
+export declare const findAaveV4SpokeByAddress: (networkId: NetworkNumber, address: string) => AaveV4SpokeInfo | undefined;

package/esm/markets/aaveV4/index.js

@@ -159,3 +159,4 @@ export const AaveV4Spokes = (networkId) => ({
     [AaveV4SpokesType.AaveV4MainSpoke]: AAVE_V4_MAIN_SPOKE(networkId),
 });
 export const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, AaveV4Spokes(network !== null && network !== void 0 ? network : NetworkNumber.Eth))[type]);
+export const findAaveV4SpokeByAddress = (networkId, address) => Object.values(AaveV4Spokes(networkId)).find(spoke => spoke.address.toLowerCase() === address.toLowerCase());

package/esm/markets/index.d.ts

@@ -7,4 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
-export { AaveV4Spokes } from './aaveV4';
+export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

package/esm/markets/index.js

@@ -7,4 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
-export { AaveV4Spokes } from './aaveV4';
+export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

package/esm/types/aave.d.ts

@@ -125,7 +125,6 @@ export interface AavePositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
-    safetyRatioWithLtvZeroFallback?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -157,8 +156,6 @@ export interface AaveV3AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
-    borrowLimitWithLtvZeroFallbackUsd: string;
-    safetyRatioWithLtvZeroFallback: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.109-ltv-0-automations-dev",
+  "version": "2.1.110",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, assetAmountInWei, getAssetInfoByAddress } from '@defisaver/tokens';
 import { getViemProvider } from '../services/viem';
 import {
   AaveV4AccountData,
@@ -16,12 +16,14 @@ import {
   IncentiveData,
   IncentiveKind,
   NetworkNumber,
+  Blockish,
+  PositionBalances,
 } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { isMaxUint, wethToEth } from '../services/utils';
+import { isMaxUint, wethToEth, wethToEthByAddress } from '../services/utils';
 import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
-import { getAaveV4HubByAddress } from '../markets/aaveV4';
+import { findAaveV4SpokeByAddress, getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
 import { attachAaveV4MerklIncentives, getAaveV4MerkleCampaigns } from './merkl';
 
@@ -259,6 +261,74 @@ export async function getAaveV4AccountData(provider: EthereumProvider, network:
   return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
 }
 
+export const _getAaveV4AccountBalances = async (
+  provider: Client,
+  network: NetworkNumber,
+  block: Blockish,
+  addressMapping: boolean,
+  address: EthAddress,
+  spokeAddress: EthAddress,
+  spokeData?: AaveV4SpokeData,
+): Promise<PositionBalances> => {
+  const balances: PositionBalances = {
+    collateral: {},
+    debt: {},
+  };
+
+  if (!address || !spokeAddress) {
+    return balances;
+  }
+
+  const blockNumber = block === 'latest' ? 'latest' : Number(block);
+  let resolvedSpokeData = spokeData;
+  if (!resolvedSpokeData) {
+    const spokeInfo = findAaveV4SpokeByAddress(network, spokeAddress);
+    if (!spokeInfo) {
+      return balances;
+    }
+    resolvedSpokeData = await _getAaveV4SpokeData(provider, network, spokeInfo, blockNumber);
+  }
+
+  const accountData = await _getAaveV4AccountData(provider, network, resolvedSpokeData, address, blockNumber);
+  const finalSpokeData = resolvedSpokeData;
+
+  Object.entries(accountData.usedAssets).forEach(([key, asset]) => {
+    const reserveData = finalSpokeData.assetsData[key];
+    if (!reserveData) return;
+
+    const balanceKey = addressMapping
+      ? wethToEthByAddress(reserveData.underlying, network).toLowerCase()
+      : wethToEth(asset.symbol);
+
+    if (asset.isSupplied && new Dec(asset.supplied || 0).gt(0)) {
+      balances.collateral![balanceKey] = assetAmountInWei(asset.supplied, asset.symbol);
+    }
+    if (asset.isBorrowed && new Dec(asset.borrowed || 0).gt(0)) {
+      balances.debt![balanceKey] = assetAmountInWei(asset.borrowed, asset.symbol);
+    }
+  });
+
+  return balances;
+};
+
+export const getAaveV4AccountBalances = async (
+  provider: EthereumProvider,
+  network: NetworkNumber,
+  block: Blockish,
+  addressMapping: boolean,
+  address: EthAddress,
+  spokeAddress: EthAddress,
+  spokeData?: AaveV4SpokeData,
+): Promise<PositionBalances> => _getAaveV4AccountBalances(
+  getViemProvider(provider, network),
+  network,
+  block,
+  addressMapping,
+  address,
+  spokeAddress,
+  spokeData,
+);
+
 const _getAaveV4UnderlyingFromReserveId = async (provider: Client, network: NetworkNumber, spoke: EthAddress, reserveId: number): Promise<any> => {
   const viewContract = AaveV4ViewContractViem(provider, network);
 

package/src/helpers/aaveHelpers/index.ts

@@ -80,45 +80,6 @@ export const aaveAnyGetEmodeMutableProps = (
   return ({ liquidationRatio, collateralFactor });
 };
 
-/**
- * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
- * in the safety-ratio fallback. Matches AaveV3View.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
- * Values are fractions (e.g. 0.8), so 5% === 0.05.
- */
-const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
-
-/**
- * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
- * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
- * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
- * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
- * built on this matches the regular safety ratio whenever no collateral is LTV-0.
- */
-export const aaveAnyGetUserReserveLtvAndLltv = (
-  {
-    eModeCategory,
-    eModeCategoriesData,
-    assetsData,
-  }: AaveHelperCommon,
-  _asset: string,
-): { ltv: string, lltv: string } => {
-  const asset = getNativeAssetFromWrapped(_asset);
-  const assetData = assetsData[asset];
-  const eModeCategoryData = eModeCategoriesData?.[eModeCategory];
-
-  if (
-    eModeCategory === 0
-    || !eModeCategoryData
-    || !eModeCategoryData.collateralAssets.includes(asset)
-    || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)
-  ) {
-    return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
-  }
-
-  const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
-  return { ltv, lltv: eModeCategoryData.liquidationRatio };
-};
-
 export const aaveAnyGetAggregatedPositionData = ({
   usedAssets,
   eModeCategory,
@@ -148,21 +109,6 @@ export const aaveAnyGetAggregatedPositionData = ({
   payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
   payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
   payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-  // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
-  // instead of 0 (AaveV3View.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
-  // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
-  payload.borrowLimitWithLtvZeroFallbackUsd = getAssetsTotal(
-    usedAssets,
-    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => {
-      const { ltv, lltv } = aaveAnyGetUserReserveLtvAndLltv(data, symbol);
-      const effectiveLtv = new Dec(ltv).eq(0)
-        ? Dec.max(0, new Dec(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
-        : new Dec(ltv);
-      return new Dec(suppliedUsd).mul(effectiveLtv);
-    },
-  );
-  payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
   payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
   payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
   const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);

package/src/markets/aaveV4/index.ts

@@ -188,4 +188,8 @@ export const AaveV4Spokes = (networkId: NetworkNumber) => ({
 
 export const getAaveV4SpokeTypeInfo = (type: AaveV4SpokesType, network?: NetworkNumber) => ({ ...AaveV4Spokes(network ?? NetworkNumber.Eth) }[type]);
 
+export const findAaveV4SpokeByAddress = (networkId: NetworkNumber, address: string): AaveV4SpokeInfo | undefined => Object.values(AaveV4Spokes(networkId)).find(
+  spoke => spoke.address.toLowerCase() === address.toLowerCase(),
+);
+
 

package/src/markets/index.ts

@@ -27,4 +27,4 @@ export {
   getFTokenAddress,
   getFluidMarketInfoByAddress,
 } from './fluid';
-export { AaveV4Spokes } from './aaveV4';
+export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

package/src/types/aave.ts

@@ -141,8 +141,6 @@ export interface AavePositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
   collRatio: string,
-  // Safety ratio as evaluated by automation bots (LTV-0 collateral credited at LLTV - 5%). Aave v3 only.
-  safetyRatioWithLtvZeroFallback?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,
@@ -175,8 +173,6 @@ export interface AaveV3AggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
-  borrowLimitWithLtvZeroFallbackUsd: string,
-  safetyRatioWithLtvZeroFallback: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,