@defisaver/positions-sdk 2.1.104 → 2.1.106

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/claiming/aaveV3.ts

@@ -103,7 +103,7 @@ export async function getUnclaimedRewardsForAllMarkets(
   return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
 }
 
-export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber, acceptMorpho: boolean = true): Promise<ClaimableToken[]> {
+export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]> {
   let data;
   try {
     const res = await fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`,
@@ -125,8 +125,7 @@ export async function getMeritUnclaimedRewards(account: EthAddress, network: Net
         proofs,
       } = reward;
 
-      const isTokenMorpho = token.symbol === 'MORPHO';
-      if (!token || !token.symbol || amount === '0' || (isTokenMorpho && !acceptMorpho)) return;
+      if (!token || !token.symbol || amount === '0') return;
 
       const unclaimedAmount = new Dec(amount).minus(claimed || 0).toString();
       if (unclaimedAmount === '0') return;

package/src/claiming/index.ts

@@ -1,13 +1,11 @@
 import * as aaveV3Claim from './aaveV3';
 import * as compV3Claim from './compV3';
 import * as kingV3Claim from './king';
-import * as morphoBlueClaim from './morphoBlue';
 import * as sparkClaim from './spark';
 
 export {
   aaveV3Claim,
   compV3Claim,
   kingV3Claim,
-  morphoBlueClaim,
   sparkClaim,
 };

package/src/config/contracts.ts

@@ -1264,10 +1264,6 @@ export const SparkRewardsController = {
     }
   }
 } as const;
-export const MorphoDistributor = {
-  "abi": [{"inputs":[{"internalType":"address","name":"initialOwner","type":"address"},{"internalType":"uint256","name":"initialTimelock","type":"uint256"},{"internalType":"bytes32","name":"initialRoot","type":"bytes32"},{"internalType":"bytes32","name":"initialIpfsHash","type":"bytes32"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"acceptRoot","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"address","name":"reward","type":"address"},{"internalType":"uint256","name":"claimable","type":"uint256"},{"internalType":"bytes32[]","name":"proof","type":"bytes32[]"}],"name":"claim","outputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"address","name":"reward","type":"address"}],"name":"claimed","outputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ipfsHash","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"isUpdater","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"pendingRoot","outputs":[{"internalType":"bytes32","name":"root","type":"bytes32"},{"internalType":"bytes32","name":"ipfsHash","type":"bytes32"},{"internalType":"uint256","name":"validAt","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"revokePendingRoot","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"root","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"setOwner","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"newRoot","type":"bytes32"},{"internalType":"bytes32","name":"newIpfsHash","type":"bytes32"}],"name":"setRoot","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"updater","type":"address"},{"internalType":"bool","name":"active","type":"bool"}],"name":"setRootUpdater","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"newTimelock","type":"uint256"}],"name":"setTimelock","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"newRoot","type":"bytes32"},{"internalType":"bytes32","name":"newIpfsHash","type":"bytes32"}],"name":"submitRoot","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"timelock","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-  "networks": {}
-} as const;
 export const AaveRewardsController = {
   "abi": [{"inputs":[{"internalType":"address[]","name":"assets","type":"address[]"},{"internalType":"address","name":"user","type":"address"}],"name":"getAllUserRewards","outputs":[{"internalType":"address[]","name":"rewardsList","type":"address[]"},{"internalType":"uint256[]","name":"unclaimedAmounts","type":"uint256[]"}],"stateMutability":"view","type":"function"}],
   "networks": {

package/src/helpers/morphoBlueHelpers/index.ts

@@ -146,12 +146,14 @@ export const getApyAfterValuesEstimation = async (selectedMarket: MorphoBlueMark
   return { borrowRate, supplyRate };
 };
 
-const API_URL = 'https://blue-api.morpho.org/graphql';
+const API_URL = 'https://api.morpho.org/graphql';
+// Morpho Blue ACRM (Adaptive Curve IRM) always targets 90% utilization — protocol constant
+const ACRM_TARGET_UTILIZATION = '900000000000000000';
+
 const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+  query MarketByUniqueKey($marketId: String!, $chainId: Int!) {
+      marketById(marketId: $marketId, chainId: $chainId) {
         reallocatableLiquidityAssets
-        targetBorrowUtilization
         loanAsset {
           address
           decimals
@@ -168,8 +170,8 @@ const MARKET_QUERY = `
             address
             name
           }
-          allocationMarket {
-            uniqueKey
+          withdrawMarket {
+            marketId
             loanAsset {
               address
             }
@@ -193,15 +195,15 @@ const MARKET_QUERY = `
           address
         }
         irmAddress
-        lltv  
+        lltv
       }
     }
 `;
 
 const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
+  query MarketByUniqueKey($marketId: String!, $chainId: Int!) {
+      marketById(marketId: $marketId, chainId: $chainId) {
+      marketId
       state {
         rewards {
           amountPerSuppliedToken
@@ -230,19 +232,19 @@ export const getReallocatableLiquidity = async (marketId: string, network: Netwo
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         query: MARKET_QUERY,
-        variables: { uniqueKey: marketId, chainId: network },
+        variables: { marketId, chainId: network },
       }),
       signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
 
-    const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
-    const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
+    const data: { data: { marketById: MorphoBlueRealloactionMarketData } } = await response.json();
+    const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketById;
 
     if (!marketData) throw new Error('Market data not found');
 
     return {
       reallocatableLiquidity: marketData.reallocatableLiquidityAssets,
-      targetBorrowUtilization: marketData.targetBorrowUtilization,
+      targetBorrowUtilization: ACRM_TARGET_UTILIZATION,
     };
   } catch (error) {
     console.error('External API Failure: Morpho blue reallocatable liquidity', error);
@@ -295,13 +297,13 @@ export const getReallocation = async (market: MorphoBlueMarketData, assetsData:
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         query: MARKET_QUERY,
-        variables: { uniqueKey: marketId, chainId: network },
+        variables: { marketId, chainId: network },
       }),
       signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
 
-    const data: { data: { marketByUniqueKey: MorphoBlueRealloactionMarketData } } = await response.json();
-    const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketByUniqueKey;
+    const data: { data: { marketById: MorphoBlueRealloactionMarketData } } = await response.json();
+    const marketData: MorphoBlueRealloactionMarketData = data?.data?.marketById;
 
     if (!marketData) throw new Error('Market data not found');
 
@@ -315,9 +317,9 @@ export const getReallocation = async (market: MorphoBlueMarketData, assetsData:
     const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
     const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
 
-    if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization)) return { vaults: [], withdrawals: [] };
+    if (new Dec(newUtilScaled).lt(ACRM_TARGET_UTILIZATION)) return { vaults: [], withdrawals: [] };
 
-    const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
+    const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, ACRM_TARGET_UTILIZATION, marketData.reallocatableLiquidityAssets);
 
     const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce(
       (acc: Record<string, string>, item: MorphoBluePublicAllocatorItem) => {
@@ -348,14 +350,14 @@ export const getReallocation = async (market: MorphoBlueMarketData, assetsData:
         totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
         const withdrawal: [string[], string, string] = [
           [
-            item.allocationMarket.loanAsset.address,
-            item.allocationMarket.collateralAsset?.address,
-            item.allocationMarket.oracle?.address,
-            item.allocationMarket.irmAddress,
-            item.allocationMarket.lltv,
+            item.withdrawMarket.loanAsset.address,
+            item.withdrawMarket.collateralAsset?.address,
+            item.withdrawMarket.oracle?.address,
+            item.withdrawMarket.irmAddress,
+            item.withdrawMarket.lltv,
           ],
           amountToTake.toString(),
-          item.allocationMarket.uniqueKey,
+          item.withdrawMarket.marketId,
         ];
         if (!withdrawalsPerVault[vaultAddress]) {
           withdrawalsPerVault[vaultAddress] = [];
@@ -386,12 +388,12 @@ export const getRewardsForMarket = async (marketId: string, network: NetworkNumb
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
       query: REWARDS_QUERY,
-      variables: { uniqueKey: marketId, chainId: network },
+      variables: { marketId, chainId: network },
     }),
   });
 
   const data = await response.json();
-  const marketData = data?.data?.marketByUniqueKey;
+  const marketData = data?.data?.marketById;
   if (!marketData) throw new Error('Market data not found');
   const morphoAssetInfo = getAssetInfo('MORPHO');
   const { supplyApr, borrowApr } = marketData.state.rewards.find((reward: any) => compareAddresses(reward.asset.address, morphoAssetInfo.addresses[network])) || { supplyApr: '0', borrowApr: '0' };
@@ -399,8 +401,3 @@ export const getRewardsForMarket = async (marketId: string, network: NetworkNumb
   const borrowAprPercent = new Dec(borrowApr).mul(100).toString();
   return { supplyApy: aprToApy(supplyAprPercent), borrowApy: aprToApy(borrowAprPercent) };
 };
-
-export const getMorphoUnderlyingSymbol = (_symbol: string) => {
-  if (_symbol === 'MORPHO Legacy') return 'MORPHO';
-  return wethToEth(_symbol);
-};

package/src/portfolio/index.ts

@@ -48,7 +48,6 @@ import { getUmbrellaData } from '../umbrella';
 import { getMeritUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { getCompoundV3Rewards } from '../claiming/compV3';
 import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
-import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
 import { getKingRewards } from '../claiming/king';
 import { fetchEthenaAirdropRewards } from '../claiming/ethena';
 import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
@@ -61,7 +60,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
 }> {
   const isMainnet = network === NetworkNumber.Eth;
   const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
-  const isMorphoRewardsSupported = [NetworkNumber.Eth, NetworkNumber.Base].includes(network);
 
   const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
   const compoundV3Markets = Object.values(CompoundMarkets(network)).filter((market) => market.chainIds.includes(network) && market.value !== CompoundVersions.CompoundV2);
@@ -157,7 +155,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       spark: {},
       spk: {},
       king: {},
-      morpho: {},
       ethena: {},
     };
   }
@@ -354,28 +351,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         rewardsData[address.toLowerCase() as EthAddress].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
       }
     })).flat(),
