@defisaver/positions-sdk 2.1.154 → 2.1.155

package/cjs/aaveV4/merkl.js

@@ -15,14 +15,15 @@ const merkl_1 = require("../services/merkl");
 const types_1 = require("../types");
 /**
  * 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 hub contract + underlying)
- *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke (matched per spoke contract + underlying)
- * 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.
+ *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub asset
+ *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke reserve
+ * Embedded campaign params provide the exact on-chain identifiers. Token addresses cannot safely
+ * identify Aave V4 rewards because one spoke can expose the same underlying from multiple hubs.
+ * Each stored reward is also tagged with campaign identity (`campaignIds`/`parentCampaignIds`) so
+ * a hub (parent) campaign's child re-listing on a spoke can be told apart from a genuinely
+ * distinct spoke campaign — the former replaces the hub reward, the latter combines with it.
  */
-const scopeKey = (scopeAddress, underlying) => `${scopeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
+const scopeKey = (scopeAddress, id) => `${scopeAddress.toLowerCase()}_${id.toString()}`;
 const buildIncentive = (opportunity) => {
     var _a, _b, _c, _d, _e;
     const rewardToken = (_c = (_b = (_a = opportunity.rewardsRecord) === null || _a === void 0 ? void 0 : _a.breakdowns) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.token;
@@ -41,25 +42,45 @@ const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
         .filter((o) => o.status === types_1.OpportunityStatus.LIVE)
         .filter((o) => typeof o.type === 'string' && o.type.startsWith('AAVE_V4_'))
         .forEach((o) => {
-        var _a, _b, _c, _d;
-        const underlying = (_c = (_b = (_a = o.tokens) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c.toLowerCase();
-        if (!underlying)
-            return;
-        const scopeAddress = (_d = o.explorerAddress) === null || _d === void 0 ? void 0 : _d.toLowerCase();
-        if (!scopeAddress)
-            return;
+        var _a, _b;
         const side = o.action === types_1.OpportunityAction.BORROW ? types_1.IncentiveSide.Borrow : types_1.IncentiveSide.Supply;
         const incentive = buildIncentive(o);
-        const key = scopeKey(scopeAddress, underlying);
+        // one opportunity can span several campaigns (e.g. renewed periods), so campaign identity is
+        // collected per scope key before the reward entries are written
+        const idsByKey = {};
+        const collect = (key, campaign) => {
+            if (!idsByKey[key])
+                idsByKey[key] = { campaignIds: new Set(), parentCampaignIds: new Set() };
+            if (campaign.id)
+                idsByKey[key].campaignIds.add(campaign.id);
+            if (campaign.parentCampaignId)
+                idsByKey[key].parentCampaignIds.add(campaign.parentCampaignId);
+        };
         if (o.type.includes('HUB')) {
-            if (!result.hub[key])
-                result.hub[key] = {};
-            result.hub[key][side] = incentive;
+            (_a = o.campaigns) === null || _a === void 0 ? void 0 : _a.forEach((c) => {
+                var _a;
+                if (!((_a = c.params) === null || _a === void 0 ? void 0 : _a.hubAddress) || c.params.assetId === undefined || c.params.assetId === null)
+                    return;
+                collect(scopeKey(c.params.hubAddress, c.params.assetId), c);
+            });
+            Object.entries(idsByKey).forEach(([key, ids]) => {
+                if (!result.hub[key])
+                    result.hub[key] = {};
+                result.hub[key][side] = [...(result.hub[key][side] || []), Object.assign(Object.assign({}, incentive), { campaignIds: [...ids.campaignIds] })];
+            });
         }
         else if (o.type.includes('SPOKE')) {
-            if (!result.spoke[key])
-                result.spoke[key] = {};
-            result.spoke[key][side] = incentive;
+            (_b = o.campaigns) === null || _b === void 0 ? void 0 : _b.forEach((c) => {
+                var _a;
+                if (!((_a = c.params) === null || _a === void 0 ? void 0 : _a.spokeAddress) || c.params.reserveId === undefined || c.params.reserveId === null)
+                    return;
+                collect(scopeKey(c.params.spokeAddress, c.params.reserveId), c);
+            });
+            Object.entries(idsByKey).forEach(([key, ids]) => {
+                if (!result.spoke[key])
+                    result.spoke[key] = {};
+                result.spoke[key][side] = [...(result.spoke[key][side] || []), Object.assign(Object.assign({}, incentive), { campaignIds: [...ids.campaignIds], parentCampaignIds: [...ids.parentCampaignIds] })];
+            });
         }
     });
     return result;
@@ -71,6 +92,7 @@ const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0,
             mainProtocolId: 'aave',
             type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW',
             status: types_1.OpportunityStatus.LIVE,
+            campaigns: 'true',
         });
         return (0, exports.buildAaveV4MerklRewardMap)(opportunities, chainId);
     }
@@ -85,12 +107,11 @@ exports.getAaveV4MerkleCampaigns = getAaveV4MerkleCampaigns;
  * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
  */
 const attachAaveV4MerklIncentives = (asset, spokeAddress, campaigns) => {
-    var _a;
-    const underlying = (_a = asset.underlying) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+    var _a, _b, _c, _d;
     const baseSupply = asset.supplyIncentives || [];
     const baseBorrow = asset.borrowIncentives || [];
-    const spokeScoped = (spokeAddress && underlying) ? campaigns.spoke[scopeKey(spokeAddress, underlying)] : undefined;
-    const hubScoped = (asset.hub && underlying) ? campaigns.hub[scopeKey(asset.hub, underlying)] : undefined;
-    return Object.assign(Object.assign({}, asset), { spokeSupplyIncentives: (spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.supply) ? [...baseSupply, spokeScoped.supply] : baseSupply, spokeBorrowIncentives: (spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.borrow) ? [...baseBorrow, spokeScoped.borrow] : baseBorrow, hubSupplyIncentives: (hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.supply) ? [...baseSupply, hubScoped.supply] : baseSupply, hubBorrowIncentives: (hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.borrow) ? [...baseBorrow, hubScoped.borrow] : baseBorrow });
+    const spokeScoped = spokeAddress ? campaigns.spoke[scopeKey(spokeAddress, asset.reserveId)] : undefined;
+    const hubScoped = asset.hub ? campaigns.hub[scopeKey(asset.hub, asset.assetId)] : undefined;
+    return Object.assign(Object.assign({}, asset), { spokeSupplyIncentives: ((_a = spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.supply) === null || _a === void 0 ? void 0 : _a.length) ? [...baseSupply, ...spokeScoped.supply] : baseSupply, spokeBorrowIncentives: ((_b = spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.borrow) === null || _b === void 0 ? void 0 : _b.length) ? [...baseBorrow, ...spokeScoped.borrow] : baseBorrow, hubSupplyIncentives: ((_c = hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.supply) === null || _c === void 0 ? void 0 : _c.length) ? [...baseSupply, ...hubScoped.supply] : baseSupply, hubBorrowIncentives: ((_d = hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.borrow) === null || _d === void 0 ? void 0 : _d.length) ? [...baseBorrow, ...hubScoped.borrow] : baseBorrow });
 };
 exports.attachAaveV4MerklIncentives = attachAaveV4MerklIncentives;

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

@@ -2,7 +2,7 @@ import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData,
 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
+ * intrinsic (staking) incentives plus the applicable Merkl rewards. 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[];

package/cjs/helpers/aaveV4Helpers/index.js

@@ -75,21 +75,31 @@ const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
 };
 exports.calcUserRiskPremiumBps = calcUserRiskPremiumBps;
 /**
- * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with at most one Merkl
- * 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.
+ * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with the Merkl rewards
+ * of that scope appended (see attachAaveV4MerklIncentives). Merkl publishes a hub reward stream at both
+ * scopes — the hub (parent) campaign plus a child campaign per covered spoke (e.g. USDC borrowed
+ * from the Prime Hub via the Bluechip Spoke) — so a child must never be summed with its parent:
+ * the more specific spoke listing wins. A hub reward the spoke reward is not a child of comes from
+ * a distinct campaign, and both genuinely accrue, so they are shown together — which is also what
+ * every per-asset APY badge (and Aave's own UI) shows.
  */
 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)];
+    const parentIds = new Set();
+    spokeExtras.forEach((extra) => { var _a; return (_a = extra.parentCampaignIds) === null || _a === void 0 ? void 0 : _a.forEach((id) => parentIds.add(id)); });
+    const distinctHubExtras = hubExtras.filter((extra) => {
+        var _a;
+        // without campaign identity the parent/child relation is unknowable — fail closed to spoke-wins
+        if (!((_a = extra.campaignIds) === null || _a === void 0 ? void 0 : _a.length))
+            return !spokeExtras.length;
+        return !extra.campaignIds.some((id) => parentIds.has(id));
+    });
+    return [...base, ...spokeExtras, ...distinctHubExtras];
 };
 /**
  * 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
+ * intrinsic (staking) incentives plus the applicable Merkl rewards. Display surfaces should
  * use this rather than picking a scoped list directly, so badges always match the net APY math.
  */
 const getAaveV4ApplicableIncentives = (assetData, side) => (side === types_1.IncentiveSide.Supply

package/cjs/types/merkl.d.ts

@@ -8,6 +8,24 @@ export declare enum OpportunityStatus {
     PAST = "PAST",
     UPCOMING = "UPCOMING"
 }
+export type MerklCampaign = {
+    id: string;
+    campaignId: string;
+    /**
+     * Merkl-internal `id` of the parent campaign — set on child campaigns, which re-publish a hub
+     * (parent) campaign's reward scoped to a single spoke reserve. Absent on standalone campaigns,
+     * whose `params` still carry `hubAddress`/`hubAssetId`, so only this field tells the two apart.
+     */
+    parentCampaignId?: string;
+    childCampaignIds?: string[];
+    params?: {
+        reserveId?: string | number;
+        spokeAddress?: EthAddress;
+        hubAddress?: EthAddress;
+        hubAssetId?: string | number;
+        assetId?: string | number;
+    };
+};
 export type MerklOpportunity = {
     chainId: number;
     type: string;
@@ -22,6 +40,7 @@ export type MerklOpportunity = {
     id: string;
     explorerAddress?: EthAddress;
     description?: string;
+    campaigns?: MerklCampaign[];
     tokens: {
         id: string;
         name: string;
@@ -73,8 +92,19 @@ export type MerkleRewardMap = Record<EthAddress, {
     supply?: MerkleRewardInfo;
     borrow?: MerkleRewardInfo;
 }>;
+/**
+ * A scoped Aave V4 Merkl reward tagged with the campaign identity needed to resolve parent/child
+ * listings downstream: `campaignIds` are the Merkl-internal ids of the campaigns behind this
+ * entry, `parentCampaignIds` (spoke entries only) the ids of the hub campaigns those are children
+ * of. A hub reward is dropped only for a spoke reward that is its own child re-listing — a spoke
+ * reward from a distinct campaign combines with it instead.
+ */
+export type AaveV4MerklIncentive = IncentiveData & {
+    campaignIds?: string[];
+    parentCampaignIds?: string[];
+};
 export type AaveV4MerklScopedReward = {
-    [side in IncentiveSide]?: IncentiveData;
+    [side in IncentiveSide]?: AaveV4MerklIncentive[];
 };
 /**
  * Fluid vault-scoped Merkl campaigns keyed by lowercase vault address — `supply` rewards apply to
@@ -86,8 +116,8 @@ export type FluidMerklRewardMap = Record<string, {
 }>;
 /**
  * Aave V4 Merkl reward campaigns split by scope:
- *   - `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
+ *   - `hub`: keyed by `${hubAddress}_${assetId}` — rewards for supplying/borrowing via a hub asset
+ *   - `spoke`: keyed by `${spokeAddress}_${reserveId}` — rewards for supplying/borrowing on a spoke reserve
  */
 export type AaveV4MerklRewardMap = {
     hub: Record<string, AaveV4MerklScopedReward>;

package/esm/aaveV4/merkl.js

@@ -12,14 +12,15 @@ import { fetchAllMerklOpportunities } from '../services/merkl';
 import { IncentiveKind, IncentiveSide, OpportunityAction, OpportunityStatus, } from '../types';
 /**
  * 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 hub contract + underlying)
- *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke (matched per spoke contract + underlying)
- * 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.
+ *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub asset
+ *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke reserve
+ * Embedded campaign params provide the exact on-chain identifiers. Token addresses cannot safely
+ * identify Aave V4 rewards because one spoke can expose the same underlying from multiple hubs.
+ * Each stored reward is also tagged with campaign identity (`campaignIds`/`parentCampaignIds`) so
+ * a hub (parent) campaign's child re-listing on a spoke can be told apart from a genuinely
+ * distinct spoke campaign — the former replaces the hub reward, the latter combines with it.
  */
-const scopeKey = (scopeAddress, underlying) => `${scopeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
+const scopeKey = (scopeAddress, id) => `${scopeAddress.toLowerCase()}_${id.toString()}`;
 const buildIncentive = (opportunity) => {
     var _a, _b, _c, _d, _e;
     const rewardToken = (_c = (_b = (_a = opportunity.rewardsRecord) === null || _a === void 0 ? void 0 : _a.breakdowns) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.token;
@@ -38,25 +39,45 @@ export const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
         .filter((o) => o.status === OpportunityStatus.LIVE)
         .filter((o) => typeof o.type === 'string' && o.type.startsWith('AAVE_V4_'))
         .forEach((o) => {
-        var _a, _b, _c, _d;
-        const underlying = (_c = (_b = (_a = o.tokens) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.address) === null || _c === void 0 ? void 0 : _c.toLowerCase();
-        if (!underlying)
-            return;
-        const scopeAddress = (_d = o.explorerAddress) === null || _d === void 0 ? void 0 : _d.toLowerCase();
-        if (!scopeAddress)
-            return;
+        var _a, _b;
         const side = o.action === OpportunityAction.BORROW ? IncentiveSide.Borrow : IncentiveSide.Supply;
         const incentive = buildIncentive(o);
-        const key = scopeKey(scopeAddress, underlying);
+        // one opportunity can span several campaigns (e.g. renewed periods), so campaign identity is
+        // collected per scope key before the reward entries are written
+        const idsByKey = {};
+        const collect = (key, campaign) => {
+            if (!idsByKey[key])
+                idsByKey[key] = { campaignIds: new Set(), parentCampaignIds: new Set() };
+            if (campaign.id)
+                idsByKey[key].campaignIds.add(campaign.id);
+            if (campaign.parentCampaignId)
+                idsByKey[key].parentCampaignIds.add(campaign.parentCampaignId);
+        };
         if (o.type.includes('HUB')) {
-            if (!result.hub[key])
-                result.hub[key] = {};
-            result.hub[key][side] = incentive;
+            (_a = o.campaigns) === null || _a === void 0 ? void 0 : _a.forEach((c) => {
+                var _a;
+                if (!((_a = c.params) === null || _a === void 0 ? void 0 : _a.hubAddress) || c.params.assetId === undefined || c.params.assetId === null)
+                    return;
+                collect(scopeKey(c.params.hubAddress, c.params.assetId), c);
+            });
+            Object.entries(idsByKey).forEach(([key, ids]) => {
+                if (!result.hub[key])
+                    result.hub[key] = {};
+                result.hub[key][side] = [...(result.hub[key][side] || []), Object.assign(Object.assign({}, incentive), { campaignIds: [...ids.campaignIds] })];
+            });
         }
         else if (o.type.includes('SPOKE')) {
-            if (!result.spoke[key])
-                result.spoke[key] = {};
-            result.spoke[key][side] = incentive;
+            (_b = o.campaigns) === null || _b === void 0 ? void 0 : _b.forEach((c) => {
+                var _a;
+                if (!((_a = c.params) === null || _a === void 0 ? void 0 : _a.spokeAddress) || c.params.reserveId === undefined || c.params.reserveId === null)
+                    return;
+                collect(scopeKey(c.params.spokeAddress, c.params.reserveId), c);
+            });
+            Object.entries(idsByKey).forEach(([key, ids]) => {
+                if (!result.spoke[key])
+                    result.spoke[key] = {};
+                result.spoke[key][side] = [...(result.spoke[key][side] || []), Object.assign(Object.assign({}, incentive), { campaignIds: [...ids.campaignIds], parentCampaignIds: [...ids.parentCampaignIds] })];
+            });
         }
     });
     return result;
@@ -67,6 +88,7 @@ export const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, v
             mainProtocolId: 'aave',
             type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW',
             status: OpportunityStatus.LIVE,
+            campaigns: 'true',
         });
         return buildAaveV4MerklRewardMap(opportunities, chainId);
     }
@@ -80,11 +102,10 @@ export const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, v
  * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
  */
 export const attachAaveV4MerklIncentives = (asset, spokeAddress, campaigns) => {
-    var _a;
-    const underlying = (_a = asset.underlying) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+    var _a, _b, _c, _d;
     const baseSupply = asset.supplyIncentives || [];
     const baseBorrow = asset.borrowIncentives || [];
-    const spokeScoped = (spokeAddress && underlying) ? campaigns.spoke[scopeKey(spokeAddress, underlying)] : undefined;
-    const hubScoped = (asset.hub && underlying) ? campaigns.hub[scopeKey(asset.hub, underlying)] : undefined;
-    return Object.assign(Object.assign({}, asset), { spokeSupplyIncentives: (spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.supply) ? [...baseSupply, spokeScoped.supply] : baseSupply, spokeBorrowIncentives: (spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.borrow) ? [...baseBorrow, spokeScoped.borrow] : baseBorrow, hubSupplyIncentives: (hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.supply) ? [...baseSupply, hubScoped.supply] : baseSupply, hubBorrowIncentives: (hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.borrow) ? [...baseBorrow, hubScoped.borrow] : baseBorrow });
+    const spokeScoped = spokeAddress ? campaigns.spoke[scopeKey(spokeAddress, asset.reserveId)] : undefined;
+    const hubScoped = asset.hub ? campaigns.hub[scopeKey(asset.hub, asset.assetId)] : undefined;
+    return Object.assign(Object.assign({}, asset), { spokeSupplyIncentives: ((_a = spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.supply) === null || _a === void 0 ? void 0 : _a.length) ? [...baseSupply, ...spokeScoped.supply] : baseSupply, spokeBorrowIncentives: ((_b = spokeScoped === null || spokeScoped === void 0 ? void 0 : spokeScoped.borrow) === null || _b === void 0 ? void 0 : _b.length) ? [...baseBorrow, ...spokeScoped.borrow] : baseBorrow, hubSupplyIncentives: ((_c = hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.supply) === null || _c === void 0 ? void 0 : _c.length) ? [...baseSupply, ...hubScoped.supply] : baseSupply, hubBorrowIncentives: ((_d = hubScoped === null || hubScoped === void 0 ? void 0 : hubScoped.borrow) === null || _d === void 0 ? void 0 : _d.length) ? [...baseBorrow, ...hubScoped.borrow] : baseBorrow });
 };

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

@@ -2,7 +2,7 @@ import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData,
 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
+ * intrinsic (staking) incentives plus the applicable Merkl rewards. 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[];

package/esm/helpers/aaveV4Helpers/index.js

@@ -68,21 +68,31 @@ export const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
     return riskPremiumBps.toNumber();
 };
 /**
- * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with at most one Merkl
- * 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.
+ * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with the Merkl rewards
+ * of that scope appended (see attachAaveV4MerklIncentives). Merkl publishes a hub reward stream at both
+ * scopes — the hub (parent) campaign plus a child campaign per covered spoke (e.g. USDC borrowed
+ * from the Prime Hub via the Bluechip Spoke) — so a child must never be summed with its parent:
+ * the more specific spoke listing wins. A hub reward the spoke reward is not a child of comes from
+ * a distinct campaign, and both genuinely accrue, so they are shown together — which is also what
+ * every per-asset APY badge (and Aave's own UI) shows.
  */
 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)];
+    const parentIds = new Set();
+    spokeExtras.forEach((extra) => { var _a; return (_a = extra.parentCampaignIds) === null || _a === void 0 ? void 0 : _a.forEach((id) => parentIds.add(id)); });
+    const distinctHubExtras = hubExtras.filter((extra) => {
+        var _a;
+        // without campaign identity the parent/child relation is unknowable — fail closed to spoke-wins
+        if (!((_a = extra.campaignIds) === null || _a === void 0 ? void 0 : _a.length))
+            return !spokeExtras.length;
+        return !extra.campaignIds.some((id) => parentIds.has(id));
+    });
+    return [...base, ...spokeExtras, ...distinctHubExtras];
 };
 /**
  * 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
+ * intrinsic (staking) incentives plus the applicable Merkl rewards. 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

package/esm/types/merkl.d.ts

@@ -8,6 +8,24 @@ export declare enum OpportunityStatus {
     PAST = "PAST",
     UPCOMING = "UPCOMING"
 }
+export type MerklCampaign = {
+    id: string;
+    campaignId: string;
+    /**
+     * Merkl-internal `id` of the parent campaign — set on child campaigns, which re-publish a hub
+     * (parent) campaign's reward scoped to a single spoke reserve. Absent on standalone campaigns,
+     * whose `params` still carry `hubAddress`/`hubAssetId`, so only this field tells the two apart.
+     */
+    parentCampaignId?: string;
+    childCampaignIds?: string[];
+    params?: {
+        reserveId?: string | number;
+        spokeAddress?: EthAddress;
+        hubAddress?: EthAddress;
+        hubAssetId?: string | number;
+        assetId?: string | number;
+    };
+};
 export type MerklOpportunity = {
     chainId: number;
     type: string;
@@ -22,6 +40,7 @@ export type MerklOpportunity = {
     id: string;
     explorerAddress?: EthAddress;
     description?: string;
+    campaigns?: MerklCampaign[];
     tokens: {
         id: string;
         name: string;
@@ -73,8 +92,19 @@ export type MerkleRewardMap = Record<EthAddress, {
     supply?: MerkleRewardInfo;
     borrow?: MerkleRewardInfo;
 }>;
+/**
+ * A scoped Aave V4 Merkl reward tagged with the campaign identity needed to resolve parent/child
+ * listings downstream: `campaignIds` are the Merkl-internal ids of the campaigns behind this
+ * entry, `parentCampaignIds` (spoke entries only) the ids of the hub campaigns those are children
+ * of. A hub reward is dropped only for a spoke reward that is its own child re-listing — a spoke
+ * reward from a distinct campaign combines with it instead.
+ */
+export type AaveV4MerklIncentive = IncentiveData & {
+    campaignIds?: string[];
+    parentCampaignIds?: string[];
+};
 export type AaveV4MerklScopedReward = {
-    [side in IncentiveSide]?: IncentiveData;
+    [side in IncentiveSide]?: AaveV4MerklIncentive[];
 };
 /**
  * Fluid vault-scoped Merkl campaigns keyed by lowercase vault address — `supply` rewards apply to
@@ -86,8 +116,8 @@ export type FluidMerklRewardMap = Record<string, {
 }>;
 /**
  * Aave V4 Merkl reward campaigns split by scope:
- *   - `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
+ *   - `hub`: keyed by `${hubAddress}_${assetId}` — rewards for supplying/borrowing via a hub asset
+ *   - `spoke`: keyed by `${spokeAddress}_${reserveId}` — rewards for supplying/borrowing on a spoke reserve
  */
 export type AaveV4MerklRewardMap = {
     hub: Record<string, AaveV4MerklScopedReward>;

package/package.json

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

package/src/aaveV4/merkl.ts

@@ -6,6 +6,7 @@ import {
   IncentiveData,
   IncentiveKind,
   IncentiveSide,
+  MerklCampaign,
   MerklOpportunity,
   OpportunityAction,
   OpportunityStatus,
@@ -14,15 +15,16 @@ 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 hub contract + underlying)
- *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke (matched per spoke contract + underlying)
- * 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.
+ *   - AAVE_V4_HUB_SUPPLY / AAVE_V4_HUB_BORROW   → reward tied to a hub asset
+ *   - AAVE_V4_SPOKE_SUPPLY / AAVE_V4_SPOKE_BORROW → reward tied to a spoke reserve
+ * Embedded campaign params provide the exact on-chain identifiers. Token addresses cannot safely
+ * identify Aave V4 rewards because one spoke can expose the same underlying from multiple hubs.
+ * Each stored reward is also tagged with campaign identity (`campaignIds`/`parentCampaignIds`) so
+ * a hub (parent) campaign's child re-listing on a spoke can be told apart from a genuinely
+ * distinct spoke campaign — the former replaces the hub reward, the latter combines with it.
  */
 
-const scopeKey = (scopeAddress: string, underlying: string) => `${scopeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
+const scopeKey = (scopeAddress: string, id: string | number) => `${scopeAddress.toLowerCase()}_${id.toString()}`;
 
 const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
   const rewardToken = opportunity.rewardsRecord?.breakdowns?.[0]?.token;
@@ -43,22 +45,35 @@ export const buildAaveV4MerklRewardMap = (opportunities: MerklOpportunity[], cha
     .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);
+      // one opportunity can span several campaigns (e.g. renewed periods), so campaign identity is
+      // collected per scope key before the reward entries are written
+      const idsByKey: Record<string, { campaignIds: Set<string>, parentCampaignIds: Set<string> }> = {};
+      const collect = (key: string, campaign: MerklCampaign) => {
+        if (!idsByKey[key]) idsByKey[key] = { campaignIds: new Set(), parentCampaignIds: new Set() };
+        if (campaign.id) idsByKey[key].campaignIds.add(campaign.id);
+        if (campaign.parentCampaignId) idsByKey[key].parentCampaignIds.add(campaign.parentCampaignId);
+      };
 
       if (o.type.includes('HUB')) {
-        if (!result.hub[key]) result.hub[key] = {};
-        result.hub[key][side] = incentive;
+        o.campaigns?.forEach((c) => {
+          if (!c.params?.hubAddress || c.params.assetId === undefined || c.params.assetId === null) return;
+          collect(scopeKey(c.params.hubAddress, c.params.assetId), c);
+        });
+        Object.entries(idsByKey).forEach(([key, ids]) => {
+          if (!result.hub[key]) result.hub[key] = {};
+          result.hub[key][side] = [...(result.hub[key][side] || []), { ...incentive, campaignIds: [...ids.campaignIds] }];
+        });
       } else if (o.type.includes('SPOKE')) {
-        if (!result.spoke[key]) result.spoke[key] = {};
-        result.spoke[key][side] = incentive;
+        o.campaigns?.forEach((c) => {
+          if (!c.params?.spokeAddress || c.params.reserveId === undefined || c.params.reserveId === null) return;
+          collect(scopeKey(c.params.spokeAddress, c.params.reserveId), c);
+        });
+        Object.entries(idsByKey).forEach(([key, ids]) => {
+          if (!result.spoke[key]) result.spoke[key] = {};
+          result.spoke[key][side] = [...(result.spoke[key][side] || []), { ...incentive, campaignIds: [...ids.campaignIds], parentCampaignIds: [...ids.parentCampaignIds] }];
+        });
       }
     });
 
@@ -71,6 +86,7 @@ export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<
       mainProtocolId: 'aave',
       type: 'AAVE_V4_HUB_SUPPLY,AAVE_V4_HUB_BORROW,AAVE_V4_SPOKE_SUPPLY,AAVE_V4_SPOKE_BORROW',
       status: OpportunityStatus.LIVE,
+      campaigns: 'true',
     });
     return buildAaveV4MerklRewardMap(opportunities, chainId);
   } catch (e) {
@@ -84,18 +100,17 @@ export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<
  * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
  */
 export const attachAaveV4MerklIncentives = (asset: AaveV4ReserveAssetData, spokeAddress: string, campaigns: AaveV4MerklRewardMap): AaveV4ReserveAssetData => {
-  const underlying = asset.underlying?.toLowerCase();
   const baseSupply = asset.supplyIncentives || [];
   const baseBorrow = asset.borrowIncentives || [];
 
-  const spokeScoped = (spokeAddress && underlying) ? campaigns.spoke[scopeKey(spokeAddress, underlying)] : undefined;
-  const hubScoped = (asset.hub && underlying) ? campaigns.hub[scopeKey(asset.hub, underlying)] : undefined;
+  const spokeScoped = spokeAddress ? campaigns.spoke[scopeKey(spokeAddress, asset.reserveId)] : undefined;
+  const hubScoped = asset.hub ? campaigns.hub[scopeKey(asset.hub, asset.assetId)] : undefined;
 
   return {
     ...asset,
-    spokeSupplyIncentives: spokeScoped?.supply ? [...baseSupply, spokeScoped.supply] : baseSupply,
-    spokeBorrowIncentives: spokeScoped?.borrow ? [...baseBorrow, spokeScoped.borrow] : baseBorrow,
-    hubSupplyIncentives: hubScoped?.supply ? [...baseSupply, hubScoped.supply] : baseSupply,
-    hubBorrowIncentives: hubScoped?.borrow ? [...baseBorrow, hubScoped.borrow] : baseBorrow,
+    spokeSupplyIncentives: spokeScoped?.supply?.length ? [...baseSupply, ...spokeScoped.supply] : baseSupply,
+    spokeBorrowIncentives: spokeScoped?.borrow?.length ? [...baseBorrow, ...spokeScoped.borrow] : baseBorrow,
+    hubSupplyIncentives: hubScoped?.supply?.length ? [...baseSupply, ...hubScoped.supply] : baseSupply,
+    hubBorrowIncentives: hubScoped?.borrow?.length ? [...baseBorrow, ...hubScoped.borrow] : baseBorrow,
   };
 };

package/src/helpers/aaveV4Helpers/index.ts

@@ -11,6 +11,7 @@ import { calculateInterestEarned } from '../../staking';
 import {
   AaveV4AggregatedPositionData,
   AaveV4AssetsData,
+  AaveV4MerklIncentive,
   AaveV4ReserveAssetData,
   AaveV4SpokeInfo,
   AaveV4UsedReserveAsset,
@@ -93,22 +94,33 @@ export const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, asse
 };
 
 /**
- * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with at most one Merkl
- * 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.
+ * `spokeXIncentives`/`hubXIncentives` are each the intrinsic `base` list with the Merkl rewards
+ * of that scope appended (see attachAaveV4MerklIncentives). Merkl publishes a hub reward stream at both
+ * scopes — the hub (parent) campaign plus a child campaign per covered spoke (e.g. USDC borrowed
+ * from the Prime Hub via the Bluechip Spoke) — so a child must never be summed with its parent:
+ * the more specific spoke listing wins. A hub reward the spoke reward is not a child of comes from
+ * a distinct campaign, and both genuinely accrue, so they are shown together — which is also what
+ * every per-asset APY badge (and Aave's own UI) shows.
  */
 const mergeScopedIncentives = (base: IncentiveData[] = [], spokeScoped?: IncentiveData[], hubScoped?: IncentiveData[]): IncentiveData[] => {
-  const spokeExtras = spokeScoped ? spokeScoped.slice(base.length) : [];
-  const hubExtras = hubScoped ? hubScoped.slice(base.length) : [];
-  return [...base, ...(spokeExtras.length ? spokeExtras : hubExtras)];
+  const spokeExtras: AaveV4MerklIncentive[] = spokeScoped ? spokeScoped.slice(base.length) : [];
+  const hubExtras: AaveV4MerklIncentive[] = hubScoped ? hubScoped.slice(base.length) : [];
+
+  const parentIds = new Set<string>();
+  spokeExtras.forEach((extra) => extra.parentCampaignIds?.forEach((id) => parentIds.add(id)));
+
+  const distinctHubExtras = hubExtras.filter((extra) => {
+    // without campaign identity the parent/child relation is unknowable — fail closed to spoke-wins
+    if (!extra.campaignIds?.length) return !spokeExtras.length;
+    return !extra.campaignIds.some((id) => parentIds.has(id));
+  });
+
+  return [...base, ...spokeExtras, ...distinctHubExtras];
 };
 
 /**
  * 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
+ * intrinsic (staking) incentives plus the applicable Merkl rewards. Display surfaces should
  * use this rather than picking a scoped list directly, so badges always match the net APY math.
  */
 export const getAaveV4ApplicableIncentives = (assetData: AaveV4ReserveAssetData, side: IncentiveSide): IncentiveData[] => (side === IncentiveSide.Supply

package/src/types/merkl.ts

@@ -11,6 +11,25 @@ export enum OpportunityStatus {
   UPCOMING = 'UPCOMING',
 }
 
+export type MerklCampaign = {
+  id: string;
+  campaignId: string;
+  /**
+   * Merkl-internal `id` of the parent campaign — set on child campaigns, which re-publish a hub
+   * (parent) campaign's reward scoped to a single spoke reserve. Absent on standalone campaigns,
+   * whose `params` still carry `hubAddress`/`hubAssetId`, so only this field tells the two apart.
+   */
+  parentCampaignId?: string;
+  childCampaignIds?: string[];
+  params?: {
+    reserveId?: string | number;
+    spokeAddress?: EthAddress;
+    hubAddress?: EthAddress;
+    hubAssetId?: string | number;
+    assetId?: string | number;
+  };
+};
+
 export type MerklOpportunity = {
   chainId: number;
   type: string;
@@ -25,6 +44,7 @@ export type MerklOpportunity = {
   id: string;
   explorerAddress?: EthAddress;
   description?: string;
+  campaigns?: MerklCampaign[];
   tokens: {
     id: string;
     name: string;
@@ -70,7 +90,19 @@ export type MerklOpportunity = {
 export type MerkleRewardInfo = { apy: string; rewardTokenSymbol: string, description: string, identifier: string };
 export type MerkleRewardMap = Record<EthAddress, { supply?: MerkleRewardInfo; borrow?: MerkleRewardInfo }>;
 
-export type AaveV4MerklScopedReward = { [side in IncentiveSide]?: IncentiveData };
+/**
+ * A scoped Aave V4 Merkl reward tagged with the campaign identity needed to resolve parent/child
+ * listings downstream: `campaignIds` are the Merkl-internal ids of the campaigns behind this
+ * entry, `parentCampaignIds` (spoke entries only) the ids of the hub campaigns those are children
+ * of. A hub reward is dropped only for a spoke reward that is its own child re-listing — a spoke
+ * reward from a distinct campaign combines with it instead.
+ */
+export type AaveV4MerklIncentive = IncentiveData & {
+  campaignIds?: string[];
+  parentCampaignIds?: string[];
+};
+
+export type AaveV4MerklScopedReward = { [side in IncentiveSide]?: AaveV4MerklIncentive[] };
 
 /**
  * Fluid vault-scoped Merkl campaigns keyed by lowercase vault address — `supply` rewards apply to
@@ -80,10 +112,10 @@ export type FluidMerklRewardMap = Record<string, { supply: IncentiveData[], borr
 
 /**
  * Aave V4 Merkl reward campaigns split by scope:
- *   - `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
+ *   - `hub`: keyed by `${hubAddress}_${assetId}` — rewards for supplying/borrowing via a hub asset
+ *   - `spoke`: keyed by `${spokeAddress}_${reserveId}` — rewards for supplying/borrowing on a spoke reserve
  */
 export type AaveV4MerklRewardMap = {
   hub: Record<string, AaveV4MerklScopedReward>;
   spoke: Record<string, AaveV4MerklScopedReward>;
-};
+};