@defisaver/positions-sdk 2.1.72-aave-v4-dev → 2.1.72-aave-v4-3-dev

package/cjs/aaveV4/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo } from '../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
+export * as lend from './lend';
 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>;

package/cjs/aaveV4/index.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,6 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.lend = void 0;
 exports._getAaveV4SpokeData = _getAaveV4SpokeData;
 exports.getAaveV4SpokeData = getAaveV4SpokeData;
 exports._getAaveV4AccountData = _getAaveV4AccountData;
@@ -19,12 +53,14 @@ exports.getAaveV4AccountData = getAaveV4AccountData;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const viem_1 = require("../services/viem");
-const common_1 = require("../types/common");
+const types_1 = require("../types");
 const contracts_1 = require("../contracts");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const aaveV4Helpers_1 = require("../helpers/aaveV4Helpers");
 const aaveV4_1 = require("../markets/aaveV4");
+const moneymarket_1 = require("../moneymarket");
+exports.lend = __importStar(require("./lend"));
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
     return {
@@ -32,12 +68,71 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
             acc[assetOnChainData.assetId] = {
                 assetId: assetOnChainData.assetId,
                 drawnRate: assetOnChainData.drawnRate,
+                liquidity: assetOnChainData.liquidity,
+                liquidityFee: assetOnChainData.liquidityFee,
+                swept: assetOnChainData.swept,
+                totalDrawn: assetOnChainData.totalDrawn,
+                totalDrawnShares: assetOnChainData.totalDrawnShares,
+                totalPremiumShares: assetOnChainData.totalPremiumShares,
             };
             return acc;
         }, {}),
     };
 });
+const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
+    const collaterals = [];
+    const debts = [];
+    Object.entries(usedAssets).forEach(([identifier, asset]) => {
+        const reserveData = assetsData[identifier];
+        if (!reserveData)
+            return;
+        const borrowedUsdDec = new decimal_js_1.default(asset.borrowedUsd || '0');
+        if (asset.isBorrowed && borrowedUsdDec.gt(0)) {
+            debts.push({ valueUsd: borrowedUsdDec });
+        }
+        const suppliedUsdDec = new decimal_js_1.default(asset.suppliedUsd || '0');
+        const isActiveCollateral = asset.collateral
+            && asset.isSupplied
+            && asset.collateralFactor > 0
+            && suppliedUsdDec.gt(0);
+        if (isActiveCollateral) {
+            // collateralRisk is stored as a fraction (e.g. 0.25), convert back to bps
+            const riskBps = new decimal_js_1.default(reserveData.collateralRisk).mul(10000).toNumber();
+            collaterals.push({
+                riskBps,
+                valueUsd: suppliedUsdDec,
+            });
+        }
+    });
+    const totalDebtUsd = debts.reduce((sum, d) => sum.add(d.valueUsd), new decimal_js_1.default(0));
+    if (totalDebtUsd.lte(0)) {
+        return 0;
+    }
+    // sort by risk ASC, value DESC
+    collaterals.sort((a, b) => {
+        if (a.riskBps !== b.riskBps)
+            return a.riskBps - b.riskBps;
+        return b.valueUsd.comparedTo(a.valueUsd);
+    });
+    let debtLeftToCover = totalDebtUsd;
+    let numerator = new decimal_js_1.default(0); // sum(coveredUsd * riskBps)
+    let coveredDebt = new decimal_js_1.default(0); // sum(coveredUsd)
+    collaterals.forEach(({ riskBps, valueUsd }) => {
+        if (debtLeftToCover.lte(0))
+            return;
+        const coveredUsd = decimal_js_1.default.min(valueUsd, debtLeftToCover);
+        numerator = numerator.add(coveredUsd.mul(riskBps));
+        coveredDebt = coveredDebt.add(coveredUsd);
+        debtLeftToCover = debtLeftToCover.sub(coveredUsd);
+    });
+    if (coveredDebt.lte(0)) {
+        return 0;
+    }
+    const riskPremiumBps = numerator.div(coveredDebt);
+    return riskPremiumBps.toNumber();
+};
 const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f;
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(reserveAsset.underlying, network);
     const symbol = (0, utils_1.wethToEth)(assetInfo.symbol);
     const hubInfo = (0, aaveV4_1.getAaveV4HubByAddress)(network, reserveAsset.hub);
