@defisaver/positions-sdk 2.1.169-portfolio-api-dev → 2.1.169

package/src/types/portfolio.ts

@@ -1,31 +1,18 @@
 import {
-  AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions, StakeAaveData, UmbrellaStakingData,
+  AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions,
 } from './aave';
 import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
-import {
-  AaveRewardsClaimableToken,
-  EthenaAirdropClaimableToken,
-  KingRewardsClaimableToken,
-  MerklRewardsClaimableToken,
-  SparkAirdropClaimableToken,
-  SparkRewardsClaimableToken,
-  UniswapAirdropClaimableToken,
-} from './claiming';
 import { EthAddress } from './common';
 import {
   CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions,
 } from './compound';
 import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidEarnPositionData, FluidMarketData, FluidVaultData } from './fluid';
-import { LiquityStakingData, LiquityTroveInfo } from './liquity';
-import {
-  LiquityV2MarketData, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions,
-} from './liquityV2';
+import { FluidMarketData, 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 {
-  MorphoBlueEarnData, MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions,
-} from './morphoBlue';
+import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
 import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
 import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
 
@@ -34,35 +21,6 @@ export interface PortfolioProtocolData<T> {
   data: T | null,
 }
 
-/** A failed fetch of a protocol that, when it succeeds, getPortfolioData returns unwrapped rather than as `{ error, data }`. */
-export interface PortfolioProtocolError {
-  error: string,
-  data: null,
-}
-
-/** What getPortfolioData reads besides markets. */
-export interface PortfolioDataOptions {
-  /** positions (lending); default true. With false it comes back as {} and no lending position is read. */
-  positions?: boolean,
-  /** stakingPositions; default true. With false it comes back as {} and no staking source is read. */
-  staking?: boolean,
-  /** rewardsData; default true. With false it comes back as {} and no rewards source is read. */
-  rewards?: boolean,
-  /**
-   * Liquity V2 troves in positions[address].liquityV2; default false, as the DeFi Saver app reads them on its own.
-   * Mainnet only: elsewhere liquityV2 is {}. Needs positions.
-   */
-  liquityV2?: boolean,
-}
-
-/** One Liquity V2 market's troves of an address, by trove id — with an error when the ids or any trove failed to load. */
-export interface PortfolioLiquityV2Troves {
-  error: string,
-  data: {
-    [troveId: string]: LiquityV2TroveData;
-  },
-}
-
 export interface PortfolioPositionsDataForAddress {
   aaveV3: {
     [key in AaveVersions]?: PortfolioProtocolData<AaveV3PositionData>;
@@ -104,71 +62,11 @@ export interface PortfolioPositionsDataForAddress {
   aaveV4: {
     [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
   };
-  /** Only with the liquityV2 option. Every trove the address holds, by market. */
-  liquityV2?: {
-    [key in LiquityV2Versions]?: PortfolioLiquityV2Troves;
-  };
 }
 
 export interface PortfolioPositionsData {
   [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
-
-/**
- * The staking positions getPortfolioData returns for an address. The shapes are uneven, and the DeFi Saver app
- * parses them as they are: a protocol read once per address comes back unwrapped on success, as
- * `{ error, data: null }` on failure, and as {} (or Fluid's `{ error: '', data: {} }`) on a network it is not read on.
- */
-export interface PortfolioStakingPositionsDataForAddress {
-  /** stkAAVE, stkGHO and sGHO; mainnet only. */
-  aaveV3: StakeAaveData | PortfolioProtocolError | {};
-  /** Morpho Blue supply without a borrow (Earn), by market; only markets with a deposit or an error. */
-  morphoBlue: {
-    [key in MorphoBlueVersions]?: PortfolioProtocolData<MorphoBlueEarnData>;
-  };
-  // Never filled; kept so the shape does not change under the app.
-  compoundV3: Record<string, never>;
-  spark: Record<string, never>;
-  aaveV2: Record<string, never>;
-  compoundV2: Record<string, never>;
-  /** LQTY staking and the LUSD stability pool; mainnet only. */
-  liquity: LiquityStakingData | PortfolioProtocolError | {};
-  /** Stability pool deposits, by market; mainnet only, legacy markets left out. */
-  liquityV2: {
-    [key in LiquityV2Versions]?: PortfolioProtocolData<LiquityV2StakingData>;
-  };
-  /** Fluid lending (fToken) deposits; `{ error: '', data: {} }` on a network without Fluid. */
-  fluid: FluidEarnPositionData[] | PortfolioProtocolError | { error: string, data: Record<string, never> };
-  /** Umbrella stakes; absent off mainnet. */
-  umbrella?: UmbrellaStakingData | PortfolioProtocolError;
-  /** sBOLD, yBOLD and stYBOLD; data is null off mainnet. */
-  liquityV2SBoldYBold: PortfolioProtocolData<LiquityV2SBoldYBoldData>;
-}
-
-// A Record rather than an interface: the app casts getPortfolioData's result to its own Record<string, …> type, and an
-// interface with an address index signature is not comparable to one.
-export type PortfolioStakingPositionsData = Record<EthAddress, PortfolioStakingPositionsDataForAddress>;
-
-/** The claimable rewards getPortfolioData returns for an address. Off mainnet only Merkl and Aave V3 are read. */
-export interface PortfolioRewardsDataForAddress {
-  merkl: PortfolioProtocolData<MerklRewardsClaimableToken[]>;
-  aaveV3: {
-    [key in AaveVersions]?: PortfolioProtocolData<AaveRewardsClaimableToken[]>;
-  };
-  spark: {
-    [key in SparkVersions]?: PortfolioProtocolData<SparkRewardsClaimableToken[]>;
-  };
-  /** The SPK airdrop. */
-  spk: PortfolioProtocolData<SparkAirdropClaimableToken[]>;
-  king: PortfolioProtocolData<KingRewardsClaimableToken[]>;
-  /** {} off mainnet. */
-  ethena: PortfolioProtocolData<EthenaAirdropClaimableToken[]> | {};
-  uniswap: PortfolioProtocolData<UniswapAirdropClaimableToken[]>;
-}
-
-export type PortfolioRewardsData = Record<EthAddress, PortfolioRewardsDataForAddress>;
-
-/** The `markets` getPortfolioData returns: every market it read, by protocol, keyed by market or spoke. */
 export interface PortfolioMarketsData {
   morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
   morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
@@ -181,50 +79,6 @@ export interface PortfolioMarketsData {
   llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
   liquityV2MarketsData: Record<string, LiquityV2MarketData>;
   aaveV4SpokesData: Record<string, AaveV4SpokeData>;
-}
-
-/**
- * The `markets` getShifterPortfolioData returns: the portfolio's markets, plus Fluid's and Maker's, which the shifter
- * offers as destinations. Kept apart from PortfolioMarketsData, which getPortfolioData does not fill these into.
- */
-export interface ShifterPortfolioMarketsData extends PortfolioMarketsData {
   fluidMarketsData: Record<string, FluidMarketData>;
   makerMarketsData: Record<string, IlkInfo>;
 }
-
-/** The markets that could not be read, by their key in PortfolioMarketsData, then by market or spoke: the error. */
-export type PortfolioMarketsErrors = {
-  [key in keyof PortfolioMarketsData]?: Record<string, string>;
-};
-
-/**
- * What the portfolio fetch could not read and has no `{ error, data }` entry of its own to report it in. A key is
- * present only when something under it failed; {} when everything was read.
- */
-export interface PortfolioErrors {
-  /** Markets missing from `markets`; every position on such a market is an entry with an error. */
-  markets?: PortfolioMarketsErrors;
-  /** Addresses whose Maker vault list could not be read: their `maker` is {}, which would otherwise read as "no vaults". */
-  makerCdps?: Record<EthAddress, string>;
-}
-
-/** getPortfolioMarketsData's result. */
-export interface PortfolioMarketsResult {
-  /** Every market read; one that failed is missing and named in `errors`. */
-  markets: PortfolioMarketsData;
-  errors: PortfolioMarketsErrors;
-}
-
-/** getPortfolioUserData's result: what is read per address. */
-export interface PortfolioUserData {
-  positions: PortfolioPositionsData;
-  stakingPositions: PortfolioStakingPositionsData;
-  rewardsData: PortfolioRewardsData;
-  errors: Pick<PortfolioErrors, 'makerCdps'>;
-}
-
-/** getPortfolioData's result. */
-export interface PortfolioData extends Omit<PortfolioUserData, 'errors'> {
-  markets: PortfolioMarketsData;
-  errors: PortfolioErrors;
-}

package/src/types/savings/index.ts

@@ -23,15 +23,4 @@ export interface SavingsVaultData {
   optionType: string,
 }
 
-/** The key of every savings vault getSavingsData reads. */
-export type SavingsVaultKey = MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType;
-
-export type SavingsData = Partial<Record<SavingsVaultKey, SavingsVaultData>>;
-
-/** Why each vault that was read for a network came back without data. */
-export type SavingsErrors = Partial<Record<SavingsVaultKey, string>>;
-
-export interface SavingsDataWithErrors {
-  data: SavingsData,
-  errors: SavingsErrors,
-}
+export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType, SavingsVaultData>>;

package/src/types/spark.ts

@@ -57,22 +57,6 @@ export interface SparkAssetData extends MMAssetData {
   eModeCategory: number,
   liquidationBonus: string,
   liquidationRatio: string,
-  // Set by _getSparkMarketsData. Optional, so objects built by hand still type-check.
-  debtCeilingForIsolationMode?: string,
-  isSiloed?: boolean,
-  isolationModeTotalDebt?: string,
-  isolationModeBorrowingEnabled?: boolean,
-  assetId?: number,
-  borrowRateStable?: string,
-  supplyCap?: string,
-  isInactive?: boolean,
-  isFrozen?: boolean,
-  isPaused?: boolean,
-  canBeWithdrawn?: boolean,
-  canBePayBacked?: boolean,
-  disabledStableBorrowing?: boolean,
-  isFlashLoanEnabled?: boolean,
-  aTokenAddress?: EthAddress,
 }
 
 export interface SparkAssetsData {
@@ -132,15 +116,7 @@ export interface SparkAggregatedPositionData {
   exposure: string,
 }
 
-/**
- * Fields sparkGetAggregatedPositionData adds to every Spark position at runtime, on top of those declared below.
- * Optional, so code that builds a position by hand keeps compiling.
- */
-export type SparkPositionAggregatedFields = Partial<Omit<SparkAggregatedPositionData,
-| keyof MMPositionData | 'ratio' | 'collRatio' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd'
-| 'suppliedCollateralUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
-
-export interface SparkPositionData extends MMPositionData, SparkPositionAggregatedFields {
+export interface SparkPositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
   collRatio: string,

package/src/umbrella/index.ts

@@ -1,14 +1,13 @@
 import { Client } from 'viem';
 import { AaveUmbrellaViewViem, AaveV3ViewContractViem } from '../contracts';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { UmbrellaStakingData } from '../types/aave';
 import { compareAddresses, convertHybridArraysToObjects, getEthAmountForDecimals } from '../services/utils';
 import { findMatching, tokenEntries } from './umbrellaUtils';
 
 const umbrella = '0xD400fc38ED4732893174325693a63C30ee3881a8';
 const aaveOracle = '0x54586bE62E3c3580375aE3723C145253060Ca0C2';
 
-export const getUmbrellaData = async (provider: Client, network: NetworkNumber, address: EthAddress): Promise<UmbrellaStakingData> => {
+export const getUmbrellaData = async (provider: Client, network: NetworkNumber, address: EthAddress) => {
   const umbrellaView = AaveUmbrellaViewViem(provider, network);
   const aaveV3View = AaveV3ViewContractViem(provider, network);
   const [tokensAggregatedData, additionalUmbrellaStakingData, userAggregatedData] = await Promise.all([

package/cjs/portfolio/lendingProtocols.d.ts

@@ -1,184 +0,0 @@
-import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { AaveMarketInfo, AaveV4SpokeInfo, CompoundMarketData, CrvUSDMarketData, LlamaLendMarketData, MorphoBlueMarketData, MorphoMidnightMarketData, PortfolioMarketsData, PortfolioPositionsData, PortfolioPositionsDataForAddress, PortfolioProtocolData, SparkMarketData } from '../types';
-/**
- * The lending protocols the portfolio reads the same way — a market's data, then each address's position on it — one
- * entry each. Adding such a protocol is its types (its key in PortfolioPositionsDataForAddress and in
- * PortfolioMarketsData) and its entry in LENDING_PROTOCOLS; the portfolio reads, errors and options follow. Maker,
- * Liquity, Fluid and Liquity V2 have shapes of their own and are read by their own code in ./index.ts.
- */
-/** What a position read gets. */
-export interface PortfolioReadContext {
-    client: Client;
-    network: NetworkNumber;
-}
-/** What a market read gets: also the default client, on Ethereum (Compound V3 reads its prices there). */
-export interface PortfolioMarketsReadContext extends PortfolioReadContext {
-    defaultClient: Client;
-}
-type PositionKey = keyof PortfolioPositionsDataForAddress;
-type MarketsKey = keyof PortfolioMarketsData;
-type PositionsOf<K extends PositionKey> = NonNullable<PortfolioPositionsDataForAddress[K]>;
-/** The data of one of a protocol's positions: what positions[address][K][market] holds as `{ error, data }`. */
-export type LendingPositionData<K extends PositionKey> = NonNullable<PositionsOf<K>[keyof PositionsOf<K>]> extends PortfolioProtocolData<infer D> ? D : never;
-export interface LendingProtocol<K extends PositionKey, M extends MarketsKey, Market extends {
-    value: string;
-}> {
-    /** Its key in PortfolioMarketsData. */
-    marketsKey: M;
-    /** Its name in error messages. */
-    label: string;
-    /** Its markets on a network; none where it is not deployed. */
-    markets: (network: NetworkNumber) => Market[];
-    readMarket: (context: PortfolioMarketsReadContext, market: Market) => Promise<PortfolioMarketsData[M][string]>;
-    /** An address's position on a market; undefined when the market can hold none. */
-    readPosition: (context: PortfolioReadContext, address: EthAddress, market: Market, marketData: PortfolioMarketsData[M][string]) => Promise<LendingPositionData<K> | undefined>;
-    /** Whether there is a position to list: an address without one gets no entry for that market. */
-    holds: (position: LendingPositionData<K>) => boolean;
-}
-/**
- * A market's data, or a throw that the caller's catch turns into the position's error entry: read against a missing
- * market, a position would otherwise come back empty and read as "no position".
- */
-export declare const requireMarket: <T>(marketsData: Record<string, T>, market: string) => T;
-export declare const aaveV3Lending: {
-    key: "aaveV3";
-    marketsKey: "aaveV3MarketsData";
-    markets: (network: NetworkNumber) => AaveMarketInfo[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const aaveV4Lending: {
-    key: "aaveV4";
-    marketsKey: "aaveV4SpokesData";
-    markets: (network: NetworkNumber) => AaveV4SpokeInfo[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const morphoBlueLending: {
-    key: "morphoBlue";
-    marketsKey: "morphoMarketsData";
-    markets: (network: NetworkNumber) => MorphoBlueMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const morphoMidnightLending: {
-    key: "morphoMidnight";
-    marketsKey: "morphoMidnightMarketsData";
-    markets: (network: NetworkNumber) => MorphoMidnightMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const compoundV3Lending: {
-    key: "compoundV3";
-    marketsKey: "compoundV3MarketsData";
-    markets: (network: NetworkNumber) => CompoundMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const sparkLending: {
-    key: "spark";
-    marketsKey: "sparkMarketsData";
-    markets: (network: NetworkNumber) => SparkMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const aaveV2Lending: {
-    key: "aaveV2";
-    marketsKey: "aaveV2MarketsData";
-    markets: (network: NetworkNumber) => AaveMarketInfo[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const compoundV2Lending: {
-    key: "compoundV2";
-    marketsKey: "compoundV2MarketsData";
-    markets: (network: NetworkNumber) => CompoundMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const crvUsdLending: {
-    key: "crvUsd";
-    marketsKey: "crvUsdMarketsData";
-    markets: (network: NetworkNumber) => CrvUSDMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-export declare const llamaLendLending: {
-    key: "llamaLend";
-    marketsKey: "llamaLendMarketsData";
-    markets: (network: NetworkNumber) => LlamaLendMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-};
-/** Every lending protocol read through its entry, in the order positions list them. */
-export declare const LENDING_PROTOCOLS: readonly [{
-    key: "aaveV3";
-    marketsKey: "aaveV3MarketsData";
-    markets: (network: NetworkNumber) => AaveMarketInfo[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "aaveV4";
-    marketsKey: "aaveV4SpokesData";
-    markets: (network: NetworkNumber) => AaveV4SpokeInfo[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "morphoBlue";
-    marketsKey: "morphoMarketsData";
-    markets: (network: NetworkNumber) => MorphoBlueMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "morphoMidnight";
-    marketsKey: "morphoMidnightMarketsData";
-    markets: (network: NetworkNumber) => MorphoMidnightMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "compoundV3";
-    marketsKey: "compoundV3MarketsData";
-    markets: (network: NetworkNumber) => CompoundMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "spark";
-    marketsKey: "sparkMarketsData";
-    markets: (network: NetworkNumber) => SparkMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "aaveV2";
-    marketsKey: "aaveV2MarketsData";
-    markets: (network: NetworkNumber) => AaveMarketInfo[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "compoundV2";
-    marketsKey: "compoundV2MarketsData";
-    markets: (network: NetworkNumber) => CompoundMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "crvUsd";
-    marketsKey: "crvUsdMarketsData";
-    markets: (network: NetworkNumber) => CrvUSDMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}, {
-    key: "llamaLend";
-    marketsKey: "llamaLendMarketsData";
-    markets: (network: NetworkNumber) => LlamaLendMarketData[];
-    readMarkets: (context: PortfolioMarketsReadContext, markets: PortfolioMarketsData) => Promise<Record<string, string>>;
-    readPositions: (context: PortfolioReadContext, addresses: EthAddress[], marketsData: Promise<PortfolioMarketsData>, positions: PortfolioPositionsData) => Promise<void>[];
-}];
-export type LendingKey = typeof LENDING_PROTOCOLS[number]['key'];
-/** The keys ./index.ts reads with code of its own. */
-export type SpecialPositionKey = 'maker' | 'liquity' | 'fluid' | 'liquityV2';
-type SpecialMarketsKey = 'liquityV2MarketsData';
-type UnreadPositionKey = Exclude<PositionKey, LendingKey | SpecialPositionKey>;
-type UnreadMarketsKey = Exclude<MarketsKey, typeof LENDING_PROTOCOLS[number]['marketsKey'] | SpecialMarketsKey>;
-export declare const EVERY_POSITION_KEY_IS_READ: [UnreadPositionKey] extends [never] ? true : UnreadPositionKey;
-export declare const EVERY_MARKETS_KEY_IS_READ: [UnreadMarketsKey] extends [never] ? true : UnreadMarketsKey;
-export {};

package/cjs/portfolio/lendingProtocols.js

@@ -1,196 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EVERY_MARKETS_KEY_IS_READ = exports.EVERY_POSITION_KEY_IS_READ = exports.LENDING_PROTOCOLS = exports.llamaLendLending = exports.crvUsdLending = exports.compoundV2Lending = exports.aaveV2Lending = exports.sparkLending = exports.compoundV3Lending = exports.morphoMidnightLending = exports.morphoBlueLending = exports.aaveV4Lending = exports.aaveV3Lending = exports.requireMarket = void 0;
-const decimal_js_1 = __importDefault(require("decimal.js"));
-const common_1 = require("../types/common");
-const markets_1 = require("../markets");
-const types_1 = require("../types");
-const aaveV3_1 = require("../aaveV3");
-const aaveV4_1 = require("../aaveV4");
-const aaveV2_1 = require("../aaveV2");
-const compoundV2_1 = require("../compoundV2");
-const compoundV3_1 = require("../compoundV3");
-const curveUsd_1 = require("../curveUsd");
-const llamaLend_1 = require("../llamaLend");
-const morphoBlue_1 = require("../morphoBlue");
-const morphoMidnight_1 = require("../morphoMidnight");
-const spark_1 = require("../spark");
-const constants_1 = require("../constants");
-/**
- * A market's data, or a throw that the caller's catch turns into the position's error entry: read against a missing
- * market, a position would otherwise come back empty and read as "no position".
- */
-const requireMarket = (marketsData, market) => {
-    const marketData = marketsData[market];
-    if (!marketData)
-        throw new Error(`Market data for ${market} is not available`);
-    return marketData;
-};
-exports.requireMarket = requireMarket;
-/** requireMarket for one protocol's key, typed by that key's market data. */
-const requireMarketOf = (marketsData, key, market) => {
-    // TypeScript reads marketsData[key][market] as any protocol's market data; the key's own is what is stored there.
-    const marketData = marketsData[key][market];
-    if (!marketData)
-        throw new Error(`Market data for ${market} is not available`);
-    return marketData;
-};
-/** A protocol's entry with its reads, typed by its own market and position types. */
-const lendingProtocol = (key, protocol) => {
-    /** Every market of the protocol into `markets`; resolves to the ones that failed (left out), with their errors. */
-    const readMarkets = (context, markets) => __awaiter(void 0, void 0, void 0, function* () {
-        const protocolMarkets = markets[protocol.marketsKey];
-        const failed = {};
-        yield Promise.all(protocol.markets(context.network).map((market) => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                protocolMarkets[market.value] = yield protocol.readMarket(context, market);
-            }
-            catch (error) {
-                console.error(`Error fetching ${protocol.marketsKey} for market ${market.value}:`, error);
-                failed[market.value] = `Error fetching ${protocol.marketsKey} for market ${market.value}`;
-            }
-        })));
-        return failed;
-    });
-    /**
-     * Every address's position on every market into `positions`, each read once its market is in: an entry with the data
-     * where the address holds a position, an entry with an error where the read or its market failed, none otherwise.
-     */
-    const readPositions = (context, addresses, marketsData, positions) => protocol.markets(context.network).flatMap((market) => addresses.map((address) => __awaiter(void 0, void 0, void 0, function* () {
-        // Keyed by the protocol's market type in PortfolioPositionsDataForAddress; written here by market.value.
-        const byMarket = positions[address.toLowerCase()][key];
-        try {
-            const marketData = requireMarketOf(yield marketsData, protocol.marketsKey, market.value);
-            const position = yield protocol.readPosition(context, address, market, marketData);
-            if (position && protocol.holds(position))
-                byMarket[market.value] = { error: '', data: position };
-        }
-        catch (error) {
-            console.error(`Error fetching ${protocol.label} account data for address ${address} on market ${market.value}:`, error);
-            byMarket[market.value] = { error: `Error fetching ${protocol.label} account data for address ${address} on market ${market.value}`, data: null };
-        }
-    })));
-    return {
-        key, marketsKey: protocol.marketsKey, markets: protocol.markets, readMarkets, readPositions,
-    };
-};
-const onNetwork = (network, markets) => markets.filter((market) => market.chainIds.includes(network));
-const suppliesAnything = (position) => new decimal_js_1.default(position.suppliedUsd).gt(0);
-const suppliesOrBorrowsAnything = (position) => new decimal_js_1.default(position.suppliedUsd).gt(0) || new decimal_js_1.default(position.borrowedUsd).gt(0);
-exports.aaveV3Lending = lendingProtocol('aaveV3', {
-    marketsKey: 'aaveV3MarketsData',
-    label: 'AaveV3',
-    markets: (network) => onNetwork(network, [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((version) => (0, markets_1.AaveMarkets)(network)[version])),
-    readMarket: ({ client, network }, market) => (0, aaveV3_1._getAaveV3MarketData)(client, network, market),
-    readPosition: ({ client, network }, address, market, marketData) => (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, marketData)),
-    holds: suppliesAnything,
-});
-exports.aaveV4Lending = lendingProtocol('aaveV4', {
-    marketsKey: 'aaveV4SpokesData',
-    label: 'AaveV4',
-    markets: (network) => onNetwork(network, Object.values((0, markets_1.AaveV4Spokes)(network))),
-    readMarket: ({ client, network }, spoke) => (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke),
-    readPosition: ({ client, network }, address, _spoke, spokeData) => (0, aaveV4_1._getAaveV4AccountData)(client, network, spokeData, address),
-    holds: suppliesAnything,
-});
-exports.morphoBlueLending = lendingProtocol('morphoBlue', {
-    marketsKey: 'morphoMarketsData',
-    label: 'MorphoBlue',
-    markets: (network) => onNetwork(network, Object.values((0, markets_1.MorphoBlueMarkets)(network))),
-    readMarket: ({ client, network }, market) => (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market),
-    readPosition: ({ client, network }, address, market, marketData) => (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, marketData),
-    holds: suppliesAnything,
-});
-exports.morphoMidnightLending = lendingProtocol('morphoMidnight', {
-    marketsKey: 'morphoMidnightMarketsData',
-    label: 'MorphoMidnight',
-    markets: (network) => onNetwork(network, Object.values((0, markets_1.MorphoMidnightMarkets)(network))),
-    readMarket: ({ client, network }, market) => (0, morphoMidnight_1._getMorphoMidnightMarketData)(client, network, market),
-    // Markets are created lazily on the first position, so an uncreated one can hold no position.
-    readPosition: (_a, address_1, market_1, marketData_1) => __awaiter(void 0, [_a, address_1, market_1, marketData_1], void 0, function* ({ client, network }, address, market, marketData) {
-        return (marketData.isCreated
-            ? (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, marketData)
-            : undefined);
-    }),
-    holds: suppliesAnything,
-});
-exports.compoundV3Lending = lendingProtocol('compoundV3', {
-    marketsKey: 'compoundV3MarketsData',
-    label: 'CompoundV3',
-    markets: (network) => onNetwork(network, Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.value !== types_1.CompoundVersions.CompoundV2)),
-    readMarket: ({ client, defaultClient, network }, market) => (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient),
-    readPosition: ({ client, network }, address, market, marketData) => (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: marketData.assetsData }),
-    holds: suppliesAnything,
-});
-exports.sparkLending = lendingProtocol('spark', {
-    marketsKey: 'sparkMarketsData',
-    label: 'Spark',
-    markets: (network) => onNetwork(network, Object.values((0, markets_1.SparkMarkets)(network))),
-    readMarket: ({ client, network }, market) => (0, spark_1._getSparkMarketsData)(client, network, market),
-    readPosition: ({ client, network }, address, market, marketData) => (0, spark_1._getSparkAccountData)(client, network, address, {
-        selectedMarket: market, assetsData: marketData.assetsData, eModeCategoriesData: marketData.eModeCategoriesData,
-    }),
-    holds: suppliesAnything,
-});
-exports.aaveV2Lending = lendingProtocol('aaveV2', {
-    marketsKey: 'aaveV2MarketsData',
-    label: 'AaveV2',
-    markets: (network) => onNetwork(network, [(0, markets_1.AaveMarkets)(network)[types_1.AaveVersions.AaveV2]]),
-    readMarket: ({ client, network }, market) => (0, aaveV2_1._getAaveV2MarketsData)(client, network, market),
-    readPosition: ({ client, network }, address, market, marketData) => (0, aaveV2_1._getAaveV2AccountData)(client, network, address, marketData.assetsData, market),
-    holds: suppliesAnything,
-});
-exports.compoundV2Lending = lendingProtocol('compoundV2', {
-    marketsKey: 'compoundV2MarketsData',
-    label: 'CompoundV2',
-    markets: (network) => onNetwork(network, [(0, markets_1.CompoundMarkets)(network)[types_1.CompoundVersions.CompoundV2]]),
-    readMarket: ({ client, network }) => (0, compoundV2_1._getCompoundV2MarketsData)(client, network),
-    readPosition: ({ client, network }, address, _market, marketData) => (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, marketData.assetsData),
-    holds: suppliesAnything,
-});
-exports.crvUsdLending = lendingProtocol('crvUsd', {
-    marketsKey: 'crvUsdMarketsData',
-    label: 'Curve USD',
-    markets: (network) => onNetwork(network, Object.values((0, markets_1.CrvUsdMarkets)(network))),
-    readMarket: ({ client, network }, market) => (0, curveUsd_1._getCurveUsdGlobalData)(client, network, market),
-    // The market's borrow rate is passed in, so the read does not fetch it again.
-    readPosition: ({ client, network }, address, market, marketData) => (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, marketData.activeBand, marketData.borrowRate),
-    holds: suppliesOrBorrowsAnything,
-});
-exports.llamaLendLending = lendingProtocol('llamaLend', {
-    marketsKey: 'llamaLendMarketsData',
-    label: 'LlamaLend',
-    markets: (network) => ([common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? onNetwork(network, Object.values((0, markets_1.LlamaLendMarkets)(network))) : []),
-    readMarket: ({ client, network }, market) => (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market),
-    readPosition: (_a, address_1, market_1, marketData_1) => __awaiter(void 0, [_a, address_1, market_1, marketData_1], void 0, function* ({ client, network }, address, market, marketData) {
-        return (Object.assign(Object.assign({}, yield (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, marketData)), { borrowRate: marketData.borrowRate }));
-    }),
-    holds: suppliesOrBorrowsAnything,
-});
-/** Every lending protocol read through its entry, in the order positions list them. */
-exports.LENDING_PROTOCOLS = [
-    exports.aaveV3Lending,
-    exports.aaveV4Lending,
-    exports.morphoBlueLending,
-    exports.morphoMidnightLending,
-    exports.compoundV3Lending,
-    exports.sparkLending,
-    exports.aaveV2Lending,
-    exports.compoundV2Lending,
-    exports.crvUsdLending,
-    exports.llamaLendLending,
-];
-exports.EVERY_POSITION_KEY_IS_READ = true;
-exports.EVERY_MARKETS_KEY_IS_READ = true;