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

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.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.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/cjs/helpers/aaveHelpers/index.d.ts

@@ -30,6 +30,23 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, eModeCategor
     liquidationRatio: any;
     collateralFactor: any;
 };
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
+ * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
+ * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ *
+ * Intentionally NOT merged with aaveAnyGetEmodeMutableProps (which it otherwise duplicates): the two
+ * differ only for an eMode ltv-zero asset — that helper returns liquidationRatio '0', whereas this one
+ * keeps the eMode liquidation threshold (to match the contract). aaveAnyGetEmodeMutableProps also feeds
+ * liquidationLimitUsd, so unifying them would change healthRatio / liqRatio / liquidationPrice for
+ * eMode-ltv-zero positions — to be done as a separate, validated follow-up PR.
+ */
+export declare const aaveAnyGetUserReserveLtvAndLltv: ({ eModeCategory, eModeCategoriesData, assetsData, }: AaveHelperCommon, _asset: string) => {
+    ltv: string;
+    lltv: string;
+};
 export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
     action: string;

package/cjs/helpers/aaveHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
+exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetUserReserveLtvAndLltv = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const types_1 = require("../../types");
@@ -83,6 +83,39 @@ const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, asset
     return ({ liquidationRatio, collateralFactor });
 };
 exports.aaveAnyGetEmodeMutableProps = aaveAnyGetEmodeMutableProps;
+/**
+ * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
+ * in the safety-ratio fallback. Matches AaveV3View.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
+ * Values are fractions (e.g. 0.8), so 5% === 0.05.
+ */
+const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
+ * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
+ * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ *
+ * Intentionally NOT merged with aaveAnyGetEmodeMutableProps (which it otherwise duplicates): the two
+ * differ only for an eMode ltv-zero asset — that helper returns liquidationRatio '0', whereas this one
+ * keeps the eMode liquidation threshold (to match the contract). aaveAnyGetEmodeMutableProps also feeds
+ * liquidationLimitUsd, so unifying them would change healthRatio / liqRatio / liquidationPrice for
+ * eMode-ltv-zero positions — to be done as a separate, validated follow-up PR.
+ */
+const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
+    const assetData = assetsData[asset];
+    const eModeCategoryData = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory];
+    if (eModeCategory === 0
+        || !eModeCategoryData
+        || !eModeCategoryData.collateralAssets.includes(asset)
+        || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
+        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+    }
+    const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
+    return { ltv, lltv: eModeCategoryData.liquidationRatio };
+};
+exports.aaveAnyGetUserReserveLtvAndLltv = aaveAnyGetUserReserveLtvAndLltv;
 const aaveAnyGetAggregatedPositionData = (_a) => {
     var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
@@ -96,6 +129,17 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
+    // instead of 0 (AaveV3View.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
+    // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
+    payload.borrowLimitWithLtvZeroFallbackUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const { ltv, lltv } = (0, exports.aaveAnyGetUserReserveLtvAndLltv)(data, symbol);
+        const effectiveLtv = new decimal_js_1.default(ltv).eq(0)
+            ? decimal_js_1.default.max(0, new decimal_js_1.default(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
+            : new decimal_js_1.default(ltv);
+        return new decimal_js_1.default(suppliedUsd).mul(effectiveLtv);
+    });
+    payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);

package/cjs/types/aave.d.ts

@@ -125,6 +125,7 @@ export interface AavePositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
+    safetyRatioWithLtvZeroFallback?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -156,6 +157,8 @@ export interface AaveV3AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    borrowLimitWithLtvZeroFallbackUsd: string;
+    safetyRatioWithLtvZeroFallback: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

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.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.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/esm/helpers/aaveHelpers/index.d.ts

@@ -30,6 +30,23 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, eModeCategor
     liquidationRatio: any;
     collateralFactor: any;
 };
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
+ * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
+ * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ *
+ * Intentionally NOT merged with aaveAnyGetEmodeMutableProps (which it otherwise duplicates): the two
+ * differ only for an eMode ltv-zero asset — that helper returns liquidationRatio '0', whereas this one
+ * keeps the eMode liquidation threshold (to match the contract). aaveAnyGetEmodeMutableProps also feeds
+ * liquidationLimitUsd, so unifying them would change healthRatio / liqRatio / liquidationPrice for
+ * eMode-ltv-zero positions — to be done as a separate, validated follow-up PR.
+ */
+export declare const aaveAnyGetUserReserveLtvAndLltv: ({ eModeCategory, eModeCategoriesData, assetsData, }: AaveHelperCommon, _asset: string) => {
+    ltv: string;
+    lltv: string;
+};
 export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
     action: string;

package/esm/helpers/aaveHelpers/index.js

@@ -69,6 +69,38 @@ export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData
     const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