@@ -52,7 +147,7 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         supplyIncentives.push({
             apy: yieldApy,
             token: symbol,
-            incentiveKind: common_1.IncentiveKind.Staking,
+            incentiveKind: types_1.IncentiveKind.Staking,
             description: `Native ${symbol} yield.`,
         });
         if (reserveAsset.borrowable) {
@@ -60,11 +155,31 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
             borrowIncentives.push({
                 apy: new decimal_js_1.default(yieldApy).mul(-1).toString(),
                 token: symbol,
-                incentiveKind: common_1.IncentiveKind.Reward,
+                incentiveKind: types_1.IncentiveKind.Reward,
                 description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
             });
         }
     }
+    const totalSuppliedRaw = (_a = reserveAsset.totalSupplied) !== null && _a !== void 0 ? _a : 0;
+    const totalDrawnRaw = (_b = reserveAsset.totalDrawn) !== null && _b !== void 0 ? _b : 0;
+    const totalPremiumRaw = (_c = reserveAsset.totalPremium) !== null && _c !== void 0 ? _c : 0;
+    const totalDebtRaw = (_d = reserveAsset.totalDebt) !== null && _d !== void 0 ? _d : 0;
+    const supplyCapRaw = (_e = reserveAsset.supplyCap) !== null && _e !== void 0 ? _e : 0;
+    const borrowCapRaw = (_f = reserveAsset.borrowCap) !== null && _f !== void 0 ? _f : 0;
+    /** @DEV Hub related calculations */
+    const drawnRate = new decimal_js_1.default(hubAsset.drawnRate.toString()).div(new decimal_js_1.default(10).pow(27));
+    const borrowApr = drawnRate.mul(100);
+    const totalDrawn = new decimal_js_1.default(hubAsset.totalDrawn.toString());
+    const liquidity = new decimal_js_1.default(hubAsset.liquidity.toString());
+    const swept = new decimal_js_1.default(hubAsset.swept.toString());
+    const hubUtilization = totalDrawn.div(totalDrawn.add(swept).add(liquidity));
+    const liquidityFee = new decimal_js_1.default(hubAsset.liquidityFee.toString()).div(new decimal_js_1.default(10).pow(4));
+    const totalDrawnShares = new decimal_js_1.default(hubAsset.totalDrawnShares.toString());
+    const totalPremiumShares = new decimal_js_1.default(hubAsset.totalPremiumShares.toString());
+    // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
+    // TODO JKJ@JK when we confirm that this is the right way to calculate it
+    const premiumMultiplier = totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
+    const supplyApr = borrowApr.mul(hubUtilization).mul(new decimal_js_1.default(1).minus(liquidityFee));
     return ({
         symbol,
         underlying: reserveAsset.underlying,
@@ -79,16 +194,17 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         collateralFactor: new decimal_js_1.default(reserveAsset.collateralFactor).div(10000).toNumber(),
         liquidationFee: new decimal_js_1.default(reserveAsset.liquidationFee).div(10000).toNumber(),
         price: new decimal_js_1.default(reserveAsset.price).div(new decimal_js_1.default(10).pow(oracleDecimals)).toString(),
-        totalSupplied: (0, tokens_1.assetAmountInEth)(reserveAsset.totalSupplied.toString(), symbol),
-        totalDrawn: (0, tokens_1.assetAmountInEth)(reserveAsset.totalDrawn.toString(), symbol),
-        totalPremium: (0, tokens_1.assetAmountInEth)(reserveAsset.totalPremium.toString(), symbol),
-        totalDebt: (0, tokens_1.assetAmountInEth)(reserveAsset.totalDebt.toString(), symbol),
-        supplyCap: (0, tokens_1.assetAmountInEth)(reserveAsset.supplyCap.toString(), symbol),
-        borrowCap: (0, tokens_1.assetAmountInEth)(reserveAsset.borrowCap.toString(), symbol),
+        totalSupplied: (0, tokens_1.assetAmountInEth)(totalSuppliedRaw.toString(), symbol),
+        totalDrawn: (0, tokens_1.assetAmountInEth)(totalDrawnRaw.toString(), symbol),
+        totalPremium: (0, tokens_1.assetAmountInEth)(totalPremiumRaw.toString(), symbol),
+        totalDebt: (0, tokens_1.assetAmountInEth)(totalDebtRaw.toString(), symbol),
+        supplyCap: (0, tokens_1.assetAmountInEth)(supplyCapRaw.toString(), symbol),
+        borrowCap: (0, tokens_1.assetAmountInEth)(borrowCapRaw.toString(), symbol),
         spokeActive: reserveAsset.spokeActive,
         spokeHalted: reserveAsset.spokeHalted,
-        drawnRate: new decimal_js_1.default(hubAsset.drawnRate).div(new decimal_js_1.default(10).pow(27)).toString(),
-        supplyRate: '0', // To be implemented
+        drawnRate: drawnRate.toString(),
+        borrowRate: (0, moneymarket_1.aprToApy)(borrowApr.toString()),
+        supplyRate: (0, moneymarket_1.aprToApy)(supplyApr.toString()),
         supplyIncentives,
         borrowIncentives,
         canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
@@ -158,13 +274,16 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
             };
             return acc;
         }, {});
