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

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;
 }

package/esm/types/portfolio.d.ts

@@ -9,7 +9,6 @@ import { LiquityTroveInfo } from './liquity';
 import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData } from './maker';
 import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
 import { SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
@@ -22,9 +21,6 @@ export interface PortfolioPositionsDataForAddress {
     morphoBlue: {
         [key in MorphoBlueVersions]?: PortfolioProtocolData<MorphoBluePositionData>;
     };
-    morphoMidnight: {
-        [key in MorphoMidnightVersions]?: PortfolioProtocolData<MorphoMidnightPositionData>;
-    };
     compoundV3: {
         [key in CompoundVersions]?: PortfolioProtocolData<CompoundV3PositionData>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.127-midnight-dev",
+  "version": "2.1.127-uniswap-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/claiming/index.ts

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

package/src/claiming/uniswap.ts

@@ -0,0 +1,65 @@
+import Dec from 'decimal.js';
+import { Client } from 'viem';
+import { assetAmountInEth } from '@defisaver/tokens';
+import { EthAddress, NetworkNumber } from '../types';
+import { UniswapTokenDistributorViem } from '../contracts';
+import { ClaimType } from '../types/claiming';
+
+const EMPTY_DATA = (walletAddress: EthAddress) => ({
+  address: walletAddress, index: 0, amount: '0x0', proof: [],
+});
+
+export const fetchUniswapRewardsData = async (walletAddress: EthAddress) => {
+  try {
+    const res = await fetch(`https://uniswap-merkl-drop.defisaver.com/claims/${walletAddress}`,
+      { signal: AbortSignal.timeout(5000) });
+
+    if (!res.ok) throw new Error(await res.text());
+
+    const data = await res.json();
+    if (data.error) return EMPTY_DATA(walletAddress);
+
+    return data;
+  } catch (err) {
+    console.error('External API Error: Error fetching Uniswap rewards:', err);
+    return EMPTY_DATA(walletAddress);
+  }
+};
+
+export const getUniswapRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => {
+  // 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 = await 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 = await Promise.all(cumulativePromises);
+
+  // Process results
+  const results: Record<string, any[]> = {};
+
+  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')) {
+      results[walletAddress.toLowerCase() as EthAddress] = [];
+    } else {
+      results[walletAddress.toLowerCase() as EthAddress] = [{
+        amount: assetAmountInEth(amountToClaim.toString(), 'UNI'),
+        walletAddress,
+        claimType: ClaimType.UNI_REWARDS,
+        index: data.index,
+        proof: data.proof,
+        isClaimed: cumulative,
+      }];
+    }
+  }
+
+  return results;
+};

package/src/config/contracts.ts

@@ -1113,15 +1113,6 @@ export const MorphoBlueView =  {
       }
     },
   } as const;
