@defisaver/positions-sdk 2.1.127-midnight-8-dev → 2.1.127-midnight-9-dev

package/esm/contracts.js

@@ -107,7 +107,6 @@ export const WstETHPriceFeedContractViem = createViemContractFromConfigFunc('Wst
 export const CompV3ViewContractViem = createViemContractFromConfigFunc('CompV3View');
 export const SparkViewContractViem = createViemContractFromConfigFunc('SparkView');
 export const SparkIncentiveDataProviderContractViem = createViemContractFromConfigFunc('SparkIncentiveDataProvider');
-export const EulerV2ViewContractViem = createViemContractFromConfigFunc('EulerV2View');
 export const CrvUSDViewContractViem = createViemContractFromConfigFunc('crvUSDView');
 export const CrvUSDFactoryContractViem = createViemContractFromConfigFunc('crvUSDFactory');
 export const LlamaLendViewContractViem = createViemContractFromConfigFunc('LlamaLendView');

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

@@ -1,5 +1,11 @@
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4SpokeInfo, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, EthereumProvider, LeverageType, NetworkNumber } from '../../types';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4SpokeInfo, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, EthereumProvider, IncentiveData, IncentiveSide, LeverageType, NetworkNumber } from '../../types';
 export declare const calcUserRiskPremiumBps: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => number;
+/**
+ * The incentives that actually accrue to a position on this reserve for the given side: the
+ * intrinsic (staking) incentives plus the single applicable Merkl reward. Display surfaces should
+ * use this rather than picking a scoped list directly, so badges always match the net APY math.
+ */
+export declare const getAaveV4ApplicableIncentives: (assetData: AaveV4ReserveAssetData, side: IncentiveSide) => IncentiveData[];
 export declare const calculateNetApyAaveV4: ({ usedAssets, assetsData, }: {
     usedAssets: AaveV4UsedReserveAssets;
     assetsData: AaveV4AssetsData;

package/esm/helpers/aaveV4Helpers/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInWei } from '@defisaver/tokens';
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS, } from '../../moneymarket';
 import { calculateInterestEarned } from '../../staking';
-import { LeverageType, } from '../../types';
+import { IncentiveSide, LeverageType, } from '../../types';
 import { borrowOperations } from '../../constants';
 import { AaveV4ViewContractViem } from '../../contracts';
 import { getViemProvider } from '../../services/viem';
@@ -69,14 +69,25 @@ export const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
 };
 /**
  * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with at most one Merkl
- * reward appended (see attachAaveV4MerklIncentives). Both scopes can apply to the same position at
- * once (spoke-specific + hub-wide), so the full applicable set is base + whatever each scope appended.
+ * reward appended (see attachAaveV4MerklIncentives). Merkl regularly publishes the same reward
+ * stream at both scopes (a spoke campaign and a hub campaign covering the same borrows, e.g. USDC
+ * borrowed from the Prime Hub via the Bluechip Spoke), so the scopes must never be summed — the
+ * more specific spoke reward wins and the hub reward only applies when no spoke campaign exists,
+ * which is also what every per-asset APY badge (and Aave's own UI) shows.
  */