-        return Object.assign({ usedAssets,
-            healthFactor }, (0, aaveV4Helpers_1.aaveV4GetAggregatedPositionData)({
+        const aggregated = (0, aaveV4Helpers_1.aaveV4GetAggregatedPositionData)({
             usedAssets,
             assetsData: spokeData.assetsData,
             network,
             useUserCollateralFactor: true,
-        }));
+        });
+        const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, spokeData.assetsData);
+        return Object.assign(Object.assign({}, aggregated), { usedAssets,
+            healthFactor,
+            riskPremiumBps });
     });
 }
 function getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {

package/cjs/aaveV4/lend.d.ts

@@ -0,0 +1,45 @@
+import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+export interface AaveV4TokenizationSpokeData {
+    underlyingAsset: EthAddress;
+    assetId: string;
+    decimals: number;
+    spoke: EthAddress;
+    spokeActive: boolean;
+    spokeHalted: boolean;
+    spokeDepositCap: string;
+    spokeTotalAssets: string;
+    spokeTotalShares: string;
+    hub: EthAddress;
+    hubLiquidity: string;
+    hubDrawnRate: string;
+    convertToShares: string;
+    convertToAssets: string;
+    user: EthAddress;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+}
+export declare const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress>;
+export declare const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>>;
+export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME';
+export declare const aaveV4GetTokenizedHubKey: (hubNameOrKey?: string | null) => AaveV4TokenizedHubKey | null;
+export declare const aaveV4GetTokenizedVaultKey: (symbol: string, hubNameOrKey?: string | null) => string | null;
+export declare const aaveV4GetTokenizedVaultAddress: (network: NetworkNumber, symbol: string, hubNameOrKey?: string | null) => EthAddress | undefined;
+/** Parsed tokenization spoke data with human-readable supplied amounts for display */
+export interface AaveV4TokenizationSpokeDataParsed {
+    vaultAddress: EthAddress;
+    key: string | null;
+    symbol: string;
+    hubKey: string;
+    userSuppliedAssetsEth: string;
+    userSuppliedSharesEth: string;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+    underlyingAsset: EthAddress;
+    spoke: EthAddress;
+    decimals: number;
+}
+/**
+ * Fetches tokenization vault data for the given user via getTokenizationSpokesData.
+ * Returns parsed data including userSuppliedAssets in human-readable form for each vault.
+ */
+export declare function getAaveV4TokenizationSpokesData(provider: EthereumProvider, network: NetworkNumber, userAddress: EthAddress): Promise<AaveV4TokenizationSpokeDataParsed[]>;

package/cjs/aaveV4/lend.js

@@ -0,0 +1,141 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aaveV4GetTokenizedVaultAddress = exports.aaveV4GetTokenizedVaultKey = exports.aaveV4GetTokenizedHubKey = exports.AAVE_V4_TOKENIZED_SPOKE_ADDRESSES = exports.AAVE_V4_TOKENIZED_SPOKES = void 0;
+exports.getAaveV4TokenizationSpokesData = getAaveV4TokenizationSpokesData;
+const tokens_1 = require("@defisaver/tokens");
+const contracts_1 = require("../contracts");
+const viem_1 = require("../services/viem");
+const utils_1 = require("../services/utils");
+const common_1 = require("../types/common");
+exports.AAVE_V4_TOKENIZED_SPOKES = {
+    AAVE_CORE: '0x08309234884cF7E015b07Bf22569017Aa035cdeF',
+    EURC_CORE: '0x73596dED4B2Eb0aC85e477b3c8dB56FC427E6774',
+    GHO_CORE: '0xf7E1f1b43922527e5054bD77E7f863Cf182b194D',
+    GHO_PRIME: '0xeF1cAd5c6a2C9cb83c952b4B96bbD35b3F61F18f',
+    LBTC_CORE: '0x8f4D423590F22833131e3493bf67A27213398f8e',
+    LINK_CORE: '0xBE1197750b423e30137E97d9183065d33E903BE6',
+    PT_USDe_PLUS: '0x8cA27Ab284F2aA2BcF33D9129e11c101aD2d16de',
+    PT_sUSDe_PLUS: '0xb8A464EC56071a98c854f30fE19CfeCc41FA6233',
+    PYUSD_CORE: '0x203FB463087005698d50768FcA837047f738632d',
+    RLUSD_CORE: '0xa9afdd0c54fb153CaE39cE86E49626B5e9d15513',
+    USDC_CORE: '0xa2e476f4cbB06C7bFA8Ad51bCcbF198cd32CfD35',
+    USDC_PLUS: '0x320Bec4fB7a25e64c003A007D0AeF7AB3D6C30d7',
+    USDC_PRIME: '0x0A0507F7A1129892b5cf74b8B4e911442c466b87',
+    USDG_CORE: '0x87c224256f09a014C1BC3e9FbB094C3AdD8fBaCC',
+    USDT_CORE: '0x3f12BD5999b9172550893FF52691c980676f9E73',
+    USDT_PLUS: '0xa4E74a78bED2d3ab8971e8AB26fb39f26DD8eEd9',
+    USDT_PRIME: '0xF565fB55bc96d65561887898bfeb25C1dE7e06d2',
+    USDe_PLUS: '0xA0d346ab2699B689AC67aba5174164A84206BB73',
+    WBTC_CORE: '0x837Ab872A665e0CF467d41cF56a054031b4A38bc',
+    WBTC_PRIME: '0xeae98b8a1798738182B2123DF1eB93d97BD29F34',
+    WETH_CORE: '0x3961a75099E986F59a1a31c6f945061641dFD2b2',
+    WETH_PRIME: '0xa411826a6ef5d289c0FAa7d5B45FE8aAB52257F6',
+    XAUt_CORE: '0x470341bC0e2B833C54D0120642713BdF762A494F',
+    cbBTC_CORE: '0xe8D5E595d5b6b5EFf84B7064765fd0e8DfD214C9',
+    cbBTC_PRIME: '0x0E986545150DcDDe46Ea9df355D0fD2af33bd75D',
+    frxUSD_CORE: '0x00C8A6a42947Cc4E7B6f27963Cab0143ccaaD2B5',
+    frxUSD_PLUS: '0xCAB288d37CAb5a9db7b503F086455276Dcde61F1',
+    rsETH_CORE: '0x6eEce89caE2163584bA7Ff9743861B9633c245E0',
+    sUSDe_PLUS: '0xdf47fc43c88B06edC47753b7d647ff18037D2F3d',
+    weETH_CORE: '0xB67F20bFF413C8E5d633B54BD28899c4c9e33ed0',
+    wstETH_CORE: '0x474602394d0B02F43AC3D7C8c5cFc0814b03fd40',
+    wstETH_PRIME: '0xAcCdAb49ECB9A801CfF62a92fc80D52339b33770',
+};
+exports.AAVE_V4_TOKENIZED_SPOKE_ADDRESSES = {
+    [common_1.NetworkNumber.Eth]: Object.values(exports.AAVE_V4_TOKENIZED_SPOKES),
+};
+const aaveV4GetTokenizedHubKey = (hubNameOrKey) => {
+    if (!hubNameOrKey)
+        return null;
+    const normalized = hubNameOrKey.trim().toUpperCase();
+    // TODO AaveV4 Maybe turn into constants
+    if (normalized === 'CORE' || normalized === 'CORE HUB')
+        return 'CORE';
+    if (normalized === 'PLUS' || normalized === 'PLUS HUB')
+        return 'PLUS';
+    if (normalized === 'PRIME' || normalized === 'PRIME HUB')
+        return 'PRIME';
+    if (normalized.includes('CORE'))
+        return 'CORE';
+    if (normalized.includes('PLUS'))
+        return 'PLUS';
+    if (normalized.includes('PRIME'))
+        return 'PRIME';
+    return null;
+};
+exports.aaveV4GetTokenizedHubKey = aaveV4GetTokenizedHubKey;
+const aaveV4GetTokenizedVaultKey = (symbol, hubNameOrKey) => {
+    if (!symbol)
+        return null;
+    const hubKey = (0, exports.aaveV4GetTokenizedHubKey)(hubNameOrKey);
+    if (!hubKey)
+        return null;
+    const normalizedSymbol = symbol.trim().replace(/-/g, '_');
+    return `${normalizedSymbol}_${hubKey}`;
+};
+exports.aaveV4GetTokenizedVaultKey = aaveV4GetTokenizedVaultKey;
+const aaveV4GetTokenizedVaultAddress = (network, symbol, hubNameOrKey) => {
+    if (network !== common_1.NetworkNumber.Eth)
+        return undefined;
+    const key = (0, exports.aaveV4GetTokenizedVaultKey)(symbol, hubNameOrKey);
+    if (!key)
+        return undefined;
+    return exports.AAVE_V4_TOKENIZED_SPOKES[key];
+};
+exports.aaveV4GetTokenizedVaultAddress = aaveV4GetTokenizedVaultAddress;
+const AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY = Object.entries(exports.AAVE_V4_TOKENIZED_SPOKES).reduce((acc, [k, v]) => {
+    acc[v.toLowerCase()] = k;
+    return acc;
+}, {});
+/**
+ * Fetches tokenization vault data for the given user via getTokenizationSpokesData.
+ * Returns parsed data including userSuppliedAssets in human-readable form for each vault.
+ */
+function getAaveV4TokenizationSpokesData(provider, network, userAddress) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const spokes = (_a = exports.AAVE_V4_TOKENIZED_SPOKE_ADDRESSES[network]) !== null && _a !== void 0 ? _a : [];
+        if (spokes.length === 0)
+            return [];
+        const client = (0, viem_1.getViemProvider)(provider, network);
+        const viewContract = (0, contracts_1.AaveV4ViewContractViem)(client, network);
+        const raw = yield viewContract.read.getTokenizationSpokesData([spokes, userAddress]);
+        return raw.map((r, i) => {
+            var _a, _b, _c, _d, _e;
+            const vaultAddress = spokes[i];
+            const key = (_a = AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY[vaultAddress.toLowerCase()]) !== null && _a !== void 0 ? _a : null;
+            const symbol = (0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(r.underlyingAsset, network).symbol);
+            if (symbol === '?') { // unsupported asset
+                return null;
+            }
+            const hubKey = key ? (_b = key.split('_').pop()) !== null && _b !== void 0 ? _b : '' : '';
+            const decimals = Number((_c = r.decimals) !== null && _c !== void 0 ? _c : 18);
+            const userSuppliedAssetsRaw = (_d = r.userSuppliedAssets) !== null && _d !== void 0 ? _d : 0;
+            const userSuppliedSharesRaw = (_e = r.userSuppliedShares) !== null && _e !== void 0 ? _e : 0;
+            const userSuppliedAssetsEth = (0, tokens_1.assetAmountInEth)(userSuppliedAssetsRaw.toString(), symbol);
+            const userSuppliedSharesEth = (0, tokens_1.assetAmountInEth)(userSuppliedSharesRaw.toString(), symbol);
+            return {
+                vaultAddress,
+                key,
+                symbol,
+                hubKey,
+                userSuppliedAssetsEth,
+                userSuppliedSharesEth,
+                userSuppliedAssets: userSuppliedAssetsRaw.toString(),
+                userSuppliedShares: userSuppliedSharesRaw.toString(),
+                underlyingAsset: r.underlyingAsset,
+                spoke: r.spoke,
+                decimals,
+            };
+        }).filter(item => item != null);
+    });
+}

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