-export const MidnightView =  {
-    "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
-    "networks": {
-      "8453": {
-        "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
-        "createdBlock": 48932293,
-      }
-    },
-  } as const;
 export const FeedRegistry =  {
     "abi": [{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferRequested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"inputs":[],"name":"acceptOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"address","name":"aggregator","type":"address"}],"name":"confirmFeed","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"description","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"getAccessController","outputs":[{"internalType":"contract AccessControllerInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint256","name":"roundId","type":"uint256"}],"name":"getAnswer","outputs":[{"internalType":"int256","name":"answer","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getCurrentPhaseId","outputs":[{"internalType":"uint16","name":"currentPhaseId","type":"uint16"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"getNextRoundId","outputs":[{"internalType":"uint80","name":"nextRoundId","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint16","name":"phaseId","type":"uint16"}],"name":"getPhase","outputs":[{"components":[{"internalType":"uint16","name":"phaseId","type":"uint16"},{"internalType":"uint80","name":"startingAggregatorRoundId","type":"uint80"},{"internalType":"uint80","name":"endingAggregatorRoundId","type":"uint80"}],"internalType":"struct FeedRegistryInterface.Phase","name":"phase","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint16","name":"phaseId","type":"uint16"}],"name":"getPhaseFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint16","name":"phaseId","type":"uint16"}],"name":"getPhaseRange","outputs":[{"internalType":"uint80","name":"startingRoundId","type":"uint80"},{"internalType":"uint80","name":"endingRoundId","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"getPreviousRoundId","outputs":[{"internalType":"uint80","name":"previousRoundId","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getProposedFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"proposedAggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"getRoundFeed","outputs":[{"internalType":"contract AggregatorV2V3Interface","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint256","name":"roundId","type":"uint256"}],"name":"getTimestamp","outputs":[{"internalType":"uint256","name":"timestamp","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"aggregator","type":"address"}],"name":"isFeedEnabled","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestAnswer","outputs":[{"internalType":"int256","name":"answer","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestRound","outputs":[{"internalType":"uint256","name":"roundId","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestTimestamp","outputs":[{"internalType":"uint256","name":"timestamp","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"address","name":"aggregator","type":"address"}],"name":"proposeFeed","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"uint80","name":"roundId","type":"uint80"}],"name":"proposedGetRoundData","outputs":[{"internalType":"uint80","name":"id","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"proposedLatestRoundData","outputs":[{"internalType":"uint80","name":"id","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"contract AccessControllerInterface","name":"_accessController","type":"address"}],"name":"setAccessController","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"typeAndVersion","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"version","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
     "networks": {
@@ -1360,3 +1351,12 @@ export const AaveV4View = {
     }
   }
 } as const;
+
+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",
+    }
+  }
+} as const;

package/src/contracts.ts

@@ -122,7 +122,6 @@ export const getYearnV3VaultContractViem = (client: Client, address: HexString)
 };
 
 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');
@@ -182,3 +181,5 @@ export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr')
 export const SkySavingsContractView = createViemContractFromConfigFunc('SkySavings');
 
 export const AaveV4ViewContractViem = createViemContractFromConfigFunc('AaveV4View');
+
+export const UniswapTokenDistributorViem = createViemContractFromConfigFunc('UniswapTokenDistributor');

package/src/helpers/index.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/src/helpers/morphoBlueHelpers/index.ts

@@ -389,6 +389,7 @@ export const getRewardsForMarket = async (marketId: string, network: NetworkNumb
       query: REWARDS_QUERY,
       variables: { marketId, chainId: network },
     }),
+    signal: AbortSignal.timeout(LONGER_TIMEOUT),
   });
 
   const data = await response.json();

package/src/index.ts

@@ -17,7 +17,6 @@ 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';
@@ -43,7 +42,6 @@ export {
   markets,
   helpers,
   morphoBlue,
-  morphoMidnight,
   llamaLend,
   eulerV2,
   fluid,

package/src/markets/index.ts

@@ -17,7 +17,6 @@ export {
 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/src/morphoBlue/index.ts

@@ -8,7 +8,7 @@ import {
   DFSFeedRegistryContractViem, FeedRegistryContractViem, MorphoBlueViewContractViem,
 } from '../contracts';
 import {
-  MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
+  MorphoBlueAssetsData, MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData,
 } from '../types';
 import { USD_QUOTE, WAD } from '../constants';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS } from '../staking';
@@ -21,7 +21,39 @@ import { getViemProvider, setViemBlockNumber } from '../services/viem';
 
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
 
-export async function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
+const getMorphoRewardIncentives = (apy: string) => [{
+  token: 'MORPHO',
+  apy,
+  incentiveKind: IncentiveKind.Reward,
+  description: 'Eligible for protocol-level MORPHO incentives.',
+}];
+
+export const addMorphoBlueRewardsToMarketInfo = (
+  marketInfo: MorphoBlueMarketInfo,
+  rewards: MorphoBlueMarketRewards,
+): MorphoBlueMarketInfo => ({
+  ...marketInfo,
+  assetsData: {
+    ...marketInfo.assetsData,
+    [marketInfo.loanToken]: {
+      ...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),
+      ],
+    },
+  },
+});
+
+async function getMorphoBlueMarketDataInternal(
+  provider: Client,
+  network: NetworkNumber,
+  selectedMarket: MorphoBlueMarketData,
+): Promise<MorphoBlueMarketInfo> {
   const {
     loanToken, collateralToken, oracle, irm, lltv, oracleType,
   } = selectedMarket;
@@ -59,16 +91,6 @@ export async function _getMorphoBlueMarketData(provider: Client, network: Networ
     loanTokenPrice = loanTokenPriceRound[1].toString();
   }
 
-  let morphoSupplyApy = '0';
-  let morphoBorrowApy = '0';
-  try {
-    const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = await 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();
@@ -90,18 +112,8 @@ export async function _getMorphoBlueMarketData(provider: Client, network: Networ
     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)] = {
@@ -138,10 +150,70 @@ export async function _getMorphoBlueMarketData(provider: Client, network: Networ
   };
 }
 
+export async function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
+  const marketInfo = await getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+
+  try {
+    const rewards = await getRewardsForMarket(selectedMarket.marketId, network);
+    return addMorphoBlueRewardsToMarketInfo(marketInfo, rewards);
+  } catch (error) {
+    console.error(error);
+    return addMorphoBlueRewardsToMarketInfo(marketInfo, { supplyApy: '0', borrowApy: '0' });
+  }
+}
+
+export function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
+  return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+}
+
 export async function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
   return _getMorphoBlueMarketData(getViemProvider(provider, network), network, selectedMarket);
 }
 
