@defisaver/positions-sdk 2.1.105 → 2.1.106

package/cjs/aaveV4/index.js

@@ -86,6 +86,9 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
 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);
+    // `@defisaver/tokens` returns a placeholder ('?', decimals NaN) when the underlying is not in the
+    // tokens package. Flag it so consumers can render it read-only instead of feeding NaN into amounts.
+    const isUnsupported = assetInfo.symbol === '?';
     const symbol = (0, utils_1.wethToEth)(assetInfo.symbol);
     const hubInfo = (0, aaveV4_1.getAaveV4HubByAddress)(network, reserveAsset.hub);
     if (!hubInfo) {
@@ -132,10 +135,23 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
     const premiumMultiplier = totalDrawnShares.isZero() ? new decimal_js_1.default(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
     const supplyApr = borrowApr.mul(hubUtilization).mul(premiumMultiplier).mul(new decimal_js_1.default(1).minus(liquidityFee));
     const utilization = hubUtilization.times(100).toString();
+    // For unsupported assets `symbol` is '?' (decimals NaN in `@defisaver/tokens`), so the
+    // symbol-based conversion would produce NaN. Fall back to the on-chain `decimals` so the reserve
+    // still shows correct amounts (and feeds correct USD/ratio/liquidation math) in read-only mode.
+    const toEth = (raw) => {
+        const rawStr = raw.toString();
+        if ((0, utils_1.isMaxUint)(rawStr))
+            return rawStr;
+        if (isUnsupported)
+            return new decimal_js_1.default(rawStr || 0).div(new decimal_js_1.default(10).pow(reserveAsset.decimals)).toString();
+        return (0, tokens_1.assetAmountInEth)(rawStr, symbol);
+    };
     const hubLiquidityRaw = hubAsset.liquidity;
-    const hubLiquidity = (0, utils_1.isMaxUint)(hubLiquidityRaw.toString()) ? hubLiquidityRaw.toString() : (0, tokens_1.assetAmountInEth)(hubLiquidityRaw.toString(), symbol);
+    const hubLiquidity = toEth(hubLiquidityRaw.toString());
     return ({
         symbol,
+        decimals: reserveAsset.decimals,
+        isUnsupported,
         underlying: reserveAsset.underlying,
         hub: hubInfo.address,
         hubName: hubInfo === null || hubInfo === void 0 ? void 0 : hubInfo.label,
@@ -149,12 +165,12 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         liquidationFee: new decimal_js_1.default(reserveAsset.liquidationFee).div(10000).toNumber(),
         maxLiquidationBonus: new decimal_js_1.default(reserveAsset.maxLiquidationBonus).div(10000).toNumber(),
         price: new decimal_js_1.default(reserveAsset.price).div(new decimal_js_1.default(10).pow(oracleDecimals)).toString(),
-        totalSupplied: (0, utils_1.isMaxUint)(totalSuppliedRaw.toString()) ? totalSuppliedRaw.toString() : (0, tokens_1.assetAmountInEth)(totalSuppliedRaw.toString(), symbol),
-        totalDrawn: (0, utils_1.isMaxUint)(totalDrawnRaw.toString()) ? totalDrawnRaw.toString() : (0, tokens_1.assetAmountInEth)(totalDrawnRaw.toString(), symbol),
-        totalPremium: (0, utils_1.isMaxUint)(totalPremiumRaw.toString()) ? totalPremiumRaw.toString() : (0, tokens_1.assetAmountInEth)(totalPremiumRaw.toString(), symbol),
-        totalDebt: (0, utils_1.isMaxUint)(totalDebtRaw.toString()) ? totalDebtRaw.toString() : (0, tokens_1.assetAmountInEth)(totalDebtRaw.toString(), symbol),
-        supplyCap: (0, utils_1.isMaxUint)(supplyCapRaw.toString()) ? supplyCapRaw.toString() : (0, tokens_1.assetAmountInEth)(supplyCapRaw.toString(), symbol),
-        borrowCap: (0, utils_1.isMaxUint)(borrowCapRaw.toString()) ? borrowCapRaw.toString() : (0, tokens_1.assetAmountInEth)(borrowCapRaw.toString(), symbol),
+        totalSupplied: toEth(totalSuppliedRaw.toString()),
+        totalDrawn: toEth(totalDrawnRaw.toString()),
+        totalPremium: toEth(totalPremiumRaw.toString()),
+        totalDebt: toEth(totalDebtRaw.toString()),
+        supplyCap: toEth(supplyCapRaw.toString()),
+        borrowCap: toEth(borrowCapRaw.toString()),
         spokeActive: reserveAsset.spokeActive,
         spokeHalted: reserveAsset.spokeHalted,
         drawnRate: drawnRate.toString(),
@@ -162,10 +178,10 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         supplyRate: (0, moneymarket_1.aprToApy)(supplyApr.toString()),
         supplyIncentives,
         borrowIncentives,
-        canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen && reserveAsset.borrowable,
-        canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
-        canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-        canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+        canBeBorrowed: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen && reserveAsset.borrowable,
+        canBeSupplied: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
+        canBeWithdrawn: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+        canBePayBacked: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
         utilization,
         hubLiquidity,
         premiumMultiplier: premiumMultiplier.toString(),
@@ -208,17 +224,33 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
         const healthFactorFromContract = new decimal_js_1.default(loanData.healthFactor.toString());
         const healthFactor = (0, utils_1.isMaxUint)(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
-            const identifier = `${(0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
+            var _a, _b, _c, _d;
+            const assetInfo = (0, tokens_1.getAssetInfoByAddress)(usedReserveAsset.underlying, network);
+            const isUnsupported = assetInfo.symbol === '?';
+            const symbol = (0, utils_1.wethToEth)(assetInfo.symbol);
+            const identifier = `${symbol}-${+usedReserveAsset.reserveId.toString()}`;
             const reserveData = spokeData.assetsData[identifier];
-            const price = reserveData.price;
-            const supplied = (0, utils_1.isMaxUint)(usedReserveAsset.supplied.toString()) ? usedReserveAsset.supplied.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.supplied.toString(), reserveData.symbol);
-            const drawn = (0, utils_1.isMaxUint)(usedReserveAsset.drawn.toString()) ? usedReserveAsset.drawn.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.drawn.toString(), reserveData.symbol);
-            const premium = (0, utils_1.isMaxUint)(usedReserveAsset.premium.toString()) ? usedReserveAsset.premium.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.premium.toString(), reserveData.symbol);
-            const borrowed = (0, utils_1.isMaxUint)(usedReserveAsset.totalDebt.toString()) ? usedReserveAsset.totalDebt.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+            const price = (_a = reserveData === null || reserveData === void 0 ? void 0 : reserveData.price) !== null && _a !== void 0 ? _a : '0';
+            // For unsupported assets the symbol-based conversion yields NaN, so use the on-chain decimals
+            // from the reserve data instead. If the reserve is missing entirely we can't convert, so fall
+            // back to '0' and keep the entry read-only.
+            const toEth = (raw) => {
+                if ((0, utils_1.isMaxUint)(raw))
+                    return raw;
+                if (!reserveData)
+                    return '0';
+                if (isUnsupported)
+                    return new decimal_js_1.default(raw || 0).div(new decimal_js_1.default(10).pow(reserveData.decimals)).toString();
+                return (0, tokens_1.assetAmountInEth)(raw, reserveData.symbol);
+            };
+            const supplied = toEth(usedReserveAsset.supplied.toString());
+            const drawn = toEth(usedReserveAsset.drawn.toString());
+            const premium = toEth(usedReserveAsset.premium.toString());
+            const borrowed = toEth(usedReserveAsset.totalDebt.toString());
             acc[identifier] = {
-                symbol: reserveData.symbol,
-                hubName: reserveData.hubName,
-                assetId: reserveData.assetId,
+                symbol: (_b = reserveData === null || reserveData === void 0 ? void 0 : reserveData.symbol) !== null && _b !== void 0 ? _b : symbol,
+                hubName: (_c = reserveData === null || reserveData === void 0 ? void 0 : reserveData.hubName) !== null && _c !== void 0 ? _c : '',
+                assetId: (_d = reserveData === null || reserveData === void 0 ? void 0 : reserveData.assetId) !== null && _d !== void 0 ? _d : 0,
                 reserveId: +usedReserveAsset.reserveId.toString(),
                 supplied,
                 suppliedUsd: new decimal_js_1.default(supplied).mul(price).toString(),
@@ -232,6 +264,7 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
                 isBorrowed: usedReserveAsset.isBorrowing,
                 collateral: usedReserveAsset.isUsingAsCollateral,
                 collateralFactor: new decimal_js_1.default(usedReserveAsset.collateralFactor).div(10000).toNumber(),
+                isUnsupported: isUnsupported || !reserveData,
             };
             return acc;
         }, {});

package/cjs/types/aaveV4.d.ts

@@ -74,6 +74,8 @@ export interface AaveV4ReserveAssetOnChain {
 }
 export interface AaveV4ReserveAssetData {
     symbol: string;
+    /** Underlying token decimals as reported on-chain (independent of `@defisaver/tokens`). */
+    decimals: number;
     underlying: EthAddress;
     hub: EthAddress;
     hubName: string;
@@ -119,6 +121,11 @@ export interface AaveV4ReserveAssetData {
     hubLiquidity: string;
     premiumMultiplier: string;
     liquidityFee: string;
+    /**
+     * True when the underlying token is missing from `@defisaver/tokens` (placeholder `?` asset).
+     * The reserve is kept for read-only display, but amounts are zeroed and all actions are disabled.
+     */
+    isUnsupported?: boolean;
 }
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4UsedReserveAsset {
@@ -138,6 +145,8 @@ export interface AaveV4UsedReserveAsset {
     isBorrowed: boolean;
     collateral: boolean;
     collateralFactor: number;
+    /** True when the underlying token is missing from `@defisaver/tokens` (placeholder `?` asset). */
+    isUnsupported?: boolean;
 }
 export interface AaveV4AggregatedPositionData {
     suppliedUsd: string;

package/esm/aaveV4/index.js

@@ -41,6 +41,9 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
 const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e, _f;
     const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
+    // `@defisaver/tokens` returns a placeholder ('?', decimals NaN) when the underlying is not in the
+    // tokens package. Flag it so consumers can render it read-only instead of feeding NaN into amounts.
+    const isUnsupported = assetInfo.symbol === '?';
     const symbol = wethToEth(assetInfo.symbol);
     const hubInfo = getAaveV4HubByAddress(network, reserveAsset.hub);
     if (!hubInfo) {
@@ -87,10 +90,23 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
     const premiumMultiplier = totalDrawnShares.isZero() ? new Dec(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
     const supplyApr = borrowApr.mul(hubUtilization).mul(premiumMultiplier).mul(new Dec(1).minus(liquidityFee));
     const utilization = hubUtilization.times(100).toString();
+    // For unsupported assets `symbol` is '?' (decimals NaN in `@defisaver/tokens`), so the
+    // symbol-based conversion would produce NaN. Fall back to the on-chain `decimals` so the reserve
+    // still shows correct amounts (and feeds correct USD/ratio/liquidation math) in read-only mode.
+    const toEth = (raw) => {
+        const rawStr = raw.toString();
+        if (isMaxUint(rawStr))
+            return rawStr;
+        if (isUnsupported)
+            return new Dec(rawStr || 0).div(new Dec(10).pow(reserveAsset.decimals)).toString();
+        return assetAmountInEth(rawStr, symbol);
+    };
     const hubLiquidityRaw = hubAsset.liquidity;
-    const hubLiquidity = isMaxUint(hubLiquidityRaw.toString()) ? hubLiquidityRaw.toString() : assetAmountInEth(hubLiquidityRaw.toString(), symbol);
+    const hubLiquidity = toEth(hubLiquidityRaw.toString());
     return ({
         symbol,
+        decimals: reserveAsset.decimals,
+        isUnsupported,
         underlying: reserveAsset.underlying,
         hub: hubInfo.address,
         hubName: hubInfo === null || hubInfo === void 0 ? void 0 : hubInfo.label,
@@ -104,12 +120,12 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
         maxLiquidationBonus: new Dec(reserveAsset.maxLiquidationBonus).div(10000).toNumber(),
         price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-        totalSupplied: isMaxUint(totalSuppliedRaw.toString()) ? totalSuppliedRaw.toString() : assetAmountInEth(totalSuppliedRaw.toString(), symbol),
-        totalDrawn: isMaxUint(totalDrawnRaw.toString()) ? totalDrawnRaw.toString() : assetAmountInEth(totalDrawnRaw.toString(), symbol),
-        totalPremium: isMaxUint(totalPremiumRaw.toString()) ? totalPremiumRaw.toString() : assetAmountInEth(totalPremiumRaw.toString(), symbol),
-        totalDebt: isMaxUint(totalDebtRaw.toString()) ? totalDebtRaw.toString() : assetAmountInEth(totalDebtRaw.toString(), symbol),
-        supplyCap: isMaxUint(supplyCapRaw.toString()) ? supplyCapRaw.toString() : assetAmountInEth(supplyCapRaw.toString(), symbol),
-        borrowCap: isMaxUint(borrowCapRaw.toString()) ? borrowCapRaw.toString() : assetAmountInEth(borrowCapRaw.toString(), symbol),
+        totalSupplied: toEth(totalSuppliedRaw.toString()),
+        totalDrawn: toEth(totalDrawnRaw.toString()),
+        totalPremium: toEth(totalPremiumRaw.toString()),
+        totalDebt: toEth(totalDebtRaw.toString()),
+        supplyCap: toEth(supplyCapRaw.toString()),
+        borrowCap: toEth(borrowCapRaw.toString()),
         spokeActive: reserveAsset.spokeActive,
         spokeHalted: reserveAsset.spokeHalted,
         drawnRate: drawnRate.toString(),
@@ -117,10 +133,10 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         supplyRate: aprToApy(supplyApr.toString()),
         supplyIncentives,
         borrowIncentives,
-        canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen && reserveAsset.borrowable,
-        canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
-        canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-        canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+        canBeBorrowed: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen && reserveAsset.borrowable,
+        canBeSupplied: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
+        canBeWithdrawn: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+        canBePayBacked: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
         utilization,
         hubLiquidity,
         premiumMultiplier: premiumMultiplier.toString(),
@@ -163,17 +179,33 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
         const healthFactorFromContract = new Dec(loanData.healthFactor.toString());
         const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
         const usedAssets = loanData.reserves.reduce((acc, usedReserveAsset) => {
-            const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
+            var _a, _b, _c, _d;
+            const assetInfo = getAssetInfoByAddress(usedReserveAsset.underlying, network);
+            const isUnsupported = assetInfo.symbol === '?';
+            const symbol = wethToEth(assetInfo.symbol);
+            const identifier = `${symbol}-${+usedReserveAsset.reserveId.toString()}`;
             const reserveData = spokeData.assetsData[identifier];
-            const price = reserveData.price;
-            const supplied = isMaxUint(usedReserveAsset.supplied.toString()) ? usedReserveAsset.supplied.toString() : assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
-            const drawn = isMaxUint(usedReserveAsset.drawn.toString()) ? usedReserveAsset.drawn.toString() : assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
-            const premium = isMaxUint(usedReserveAsset.premium.toString()) ? usedReserveAsset.premium.toString() : assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
-            const borrowed = isMaxUint(usedReserveAsset.totalDebt.toString()) ? usedReserveAsset.totalDebt.toString() : assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+            const price = (_a = reserveData === null || reserveData === void 0 ? void 0 : reserveData.price) !== null && _a !== void 0 ? _a : '0';
+            // For unsupported assets the symbol-based conversion yields NaN, so use the on-chain decimals
+            // from the reserve data instead. If the reserve is missing entirely we can't convert, so fall
+            // back to '0' and keep the entry read-only.
+            const toEth = (raw) => {
+                if (isMaxUint(raw))
+                    return raw;
+                if (!reserveData)
+                    return '0';
+                if (isUnsupported)
+                    return new Dec(raw || 0).div(new Dec(10).pow(reserveData.decimals)).toString();
+                return assetAmountInEth(raw, reserveData.symbol);
+            };
+            const supplied = toEth(usedReserveAsset.supplied.toString());
+            const drawn = toEth(usedReserveAsset.drawn.toString());
+            const premium = toEth(usedReserveAsset.premium.toString());
+            const borrowed = toEth(usedReserveAsset.totalDebt.toString());
             acc[identifier] = {
-                symbol: reserveData.symbol,
-                hubName: reserveData.hubName,
-                assetId: reserveData.assetId,
+                symbol: (_b = reserveData === null || reserveData === void 0 ? void 0 : reserveData.symbol) !== null && _b !== void 0 ? _b : symbol,
+                hubName: (_c = reserveData === null || reserveData === void 0 ? void 0 : reserveData.hubName) !== null && _c !== void 0 ? _c : '',
+                assetId: (_d = reserveData === null || reserveData === void 0 ? void 0 : reserveData.assetId) !== null && _d !== void 0 ? _d : 0,
                 reserveId: +usedReserveAsset.reserveId.toString(),
                 supplied,
                 suppliedUsd: new Dec(supplied).mul(price).toString(),
@@ -187,6 +219,7 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
                 isBorrowed: usedReserveAsset.isBorrowing,
                 collateral: usedReserveAsset.isUsingAsCollateral,
                 collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
+                isUnsupported: isUnsupported || !reserveData,
             };
             return acc;
         }, {});

package/esm/types/aaveV4.d.ts

@@ -74,6 +74,8 @@ export interface AaveV4ReserveAssetOnChain {
 }
 export interface AaveV4ReserveAssetData {
     symbol: string;
+    /** Underlying token decimals as reported on-chain (independent of `@defisaver/tokens`). */
+    decimals: number;
     underlying: EthAddress;
     hub: EthAddress;
     hubName: string;
@@ -119,6 +121,11 @@ export interface AaveV4ReserveAssetData {
     hubLiquidity: string;
     premiumMultiplier: string;
     liquidityFee: string;
+    /**
+     * True when the underlying token is missing from `@defisaver/tokens` (placeholder `?` asset).
+     * The reserve is kept for read-only display, but amounts are zeroed and all actions are disabled.
+     */
+    isUnsupported?: boolean;
 }
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4UsedReserveAsset {
@@ -138,6 +145,8 @@ export interface AaveV4UsedReserveAsset {
     isBorrowed: boolean;
     collateral: boolean;
     collateralFactor: number;
+    /** True when the underlying token is missing from `@defisaver/tokens` (placeholder `?` asset). */
+    isUnsupported?: boolean;
 }
 export interface AaveV4AggregatedPositionData {
     suppliedUsd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.105",
+  "version": "2.1.106",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -50,6 +50,9 @@ const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractVi
 
 const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, reserveId: number, oracleDecimals: number, network: NetworkNumber): Promise<AaveV4ReserveAssetData> => {
   const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
+  // `@defisaver/tokens` returns a placeholder ('?', decimals NaN) when the underlying is not in the
+  // tokens package. Flag it so consumers can render it read-only instead of feeding NaN into amounts.
+  const isUnsupported = assetInfo.symbol === '?';
   const symbol = wethToEth(assetInfo.symbol);
   const hubInfo = getAaveV4HubByAddress(network, reserveAsset.hub);
   if (!hubInfo) {
@@ -101,11 +104,23 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
   const supplyApr = borrowApr.mul(hubUtilization).mul(premiumMultiplier).mul(new Dec(1).minus(liquidityFee));
   const utilization = hubUtilization.times(100).toString();
 
+  // For unsupported assets `symbol` is '?' (decimals NaN in `@defisaver/tokens`), so the
+  // symbol-based conversion would produce NaN. Fall back to the on-chain `decimals` so the reserve
+  // still shows correct amounts (and feeds correct USD/ratio/liquidation math) in read-only mode.
+  const toEth = (raw: string | number | bigint) => {
+    const rawStr = raw.toString();
+    if (isMaxUint(rawStr)) return rawStr;
+    if (isUnsupported) return new Dec(rawStr || 0).div(new Dec(10).pow(reserveAsset.decimals)).toString();
+    return assetAmountInEth(rawStr, symbol);
+  };
+
   const hubLiquidityRaw = hubAsset.liquidity;
-  const hubLiquidity = isMaxUint(hubLiquidityRaw.toString()) ? hubLiquidityRaw.toString() : assetAmountInEth(hubLiquidityRaw.toString(), symbol);
+  const hubLiquidity = toEth(hubLiquidityRaw.toString());
 
   return ({
     symbol,
+    decimals: reserveAsset.decimals,
+    isUnsupported,
     underlying: reserveAsset.underlying,
     hub: hubInfo.address,
     hubName: hubInfo?.label,
@@ -119,12 +134,12 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
     maxLiquidationBonus: new Dec(reserveAsset.maxLiquidationBonus).div(10000).toNumber(),
     price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-    totalSupplied: isMaxUint(totalSuppliedRaw.toString()) ? totalSuppliedRaw.toString() : assetAmountInEth(totalSuppliedRaw.toString(), symbol),
-    totalDrawn: isMaxUint(totalDrawnRaw.toString()) ? totalDrawnRaw.toString() : assetAmountInEth(totalDrawnRaw.toString(), symbol),
-    totalPremium: isMaxUint(totalPremiumRaw.toString()) ? totalPremiumRaw.toString() : assetAmountInEth(totalPremiumRaw.toString(), symbol),
-    totalDebt: isMaxUint(totalDebtRaw.toString()) ? totalDebtRaw.toString() : assetAmountInEth(totalDebtRaw.toString(), symbol),
-    supplyCap: isMaxUint(supplyCapRaw.toString()) ? supplyCapRaw.toString() : assetAmountInEth(supplyCapRaw.toString(), symbol),
-    borrowCap: isMaxUint(borrowCapRaw.toString()) ? borrowCapRaw.toString() : assetAmountInEth(borrowCapRaw.toString(), symbol),
+    totalSupplied: toEth(totalSuppliedRaw.toString()),
+    totalDrawn: toEth(totalDrawnRaw.toString()),
+    totalPremium: toEth(totalPremiumRaw.toString()),
+    totalDebt: toEth(totalDebtRaw.toString()),
+    supplyCap: toEth(supplyCapRaw.toString()),
+    borrowCap: toEth(borrowCapRaw.toString()),
     spokeActive: reserveAsset.spokeActive,
     spokeHalted: reserveAsset.spokeHalted,
     drawnRate: drawnRate.toString(),
@@ -132,10 +147,10 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     supplyRate: aprToApy(supplyApr.toString()),
     supplyIncentives,
     borrowIncentives,
-    canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen && reserveAsset.borrowable,
-    canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
-    canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-    canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+    canBeBorrowed: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen && reserveAsset.borrowable,
+    canBeSupplied: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeWithdrawn: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
+    canBePayBacked: !isUnsupported && reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
     utilization,
     hubLiquidity,
     premiumMultiplier: premiumMultiplier.toString(),
@@ -182,17 +197,29 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
   const healthFactorFromContract = new Dec(loanData.healthFactor.toString());
   const healthFactor = isMaxUint(healthFactorFromContract.toString()) ? 'Infinity' : healthFactorFromContract.div(1e18).toString();
   const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
-    const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
+    const assetInfo = getAssetInfoByAddress(usedReserveAsset.underlying, network);
+    const isUnsupported = assetInfo.symbol === '?';
+    const symbol = wethToEth(assetInfo.symbol);
+    const identifier = `${symbol}-${+usedReserveAsset.reserveId.toString()}`;
     const reserveData = spokeData.assetsData[identifier];
-    const price = reserveData.price;
-    const supplied = isMaxUint(usedReserveAsset.supplied.toString()) ? usedReserveAsset.supplied.toString() : assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
-    const drawn = isMaxUint(usedReserveAsset.drawn.toString()) ? usedReserveAsset.drawn.toString() : assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
-    const premium = isMaxUint(usedReserveAsset.premium.toString()) ? usedReserveAsset.premium.toString() : assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
-    const borrowed = isMaxUint(usedReserveAsset.totalDebt.toString()) ? usedReserveAsset.totalDebt.toString() : assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+    const price = reserveData?.price ?? '0';
+    // For unsupported assets the symbol-based conversion yields NaN, so use the on-chain decimals
+    // from the reserve data instead. If the reserve is missing entirely we can't convert, so fall
+    // back to '0' and keep the entry read-only.
+    const toEth = (raw: string) => {
+      if (isMaxUint(raw)) return raw;
+      if (!reserveData) return '0';
+      if (isUnsupported) return new Dec(raw || 0).div(new Dec(10).pow(reserveData.decimals)).toString();
+      return assetAmountInEth(raw, reserveData.symbol);
+    };
+    const supplied = toEth(usedReserveAsset.supplied.toString());
+    const drawn = toEth(usedReserveAsset.drawn.toString());
+    const premium = toEth(usedReserveAsset.premium.toString());
+    const borrowed = toEth(usedReserveAsset.totalDebt.toString());
     acc[identifier] = {
-      symbol: reserveData.symbol,
-      hubName: reserveData.hubName,
-      assetId: reserveData.assetId,
+      symbol: reserveData?.symbol ?? symbol,
+      hubName: reserveData?.hubName ?? '',
+      assetId: reserveData?.assetId ?? 0,
       reserveId: +usedReserveAsset.reserveId.toString(),
       supplied,
       suppliedUsd: new Dec(supplied).mul(price).toString(),
@@ -206,6 +233,7 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
       isBorrowed: usedReserveAsset.isBorrowing,
       collateral: usedReserveAsset.isUsingAsCollateral,
       collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
+      isUnsupported: isUnsupported || !reserveData,
     };
     return acc;
   }, {});

package/src/types/aaveV4.ts

@@ -85,6 +85,8 @@ export interface AaveV4ReserveAssetOnChain {
 
 export interface AaveV4ReserveAssetData {
   symbol: string,
+  /** Underlying token decimals as reported on-chain (independent of `@defisaver/tokens`). */
+  decimals: number,
   underlying: EthAddress,
   hub: EthAddress,
   hubName: string,
@@ -130,6 +132,11 @@ export interface AaveV4ReserveAssetData {
   hubLiquidity: string,
   premiumMultiplier: string;
   liquidityFee: string;
+  /**
+   * True when the underlying token is missing from `@defisaver/tokens` (placeholder `?` asset).
+   * The reserve is kept for read-only display, but amounts are zeroed and all actions are disabled.
+   */
+  isUnsupported?: boolean;
 }
 
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
@@ -151,6 +158,8 @@ export interface AaveV4UsedReserveAsset {
   isBorrowed: boolean,
   collateral: boolean,
   collateralFactor: number,
+  /** True when the underlying token is missing from `@defisaver/tokens` (placeholder `?` asset). */
+  isUnsupported?: boolean,
 }
 
 export interface AaveV4AggregatedPositionData {