@defisaver/positions-sdk 2.1.114 → 2.1.116

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/lend.d.ts

@@ -20,7 +20,7 @@ export interface AaveV4TokenizationSpokeData {
 }
 export declare const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress>;
 export declare const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>>;
-export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME';
+export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME' | 'PAXOS';
 export declare const aaveV4GetTokenizedHubKey: (hubNameOrKey?: string | null) => AaveV4TokenizedHubKey | null;
 export declare const aaveV4GetTokenizedVaultKey: (symbol: string, hubNameOrKey?: string | null) => string | null;
 export declare const aaveV4GetTokenizedVaultAddress: (network: NetworkNumber, symbol: string, hubNameOrKey?: string | null) => EthAddress | undefined;

package/cjs/aaveV4/lend.js

@@ -34,6 +34,8 @@ exports.AAVE_V4_TOKENIZED_SPOKES = {
     GHO_PRIME: '0x900fD46d565d1ac8995928c0179052ec02a6D0E1',
     USDC_PRIME: '0x486415fb1F8b062c89ED548f871cf64304AACb31',
     USDT_PRIME: '0x46c588DD8453aC259c1f6a54b4C9A93C2aC3762D',
+    // USDC_PAXOS: '0x0',
+    // USDT_PAXOS: '0x0',
 };
 exports.AAVE_V4_TOKENIZED_SPOKE_ADDRESSES = {
     [common_1.NetworkNumber.Eth]: Object.values(exports.AAVE_V4_TOKENIZED_SPOKES),
@@ -48,12 +50,16 @@ const aaveV4GetTokenizedHubKey = (hubNameOrKey) => {
         return 'PLUS';
     if (normalized === 'PRIME' || normalized === 'PRIME HUB')
         return 'PRIME';
+    if (normalized === 'PAXOS' || normalized === 'PAXOS HUB')
+        return 'PAXOS';
     if (normalized.includes('CORE'))
         return 'CORE';
     if (normalized.includes('PLUS'))
         return 'PLUS';
     if (normalized.includes('PRIME'))
         return 'PRIME';
+    if (normalized.includes('PAXOS'))
+        return 'PAXOS';
     return null;
 };
 exports.aaveV4GetTokenizedHubKey = aaveV4GetTokenizedHubKey;

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/cjs/helpers/morphoBlueHelpers/index.js

@@ -196,9 +196,7 @@ const REWARDS_QUERY = `
       marketId
       state {
         rewards {
-          amountPerSuppliedToken
           supplyApr
-          amountPerBorrowedToken
           borrowApr
           asset {
             address

package/cjs/markets/aaveV4/index.d.ts

@@ -2,10 +2,12 @@ import { AaveV4HubInfo, AaveV4HubsType, AaveV4SpokeInfo, AaveV4SpokesType, Netwo
 export declare const AAVE_V4_CORE_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AAVE_V4_PLUS_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AAVE_V4_PRIME_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
+export declare const AAVE_V4_PAXOS_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AaveV4Hubs: (networkId: NetworkNumber) => {
     readonly aave_v4_core_hub: AaveV4HubInfo;
     readonly aave_v4_plus_hub: AaveV4HubInfo;
     readonly aave_v4_prime_hub: AaveV4HubInfo;
+    readonly aave_v4_paxos_hub: AaveV4HubInfo;
 };
 export declare const getAaveV4HubTypeInfo: (type: AaveV4HubsType, network?: NetworkNumber) => AaveV4HubInfo;
 export declare const getAaveV4HubByAddress: (networkId: NetworkNumber, address: string) => AaveV4HubInfo | undefined;
@@ -19,6 +21,7 @@ export declare const AAVE_V4_KELP_SPOKE: (networkId: NetworkNumber) => AaveV4Spo
 export declare const AAVE_V4_LIDO_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AAVE_V4_LOMBARD_BTC_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AAVE_V4_MAIN_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
+export declare const AAVE_V4_USDG_PENDLE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_bluechip_spoke: AaveV4SpokeInfo;
     readonly aave_v4_ethena_correlated_spoke: AaveV4SpokeInfo;
@@ -30,6 +33,7 @@ export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_lido_spoke: AaveV4SpokeInfo;
     readonly aave_v4_lombard_btc_spoke: AaveV4SpokeInfo;
     readonly aave_v4_main_spoke: AaveV4SpokeInfo;
+    readonly aave_v4_usdg_pendle_spoke: AaveV4SpokeInfo;
 };
 export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;
 export declare const findAaveV4SpokeByAddress: (networkId: NetworkNumber, address: string) => AaveV4SpokeInfo | undefined;

package/cjs/markets/aaveV4/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAaveV4SpokeByAddress = exports.getAaveV4SpokeTypeInfo = exports.AaveV4Spokes = exports.AAVE_V4_MAIN_SPOKE = exports.AAVE_V4_LOMBARD_BTC_SPOKE = exports.AAVE_V4_LIDO_SPOKE = exports.AAVE_V4_KELP_SPOKE = exports.AAVE_V4_GOLD_SPOKE = exports.AAVE_V4_FOREX_SPOKE = exports.AAVE_V4_ETHERFI_SPOKE = exports.AAVE_V4_ETHENA_ECOSYSTEM_SPOKE = exports.AAVE_V4_ETHENA_CORRELATED_SPOKE = exports.AAVE_V4_BLUECHIP_SPOKE = exports.getAaveV4HubByAddress = exports.getAaveV4HubTypeInfo = exports.AaveV4Hubs = exports.AAVE_V4_PRIME_HUB = exports.AAVE_V4_PLUS_HUB = exports.AAVE_V4_CORE_HUB = void 0;
+exports.findAaveV4SpokeByAddress = exports.getAaveV4SpokeTypeInfo = exports.AaveV4Spokes = exports.AAVE_V4_USDG_PENDLE_SPOKE = exports.AAVE_V4_MAIN_SPOKE = exports.AAVE_V4_LOMBARD_BTC_SPOKE = exports.AAVE_V4_LIDO_SPOKE = exports.AAVE_V4_KELP_SPOKE = exports.AAVE_V4_GOLD_SPOKE = exports.AAVE_V4_FOREX_SPOKE = exports.AAVE_V4_ETHERFI_SPOKE = exports.AAVE_V4_ETHENA_ECOSYSTEM_SPOKE = exports.AAVE_V4_ETHENA_CORRELATED_SPOKE = exports.AAVE_V4_BLUECHIP_SPOKE = exports.getAaveV4HubByAddress = exports.getAaveV4HubTypeInfo = exports.AaveV4Hubs = exports.AAVE_V4_PAXOS_HUB = exports.AAVE_V4_PRIME_HUB = exports.AAVE_V4_PLUS_HUB = exports.AAVE_V4_CORE_HUB = void 0;
 const types_1 = require("../../types");
 // HUBS
 const AAVE_V4_CORE_HUB = (networkId) => ({
@@ -24,10 +24,18 @@ const AAVE_V4_PRIME_HUB = (networkId) => ({
     address: '0x943827DCA022D0F354a8a8c332dA1e5Eb9f9F931',
 });
 exports.AAVE_V4_PRIME_HUB = AAVE_V4_PRIME_HUB;
+const AAVE_V4_PAXOS_HUB = (networkId) => ({
+    chainIds: [types_1.NetworkNumber.Eth],
+    label: 'Paxos Hub',
+    value: types_1.AaveV4HubsType.AaveV4PaxosHub,
+    address: '0x62d63197660c080236193CA60b70E49A08E90368',
+});
+exports.AAVE_V4_PAXOS_HUB = AAVE_V4_PAXOS_HUB;
 const AaveV4Hubs = (networkId) => ({
     [types_1.AaveV4HubsType.AaveV4CoreHub]: (0, exports.AAVE_V4_CORE_HUB)(networkId),
     [types_1.AaveV4HubsType.AaveV4PlusHub]: (0, exports.AAVE_V4_PLUS_HUB)(networkId),
     [types_1.AaveV4HubsType.AaveV4PrimeHub]: (0, exports.AAVE_V4_PRIME_HUB)(networkId),
+    [types_1.AaveV4HubsType.AaveV4PaxosHub]: (0, exports.AAVE_V4_PAXOS_HUB)(networkId),
 });
 exports.AaveV4Hubs = AaveV4Hubs;
 const getAaveV4HubTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Hubs)(network !== null && network !== void 0 ? network : types_1.NetworkNumber.Eth))[type]);
@@ -165,6 +173,18 @@ const AAVE_V4_MAIN_SPOKE = (networkId) => ({
     ],
 });
 exports.AAVE_V4_MAIN_SPOKE = AAVE_V4_MAIN_SPOKE;
+const AAVE_V4_USDG_PENDLE_SPOKE = (networkId) => ({
+    chainIds: [types_1.NetworkNumber.Eth],
+    label: 'USDG Pendle',
+    value: types_1.AaveV4SpokesType.AaveV4USDGPendleSpoke,
+    url: 'usdg-pendle',
+    address: '0x956d8e0A89cfa3744428C4641b5a53B56167a7f9',
+    hubs: [
+        (0, exports.AAVE_V4_PAXOS_HUB)(types_1.NetworkNumber.Eth).address,
+        (0, exports.AAVE_V4_CORE_HUB)(types_1.NetworkNumber.Eth).address,
+    ],
+});
+exports.AAVE_V4_USDG_PENDLE_SPOKE = AAVE_V4_USDG_PENDLE_SPOKE;
 const AaveV4Spokes = (networkId) => ({
     [types_1.AaveV4SpokesType.AaveV4BluechipSpoke]: (0, exports.AAVE_V4_BLUECHIP_SPOKE)(networkId),
     [types_1.AaveV4SpokesType.AaveV4EthenaCorrelatedSpoke]: (0, exports.AAVE_V4_ETHENA_CORRELATED_SPOKE)(networkId),
@@ -176,6 +196,7 @@ const AaveV4Spokes = (networkId) => ({
     [types_1.AaveV4SpokesType.AaveV4LidoSpoke]: (0, exports.AAVE_V4_LIDO_SPOKE)(networkId),
     [types_1.AaveV4SpokesType.AaveV4LombardBtcSpoke]: (0, exports.AAVE_V4_LOMBARD_BTC_SPOKE)(networkId),
     [types_1.AaveV4SpokesType.AaveV4MainSpoke]: (0, exports.AAVE_V4_MAIN_SPOKE)(networkId),
+    [types_1.AaveV4SpokesType.AaveV4USDGPendleSpoke]: (0, exports.AAVE_V4_USDG_PENDLE_SPOKE)(networkId),
 });
 exports.AaveV4Spokes = AaveV4Spokes;
 const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, (0, exports.AaveV4Spokes)(network !== null && network !== void 0 ? network : types_1.NetworkNumber.Eth))[type]);

package/cjs/moneymarket/moneymarketCommonService.js

@@ -33,7 +33,7 @@ exports.STABLE_ASSETS = [
     'USDe', 'sUSDe', 'srUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
     'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
     'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'frxUSD', 'PT sUSDe June',
-    'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct',
+    'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
 ];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/cjs/staking/staking.js

@@ -73,7 +73,7 @@ exports.STAKING_ASSETS = [
     'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
     'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
     'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'GHO',
-    'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct',
+    'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
 ];
 exports.getStakingApy = (0, memoizee_1.default)((asset_1, ...args_1) => __awaiter(void 0, [asset_1, ...args_1], void 0, function* (asset, network = common_1.NetworkNumber.Eth) {
     try {
@@ -159,6 +159,8 @@ exports.getStakingApy = (0, memoizee_1.default)((asset_1, ...args_1) => __awaite
             return yield getApyFromDfsApi('PT USDe June', network);
         if (asset === 'PT USDG May')
             return yield getApyFromDfsApi('PT USDG May', network);
+        if (asset === 'PT USDG Sep')
+            return yield getApyFromDfsApi('PT USDG Sep', network);
         if (asset === 'PT sUSDS Nov')
             return yield getApyFromDfsApi('PT sUSDS Nov', network);
         if (asset === 'GHO')

package/cjs/types/aaveV4.d.ts

@@ -2,7 +2,8 @@ import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common
 export declare enum AaveV4HubsType {
     AaveV4CoreHub = "aave_v4_core_hub",
     AaveV4PlusHub = "aave_v4_plus_hub",
-    AaveV4PrimeHub = "aave_v4_prime_hub"
+    AaveV4PrimeHub = "aave_v4_prime_hub",
+    AaveV4PaxosHub = "aave_v4_paxos_hub"
 }
 export declare enum AaveV4SpokesType {
     AaveV4BluechipSpoke = "aave_v4_bluechip_spoke",
@@ -14,7 +15,8 @@ export declare enum AaveV4SpokesType {
     AaveV4KelpSpoke = "aave_v4_kelp_spoke",
     AaveV4LidoSpoke = "aave_v4_lido_spoke",
     AaveV4LombardBtcSpoke = "aave_v4_lombard_btc_spoke",
-    AaveV4MainSpoke = "aave_v4_main_spoke"
+    AaveV4MainSpoke = "aave_v4_main_spoke",
+    AaveV4USDGPendleSpoke = "aave_v4_usdg_pendle_spoke"
 }
 export interface AaveV4HubInfo {
     chainIds: NetworkNumber[];

package/cjs/types/aaveV4.js

@@ -6,6 +6,7 @@ var AaveV4HubsType;
     AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
     AaveV4HubsType["AaveV4PlusHub"] = "aave_v4_plus_hub";
     AaveV4HubsType["AaveV4PrimeHub"] = "aave_v4_prime_hub";
+    AaveV4HubsType["AaveV4PaxosHub"] = "aave_v4_paxos_hub";
 })(AaveV4HubsType || (exports.AaveV4HubsType = AaveV4HubsType = {}));
 var AaveV4SpokesType;
 (function (AaveV4SpokesType) {
@@ -19,4 +20,5 @@ var AaveV4SpokesType;
     AaveV4SpokesType["AaveV4LidoSpoke"] = "aave_v4_lido_spoke";
     AaveV4SpokesType["AaveV4LombardBtcSpoke"] = "aave_v4_lombard_btc_spoke";
     AaveV4SpokesType["AaveV4MainSpoke"] = "aave_v4_main_spoke";
+    AaveV4SpokesType["AaveV4USDGPendleSpoke"] = "aave_v4_usdg_pendle_spoke";
 })(AaveV4SpokesType || (exports.AaveV4SpokesType = AaveV4SpokesType = {}));

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/lend.d.ts

@@ -20,7 +20,7 @@ export interface AaveV4TokenizationSpokeData {
 }
 export declare const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress>;
 export declare const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>>;
-export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME';
+export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME' | 'PAXOS';
 export declare const aaveV4GetTokenizedHubKey: (hubNameOrKey?: string | null) => AaveV4TokenizedHubKey | null;
 export declare const aaveV4GetTokenizedVaultKey: (symbol: string, hubNameOrKey?: string | null) => string | null;
 export declare const aaveV4GetTokenizedVaultAddress: (network: NetworkNumber, symbol: string, hubNameOrKey?: string | null) => EthAddress | undefined;

package/esm/aaveV4/lend.js

@@ -30,6 +30,8 @@ export const AAVE_V4_TOKENIZED_SPOKES = {
     GHO_PRIME: '0x900fD46d565d1ac8995928c0179052ec02a6D0E1',
     USDC_PRIME: '0x486415fb1F8b062c89ED548f871cf64304AACb31',
     USDT_PRIME: '0x46c588DD8453aC259c1f6a54b4C9A93C2aC3762D',
+    // USDC_PAXOS: '0x0',
+    // USDT_PAXOS: '0x0',
 };
 export const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES = {
     [NetworkNumber.Eth]: Object.values(AAVE_V4_TOKENIZED_SPOKES),
@@ -44,12 +46,16 @@ export const aaveV4GetTokenizedHubKey = (hubNameOrKey) => {
         return 'PLUS';
     if (normalized === 'PRIME' || normalized === 'PRIME HUB')
         return 'PRIME';
+    if (normalized === 'PAXOS' || normalized === 'PAXOS HUB')
+        return 'PAXOS';
     if (normalized.includes('CORE'))
         return 'CORE';
     if (normalized.includes('PLUS'))
         return 'PLUS';
     if (normalized.includes('PRIME'))
         return 'PRIME';
+    if (normalized.includes('PAXOS'))
+        return 'PAXOS';
     return null;
 };
 export const aaveV4GetTokenizedVaultKey = (symbol, hubNameOrKey) => {

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/esm/helpers/morphoBlueHelpers/index.js

@@ -186,9 +186,7 @@ const REWARDS_QUERY = `
       marketId
       state {
         rewards {
-          amountPerSuppliedToken
           supplyApr
-          amountPerBorrowedToken
           borrowApr
           asset {
             address

package/esm/markets/aaveV4/index.d.ts

@@ -2,10 +2,12 @@ import { AaveV4HubInfo, AaveV4HubsType, AaveV4SpokeInfo, AaveV4SpokesType, Netwo
 export declare const AAVE_V4_CORE_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AAVE_V4_PLUS_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AAVE_V4_PRIME_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
+export declare const AAVE_V4_PAXOS_HUB: (networkId: NetworkNumber) => AaveV4HubInfo;
 export declare const AaveV4Hubs: (networkId: NetworkNumber) => {
     readonly aave_v4_core_hub: AaveV4HubInfo;
     readonly aave_v4_plus_hub: AaveV4HubInfo;
     readonly aave_v4_prime_hub: AaveV4HubInfo;
+    readonly aave_v4_paxos_hub: AaveV4HubInfo;
 };
 export declare const getAaveV4HubTypeInfo: (type: AaveV4HubsType, network?: NetworkNumber) => AaveV4HubInfo;
 export declare const getAaveV4HubByAddress: (networkId: NetworkNumber, address: string) => AaveV4HubInfo | undefined;
@@ -19,6 +21,7 @@ export declare const AAVE_V4_KELP_SPOKE: (networkId: NetworkNumber) => AaveV4Spo
 export declare const AAVE_V4_LIDO_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AAVE_V4_LOMBARD_BTC_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AAVE_V4_MAIN_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
+export declare const AAVE_V4_USDG_PENDLE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_bluechip_spoke: AaveV4SpokeInfo;
     readonly aave_v4_ethena_correlated_spoke: AaveV4SpokeInfo;
@@ -30,6 +33,7 @@ export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_lido_spoke: AaveV4SpokeInfo;
     readonly aave_v4_lombard_btc_spoke: AaveV4SpokeInfo;
     readonly aave_v4_main_spoke: AaveV4SpokeInfo;
+    readonly aave_v4_usdg_pendle_spoke: AaveV4SpokeInfo;
 };
 export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;
 export declare const findAaveV4SpokeByAddress: (networkId: NetworkNumber, address: string) => AaveV4SpokeInfo | undefined;

package/esm/markets/aaveV4/index.js

@@ -18,10 +18,17 @@ export const AAVE_V4_PRIME_HUB = (networkId) => ({
     value: AaveV4HubsType.AaveV4PrimeHub,
     address: '0x943827DCA022D0F354a8a8c332dA1e5Eb9f9F931',
 });
+export const AAVE_V4_PAXOS_HUB = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Paxos Hub',
+    value: AaveV4HubsType.AaveV4PaxosHub,
+    address: '0x62d63197660c080236193CA60b70E49A08E90368',
+});
 export const AaveV4Hubs = (networkId) => ({
     [AaveV4HubsType.AaveV4CoreHub]: AAVE_V4_CORE_HUB(networkId),
     [AaveV4HubsType.AaveV4PlusHub]: AAVE_V4_PLUS_HUB(networkId),
     [AaveV4HubsType.AaveV4PrimeHub]: AAVE_V4_PRIME_HUB(networkId),
+    [AaveV4HubsType.AaveV4PaxosHub]: AAVE_V4_PAXOS_HUB(networkId),
 });
 export const getAaveV4HubTypeInfo = (type, network) => (Object.assign({}, AaveV4Hubs(network !== null && network !== void 0 ? network : NetworkNumber.Eth))[type]);
 export const getAaveV4HubByAddress = (networkId, address) => Object.values(AaveV4Hubs(networkId)).find(hub => hub.address.toLowerCase() === address.toLowerCase());
@@ -146,6 +153,17 @@ export const AAVE_V4_MAIN_SPOKE = (networkId) => ({
         AAVE_V4_PRIME_HUB(NetworkNumber.Eth).address,
     ],
 });
+export const AAVE_V4_USDG_PENDLE_SPOKE = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'USDG Pendle',
+    value: AaveV4SpokesType.AaveV4USDGPendleSpoke,
+    url: 'usdg-pendle',
+    address: '0x956d8e0A89cfa3744428C4641b5a53B56167a7f9',
+    hubs: [
+        AAVE_V4_PAXOS_HUB(NetworkNumber.Eth).address,
+        AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+    ],
+});
 export const AaveV4Spokes = (networkId) => ({
     [AaveV4SpokesType.AaveV4BluechipSpoke]: AAVE_V4_BLUECHIP_SPOKE(networkId),
     [AaveV4SpokesType.AaveV4EthenaCorrelatedSpoke]: AAVE_V4_ETHENA_CORRELATED_SPOKE(networkId),
@@ -157,6 +175,7 @@ export const AaveV4Spokes = (networkId) => ({
     [AaveV4SpokesType.AaveV4LidoSpoke]: AAVE_V4_LIDO_SPOKE(networkId),
     [AaveV4SpokesType.AaveV4LombardBtcSpoke]: AAVE_V4_LOMBARD_BTC_SPOKE(networkId),
     [AaveV4SpokesType.AaveV4MainSpoke]: AAVE_V4_MAIN_SPOKE(networkId),
+    [AaveV4SpokesType.AaveV4USDGPendleSpoke]: AAVE_V4_USDG_PENDLE_SPOKE(networkId),
 });
 export const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, AaveV4Spokes(network !== null && network !== void 0 ? network : NetworkNumber.Eth))[type]);
 export const findAaveV4SpokeByAddress = (networkId, address) => Object.values(AaveV4Spokes(networkId)).find(spoke => spoke.address.toLowerCase() === address.toLowerCase());

