@defisaver/positions-sdk 2.1.127-midnight-1-dev → 2.1.127-midnight-2-dev

package/esm/helpers/morphoMidnightHelpers/index.d.ts

@@ -34,6 +34,23 @@ export interface MorphoMidnightBorrowQuote {
 }
 export declare const midnightTimeToMaturityDays: (maturity: number, atSeconds?: number) => number;
 export declare const midnightApyFromPrice: (price: Dec.Value, ttmDays: Dec.Value) => string;
+/**
+ * Inverse of `midnightApyFromPrice`: the loan-per-unit price a borrow APY implies,
+ * price = (1 + rate)^(−ttmDays / 365).
+ *
+ * This is what turns an absolute rate ceiling into an on-chain `maxUnits` cap (units = assets / price),
+ * and equally the principal a unit of borrow power is worth — Midnight debt is recorded at its maturity
+ * face value, so borrowing the full limit as principal would overshoot it by the interest.
+ */
+export declare const midnightPriceFromApy: (ratePercent: Dec.Value, ttmDays: Dec.Value) => string;
+/**
+ * Coerce a slippage into what the quote endpoint accepts: 0.1–100 with at most one decimal place. The
+ * validation is lexical, so a computed value (`4.15066671050631467`) is rejected outright — without this
+ * the request 400s and the quote looks unavailable.
+ *
+ * Rounded **down**, since a wider slippage is a looser cap than the caller asked for.
+ */
+export declare const midnightSlippageParam: (slippagePercent: Dec.Value) => string;
 /**
  * Current borrower rate + debt breakdown from the Midnight transactions API. On-chain we can only read the
  * total debt at maturity (`units`); the base-vs-interest split and the effective borrow rate require the
@@ -42,9 +59,20 @@ export declare const midnightApyFromPrice: (price: Dec.Value, ttmDays: Dec.Value
  */
 export declare const getMorphoMidnightUserBorrowInfo: (account: string, marketId: string, maturity: number, loanTokenSymbol: string) => Promise<MorphoMidnightBorrowInfo>;
 /**
- * Estimate the borrow rate + slippage cap for a prospective borrow by quoting the Midnight order book.
- * `assetsRaw` (and the returned `newUnits`/`maxUnits`) are raw loan-token base units — callers convert to/from
- * human amounts. `maxUnits` (from the slippage-adjusted worst price) is the cap sent on-chain to protect the
- * user if better offers get filled first. Throws if the book can't fill the amount (caller handles).
+ * Quote a prospective borrow against the Midnight order book: the estimated rate, the debt units it adds,
+ * and the `maxUnits` cap sent on-chain to protect the user if better offers get filled first. `assetsRaw`
+ * (and the returned `newUnits`/`maxUnits`) are raw loan-token base units — callers convert to/from human
+ * amounts. Throws if the book can't fill the amount (caller handles).
+ *
+ * Two ways to set the cap:
+ *  - `maxBorrowRate` — an absolute APY ceiling, honoured **exactly**: the cap price is derived locally via
+ *    `midnightPriceFromApy`. Prefer this when a user pins a max rate.
+ *  - otherwise `slippagePercent`, the API's own knob. Note it is a **price**-level slippage, not APY points:
+ *    near maturity the annualisation factor (365 / ttmDays) multiplies it heavily, so on a 22-day market a
+ *    slippage of 0.5 permitted an APY ~9pp above the estimate, not 0.5pp. It also saturates at the book's
+ *    cheapest bid. `maxRate` therefore reports what the cap actually permits, derived from the cap price.
+ *
+ * A `maxBorrowRate` below `estBorrowRate` yields `maxUnits < newUnits` — the borrow would revert on-chain.
+ * Compare the two before submitting and tell the user their ceiling is under the market rate.
  */
