@defisaver/positions-sdk 2.1.137 → 2.1.139

package/cjs/aaveV4/index.js

@@ -84,16 +84,16 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
     };
 });
 const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, network) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(reserveAsset.underlying, network);
     // `@defisaver/tokens` returns a placeholder ('?', decimals NaN) when the underlying is not in the
     // tokens package. Flag it so consumers can render it read-only instead of feeding NaN into amounts.
     const isUnsupported = assetInfo.symbol === '?';
     const symbol = (0, utils_1.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 = (0, aaveV4_1.getAaveV4HubByAddress)(network, reserveAsset.hub);
-    if (!hubInfo) {
-        throw new Error(`Hub not found with address: ${reserveAsset.hub}`);
-    }
     const isStakingAsset = staking_1.STAKING_ASSETS.includes(symbol);
     const supplyIncentives = [];
     const borrowIncentives = [];
@@ -153,8 +153,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         decimals: reserveAsset.decimals,
         isUnsupported,
         underlying: reserveAsset.underlying,
-        hub: hubInfo.address,
-        hubName: hubInfo === null || hubInfo === void 0 ? void 0 : hubInfo.label,
+        hub: (_g = hubInfo === null || hubInfo === void 0 ? void 0 : hubInfo.address) !== null && _g !== void 0 ? _g : reserveAsset.hub,
+        hubName: (_h = hubInfo === null || hubInfo === void 0 ? void 0 : hubInfo.label) !== null && _h !== void 0 ? _h : `Hub ${(0, utils_1.shortenAddress)(reserveAsset.hub)}`,
         assetId: reserveAsset.assetId,
         reserveId,
         paused: reserveAsset.paused,
@@ -192,14 +192,30 @@ function _getAaveV4SpokeData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const viewContract = (0, contracts_1.AaveV4ViewContractViem)(provider, network, blockNumber);
         const hubsData = {};
+        const loadHubData = (hubAddress) => __awaiter(this, void 0, void 0, function* () {
+            hubsData[hubAddress.toLowerCase()] = yield 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] = yield Promise.all([
             viewContract.read.getSpokeDataFull([market.address]),
             (0, merkl_1.getAaveV4MerkleCampaigns)(network),
-            ...market.hubs.map((hubAddress) => __awaiter(this, void 0, void 0, function* () {
-                hubsData[hubAddress] = yield fetchHubData(viewContract, hubAddress);
-            })),
+            ...market.hubs.map((hubAddress) => loadHubData(hubAddress).catch(() => { })),
         ]);
-        const reserveAssetsArray = yield Promise.all(spokeData[1].map((reserveAssetOnChain, index) => __awaiter(this, void 0, void 0, function* () { return 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) => reserveAsset.hub.toLowerCase()))]
+            .filter((hubAddress) => !hubsData[hubAddress]);
+        yield Promise.all(missingHubs.map(loadHubData));
+        const reserveAssetsArray = (yield Promise.all(spokeData[1].map((reserveAssetOnChain, index) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const hubAsset = (_a = hubsData[reserveAssetOnChain.hub.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.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 !== null);
         const enrichedAssets = reserveAssetsArray.map((asset) => (0, merkl_1.attachAaveV4MerklIncentives)(asset, market.address, merklCampaigns));
         return {
             assetsData: enrichedAssets.reduce((acc, reserveAsset) => {

package/cjs/aaveV4/merkl.d.ts

@@ -1,4 +1,5 @@
-import { AaveV4MerklRewardMap, AaveV4ReserveAssetData, NetworkNumber } from '../types';
+import { AaveV4MerklRewardMap, AaveV4ReserveAssetData, MerklOpportunity, NetworkNumber } from '../types';
+export declare const buildAaveV4MerklRewardMap: (opportunities: MerklOpportunity[], chainId: NetworkNumber) => AaveV4MerklRewardMap;
 export declare const getAaveV4MerkleCampaigns: (chainId: NetworkNumber) => Promise<AaveV4MerklRewardMap>;
 /**
  * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's

package/cjs/aaveV4/merkl.js

@@ -9,17 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.attachAaveV4MerklIncentives = exports.getAaveV4MerkleCampaigns = void 0;
+exports.attachAaveV4MerklIncentives = exports.getAaveV4MerkleCampaigns = exports.buildAaveV4MerklRewardMap = void 0;
 const moneymarket_1 = require("../moneymarket");
 const utils_1 = require("../services/utils");
 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 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, underlying) => `${spokeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
+const scopeKey = (scopeAddress, underlying) => `${scopeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
 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;
@@ -31,8 +34,38 @@ const buildIncentive = (opportunity) => {
         description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
     };
 };
-const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+const buildAaveV4MerklRewardMap = (opportunities, chainId) => {
     const result = { hub: {}, spoke: {} };
+    opportunities
+        .filter((o) => o.chainId === 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;
+        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);
+        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;
+};
+exports.buildAaveV4MerklRewardMap = buildAaveV4MerklRewardMap;
+const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const res = yield 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(utils_1.LONGER_TIMEOUT),
@@ -40,37 +73,11 @@ const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0,
         if (!res.ok)
             throw new Error('Failed to fetch Aave V4 Merkle campaigns');
         const opportunities = yield res.json();
-        opportunities
-            .filter((o) => o.chainId === 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 side = o.action === types_1.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 = (_d = o.explorerAddress) === null || _d === void 0 ? void 0 : _d.toLowerCase();
-                if (!spokeAddress)
-                    return;
-                const key = spokeKey(spokeAddress, underlying);
-                if (!result.spoke[key])
-                    result.spoke[key] = {};
-                result.spoke[key][side] = incentive;
-            }
-        });
-        return result;
+        return (0, exports.buildAaveV4MerklRewardMap)(opportunities, chainId);
     }
     catch (e) {
         console.error('Failed to fetch Aave V4 Merkle campaigns', e);
-        return result;
+        return { hub: {}, spoke: {} };
     }
 });
 exports.getAaveV4MerkleCampaigns = getAaveV4MerkleCampaigns;
@@ -83,8 +90,8 @@ const attachAaveV4MerklIncentives = (asset, spokeAddress, campaigns) => {
     const underlying = (_a = asset.underlying) === null || _a === void 0 ? void 0 : _a.toLowerCase();
     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 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 });
 };
 exports.attachAaveV4MerklIncentives = attachAaveV4MerklIncentives;