@defisaver/positions-sdk 2.1.52-dev-3 → 2.1.53-aave-v4

package/src/types/morphoBlue.ts

@@ -1,202 +1,202 @@
-import {
-  EthAddress, IncentiveData, LeverageType, MMUsedAssets, NetworkNumber,
-} from './common';
-
-export enum MorphoBlueVersions {
-  // MAINNET
-  MorphoBlueWstEthUSDC = 'morphobluewstethusdc', // wstETH/USDC
-  MorphoBlueSDAIUSDC = 'morphobluesdaiusdc', // sDAI/USDC
-  MorphoBlueWBTCUSDC = 'morphobluewbtcusdc', // WBTC/USDC
-  MorphoBlueEthUSDC = 'morphoblueethusdc', // ETH/USDC
-  MorphoBlueWBTCUSDT = 'morphobluewbtcusdt', // WBTC/USDT
-  MorphoBlueWstEthUSDT = 'morphobluewstethusdt', // wstETH/USDT
-  MorphoBlueWstEthUSDA_Exchange_Rate = 'morphobluewstethusda_exchange_rate', // wstETH/USDA
-  MorphoBlueWstEthPYUSD = 'morphobluwstethpyusd', // wstETH/PYUSD
-  MorphoBlueWBTCPYUSD = 'morphobluewbtcpyusd', // WBTC/PYUSD
-  MorphoBlueWBTCEth = 'morphobluewbtceth', // WBTC/ETH
-  MorphoBlueUSDeUSDT = 'morphoblueusdeusdt', // USDe/USDT
-  MorphoBlueSUSDeUSDT = 'morphobluesusdeusdt', // sUSDe/USDT
-  MorphoBlueMKRUSDC = 'morphobluemkrusdc', // MKR/USDC
-  MorphoBlueTBTCUSDC = 'morphobluetbtcusdc', // tBTC/USDC
-  MorphoBlueCbBTCEth_915 = 'morphobluecbbtceth', // cbBTC/Eth
-  MorphoBlueCbBTCUSDC_860 = 'morphobluecbbtcusdc', // cbBTC/USDC
-  MorphoBlueSUSDeUSDC_915 = 'morphobluesusdeusdc_915', // sUSDe/USDC
-  MorphoBlueLBTCWBTC_945 = 'morphobluelbtcwbtc_945', // LBTC/WBTC
-  MorphoBlueLBTCUSDC_860 = 'morphobluelbtcusdc_860', // LBTC/USDC
-  MorphoBlueLBTCCbBTC_945 = 'morphobluelbtccbbtc_945', // LBTC/cbBTC
-  MorphoBlueUSRUSDC_915 = 'morphoblueusrusdc_915', // USR/USDC
-  MorphoBlueSyrupUSDCUSDC_915 = 'morphobluesyrupusdcusdc_915', // syrupUSDC/USDC
-  MorphoBluesUSDSUSDT_965 = 'morphobluesusdsusdt_965', // sUSDS/USDT
-  // ezETH/ETH
-  MorphoBlueEzEthEth_860 = 'morphoblueezetheth_860',
-  MorphoBlueEzEthEth_945 = 'morphoblueezetheth_945',
-  // weETH/ETH
-  MorphoBlueWeEthEth_945 = 'morphoblueweetheth_945',
-  // wstETH/WETH
-  MorphoBlueWstEthEth_945 = 'morphobluewstetheth_945',
-  MorphoBlueWstEthEth_945_Exchange_Rate = 'morphobluewstetheth_945_exchange_rate',
-  MorphoBlueWstEthEth_965_Exchange_Rate = 'morphobluewstetheth_965_exchange_rate',
-  // sUSDe/DAI
-  MorphoBlueSUSDeDAI_860 = 'morphobluesusdedai_860',
-  MorphoBlueSUSDeDAI_915 = 'morphobluesusdedai_915',
-  MorphoBlueSUSDeDAI_945 = 'morphobluesusdedai_945',
-  // USDe/DAI
-  MorphoBlueUSDeDAI_860 = 'morphoblueusdedai_860',
-  MorphoBlueUSDeDAI_915 = 'morphoblueusdedai_915',
-
-  MorphoBlueMORPHOUSDC_625 = 'morphobluemorphousdc_625',
-
-  // BASE
-  MorphoBlueCbEthUSDC_860_Base = 'morphobluecbethusdc_860_base',
-  MorphoBlueCbEthUSDC_860_Base_1c21c59d = 'morphobluecbethusdc_860_base_1c21c59d',
-  MorphoBlueWstEthUSDC_860_Base = 'morphobluewstethusdc_860_base',
-  MorphoBlueWstEthUSDC_860_Base_13c42741 = 'morphobluewstethusdc_860_base_13c42741',
-  MorphoBlueEthUSDC_860_Base = 'morphoblueethusdc_860_base',
-  MorphoBlueCbEthEth_945_Base = 'morphobluecbetheth_945_base',
-  MorphoBlueCbEthEth_965_Base = 'morphobluecbetheth_965_base',
-  MorphoBlueWstEthEth_945_Base = 'morphobluewstetheth_945_base',
-  MorphoBlueWstEthEth_965_Base = 'morphobluewstetheth_965_base',
-  MorphoBlueREthUSDC_860_Base = 'morphobluerethusdc_860_base',
-  MorphoBlueREthEth_945_Base = 'morphoblueretheth_945_base',
-  MorphoBlueCbBTCEth_915_Base = 'morphobluecbbtceth_915_base',
-  MorphoBlueCbBTCUSDC_860_Base = 'morphobluecbbtcusdc_860_base',
-  MorphoBlueWsuperOETHbWETH_915_Base = 'morphobluewsuperoethbweth_915_base',
-  MorphoBlueLBTCCbBTC_945_Base = 'morphobluelbtccbbtc_945_base', // LBTC/cbBTC
-  MorphoBlueWstEthEURC_860_Base = 'morphobluewstetheurc_860_base', // wstETH/EURC
-  MorphoBlueCbBTCEURC_860_Base = 'morphobluecbbtceurc_860_base', // cbBTC/EURC
-  MorphoBlueWETHEURC_860_Base = 'morphobluewetheurc_860_base', // WETH/EURC
-
-  // ARBITRUM
-  MorphoBlueSyrupUSDCUSDC_915_Arb = 'morphobluesyrupusdcusdc_915_arb', // syrupUSDC/USDC
-  MorphoBlueWBTCUSDC_860_Arb = 'morphobluewbtcusdc_860_arb', // WBTC/USDC
-  MorphoBlueWstEthUSDC_860_Arb = 'morphobluewstethusdc_860_arb', // wstETH/USDC
-  MorphoBlueEthUSDC_860_Arb = 'morphoblueethusdc_860_arb', // ETH/USDC
-  MorphoBluesUSDSUSDC_945_Arb = 'morphobluesusdsusdc_945_arb', // sUSDS/USDC
-}
-
-export enum MorphoBlueOracleType {
-  MARKET_RATE = 'Market rate',
-  LIDO_RATE = 'Lido rate',
-  ETHENA_RATE = 'Ethena rate',
-  CONTRACT_RATE = 'Contract rate',
-}
-
-export interface MorphoBlueMarketData {
-  chainIds: NetworkNumber[],
-  label: string,
-  shortLabel: string,
-  url: string,
-  value: MorphoBlueVersions,
-  loanToken: EthAddress,
-  collateralToken: EthAddress,
-  oracle: EthAddress,
-  oracleType: MorphoBlueOracleType,
-  irm: EthAddress,
-  lltv: number | string,
-  marketId: string,
-  // icon: Function,
-  protocolName: string,
-}
-
-export interface MorphoBlueAssetData {
-  symbol: string,
-  address: string,
-  price: string,
-  supplyRate: string,
-  borrowRate: string,
-  supplyIncentives: IncentiveData[],
-  borrowIncentives: IncentiveData[],
-  totalSupply?: string,
-  totalBorrow?: string,
-  canBeSupplied?: boolean,
-  canBeBorrowed?: boolean,
-}
-
-export type MorphoBlueAssetsData = { [key: string]: MorphoBlueAssetData };
-
-export interface MorphoBlueMarketInfo {
-  id: string,
-  fee: string,
-  loanToken: string,
-  collateralToken: string,
-  utillization: string,
-  oracle: string,
-  oracleType: MorphoBlueOracleType,
-  lltv: string,
-  minRatio: string,
-  assetsData: MorphoBlueAssetsData,
-}
-
-export interface MorphoBlueAggregatedPositionData {
-  suppliedUsd: string,
-  suppliedCollateralUsd: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  liquidationLimitUsd: string,
-  leftToBorrowUsd: string,
-  leftToBorrow: string,
-  netApy: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  ltv: string,
-  ratio: string,
-  leveragedType: LeverageType,
-  leveragedAsset?: string,
-  currentVolatilePairRatio?: string,
-  liquidationPrice?: string,
-  minCollRatio?: string,
-  collLiquidationRatio?: string,
-}
-
-export interface MorphoBluePositionData {
-  usedAssets: MMUsedAssets,
-  suppliedUsd: string,
-  suppliedCollateralUsd: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  liquidationLimitUsd: string,
-  leftToBorrowUsd: string,
-  leftToBorrow: string,
-  netApy: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  ltv: string,
-  ratio: string,
-  leveragedType: LeverageType,
-  leveragedAsset?: string,
-  currentVolatilePairRatio?: string,
-  liquidationPrice?: string,
-  supplyShares: string,
-  borrowShares: string,
-}
-
-export interface MorphoBlueVault {
-  address: string,
-}
-
-export interface MorphoBlueAllocationMarket {
-  loanAsset: { address: string },
-  collateralAsset: { address: string },
-  oracle: { address: string },
-  irmAddress: string,
-  lltv: string,
-  uniqueKey: string,
-}
-
-export interface MorphoBluePublicAllocatorItem {
-  vault: MorphoBlueVault,
-  assets: string,
-  allocationMarket: MorphoBlueAllocationMarket,
-}
-
-export interface MorphoBlueAllocatorMarketState {
-  borrowAssets: string,
-  supplyAssets: string,
-}
-
-export interface MorphoBlueRealloactionMarketData {
-  reallocatableLiquidityAssets: string,
-  targetBorrowUtilization: string,
-  publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[],
-  state: MorphoBlueAllocatorMarketState,
-}
+import {
+  EthAddress, IncentiveData, LeverageType, MMUsedAssets, NetworkNumber,
+} from './common';
+
+export enum MorphoBlueVersions {
+  // MAINNET
+  MorphoBlueWstEthUSDC = 'morphobluewstethusdc', // wstETH/USDC
+  MorphoBlueSDAIUSDC = 'morphobluesdaiusdc', // sDAI/USDC
+  MorphoBlueWBTCUSDC = 'morphobluewbtcusdc', // WBTC/USDC
+  MorphoBlueEthUSDC = 'morphoblueethusdc', // ETH/USDC
+  MorphoBlueWBTCUSDT = 'morphobluewbtcusdt', // WBTC/USDT
+  MorphoBlueWstEthUSDT = 'morphobluewstethusdt', // wstETH/USDT
+  MorphoBlueWstEthUSDA_Exchange_Rate = 'morphobluewstethusda_exchange_rate', // wstETH/USDA
+  MorphoBlueWstEthPYUSD = 'morphobluwstethpyusd', // wstETH/PYUSD
+  MorphoBlueWBTCPYUSD = 'morphobluewbtcpyusd', // WBTC/PYUSD
+  MorphoBlueWBTCEth = 'morphobluewbtceth', // WBTC/ETH
+  MorphoBlueUSDeUSDT = 'morphoblueusdeusdt', // USDe/USDT
+  MorphoBlueSUSDeUSDT = 'morphobluesusdeusdt', // sUSDe/USDT
+  MorphoBlueMKRUSDC = 'morphobluemkrusdc', // MKR/USDC
+  MorphoBlueTBTCUSDC = 'morphobluetbtcusdc', // tBTC/USDC
+  MorphoBlueCbBTCEth_915 = 'morphobluecbbtceth', // cbBTC/Eth
+  MorphoBlueCbBTCUSDC_860 = 'morphobluecbbtcusdc', // cbBTC/USDC
+  MorphoBlueSUSDeUSDC_915 = 'morphobluesusdeusdc_915', // sUSDe/USDC
+  MorphoBlueLBTCWBTC_945 = 'morphobluelbtcwbtc_945', // LBTC/WBTC
+  MorphoBlueLBTCUSDC_860 = 'morphobluelbtcusdc_860', // LBTC/USDC
+  MorphoBlueLBTCCbBTC_945 = 'morphobluelbtccbbtc_945', // LBTC/cbBTC
+  MorphoBlueUSRUSDC_915 = 'morphoblueusrusdc_915', // USR/USDC
+  MorphoBlueSyrupUSDCUSDC_915 = 'morphobluesyrupusdcusdc_915', // syrupUSDC/USDC
+  MorphoBluesUSDSUSDT_965 = 'morphobluesusdsusdt_965', // sUSDS/USDT
+  // ezETH/ETH
+  MorphoBlueEzEthEth_860 = 'morphoblueezetheth_860',
+  MorphoBlueEzEthEth_945 = 'morphoblueezetheth_945',
+  // weETH/ETH
+  MorphoBlueWeEthEth_945 = 'morphoblueweetheth_945',
+  // wstETH/WETH
+  MorphoBlueWstEthEth_945 = 'morphobluewstetheth_945',
+  MorphoBlueWstEthEth_945_Exchange_Rate = 'morphobluewstetheth_945_exchange_rate',
+  MorphoBlueWstEthEth_965_Exchange_Rate = 'morphobluewstetheth_965_exchange_rate',
+  // sUSDe/DAI
+  MorphoBlueSUSDeDAI_860 = 'morphobluesusdedai_860',
+  MorphoBlueSUSDeDAI_915 = 'morphobluesusdedai_915',
+  MorphoBlueSUSDeDAI_945 = 'morphobluesusdedai_945',
+  // USDe/DAI
+  MorphoBlueUSDeDAI_860 = 'morphoblueusdedai_860',
+  MorphoBlueUSDeDAI_915 = 'morphoblueusdedai_915',
+
+  MorphoBlueMORPHOUSDC_625 = 'morphobluemorphousdc_625',
+
+  // BASE
+  MorphoBlueCbEthUSDC_860_Base = 'morphobluecbethusdc_860_base',
+  MorphoBlueCbEthUSDC_860_Base_1c21c59d = 'morphobluecbethusdc_860_base_1c21c59d',
+  MorphoBlueWstEthUSDC_860_Base = 'morphobluewstethusdc_860_base',
+  MorphoBlueWstEthUSDC_860_Base_13c42741 = 'morphobluewstethusdc_860_base_13c42741',
+  MorphoBlueEthUSDC_860_Base = 'morphoblueethusdc_860_base',
+  MorphoBlueCbEthEth_945_Base = 'morphobluecbetheth_945_base',
+  MorphoBlueCbEthEth_965_Base = 'morphobluecbetheth_965_base',
+  MorphoBlueWstEthEth_945_Base = 'morphobluewstetheth_945_base',
+  MorphoBlueWstEthEth_965_Base = 'morphobluewstetheth_965_base',
+  MorphoBlueREthUSDC_860_Base = 'morphobluerethusdc_860_base',
+  MorphoBlueREthEth_945_Base = 'morphoblueretheth_945_base',
+  MorphoBlueCbBTCEth_915_Base = 'morphobluecbbtceth_915_base',
+  MorphoBlueCbBTCUSDC_860_Base = 'morphobluecbbtcusdc_860_base',
+  MorphoBlueWsuperOETHbWETH_915_Base = 'morphobluewsuperoethbweth_915_base',
+  MorphoBlueLBTCCbBTC_945_Base = 'morphobluelbtccbbtc_945_base', // LBTC/cbBTC
+  MorphoBlueWstEthEURC_860_Base = 'morphobluewstetheurc_860_base', // wstETH/EURC
+  MorphoBlueCbBTCEURC_860_Base = 'morphobluecbbtceurc_860_base', // cbBTC/EURC
+  MorphoBlueWETHEURC_860_Base = 'morphobluewetheurc_860_base', // WETH/EURC
+
+  // ARBITRUM
+  MorphoBlueSyrupUSDCUSDC_915_Arb = 'morphobluesyrupusdcusdc_915_arb', // syrupUSDC/USDC
+  MorphoBlueWBTCUSDC_860_Arb = 'morphobluewbtcusdc_860_arb', // WBTC/USDC
+  MorphoBlueWstEthUSDC_860_Arb = 'morphobluewstethusdc_860_arb', // wstETH/USDC
+  MorphoBlueEthUSDC_860_Arb = 'morphoblueethusdc_860_arb', // ETH/USDC
+  MorphoBluesUSDSUSDC_945_Arb = 'morphobluesusdsusdc_945_arb', // sUSDS/USDC
+}
+
+export enum MorphoBlueOracleType {
+  MARKET_RATE = 'Market rate',
+  LIDO_RATE = 'Lido rate',
+  ETHENA_RATE = 'Ethena rate',
+  CONTRACT_RATE = 'Contract rate',
+}
+
+export interface MorphoBlueMarketData {
+  chainIds: NetworkNumber[],
+  label: string,
+  shortLabel: string,
+  url: string,
+  value: MorphoBlueVersions,
+  loanToken: EthAddress,
+  collateralToken: EthAddress,
+  oracle: EthAddress,
+  oracleType: MorphoBlueOracleType,
+  irm: EthAddress,
+  lltv: number | string,
+  marketId: string,
+  // icon: Function,
+  protocolName: string,
+}
+
+export interface MorphoBlueAssetData {
+  symbol: string,
+  address: string,
+  price: string,
+  supplyRate: string,
+  borrowRate: string,
+  supplyIncentives: IncentiveData[],
+  borrowIncentives: IncentiveData[],
+  totalSupply?: string,
+  totalBorrow?: string,
+  canBeSupplied?: boolean,
+  canBeBorrowed?: boolean,
+}
+
+export type MorphoBlueAssetsData = { [key: string]: MorphoBlueAssetData };
+
+export interface MorphoBlueMarketInfo {
+  id: string,
+  fee: string,
+  loanToken: string,
+  collateralToken: string,
+  utillization: string,
+  oracle: string,
+  oracleType: MorphoBlueOracleType,
+  lltv: string,
+  minRatio: string,
+  assetsData: MorphoBlueAssetsData,
+}
+
+export interface MorphoBlueAggregatedPositionData {
+  suppliedUsd: string,
+  suppliedCollateralUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  liquidationLimitUsd: string,
+  leftToBorrowUsd: string,
+  leftToBorrow: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  ltv: string,
+  ratio: string,
+  leveragedType: LeverageType,
+  leveragedAsset?: string,
+  currentVolatilePairRatio?: string,
+  liquidationPrice?: string,
+  minCollRatio?: string,
+  collLiquidationRatio?: string,
+}
+
+export interface MorphoBluePositionData {
+  usedAssets: MMUsedAssets,
+  suppliedUsd: string,
+  suppliedCollateralUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  liquidationLimitUsd: string,
+  leftToBorrowUsd: string,
+  leftToBorrow: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  ltv: string,
+  ratio: string,
+  leveragedType: LeverageType,
+  leveragedAsset?: string,
+  currentVolatilePairRatio?: string,
+  liquidationPrice?: string,
+  supplyShares: string,
+  borrowShares: string,
+}
+
+export interface MorphoBlueVault {
+  address: string,
+}
+
+export interface MorphoBlueAllocationMarket {
+  loanAsset: { address: string },
+  collateralAsset: { address: string },
+  oracle: { address: string },
+  irmAddress: string,
+  lltv: string,
+  uniqueKey: string,
+}
+
+export interface MorphoBluePublicAllocatorItem {
+  vault: MorphoBlueVault,
+  assets: string,
+  allocationMarket: MorphoBlueAllocationMarket,
+}
+
+export interface MorphoBlueAllocatorMarketState {
+  borrowAssets: string,
+  supplyAssets: string,
+}
+
+export interface MorphoBlueRealloactionMarketData {
+  reallocatableLiquidityAssets: string,
+  targetBorrowUtilization: string,
+  publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[],
+  state: MorphoBlueAllocatorMarketState,
+}