-export declare const getMorphoMidnightBorrowQuote: (marketId: string, assetsRaw: string, slippagePercent: Dec.Value, maturity: number) => Promise<MorphoMidnightBorrowQuote>;
+export declare const getMorphoMidnightBorrowQuote: (marketId: string, assetsRaw: string, slippagePercent: Dec.Value, maturity: number, maxBorrowRate?: Dec.Value) => Promise<MorphoMidnightBorrowQuote>;

package/esm/helpers/morphoMidnightHelpers/index.js

@@ -79,6 +79,10 @@ export const getMorphoMidnightAggregatedPositionData = ({ usedAssets, assetsData
 // loan-per-unit ratios (< 1 for a discounted fixed-term borrow); annualizing them yields the borrow APY.
 const MIDNIGHT_API_BASE = 'https://api.morpho.org/v0/midnight';
 const nowInSeconds = () => Math.floor(Date.now() / 1000);
+// The quote endpoint's `slippage` query param is validated as a string: 0.1–100, at most one decimal
+// place (`0.50` is rejected even though `0.5` passes). See `midnightSlippageParam`.
+const MIDNIGHT_SLIPPAGE_MIN = 0.1;
+const MIDNIGHT_SLIPPAGE_MAX = 100;
 // Days remaining until maturity, optionally measured at a past timestamp (for historical fills).
 export const midnightTimeToMaturityDays = (maturity, atSeconds = nowInSeconds()) => new Dec(maturity).sub(atSeconds).div(SECONDS_PER_DAY).toNumber();
 // Annualize a fixed-term discount price into an APY percent: (1 / price)^(365 / ttmDays) − 1.
@@ -92,6 +96,29 @@ export const midnightApyFromPrice = (price, ttmDays) => {
         .mul(100)
         .toString();
 };
+/**
+ * Inverse of `midnightApyFromPrice`: the loan-per-unit price a borrow APY implies,
+ * price = (1 + rate)^(−ttmDays / 365).
+ *
+ * This is what turns an absolute rate ceiling into an on-chain `maxUnits` cap (units = assets / price),
+ * and equally the principal a unit of borrow power is worth — Midnight debt is recorded at its maturity
+ * face value, so borrowing the full limit as principal would overshoot it by the interest.
+ */
+export const midnightPriceFromApy = (ratePercent, ttmDays) => {
+    const rate = new Dec(ratePercent);
+    const ttm = new Dec(ttmDays);
+    if (rate.lte(0) || ttm.lte(0))
+        return '1';
+    return new Dec(1).div(new Dec(1).add(rate.div(100)).pow(ttm.div(365))).toString();
+};
+/**
+ * Coerce a slippage into what the quote endpoint accepts: 0.1–100 with at most one decimal place. The
+ * validation is lexical, so a computed value (`4.15066671050631467`) is rejected outright — without this
+ * the request 400s and the quote looks unavailable.
+ *
+ * Rounded **down**, since a wider slippage is a looser cap than the caller asked for.
+ */
+export const midnightSlippageParam = (slippagePercent) => Dec.min(Dec.max(new Dec(slippagePercent), MIDNIGHT_SLIPPAGE_MIN), MIDNIGHT_SLIPPAGE_MAX).toDP(1, Dec.ROUND_DOWN).toString();
 /**
  * Current borrower rate + debt breakdown from the Midnight transactions API. On-chain we can only read the
  * total debt at maturity (`units`); the base-vs-interest split and the effective borrow rate require the
@@ -125,26 +152,50 @@ export const getMorphoMidnightUserBorrowInfo = (account, marketId, maturity, loa
         borrowRate, debtBase, debtInterest, debtTotal,
     };
 });
+// The API says why a quote failed — NOT_FOUND (market matured or not open yet), INSUFFICIENT_LIQUIDITY
+// (book can't fill the size), VALIDATION_ERROR (bad param, with the offending field in `details`).
+// Callers surface this to the user, so keep the reason rather than collapsing everything into one string.
+const midnightQuoteError = (error) => {
+    const detail = ((error === null || error === void 0 ? void 0 : error.details) || []).map(({ issue }) => issue).filter(Boolean).join('; ');
+    const reason = detail || (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.code);
+    return reason ? `Morpho Midnight quote unavailable: ${reason}` : 'Morpho Midnight quote unavailable';
+};
 /**
- * Estimate the borrow rate + slippage cap for a prospective borrow by quoting the Midnight order book.
- * `assetsRaw` (and the returned `newUnits`/`maxUnits`) are raw loan-token base units — callers convert to/from
- * human amounts. `maxUnits` (from the slippage-adjusted worst price) is the cap sent on-chain to protect the
- * user if better offers get filled first. Throws if the book can't fill the amount (caller handles).
+ * Quote a prospective borrow against the Midnight order book: the estimated rate, the debt units it adds,
+ * and the `maxUnits` cap sent on-chain to protect the user if better offers get filled first. `assetsRaw`
+ * (and the returned `newUnits`/`maxUnits`) are raw loan-token base units — callers convert to/from human
+ * amounts. Throws if the book can't fill the amount (caller handles).
+ *
+ * Two ways to set the cap:
+ *  - `maxBorrowRate` — an absolute APY ceiling, honoured **exactly**: the cap price is derived locally via
+ *    `midnightPriceFromApy`. Prefer this when a user pins a max rate.
+ *  - otherwise `slippagePercent`, the API's own knob. Note it is a **price**-level slippage, not APY points:
+ *    near maturity the annualisation factor (365 / ttmDays) multiplies it heavily, so on a 22-day market a
+ *    slippage of 0.5 permitted an APY ~9pp above the estimate, not 0.5pp. It also saturates at the book's
+ *    cheapest bid. `maxRate` therefore reports what the cap actually permits, derived from the cap price.
+ *
+ * A `maxBorrowRate` below `estBorrowRate` yields `maxUnits < newUnits` — the borrow would revert on-chain.
+ * Compare the two before submitting and tell the user their ceiling is under the market rate.
  */
-export const getMorphoMidnightBorrowQuote = (marketId, assetsRaw, slippagePercent, maturity) => __awaiter(void 0, void 0, void 0, function* () {
-    const url = `${MIDNIGHT_API_BASE}/books/${marketId}/bids/quote?assets=${assetsRaw}&slippage=${slippagePercent}`;
+export const getMorphoMidnightBorrowQuote = (marketId, assetsRaw, slippagePercent, maturity, maxBorrowRate) => __awaiter(void 0, void 0, void 0, function* () {
+    const url = `${MIDNIGHT_API_BASE}/books/${marketId}/bids/quote?assets=${assetsRaw}&slippage=${midnightSlippageParam(slippagePercent)}`;
     const res = yield fetch(url, { signal: AbortSignal.timeout(LONGER_TIMEOUT) });
     const json = yield res.json();
     const d = json === null || json === void 0 ? void 0 : json.data;
     if (!(d === null || d === void 0 ? void 0 : d.average_best_price))
-        throw new Error('Morpho Midnight quote unavailable');
+        throw new Error(midnightQuoteError(json === null || json === void 0 ? void 0 : json.error));
     const bestPrice = new Dec(d.average_best_price).div(WAD).toString();
-    const worstPrice = new Dec(d.average_worst_price).div(WAD).toString();
+    const worstPrice = new Dec(d.average_worst_price || 0).div(WAD).toString();
     const ttmDays = midnightTimeToMaturityDays(maturity);
     const estBorrowRate = midnightApyFromPrice(bestPrice, ttmDays);
-    const maxRate = new Dec(estBorrowRate).add(slippagePercent).toString();
+    // Price the cap sits at, and the rate that price represents — one derivation, so `maxRate` and
+    // `maxUnits` can never disagree about what the user is protected at.
+    const capPrice = maxBorrowRate !== undefined && new Dec(maxBorrowRate).gt(0)
+        ? midnightPriceFromApy(maxBorrowRate, ttmDays)
+        : worstPrice;
+    const maxRate = midnightApyFromPrice(capPrice, ttmDays);
     const newUnits = new Dec(bestPrice).lte(0) ? '0' : new Dec(assetsRaw).div(bestPrice).toFixed(0);
-    const maxUnits = new Dec(worstPrice).lte(0) ? '0' : new Dec(assetsRaw).div(worstPrice).toFixed(0);
+    const maxUnits = new Dec(capPrice).lte(0) ? '0' : new Dec(assetsRaw).div(capPrice).toFixed(0);
     return {
         bestPrice,
         worstPrice,
@@ -152,8 +203,8 @@ export const getMorphoMidnightBorrowQuote = (marketId, assetsRaw, slippagePercen
         maxRate,
         newUnits,
         maxUnits,
-        availableAssets: d.available_assets,
-        availableUnits: d.available_units,
+        availableAssets: d.available_assets || '0',
+        availableUnits: d.available_units || '0',
         takeableOffers: d.takeable_offers || [],
     };
 });

package/esm/llamaLend/index.js

@@ -25,7 +25,7 @@ const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand
     // getBandsData uses a lot of gas to get all of the bands at once, so we use pagination and fetch 200 bands at a time
     let i = minBand;
     while (i < maxBand) {
-        i += 200;
+        i += 20;
         if (i > maxBand) {
             pivots.push(maxBand);
         }

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

@@ -22,6 +22,7 @@ export declare const AAVE_V4_LIDO_SPOKE: (networkId: NetworkNumber) => AaveV4Spo
 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 AAVE_V4_USDG_MAPLE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
 export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_bluechip_spoke: AaveV4SpokeInfo;
     readonly aave_v4_ethena_correlated_spoke: AaveV4SpokeInfo;
@@ -34,6 +35,7 @@ export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
     readonly aave_v4_lombard_btc_spoke: AaveV4SpokeInfo;
     readonly aave_v4_main_spoke: AaveV4SpokeInfo;
     readonly aave_v4_usdg_pendle_spoke: AaveV4SpokeInfo;
+    readonly aave_v4_usdg_maple_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

@@ -164,6 +164,17 @@ export const AAVE_V4_USDG_PENDLE_SPOKE = (networkId) => ({
         AAVE_V4_CORE_HUB(NetworkNumber.Eth).address,
     ],
 });
+export const AAVE_V4_USDG_MAPLE_SPOKE = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'USDG Maple',
+    value: AaveV4SpokesType.AaveV4USDGMapleSpoke,
+    url: 'usdg-maple',
+    address: '0x774b9655413c34809c1f1b16b654465A89EBE989',
+    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),
@@ -176,6 +187,7 @@ export const AaveV4Spokes = (networkId) => ({
     [AaveV4SpokesType.AaveV4LombardBtcSpoke]: AAVE_V4_LOMBARD_BTC_SPOKE(networkId),
     [AaveV4SpokesType.AaveV4MainSpoke]: AAVE_V4_MAIN_SPOKE(networkId),
     [AaveV4SpokesType.AaveV4USDGPendleSpoke]: AAVE_V4_USDG_PENDLE_SPOKE(networkId),
+    [AaveV4SpokesType.AaveV4USDGMapleSpoke]: AAVE_V4_USDG_MAPLE_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/morphoBlue/index.d.ts

@@ -1,14 +1,16 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData } from '../types';
+import { MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData } from '../types';
+export declare const addMorphoBlueRewardsToMarketInfo: (marketInfo: MorphoBlueMarketInfo, rewards: MorphoBlueMarketRewards) => MorphoBlueMarketInfo;
 export declare function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
 export declare function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare const getMorphoBluePositionDataWithMarketInfo: (data: MorphoBluePositionData, marketInfo: MorphoBlueMarketInfo) => MorphoBluePositionData;
+export declare const getMorphoEarnDataWithMarketInfo: (data: MorphoBlueEarnData, marketInfo: MorphoBlueMarketInfo) => MorphoBlueEarnData;
+export declare function getMorphoBlueMarketRewards(network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketRewards>;
 export declare const _getMorphoBlueAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare const getMorphoBlueAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
 export declare function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
-export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{
-    apy: string;
-    amount: string;
-    amountUsd: string;
-}>;
+export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData>;

package/esm/morphoBlue/index.js

@@ -18,7 +18,20 @@ import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket
 import { getChainlinkAssetAddress } from '../services/priceService';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
-export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
+const getMorphoRewardIncentives = (apy) => [{
+        token: 'MORPHO',
+        apy,
+        incentiveKind: IncentiveKind.Reward,
+        description: 'Eligible for protocol-level MORPHO incentives.',
+    }];
+export const addMorphoBlueRewardsToMarketInfo = (marketInfo, rewards) => (Object.assign(Object.assign({}, marketInfo), { assetsData: Object.assign(Object.assign({}, marketInfo.assetsData), { [marketInfo.loanToken]: Object.assign(Object.assign({}, marketInfo.assetsData[marketInfo.loanToken]), { supplyIncentives: [
+                ...marketInfo.assetsData[marketInfo.loanToken].supplyIncentives.filter(({ token }) => token !== 'MORPHO'),
+                ...getMorphoRewardIncentives(rewards.supplyApy),
+            ], borrowIncentives: [
+                ...marketInfo.assetsData[marketInfo.loanToken].borrowIncentives.filter(({ token }) => token !== 'MORPHO'),
+                ...getMorphoRewardIncentives(rewards.borrowApy),
+            ] }) }) }));
+function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
@@ -50,16 +63,6 @@ export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             marketInfo = _marketInfo;
             loanTokenPrice = loanTokenPriceRound[1].toString();
         }
-        let morphoSupplyApy = '0';
-        let morphoBorrowApy = '0';
-        try {
-            const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield getRewardsForMarket(selectedMarket.marketId, network);
-            morphoSupplyApy = _morphoSupplyApy;
-            morphoBorrowApy = _morphoBorrowApy;
-        }
-        catch (e) {
-            console.error(e);
-        }
         const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets.toString(), marketInfo.totalBorrowAssets.toString(), marketInfo.borrowRate.toString(), marketInfo.fee.toString());
         const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate.toString(), marketInfo.totalBorrowShares.toString());
         const utillization = new Dec(marketInfo.totalBorrowAssets.toString()).div(marketInfo.totalSupplyAssets.toString()).mul(100).toString();
@@ -78,18 +81,8 @@ export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             totalBorrow: new Dec(marketInfo.totalBorrowAssets.toString()).div(scale).toString(),
             canBeSupplied: true,
             canBeBorrowed: true,
-            supplyIncentives: [{
-                    token: 'MORPHO',
-                    apy: morphoSupplyApy,
-                    incentiveKind: IncentiveKind.Reward,
-                    description: 'Eligible for protocol-level MORPHO incentives.',
-                }],
-            borrowIncentives: [{
-                    token: 'MORPHO',
-                    apy: morphoBorrowApy,
-                    incentiveKind: IncentiveKind.Reward,
-                    description: 'Eligible for protocol-level MORPHO incentives.',
-                }],
+            supplyIncentives: [],
+            borrowIncentives: [],
         };
         assetsData[wethToEth(collateralTokenInfo.symbol)] = {
             symbol: wethToEth(collateralTokenInfo.symbol),
@@ -124,11 +117,54 @@ export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
         };
     });
 }