+/**
+ * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
+ * in the safety-ratio fallback. Matches AaveV3View.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
+ * Values are fractions (e.g. 0.8), so 5% === 0.05.
+ */
+const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
+ * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
+ * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ *
+ * Intentionally NOT merged with aaveAnyGetEmodeMutableProps (which it otherwise duplicates): the two
+ * differ only for an eMode ltv-zero asset — that helper returns liquidationRatio '0', whereas this one
+ * keeps the eMode liquidation threshold (to match the contract). aaveAnyGetEmodeMutableProps also feeds
+ * liquidationLimitUsd, so unifying them would change healthRatio / liqRatio / liquidationPrice for
+ * eMode-ltv-zero positions — to be done as a separate, validated follow-up PR.
+ */
+export const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = getNativeAssetFromWrapped(_asset);
+    const assetData = assetsData[asset];
+    const eModeCategoryData = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory];
+    if (eModeCategory === 0
+        || !eModeCategoryData
+        || !eModeCategoryData.collateralAssets.includes(asset)
+        || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)) {
+        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+    }
+    const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
+    return { ltv, lltv: eModeCategoryData.liquidationRatio };
+};
 export const aaveAnyGetAggregatedPositionData = (_a) => {
     var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
@@ -82,6 +114,17 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
+    // instead of 0 (AaveV3View.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
+    // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
+    payload.borrowLimitWithLtvZeroFallbackUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const { ltv, lltv } = aaveAnyGetUserReserveLtvAndLltv(data, symbol);
+        const effectiveLtv = new Dec(ltv).eq(0)
+            ? Dec.max(0, new Dec(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
+            : new Dec(ltv);
+        return new Dec(suppliedUsd).mul(effectiveLtv);
+    });
+    payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);

package/esm/types/aave.d.ts

@@ -125,6 +125,7 @@ export interface AavePositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
+    safetyRatioWithLtvZeroFallback?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -156,6 +157,8 @@ export interface AaveV3AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    borrowLimitWithLtvZeroFallbackUsd: string;
+    safetyRatioWithLtvZeroFallback: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/package.json

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

package/src/aaveV3/merkl.ts

@@ -1,5 +1,5 @@
 import { aprToApy } from '../moneymarket';
-import { DEFAULT_TIMEOUT, wethToEth } from '../services/utils';
+import { LONGER_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://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,
@@ -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

@@ -6,7 +6,7 @@ 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 {

package/src/helpers/aaveHelpers/index.ts

@@ -80,6 +80,51 @@ export const aaveAnyGetEmodeMutableProps = (
   return ({ liquidationRatio, collateralFactor });
 };
 
+/**
+ * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
+ * in the safety-ratio fallback. Matches AaveV3View.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
+ * Values are fractions (e.g. 0.8), so 5% === 0.05.
+ */
+const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
+
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors AaveV3View._getUserReserveLtvAndLltv: an asset in the active eMode's ltv-zero set has
+ * ltv 0 but KEEPS the eMode liquidation threshold (liquidations only consider LLTV). The returned
+ * `ltv` is identical to aaveAnyGetEmodeMutableProps().collateralFactor in every branch, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ *
+ * Intentionally NOT merged with aaveAnyGetEmodeMutableProps (which it otherwise duplicates): the two
+ * differ only for an eMode ltv-zero asset — that helper returns liquidationRatio '0', whereas this one
+ * keeps the eMode liquidation threshold (to match the contract). aaveAnyGetEmodeMutableProps also feeds
+ * liquidationLimitUsd, so unifying them would change healthRatio / liqRatio / liquidationPrice for
+ * eMode-ltv-zero positions — to be done as a separate, validated follow-up PR.
+ */
+export const aaveAnyGetUserReserveLtvAndLltv = (
+  {
+    eModeCategory,
+    eModeCategoriesData,
+    assetsData,
+  }: AaveHelperCommon,
+  _asset: string,
+): { ltv: string, lltv: string } => {
+  const asset = getNativeAssetFromWrapped(_asset);
+  const assetData = assetsData[asset];
+  const eModeCategoryData = eModeCategoriesData?.[eModeCategory];
+
+  if (
+    eModeCategory === 0
+    || !eModeCategoryData
+    || !eModeCategoryData.collateralAssets.includes(asset)
+    || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)
+  ) {
+    return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+  }
+
+  const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
+  return { ltv, lltv: eModeCategoryData.liquidationRatio };
+};
+
 export const aaveAnyGetAggregatedPositionData = ({
   usedAssets,
   eModeCategory,
@@ -109,6 +154,21 @@ export const aaveAnyGetAggregatedPositionData = ({
   payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
   payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
   payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
+  // instead of 0 (AaveV3View.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
+  // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
+  payload.borrowLimitWithLtvZeroFallbackUsd = getAssetsTotal(
+    usedAssets,
+    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
+    ({ symbol, suppliedUsd }: { symbol: string, suppliedUsd: string }) => {
+      const { ltv, lltv } = aaveAnyGetUserReserveLtvAndLltv(data, symbol);
+      const effectiveLtv = new Dec(ltv).eq(0)
+        ? Dec.max(0, new Dec(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
+        : new Dec(ltv);
+      return new Dec(suppliedUsd).mul(effectiveLtv);
+    },
+  );
+  payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
   payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
   payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
   const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);

package/src/types/aave.ts

@@ -141,6 +141,8 @@ export interface AavePositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
   collRatio: string,
+  // Safety ratio as evaluated by automation bots (LTV-0 collateral credited at LLTV - 5%). Aave v3 only.
+  safetyRatioWithLtvZeroFallback?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,
@@ -173,6 +175,8 @@ export interface AaveV3AggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  borrowLimitWithLtvZeroFallbackUsd: string,
+  safetyRatioWithLtvZeroFallback: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,