-const mergeScopedIncentives = (base = [], spokeScoped, hubScoped) => [
-    ...base,
-    ...(spokeScoped ? spokeScoped.slice(base.length) : []),
-    ...(hubScoped ? hubScoped.slice(base.length) : []),
-];
+const mergeScopedIncentives = (base = [], spokeScoped, hubScoped) => {
+    const spokeExtras = spokeScoped ? spokeScoped.slice(base.length) : [];
+    const hubExtras = hubScoped ? hubScoped.slice(base.length) : [];
+    return [...base, ...(spokeExtras.length ? spokeExtras : hubExtras)];
+};
+/**
+ * The incentives that actually accrue to a position on this reserve for the given side: the
+ * intrinsic (staking) incentives plus the single applicable Merkl reward. Display surfaces should
+ * use this rather than picking a scoped list directly, so badges always match the net APY math.
+ */
+export const getAaveV4ApplicableIncentives = (assetData, side) => (side === IncentiveSide.Supply
+    ? mergeScopedIncentives(assetData.supplyIncentives, assetData.spokeSupplyIncentives, assetData.hubSupplyIncentives)
+    : mergeScopedIncentives(assetData.borrowIncentives, assetData.spokeBorrowIncentives, assetData.hubBorrowIncentives));
 export const calculateNetApyAaveV4 = ({ usedAssets, assetsData, }) => {
     const riskPremiumBps = calcUserRiskPremiumBps(usedAssets, assetsData);
     const riskPremiumFraction = new Dec(riskPremiumBps).div(10000);
@@ -90,7 +101,7 @@ export const calculateNetApyAaveV4 = ({ usedAssets, assetsData, }) => {
             acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();
             const supplyInterest = calculateInterestEarned(amount, assetData.supplyRate, 'year', true);
             acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
-            const supplyIncentives = mergeScopedIncentives(assetData.supplyIncentives, assetData.spokeSupplyIncentives, assetData.hubSupplyIncentives);
+            const supplyIncentives = getAaveV4ApplicableIncentives(assetData, IncentiveSide.Supply);
             for (const supplyIncentive of supplyIncentives) {
                 const incentiveInterest = calculateInterestEarned(amount, supplyIncentive.apy, 'year', true);
                 acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
@@ -106,7 +117,7 @@ export const calculateNetApyAaveV4 = ({ usedAssets, assetsData, }) => {
             const userBorrowRate = aprToApy(userBorrowApr.toString());
             const borrowInterest = calculateInterestEarned(amount, userBorrowRate, 'year', true);
             acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-            const borrowIncentives = mergeScopedIncentives(assetData.borrowIncentives, assetData.spokeBorrowIncentives, assetData.hubBorrowIncentives);
+            const borrowIncentives = getAaveV4ApplicableIncentives(assetData, IncentiveSide.Borrow);
             for (const borrowIncentive of borrowIncentives) {
                 const incentiveInterest = calculateInterestEarned(amount, borrowIncentive.apy, 'year', true);
                 acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();

package/esm/helpers/index.d.ts

@@ -7,6 +7,5 @@ export * as morphoBlueHelpers from './morphoBlueHelpers';
 export * as morphoMidnightHelpers from './morphoMidnightHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
-export * as eulerV2Helpers from './eulerHelpers';
 export * as fluidHelpers from './fluidHelpers';
 export * as aaveV4Helpers from './aaveV4Helpers';

package/esm/helpers/index.js

@@ -7,6 +7,5 @@ export * as morphoBlueHelpers from './morphoBlueHelpers';
 export * as morphoMidnightHelpers from './morphoMidnightHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
-export * as eulerV2Helpers from './eulerHelpers';
 export * as fluidHelpers from './fluidHelpers';
 export * as aaveV4Helpers from './aaveV4Helpers';

package/esm/index.d.ts

@@ -18,9 +18,8 @@ import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 import * as morphoMidnight from './morphoMidnight';
 import * as llamaLend from './llamaLend';
-import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -18,9 +18,8 @@ import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 import * as morphoMidnight from './morphoMidnight';
 import * as llamaLend from './llamaLend';
-import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, fluid, portfolio, claiming, savings, };

package/esm/markets/index.d.ts

@@ -6,6 +6,5 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { MorphoMidnightMarkets, findMorphoMidnightMarket, isTenorMidnightMarket, morphoMidnightMarketCollateralParams, } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
-export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
 export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

package/esm/markets/index.js

@@ -6,6 +6,5 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { MorphoMidnightMarkets, findMorphoMidnightMarket, isTenorMidnightMarket, morphoMidnightMarketCollateralParams, } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
-export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
 export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';

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

@@ -65,6 +65,8 @@ export declare const MORPHO_BLUE_WBTC_USDT_860: (networkId?: NetworkNumber) => M
 export declare const MORPHO_BLUE_WSTETH_USDT_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SYRUPUSDC_RLUSD_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WEETH_USDC_770: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WEETH_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WEETH_USDC_860_85252BB8: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_ETH_USDC_860_94B823E6: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USD3_USDC_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_STUSDS_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -72,6 +74,7 @@ export declare const MORPHO_BLUE_CBBTC_RLUSD_860: (networkId?: NetworkNumber) =>
 export declare const MORPHO_BLUE_WBTC_ETH_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_ETH_915_12DBF493: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WEETH_USDT_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WEETH_USDT_860_A6A4C1F1: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SYRUPUSDT_USDT_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_PYUSD_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WEETH_USDT_770: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -185,6 +188,8 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdt_860: MorphoBlueMarketData;
     readonly morphobluesyrupusdcrlusd_915: MorphoBlueMarketData;
     readonly morphoblueweethusdc_770: MorphoBlueMarketData;
+    readonly morphoblueweethusdc_860: MorphoBlueMarketData;
+    readonly morphoblueweethusdc_860_85252bb8: MorphoBlueMarketData;
     readonly morphoblueethusdc_860_94b823e6: MorphoBlueMarketData;
     readonly morphoblueusd3usdc_915: MorphoBlueMarketData;
     readonly morphobluestusdsusdc_860: MorphoBlueMarketData;
@@ -192,6 +197,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewbtceth_915: MorphoBlueMarketData;
     readonly morphobluecbbtceth_915_12dbf493: MorphoBlueMarketData;
     readonly morphoblueweethusdt_860: MorphoBlueMarketData;
+    readonly morphoblueweethusdt_860_a6a4c1f1: MorphoBlueMarketData;
     readonly morphobluesyrupusdtusdt_915: MorphoBlueMarketData;
     readonly morphobluecbbtcpyusd_860: MorphoBlueMarketData;
     readonly morphoblueweethusdt_770: MorphoBlueMarketData;

package/esm/markets/morphoBlue/index.js

@@ -991,6 +991,36 @@ export const MORPHO_BLUE_WEETH_USDC_770 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0x34377fc4f617c51818e92c79df31ff270c6a91bc94ad32e367fdf59b9f4ac5dd',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_WEETH_USDC_860 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Morpho',
+    shortLabel: 'weETH/USDC',
+    value: MorphoBlueVersions.MorphoBlueWeEthUSDC_860,
+    url: 'weethusdc-61765602',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee',
+    oracle: '0x5635a2F38c5dFd1d8fDB176d9CB5AEFA07bf6A68',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x61765602144e91e5ac9f9e98b8584eae308f9951596fd7f5e0f59f21cd2bf664',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WEETH_USDC_860_85252BB8 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Morpho',
+    shortLabel: 'weETH/USDC',
+    value: MorphoBlueVersions.MorphoBlueWeEthUSDC_860_85252bb8,
+    url: 'weethusdc-85252bb8',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee',
+    oracle: '0xa3A7A3ceFee206f9d7Fe00eC3C83324ED4228411',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0x85252bb8485c99bba46fe149c7dd2aad83672640f53c630890673cf1848ba16e',
+    protocolName: 'morpho-blue',
+});
 export const MORPHO_BLUE_ETH_USDC_860_94B823E6 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Eth],
     label: 'Morpho',
@@ -1096,6 +1126,21 @@ export const MORPHO_BLUE_WEETH_USDT_860 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0xc2c53d2b868e163da71de14a5113cc2743fc9b5ad7488334720ed2846566a8f6',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_WEETH_USDT_860_A6A4C1F1 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Morpho',
+    shortLabel: 'weETH/USDT',
+    value: MorphoBlueVersions.MorphoBlueWeEthUSDT_860_a6a4c1f1,
+    url: 'weethusdt-a6a4c1f1',
+    loanToken: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    collateralToken: '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee',
+    oracle: '0xa3A7A3ceFee206f9d7Fe00eC3C83324ED4228411',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    marketId: '0xa6a4c1f15490a1ff39d9de3a366b408dd5647a436d8b179726d3e0562aff1292',
+    protocolName: 'morpho-blue',
+});
 export const MORPHO_BLUE_SYRUPUSDT_USDT_915 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Eth],
     label: 'Morpho',