+export function _getMorphoBlueMarketData(provider, network, selectedMarket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const marketInfo = yield getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+        try {
+            const rewards = yield getRewardsForMarket(selectedMarket.marketId, network);
+            return addMorphoBlueRewardsToMarketInfo(marketInfo, rewards);
+        }
+        catch (error) {
+            console.error(error);
+            return addMorphoBlueRewardsToMarketInfo(marketInfo, { supplyApy: '0', borrowApy: '0' });
+        }
+    });
+}
+export function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
+    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+}
 export function getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket);
     });
 }
+export function getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
+    return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket);
+}
+export const getMorphoBluePositionDataWithMarketInfo = (data, marketInfo) => (Object.assign(Object.assign({}, data), getMorphoBlueAggregatedPositionData({
+    usedAssets: data.usedAssets,
+    assetsData: marketInfo.assetsData,
+    marketInfo,
+})));
+export const getMorphoEarnDataWithMarketInfo = (data, marketInfo) => {
+    const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+    const usedAssets = {
+        [marketInfo.loanToken]: {
+            symbol: loanTokenInfo.symbol,
+            supplied: data.amount,
+            borrowed: '0',
+            isSupplied: new Dec(data.amount).gt(0),
+            isBorrowed: false,
+            collateral: false,
+            suppliedUsd: data.amountUsd,
+            borrowedUsd: '0',
+        },
+    };
+    return Object.assign(Object.assign({}, data), { apy: calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData }).netApy });
+};
+export function getMorphoBlueMarketRewards(network, selectedMarket) {
+    return getRewardsForMarket(selectedMarket.marketId, network);
+}
 export const _getMorphoBlueAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -216,23 +252,10 @@ export function getMorphoEarn(provider, network, account, selectedMarket, market
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
         const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenSuppliedUsd = new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString();
-        const usedAssets = {
-            [marketInfo.loanToken]: {
-                symbol: loanTokenInfo.symbol,
-                supplied: loanTokenSupplied,
-                borrowed: '0',
-                isSupplied: new Dec(loanInfo.suppliedInAssets.toString()).gt(0),
-                isBorrowed: false,
-                collateral: false,
-                suppliedUsd: loanTokenSuppliedUsd,
-                borrowedUsd: '0',
-            },
-        };
-        const { netApy } = calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData });
-        return {
-            apy: netApy,
+        return getMorphoEarnDataWithMarketInfo({
+            apy: '0',
             amount: loanTokenSupplied,
             amountUsd: loanTokenSuppliedUsd,
-        };
+        }, marketInfo);
     });
 }