package/src/types/portfolio.ts

@@ -1,61 +1,65 @@
-import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
-import { EthAddress } from './common';
-import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { EulerV2PositionData, EulerV2Versions } from './euler';
-import { FluidVaultData } from './fluid';
-import { LiquityTroveInfo } from './liquity';
-import { LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
-import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData } from './maker';
-import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { SparkPositionData, SparkVersions } from './spark';
-
-export interface PortfolioProtocolData<T> {
-  error: string,
-  data: T | null,
-}
-
-export interface PortfolioPositionsDataForAddress {
-  aaveV3: {
-    [key in AaveVersions]?: PortfolioProtocolData<AaveV3PositionData>;
-  };
-  morphoBlue: {
-    [key in MorphoBlueVersions]?: PortfolioProtocolData<MorphoBluePositionData>;
-  };
-  compoundV3: {
-    [key in CompoundVersions]?: PortfolioProtocolData<CompoundV3PositionData>;
-  };
-  spark: {
-    [key in SparkVersions]?: PortfolioProtocolData<SparkPositionData>;
-  };
-  eulerV2: {
-    [key in EulerV2Versions]?: Record<EthAddress, PortfolioProtocolData<EulerV2PositionData>>;
-  };
-  maker: {
-    [key: string]: PortfolioProtocolData<CdpData>;
-  };
-  aaveV2: {
-    [key in AaveVersions]?: PortfolioProtocolData<AaveV2PositionData>;
-  };
-  compoundV2: {
-    [key in CompoundVersions]?: PortfolioProtocolData<CompoundV2PositionData>;
-  };
-  liquity: PortfolioProtocolData<LiquityTroveInfo> | {};
-  crvUsd: {
-    [key in CrvUSDVersions]?: PortfolioProtocolData<CrvUSDUserData>;
-  };
-  llamaLend: {
-    [key in LlamaLendVersionsType]?: PortfolioProtocolData<LlamaLendUserData>;
-  };
-  fluid: {
-    error: string;
-    data: {
-      [key: string]: FluidVaultData;
-    };
-  };
-}
-
-export interface PortfolioPositionsData {
-  [key: EthAddress]: PortfolioPositionsDataForAddress;
+import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
+import { EthAddress } from './common';
+import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { EulerV2PositionData, EulerV2Versions } from './euler';
+import { FluidVaultData } from './fluid';
+import { LiquityTroveInfo } from './liquity';
+import { LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
+import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { CdpData } from './maker';
+import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { SparkPositionData, SparkVersions } from './spark';
+
+export interface PortfolioProtocolData<T> {
+  error: string,
+  data: T | null,
+}
+
+export interface PortfolioPositionsDataForAddress {
+  aaveV3: {
+    [key in AaveVersions]?: PortfolioProtocolData<AaveV3PositionData>;
+  };
+  morphoBlue: {
+    [key in MorphoBlueVersions]?: PortfolioProtocolData<MorphoBluePositionData>;
+  };
+  compoundV3: {
+    [key in CompoundVersions]?: PortfolioProtocolData<CompoundV3PositionData>;
+  };
+  spark: {
+    [key in SparkVersions]?: PortfolioProtocolData<SparkPositionData>;
+  };
+  eulerV2: {
+    [key in EulerV2Versions]?: Record<EthAddress, PortfolioProtocolData<EulerV2PositionData>>;
+  };
+  maker: {
+    [key: string]: PortfolioProtocolData<CdpData>;
+  };
+  aaveV2: {
+    [key in AaveVersions]?: PortfolioProtocolData<AaveV2PositionData>;
+  };
+  compoundV2: {
+    [key in CompoundVersions]?: PortfolioProtocolData<CompoundV2PositionData>;
+  };
+  liquity: PortfolioProtocolData<LiquityTroveInfo> | {};
+  crvUsd: {
+    [key in CrvUSDVersions]?: PortfolioProtocolData<CrvUSDUserData>;
+  };
+  llamaLend: {
+    [key in LlamaLendVersionsType]?: PortfolioProtocolData<LlamaLendUserData>;
+  };
+  fluid: {
+    error: string;
+    data: {
+      [key: string]: FluidVaultData;
+    };
+  };
+  aaveV4: {
+    [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
+  };
+}
+
+export interface PortfolioPositionsData {
+  [key: EthAddress]: PortfolioPositionsDataForAddress;
 }

package/src/types/savings/index.ts

@@ -1,24 +1,24 @@
-import { EthAddress } from '../common';
-import { MakerDsrType } from './makerDsr';
-import { MorphoVaultType } from './morphoVaults';
-import { SkySavingsType } from './sky';
-import { SparkSavingsVaultType } from './sparkSavingsVaults';
-import { YearnV3VaultType } from './yearnV3Vaults';
-import { YearnVaultType } from './yearnVaults';
-
-export * from './morphoVaults';
-export * from './yearnVaults';
-export * from './makerDsr';
-export * from './sky';
-export * from './sparkSavingsVaults';
-export * from './yearnV3Vaults';
-
-export interface SavingsVaultData {
-  poolSize: string,
-  liquidity: string,
-  supplied: Record<EthAddress, string>,
-  asset: string,
-  optionType: string,
-}
-
+import { EthAddress } from '../common';
+import { MakerDsrType } from './makerDsr';
+import { MorphoVaultType } from './morphoVaults';
+import { SkySavingsType } from './sky';
+import { SparkSavingsVaultType } from './sparkSavingsVaults';
+import { YearnV3VaultType } from './yearnV3Vaults';
+import { YearnVaultType } from './yearnVaults';
+
+export * from './morphoVaults';
+export * from './yearnVaults';
+export * from './makerDsr';
+export * from './sky';
+export * from './sparkSavingsVaults';
+export * from './yearnV3Vaults';
+
+export interface SavingsVaultData {
+  poolSize: string,
+  liquidity: string,
+  supplied: Record<EthAddress, string>,
+  asset: string,
+  optionType: string,
+}
+
 export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | YearnV3VaultType, SavingsVaultData>>;

package/src/types/savings/makerDsr.ts

@@ -1,14 +1,14 @@
-import { EthAddress } from '../common';
-
-export enum MakerDsrType {
-  MakerDsrVault = 'maker_dsr',
-}
-
-export interface MakerDsrVault {
-  type: MakerDsrType;
-  name: string;
-  address: EthAddress;
-  asset: string;
-  deploymentBlock: number;
-  isLegacy: boolean;
+import { EthAddress } from '../common';
+
+export enum MakerDsrType {
+  MakerDsrVault = 'maker_dsr',
+}
+
+export interface MakerDsrVault {
+  type: MakerDsrType;
+  name: string;
+  address: EthAddress;
+  asset: string;
+  deploymentBlock: number;
+  isLegacy: boolean;
 }