@defisaver/positions-sdk 2.1.127-midnight-dev → 2.1.127-uniswap-dev

package/esm/contracts.js

@@ -94,7 +94,6 @@ export const getYearnV3VaultContractViem = (client, address) => {
     });
 };
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
-export const MorphoMidnightViewContractViem = createViemContractFromConfigFunc('MidnightView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');
 export const AaveIncentiveDataProviderV3ContractViem = createViemContractFromConfigFunc('AaveUiIncentiveDataProviderV3');
@@ -142,3 +141,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/helpers/index.d.ts

@@ -4,7 +4,6 @@ export * as sparkHelpers from './sparkHelpers';
 export * as curveUsdHelpers from './curveUsdHelpers';
 export * as makerHelpers from './makerHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
-export * as morphoMidnightHelpers from './morphoMidnightHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';

package/esm/helpers/index.js

@@ -4,7 +4,6 @@ export * as sparkHelpers from './sparkHelpers';
 export * as curveUsdHelpers from './curveUsdHelpers';
 export * as makerHelpers from './makerHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
-export * as morphoMidnightHelpers from './morphoMidnightHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';

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;

package/esm/index.d.ts

@@ -16,11 +16,10 @@ import * as markets from './markets';
 import * as helpers from './helpers';
 import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
-import * as morphoMidnight from './morphoMidnight';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/index.js

@@ -16,11 +16,10 @@ import * as markets from './markets';
 import * as helpers from './helpers';
 import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
-import * as morphoMidnight from './morphoMidnight';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/esm/markets/index.d.ts