package/esm/portfolio/index.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
 import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
-import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
+import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
@@ -35,6 +35,7 @@ import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
 import { getKingRewards } from '../claiming/king';
 import { fetchEthenaAirdropRewards } from '../claiming/ethena';
 import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
+import { getUniswapRewards } from '../claiming/uniswap';
 export function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
         const isMainnet = network === NetworkNumber.Eth;
@@ -52,7 +53,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
         const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
         const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
-        const args = [network, { batch: { multicall: { batchSize: isSim ? 500000 : 2500000 } } }];
+        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
         const client = getViemProvider(provider, ...args);
         const defaultClient = getViemProvider(defaultProvider, ...args);
         const morphoMarketsData = {};
@@ -137,7 +138,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         yield Promise.allSettled([
             // === MARKET DATA (needs to be fetched first) ===
             ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield _getMorphoBlueMarketData(client, network, market);
+                const marketData = yield _getMorphoBluePortfolioMarketData(client, network, market);
                 morphoMarketsData[market.value] = marketData;
             })),
             ...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
@@ -299,6 +300,34 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     }
                 }
             }))(),
+            // Batch UNI rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const uniswapRewards = yield getUniswapRewards(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].uniswap = {
+                            error: '',
+                            data: uniswapRewards[lowerAddress] || [],
+                        };
+                    }
+                }
+                catch (error) {
+                    console.error('Error fetching Uniswap rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].uniswap = {
+                            error: 'Error fetching Uniswap rewards data in batch',
+                            data: null,
+                        };
+                    }
+                }
+            }))(),
             ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {

package/esm/savings/summerVaults/options.js

@@ -7,7 +7,7 @@ export const SUMMER_VAULT_USDC_MAINNET_LR = {
     asset: 'USDC',
     network: NetworkNumber.Eth,
     deploymentBlock: 21795049,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_USDC_MAINNET_HR = {
     type: SummerVaultType.SummerVaultUSDCMainnetHR,
@@ -16,7 +16,7 @@ export const SUMMER_VAULT_USDC_MAINNET_HR = {
     asset: 'USDC',
     network: NetworkNumber.Eth,
     deploymentBlock: 22488041,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_USDT_MAINNET_LR = {
     type: SummerVaultType.SummerVaultUSDTMainnetLR,
@@ -25,7 +25,7 @@ export const SUMMER_VAULT_USDT_MAINNET_LR = {
     asset: 'USDT',
     network: NetworkNumber.Eth,
     deploymentBlock: 21795276,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_ETH_MAINNET_LR = {
     type: SummerVaultType.SummerVaultETHMainnetLR,
@@ -34,7 +34,7 @@ export const SUMMER_VAULT_ETH_MAINNET_LR = {
     asset: 'WETH',
     network: NetworkNumber.Eth,
     deploymentBlock: 21795390,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_ETH_MAINNET_HR = {
     type: SummerVaultType.SummerVaultETHMainnetHR,
@@ -43,7 +43,7 @@ export const SUMMER_VAULT_ETH_MAINNET_HR = {
     asset: 'WETH',
     network: NetworkNumber.Eth,
     deploymentBlock: 22291252,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_USDC_ARBITRUM_LR = {
     type: SummerVaultType.SummerVaultUSDCArbitrumLR,
@@ -52,7 +52,7 @@ export const SUMMER_VAULT_USDC_ARBITRUM_LR = {
     asset: 'USDC',
     network: NetworkNumber.Arb,
     deploymentBlock: 404339289,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_USDT_ARBITRUM_LR = {
     type: SummerVaultType.SummerVaultUSDTArbitrumLR,
@@ -61,7 +61,7 @@ export const SUMMER_VAULT_USDT_ARBITRUM_LR = {
     asset: 'USDT',
     network: NetworkNumber.Arb,
     deploymentBlock: 303594065,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_USDC_BASE_LR = {
     type: SummerVaultType.SummerVaultUSDCBaseLR,
@@ -70,7 +70,7 @@ export const SUMMER_VAULT_USDC_BASE_LR = {
     asset: 'USDC',
     network: NetworkNumber.Base,
     deploymentBlock: 303594065,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_EURC_BASE_LR = {
     type: SummerVaultType.SummerVaultEURCBaseLR,
@@ -79,7 +79,7 @@ export const SUMMER_VAULT_EURC_BASE_LR = {
     asset: 'EURC',
     network: NetworkNumber.Base,
     deploymentBlock: 27544064,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULT_ETH_BASE_LR = {
     type: SummerVaultType.SummerVaultETHBaseLR,
@@ -88,7 +88,7 @@ export const SUMMER_VAULT_ETH_BASE_LR = {
     asset: 'WETH',
     network: NetworkNumber.Base,
     deploymentBlock: 29066887,
-    isLegacy: false,
+    isLegacy: true,
 };
 export const SUMMER_VAULTS = {
     [SummerVaultType.SummerVaultUSDCMainnetLR]: SUMMER_VAULT_USDC_MAINNET_LR,

package/esm/staking/staking.js

@@ -68,6 +68,7 @@ export const STAKING_ASSETS = [
     '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 USDG Sep',
+    'syrupUSDG',
 ];
 export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [asset_1, ...args_1], void 0, function* (asset, network = NetworkNumber.Eth) {
     try {
@@ -125,6 +126,8 @@ export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [
             return yield getApyFromDfsApi('syrupUSDT');
         if (asset === 'syrupUSDC')
             return yield getApyFromDfsApi('syrupUSDC');
+        if (asset === 'syrupUSDG')
+            return yield getApyFromDfsApi('syrupUSDG');
         if (asset === 'wstUSR')
             return yield getApyFromDfsApi('wstUSR');
         if (asset === 'PT sUSDe Feb')

package/esm/types/aaveV4.d.ts

@@ -16,7 +16,8 @@ export declare enum AaveV4SpokesType {
     AaveV4LidoSpoke = "aave_v4_lido_spoke",
     AaveV4LombardBtcSpoke = "aave_v4_lombard_btc_spoke",
     AaveV4MainSpoke = "aave_v4_main_spoke",
-    AaveV4USDGPendleSpoke = "aave_v4_usdg_pendle_spoke"
+    AaveV4USDGPendleSpoke = "aave_v4_usdg_pendle_spoke",
+    AaveV4USDGMapleSpoke = "aave_v4_usdg_maple_spoke"
 }
 export interface AaveV4HubInfo {
     chainIds: NetworkNumber[];

package/esm/types/aaveV4.js

@@ -18,4 +18,5 @@ export var AaveV4SpokesType;
     AaveV4SpokesType["AaveV4LombardBtcSpoke"] = "aave_v4_lombard_btc_spoke";
     AaveV4SpokesType["AaveV4MainSpoke"] = "aave_v4_main_spoke";
     AaveV4SpokesType["AaveV4USDGPendleSpoke"] = "aave_v4_usdg_pendle_spoke";
+    AaveV4SpokesType["AaveV4USDGMapleSpoke"] = "aave_v4_usdg_maple_spoke";
 })(AaveV4SpokesType || (AaveV4SpokesType = {}));

package/esm/types/claiming.d.ts

@@ -14,6 +14,8 @@ export declare enum ClaimType {
     SPARK_AIRDROP = "SPARK_AIRDROP",
     /** Spark Airdrop */
     SPARK_WST_ETH_REWARDS = "SPARK_WST_ETH_REWARDS",// TODO: This will be removed once we fully refactor spark rewards
+    /** UNI Airdrop  */
+    UNI_REWARDS = "UNI_REWARDS",
     ETHENA_AIRDROP = "ETHENA_AIRDROP"
 }
 type _ClaimableTokenPartial = {
@@ -81,5 +83,13 @@ export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & {
 export type EthenaAirdropClaimableToken = _ClaimableTokenPartial & {
     claimType: ClaimType.ETHENA_AIRDROP;
 };
+export type UniswapAirdropClaimableToken = _ClaimableTokenPartial & {
+    claimType: ClaimType.UNI_REWARDS;
+    additionalClaimFields: {
+        index: number;
+        isClaimed: boolean;
+        proof: string[];
+    };
+};
 export type ClaimableToken = AaveRewardsClaimableToken | AaveMeritRewardsClaimableToken | CompoundV3CompClaimableToken | SparkRewardsClaimableToken | KingRewardsClaimableToken | SparkAirdropClaimableToken | SparkWstEthRewardsClaimableToken | EthenaAirdropClaimableToken;
 export {};

package/esm/types/claiming.js

@@ -14,6 +14,8 @@ export var ClaimType;
     ClaimType["SPARK_AIRDROP"] = "SPARK_AIRDROP";
     /** Spark Airdrop */
     ClaimType["SPARK_WST_ETH_REWARDS"] = "SPARK_WST_ETH_REWARDS";
+    /** UNI Airdrop  */
+    ClaimType["UNI_REWARDS"] = "UNI_REWARDS";
     ClaimType["ETHENA_AIRDROP"] = "ETHENA_AIRDROP";
 })(ClaimType || (ClaimType = {}));
 export var SparkAirdropType;

package/esm/types/morphoBlue.d.ts

@@ -212,6 +212,15 @@ export interface MorphoBluePositionData {
     borrowShares: string;
     exposure: string;
 }
+export interface MorphoBlueEarnData {
+    apy: string;
+    amount: string;
+    amountUsd: string;
+}
+export interface MorphoBlueMarketRewards {
+    supplyApy: string;
+    borrowApy: string;
+}
 export interface MorphoBlueVault {
     address: string;
 }