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

package/cjs/morphoBlue/index.js

@@ -12,9 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = void 0;
+exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = exports.getMorphoEarnDataWithMarketInfo = exports.getMorphoBluePositionDataWithMarketInfo = exports.addMorphoBlueRewardsToMarketInfo = void 0;
 exports._getMorphoBlueMarketData = _getMorphoBlueMarketData;
+exports._getMorphoBluePortfolioMarketData = _getMorphoBluePortfolioMarketData;
 exports.getMorphoBlueMarketData = getMorphoBlueMarketData;
+exports.getMorphoBluePortfolioMarketData = getMorphoBluePortfolioMarketData;
+exports.getMorphoBlueMarketRewards = getMorphoBlueMarketRewards;
 exports._getMorphoBlueAccountData = _getMorphoBlueAccountData;
 exports.getMorphoBlueAccountData = getMorphoBlueAccountData;
 exports.getMorphoEarn = getMorphoEarn;
@@ -29,7 +32,21 @@ const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
 const priceService_1 = require("../services/priceService");
 const viem_1 = require("../services/viem");
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
-function _getMorphoBlueMarketData(provider, network, selectedMarket) {
+const getMorphoRewardIncentives = (apy) => [{
+        token: 'MORPHO',
+        apy,
+        incentiveKind: common_1.IncentiveKind.Reward,
+        description: 'Eligible for protocol-level MORPHO incentives.',
+    }];
+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),
+            ] }) }) }));
+exports.addMorphoBlueRewardsToMarketInfo = addMorphoBlueRewardsToMarketInfo;
+function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
@@ -61,16 +78,6 @@ function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             marketInfo = _marketInfo;
             loanTokenPrice = loanTokenPriceRound[1].toString();
         }
-        let morphoSupplyApy = '0';
-        let morphoBorrowApy = '0';
-        try {
-            const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
-            morphoSupplyApy = _morphoSupplyApy;
-            morphoBorrowApy = _morphoBorrowApy;
-        }
-        catch (e) {
-            console.error(e);
-        }
         const supplyRate = (0, morphoBlueHelpers_1.getSupplyRate)(marketInfo.totalSupplyAssets.toString(), marketInfo.totalBorrowAssets.toString(), marketInfo.borrowRate.toString(), marketInfo.fee.toString());
         const compoundedBorrowRate = (0, morphoBlueHelpers_1.getBorrowRate)(marketInfo.borrowRate.toString(), marketInfo.totalBorrowShares.toString());
         const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets.toString()).div(marketInfo.totalSupplyAssets.toString()).mul(100).toString();
@@ -89,18 +96,8 @@ function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets.toString()).div(scale).toString(),
             canBeSupplied: true,
             canBeBorrowed: true,
-            supplyIncentives: [{
-                    token: 'MORPHO',
-                    apy: morphoSupplyApy,
-                    incentiveKind: common_1.IncentiveKind.Reward,
-                    description: 'Eligible for protocol-level MORPHO incentives.',
-                }],
-            borrowIncentives: [{
-                    token: 'MORPHO',
-                    apy: morphoBorrowApy,
-                    incentiveKind: common_1.IncentiveKind.Reward,
-                    description: 'Eligible for protocol-level MORPHO incentives.',
-                }],
+            supplyIncentives: [],
+            borrowIncentives: [],
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
@@ -135,11 +132,56 @@ function _getMorphoBlueMarketData(provider, network, selectedMarket) {
         };
     });
 }
+function _getMorphoBlueMarketData(provider, network, selectedMarket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const marketInfo = yield getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+        try {
+            const rewards = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
+            return (0, exports.addMorphoBlueRewardsToMarketInfo)(marketInfo, rewards);
+        }
+        catch (error) {
+            console.error(error);
+            return (0, exports.addMorphoBlueRewardsToMarketInfo)(marketInfo, { supplyApy: '0', borrowApy: '0' });
+        }
+    });
+}
+function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
+    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+}
 function getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         return _getMorphoBlueMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
     });
 }
