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

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

@@ -12,7 +12,7 @@ import {
   MorphoMidnightMarkets,
   SparkMarkets,
 } from '../markets';
-import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
+import { _getMorphoBlueAccountData, _getMorphoBluePortfolioMarketData, getMorphoEarn } from '../morphoBlue';
 import { _getMorphoMidnightAccountData, _getMorphoMidnightMarketData, getMorphoMidnightEarn } from '../morphoMidnight';
 import {
   AaveV2MarketData,
@@ -54,6 +54,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;
@@ -78,7 +79,8 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
   const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
 
-  const args: [NetworkNumber, any?] = [network, { batch: { multicall: { batchSize: isSim ? 500_000 : 2_500_000 } } }];
+
+  const args: [NetworkNumber, any?] = [network, { batch: { multicall: { batchSize: isSim ? 2_000 : 2_500_000 } } }];
   const client = getViemProvider(provider, ...args);
   const defaultClient = getViemProvider(defaultProvider, ...args);
 
@@ -170,7 +172,7 @@ 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) => {
@@ -322,6 +324,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) {

package/src/savings/summerVaults/options.ts

@@ -8,7 +8,7 @@ export const SUMMER_VAULT_USDC_MAINNET_LR: SummerVault = {
   asset: 'USDC',
   network: NetworkNumber.Eth,
   deploymentBlock: 21795049,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_USDC_MAINNET_HR: SummerVault = {
@@ -18,7 +18,7 @@ export const SUMMER_VAULT_USDC_MAINNET_HR: SummerVault = {
   asset: 'USDC',
   network: NetworkNumber.Eth,
   deploymentBlock: 22488041,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_USDT_MAINNET_LR: SummerVault = {
@@ -28,7 +28,7 @@ export const SUMMER_VAULT_USDT_MAINNET_LR: SummerVault = {
   asset: 'USDT',
   network: NetworkNumber.Eth,
   deploymentBlock: 21795276,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_ETH_MAINNET_LR: SummerVault = {
@@ -38,7 +38,7 @@ export const SUMMER_VAULT_ETH_MAINNET_LR: SummerVault = {
   asset: 'WETH',
   network: NetworkNumber.Eth,
   deploymentBlock: 21795390,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_ETH_MAINNET_HR: SummerVault = {
@@ -48,7 +48,7 @@ export const SUMMER_VAULT_ETH_MAINNET_HR: SummerVault = {
   asset: 'WETH',
   network: NetworkNumber.Eth,
   deploymentBlock: 22291252,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_USDC_ARBITRUM_LR: SummerVault = {
@@ -58,7 +58,7 @@ export const SUMMER_VAULT_USDC_ARBITRUM_LR: SummerVault = {
   asset: 'USDC',
   network: NetworkNumber.Arb,
   deploymentBlock: 404339289,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_USDT_ARBITRUM_LR: SummerVault = {
@@ -68,7 +68,7 @@ export const SUMMER_VAULT_USDT_ARBITRUM_LR: SummerVault = {
   asset: 'USDT',
   network: NetworkNumber.Arb,
   deploymentBlock: 303594065,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_USDC_BASE_LR: SummerVault = {
@@ -78,7 +78,7 @@ export const SUMMER_VAULT_USDC_BASE_LR: SummerVault = {
   asset: 'USDC',
   network: NetworkNumber.Base,
   deploymentBlock: 303594065,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_EURC_BASE_LR: SummerVault = {
@@ -88,7 +88,7 @@ export const SUMMER_VAULT_EURC_BASE_LR: SummerVault = {
   asset: 'EURC',
   network: NetworkNumber.Base,
   deploymentBlock: 27544064,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULT_ETH_BASE_LR: SummerVault = {
@@ -98,7 +98,7 @@ export const SUMMER_VAULT_ETH_BASE_LR: SummerVault = {
   asset: 'WETH',
   network: NetworkNumber.Base,
   deploymentBlock: 29066887,
-  isLegacy: false,
+  isLegacy: true,
 };
 
 export const SUMMER_VAULTS: Record<SummerVaultType, SummerVault> = {

package/src/staking/staking.ts

@@ -66,6 +66,7 @@ export const STAKING_ASSETS = [
   'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
   'PT sUSDe Feb', 'PT USDe Feb', 'PT sUSDe Apr', 'PT USDe Apr', 'PT sUSDe May', 'PT USDe May', 'PT srUSDe Apr', 'GHO',
   'PT sUSDe June', 'PT USDe June', 'PT srUSDe Jun', 'PT srUSDe Oct', 'PT USDG May', 'PT sUSDS Nov', 'PT sUSDe Oct', 'PT USDG Sep',
+  'syrupUSDG',
 ];
 
 export const getStakingApy = memoize(async (asset: string, network: number = NetworkNumber.Eth) => {
@@ -97,6 +98,7 @@ export const getStakingApy = memoize(async (asset: string, network: number = Net
     if (asset === 'PT sUSDe Jan') return await getApyFromDfsApi('PT sUSDe Jan', network);
     if (asset === 'syrupUSDT') return await getApyFromDfsApi('syrupUSDT');
     if (asset === 'syrupUSDC') return await getApyFromDfsApi('syrupUSDC');
+    if (asset === 'syrupUSDG') return await getApyFromDfsApi('syrupUSDG');
     if (asset === 'wstUSR') return await getApyFromDfsApi('wstUSR');
     if (asset === 'PT sUSDe Feb') return await getApyFromDfsApi('PT sUSDe Feb', network);
     if (asset === 'PT USDe Feb') return await getApyFromDfsApi('PT USDe Feb', network);

package/src/types/aaveV4.ts

@@ -21,6 +21,7 @@ export enum AaveV4SpokesType {
   AaveV4LombardBtcSpoke = 'aave_v4_lombard_btc_spoke',
   AaveV4MainSpoke = 'aave_v4_main_spoke',
   AaveV4USDGPendleSpoke = 'aave_v4_usdg_pendle_spoke',
+  AaveV4USDGMapleSpoke = 'aave_v4_usdg_maple_spoke',
 }
 
 export interface AaveV4HubInfo {

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',
 }
@@ -88,6 +90,15 @@ export type SparkWstEthRewardsClaimableToken = _ClaimableTokenPartial & { claimT
 
 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

package/src/types/morphoBlue.ts

@@ -235,6 +235,17 @@ export interface MorphoBluePositionData {
   exposure: string,
 }
 
+export interface MorphoBlueEarnData {
+  apy: string,
+  amount: string,
+  amountUsd: string,
+}
+
+export interface MorphoBlueMarketRewards {
+  supplyApy: string,
+  borrowApy: string,
+}
+
 export interface MorphoBlueVault {
   address: string,
 }

package/src/types/morphoMidnight.ts

@@ -70,6 +70,18 @@ export interface MorphoMidnightMarketInfo {
   assetsData: MorphoMidnightAssetsData,
 }
 
+// One resting bid on a market's order book, as an annualized rate rather than the API's raw WAD price.
+export interface MorphoMidnightBookOffer {
+  rate: string, // fixed borrow APY, percent
+  liquidity: string, // loan-token amount available at this rate
+}
+
+export interface MorphoMidnightParsedBook {
+  bestRate: string, // cheapest rate on the book (= offers[0].rate)
+  totalLiquidity: string, // Σ offers[].liquidity, loan-token units
+  offers: MorphoMidnightBookOffer[], // ascending by rate
+}
+
 export interface MorphoMidnightAggregatedPositionData {
   suppliedUsd: string,
   suppliedCollateralUsd: string,