@defisaver/positions-sdk 2.1.137 → 2.1.139

package/esm/contracts.js

@@ -106,7 +106,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

@@ -6,6 +6,5 @@ export * as makerHelpers from './makerHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
 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

@@ -6,6 +6,5 @@ export * as makerHelpers from './makerHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
 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

@@ -17,9 +17,8 @@ import * as helpers from './helpers';
 import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 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, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -17,9 +17,8 @@ import * as helpers from './helpers';
 import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
 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, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, fluid, portfolio, claiming, savings, };

package/esm/markets/index.d.ts

@@ -5,6 +5,5 @@ export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 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

@@ -5,6 +5,5 @@ export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 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/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

@@ -28,7 +28,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,12 +9,11 @@ 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, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
 import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 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';
@@ -26,7 +25,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';
@@ -42,7 +40,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         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));
-        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));
@@ -57,7 +54,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const morphoMarketsData = {};
         const compoundV3MarketsData = {};
         const sparkMarketsData = {};
-        const eulerV2MarketsData = {};
         const aaveV3MarketsData = {};
         const makerCdps = {};
         const aaveV2MarketsData = {};
@@ -70,7 +66,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             morphoMarketsData,
             compoundV3MarketsData,
             sparkMarketsData,
-            eulerV2MarketsData,
             aaveV3MarketsData,
             aaveV2MarketsData,
             compoundV2MarketsData,
@@ -90,7 +85,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 morphoBlue: {},
                 compoundV3: {},
                 spark: {},
-                eulerV2: {},
                 maker: {},
                 aaveV2: {},
                 compoundV2: {},
@@ -143,10 +137,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;
@@ -495,28 +485,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

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

package/esm/types/index.js

@@ -7,7 +7,6 @@ export * from './liquityV2';
 export * from './maker';
 export * from './morphoBlue';
 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/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';
@@ -27,9 +26,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.137",
+  "version": "2.1.139",
   "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));
 

package/src/aaveV4/merkl.ts

@@ -5,6 +5,7 @@ import {
   AaveV4ReserveAssetData,
   IncentiveData,
   IncentiveKind,
+  IncentiveSide,
   MerklOpportunity,
   OpportunityAction,
   OpportunityStatus,
@@ -13,12 +14,15 @@ import {
 
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
- *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub (matched per underlying token)
+ *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub (matched per hub contract + underlying)
  *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke (matched per spoke contract + underlying)
- * Hub campaigns identify the underlying via `tokens[0]`; spoke campaigns identify the spoke via `explorerAddress`.
+ * Campaigns identify the underlying via `tokens[0]` and the scoping contract (the hub or spoke) via
+ * `explorerAddress`. The same underlying exists on several hubs (e.g. USDC on Prime and Paxos), so a
+ * hub campaign matched by underlying alone would leak onto every hub's reserves — a campaign whose
+ * `explorerAddress` isn't a contract any fetched reserve points to simply never matches.
  */
 
-const spokeKey = (spokeAddress: string, underlying: string) => `${spokeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
+const scopeKey = (scopeAddress: string, underlying: string) => `${scopeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
 
 const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
   const rewardToken = opportunity.rewardsRecord?.breakdowns?.[0]?.token;
@@ -31,42 +35,47 @@ const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
   };
 };
 
-export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<AaveV4MerklRewardMap> => {
+export const buildAaveV4MerklRewardMap = (opportunities: MerklOpportunity[], chainId: NetworkNumber): AaveV4MerklRewardMap => {
   const result: AaveV4MerklRewardMap = { hub: {}, spoke: {} };
+
+  opportunities
+    .filter((o) => o.chainId === chainId)
+    .filter((o) => o.status === OpportunityStatus.LIVE)
+    .filter((o) => typeof o.type === 'string' && o.type.startsWith('AAVE_V4_'))
+    .forEach((o) => {
+      const underlying = o.tokens?.[0]?.address?.toLowerCase();
+      if (!underlying) return;
+
+      const scopeAddress = o.explorerAddress?.toLowerCase();
+      if (!scopeAddress) return;
+
+      const side = o.action === OpportunityAction.BORROW ? IncentiveSide.Borrow : IncentiveSide.Supply;
+      const incentive = buildIncentive(o);
+      const key = scopeKey(scopeAddress, underlying);
+
+      if (o.type.includes('HUB')) {
+        if (!result.hub[key]) result.hub[key] = {};
+        result.hub[key][side] = incentive;
+      } else if (o.type.includes('SPOKE')) {
+        if (!result.spoke[key]) result.spoke[key] = {};
+        result.spoke[key][side] = incentive;
+      }
+    });
+
+  return result;
+};
+
+export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<AaveV4MerklRewardMap> => {
   try {
     const res = await fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave&type=AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW', {
       signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     if (!res.ok) throw new Error('Failed to fetch Aave V4 Merkle campaigns');
     const opportunities = await res.json() as MerklOpportunity[];
-
-    opportunities
-      .filter((o) => o.chainId === chainId)
-      .filter((o) => o.status === OpportunityStatus.LIVE)
-      .filter((o) => typeof o.type === 'string' && o.type.startsWith('AAVE_V4_'))
-      .forEach((o) => {
-        const underlying = o.tokens?.[0]?.address?.toLowerCase();
-        if (!underlying) return;
-
-        const side: 'supply' | 'borrow' = o.action === OpportunityAction.BORROW ? 'borrow' : 'supply';
-        const incentive = buildIncentive(o);
-
-        if (o.type.includes('HUB')) {
-          if (!result.hub[underlying]) result.hub[underlying] = {};
-          result.hub[underlying][side] = incentive;
-        } else if (o.type.includes('SPOKE')) {
-          const spokeAddress = o.explorerAddress?.toLowerCase();
-          if (!spokeAddress) return;
-          const key = spokeKey(spokeAddress, underlying);
-          if (!result.spoke[key]) result.spoke[key] = {};
-          result.spoke[key][side] = incentive;
-        }
-      });
-
-    return result;
+    return buildAaveV4MerklRewardMap(opportunities, chainId);
   } catch (e) {
     console.error('Failed to fetch Aave V4 Merkle campaigns', e);
-    return result;
+    return { hub: {}, spoke: {} };
   }
 };
 
@@ -79,8 +88,8 @@ export const attachAaveV4MerklIncentives = (asset: AaveV4ReserveAssetData, spoke
   const baseSupply = asset.supplyIncentives || [];
   const baseBorrow = asset.borrowIncentives || [];
 
-  const spokeScoped = (spokeAddress && underlying) ? campaigns.spoke[spokeKey(spokeAddress, underlying)] : undefined;
-  const hubScoped = underlying ? campaigns.hub[underlying] : undefined;
+  const spokeScoped = (spokeAddress && underlying) ? campaigns.spoke[scopeKey(spokeAddress, underlying)] : undefined;
+  const hubScoped = (asset.hub && underlying) ? campaigns.hub[scopeKey(asset.hub, underlying)] : undefined;
 
   return {
     ...asset,