@defisaver/positions-sdk 2.1.102-aave-v4-merkl-1-dev → 2.1.103

package/cjs/aaveV4/index.d.ts

@@ -1,7 +1,6 @@
 import { Client } from 'viem';
 import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
 export * as lend from './lend';
-export { getAaveV4MerkleCampaigns } from './merkl';
 export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;

package/cjs/aaveV4/index.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV4MerkleCampaigns = exports.lend = void 0;
+exports.lend = void 0;
 exports._getAaveV4SpokeData = _getAaveV4SpokeData;
 exports.getAaveV4SpokeData = getAaveV4SpokeData;
 exports._getAaveV4AccountData = _getAaveV4AccountData;
@@ -61,10 +61,7 @@ const utils_1 = require("../services/utils");
 const aaveV4Helpers_1 = require("../helpers/aaveV4Helpers");
 const aaveV4_1 = require("../markets/aaveV4");
 const moneymarket_1 = require("../moneymarket");
-const merkl_1 = require("./merkl");
 exports.lend = __importStar(require("./lend"));
-var merkl_2 = require("./merkl");
-Object.defineProperty(exports, "getAaveV4MerkleCampaigns", { enumerable: true, get: function () { return merkl_2.getAaveV4MerkleCampaigns; } });
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
     return {
@@ -176,7 +173,6 @@ 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 merklCampaignsPromise = (0, merkl_1.getAaveV4MerkleCampaigns)(network);
         const [spokeData] = yield Promise.all([
             viewContract.read.getSpokeDataFull([market.address]),
             ...market.hubs.map((hubAddress) => __awaiter(this, void 0, void 0, function* () {
@@ -184,10 +180,8 @@ function _getAaveV4SpokeData(provider_1, network_1, market_1) {
             })),
         ]);
         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); })));
-        const merklCampaigns = yield merklCampaignsPromise;
-        const enrichedAssets = reserveAssetsArray.map((asset) => (0, merkl_1.attachAaveV4MerklIncentives)(asset, market.address, merklCampaigns));
         return {
-            assetsData: enrichedAssets.reduce((acc, reserveAsset) => {
+            assetsData: reserveAssetsArray.reduce((acc, reserveAsset) => {
                 acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
                 return acc;
             }, {}),

package/cjs/savings/morphoVaults/index.js

@@ -54,25 +54,22 @@ const morphoVaultsOptions = __importStar(require("./options"));
 exports.morphoVaultsOptions = morphoVaultsOptions;
 const viem_1 = require("../../services/viem");
 const contracts_1 = require("../../contracts");
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
+const vaultDataQuery = `
+  query VaultByAddress($address: String!, $chainId: Int!) {
+    vaultByAddress(address: $address, chainId: $chainId) {
+      address
+      state {
+        totalAssets
+        totalAssetsUsd
+        totalSupply
+      }
+      liquidity {
+        underlying
+        usd
+      }
     }
-}
 }`;
-const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
+const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
 const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
     const morphoVaultContract = (0, contracts_1.getMorphoVaultContractViem)(provider, morphoVault.address);
     const shares = {};
@@ -81,7 +78,7 @@ const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awai
         morphoVaultContract.read.totalSupply(),
         morphoVaultContract.read.decimals(),
         morphoVaultContract.read.DECIMALS_OFFSET(),
-        (0, graphql_request_1.request)(MORPHO_BLUE_API, vaultDataQuery(morphoVault.address)),
+        (0, graphql_request_1.request)(MORPHO_BLUE_API, vaultDataQuery, { address: morphoVault.address, chainId: network }),
         ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
             const share = yield morphoVaultContract.read.balanceOf([account]);
             shares[account] = share;

package/cjs/types/aaveV4.d.ts

@@ -100,16 +100,6 @@ export interface AaveV4ReserveAssetData {
     borrowRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-    /**
-     * Intrinsic incentives pre-combined with scope-specific Merkl rewards, ready to render per surface:
-     *   - spoke* → spoke supply/borrow (Create page + dashboard market table)
-     *   - hub*   → hub supply/borrow (Lend page)
-     * `supplyIncentives`/`borrowIncentives` above remain intrinsic-only so the net-APY calc is unaffected.
-     */
-    spokeSupplyIncentives?: IncentiveData[];
-    spokeBorrowIncentives?: IncentiveData[];
-    hubSupplyIncentives?: IncentiveData[];
-    hubBorrowIncentives?: IncentiveData[];
     canBeBorrowed: boolean;
     canBeSupplied: boolean;
     canBeWithdrawn: boolean;

package/cjs/types/merkl.d.ts

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

package/esm/aaveV4/index.d.ts

@@ -1,7 +1,6 @@
 import { Client } from 'viem';
 import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokeInfo, EthAddress, EthereumProvider, NetworkNumber } from '../types';
 export * as lend from './lend';
-export { getAaveV4MerkleCampaigns } from './merkl';
 export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;

package/esm/aaveV4/index.js

@@ -17,9 +17,7 @@ import { isMaxUint, wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
-import { attachAaveV4MerklIncentives, getAaveV4MerkleCampaigns } from './merkl';
 export * as lend from './lend';
-export { getAaveV4MerkleCampaigns } from './merkl';
 const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
     const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
     return {
@@ -131,7 +129,6 @@ export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
         const hubsData = {};
-        const merklCampaignsPromise = getAaveV4MerkleCampaigns(network);
         const [spokeData] = yield Promise.all([
             viewContract.read.getSpokeDataFull([market.address]),
             ...market.hubs.map((hubAddress) => __awaiter(this, void 0, void 0, function* () {
@@ -139,10 +136,8 @@ export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
             })),
         ]);
         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); })));