+function getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
+    return _getMorphoBluePortfolioMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
+}
+const getMorphoBluePositionDataWithMarketInfo = (data, marketInfo) => (Object.assign(Object.assign({}, data), (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({
+    usedAssets: data.usedAssets,
+    assetsData: marketInfo.assetsData,
+    marketInfo,
+})));
+exports.getMorphoBluePositionDataWithMarketInfo = getMorphoBluePositionDataWithMarketInfo;
+const getMorphoEarnDataWithMarketInfo = (data, marketInfo) => {
+    const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+    const usedAssets = {
+        [marketInfo.loanToken]: {
+            symbol: loanTokenInfo.symbol,
+            supplied: data.amount,
+            borrowed: '0',
+            isSupplied: new decimal_js_1.default(data.amount).gt(0),
+            isBorrowed: false,
+            collateral: false,
+            suppliedUsd: data.amountUsd,
+            borrowedUsd: '0',
+        },
+    };
+    return Object.assign(Object.assign({}, data), { apy: (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData }).netApy });
+};
+exports.getMorphoEarnDataWithMarketInfo = getMorphoEarnDataWithMarketInfo;
+function getMorphoBlueMarketRewards(network, selectedMarket) {
+    return (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
+}
 const _getMorphoBlueAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -229,23 +271,10 @@ function getMorphoEarn(provider, network, account, selectedMarket, marketInfo) {
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
         const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenSuppliedUsd = new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString();
-        const usedAssets = {
-            [marketInfo.loanToken]: {
-                symbol: loanTokenInfo.symbol,
-                supplied: loanTokenSupplied,
-                borrowed: '0',
-                isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
-                isBorrowed: false,
-                collateral: false,
-                suppliedUsd: loanTokenSuppliedUsd,
-                borrowedUsd: '0',
-            },
-        };
-        const { netApy } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData });
-        return {
-            apy: netApy,
+        return (0, exports.getMorphoEarnDataWithMarketInfo)({
+            apy: '0',
             amount: loanTokenSupplied,
             amountUsd: loanTokenSuppliedUsd,
-        };
+        }, marketInfo);
     });
 }

package/cjs/portfolio/index.js

@@ -55,6 +55,7 @@ const spark_2 = require("../claiming/spark");
 const king_1 = require("../claiming/king");
 const ethena_1 = require("../claiming/ethena");
 const aaveV4_1 = require("../aaveV4");
+const uniswap_1 = require("../claiming/uniswap");
 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 === common_1.NetworkNumber.Eth;
@@ -72,7 +73,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
         const liquityV2MarketsStaking = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)).filter(market => !market.isLegacy) : [];
         const aaveV4Spokes = Object.values((0, markets_1.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 = (0, viem_1.getViemProvider)(provider, ...args);
         const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
         const morphoMarketsData = {};
@@ -157,7 +158,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         yield Promise.allSettled([
             // === MARKET DATA (needs to be fetched first) ===
             ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield (0, morphoBlue_1._getMorphoBlueMarketData)(client, network, market);
+                const marketData = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
                 morphoMarketsData[market.value] = marketData;
             })),
             ...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
@@ -319,6 +320,34 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     }
                 }
             }))(),
+            // 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 (0, uniswap_1.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/cjs/savings/summerVaults/options.js

