@defisaver/positions-sdk 2.1.49-aave-v4-dev-1-dev → 2.1.49-aave-v4-dev-2

package/src/types/portfolio.ts

@@ -1,65 +1,65 @@
-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;
+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;
 }

package/src/types/savings/morphoVaults.ts

@@ -1,33 +1,33 @@
-import { EthAddress } from '../common';
-
-export enum MorphoVaultType {
-  MorphoVaultFlagshipEth = 'morpho_vault_flagship_eth',
-  MorphoVaultGauntletUSDCCore = 'morpho_vault_gauntlet_usdc_core',
-  MorphoVaultGauntletUSDCPrime = 'morpho_vault_gauntlet_usdc_prime',
-  MorphoVaultRe7Weth = 'morpho_vault_re7_weth',
-  MorphoVaultGauntletWETHCore = 'morpho_vault_gauntlet_weth_core',
-  MorphoVaultGauntletWETHPrime = 'morpho_vault_gauntlet_weth_prime',
-  MorphoVaultBoostedUSDC = 'morpho_vault_usual_boosted_usdc',
-  MorphoVaultFlagshipUSDT = 'morpho_vault_flagship_usdt',
-  MorphoVaultGauntletUSDACore = 'morpho_vault_gauntlet_usda_core',
-  MorphoVaultGauntletUSDTPrime = 'morpho_vault_gauntlet_usdt_prime',
-  MorphoVaultGauntletResolvUSDC = 'morpho_vault_gauntlet_resolv_usdc',
-  // Steakhouse
-  MorphoVaultSteakhouseUSDT = 'morpho_vault_steakhouse_usdt',
-  MorphoVaultSteakhouseUSDC = 'morpho_vault_steakhouse_usdc',
-  MorphoVaultSteakhouseETH = 'morpho_vault_steakhouse_eth',
-  MorphoVaultSteakhousePYUSD = 'morpho_vault_steakhouse_pyusd',
-  // Smokehouse
-  MorphoVaultSmokehouseUSDT = 'morpho_vault_smokehouse_usdt',
-  MorphoVaultSmokehouseUSDC = 'morpho_vault_smokehouse_usdc',
-  MorphoVaultSmokehouseDAI = 'morpho_vault_smokehouse_dai',
-}
-
-export interface MorphoVault {
-  type: MorphoVaultType;
-  name: string;
-  address: EthAddress;
-  asset: string;
-  deploymentBlock: number;
-  isLegacy: boolean;
+import { EthAddress } from '../common';
+
+export enum MorphoVaultType {
+  MorphoVaultFlagshipEth = 'morpho_vault_flagship_eth',
+  MorphoVaultGauntletUSDCCore = 'morpho_vault_gauntlet_usdc_core',
+  MorphoVaultGauntletUSDCPrime = 'morpho_vault_gauntlet_usdc_prime',
+  MorphoVaultRe7Weth = 'morpho_vault_re7_weth',
+  MorphoVaultGauntletWETHCore = 'morpho_vault_gauntlet_weth_core',
+  MorphoVaultGauntletWETHPrime = 'morpho_vault_gauntlet_weth_prime',
+  MorphoVaultBoostedUSDC = 'morpho_vault_usual_boosted_usdc',
+  MorphoVaultFlagshipUSDT = 'morpho_vault_flagship_usdt',
+  MorphoVaultGauntletUSDACore = 'morpho_vault_gauntlet_usda_core',
+  MorphoVaultGauntletUSDTPrime = 'morpho_vault_gauntlet_usdt_prime',
+  MorphoVaultGauntletResolvUSDC = 'morpho_vault_gauntlet_resolv_usdc',
+  // Steakhouse
+  MorphoVaultSteakhouseUSDT = 'morpho_vault_steakhouse_usdt',
+  MorphoVaultSteakhouseUSDC = 'morpho_vault_steakhouse_usdc',
+  MorphoVaultSteakhouseETH = 'morpho_vault_steakhouse_eth',
+  MorphoVaultSteakhousePYUSD = 'morpho_vault_steakhouse_pyusd',
+  // Smokehouse
+  MorphoVaultSmokehouseUSDT = 'morpho_vault_smokehouse_usdt',
+  MorphoVaultSmokehouseUSDC = 'morpho_vault_smokehouse_usdc',
+  MorphoVaultSmokehouseDAI = 'morpho_vault_smokehouse_dai',
+}
+
+export interface MorphoVault {
+  type: MorphoVaultType;
+  name: string;
+  address: EthAddress;
+  asset: string;
+  deploymentBlock: number;
+  isLegacy: boolean;
 }

package/src/types/savings/sky.ts

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

package/src/types/savings/sparkSavingsVaults.ts

@@ -1,16 +1,16 @@
-import { EthAddress } from '../common';
-
-export enum SparkSavingsVaultType {
-  SparkSavingsUSDC = 'spark_savings_usdc',
-  SparkSavingsUSDT = 'spark_savings_usdt',
-  SparkSavingsETH = 'spark_savings_eth',
-}
-
-export interface SparkSavingsVault {
-  type: SparkSavingsVaultType;
-  name: string;
-  address: EthAddress;
-  asset: string;
-  deploymentBlock: number;
-  isLegacy: boolean;
+import { EthAddress } from '../common';
+
+export enum SparkSavingsVaultType {
+  SparkSavingsUSDC = 'spark_savings_usdc',
+  SparkSavingsUSDT = 'spark_savings_usdt',
+  SparkSavingsETH = 'spark_savings_eth',
+}
+
+export interface SparkSavingsVault {
+  type: SparkSavingsVaultType;
+  name: string;
+  address: EthAddress;
+  asset: string;
+  deploymentBlock: number;
+  isLegacy: boolean;
 }

package/src/types/savings/yearnV3Vaults.ts

@@ -1,18 +1,18 @@
-import { EthAddress } from '../common';
-
-export enum YearnV3VaultType {
-  YearnVaultV3USDC = 'yearn_v3_vault_usdc',
-  YearnVaultV3USDS = 'yearn_v3_vault_usds',
-  YearnVaultV3USDT = 'yearn_v3_vault_usdt',
-  YearnVaultV3DAI = 'yearn_v3_vault_dai',
-  YearnVaultV3WETH_1 = 'yearn_v3_vault_weth_1',
-}
-
-export interface YearnV3Vault {
-  type: YearnV3VaultType;
-  address: EthAddress;
-  asset: string;
-  name: string;
-  deploymentBlock: number;
-  isLegacy: boolean;
+import { EthAddress } from '../common';
+
+export enum YearnV3VaultType {
+  YearnVaultV3USDC = 'yearn_v3_vault_usdc',
+  YearnVaultV3USDS = 'yearn_v3_vault_usds',
+  YearnVaultV3USDT = 'yearn_v3_vault_usdt',
+  YearnVaultV3DAI = 'yearn_v3_vault_dai',
+  YearnVaultV3WETH_1 = 'yearn_v3_vault_weth_1',
+}
+
+export interface YearnV3Vault {
+  type: YearnV3VaultType;
+  address: EthAddress;
+  asset: string;
+  name: string;
+  deploymentBlock: number;
+  isLegacy: boolean;
 }

package/src/types/savings/yearnVaults.ts

@@ -1,15 +1,15 @@
-import { EthAddress } from '../common';
-
-export enum YearnVaultType {
-  YearnVaultDAI = 'yearn_vault_dai',
-  YearnVaultUSDC = 'yearn_vault_usdc',
-  YearnVaultUSDT = 'yearn_vault_usdt',
-}
-
-export interface YearnVault {
-  type: YearnVaultType;
-  address: EthAddress;
-  asset: string;
-  deploymentBlock: number;
-  isLegacy: boolean;
+import { EthAddress } from '../common';
+
+export enum YearnVaultType {
+  YearnVaultDAI = 'yearn_vault_dai',
+  YearnVaultUSDC = 'yearn_vault_usdc',
+  YearnVaultUSDT = 'yearn_vault_usdt',
+}
+
+export interface YearnVault {
+  type: YearnVaultType;
+  address: EthAddress;
+  asset: string;
+  deploymentBlock: number;
+  isLegacy: boolean;
 }

package/src/types/spark.ts

@@ -1,134 +1,134 @@
-import { EModeCategoriesData } from './aave';
-import {
-  EthAddress,
-  IncentiveData,
-  MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
-} from './common';
-
-export enum SparkVersions {
-  SparkV1 = 'v1default',
-}
-
-export interface SparkEModeCategoryData {
-  label: string,
-  liquidationBonus: string,
-  liquidationRatio: string,
-  collateralFactor: string,
-  priceSource: string,
-}
-
-export interface SparkEModeCategoryDataMapping {
-  enteringTerms: boolean[],
-  canEnterCategory: boolean,
-  id: number,
-  enabledData: {
-    ratio: string,
-    liqRatio: string,
-    liqPercent: string,
-    collRatio: string,
-  }
-}
-
-export interface SparkMarketData {
-  chainIds: NetworkNumber[],
-  label: string,
-  shortLabel: string,
-  url: string,
-  value: SparkVersions,
-  assets: readonly string[],
-  provider: '' | 'SparkPoolAddressesProvider',
-  providerAddress: EthAddress,
-  lendingPool: 'SparkLendingPool',
-  lendingPoolAddress: EthAddress,
-  protocolData: '' | 'SparkProtocolDataProvider',
-  protocolDataAddress: EthAddress,
-  subVersionLabel?: string
-  // icon: Function,
-  protocolName: string,
-  disabled?: boolean,
-}
-
-export interface SparkAssetData extends MMAssetData {
-  totalBorrowVar: string,
-  sortIndex?: number,
-  usageAsCollateralEnabled: boolean,
-  isIsolated: boolean,
-  eModeCategory: number,
-  liquidationBonus: string,
-  liquidationRatio: string,
-}
-
-export interface SparkAssetsData {
-  [token: string]: SparkAssetData,
-}
-
-export type SparkMarketsData = { assetsData: SparkAssetsData, eModeCategoriesData: EModeCategoriesData };
-
-export interface SparkUsedAsset extends MMUsedAsset {
-  stableBorrowRate: string,
-  borrowedStable: string,
-  borrowedVariable: string,
-  borrowedUsdStable: string,
-  borrowedUsdVariable: string,
-  stableLimit: string,
-  variableLimit: string,
-  limit: string,
-  eModeCategory: number,
-}
-
-export interface SparkUsedAssets {
-  [token: string]: SparkUsedAsset,
-}
-
-export interface SparkHelperCommon {
-  usedAssets: SparkUsedAssets,
-  eModeCategory: number,
-  eModeCategoriesData?: EModeCategoriesData,
-  assetsData: SparkAssetsData,
-  selectedMarket?: SparkMarketData,
-  network?: NetworkNumber,
-}
-
-export interface SparkAggregatedPositionData {
-  suppliedUsd: string,
-  suppliedCollateralUsd: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  liquidationLimitUsd: string,
-  leftToBorrowUsd: string,
-  ratio: string,
-  collRatio: string,
-  netApy: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  liqRatio: string,
-  liqPercent: string,
-  leveragedType: string,
-  leveragedAsset?: string,
-  leveragedLsdAssetRatio?: string,
-  liquidationPrice?: string,
-  minCollRatio: string,
-  collLiquidationRatio: string,
-  healthRatio: string;
-  minHealthRatio: string;
-}
-
-export interface SparkPositionData extends MMPositionData {
-  ratio: string,
-  minRatio: string,
-  collRatio: string,
-  suppliedUsd: string,
-  borrowedUsd: string,
-  borrowLimitUsd: string,
-  suppliedCollateralUsd: string,
-  incentiveUsd: string,
-  totalInterestUsd: string,
-  isSubscribedToAutomation?: boolean,
-  automationResubscribeRequired?: boolean,
-  totalSupplied: string,
-  usedAssets: SparkUsedAssets,
-  eModeCategory: number,
-  isInIsolationMode: boolean,
-  isInSiloedMode: boolean,
-  eModeCategories: { [key: number]: SparkEModeCategoryDataMapping },
-}
+import { EModeCategoriesData } from './aave';
+import {
+  EthAddress,
+  IncentiveData,
+  MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
+} from './common';
+
+export enum SparkVersions {
+  SparkV1 = 'v1default',
+}
+
+export interface SparkEModeCategoryData {
+  label: string,
+  liquidationBonus: string,
+  liquidationRatio: string,
+  collateralFactor: string,
+  priceSource: string,
+}
+
+export interface SparkEModeCategoryDataMapping {
+  enteringTerms: boolean[],
+  canEnterCategory: boolean,
+  id: number,
+  enabledData: {
+    ratio: string,
+    liqRatio: string,
+    liqPercent: string,
+    collRatio: string,
+  }
+}
+
+export interface SparkMarketData {
+  chainIds: NetworkNumber[],
+  label: string,
+  shortLabel: string,
+  url: string,
+  value: SparkVersions,
+  assets: readonly string[],
+  provider: '' | 'SparkPoolAddressesProvider',
+  providerAddress: EthAddress,
+  lendingPool: 'SparkLendingPool',
+  lendingPoolAddress: EthAddress,
+  protocolData: '' | 'SparkProtocolDataProvider',
+  protocolDataAddress: EthAddress,
+  subVersionLabel?: string
+  // icon: Function,
+  protocolName: string,
+  disabled?: boolean,
+}
+
+export interface SparkAssetData extends MMAssetData {
+  totalBorrowVar: string,
+  sortIndex?: number,
+  usageAsCollateralEnabled: boolean,
+  isIsolated: boolean,
+  eModeCategory: number,
+  liquidationBonus: string,
+  liquidationRatio: string,
+}
+
+export interface SparkAssetsData {
+  [token: string]: SparkAssetData,
+}
+
+export type SparkMarketsData = { assetsData: SparkAssetsData, eModeCategoriesData: EModeCategoriesData };
+
+export interface SparkUsedAsset extends MMUsedAsset {
+  stableBorrowRate: string,
+  borrowedStable: string,
+  borrowedVariable: string,
+  borrowedUsdStable: string,
+  borrowedUsdVariable: string,
+  stableLimit: string,
+  variableLimit: string,
+  limit: string,
+  eModeCategory: number,
+}
+
+export interface SparkUsedAssets {
+  [token: string]: SparkUsedAsset,
+}
+
+export interface SparkHelperCommon {
+  usedAssets: SparkUsedAssets,
+  eModeCategory: number,
+  eModeCategoriesData?: EModeCategoriesData,
+  assetsData: SparkAssetsData,
+  selectedMarket?: SparkMarketData,
+  network?: NetworkNumber,
+}
+
+export interface SparkAggregatedPositionData {
+  suppliedUsd: string,
+  suppliedCollateralUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  liquidationLimitUsd: string,
+  leftToBorrowUsd: string,
+  ratio: string,
+  collRatio: string,
+  netApy: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  liqRatio: string,
+  liqPercent: string,
+  leveragedType: string,
+  leveragedAsset?: string,
+  leveragedLsdAssetRatio?: string,
+  liquidationPrice?: string,
+  minCollRatio: string,
+  collLiquidationRatio: string,
+  healthRatio: string;
+  minHealthRatio: string;
+}
+
+export interface SparkPositionData extends MMPositionData {
+  ratio: string,
+  minRatio: string,
+  collRatio: string,
+  suppliedUsd: string,
+  borrowedUsd: string,
+  borrowLimitUsd: string,
+  suppliedCollateralUsd: string,
+  incentiveUsd: string,
+  totalInterestUsd: string,
+  isSubscribedToAutomation?: boolean,
+  automationResubscribeRequired?: boolean,
+  totalSupplied: string,
+  usedAssets: SparkUsedAssets,
+  eModeCategory: number,
+  isInIsolationMode: boolean,
+  isInSiloedMode: boolean,
+  eModeCategories: { [key: number]: SparkEModeCategoryDataMapping },
+}