@@ -1,5 +1,4 @@
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets } from '../../types';
-import { LeverageType, NetworkNumber } from '../../types/common';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, LeverageType, NetworkNumber } from '../../types';
 export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
 export declare const isLeveragedPosAaveV4: (usedAssets: AaveV4UsedReserveAssets, dustLimit?: number) => {
     leveragedType: LeverageType;

package/cjs/helpers/aaveV4Helpers/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aaveV4GetAggregatedPositionData = exports.isLeveragedPosAaveV4 = exports.aaveV4GetCollateralFactor = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
-const common_1 = require("../../types/common");
+const types_1 = require("../../types");
 const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
 exports.aaveV4GetCollateralFactor = aaveV4GetCollateralFactor;
 const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
@@ -38,24 +38,24 @@ const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
     if (isLong) {
         return {
-            leveragedType: common_1.LeverageType.Long,
+            leveragedType: types_1.LeverageType.Long,
             leveragedAsset: longAsset,
         };
     }
     if (isShort) {
         return {
-            leveragedType: common_1.LeverageType.Short,
+            leveragedType: types_1.LeverageType.Short,
             leveragedAsset: shortAsset,
         };
     }
     if (isVolatilePair) {
         return {
-            leveragedType: common_1.LeverageType.VolatilePair,
+            leveragedType: types_1.LeverageType.VolatilePair,
             leveragedAsset: longAsset,
         };
     }
     return {
-        leveragedType: common_1.LeverageType.None,
+        leveragedType: types_1.LeverageType.None,
         leveragedAsset: '',
     };
 };