@@ -10,7 +10,7 @@ exports.SUMMER_VAULT_USDC_MAINNET_LR = {
     asset: 'USDC',
     network: common_1.NetworkNumber.Eth,
     deploymentBlock: 21795049,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_USDC_MAINNET_HR = {
     type: types_1.SummerVaultType.SummerVaultUSDCMainnetHR,
@@ -19,7 +19,7 @@ exports.SUMMER_VAULT_USDC_MAINNET_HR = {
     asset: 'USDC',
     network: common_1.NetworkNumber.Eth,
     deploymentBlock: 22488041,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_USDT_MAINNET_LR = {
     type: types_1.SummerVaultType.SummerVaultUSDTMainnetLR,
@@ -28,7 +28,7 @@ exports.SUMMER_VAULT_USDT_MAINNET_LR = {
     asset: 'USDT',
     network: common_1.NetworkNumber.Eth,
     deploymentBlock: 21795276,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_ETH_MAINNET_LR = {
     type: types_1.SummerVaultType.SummerVaultETHMainnetLR,
@@ -37,7 +37,7 @@ exports.SUMMER_VAULT_ETH_MAINNET_LR = {
     asset: 'WETH',
     network: common_1.NetworkNumber.Eth,
     deploymentBlock: 21795390,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_ETH_MAINNET_HR = {
     type: types_1.SummerVaultType.SummerVaultETHMainnetHR,
@@ -46,7 +46,7 @@ exports.SUMMER_VAULT_ETH_MAINNET_HR = {
     asset: 'WETH',
     network: common_1.NetworkNumber.Eth,
     deploymentBlock: 22291252,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_USDC_ARBITRUM_LR = {
     type: types_1.SummerVaultType.SummerVaultUSDCArbitrumLR,
@@ -55,7 +55,7 @@ exports.SUMMER_VAULT_USDC_ARBITRUM_LR = {
     asset: 'USDC',
     network: common_1.NetworkNumber.Arb,
     deploymentBlock: 404339289,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_USDT_ARBITRUM_LR = {
     type: types_1.SummerVaultType.SummerVaultUSDTArbitrumLR,
@@ -64,7 +64,7 @@ exports.SUMMER_VAULT_USDT_ARBITRUM_LR = {
     asset: 'USDT',
     network: common_1.NetworkNumber.Arb,
     deploymentBlock: 303594065,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_USDC_BASE_LR = {
     type: types_1.SummerVaultType.SummerVaultUSDCBaseLR,
@@ -73,7 +73,7 @@ exports.SUMMER_VAULT_USDC_BASE_LR = {
     asset: 'USDC',
     network: common_1.NetworkNumber.Base,
     deploymentBlock: 303594065,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_EURC_BASE_LR = {
     type: types_1.SummerVaultType.SummerVaultEURCBaseLR,
@@ -82,7 +82,7 @@ exports.SUMMER_VAULT_EURC_BASE_LR = {
     asset: 'EURC',
     network: common_1.NetworkNumber.Base,
     deploymentBlock: 27544064,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULT_ETH_BASE_LR = {
     type: types_1.SummerVaultType.SummerVaultETHBaseLR,
@@ -91,7 +91,7 @@ exports.SUMMER_VAULT_ETH_BASE_LR = {
     asset: 'WETH',
     network: common_1.NetworkNumber.Base,
     deploymentBlock: 29066887,
-    isLegacy: false,
+    isLegacy: true,
 };
 exports.SUMMER_VAULTS = {
     [types_1.SummerVaultType.SummerVaultUSDCMainnetLR]: exports.SUMMER_VAULT_USDC_MAINNET_LR,

package/cjs/staking/staking.js

@@ -74,6 +74,7 @@ exports.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',
 ];
 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 {
@@ -131,6 +132,8 @@ exports.getStakingApy = (0, memoizee_1.default)((asset_1, ...args_1) => __awaite
             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/cjs/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/cjs/types/aaveV4.js

@@ -21,4 +21,5 @@ 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 || (exports.AaveV4SpokesType = AaveV4SpokesType = {}));

package/cjs/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/cjs/types/claiming.js

@@ -17,6 +17,8 @@ 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 || (exports.ClaimType = ClaimType = {}));
 var SparkAirdropType;

package/cjs/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;
 }

package/esm/aaveV3/index.js

@@ -53,9 +53,15 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
         const marketAddress = market.providerAddress;
         const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea, NetworkNumber.Plasma];
+        // Limit each view call to 10 tokens, run chunks concurrently, then combine their results into loanInfo.
+        const addressesPerRequest = 10;
+        const addressChunks = _addresses.length > addressesPerRequest
+            ? Array.from({ length: Math.ceil(_addresses.length / addressesPerRequest) }, (_, index) => _addresses.slice(index * addressesPerRequest, (index + 1) * addressesPerRequest))
+            : [_addresses];
+        const loanInfoPromise = Promise.all(addressChunks.map((addresses) => loanInfoContract.read.getFullTokensInfo([marketAddress, addresses], setViemBlockNumber(blockNumber)))).then((loanInfoChunks) => loanInfoChunks.flat());
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
-            loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber)),
+            loanInfoPromise,
             loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
             networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
             getMerkleCampaigns(network),

package/esm/aaveV4/lend.js

@@ -30,9 +30,9 @@ export const AAVE_V4_TOKENIZED_SPOKES = {
     GHO_PRIME: '0x900fD46d565d1ac8995928c0179052ec02a6D0E1',
     USDC_PRIME: '0x486415fb1F8b062c89ED548f871cf64304AACb31',
     USDT_PRIME: '0x46c588DD8453aC259c1f6a54b4C9A93C2aC3762D',
-    USDC_PAXOS: '0x4131E0B2E7AFeCEAf3d3b4225aA61a3B2B7535b8',
-    USDT_PAXOS: '0x8Dabe53E8cB991c57f0307F6f419E6D469b0deAA',
-    PT_USDG_Sep_PAXOS: '0x27eF1140364948A0E30E248297FfDFE5a4091ec4',
+    USDC_PAXOS: '0xaed7c529bD2878170B61C758DfAa215AC7a4FD07',
+    USDT_PAXOS: '0xa0e97e45C2f89003730E467Bd484fA3eEcE5B4Cf',
+    PT_USDG_Sep_PAXOS: '0x7Df10B4A01350D2A1d95cFbE7c9207d7210A2663',
 };
 export const AAVE_V4_TOKENIZED_SPOKE_ADDRESSES = {
     [NetworkNumber.Eth]: Object.values(AAVE_V4_TOKENIZED_SPOKES),

package/esm/claiming/index.d.ts

@@ -2,4 +2,5 @@ import * as aaveV3Claim from './aaveV3';
 import * as compV3Claim from './compV3';
 import * as kingV3Claim from './king';
 import * as sparkClaim from './spark';
-export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, };
+import * as uniswapClaim from './uniswap';
+export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, uniswapClaim, };

package/esm/claiming/index.js

@@ -2,4 +2,5 @@ import * as aaveV3Claim from './aaveV3';
 import * as compV3Claim from './compV3';
 import * as kingV3Claim from './king';
 import * as sparkClaim from './spark';
-export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, };
+import * as uniswapClaim from './uniswap';
+export { aaveV3Claim, compV3Claim, kingV3Claim, sparkClaim, uniswapClaim, };

package/esm/claiming/uniswap.d.ts

@@ -0,0 +1,5 @@
+import { Client } from 'viem';
+import { EthAddress, NetworkNumber } from '../types';
+import { UniswapAirdropClaimableToken } from '../types/claiming';
+export declare const fetchUniswapRewardsData: (walletAddress: EthAddress) => Promise<any>;
+export declare const getUniswapRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, UniswapAirdropClaimableToken[]>>;

package/esm/claiming/uniswap.js

@@ -0,0 +1,67 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import Dec from 'decimal.js';
+import { assetAmountInEth } from '@defisaver/tokens';
+import { UniswapTokenDistributorViem } from '../contracts';
+import { ClaimType } from '../types/claiming';
+const EMPTY_DATA = (walletAddress) => ({
+    address: walletAddress, index: 0, amount: '0x0', proof: [],
+});
+export const fetchUniswapRewardsData = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const res = yield fetch(`https://fe.defisaver.com/api/rewards/uniswap?user=${walletAddress}`, { signal: AbortSignal.timeout(5000) });
+        if (!res.ok)
+            throw new Error(yield res.text());
+        const data = yield res.json();
+        if (data.data.error)
+            return EMPTY_DATA(walletAddress);
+        return data.data;
+    }
+    catch (err) {
+        return EMPTY_DATA(walletAddress);
+    }
+});
+export const getUniswapRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
+    // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
+    const apiDataPromises = walletAddresses.map(address => fetchUniswapRewardsData(address));
+    const apiDataArray = yield Promise.all(apiDataPromises);
+    // Batch all contract calls using multicall
+    const contract = UniswapTokenDistributorViem(provider, network);
+    const cumulativePromises = apiDataArray.map(data => (data.index ? contract.read.isClaimed([data.index]) : Promise.resolve(false)));
+    const cumulativeResults = yield Promise.all(cumulativePromises);
+    // Process results
+    const results = {};
+    for (let i = 0; i < walletAddresses.length; i++) {
+        const walletAddress = walletAddresses[i];
+        const data = apiDataArray[i];
+        const cumulative = cumulativeResults[i];
+        const amountToClaim = new Dec(data.amount);
+        if (amountToClaim.lessThanOrEqualTo('0') || cumulative) {
+            results[walletAddress.toLowerCase()] = [];
+        }
+        else {
+            results[walletAddress.toLowerCase()] = [{
+                    symbol: 'UNI',
+                    underlyingSymbol: 'UNI',
+                    label: 'Uniswap Airdrop',
+                    tokenAddress: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+                    amount: assetAmountInEth(amountToClaim.toString(), 'UNI'),
+                    walletAddress,
+                    claimType: ClaimType.UNI_REWARDS,
+                    additionalClaimFields: {
+                        index: data.index,
+                        isClaimed: cumulative,
+                        proof: data.proof,
+                    },
+                }];
+        }
+    }
+    return results;
+});

package/esm/config/contracts.d.ts

@@ -99340,3 +99340,25 @@ export declare const AaveV4View: {
         };
     };
 };
+export declare const UniswapTokenDistributor: {
+    readonly abi: readonly [{
+        readonly inputs: readonly [{
+            readonly internalType: "uint256";
+            readonly name: "index";
+            readonly type: "uint256";
+        }];
+        readonly name: "isClaimed";
+        readonly outputs: readonly [{
+            readonly internalType: "bool";
+            readonly name: "";
+            readonly type: "bool";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }];
+    readonly networks: {
+        readonly "1": {
+            readonly address: "0x090D4613473dEE047c3f2706764f49E0821D256e";
+        };
+    };
+};

package/esm/config/contracts.js

@@ -1358,3 +1358,11 @@ export const AaveV4View = {
         }
     }
 };
+export const UniswapTokenDistributor = {
+    "abi": [{ "inputs": [{ "internalType": "uint256", "name": "index", "type": "uint256" }], "name": "isClaimed", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }],
+    "networks": {
+        "1": {
+            "address": "0x090D4613473dEE047c3f2706764f49E0821D256e",
+        }
+    }
+};

package/esm/contracts.d.ts

@@ -619752,3 +619752,38 @@ export declare const AaveV4ViewContractViem: (client: Client, network: NetworkNu
         readonly type: "function";
     }];
 };
+export declare const UniswapTokenDistributorViem: (client: Client, network: NetworkNumber, block?: Blockish) => {
+    read: {
+        isClaimed: (args: readonly [bigint], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "index";
+                readonly type: "uint256";
+            }];
+            readonly name: "isClaimed";
+            readonly outputs: readonly [{
+                readonly internalType: "bool";
+                readonly name: "";
+                readonly type: "bool";
+            }];
+            readonly stateMutability: "view";
+            readonly type: "function";
+        }], "isClaimed", readonly [bigint]>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<boolean>;
+    };
+    address: `0x${string}`;
+    abi: readonly [{
+        readonly inputs: readonly [{
+            readonly internalType: "uint256";
+            readonly name: "index";
+            readonly type: "uint256";
+        }];
+        readonly name: "isClaimed";
+        readonly outputs: readonly [{
+            readonly internalType: "bool";
+            readonly name: "";
+            readonly type: "bool";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }];
+};

package/esm/contracts.js

@@ -142,3 +142,4 @@ export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView
 export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr');
 export const SkySavingsContractView = createViemContractFromConfigFunc('SkySavings');
 export const AaveV4ViewContractViem = createViemContractFromConfigFunc('AaveV4View');
+export const UniswapTokenDistributorViem = createViemContractFromConfigFunc('UniswapTokenDistributor');

package/esm/curveUsd/index.js

@@ -24,7 +24,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/helpers/morphoBlueHelpers/index.js

@@ -348,6 +348,7 @@ export const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0,
             query: REWARDS_QUERY,
             variables: { marketId, chainId: network },
         }),
+        signal: AbortSignal.timeout(LONGER_TIMEOUT),
     });
     const data = yield response.json();
     const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;