@defisaver/positions-sdk 2.1.114 → 2.1.115

package/cjs/aaveV3/merkl.d.ts

@@ -1,5 +1,4 @@
-import { MerkleRewardMap } from '../types';
-import { NetworkNumber } from '../types/common';
+import { MerkleRewardMap, NetworkNumber } from '../types';
 export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;
 /**
  * aEthLidoUSDC -> aUSDC

package/cjs/aaveV3/merkl.js

@@ -40,8 +40,8 @@ const formatAaveAsset = (_symbol) => {
 exports.formatAaveAsset = formatAaveAsset;
 const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
+        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
         });
         if (!res.ok)
             throw new Error('Failed to fetch Merkle campaigns');

package/cjs/aaveV4/merkl.d.ts

@@ -1,5 +1,4 @@
-import { AaveV4MerklRewardMap, AaveV4ReserveAssetData } from '../types';
-import { NetworkNumber } from '../types/common';
+import { AaveV4MerklRewardMap, AaveV4ReserveAssetData, NetworkNumber } from '../types';
 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

@@ -34,8 +34,8 @@ const buildIncentive = (opportunity) => {
 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),
+        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
         });
         if (!res.ok)
             throw new Error('Failed to fetch Aave V4 Merkle campaigns');

package/cjs/claiming/aaveV3.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/cjs/claiming/aaveV3.js

@@ -99,7 +99,7 @@ function getMeritUnclaimedRewards(account, network) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
-            const res = yield fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(3000) });
+            const res = yield fetch(`https://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`, { signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT) });
             data = yield res.json();
         }
         catch (error) {
@@ -107,6 +107,10 @@ function getMeritUnclaimedRewards(account, network) {
             data = [];
         }
         const claimableTokens = [];
+        // Merkl (or our proxy, on a non-2xx) can return a non-array error body; `fetch` doesn't throw on
+        // HTTP errors, so guard before iterating. Mirrors the app-side getMeritUnclaimedRewards.
+        if (!Array.isArray(data))
+            return claimableTokens;
         data.forEach((item) => {
             item.rewards.forEach(reward => {
                 const { token, amount, claimed, proofs, } = reward;

package/esm/aaveV3/merkl.d.ts

@@ -1,5 +1,4 @@
-import { MerkleRewardMap } from '../types';
-import { NetworkNumber } from '../types/common';
+import { MerkleRewardMap, NetworkNumber } from '../types';
 export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;
 /**
  * aEthLidoUSDC -> aUSDC

package/esm/aaveV3/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT, wethToEth } from '../services/utils';
+import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
 import { OpportunityAction, OpportunityStatus, } from '../types';
 export const getAaveUnderlyingSymbol = (_symbol = '') => {
     let symbol = _symbol
@@ -35,8 +35,8 @@ export const formatAaveAsset = (_symbol) => {
 };
 export const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const res = yield fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(LONGER_TIMEOUT),
         });
         if (!res.ok)
             throw new Error('Failed to fetch Merkle campaigns');

package/esm/aaveV4/merkl.d.ts

@@ -1,5 +1,4 @@
-import { AaveV4MerklRewardMap, AaveV4ReserveAssetData } from '../types';
-import { NetworkNumber } from '../types/common';
+import { AaveV4MerklRewardMap, AaveV4ReserveAssetData, NetworkNumber } from '../types';
 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/esm/aaveV4/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT } from '../services/utils';
+import { LONGER_TIMEOUT } from '../services/utils';
 import { IncentiveKind, OpportunityAction, OpportunityStatus, } from '../types';
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
@@ -31,8 +31,8 @@ const buildIncentive = (opportunity) => {
 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),
+        const res = yield fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(LONGER_TIMEOUT),
         });
         if (!res.ok)
             throw new Error('Failed to fetch Aave V4 Merkle campaigns');

package/esm/claiming/aaveV3.d.ts

@@ -1,5 +1,5 @@
 import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken } from '../types/claiming';
 export declare function getUnclaimedRewardsForAllMarkets(provider: Client, network: NetworkNumber, walletAddress: EthAddress, marketAddress: EthAddress): Promise<ClaimableToken[]>;
 export declare function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]>;

package/esm/claiming/aaveV3.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { ClaimType } from '../types/claiming';
 import { AaveIncentiveDataProviderV3ContractViem, AaveRewardsControllerViem, } from '../contracts';
-import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
+import { compareAddresses, getEthAmountForDecimals, LONGER_TIMEOUT } from '../services/utils';
 import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';
 const mapAaveRewardsToClaimableTokens = (aaveRewards, marketAddress, walletAddress) => aaveRewards.map(reward => ({
     symbol: reward.symbol,
@@ -92,7 +92,7 @@ export function getMeritUnclaimedRewards(account, network) {
     return __awaiter(this, void 0, void 0, function* () {
         let data;
         try {
-            const res = yield fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(3000) });
+            const res = yield fetch(`https://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
             data = yield res.json();
         }
         catch (error) {
@@ -100,6 +100,10 @@ export function getMeritUnclaimedRewards(account, network) {
             data = [];
         }
         const claimableTokens = [];
+        // Merkl (or our proxy, on a non-2xx) can return a non-array error body; `fetch` doesn't throw on
+        // HTTP errors, so guard before iterating. Mirrors the app-side getMeritUnclaimedRewards.
+        if (!Array.isArray(data))
+            return claimableTokens;
         data.forEach((item) => {
             item.rewards.forEach(reward => {
                 const { token, amount, claimed, proofs, } = reward;

package/package.json

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

package/src/aaveV3/merkl.ts

@@ -1,9 +1,9 @@
 import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT, wethToEth } from '../services/utils';
+import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
 import {
   MerkleRewardMap, MerklOpportunity, OpportunityAction, OpportunityStatus,
+  EthAddress, NetworkNumber,
 } from '../types';
-import { EthAddress, NetworkNumber } from '../types/common';
 
 export const getAaveUnderlyingSymbol = (_symbol = '') => {
   let symbol = _symbol
@@ -31,8 +31,8 @@ export const formatAaveAsset = (_symbol: string) => {
 
 export const getMerkleCampaigns = async (chainId: NetworkNumber): Promise<MerkleRewardMap> => {
   try {
-    const res = await fetch('https://api-merkl.angle.money/v4/opportunities?mainProtocolId=aave', {
-      signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+    const res = await fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
+      signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     if (!res.ok) throw new Error('Failed to fetch Merkle campaigns');
     const opportunities = await res.json() as MerklOpportunity[];

package/src/aaveV4/merkl.ts

@@ -1,5 +1,5 @@
 import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT } from '../services/utils';
+import { LONGER_TIMEOUT } from '../services/utils';
 import {
   AaveV4MerklRewardMap,
   AaveV4ReserveAssetData,
@@ -8,8 +8,8 @@ import {
   MerklOpportunity,
   OpportunityAction,
   OpportunityStatus,
+  NetworkNumber,
 } from '../types';
-import { NetworkNumber } from '../types/common';
 
 /**
  * Merkl tags Aave V4 reward campaigns by scope via the `type` field:
@@ -34,8 +34,8 @@ const buildIncentive = (opportunity: MerklOpportunity): IncentiveData => {
 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),
+    const res = await fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
+      signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     if (!res.ok) throw new Error('Failed to fetch Aave V4 Merkle campaigns');
     const opportunities = await res.json() as MerklOpportunity[];

package/src/claiming/aaveV3.ts

@@ -1,12 +1,12 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
-import { EthAddress, NetworkNumber } from '../types/common';
+import { EthAddress, NetworkNumber } from '../types';
 import { ClaimableToken, ClaimType } from '../types/claiming';
 import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveRewardsControllerViem,
 } from '../contracts';
-import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
+import { compareAddresses, getEthAmountForDecimals, LONGER_TIMEOUT } from '../services/utils';
 import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';
 
 type AaveReward = {
@@ -106,8 +106,8 @@ export async function getUnclaimedRewardsForAllMarkets(
 export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber): Promise<ClaimableToken[]> {
   let data;
   try {
-    const res = await fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`,
-      { signal: AbortSignal.timeout(3000) });
+    const res = await fetch(`https://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`,
+      { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
     data = await res.json();
   } catch (error) {
     console.error('External API Failure: Aave Merit', error);
@@ -116,6 +116,10 @@ export async function getMeritUnclaimedRewards(account: EthAddress, network: Net
 
   const claimableTokens: ClaimableToken[] = [];
 
+  // Merkl (or our proxy, on a non-2xx) can return a non-array error body; `fetch` doesn't throw on
+  // HTTP errors, so guard before iterating. Mirrors the app-side getMeritUnclaimedRewards.
+  if (!Array.isArray(data)) return claimableTokens;
+
   data.forEach((item: { rewards: any[]; }) => {
     item.rewards.forEach(reward => {
       const {