-        const merklCampaigns = yield merklCampaignsPromise;
-        const enrichedAssets = reserveAssetsArray.map((asset) => attachAaveV4MerklIncentives(asset, market.address, merklCampaigns));
         return {
-            assetsData: enrichedAssets.reduce((acc, reserveAsset) => {
+            assetsData: reserveAssetsArray.reduce((acc, reserveAsset) => {
                 acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
                 return acc;
             }, {}),

package/esm/savings/morphoVaults/index.js

@@ -14,25 +14,22 @@ import * as morphoVaultsOptions from './options';
 import { getViemProvider } from '../../services/viem';
 import { getMorphoVaultContractViem } from '../../contracts';
 export { morphoVaultsOptions, };
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
+const vaultDataQuery = `
+  query VaultByAddress($address: String!, $chainId: Int!) {
+    vaultByAddress(address: $address, chainId: $chainId) {
+      address
+      state {
+        totalAssets
+        totalAssetsUsd
+        totalSupply
+      }
+      liquidity {
+        underlying
+        usd
+      }
     }
-}
 }`;
-const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
+const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
 export const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
     const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
     const shares = {};
@@ -41,7 +38,7 @@ export const _getMorphoVaultData = (provider, network, morphoVault, accounts) =>
         morphoVaultContract.read.totalSupply(),
         morphoVaultContract.read.decimals(),
         morphoVaultContract.read.DECIMALS_OFFSET(),
-        graphqlRequest(MORPHO_BLUE_API, vaultDataQuery(morphoVault.address)),
+        graphqlRequest(MORPHO_BLUE_API, vaultDataQuery, { address: morphoVault.address, chainId: network }),
         ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
             const share = yield morphoVaultContract.read.balanceOf([account]);
             shares[account] = share;

package/esm/types/aaveV4.d.ts

@@ -100,16 +100,6 @@ export interface AaveV4ReserveAssetData {
     borrowRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-    /**
-     * Intrinsic incentives pre-combined with scope-specific Merkl rewards, ready to render per surface:
-     *   - spoke* → spoke supply/borrow (Create page + dashboard market table)
-     *   - hub*   → hub supply/borrow (Lend page)
-     * `supplyIncentives`/`borrowIncentives` above remain intrinsic-only so the net-APY calc is unaffected.
-     */
-    spokeSupplyIncentives?: IncentiveData[];
-    spokeBorrowIncentives?: IncentiveData[];
-    hubSupplyIncentives?: IncentiveData[];
-    hubBorrowIncentives?: IncentiveData[];
     canBeBorrowed: boolean;
     canBeSupplied: boolean;
     canBeWithdrawn: boolean;

package/esm/types/merkl.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.102-aave-v4-merkl-1-dev",
+  "version": "2.1.103",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -23,10 +23,8 @@ import { isMaxUint, wethToEth } from '../services/utils';
 import { aaveV4GetAggregatedPositionData, calcUserRiskPremiumBps } from '../helpers/aaveV4Helpers';
 import { getAaveV4HubByAddress } from '../markets/aaveV4';
 import { aprToApy } from '../moneymarket';
-import { attachAaveV4MerklIncentives, getAaveV4MerkleCampaigns } from './merkl';
 
 export * as lend from './lend';
-export { getAaveV4MerkleCampaigns } from './merkl';
 
 const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
   const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
@@ -147,7 +145,6 @@ export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumb
   const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
 
   const hubsData: Record<EthAddress, AaveV4HubOnChainData> = {};
-  const merklCampaignsPromise = getAaveV4MerkleCampaigns(network);
   const [spokeData] = await Promise.all([
     viewContract.read.getSpokeDataFull([market.address]),
     ...market.hubs.map(async (hubAddress) => {
@@ -157,11 +154,8 @@ export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumb
 
   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)));
 
-  const merklCampaigns = await merklCampaignsPromise;
-  const enrichedAssets = reserveAssetsArray.map((asset) => attachAaveV4MerklIncentives(asset, market.address, merklCampaigns));
-
   return {
-    assetsData: enrichedAssets.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
+    assetsData: reserveAssetsArray.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
       acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
       return acc;
     }, {}),

package/src/savings/morphoVaults/index.ts

@@ -12,26 +12,23 @@ export {
   morphoVaultsOptions,
 };
 
-const vaultDataQuery = (vaultAddress: EthAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
+const vaultDataQuery = `
+  query VaultByAddress($address: String!, $chainId: Int!) {
+    vaultByAddress(address: $address, chainId: $chainId) {
+      address
+      state {
+        totalAssets
+        totalAssetsUsd
+        totalSupply
+      }
+      liquidity {
+        underlying
+        usd
+      }
     }
-}
 }`;
 
-const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
+const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
 
 export const _getMorphoVaultData = async (provider: Client, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
   const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
@@ -43,7 +40,7 @@ export const _getMorphoVaultData = async (provider: Client, network: NetworkNumb
     morphoVaultContract.read.totalSupply(),
     morphoVaultContract.read.decimals(),
     morphoVaultContract.read.DECIMALS_OFFSET(),
-    graphqlRequest(MORPHO_BLUE_API, vaultDataQuery(morphoVault.address)),
+    graphqlRequest(MORPHO_BLUE_API, vaultDataQuery, { address: morphoVault.address, chainId: network }),
     ...accounts.map(async (account) => {
       const share = await morphoVaultContract.read.balanceOf([account]);
       shares[account] = share;

package/src/types/aaveV4.ts

@@ -111,16 +111,6 @@ export interface AaveV4ReserveAssetData {
   borrowRate: string,
   supplyIncentives: IncentiveData[];
   borrowIncentives: IncentiveData[];
-  /**
-   * Intrinsic incentives pre-combined with scope-specific Merkl rewards, ready to render per surface:
-   *   - spoke* → spoke supply/borrow (Create page + dashboard market table)
-   *   - hub*   → hub supply/borrow (Lend page)
-   * `supplyIncentives`/`borrowIncentives` above remain intrinsic-only so the net-APY calc is unaffected.
-   */
-  spokeSupplyIncentives?: IncentiveData[];
-  spokeBorrowIncentives?: IncentiveData[];
-  hubSupplyIncentives?: IncentiveData[];
-  hubBorrowIncentives?: IncentiveData[];
   canBeBorrowed: boolean;
   canBeSupplied: boolean;
   canBeWithdrawn: boolean;

package/src/types/merkl.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData } from './common';
+import { EthAddress } from './common';
 
 export enum OpportunityAction {
   LEND = 'LEND',
@@ -68,16 +68,4 @@ 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 = { supply?: IncentiveData; borrow?: IncentiveData };
-
-/**
- * Aave V4 Merkl reward campaigns split by scope:
- *   - `hub`: keyed by underlying token address (lowercase) — rewards for supplying to a hub
- *   - `spoke`: keyed by `${spokeAddress}_${underlyingAddress}` (both lowercase) — rewards for supplying/borrowing on a spoke
- */
-export type AaveV4MerklRewardMap = {
-  hub: Record<string, AaveV4MerklScopedReward>;
-  spoke: Record<string, AaveV4MerklScopedReward>;
-};
+export type MerkleRewardMap = Record<EthAddress, { supply?: MerkleRewardInfo; borrow?: MerkleRewardInfo }>;

package/cjs/aaveV4/merkl.d.ts

@@ -1,8 +0,0 @@
-import { AaveV4MerklRewardMap, AaveV4ReserveAssetData } from '../types';
-import { NetworkNumber } from '../types/common';
-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
- * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
- */
-export declare const attachAaveV4MerklIncentives: (asset: AaveV4ReserveAssetData, spokeAddress: string, campaigns: AaveV4MerklRewardMap) => AaveV4ReserveAssetData;

package/cjs/aaveV4/merkl.js

@@ -1,90 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.attachAaveV4MerklIncentives = exports.getAaveV4MerkleCampaigns = 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_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`.
- */
-const spokeKey = (spokeAddress, underlying) => `${spokeAddress.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;
-    const token = (rewardToken === null || rewardToken === void 0 ? void 0 : rewardToken.symbol) || ((_e = (_d = opportunity.tokens) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.symbol) || '';
-    return {
-        apy: (0, moneymarket_1.aprToApy)(opportunity.apr),
-        token,
-        incentiveKind: types_1.IncentiveKind.Reward,
-        description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
-    };
-};
-const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
-    const result = { hub: {}, spoke: {} };
-    try {
-        const res = yield fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
-        });
-        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;
-    }
-    catch (e) {
-        console.error('Failed to fetch Aave V4 Merkle campaigns', e);
-        return result;
-    }
-});
-exports.getAaveV4MerkleCampaigns = getAaveV4MerkleCampaigns;
-/**
- * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's
- * 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();
-    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;
-    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;

package/esm/aaveV4/merkl.d.ts

@@ -1,8 +0,0 @@
-import { AaveV4MerklRewardMap, AaveV4ReserveAssetData } from '../types';
-import { NetworkNumber } from '../types/common';
-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
- * intrinsic (staking) incentives, so each surface can render base yield + the rewards that apply to it.
- */
-export declare const attachAaveV4MerklIncentives: (asset: AaveV4ReserveAssetData, spokeAddress: string, campaigns: AaveV4MerklRewardMap) => AaveV4ReserveAssetData;

package/esm/aaveV4/merkl.js

@@ -1,85 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT } from '../services/utils';
-import { IncentiveKind, 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 underlying token)
- *   - 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`.
- */
-const spokeKey = (spokeAddress, underlying) => `${spokeAddress.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;
-    const token = (rewardToken === null || rewardToken === void 0 ? void 0 : rewardToken.symbol) || ((_e = (_d = opportunity.tokens) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.symbol) || '';
-    return {
-        apy: aprToApy(opportunity.apr),
-        token,
-        incentiveKind: IncentiveKind.Reward,
-        description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
-    };
-};
-export const getAaveV4MerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
-    const result = { hub: {}, spoke: {} };
-    try {
-        const res = yield fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
-        });
-        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 === 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 === 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;
-    }
-    catch (e) {
-        console.error('Failed to fetch Aave V4 Merkle campaigns', e);
-        return result;
-    }
-});
-/**
- * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's
- * 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();
-    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;
-    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 });
-};

package/src/aaveV4/merkl.ts

@@ -1,92 +0,0 @@
-import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT } from '../services/utils';
-import {
-  AaveV4MerklRewardMap,
-  AaveV4ReserveAssetData,
-  IncentiveData,
-  IncentiveKind,
-  MerklOpportunity,
-  OpportunityAction,
-  OpportunityStatus,
-} from '../types';
-import { NetworkNumber } from '../types/common';
-
-/**
- * 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_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`.
- */
-
-const spokeKey = (spokeAddress: string, underlying: string) => `${spokeAddress.toLowerCase()}_${underlying.toLowerCase()}`;
-
-const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
-  const rewardToken = opportunity.rewardsRecord?.breakdowns?.[0]?.token;
-  const token = rewardToken?.symbol || opportunity.tokens?.[0]?.symbol || '';
-  return {
-    apy: aprToApy(opportunity.apr),
-    token,
-    incentiveKind: IncentiveKind.Reward,
-    description: `Eligible for ${token} rewards through Merkl.${opportunity.description ? `\n${opportunity.description}` : ''}`,
-  };
-};
-
-export const getAaveV4MerkleCampaigns = async (chainId: NetworkNumber): Promise<AaveV4MerklRewardMap> => {
-  const result: AaveV4MerklRewardMap = { hub: {}, spoke: {} };
-  try {
-    const res = await fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
-      signal: AbortSignal.timeout(DEFAULT_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;
-  } catch (e) {
-    console.error('Failed to fetch Aave V4 Merkle campaigns', e);
-    return result;
-  }
-};
-
-/**
- * Returns a copy of the asset with scope-specific incentive arrays pre-combined with the asset's
- * 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[spokeKey(spokeAddress, underlying)] : undefined;
-  const hubScoped = underlying ? campaigns.hub[underlying] : 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,
-  };
-};