@defisaver/positions-sdk 2.1.152-shifter-v2-dev-dev → 2.1.153-dev

package/src/portfolio/index.ts

@@ -7,7 +7,6 @@ import {
   CrvUsdMarkets,
   LiquityV2Markets,
   LlamaLendMarkets,
-  MakerActiveIlks,
   MorphoBlueMarkets,
   MorphoMidnightMarkets,
   SparkMarkets,
@@ -28,7 +27,6 @@ import {
   LlamaLendGlobalMarketData,
   MorphoBlueMarketInfo,
   MorphoMidnightMarketInfo,
-  PortfolioMarketsData,
   PortfolioPositionsData,
   SparkMarketsData,
 } from '../types';
@@ -38,13 +36,13 @@ import { _getCurveUsdGlobalData, _getCurveUsdUserData } from '../curveUsd';
 import { _getLlamaLendGlobalData, _getLlamaLendUserData } from '../llamaLend';
 import { _getAaveV3AccountData, _getAaveV3MarketData, getStakeAaveData } from '../aaveV3';
 import { ZERO_ADDRESS } from '../constants';
-import { _getMakerCdpData, _getMakerIlksData, _getUserCdps } from '../maker';
+import { _getMakerCdpData, _getUserCdps } from '../maker';
 import { _getAaveV2AccountData, _getAaveV2MarketsData } from '../aaveV2';
 import { _getCompoundV2AccountData, _getCompoundV2MarketsData } from '../compoundV2';
 import { getViemProvider } from '../services/viem';
 import { _getLiquityTroveInfo, getLiquityStakingData } from '../liquity';
 import { _getLiquityV2MarketData, getLiquitySAndYBold, getLiquityV2Staking } from '../liquityV2';
-import { _getAllFluidMarketDataPortfolio, _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
+import { _getAllUserEarnPositionsWithFTokens, _getUserPositionsPortfolio } from '../fluid';
 import { getUmbrellaData } from '../umbrella';
 import { getMerklUnclaimedRewards, getUnclaimedRewardsForAllMarkets } from '../claiming/aaveV3';
 import { getCompoundV3Rewards } from '../claiming/compV3';
@@ -598,270 +596,4 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   };
 }
 