@@ -1856,6 +1901,8 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDT_860]: MORPHO_BLUE_WSTETH_USDT_860(networkId),
     [MorphoBlueVersions.MorphoBlueSyrupUSDCRLUSD_915]: MORPHO_BLUE_SYRUPUSDC_RLUSD_915(networkId),
     [MorphoBlueVersions.MorphoBlueWeEthUSDC_770]: MORPHO_BLUE_WEETH_USDC_770(networkId),
+    [MorphoBlueVersions.MorphoBlueWeEthUSDC_860]: MORPHO_BLUE_WEETH_USDC_860(networkId),
+    [MorphoBlueVersions.MorphoBlueWeEthUSDC_860_85252bb8]: MORPHO_BLUE_WEETH_USDC_860_85252BB8(networkId),
     [MorphoBlueVersions.MorphoBlueEthUSDC_860_94b823e6]: MORPHO_BLUE_ETH_USDC_860_94B823E6(networkId),
     [MorphoBlueVersions.MorphoBlueUSD3USDC_915]: MORPHO_BLUE_USD3_USDC_915(networkId),
     [MorphoBlueVersions.MorphoBlueStUSDSUSDC_860]: MORPHO_BLUE_STUSDS_USDC_860(networkId),
@@ -1863,6 +1910,7 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWBTCEth_915]: MORPHO_BLUE_WBTC_ETH_915(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCEth_915_12dbf493]: MORPHO_BLUE_CBBTC_ETH_915_12DBF493(networkId),
     [MorphoBlueVersions.MorphoBlueWeEthUSDT_860]: MORPHO_BLUE_WEETH_USDT_860(networkId),