@@ -82,13 +82,13 @@ const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useU
     if (leveragedType !== '') {
         const leveragedAssetData = assetsData[leveragedAsset];
         let assetPrice = (leveragedAssetData === null || leveragedAssetData === void 0 ? void 0 : leveragedAssetData.price) || '0';
-        if (leveragedType === common_1.LeverageType.VolatilePair) {
+        if (leveragedType === types_1.LeverageType.VolatilePair) {
             const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
             const borrowedAssetPrice = assetsData[`${borrowedAsset.symbol}-${borrowedAsset.reserveId}`].price;
             const leveragedAssetPrice = assetsData[leveragedAsset].price;
             const isReverse = new decimal_js_1.default(leveragedAssetPrice).lt(borrowedAssetPrice);
             if (isReverse) {
-                payload.leveragedType = common_1.LeverageType.VolatilePairReverse;
+                payload.leveragedType = types_1.LeverageType.VolatilePairReverse;
                 payload.currentVolatilePairRatio = new decimal_js_1.default(borrowedAssetPrice).div(leveragedAssetPrice).toDP(18).toString();
                 assetPrice = new decimal_js_1.default(borrowedAssetPrice).div(assetPrice).toString();
             }

package/cjs/types/aaveV4.d.ts

@@ -22,6 +22,12 @@ export interface AaveV4HubInfo {
 export interface AaveV4HubAssetOnChainData {
     assetId: number;
     drawnRate: bigint;
+    liquidity: bigint;
+    liquidityFee: number;
+    swept: bigint;
+    totalDrawn: bigint;
+    totalDrawnShares: bigint;
+    totalPremiumShares: bigint;
 }
 export interface AaveV4HubOnChainData {
     assets: Record<number, AaveV4HubAssetOnChainData>;
@@ -87,6 +93,7 @@ export interface AaveV4ReserveAssetData {
     spokeHalted: boolean;
     drawnRate: string;
     supplyRate: string;
+    borrowRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
     canBeBorrowed: boolean;
@@ -142,4 +149,5 @@ export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
 export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
     usedAssets: AaveV4UsedReserveAssets;
     healthFactor: string;
+    riskPremiumBps: number;
 }

package/esm/aaveV4/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo } from '../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
+export * as lend from './lend';
 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>;