-
-export async function getShifterPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim = false): Promise<{
-  positions: PortfolioPositionsData;
-  markets: PortfolioMarketsData;
-}> {
-  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 aaveV3Markets = [AaveVersions.AaveV3, AaveVersions.AaveV3Lido, AaveVersions.AaveV3Etherfi].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-  const aaveV2Markets = [AaveVersions.AaveV2].map((version) => AaveMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-  const compoundV2Markets = [CompoundVersions.CompoundV2].map((version) => CompoundMarkets(network)[version]).filter((market) => market.chainIds.includes(network));
-  const crvUsdMarkets = Object.values(CrvUsdMarkets(network)).filter((market) => market.chainIds.includes(network));
-  const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
-  const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
-  const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
-
-  const args: [NetworkNumber, any?] = [network, { batch: { multicall: { batchSize: isSim ? 2_000 : 2_500_000 } } }];
-  const client = getViemProvider(provider, ...args);
-  const defaultClient = getViemProvider(defaultProvider, ...args);
-
-  const markets: PortfolioMarketsData = {
-    morphoMarketsData: {},
-    morphoMidnightMarketsData: {},
-    compoundV3MarketsData: {},
-    sparkMarketsData: {},
-    aaveV3MarketsData: {},
-    aaveV2MarketsData: {},
-    compoundV2MarketsData: {},
-    crvUsdMarketsData: {},
-    llamaLendMarketsData: {},
-    liquityV2MarketsData: {},
-    aaveV4SpokesData: {},
-    fluidMarketsData: {},
-    makerMarketsData: {},
-  };
-  const makerCdps: Record<string, CdpInfo[]> = {};
-
-  const positions: PortfolioPositionsData = {};
-
-  for (const address of addresses) {
-    positions[address.toLowerCase() as EthAddress] = {
-      aaveV3: {},
-      aaveV4: {},
-      morphoBlue: {},
-      morphoMidnight: {},
-      compoundV3: {},
-      spark: {},
-      maker: {},
-      aaveV2: {},
-      compoundV2: {},
-      liquity: {},
-      crvUsd: {},
-      llamaLend: {},
-      fluid: {
-        error: '',
-        data: {},
-      },
-    };
-  }
-
-  await Promise.allSettled([
-    // === MARKET DATA (needs to be fetched first) ===
-    ...morphoMarkets.map(async (market) => {
-      markets.morphoMarketsData[market.value] = await _getMorphoBluePortfolioMarketData(client, network, market);
-    }),
-    ...morphoMidnightMarkets.map(async (market) => {
-      markets.morphoMidnightMarketsData[market.value] = await _getMorphoMidnightMarketData(client, network, market);
-    }),
-    ...compoundV3Markets.map(async (market) => {
-      markets.compoundV3MarketsData[market.value] = await _getCompoundV3MarketsData(client, network, market, defaultClient);
-    }),
-    ...sparkMarkets.map(async (market) => {
-      markets.sparkMarketsData[market.value] = await _getSparkMarketsData(client, network, market);
-    }),
-    ...aaveV3Markets.map(async (market) => {
-      markets.aaveV3MarketsData[market.value] = await _getAaveV3MarketData(client, network, market);
-    }),
-    ...aaveV4Spokes.map(async (spoke) => {
-      markets.aaveV4SpokesData[spoke.value] = await _getAaveV4SpokeData(client, network, spoke);
-    }),
-    ...aaveV2Markets.map(async (market) => {
-      markets.aaveV2MarketsData[market.value] = await _getAaveV2MarketsData(client, network, market);
-    }),
-    ...compoundV2Markets.map(async (market) => {
-      markets.compoundV2MarketsData[market.value] = await _getCompoundV2MarketsData(client, network);
-    }),
-    ...crvUsdMarkets.map(async (market) => {
-      markets.crvUsdMarketsData[market.value] = await _getCurveUsdGlobalData(client, network, market);
-    }),
-    ...llamaLendMarkets.map(async (market) => {
-      markets.llamaLendMarketsData[market.value] = await _getLlamaLendGlobalData(client, network, market);
-    }),
-    ...liquityV2Markets.map(async (market) => {
-      markets.liquityV2MarketsData[market.value] = await _getLiquityV2MarketData(client, network, market);
-    }),
-    (async () => {
-      if (!isFluidSupported) return;
-      try {
-        markets.fluidMarketsData = await _getAllFluidMarketDataPortfolio(client, network);
-      } catch (error) {
-        console.error('Error fetching Fluid markets data:', error);
-      }
-    })(),
-    (async () => {
-      if (!isMainnet) return; // Maker CDPs are only available on mainnet
-      try {
-        markets.makerMarketsData = await _getMakerIlksData(client, network, MakerActiveIlks);
-      } catch (error) {
-        console.error('Error fetching Maker ilks data:', error);
-      }
-    })(),
-
-    // === INDEPENDENT USER DATA (doesn't depend on market data) ===
-    ...addresses.map(async (address) => {
-      if (!isMainnet) return; // Maker CDPs are only available on mainnet
-      const makerCdp = await _getUserCdps(client, network, address);
-      makerCdps[address.toLowerCase() as EthAddress] = makerCdp;
-    }),
-    ...addresses.map(async (address) => {
-      try {
-        if (!isFluidSupported) return; // Fluid is not available on Optimism
-        const userPositions = (await _getUserPositionsPortfolio(client, network, address));
-        for (const position of userPositions) {
-          if (position.userData && new Dec(position.userData.suppliedUsd).gt(0)) {
-            positions[address.toLowerCase() as EthAddress].fluid.data[position.userData.nftId] = position.userData;
-          }
-        }
-      } catch (error) {
-        console.error(`Error fetching Fluid positions for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].fluid = {
-          error: `Error fetching Fluid positions for address ${address}`,
-          data: {},
-        };
-      }
-    }),
-  ]);
-
-  await Promise.all([
-    ...aaveV3Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getAaveV3AccountData(client, network, address, { selectedMarket: market, ...markets.aaveV3MarketsData[market.value] });
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV3[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...aaveV4Spokes.map((spoke) => addresses.map(async (address) => {
-      try {
-        const accData = await _getAaveV4AccountData(client, network, markets.aaveV4SpokesData[spoke.value], address);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV4[spoke.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
-      }
-    })).flat(),
-    ...morphoMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getMorphoBlueAccountData(client, network, address, market, markets.morphoMarketsData[market.value]);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoBlue[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
-        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 accData = await _getMorphoMidnightAccountData(client, network, address, market, markets.morphoMidnightMarketsData[market.value]);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].morphoMidnight[market.value] = { error: '', data: accData };
-      } 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: markets.compoundV3MarketsData[market.value].assetsData });
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].compoundV3[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...sparkMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...addresses.map(async (address) => makerCdps[address.toLowerCase() as EthAddress]?.map(async (cdpInfo) => {
-      try {
-        // reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
-        const cdpData = await _getMakerCdpData(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
-        if (cdpData) {
-          positions[address.toLowerCase() as EthAddress].maker[cdpInfo.id] = { error: '', data: cdpData };
-        }
-      } catch (error) {
-        console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
-        positions[address.toLowerCase() as EthAddress].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
-      }
-    })).flat(),
-    ...aaveV2Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getAaveV2AccountData(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV2[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
-      }
-    })).flat(),
-    ...compoundV2Markets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getCompoundV2AccountData(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
-        if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].compoundV2[market.value] = { error: '', data: accData };
-      } catch (error) {
-        console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
-      }
-    })).flat(),
-    ...addresses.map(async (address) => {
-      try {
-        if (!isMainnet) return; // Liquity trove info is only available on mainnet
-        const troveInfo = await _getLiquityTroveInfo(client, network, address);
-        if (new Dec(troveInfo.collateral).gt(0)) positions[address.toLowerCase() as EthAddress].liquity = { error: '', data: troveInfo };
-      } catch (error) {
-        console.error(`Error fetching Liquity trove info for address ${address}:`, error);
-        positions[address.toLowerCase() as EthAddress].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
-      }
-    }),
-    ...crvUsdMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getCurveUsdUserData(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand);
-        if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-          positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { error: '', data: { ...accData, borrowRate: markets.crvUsdMarketsData[market.value].borrowRate } };
-        }
-      } catch (error) {
-        console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-    ...llamaLendMarkets.map((market) => addresses.map(async (address) => {
-      try {
-        const accData = await _getLlamaLendUserData(client, network, address, market, markets.llamaLendMarketsData[market.value]);
-        if (new Dec(accData.suppliedUsd).gt(0) || new Dec(accData.borrowedUsd).gt(0)) {
-          positions[address.toLowerCase() as EthAddress].llamaLend[market.value] = { error: '', data: { ...accData, borrowRate: markets.llamaLendMarketsData[market.value].borrowRate } };
-        }
-      } catch (error) {
-        console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
-        positions[address.toLowerCase() as EthAddress].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
-      }
-    })).flat(),
-  ]);
-
-  return {
-    positions,
-    markets,
-  };
-}
-
 export * from './discovery';

package/src/types/portfolio.ts

@@ -1,20 +1,16 @@
-import {
-  AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions,
-} from './aave';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
+import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-import {
-  CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions,
-} from './compound';
-import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidMarketData, FluidVaultData } from './fluid';
+import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData, LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
-import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData, IlkInfo } from './maker';
-import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
+import { LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
+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,
@@ -66,19 +62,4 @@ export interface PortfolioPositionsDataForAddress {
 
 export interface PortfolioPositionsData {
   [key: EthAddress]: PortfolioPositionsDataForAddress;
-}
-export interface PortfolioMarketsData {
-  morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
-  morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
-  compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
-  sparkMarketsData: Record<string, SparkMarketsData>;
-  aaveV3MarketsData: Record<string, AaveV3MarketData>;
-  aaveV2MarketsData: Record<string, AaveV2MarketData>;
-  compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
-  crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
-  llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
-  liquityV2MarketsData: Record<string, LiquityV2MarketData>;
-  aaveV4SpokesData: Record<string, AaveV4SpokeData>;
-  fluidMarketsData: Record<string, FluidMarketData>;
-  makerMarketsData: Record<string, IlkInfo>;
-}
+}

package/cjs/markets/maker/index.d.ts

@@ -1 +0,0 @@
-export declare const MakerActiveIlks: string[];

package/cjs/markets/maker/index.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MakerActiveIlks = void 0;
-exports.MakerActiveIlks = [
-    'ETH-A',
-    'ETH-B',
-    'ETH-C',
-    'WSTETH-A',
-    'WSTETH-B',
-    'WBTC-A',
-    'WBTC-B',
-    'WBTC-C',
-];

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

@@ -1 +0,0 @@
-export declare const MakerActiveIlks: string[];

package/esm/markets/maker/index.js

@@ -1,10 +0,0 @@
-export const MakerActiveIlks = [
-    'ETH-A',
-    'ETH-B',
-    'ETH-C',
-    'WSTETH-A',
-    'WSTETH-B',
-    'WBTC-A',
-    'WBTC-B',
-    'WBTC-C',
-];

package/src/markets/maker/index.ts

@@ -1,10 +0,0 @@
-export const MakerActiveIlks: string[] = [
-  'ETH-A',
-  'ETH-B',
-  'ETH-C',
-  'WSTETH-A',
-  'WSTETH-B',
-  'WBTC-A',
-  'WBTC-B',
-  'WBTC-C',
-];