+    [MorphoBlueVersions.MorphoBlueWeEthUSDT_860_a6a4c1f1]: MORPHO_BLUE_WEETH_USDT_860_A6A4C1F1(networkId),
     [MorphoBlueVersions.MorphoBlueSyrupUSDTUSDT_915]: MORPHO_BLUE_SYRUPUSDT_USDT_915(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCPYUSD_860]: MORPHO_BLUE_CBBTC_PYUSD_860(networkId),
     [MorphoBlueVersions.MorphoBlueWeEthUSDT_770]: MORPHO_BLUE_WEETH_USDT_770(networkId),

package/esm/portfolio/discovery.d.ts

@@ -7,7 +7,7 @@ import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
  * Uses one shared, multicall-batched viem client (same pattern as getPortfolioData) so all
  * per-market reads collapse into a handful of RPC round trips.
  *
- * Not covered: Maker, Liquity, Liquity V2, Fluid, Euler V2 — these already expose cheap,
+ * Not covered: Maker, Liquity, Liquity V2, Fluid — these already expose cheap,
  * user-scoped discovery entry points elsewhere in the SDK (e.g. _getUserCdps, _getUserPositionsPortfolio).
  */
 export declare function getUserPositionsExistence(provider: EthereumProvider, network: NetworkNumber, address: EthAddress, isSim?: boolean): Promise<Record<string, boolean>>;

package/esm/portfolio/discovery.js

@@ -29,7 +29,7 @@ const hasAnyBalance = (balances) => ([balances.collateral, balances.debt].some((
  * Uses one shared, multicall-batched viem client (same pattern as getPortfolioData) so all
  * per-market reads collapse into a handful of RPC round trips.
  *
- * Not covered: Maker, Liquity, Liquity V2, Fluid, Euler V2 — these already expose cheap,
+ * Not covered: Maker, Liquity, Liquity V2, Fluid — these already expose cheap,
  * user-scoped discovery entry points elsewhere in the SDK (e.g. _getUserCdps, _getUserPositionsPortfolio).
  */
 export function getUserPositionsExistence(provider_1, network_1, address_1) {

package/esm/portfolio/index.js

@@ -9,13 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
-import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
 import { _getSparkAccountData, _getSparkMarketsData } from '../spark';
-import { _getEulerV2AccountData, _getEulerV2MarketsData } from '../eulerV2';
 import { _getCurveUsdGlobalData, _getCurveUsdUserData } from '../curveUsd';
 import { _getLlamaLendGlobalData, _getLlamaLendUserData } from '../llamaLend';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
@@ -27,7 +26,6 @@ import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
 import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
 import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
-import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
 import { getUmbrellaData } from '../umbrella';
 import { getMeritUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { getCompoundV3Rewards } from '../claiming/compV3';
@@ -44,7 +42,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const morphoMidnightMarkets = Object.values(MorphoMidnightMarkets(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));
-        const eulerV2Markets = Object.values(EulerV2Markets(network)).filter((market) => market.chainIds.includes(network));
         const aaveV3Markets = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
         const aaveV2Markets = [AaveVersions.AaveV2].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
         const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
@@ -60,7 +57,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const morphoMidnightMarketsData = {};
         const compoundV3MarketsData = {};
         const sparkMarketsData = {};
-        const eulerV2MarketsData = {};
         const aaveV3MarketsData = {};
         const makerCdps = {};
         const aaveV2MarketsData = {};
@@ -74,7 +70,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             morphoMidnightMarketsData,
             compoundV3MarketsData,
             sparkMarketsData,
-            eulerV2MarketsData,
             aaveV3MarketsData,
             aaveV2MarketsData,
             compoundV2MarketsData,
@@ -95,7 +90,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
-                eulerV2: {},
                 maker: {},
                 aaveV2: {},
                 compoundV2: {},
@@ -153,10 +147,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 const marketData = yield _getSparkMarketsData(client, network, market);
                 sparkMarketsData[market.value] = marketData;
             })),
-            ...eulerV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getEulerV2MarketsData(client, network, market);
-                eulerV2MarketsData[market.value] = marketData;
-            })),
             ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield _getAaveV3MarketData(client, network, market);
                 aaveV3MarketsData[market.value] = marketData;