+export function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo> {
+  return _getMorphoBluePortfolioMarketData(getViemProvider(provider, network), network, selectedMarket);
+}
+
+export const getMorphoBluePositionDataWithMarketInfo = (
+  data: MorphoBluePositionData,
+  marketInfo: MorphoBlueMarketInfo,
+): MorphoBluePositionData => ({
+  ...data,
+  ...getMorphoBlueAggregatedPositionData({
+    usedAssets: data.usedAssets,
+    assetsData: marketInfo.assetsData,
+    marketInfo,
+  }),
+});
+
+export const getMorphoEarnDataWithMarketInfo = (data: MorphoBlueEarnData, marketInfo: MorphoBlueMarketInfo): MorphoBlueEarnData => {
+  const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+  const usedAssets: MMUsedAssets = {
+    [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 {
+    ...data,
+    apy: calculateNetApy({ usedAssets, assetsData: marketInfo.assetsData as unknown as MMAssetsData }).netApy,
+  };
+};
+
+export function getMorphoBlueMarketRewards(
+  network: NetworkNumber,
+  selectedMarket: MorphoBlueMarketData,
+): Promise<MorphoBlueMarketRewards> {
+  return getRewardsForMarket(selectedMarket.marketId, network);
+}
+
 export const _getMorphoBlueAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData): Promise<PositionBalances> => {
   let balances: PositionBalances = {
     collateral: {},
@@ -238,7 +310,7 @@ export async function getMorphoBlueAccountData(provider: EthereumProvider, netwo
   return _getMorphoBlueAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
 }
 
-export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{ apy: string, amount: string, amountUsd: string }> {
+export async function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData> {
   const {
     loanToken, collateralToken, oracle, irm, lltv,
   } = selectedMarket;
@@ -254,24 +326,9 @@ export async function getMorphoEarn(provider: Client, network: NetworkNumber, ac
   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: MMUsedAssets = {
-    [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 as unknown as MMAssetsData });
-
-  return {
-    apy: netApy,
+  return getMorphoEarnDataWithMarketInfo({
+    apy: '0',
     amount: loanTokenSupplied,
     amountUsd: loanTokenSuppliedUsd,
-  };
-}
+  }, marketInfo);
+}

package/src/portfolio/discovery.ts

@@ -10,7 +10,6 @@ import {
   CrvUsdMarkets,
   LlamaLendMarkets,
   MorphoBlueMarkets,
-  MorphoMidnightMarkets,
   SparkMarkets,
 } from '../markets';
 import { AaveVersions, CompoundVersions } from '../types';
@@ -20,7 +19,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: PositionBalances): boolean => (
@@ -111,10 +109,6 @@ export async function getUserPositionsExistence(
     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)));
-  });
-
   await Promise.all(tasks);
   return existence;
 }

