@defisaver/positions-sdk 2.1.104 → 2.1.106-sgho-dev

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

@@ -2,4 +2,4 @@ import { Client } from 'viem';
 import { EthAddress, NetworkNumber } from '../types/common';
 import { ClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
-export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber, acceptMorpho?: boolean): Promise<ClaimableToken[]>;
+export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/esm/claiming/aaveV3.js

@@ -88,8 +88,8 @@ export function getUnclaimedRewardsForAllMarkets(provider, network, walletAddres
         return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
     });
 }
-export function getMeritUnclaimedRewards(account_1, network_1) {
-    return __awaiter(this, arguments, void 0, function* (account, network, acceptMorpho = true) {
+export function getMeritUnclaimedRewards(account, network) {
+    return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
             const res = yield fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(3000) });
@@ -103,8 +103,7 @@ export function getMeritUnclaimedRewards(account_1, network_1) {
         data.forEach((item) => {
             item.rewards.forEach(reward => {
                 const { token, amount, claimed, proofs, } = reward;
-                const isTokenMorpho = token.symbol === 'MORPHO';
-                if (!token || !token.symbol || amount === '0' || (isTokenMorpho && !acceptMorpho))
+                if (!token || !token.symbol || amount === '0')
                     return;
                 const unclaimedAmount = new Dec(amount).minus(claimed || 0).toString();
                 if (unclaimedAmount === '0')

package/esm/claiming/index.d.ts

@@ -1,6 +1,5 @@
 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, };
+export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, };

package/esm/claiming/index.js

@@ -1,6 +1,5 @@
 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, };
+export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, };

package/esm/config/contracts.d.ts

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

package/esm/config/contracts.js

@@ -1262,10 +1262,6 @@ export const SparkRewardsController = {
         }
     }
 };
-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": {}
-};
 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/esm/helpers/morphoBlueHelpers/index.d.ts

@@ -56,4 +56,3 @@ export declare const getRewardsForMarket: (marketId: string, network?: NetworkNu
     supplyApy: string;
     borrowApy: string;
 }>;
-export declare const getMorphoUnderlyingSymbol: (_symbol: string) => string;

package/esm/helpers/morphoBlueHelpers/index.js

@@ -14,7 +14,7 @@ import { calculateNetApy } from '../../staking';
 import { LeverageType, NetworkNumber, } from '../../types/common';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContractViem } from '../../contracts';
-import { compareAddresses, LONGER_TIMEOUT, wethToEth } from '../../services/utils';
+import { compareAddresses, LONGER_TIMEOUT } from '../../services/utils';
 import { getViemProvider } from '../../services/viem';
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     var _a, _b, _c, _d, _e, _f;
@@ -128,12 +128,13 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     const supplyRate = getSupplyRate(data[1].totalSupplyAssets.toString(), data[1].totalBorrowAssets.toString(), data[0].toString(), data[1].fee.toString());
     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
@@ -150,8 +151,8 @@ const MARKET_QUERY = `
             address
             name
           }
-          allocationMarket {
-            uniqueKey
+          withdrawMarket {
+            marketId
             loanAsset {
               address
             }
@@ -175,14 +176,14 @@ 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
@@ -211,17 +212,17 @@ export const getReallocatableLiquidity = (marketId_1, ...args_1) => __awaiter(vo
             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 = yield response.json();
-        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;
         if (!marketData)
             throw new Error('Market data not found');
         return {
             reallocatableLiquidity: marketData.reallocatableLiquidityAssets,
-            targetBorrowUtilization: marketData.targetBorrowUtilization,
+            targetBorrowUtilization: ACRM_TARGET_UTILIZATION,
         };
     }
     catch (error) {
@@ -273,12 +274,12 @@ export const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...arg
             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 = yield response.json();
-        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+        const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;
         if (!marketData)
             throw new Error('Market data not found');
         const loanAssetInfo = getAssetInfoByAddress(loanToken, network);
@@ -288,9 +289,9 @@ export const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...arg
         const newTotalBorrowAssets = new Dec(totalBorrowWei).add(amountToBorrow).toString();
         const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
         const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
-        if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization))
+        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, item) => {
             const vaultAddress = item.vault.address;
             acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
@@ -312,14 +313,14 @@ export const getReallocation = (market_1, assetsData_1, amountToBorrow_1, ...arg
                 totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
                 const withdrawal = [
                     [
-                        item.allocationMarket.loanAsset.address,
-                        (_b = item.allocationMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
-                        (_c = item.allocationMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
-                        item.allocationMarket.irmAddress,
-                        item.allocationMarket.lltv,
+                        item.withdrawMarket.loanAsset.address,
+                        (_b = item.withdrawMarket.collateralAsset) === null || _b === void 0 ? void 0 : _b.address,
+                        (_c = item.withdrawMarket.oracle) === null || _c === void 0 ? void 0 : _c.address,
+                        item.withdrawMarket.irmAddress,
+                        item.withdrawMarket.lltv,
                     ],
                     amountToTake.toString(),
-                    item.allocationMarket.uniqueKey,
+                    item.withdrawMarket.marketId,
                 ];
                 if (!withdrawalsPerVault[vaultAddress]) {
                     withdrawalsPerVault[vaultAddress] = [];
@@ -346,11 +347,11 @@ export const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0,
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
             query: REWARDS_QUERY,
-            variables: { uniqueKey: marketId, chainId: network },
+            variables: { marketId, chainId: network },
         }),
     });
     const data = yield response.json();
-    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;
     if (!marketData)
         throw new Error('Market data not found');
     const morphoAssetInfo = getAssetInfo('MORPHO');
@@ -359,8 +360,3 @@ export const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0,
     const borrowAprPercent = new Dec(borrowApr).mul(100).toString();
     return { supplyApy: aprToApy(supplyAprPercent), borrowApy: aprToApy(borrowAprPercent) };
 });
-export const getMorphoUnderlyingSymbol = (_symbol) => {
-    if (_symbol === 'MORPHO Legacy')
-        return 'MORPHO';
-    return wethToEth(_symbol);
-};

package/esm/portfolio/index.js

@@ -31,7 +31,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';
@@ -39,7 +38,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
     return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
         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);
         const sparkMarkets = Object.values(SparkMarkets(network)).filter((market) => market.chainIds.includes(network));
@@ -127,7 +125,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 spark: {},
                 spk: {},
                 king: {},
-                morpho: {},
                 ethena: {},
             };
         }
@@ -337,30 +334,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     rewardsData[address.toLowerCase()].aaveV3 = { error: `Error fetching Aave V3 rewards data for address ${address}`, data: null };
                 }
             }))).flat(),
-            // Batch Morpho Blue rewards
-            (() => __awaiter(this, void 0, void 0, function* () {
-                if (!isMorphoRewardsSupported)
-                    return;
-                try {
-                    const morphoRewards = yield fetchMorphoBlueRewards(client, network, addresses);
-                    for (const address of addresses) {
-                        const lowerAddress = address.toLowerCase();
-                        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()].morpho = {
-                            error: 'Error fetching Morpho Blue rewards data in batch',
-                            data: null,
-                        };
-                    }
-                }
-            }))(),
             // Batch Spark Airdrop rewards
             (() => __awaiter(this, void 0, void 0, function* () {
                 try {

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;