@defisaver/positions-sdk 2.1.111-merkl-auth-api-1-dev → 2.1.112

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://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        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 Merkle campaigns');

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://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
+        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');

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://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`, { signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT) });
+            const res = yield fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(3000) });
             data = yield res.json();
         }
         catch (error) {
@@ -107,10 +107,6 @@ 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/cjs/helpers/eulerHelpers/index.js

@@ -188,21 +188,21 @@ const getApyAfterValuesEstimationEulerV2 = (actions, provider, network) => __awa
     const data = {};
     for (let i = 0; i < numOfActions; i += 1) {
         // @ts-ignore
-        const _interestRate = res[numOfActions].estimatedBorrowRates[i];
+        const _interestRate = res[numOfActions][i].toString();
         // @ts-ignore
-        const vaultInfo = res[i][0];
-        const decimals = vaultInfo.decimals;
+        const vaultInfo = res[i];
+        const decimals = vaultInfo.decimals.toString();
         const borrowRate = (0, exports.getEulerV2BorrowRate)(_interestRate);
         const amount = new decimal_js_1.default(actions[i].amount).mul(Math.pow(10, decimals)).toString();
         const action = actions[i].action;
         const isBorrowOperation = constants_1.borrowOperations.includes(action);
         const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amount, isBorrowOperation);
-        const totalBorrows = new decimal_js_1.default(vaultInfo.totalBorrows).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
-        const totalAssets = new decimal_js_1.default(vaultInfo.totalAssets).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
+        const totalBorrows = new decimal_js_1.default(vaultInfo.totalBorrows.toString()).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
+        const totalAssets = new decimal_js_1.default(vaultInfo.totalAssets.toString()).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
         const utilizationRate = (0, exports.getUtilizationRate)(totalBorrows, totalAssets);
         data[vaultInfo.vaultAddr.toLowerCase()] = {
             borrowRate,
-            supplyRate: (0, exports.getEulerV2SupplyRate)(borrowRate, utilizationRate, vaultInfo.interestFee),
+            supplyRate: (0, exports.getEulerV2SupplyRate)(borrowRate, utilizationRate, vaultInfo.interestFee.toString()),
         };
     }
     return data;