@@ -539,28 +529,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...eulerV2Markets.map((market) => addresses.map((address) => {
-                const eulerV2SubAccounts = getEulerV2SubAccounts(address);
-                const eulerV2Addresses = [address, ...eulerV2SubAccounts];
-                return Promise.all(eulerV2Addresses.map((eulerAddress) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const accData = yield _getEulerV2AccountData(client, network, eulerAddress, eulerAddress, Object.assign({ selectedMarket: market }, eulerV2MarketsData[market.value]));
-                        if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-                            if (!positions[address.toLowerCase()].eulerV2[market.value]) {
-                                positions[address.toLowerCase()].eulerV2[market.value] = {};
-                            }
-                            positions[address.toLowerCase()].eulerV2[market.value][eulerAddress.toLowerCase()] = { error: '', data: accData };
-                        }
-                    }
-                    catch (error) {
-                        console.error(`Error fetching EulerV2 account data for address ${eulerAddress} on market ${market.value}:`, error);
-                        if (!positions[address.toLowerCase()].eulerV2[market.value]) {
-                            positions[address.toLowerCase()].eulerV2[market.value] = {};
-                        }
-                        positions[address.toLowerCase()].eulerV2[market.value][eulerAddress.toLowerCase()] = { error: `Error fetching EulerV2 account data for address ${eulerAddress} on market ${market.value}`, data: null };
-                    }
-                })));
-            }).flat()).flat(),
             ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {

package/esm/services/utils.d.ts

@@ -8,6 +8,7 @@ export declare const getAbiItem: (abi: any, methodName: string) => any;
 export declare const ADDRESS_REGEX: RegExp;
 export declare const isAddress: (address: string) => boolean;
 export declare const compareAddresses: (addr1?: string, addr2?: string) => boolean;
+export declare const shortenAddress: (address?: string, start?: number, end?: number) => string;
 export declare const getWeiAmountForDecimals: (amount: string | number, decimals: number) => string;
 export declare const getEthAmountForDecimals: (amount: string | number, decimals: string | number) => string;
 export declare const handleWbtcLegacy: (asset: string) => string;

package/esm/services/utils.js

@@ -10,6 +10,7 @@ export const getAbiItem = (abi, methodName) => abi.find((i) => i.name === method
 export const ADDRESS_REGEX = /0x[0-9a-fA-F]{40}/;
 export const isAddress = (address) => typeof address === 'string' && (new RegExp(ADDRESS_REGEX).test(address));
 export const compareAddresses = (addr1 = '', addr2 = '') => addr1.toLowerCase() === addr2.toLowerCase();
+export const shortenAddress = (address = '', start = 8, end = 4) => `${address.substring(0, start)}...${address.slice(-end)}`;
 export const getWeiAmountForDecimals = (amount, decimals) => new Dec(amount).mul(Math.pow(10, decimals)).floor().toString();
 export const getEthAmountForDecimals = (amount, decimals) => new Dec(amount).div(Math.pow(10, +decimals)).toString();
 export const handleWbtcLegacy = (asset) => (asset === 'WBTC Legacy' ? 'WBTC' : asset);

package/esm/staking/staking.js

@@ -184,9 +184,8 @@ export const calculateInterestEarned = (principal, interest, type, apy = false)
 };
 export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
-        var _a;
         const acc = Object.assign({}, _acc);
-        const assetData = assetsData[usedAsset.symbol] || assetsData[((_a = usedAsset.vaultAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || ''];
+        const assetData = assetsData[usedAsset.symbol];
         if (usedAsset.isSupplied) {
             const amount = usedAsset.suppliedUsd;
             acc.suppliedUsd = new Dec(acc.suppliedUsd).add(amount).toString();

package/esm/types/aaveV4.d.ts

@@ -44,6 +44,11 @@ export interface AaveV4SpokeInfo {
     value: AaveV4SpokesType;
     url: string;
     address: EthAddress;
+    /**
+     * Known hub addresses, used only to prefetch hub data in parallel with the spoke data.
+     * The on-chain reserves are the source of truth — hubs found there but missing here are
+     * fetched dynamically, so this list going stale can't break spoke loading.
+     */
     hubs: EthAddress[];
 }
 export interface AaveV4SpokeData {

package/esm/types/common.d.ts

@@ -2,6 +2,10 @@ export declare enum IncentiveKind {
     Staking = "staking",
     Reward = "reward"
 }
+export declare enum IncentiveSide {
+    Supply = "supply",
+    Borrow = "borrow"
+}
 export declare enum IncentiveEligibilityId {
     AaveV3EthenaLiquidLeverage = "0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",

package/esm/types/common.js

@@ -3,6 +3,11 @@ export var IncentiveKind;
     IncentiveKind["Staking"] = "staking";
     IncentiveKind["Reward"] = "reward";
 })(IncentiveKind || (IncentiveKind = {}));
+export var IncentiveSide;
+(function (IncentiveSide) {
+    IncentiveSide["Supply"] = "supply";
+    IncentiveSide["Borrow"] = "borrow";
+})(IncentiveSide || (IncentiveSide = {}));
 export var IncentiveEligibilityId;
 (function (IncentiveEligibilityId) {
     IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x0dC599DBB180E64E42b87332FDeC3a551445ea44BORROW_BL";

package/esm/types/index.d.ts

@@ -8,7 +8,6 @@ export * from './maker';
 export * from './morphoBlue';
 export * from './morphoMidnight';
 export * from './llamaLend';
-export * from './euler';
 export * from './fluid';
 export * from './portfolio';
 export * from './merit';

package/esm/types/index.js

@@ -8,7 +8,6 @@ export * from './maker';
 export * from './morphoBlue';
 export * from './morphoMidnight';
 export * from './llamaLend';
-export * from './euler';
 export * from './fluid';
 export * from './portfolio';
 export * from './merit';

package/esm/types/merkl.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData } from './common';
+import { EthAddress, IncentiveData, IncentiveSide } from './common';
 export declare enum OpportunityAction {
     LEND = "LEND",
     BORROW = "BORROW"
@@ -74,12 +74,11 @@ export type MerkleRewardMap = Record<EthAddress, {
     borrow?: MerkleRewardInfo;
 }>;
 export type AaveV4MerklScopedReward = {
-    supply?: IncentiveData;
-    borrow?: IncentiveData;
+    [side in IncentiveSide]?: IncentiveData;
 };
 /**
  * Aave V4 Merkl reward campaigns split by scope:
- *   - `hub`: keyed by underlying token address (lowercase) — rewards for supplying to a hub
+ *   - `hub`: keyed by `${hubAddress}_${underlyingAddress}` (both lowercase) — rewards for supplying/borrowing via a hub
  *   - `spoke`: keyed by `${spokeAddress}_${underlyingAddress}` (both lowercase) — rewards for supplying/borrowing on a spoke
  */
 export type AaveV4MerklRewardMap = {

package/esm/types/morphoBlue.d.ts

@@ -66,6 +66,8 @@ export declare enum MorphoBlueVersions {
     MorphoBlueWstEthUSDT_860 = "morphobluewstethusdt_860",// wstETH/USDT 0.86
     MorphoBlueSyrupUSDCRLUSD_915 = "morphobluesyrupusdcrlusd_915",// syrupUSDC/RLUSD 0.915
     MorphoBlueWeEthUSDC_770 = "morphoblueweethusdc_770",// weETH/USDC 0.77
+    MorphoBlueWeEthUSDC_860 = "morphoblueweethusdc_860",// weETH/USDC 0.86
+    MorphoBlueWeEthUSDC_860_85252bb8 = "morphoblueweethusdc_860_85252bb8",// weETH/USDC 0.86
     MorphoBlueEthUSDC_860_94b823e6 = "morphoblueethusdc_860_94b823e6",// ETH/USDC 0.86
     MorphoBlueUSD3USDC_915 = "morphoblueusd3usdc_915",// USD3/USDC 0.915
     MorphoBlueStUSDSUSDC_860 = "morphobluestusdsusdc_860",// stUSDS/USDC 0.86
@@ -73,6 +75,7 @@ export declare enum MorphoBlueVersions {
     MorphoBlueWBTCEth_915 = "morphobluewbtceth_915",// WBTC/ETH 0.915
     MorphoBlueCbBTCEth_915_12dbf493 = "morphobluecbbtceth_915_12dbf493",// cbBTC/ETH 0.915
     MorphoBlueWeEthUSDT_860 = "morphoblueweethusdt_860",// weETH/USDT 0.86
+    MorphoBlueWeEthUSDT_860_a6a4c1f1 = "morphoblueweethusdt_860_a6a4c1f1",// weETH/USDT 0.86
     MorphoBlueSyrupUSDTUSDT_915 = "morphobluesyrupusdtusdt_915",// syrupUSDT/USDT 0.915
     MorphoBlueCbBTCPYUSD_860 = "morphobluecbbtcpyusd_860",// cbBTC/PYUSD 0.86
     MorphoBlueWeEthUSDT_770 = "morphoblueweethusdt_770",// weETH/USDT 0.77

package/esm/types/morphoBlue.js

@@ -72,6 +72,8 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueWstEthUSDT_860"] = "morphobluewstethusdt_860";
     MorphoBlueVersions["MorphoBlueSyrupUSDCRLUSD_915"] = "morphobluesyrupusdcrlusd_915";
     MorphoBlueVersions["MorphoBlueWeEthUSDC_770"] = "morphoblueweethusdc_770";
+    MorphoBlueVersions["MorphoBlueWeEthUSDC_860"] = "morphoblueweethusdc_860";
+    MorphoBlueVersions["MorphoBlueWeEthUSDC_860_85252bb8"] = "morphoblueweethusdc_860_85252bb8";
     MorphoBlueVersions["MorphoBlueEthUSDC_860_94b823e6"] = "morphoblueethusdc_860_94b823e6";
     MorphoBlueVersions["MorphoBlueUSD3USDC_915"] = "morphoblueusd3usdc_915";
     MorphoBlueVersions["MorphoBlueStUSDSUSDC_860"] = "morphobluestusdsusdc_860";
@@ -79,6 +81,7 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueWBTCEth_915"] = "morphobluewbtceth_915";
     MorphoBlueVersions["MorphoBlueCbBTCEth_915_12dbf493"] = "morphobluecbbtceth_915_12dbf493";
     MorphoBlueVersions["MorphoBlueWeEthUSDT_860"] = "morphoblueweethusdt_860";
+    MorphoBlueVersions["MorphoBlueWeEthUSDT_860_a6a4c1f1"] = "morphoblueweethusdt_860_a6a4c1f1";
     MorphoBlueVersions["MorphoBlueSyrupUSDTUSDT_915"] = "morphobluesyrupusdtusdt_915";
     MorphoBlueVersions["MorphoBlueCbBTCPYUSD_860"] = "morphobluecbbtcpyusd_860";
     MorphoBlueVersions["MorphoBlueWeEthUSDT_770"] = "morphoblueweethusdt_770";

package/esm/types/portfolio.d.ts

@@ -3,7 +3,6 @@ import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
 import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
 import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { EulerV2PositionData, EulerV2Versions } from './euler';
 import { FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
 import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
@@ -31,9 +30,6 @@ export interface PortfolioPositionsDataForAddress {
     spark: {
         [key in SparkVersions]?: PortfolioProtocolData<SparkPositionData>;
     };
-    eulerV2: {
-        [key in EulerV2Versions]?: Record<EthAddress, PortfolioProtocolData<EulerV2PositionData>>;
-    };
     maker: {
         [key: string]: PortfolioProtocolData<CdpData>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.127-midnight-8-dev",
+  "version": "2.1.127-midnight-9-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -21,7 +21,9 @@ import {
 } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { isMaxUint, wethToEth, wethToEthByAddress } from '../services/utils';
+import {
+  isMaxUint, shortenAddress, wethToEth, wethToEthByAddress,
+} from '../services/utils';
 import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
 import { findAaveV4SpokeByAddress, getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
@@ -56,10 +58,10 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
   // 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);
+  // The hub registry only provides display metadata — a hub missing from it (newly deployed by
+  // Aave, SDK not yet updated) must not prevent the reserve from loading, so fall back to a
+  // generated label instead of failing.
   const hubInfo = getAaveV4HubByAddress(network, reserveAsset.hub);
-  if (!hubInfo) {
-    throw new Error(`Hub not found with address: ${reserveAsset.hub}`);
-  }
 
   const isStakingAsset = STAKING_ASSETS.includes(symbol);
   const supplyIncentives: IncentiveData[] = [];
@@ -124,8 +126,8 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     decimals: reserveAsset.decimals,
     isUnsupported,
     underlying: reserveAsset.underlying,
-    hub: hubInfo.address,
-    hubName: hubInfo?.label,
+    hub: hubInfo?.address ?? reserveAsset.hub,
+    hubName: hubInfo?.label ?? `Hub ${shortenAddress(reserveAsset.hub)}`,
     assetId: reserveAsset.assetId,
     reserveId,
     paused: reserveAsset.paused,
@@ -163,16 +165,32 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
 export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
   const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
 
-  const hubsData: Record<EthAddress, AaveV4HubOnChainData> = {};
+  const hubsData: Record<string, AaveV4HubOnChainData> = {};
+  const loadHubData = async (hubAddress: EthAddress) => {
+    hubsData[hubAddress.toLowerCase()] = await fetchHubData(viewContract, hubAddress);
+  };
+
+  // market.hubs is only a prefetch hint (lets known hubs load in parallel with the spoke data), so
+  // failures are tolerated here — any hub the reserves actually reference is (re)fetched below.
   const [spokeData, merklCampaigns] = await Promise.all([
     viewContract.read.getSpokeDataFull([market.address]),
     getAaveV4MerkleCampaigns(network),
-    ...market.hubs.map(async (hubAddress) => {
-      hubsData[hubAddress] = await fetchHubData(viewContract, hubAddress);
-    }),
+    ...market.hubs.map((hubAddress) => loadHubData(hubAddress).catch(() => {})),
   ]);
 
-  const reserveAssetsArray = await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain, index: number) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], index, +spokeData[0].oracleDecimals.toString(), network)));
+  // The on-chain reserves are the source of truth for which hubs the spoke uses — fetch any hub
+  // the prefetch didn't cover, so an asset listed from a hub unknown to the SDK can't break the spoke.
+  const missingHubs = [...new Set(spokeData[1].map((reserveAsset: AaveV4ReserveAssetOnChain) => reserveAsset.hub.toLowerCase() as EthAddress))]
+    .filter((hubAddress) => !hubsData[hubAddress]);
+  await Promise.all(missingHubs.map(loadHubData));
+
+  const reserveAssetsArray = (await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain, index: number) => {
+    const hubAsset = hubsData[reserveAssetOnChain.hub.toLowerCase()]?.assets[reserveAssetOnChain.assetId];
+    // A reserve whose hub-side asset data can't be resolved is skipped instead of failing the
+    // whole spoke (position math degrades for that one asset only).
+    if (!hubAsset) return null;
+    return formatReserveAsset(reserveAssetOnChain, hubAsset, index, +spokeData[0].oracleDecimals.toString(), network);
+  }))).filter((asset): asset is AaveV4ReserveAssetData => asset !== null);
 
   const enrichedAssets = reserveAssetsArray.map((asset) => attachAaveV4MerklIncentives(asset, market.address, merklCampaigns));