package/src/portfolio/index.ts

@@ -9,11 +9,9 @@ import {
   LiquityV2Markets,
   LlamaLendMarkets,
   MorphoBlueMarkets,
-  MorphoMidnightMarkets,
   SparkMarkets,
 } from '../markets';
-import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
-import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
+import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 import {
   AaveV2MarketData,
   AaveV3MarketData,
@@ -28,7 +26,6 @@ import {
   LiquityV2MarketData,
   LlamaLendGlobalMarketData,
   MorphoBlueMarketInfo,
-  MorphoMidnightMarketInfo,
   PortfolioPositionsData,
   SparkMarketsData,
 } from '../types';
@@ -54,6 +51,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 async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim = false): Promise<{
   positions: PortfolioPositionsData;
@@ -65,7 +63,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   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));
@@ -83,7 +80,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const defaultClient = getViemProvider(defaultProvider, ...args);
 
   const morphoMarketsData: Record<string, MorphoBlueMarketInfo> = {};
-  const morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo> = {};
   const compoundV3MarketsData: Record<string, CompoundV3MarketsData> = {};
   const sparkMarketsData: Record<string, SparkMarketsData> = {};
   const eulerV2MarketsData: Record<string, EulerV2FullMarketData> = {};
@@ -98,7 +94,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
 
   const markets = {
     morphoMarketsData,
-    morphoMidnightMarketsData,
     compoundV3MarketsData,
     sparkMarketsData,
     eulerV2MarketsData,
@@ -121,7 +116,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
       aaveV3: {},
       aaveV4: {},
       morphoBlue: {},
-      morphoMidnight: {},
       compoundV3: {},
       spark: {},
       eulerV2: {},
@@ -143,7 +137,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     stakingPositions[address.toLowerCase() as EthAddress] = {
       aaveV3: {},
       morphoBlue: {},
-      morphoMidnight: {},
       compoundV3: {},
       spark: {},
       aaveV2: {},
@@ -170,13 +163,9 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   await Promise.allSettled([
     // === MARKET DATA (needs to be fetched first) ===
     ...morphoMarkets.map(async (market) => {
-      const marketData = await _getMorphoBlueMarketData(client, network, market);
+      const marketData = await _getMorphoBluePortfolioMarketData(client, network, market);
       morphoMarketsData[market.value] = marketData;
     }),
-    ...morphoMidnightMarkets.map(async (market) => {
-      const marketData = await _getMorphoMidnightMarketData(client, network, market);
-      morphoMidnightMarketsData[market.value] = marketData;
-    }),
     ...compoundV3Markets.map(async (market) => {
       const marketData = await _getCompoundV3MarketsData(client, network, market, defaultClient);
       compoundV3MarketsData[market.value] = marketData;
@@ -322,6 +311,33 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         }
       }
     })(),
+    // Batch UNI rewards
+    (async () => {
+      try {
+        if (!isMainnet) {
+          for (const address of addresses) {
+            rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
+          }
+          return;
+        }
+        const uniswapRewards = await getUniswapRewards(client, network, addresses);
+        for (const address of addresses) {
+          const lowerAddress = address.toLowerCase() as EthAddress;
+          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() as EthAddress].uniswap = {
+            error: 'Error fetching Uniswap rewards data in batch',
+            data: null,
+          };
+        }
+      }
+    })(),
     ...sparkMarkets.map((market) => addresses.map(async address => {
       try {
         if (!isMainnet) {
@@ -468,38 +484,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         positions[address.toLowerCase() as EthAddress].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
       }
     })).flat(),
-    ...morphoMidnightMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const [accDataPromise, earnDataPromise] = await 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() as EthAddress].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() as EthAddress].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() as EthAddress].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() as EthAddress].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() as EthAddress].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
     ...compoundV3Markets.map((market) => addresses.map(async (address) => {
       try {
         const accData = await _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });

package/src/types/claiming.ts

@@ -15,6 +15,8 @@ export 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',
 }