@@ -3,7 +3,6 @@ export { CompoundMarkets, compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCo
 export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
-export { MorphoMidnightMarkets, findMorphoMidnightMarket } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';

package/esm/markets/index.js

@@ -3,7 +3,6 @@ export { CompoundMarkets, compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCo
 export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
-export { MorphoMidnightMarkets, findMorphoMidnightMarket } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';

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/discovery.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 { getViemProvider, setViemBlockNumber } from '../services/viem';
-import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LlamaLendMarkets, MorphoBlueMarkets, MorphoMidnightMarkets, SparkMarkets, } from '../markets';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
 import { AaveVersions, CompoundVersions } from '../types';
 import { _getAaveV4AccountHasAnyBalance } from '../aaveV4';
 import { _getCompoundV2AccountBalances } from '../compoundV2';
@@ -18,7 +18,6 @@ import { _getCompoundV3AccountBalances } from '../compoundV3';
 import { _getCrvUsdAccountBalances } from '../curveUsd';
 import { _getLlamaLendAccountBalances } from '../llamaLend';
 import { _getMorphoBlueAccountBalances } from '../morphoBlue';
-import { _getMorphoMidnightAccountBalances } from '../morphoMidnight';
 import { createViemContractFromConfigFunc } from '../contracts';
 const hasAnyBalance = (balances) => ([balances.collateral, balances.debt].some((group) => Object.values(group || {}).some((amount) => new Dec(amount || '0').gt(0))));
 /**
@@ -82,9 +81,6 @@ export function getUserPositionsExistence(provider_1, network_1, address_1) {
         Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network)).forEach((market) => {
             tasks.push(balanceTask(market.value, () => _getMorphoBlueAccountBalances(client, network, block, false, address, market)));
         });
-        Object.values(MorphoMidnightMarkets(network)).filter((market) => market.chainIds.includes(network)).forEach((market) => {
-            tasks.push(balanceTask(market.value, () => _getMorphoMidnightAccountBalances(client, network, block, false, address, market)));
-        });
         yield Promise.all(tasks);
         return existence;
     });

package/esm/portfolio/index.js

@@ -9,9 +9,8 @@ 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 { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
+import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
+import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 import { AaveVersions, CompoundVersions, } from '../types';
 import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
 import { _getSparkAccountData, _getSparkMarketsData } from '../spark';
@@ -35,12 +34,12 @@ 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;
         const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
         const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
-        const morphoMidnightMarkets = Object.values(MorphoMidnightMarkets(network)).filter((market) => market.chainIds.includes(network));
         const compoundV3Markets = Object.values(CompoundMarkets(network)).filter((market) => market.chainIds.includes(network) && market.value !== CompoundVersions.CompoundV2);
         const sparkMarkets = Object.values(SparkMarkets(network)).filter((market) => market.chainIds.includes(network));
         const eulerV2Markets = Object.values(EulerV2Markets(network)).filter((market) => market.chainIds.includes(network));
@@ -56,7 +55,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const client = getViemProvider(provider, ...args);
         const defaultClient = getViemProvider(defaultProvider, ...args);
         const morphoMarketsData = {};
-        const morphoMidnightMarketsData = {};
         const compoundV3MarketsData = {};
         const sparkMarketsData = {};
         const eulerV2MarketsData = {};
@@ -70,7 +68,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
         const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
-            morphoMidnightMarketsData,
             compoundV3MarketsData,
             sparkMarketsData,
             eulerV2MarketsData,
@@ -91,7 +88,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                 aaveV3: {},
                 aaveV4: {},
                 morphoBlue: {},
-                morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
                 eulerV2: {},
@@ -112,7 +108,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
             stakingPositions[address.toLowerCase()] = {
                 aaveV3: {},
                 morphoBlue: {},
-                morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
                 aaveV2: {},
@@ -137,13 +132,9 @@ 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* () {
-                const marketData = yield _getMorphoMidnightMarketData(client, network, market);
-                morphoMidnightMarketsData[market.value] = marketData;
-            })),
             ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield _getCompoundV3MarketsData(client, network, market, defaultClient);
                 compoundV3MarketsData[market.value] = marketData;
@@ -299,6 +290,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) {
@@ -454,40 +473,6 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...morphoMidnightMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
-                        _getMorphoMidnightAccountData(client, network, address, market, morphoMidnightMarketsData[market.value]),
-                        getMorphoMidnightEarn(client, network, address, market, morphoMidnightMarketsData[market.value]),
-                    ]);
-                    if (accDataPromise.status === 'rejected') {
-                        console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, accDataPromise.reason);
-                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                    }
-                    if (earnDataPromise.status === 'rejected') {
-                        console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
-                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                    }
-                    if (accDataPromise.status !== 'rejected') {
-                        const accData = accDataPromise.value;
-                        if (new Dec(accData.suppliedUsd).gt(0))
-                            positions[address.toLowerCase()].morphoMidnight[market.value] = { error: '', data: accData };
-                    }
-                    if (earnDataPromise.status !== 'rejected') {
-                        const earnData = earnDataPromise.value;
-                        if (earnData && new Dec(earnData.amount).gt(0)) {
-                            stakingPositions[address.toLowerCase()].morphoMidnight[market.value] = {
-                                error: '',
-                                data: earnData,
-                            };
-                        }
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
             ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });

package/esm/services/viem.d.ts

@@ -833,7 +833,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
-            chainId?: number | undefined;
             type: "legacy";
             gas: bigint;
             nonce: number;
@@ -848,6 +847,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             yParity?: undefined | undefined;
             input: import("viem").Hex;
             typeHex: import("viem").Hex | null;
+            chainId?: number | undefined;
             blockNumber: (blockTag extends "pending" ? true : false) extends infer T ? T extends (blockTag extends "pending" ? true : false) ? T extends true ? null : bigint : never : never;
             blockHash: (blockTag extends "pending" ? true : false) extends infer T_1 ? T_1 extends (blockTag extends "pending" ? true : false) ? T_1 extends true ? null : `0x${string}` : never : never;
             transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_2 ? T_2 extends (blockTag extends "pending" ? true : false) ? T_2 extends true ? null : number : never : never;
@@ -858,7 +858,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
-            chainId: number;
             type: "eip2930";
             gas: bigint;
             nonce: number;
@@ -873,6 +872,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             yParity: number;
             input: import("viem").Hex;
             typeHex: import("viem").Hex | null;
+            chainId: number;
             blockNumber: (blockTag extends "pending" ? true : false) extends infer T_3 ? T_3 extends (blockTag extends "pending" ? true : false) ? T_3 extends true ? null : bigint : never : never;
             blockHash: (blockTag extends "pending" ? true : false) extends infer T_4 ? T_4 extends (blockTag extends "pending" ? true : false) ? T_4 extends true ? null : `0x${string}` : never : never;
             transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_5 ? T_5 extends (blockTag extends "pending" ? true : false) ? T_5 extends true ? null : number : never : never;
@@ -883,7 +883,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
-            chainId: number;
             type: "eip1559";
             gas: bigint;
             nonce: number;
@@ -898,6 +897,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             yParity: number;
             input: import("viem").Hex;
             typeHex: import("viem").Hex | null;
+            chainId: number;
             blockNumber: (blockTag extends "pending" ? true : false) extends infer T_6 ? T_6 extends (blockTag extends "pending" ? true : false) ? T_6 extends true ? null : bigint : never : never;
             blockHash: (blockTag extends "pending" ? true : false) extends infer T_7 ? T_7 extends (blockTag extends "pending" ? true : false) ? T_7 extends true ? null : `0x${string}` : never : never;
             transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_8 ? T_8 extends (blockTag extends "pending" ? true : false) ? T_8 extends true ? null : number : never : never;
@@ -908,7 +908,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
-            chainId: number;
             type: "eip4844";
             gas: bigint;
             nonce: number;
@@ -923,6 +922,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             yParity: number;
             input: import("viem").Hex;
             typeHex: import("viem").Hex | null;
+            chainId: number;
             blockNumber: (blockTag extends "pending" ? true : false) extends infer T_9 ? T_9 extends (blockTag extends "pending" ? true : false) ? T_9 extends true ? null : bigint : never : never;
             blockHash: (blockTag extends "pending" ? true : false) extends infer T_10 ? T_10 extends (blockTag extends "pending" ? true : false) ? T_10 extends true ? null : `0x${string}` : never : never;
             transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_11 ? T_11 extends (blockTag extends "pending" ? true : false) ? T_11 extends true ? null : number : never : never;
@@ -933,7 +933,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             s: import("viem").Hex;
             value: bigint;
             v: bigint;
-            chainId: number;
             type: "eip7702";
             gas: bigint;
             nonce: number;
@@ -948,6 +947,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
             yParity: number;
             input: import("viem").Hex;
             typeHex: import("viem").Hex | null;
+            chainId: number;
             blockNumber: (blockTag extends "pending" ? true : false) extends infer T_12 ? T_12 extends (blockTag extends "pending" ? true : false) ? T_12 extends true ? null : bigint : never : never;
             blockHash: (blockTag extends "pending" ? true : false) extends infer T_13 ? T_13 extends (blockTag extends "pending" ? true : false) ? T_13 extends true ? null : `0x${string}` : never : never;
             transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_14 ? T_14 extends (blockTag extends "pending" ? true : false) ? T_14 extends true ? null : number : never : never;
@@ -983,7 +983,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
-        chainId?: number | undefined;
         type: "legacy";
         gas: bigint;
         nonce: number;
@@ -998,6 +997,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         yParity?: undefined | undefined;
         input: import("viem").Hex;
         typeHex: import("viem").Hex | null;
+        chainId?: number | undefined;
         blockNumber: (blockTag extends "pending" ? true : false) extends infer T ? T extends (blockTag extends "pending" ? true : false) ? T extends true ? null : bigint : never : never;
         blockHash: (blockTag extends "pending" ? true : false) extends infer T_1 ? T_1 extends (blockTag extends "pending" ? true : false) ? T_1 extends true ? null : `0x${string}` : never : never;
         transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_2 ? T_2 extends (blockTag extends "pending" ? true : false) ? T_2 extends true ? null : number : never : never;
@@ -1008,7 +1008,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
-        chainId: number;
         type: "eip2930";
         gas: bigint;
         nonce: number;
@@ -1023,6 +1022,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         yParity: number;
         input: import("viem").Hex;
         typeHex: import("viem").Hex | null;
+        chainId: number;
         blockNumber: (blockTag extends "pending" ? true : false) extends infer T_3 ? T_3 extends (blockTag extends "pending" ? true : false) ? T_3 extends true ? null : bigint : never : never;
         blockHash: (blockTag extends "pending" ? true : false) extends infer T_4 ? T_4 extends (blockTag extends "pending" ? true : false) ? T_4 extends true ? null : `0x${string}` : never : never;
         transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_5 ? T_5 extends (blockTag extends "pending" ? true : false) ? T_5 extends true ? null : number : never : never;
@@ -1033,7 +1033,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
-        chainId: number;
         type: "eip1559";
         gas: bigint;
         nonce: number;
@@ -1048,6 +1047,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         yParity: number;
         input: import("viem").Hex;
         typeHex: import("viem").Hex | null;
+        chainId: number;
         blockNumber: (blockTag extends "pending" ? true : false) extends infer T_6 ? T_6 extends (blockTag extends "pending" ? true : false) ? T_6 extends true ? null : bigint : never : never;
         blockHash: (blockTag extends "pending" ? true : false) extends infer T_7 ? T_7 extends (blockTag extends "pending" ? true : false) ? T_7 extends true ? null : `0x${string}` : never : never;
         transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_8 ? T_8 extends (blockTag extends "pending" ? true : false) ? T_8 extends true ? null : number : never : never;
@@ -1058,7 +1058,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
-        chainId: number;
         type: "eip4844";
         gas: bigint;
         nonce: number;
@@ -1073,6 +1072,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         yParity: number;
         input: import("viem").Hex;
         typeHex: import("viem").Hex | null;
+        chainId: number;
         blockNumber: (blockTag extends "pending" ? true : false) extends infer T_9 ? T_9 extends (blockTag extends "pending" ? true : false) ? T_9 extends true ? null : bigint : never : never;
         blockHash: (blockTag extends "pending" ? true : false) extends infer T_10 ? T_10 extends (blockTag extends "pending" ? true : false) ? T_10 extends true ? null : `0x${string}` : never : never;
         transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_11 ? T_11 extends (blockTag extends "pending" ? true : false) ? T_11 extends true ? null : number : never : never;
@@ -1083,7 +1083,6 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         s: import("viem").Hex;
         value: bigint;
         v: bigint;
-        chainId: number;
         type: "eip7702";
         gas: bigint;
         nonce: number;
@@ -1098,6 +1097,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         yParity: number;
         input: import("viem").Hex;
         typeHex: import("viem").Hex | null;
+        chainId: number;
         blockNumber: (blockTag extends "pending" ? true : false) extends infer T_12 ? T_12 extends (blockTag extends "pending" ? true : false) ? T_12 extends true ? null : bigint : never : never;
         blockHash: (blockTag extends "pending" ? true : false) extends infer T_13 ? T_13 extends (blockTag extends "pending" ? true : false) ? T_13 extends true ? null : `0x${string}` : never : never;
         transactionIndex: (blockTag extends "pending" ? true : false) extends infer T_14 ? T_14 extends (blockTag extends "pending" ? true : false) ? T_14 extends true ? null : number : never : never;
@@ -4358,7 +4358,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
         authorizationList: import("viem").TransactionSerializableEIP7702["authorizationList"];
     } ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
         chainId?: number | undefined;
-    }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "chainId" | "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "chainId" | "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
+    }, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "type" | "gas" | "nonce" | "blobVersionedHashes" | "fees" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
     readContract: <const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "pure" | "view">, const args extends import("viem").ContractFunctionArgs<abi, "pure" | "view", functionName>>(args: import("viem").ReadContractParameters<abi, functionName, args>) => Promise<import("viem").ReadContractReturnType<abi, functionName, args>>;
     sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<import("viem").SendRawTransactionReturnType>;
     simulate: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;

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 = {

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

@@ -6,7 +6,6 @@ export * from './liquity';
 export * from './liquityV2';
 export * from './maker';
 export * from './morphoBlue';
-export * from './morphoMidnight';
 export * from './llamaLend';
 export * from './euler';
 export * from './fluid';

package/esm/types/index.js

@@ -6,7 +6,6 @@ export * from './liquity';
 export * from './liquityV2';
 export * from './maker';
 export * from './morphoBlue';
-export * from './morphoMidnight';
 export * from './llamaLend';
 export * from './euler';
 export * from './fluid';