-    // Batch Morpho Blue rewards
-    (async () => {
-      if (!isMorphoRewardsSupported) return;
-      try {
-        const morphoRewards = await fetchMorphoBlueRewards(client, network, addresses);
-        for (const address of addresses) {
-          const lowerAddress = address.toLowerCase() as EthAddress;
-          rewardsData[lowerAddress].morpho = {
-            error: '',
-            data: morphoRewards[lowerAddress] || [],
-          };
-        }
-      } catch (error) {
-        console.error('Error fetching Morpho Blue rewards data in batch:', error);
-        for (const address of addresses) {
-          rewardsData[address.toLowerCase() as EthAddress].morpho = {
-            error: 'Error fetching Morpho Blue rewards data in batch',
-            data: null,
-          };
-        }
-      }
-    })(),
     // Batch Spark Airdrop rewards
     (async () => {
       try {

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 {

package/src/types/claiming.ts

@@ -9,8 +9,6 @@ export enum ClaimType {
   COMPOUND_V3_COMP = 'COMPOUND_V3_COMP',
   /** Rewards from Spark (wstETH only for now) */
   SPARK_REWARDS = 'SPARK_REWARDS',
-  /** Rewards from Morpho */
-  MORPHO = 'MORPHO',
   /** Rewards from King (prev LTR^2 - received for weETH holding) */
   KING_REWARDS = 'KING_REWARDS',
   /** Spark Airdrop */
@@ -63,18 +61,6 @@ export type KingRewardsClaimableToken = _ClaimableTokenPartial & {
   };
 };
 
-export type MorphoClaimableToken = _ClaimableTokenPartial & {
-  claimType: ClaimType.MORPHO,
-  additionalClaimFields: {
-    originalAmount: string,
-    merkleProofs: string[];
-    distributor: EthAddress;
-    isLegacy: boolean;
-    txData: string;
-  }
-};
-
-
 export type CompoundV3CompClaimableToken = _ClaimableTokenPartial & {
   claimType: ClaimType.COMPOUND_V3_COMP,
   additionalClaimFields: {
@@ -106,7 +92,6 @@ export type ClaimableToken =
     AaveRewardsClaimableToken
     | AaveMeritRewardsClaimableToken
     | CompoundV3CompClaimableToken
-    | MorphoClaimableToken
     | SparkRewardsClaimableToken
     | KingRewardsClaimableToken
     | SparkAirdropClaimableToken

package/src/types/morphoBlue.ts

@@ -206,13 +206,13 @@ export interface MorphoBlueAllocationMarket {
   oracle: { address: string },
   irmAddress: string,
   lltv: string,
-  uniqueKey: string,
+  marketId: string,
 }
 
 export interface MorphoBluePublicAllocatorItem {
   vault: MorphoBlueVault,
   assets: string,
-  allocationMarket: MorphoBlueAllocationMarket,
+  withdrawMarket: MorphoBlueAllocationMarket,
 }
 
 export interface MorphoBlueAllocatorMarketState {
@@ -222,7 +222,6 @@ export interface MorphoBlueAllocatorMarketState {
 
 export interface MorphoBlueRealloactionMarketData {
   reallocatableLiquidityAssets: string,
-  targetBorrowUtilization: string,
   publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[],
   state: MorphoBlueAllocatorMarketState,
 }

package/cjs/claiming/morphoBlue.d.ts

@@ -1,5 +0,0 @@
-import { Client } from 'viem';
-import { ClaimableToken } from '../types/claiming';
-import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getMorphoBlueRewardsInfo: (address: EthAddress) => Promise<any>;
-export declare const fetchMorphoBlueRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, ClaimableToken[]>>;

package/cjs/claiming/morphoBlue.js

@@ -1,113 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchMorphoBlueRewards = exports.getMorphoBlueRewardsInfo = void 0;
-const tokens_1 = require("@defisaver/tokens");
-const decimal_js_1 = __importDefault(require("decimal.js"));
-const claiming_1 = require("../types/claiming");
-const contracts_1 = require("../contracts");
-const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
-const MORPHO_ALLOWED_CONTRACTS = [
-    '0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb',
-    '0x678dDC1d07eaa166521325394cDEb1E4c086DF43',
-    '0x2efd4625d0c149ebadf118ec5446c6de24d916a4',
-];
-const MORPHO_ALLOWED_TOKENS = [
-    'MORPHO',
-    'MORPHO Legacy',
-];
-const getMorphoBlueRewardsInfo = (address) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!address)
-        return { claimable: '0' };
-    try {
-        const res = yield fetch(`https://rewards.morpho.org/v1/users/${address}/distributions`, { signal: AbortSignal.timeout(3000) });
-        if (!res.ok)
-            throw new Error(yield res.text());
-        return yield res.json();
-    }
-    catch (error) {
-        console.error('External API Failure: Morpho Merit', error);
-        return { claimable: '0' };
-    }
-});
-exports.getMorphoBlueRewardsInfo = getMorphoBlueRewardsInfo;
-const fetchMorphoBlueRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
-    const apiDataPromises = walletAddresses.map(address => (0, exports.getMorphoBlueRewardsInfo)(address));
-    const apiDataArray = yield Promise.all(apiDataPromises);
-    // Process API data to get claimable tokens for each wallet
-    const allClaimableTokens = [];
-    const contractCallsData = [];
-    for (let i = 0; i < walletAddresses.length; i++) {
-        const walletAddress = walletAddresses[i];
-        const data = apiDataArray[i];
-        const claimableTokens = ((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.reduce((acc, reward) => {
-            var _a, _b, _c;
-            const token = (0, tokens_1.getAssetInfoByAddress)(reward.asset.address);
-            if (!MORPHO_ALLOWED_CONTRACTS.includes((_a = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _a === void 0 ? void 0 : _a.address) || !MORPHO_ALLOWED_TOKENS.includes(token.symbol)) {
-                return acc;
-            }
-            // Store contract call data for batching
-            contractCallsData.push({
-                walletAddress,
-                tokenAddress: reward.asset.address,
-                distributor: (_b = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _b === void 0 ? void 0 : _b.address,
-            });
-            return [
-                ...acc,
-                {
-                    symbol: token.symbol,
-                    underlyingSymbol: (0, morphoBlueHelpers_1.getMorphoUnderlyingSymbol)(token.symbol),
-                    tokenAddress: reward.asset.address,
-                    amount: (0, tokens_1.assetAmountInEth)(reward.claimable, token.symbol),
-                    walletAddress,
-                    label: token.symbol,
-                    claimType: claiming_1.ClaimType.MORPHO,
-                    additionalClaimFields: {
-                        originalAmount: reward.claimable,
-                        distributor: (_c = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _c === void 0 ? void 0 : _c.address,
-                        merkleProofs: reward === null || reward === void 0 ? void 0 : reward.proof,
-                        isLegacy: token.symbol === 'MORPHO Legacy',
-                        txData: reward === null || reward === void 0 ? void 0 : reward.tx_data,
-                    },
-                }
-            ];
-        }, [])) || [];
-        allClaimableTokens.push({ walletAddress, tokens: claimableTokens });
-    }
-    // Batch all contract calls using multicall
-    const contractPromises = contractCallsData.map(({ walletAddress, tokenAddress, distributor }) => {
-        const distributorContract = (0, contracts_1.createViemContractFromConfigFunc)('MorphoDistributor', distributor)(provider, network);
-        return distributorContract.read.claimed([walletAddress, tokenAddress]);
-    });
-    const contractResults = yield Promise.all(contractPromises);
-    // Process results
-    const results = {};
-    let contractCallIndex = 0;
-    for (const { walletAddress, tokens } of allClaimableTokens) {
-        const updatedTokens = [];
-        for (let i = 0; i < tokens.length; i++) {
-            const claimableToken = tokens[i];
-            const claimed = (0, tokens_1.assetAmountInEth)(contractResults[contractCallIndex].toString(), claimableToken.underlyingSymbol);
-            contractCallIndex++;
-            const updatedToken = Object.assign({}, claimableToken);
-            updatedToken.amount = new decimal_js_1.default(claimableToken.amount).sub(claimed).toString();
-            updatedTokens.push(updatedToken);
-        }
-        results[walletAddress.toLowerCase()] = updatedTokens.filter((claimableToken) => new decimal_js_1.default(claimableToken.amount).gt(0));
-    }
-    return results;
-});
-exports.fetchMorphoBlueRewards = fetchMorphoBlueRewards;

package/esm/claiming/morphoBlue.d.ts

@@ -1,5 +0,0 @@
-import { Client } from 'viem';
-import { ClaimableToken } from '../types/claiming';
-import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getMorphoBlueRewardsInfo: (address: EthAddress) => Promise<any>;
-export declare const fetchMorphoBlueRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, ClaimableToken[]>>;