package/esm/aaveV3/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
+import { DEFAULT_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://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(LONGER_TIMEOUT),
+        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 Merkle campaigns');

package/esm/aaveV4/merkl.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT } from '../services/utils';
+import { DEFAULT_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://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
-            signal: AbortSignal.timeout(LONGER_TIMEOUT),
+        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');

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, LONGER_TIMEOUT } from '../services/utils';
+import { compareAddresses, getEthAmountForDecimals } 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://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
+            const res = yield fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`, { signal: AbortSignal.timeout(3000) });
             data = yield res.json();
         }
         catch (error) {
@@ -100,10 +100,6 @@ 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/esm/helpers/eulerHelpers/index.js

@@ -177,21 +177,21 @@ export const getApyAfterValuesEstimationEulerV2 = (actions, provider, network) =
     const data = {};
     for (let i = 0; i < numOfActions; i += 1) {
         // @ts-ignore
-        const _interestRate = res[numOfActions].estimatedBorrowRates[i];
+        const _interestRate = res[numOfActions][i].toString();
         // @ts-ignore
-        const vaultInfo = res[i][0];
-        const decimals = vaultInfo.decimals;
+        const vaultInfo = res[i];
+        const decimals = vaultInfo.decimals.toString();
         const borrowRate = getEulerV2BorrowRate(_interestRate);
         const amount = new Dec(actions[i].amount).mul(Math.pow(10, decimals)).toString();
         const action = actions[i].action;
         const isBorrowOperation = borrowOperations.includes(action);
         const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amount, isBorrowOperation);
-        const totalBorrows = new Dec(vaultInfo.totalBorrows).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
-        const totalAssets = new Dec(vaultInfo.totalAssets).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
+        const totalBorrows = new Dec(vaultInfo.totalBorrows.toString()).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
+        const totalAssets = new Dec(vaultInfo.totalAssets.toString()).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
         const utilizationRate = getUtilizationRate(totalBorrows, totalAssets);
         data[vaultInfo.vaultAddr.toLowerCase()] = {
             borrowRate,
-            supplyRate: getEulerV2SupplyRate(borrowRate, utilizationRate, vaultInfo.interestFee),
+            supplyRate: getEulerV2SupplyRate(borrowRate, utilizationRate, vaultInfo.interestFee.toString()),
         };
     }
     return data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.111-merkl-auth-api-1-dev",
+  "version": "2.1.112",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/merkl.ts

@@ -1,5 +1,5 @@
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT, wethToEth } from '../services/utils';
+import { DEFAULT_TIMEOUT, wethToEth } from '../services/utils';
 import {
   MerkleRewardMap, MerklOpportunity, OpportunityAction, OpportunityStatus,
 } from '../types';
@@ -31,8 +31,8 @@ export const formatAaveAsset = (_symbol: string) => {
 
 export const getMerkleCampaigns = async (chainId: NetworkNumber): Promise<MerkleRewardMap> => {
   try {
-    const res = await fetch('https://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
-      signal: AbortSignal.timeout(LONGER_TIMEOUT),
+    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 Merkle campaigns');
     const opportunities = await res.json() as MerklOpportunity[];

package/src/aaveV4/merkl.ts

@@ -1,5 +1,5 @@
 import { aprToApy } from '../moneymarket';
-import { LONGER_TIMEOUT } from '../services/utils';
+import { DEFAULT_TIMEOUT } from '../services/utils';
 import {
   AaveV4MerklRewardMap,
   AaveV4ReserveAssetData,
@@ -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://fe.defisaver.com/api/merkl/opportunities?mainProtocolId=aave', {
-      signal: AbortSignal.timeout(LONGER_TIMEOUT),
+    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[];

package/src/claiming/aaveV3.ts

@@ -6,7 +6,7 @@ import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveRewardsControllerViem,
 } from '../contracts';
-import { compareAddresses, getEthAmountForDecimals, LONGER_TIMEOUT } from '../services/utils';
+import { compareAddresses, getEthAmountForDecimals } 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://fe.defisaver.com/api/merkl/get-user-rewards/${account}?chainId=${network}`,
-      { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
+    const res = await fetch(`https://api-merkl.angle.money/v4/users/${account}/rewards?chainId=${network}`,
+      { signal: AbortSignal.timeout(3000) });
     data = await res.json();
   } catch (error) {
     console.error('External API Failure: Aave Merit', error);
@@ -116,10 +116,6 @@ 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 {

package/src/helpers/eulerHelpers/index.ts

@@ -173,7 +173,7 @@ export const getApyAfterValuesEstimationEulerV2 = async (actions: { action: stri
   });
 
   const res = await Promise.all([
-    ...actions.map(({ vaultAddress }) => eulerV2ViewContract.read.getVaultInfoFull([vaultAddress])),
+    ...actions.map(({ vaultAddress }) => eulerV2ViewContract.read.getVaultInfoFull([vaultAddress])) as any,
     // @ts-ignore
     eulerV2ViewContract.read.getApyAfterValuesEstimation([apyAfterValuesEstimationParams]),
   ]);
@@ -181,10 +181,10 @@ export const getApyAfterValuesEstimationEulerV2 = async (actions: { action: stri
   const data: any = {};
   for (let i = 0; i < numOfActions; i += 1) {
     // @ts-ignore
-    const _interestRate = res[numOfActions].estimatedBorrowRates[i];
+    const _interestRate = res[numOfActions][i].toString();
     // @ts-ignore
-    const vaultInfo = res[i][0];
-    const decimals = vaultInfo.decimals;
+    const vaultInfo = res[i];
+    const decimals = vaultInfo.decimals.toString();
     const borrowRate = getEulerV2BorrowRate(_interestRate);
 
     const amount = new Dec(actions[i].amount).mul(10 ** decimals).toString();
@@ -192,12 +192,12 @@ export const getApyAfterValuesEstimationEulerV2 = async (actions: { action: stri
     const isBorrowOperation = borrowOperations.includes(action);
     const { liquidityAdded, liquidityRemoved } = getLiquidityChanges(action, amount, isBorrowOperation);
 
-    const totalBorrows = new Dec(vaultInfo.totalBorrows).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
-    const totalAssets = new Dec(vaultInfo.totalAssets).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
+    const totalBorrows = new Dec(vaultInfo.totalBorrows.toString()).add(isBorrowOperation ? liquidityRemoved : '0').sub(isBorrowOperation ? liquidityAdded : '0').toString();
+    const totalAssets = new Dec(vaultInfo.totalAssets.toString()).add(isBorrowOperation ? '0' : liquidityAdded).sub(isBorrowOperation ? '0' : liquidityRemoved).toString();
     const utilizationRate = getUtilizationRate(totalBorrows, totalAssets);
     data[vaultInfo.vaultAddr.toLowerCase()] = {
       borrowRate,
-      supplyRate: getEulerV2SupplyRate(borrowRate, utilizationRate, vaultInfo.interestFee),
+      supplyRate: getEulerV2SupplyRate(borrowRate, utilizationRate, vaultInfo.interestFee.toString()),
     };
   }
   return data;