package/esm/moneymarket/moneymarketCommonService.js

@@ -22,7 +22,7 @@ export const STABLE_ASSETS = [
     'USDe', 'sUSDe', 'srUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
     'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
     'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'frxUSD', 'PT sUSDe June',
-    'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct',
+    'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
 ];
 export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/esm/staking/staking.js

@@ -67,7 +67,7 @@ export const STAKING_ASSETS = [
     'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
     'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
     'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'GHO',
-    'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct',
+    'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
 ];
 export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [asset_1, ...args_1], void 0, function* (asset, network = NetworkNumber.Eth) {
     try {
@@ -153,6 +153,8 @@ export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [
             return yield getApyFromDfsApi('PT USDe June', network);
         if (asset === 'PT USDG May')
             return yield getApyFromDfsApi('PT USDG May', network);
+        if (asset === 'PT USDG Sep')
+            return yield getApyFromDfsApi('PT USDG Sep', network);
         if (asset === 'PT sUSDS Nov')
             return yield getApyFromDfsApi('PT sUSDS Nov', network);
         if (asset === 'GHO')

package/esm/types/aaveV4.d.ts

@@ -2,7 +2,8 @@ import { EthAddress, IncentiveData, LeverageType, NetworkNumber } from './common
 export declare enum AaveV4HubsType {
     AaveV4CoreHub = "aave_v4_core_hub",
     AaveV4PlusHub = "aave_v4_plus_hub",
-    AaveV4PrimeHub = "aave_v4_prime_hub"
+    AaveV4PrimeHub = "aave_v4_prime_hub",
+    AaveV4PaxosHub = "aave_v4_paxos_hub"
 }
 export declare enum AaveV4SpokesType {
     AaveV4BluechipSpoke = "aave_v4_bluechip_spoke",
@@ -14,7 +15,8 @@ export declare enum AaveV4SpokesType {
     AaveV4KelpSpoke = "aave_v4_kelp_spoke",
     AaveV4LidoSpoke = "aave_v4_lido_spoke",
     AaveV4LombardBtcSpoke = "aave_v4_lombard_btc_spoke",
-    AaveV4MainSpoke = "aave_v4_main_spoke"
+    AaveV4MainSpoke = "aave_v4_main_spoke",
+    AaveV4USDGPendleSpoke = "aave_v4_usdg_pendle_spoke"
 }
 export interface AaveV4HubInfo {
     chainIds: NetworkNumber[];

package/esm/types/aaveV4.js

@@ -3,6 +3,7 @@ export var AaveV4HubsType;
     AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
     AaveV4HubsType["AaveV4PlusHub"] = "aave_v4_plus_hub";
     AaveV4HubsType["AaveV4PrimeHub"] = "aave_v4_prime_hub";
+    AaveV4HubsType["AaveV4PaxosHub"] = "aave_v4_paxos_hub";
 })(AaveV4HubsType || (AaveV4HubsType = {}));
 export var AaveV4SpokesType;
 (function (AaveV4SpokesType) {
@@ -16,4 +17,5 @@ export var AaveV4SpokesType;
     AaveV4SpokesType["AaveV4LidoSpoke"] = "aave_v4_lido_spoke";
     AaveV4SpokesType["AaveV4LombardBtcSpoke"] = "aave_v4_lombard_btc_spoke";
     AaveV4SpokesType["AaveV4MainSpoke"] = "aave_v4_main_spoke";
+    AaveV4SpokesType["AaveV4USDGPendleSpoke"] = "aave_v4_usdg_pendle_spoke";
 })(AaveV4SpokesType || (AaveV4SpokesType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.114",
+  "version": "2.1.116",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "1.7.38-pt-oct-1-dev",
+    "@defisaver/tokens": "^1.7.39",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

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/lend.ts

@@ -48,13 +48,16 @@ export const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress> = {
   GHO_PRIME: '0x900fD46d565d1ac8995928c0179052ec02a6D0E1',
   USDC_PRIME: '0x486415fb1F8b062c89ED548f871cf64304AACb31',
   USDT_PRIME: '0x46c588DD8453aC259c1f6a54b4C9A93C2aC3762D',
+
+  // USDC_PAXOS: '0x0',
+  // USDT_PAXOS: '0x0',
 };
 
 export const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES: Partial<Record<NetworkNumber, EthAddress[]>> = {
   [NetworkNumber.Eth]: Object.values(AAVE_V4_TOKENIZED_SPOKES),
 };
 
-export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME';
+export type AaveV4TokenizedHubKey = 'CORE' | 'PLUS' | 'PRIME' | 'PAXOS';
 
 export const aaveV4GetTokenizedHubKey = (hubNameOrKey?: string | null): AaveV4TokenizedHubKey | null => {
   if (!hubNameOrKey) return null;
@@ -63,10 +66,12 @@ export const aaveV4GetTokenizedHubKey = (hubNameOrKey?: string | null): AaveV4To
   if (normalized === 'CORE' || normalized === 'CORE HUB') return 'CORE';
   if (normalized === 'PLUS' || normalized === 'PLUS HUB') return 'PLUS';
   if (normalized === 'PRIME' || normalized === 'PRIME HUB') return 'PRIME';
+  if (normalized === 'PAXOS' || normalized === 'PAXOS HUB') return 'PAXOS';
 
   if (normalized.includes('CORE')) return 'CORE';
   if (normalized.includes('PLUS')) return 'PLUS';
   if (normalized.includes('PRIME')) return 'PRIME';
+  if (normalized.includes('PAXOS')) return 'PAXOS';
 
   return null;
 };

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 {

package/src/helpers/morphoBlueHelpers/index.ts

@@ -206,9 +206,7 @@ const REWARDS_QUERY = `
       marketId
       state {
         rewards {
-          amountPerSuppliedToken
           supplyApr
-          amountPerBorrowedToken
           borrowApr
           asset {
             address

package/src/markets/aaveV4/index.ts

@@ -29,10 +29,18 @@ export const AAVE_V4_PRIME_HUB = (networkId: NetworkNumber): AaveV4HubInfo => ({
   address: '0x943827DCA022D0F354a8a8c332dA1e5Eb9f9F931',
 });
 
+export const AAVE_V4_PAXOS_HUB = (networkId: NetworkNumber): AaveV4HubInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Paxos Hub',
+  value: AaveV4HubsType.AaveV4PaxosHub,
+  address: '0x62d63197660c080236193CA60b70E49A08E90368',
+});
+
 export const AaveV4Hubs = (networkId: NetworkNumber) => ({
   [AaveV4HubsType.AaveV4CoreHub]: AAVE_V4_CORE_HUB(networkId),
   [AaveV4HubsType.AaveV4PlusHub]: AAVE_V4_PLUS_HUB(networkId),
   [AaveV4HubsType.AaveV4PrimeHub]: AAVE_V4_PRIME_HUB(networkId),
+  [AaveV4HubsType.AaveV4PaxosHub]: AAVE_V4_PAXOS_HUB(networkId),
 }) as const;
 
 export const getAaveV4HubTypeInfo = (type: AaveV4HubsType, network?: NetworkNumber) => ({ ...AaveV4Hubs(network ?? NetworkNumber.Eth) }[type]);
@@ -173,6 +181,18 @@ export const AAVE_V4_MAIN_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo =>
   ],
 });
 
+export const AAVE_V4_USDG_PENDLE_SPOKE = (networkId: NetworkNumber): AaveV4SpokeInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'USDG Pendle',
+  value: AaveV4SpokesType.AaveV4USDGPendleSpoke,
+  url: 'usdg-pendle',
+  address: '0x956d8e0A89cfa3744428C4641b5a53B56167a7f9',
+  hubs: [
+    AAVE_V4_PAXOS_HUB(NetworkNumber.Eth).address,
+    AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
+  ],
+});
+
 export const AaveV4Spokes = (networkId: NetworkNumber) => ({
   [AaveV4SpokesType.AaveV4BluechipSpoke]: AAVE_V4_BLUECHIP_SPOKE(networkId),
   [AaveV4SpokesType.AaveV4EthenaCorrelatedSpoke]: AAVE_V4_ETHENA_CORRELATED_SPOKE(networkId),
@@ -184,6 +204,7 @@ export const AaveV4Spokes = (networkId: NetworkNumber) => ({
   [AaveV4SpokesType.AaveV4LidoSpoke]: AAVE_V4_LIDO_SPOKE(networkId),
   [AaveV4SpokesType.AaveV4LombardBtcSpoke]: AAVE_V4_LOMBARD_BTC_SPOKE(networkId),
   [AaveV4SpokesType.AaveV4MainSpoke]: AAVE_V4_MAIN_SPOKE(networkId),
+  [AaveV4SpokesType.AaveV4USDGPendleSpoke]: AAVE_V4_USDG_PENDLE_SPOKE(networkId),
 }) as const;
 
 export const getAaveV4SpokeTypeInfo = (type: AaveV4SpokesType, network?: NetworkNumber) => ({ ...AaveV4Spokes(network ?? NetworkNumber.Eth) }[type]);

package/src/moneymarket/moneymarketCommonService.ts

@@ -25,7 +25,7 @@ export const STABLE_ASSETS = [
   'USDe', 'sUSDe', 'srUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
   'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
   'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'frxUSD', 'PT sUSDe June',
-  'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct',
+  'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
 ];
 
 export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {

package/src/staking/staking.ts

@@ -65,7 +65,7 @@ export const STAKING_ASSETS = [
   'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
   'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
   'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'GHO',
-  'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct',
+  'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
 ];
 
 export const getStakingApy = memoize(async (asset: string, network: number = NetworkNumber.Eth) => {
@@ -111,6 +111,7 @@ export const getStakingApy = memoize(async (asset: string, network: number = Net
     if (asset === 'PT sUSDe Oct') return await getApyFromDfsApi('PT sUSDe Oct', network);
     if (asset === 'PT USDe June') return await getApyFromDfsApi('PT USDe June', network);
     if (asset === 'PT USDG May') return await getApyFromDfsApi('PT USDG May', network);
+    if (asset === 'PT USDG Sep') return await getApyFromDfsApi('PT USDG Sep', network);
     if (asset === 'PT sUSDS Nov') return await getApyFromDfsApi('PT sUSDS Nov', network);
     if (asset === 'GHO') return await getApyFromDfsApi('GHO', network);
   } catch (e) {

package/src/types/aaveV4.ts

@@ -6,6 +6,7 @@ export enum AaveV4HubsType {
   AaveV4CoreHub = 'aave_v4_core_hub',
   AaveV4PlusHub = 'aave_v4_plus_hub',
   AaveV4PrimeHub = 'aave_v4_prime_hub',
+  AaveV4PaxosHub = 'aave_v4_paxos_hub',
 }
 
 export enum AaveV4SpokesType {
@@ -19,6 +20,7 @@ export enum AaveV4SpokesType {
   AaveV4LidoSpoke = 'aave_v4_lido_spoke',
   AaveV4LombardBtcSpoke = 'aave_v4_lombard_btc_spoke',
   AaveV4MainSpoke = 'aave_v4_main_spoke',
+  AaveV4USDGPendleSpoke = 'aave_v4_usdg_pendle_spoke',
 }
 
 export interface AaveV4HubInfo {