@defisaver/positions-sdk 2.1.161-portfolio-api-2-dev → 2.1.162-npm-token-dev

package/src/savings/morphoVaults/options.ts

@@ -1,10 +1,14 @@
-import { MorphoVault, MorphoVaultType } from '../../types';
+import {
+  MorphoVault, MorphoVaultType, MorphoVaultVersion, NetworkNumber,
+} from '../../types';
 
 export const MORPHO_VAULT_FLAGSHIP_ETH: MorphoVault = {
   type: MorphoVaultType.MorphoVaultFlagshipEth,
   name: 'Flagship ETH',
   address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 18927491,
   isLegacy: true,
 };
@@ -14,6 +18,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_CORE: MorphoVault = {
   name: 'Gauntlet USDC Core',
   address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19777569,
   isLegacy: true,
 };
@@ -23,6 +29,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_PRIME: MorphoVault = {
   name: 'Gauntlet USDC Prime',
   address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19777569,
   isLegacy: true,
 };
@@ -32,6 +40,8 @@ export const MORPHO_VAULT_RE7_WETH: MorphoVault = {
   name: 'RE7 WETH',
   address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19121118,
   isLegacy: true,
 };
@@ -41,6 +51,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_CORE: MorphoVault = {
   name: 'Gauntlet WETH Core',
   address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19541126,
   isLegacy: true,
 };
@@ -50,6 +62,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_PRIME: MorphoVault = {
   name: 'Gauntlet WETH Prime',
   address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19372149,
   isLegacy: true,
 };
@@ -59,6 +73,8 @@ export const MORPHO_VAULT_BOOSTED_USDC: MorphoVault = {
   name: 'Boosted USDC',
   address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 20377233,
   isLegacy: true,
 };
@@ -68,6 +84,8 @@ export const MORPHO_VAULT_FLAGSHIP_USDT: MorphoVault = {
   name: 'Flagship USDT',
   address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19127039,
   isLegacy: true,
 };
@@ -77,6 +95,8 @@ export const MORPHO_VAULT_GAUNTLET_USDA_CORE: MorphoVault = {
   name: 'Gauntlet USDA Core',
   address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
   asset: 'USDA',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19633608,
   isLegacy: true,
 };
@@ -86,6 +106,8 @@ export const MORPHO_VAULT_GAUNTLET_USDT_PRIME: MorphoVault = {
   name: 'Gauntlet USDT Prime',
   address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19486541,
   isLegacy: true,
 };
@@ -95,6 +117,8 @@ export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC: MorphoVault = {
   name: 'Gauntlet Resolv USDC',
   address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21487882,
   isLegacy: true,
 };
@@ -106,6 +130,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT: MorphoVault = {
   name: 'Steakhouse USDT',
   address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19043398,
   isLegacy: false,
 };
@@ -115,6 +141,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDC: MorphoVault = {
   name: 'Steakhouse USDC',
   address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 18928285,
   isLegacy: false,
 };
@@ -124,6 +152,8 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH: MorphoVault = {
   name: 'Steakhouse WETH',
   address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
   asset: 'WETH',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19380443,
   isLegacy: false,
 };
@@ -133,6 +163,8 @@ export const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault = {
   name: 'Steakhouse PYUSD',
   address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
   asset: 'PYUSD',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 19043398,
   isLegacy: false,
 };
@@ -144,6 +176,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDT: MorphoVault = {
   name: 'Smokehouse USDT',
   address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
   asset: 'USDT',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21522238,
   isLegacy: false,
 };
@@ -153,6 +187,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDC: MorphoVault = {
   name: 'Smokehouse USDC',
   address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
   asset: 'USDC',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21337719,
   isLegacy: false,
 };
@@ -162,10 +198,36 @@ export const MORPHO_VAULT_SMOKEHOUSE_DAI: MorphoVault = {
   name: 'Smokehouse DAI',
   address: '0xbeeFfF68CC520D68f82641EFF84330C631E2490E',
   asset: 'DAI',
+  network: NetworkNumber.Eth,
+  version: MorphoVaultVersion.V1,
   deploymentBlock: 21343808,
   isLegacy: false,
 };
 
+// Vault V2
+
+export const MORPHO_VAULT_GAUNTLET_USDG_PREMIUM: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletUSDGPremium,
+  name: 'Gauntlet USDG Premium',
+  address: '0x390c1bb01F3F627144a40617e287d4cE3D5aBCfa',
+  asset: 'USDG',
+  network: NetworkNumber.Arb,
+  version: MorphoVaultVersion.V2,
+  deploymentBlock: 510799903,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_STEAKHOUSE_USDG_PRO: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSteakhouseUSDGPro,
+  name: 'Steakhouse USDG Pro',
+  address: '0xbeeFf72B77e7584a450E887125F25E8D8819016a',
+  asset: 'USDG',
+  network: NetworkNumber.Arb,
+  version: MorphoVaultVersion.V2,
+  deploymentBlock: 512247107,
+  isLegacy: false,
+};
+
 export const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault> = {
   [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
   [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -189,6 +251,10 @@ export const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault> = {
   [MorphoVaultType.MorphoVaultSmokehouseUSDT]: MORPHO_VAULT_SMOKEHOUSE_USDT,
   [MorphoVaultType.MorphoVaultSmokehouseUSDC]: MORPHO_VAULT_SMOKEHOUSE_USDC,
   [MorphoVaultType.MorphoVaultSmokehouseDAI]: MORPHO_VAULT_SMOKEHOUSE_DAI,
+
+  // Vault V2
+  [MorphoVaultType.MorphoVaultGauntletUSDGPremium]: MORPHO_VAULT_GAUNTLET_USDG_PREMIUM,
+  [MorphoVaultType.MorphoVaultSteakhouseUSDGPro]: MORPHO_VAULT_STEAKHOUSE_USDG_PRO,
 };
 
 export const getMorphoVault = (type: MorphoVaultType): MorphoVault => MORPHO_VAULTS[type];

package/src/spark/index.ts

@@ -108,6 +108,7 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
         collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
         borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
         ltvZeroAssets: [],
+        isolated: false,
       };
 
       return ({

package/src/types/aave.ts

@@ -1,5 +1,4 @@
 import {
-  EthAddress,
   IncentiveData,
   LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
@@ -49,6 +48,7 @@ export interface EModeCategoryData {
   borrowAssets: string[],
   ltvzeroBitmap?: string,
   ltvZeroAssets: string[],
+  isolated: boolean,
 }
 export interface EModeCategoryDataMapping {
   enteringTerms: boolean[],
@@ -97,9 +97,6 @@ export interface AaveV3AssetData extends AaveAssetData {
   liquidationBonus: string,
   supplyIncentives: IncentiveData[];
   borrowIncentives: IncentiveData[];
-  // Set by _getAaveV3MarketData. Optional, so objects built by hand still type-check.
-  aTokenAddress?: EthAddress,
-  vTokenAddress?: EthAddress,
 }
 
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
@@ -141,15 +138,7 @@ export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
 
-/**
- * Fields aaveAnyGetAggregatedPositionData adds to every Aave V2/V3 position at runtime, on top of those declared
- * below. Optional, so code that builds a position by hand keeps compiling.
- */
-export type AavePositionAggregatedFields = Partial<Omit<AaveV3AggregatedPositionData,
-| keyof MMPositionData | 'ratio' | 'collRatio' | 'safetyRatioWithLtvZeroFallback' | 'suppliedUsd' | 'borrowedUsd'
-| 'borrowLimitUsd' | 'suppliedCollateralUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
-
-export interface AavePositionData extends MMPositionData, AavePositionAggregatedFields {
+export interface AavePositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
   collRatio: string,
@@ -168,11 +157,6 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
 
 export interface AaveV2PositionData extends AavePositionData {
   usedAssets: AaveV2UsedAssets,
-  // Always their empty values: _getAaveV2AccountData starts from Aave V3's EMPTY_AAVE_DATA, which carries them.
-  eModeCategory?: number,
-  isInIsolationMode?: boolean,
-  isInSiloedMode?: boolean,
-  eModeCategories?: { [key: number]: EModeCategoryDataMapping },
 }
 
 export interface AaveV3PositionData extends AavePositionData {
@@ -219,89 +203,3 @@ export interface AaveHelperCommon {
   selectedMarket: Partial<AaveMarketInfo>,
   network?: NetworkNumber,
 }
-
-export interface SghoUserData {
-  shares: string;
-  balance: string;
-  maxDeposit: string;
-  maxWithdraw: string;
-  underlyingBalance: string;
-}
-
-export interface SghoData {
-  totalAssets: string;
-  totalSupply: string;
-  supplyCap: string;
-  /** Target savings rate as an APY percent (e.g. "4.25" for 4.25%). */
-  targetRate: string;
-  paused: boolean;
-  user: SghoUserData;
-}
-
-/** stkAAVE, stkGHO and sGHO of an address, from getStakeAaveData. */
-export interface StakeAaveData {
-  activatedCooldown: string,
-  activatedCooldownAmount: string,
-  stkAaveRewardsBalance: string,
-  aaveRewardsBalance: string,
-  stkAaveBalance: string,
-  stkGhoBalance: string,
-  ghoMeritApy: string,
-  stkAaveApy: string,
-  sgho: SghoData,
-}
-
-export interface UmbrellaTokenInfo {
-  token: EthAddress,
-  /** USD, converted from the oracle's 8 decimals. */
-  price: string,
-  name: string,
-  symbol: string,
-  decimals: number,
-}
-
-export interface UmbrellaRewardTokenData {
-  rewardTokenData: UmbrellaTokenInfo,
-  maxEmissionPerSecond: bigint,
-  distributionEnd: bigint,
-}
-
-export interface UmbrellaStakingAccountData {
-  stakeUserBalance: string,
-  rewardsTokenUserData: { reward: EthAddress, currentReward: string }[],
-  userCooldownAmount: string,
-  // Passed through unconverted: the view's bigint, or '0' when the view returns none.
-  userEndOfCooldown: bigint | string,
-  userWithdrawalWindow: bigint | string,
-}
-
-/**
- * One Umbrella stake token of an address, from getUmbrellaData: the view contracts' structs merged, with the amounts
- * the app reads converted to decimal strings. The bigint fields are the views' raw values, as the SDK passes them.
- */
-export interface UmbrellaStakingTokenData {
-  stakeTokenData: UmbrellaTokenInfo,
-  totalAssets: string,
-  targetLiquidity: string,
-  isStakeConfigured: boolean,
-  rewardsTokenData: UmbrellaRewardTokenData[],
-  stakeToken: EthAddress,
-  stakeUserBalance: bigint,
-  rewardsTokenUserData: { reward: EthAddress, currentReward: bigint }[],
-  stkToken: EthAddress,
-  totalShares: string,
-  stkUnderlyingToken: EthAddress,
-  aToken: EthAddress,
-  cooldownPeriod: bigint,
-  unstakeWindow: bigint,
-  stkTokenToWaTokenRate: string,
-  waTokenToATokenRate: string,
-  rewardsEmissionRates: string[],
-  userCooldownAmount: bigint,
-  userEndOfCooldown: bigint,
-  userWithdrawalWindow: bigint,
-  account: UmbrellaStakingAccountData,
-}
-
-/** Keyed by Umbrella stake (UmbrellaGHO, UmbrellaUSDC, UmbrellaUSDT, UmbrellaETH). */
-export type UmbrellaStakingData = Record<string, UmbrellaStakingTokenData>;

package/src/types/compound.ts

@@ -70,8 +70,6 @@ export interface CompoundAssetData extends MMAssetData {
 }
 
 export interface CompoundV2AssetData extends CompoundAssetData {
-  // Set by _getCompoundV2MarketsData. Optional, so objects built by hand still type-check.
-  exchangeRate?: string,
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
   borrowCollateralFactor: string,
@@ -83,20 +81,6 @@ export interface CompoundV3AssetData extends CompoundAssetData {
   supplyCap: string,
   priceInBaseAsset: string,
   canBeWithdrawn: boolean,
-  // The rest are set by formatMarketData and formatBaseData, which also spread in the view contract's raw asset
-  // data. Optional, so objects built by hand still type-check.
-  tokenAddr?: EthAddress,
-  // The base asset's only.
-  isBase?: boolean,
-  baseBorrowMin?: string,
-  baseTrackingBorrowRewardsSpeed?: string,
-  baseTrackingSupplyRewardsSpeed?: string,
-  borrowIndex?: string,
-  supplyIndex?: string,
-  trackingBorrowIndex?: string,
-  trackingSupplyIndex?: string,
-  rewardSupplySpeed?: string,
-  rewardBorrowSpeed?: string,
 }
 
 export interface CompoundAssetsData<T> {
@@ -157,30 +141,10 @@ export interface CompoundPositionData extends MMPositionData {
   automationResubscribeRequired?: boolean,
 }
 
-/**
- * Fields getCompoundV2AggregatedData adds to every Compound V2 position at runtime — a subset of
- * CompoundAggregatedPositionData. Optional, so code that builds a position by hand keeps compiling.
- */
-export type CompoundV2PositionAggregatedFields = Partial<Pick<CompoundAggregatedPositionData,
-| 'suppliedCollateralUsd' | 'liquidationLimitUsd' | 'leftToBorrowUsd' | 'collRatio' | 'leveragedType'
-| 'leveragedAsset' | 'liquidationPrice'>>;
-
-/**
- * Fields getCompoundV3AggregatedData adds to every Compound V3 position at runtime, on top of those declared in
- * CompoundPositionData. Optional, so code that builds a position by hand keeps compiling.
- */
-export type CompoundV3PositionAggregatedFields = Partial<Omit<CompoundAggregatedPositionData,
-| keyof MMPositionData | 'ratio' | 'minRatio' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd' | 'incentiveUsd'
-| 'totalInterestUsd'>>;
-
-export interface CompoundV2PositionData extends CompoundPositionData, CompoundV2PositionAggregatedFields {
+export interface CompoundV2PositionData extends CompoundPositionData {
   usedAssets: CompoundV2UsedAssets,
-  // Always false: _getCompoundV2AccountData starts from EMPTY_COMPOUND_DATA, which carries it.
-  borrowStableSupplyUnstable?: boolean,
 }
 
-export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
+export interface CompoundV3PositionData extends CompoundPositionData {
   usedAssets: CompoundV3UsedAssets,
-  // Whether the user's smart wallet is allowed to manage the account on Comet (Comet.isAllowed).
-  isAllowed?: boolean,
 }

package/src/types/curveUsd.ts

@@ -66,9 +66,6 @@ export interface CrvUSDGlobalMarketData {
   leftToBorrow: string,
   bands: BandData[],
   loanDiscount: string;
-  // crvUSDView's globalData field that _getCurveUsdGlobalData spreads in unconverted. Optional, so objects built by
-  // hand still type-check.
-  A?: bigint,
 }
 
 export interface CrvUSDAggregatedPositionData {
@@ -104,12 +101,7 @@ export interface CrvUSDUsedAssets {
   [key: string]: CrvUSDUsedAsset,
 }
 
-// Set by getCrvUsdAggregatedData, which _getCurveUsdUserData spreads in. Optional, so objects built by hand still
-// type-check.
-export type CrvUSDPositionAggregatedFields = Partial<Pick<CrvUSDAggregatedPositionData,
-| 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
-
-export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
+export interface CrvUSDUserData {
   debtAmount: string,
   health: string,
   healthPercent: string,
@@ -131,12 +123,4 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
   collateralPrice: string,
   collRatio: string,
   exposure: string,
-  // Fields of crvUSDView's userData that _getCurveUsdUserData spreads in unconverted. Optional, so objects built by
-  // hand still type-check.
-  marketCollateralAmount?: bigint,
-  curveUsdCollateralAmount?: bigint,
-  N?: bigint,
-  bandRange?: readonly [bigint, bigint],
-  usersBands?: readonly [readonly bigint[], readonly bigint[]],
-  isInSoftLiquidation?: boolean,
 }

package/src/types/fluid.ts

@@ -487,17 +487,3 @@ export interface FluidFTokenDataStructOutput {
   rewardsRate: bigint;
   withdrawable: bigint;
 }
-
-/** One Fluid lending (fToken) deposit of an address, from getAllUserEarnPositionsWithFTokens and getFluidDepositData. */
-export interface FluidEarnPositionData {
-  fTokenAddress: string | undefined,
-  fTokenSymbol: string,
-  decimals: string,
-  totalDeposited: string,
-  withdrawable: string,
-  apy: string,
-  depositRate: string,
-  withdrawRate: string,
-  deposited: string,
-  depositedShares: string,
-}

package/src/types/index.ts

@@ -14,5 +14,4 @@ export * from './merit';
 export * from './merkl';
 export * from './savings';
 export * from './common';
-export * from './aaveV4';
-export * from './claiming';
+export * from './aaveV4';

package/src/types/liquity.ts

@@ -29,16 +29,4 @@ export interface LiquityTroveInfo {
   priceForRecovery: string,
   debtInFront: string,
   exposure: string,
-}
-/** LQTY staking and the LUSD stability pool deposit of an address, from getLiquityStakingData. */
-export interface LiquityStakingData {
-  totalLUSDDeposited: string,
-  totalLQTYStaked: string,
-  stakedLQTY: string,
-  stakedLUSDBalance: string,
-  rewardETH: string,
-  rewardLUSD: string,
-  stabilityRewardETH: string,
-  stabilityRewardLQTY: string,
-  showStakingBalances: boolean,
-}
+}

package/src/types/liquityV2.ts

@@ -131,29 +131,4 @@ export interface LiquityV2TroveData {
   debtInFront: string,
   lastInterestRateAdjTime: string,
   exposure: string,
-}
-/** The stability pool deposit of an address in one market, from getLiquityV2Staking. */
-export interface LiquityV2StakingData {
-  totalBOLDDeposited: string,
-  stakedBOLDBalance: string,
-  stabilityRewardColl: string,
-  stabilityRewardYield: string,
-  showStakingBalances: boolean,
-  debtTokenBalance: string,
-  stabilityPoolApy: string,
-}
-
-/** sBOLD, yBOLD and stYBOLD of an address, from getLiquitySAndYBold. */
-export interface LiquityV2SBoldYBoldData {
-  spApy: string,
-  yBoldApy: string,
-  totalBoldDepositedSBold: string,
-  boldRateSBold: string,
-  maxWithdrawSBold: string,
-  totalBoldDepositedYBold: string,
-  boldRateYBold: string,
-  maxWithdrawYBold: string,
-  sBoldBalance: string,
-  yBoldBalance: string,
-  stYBoldBalance: string,
-}
+}

package/src/types/llamaLend.ts

@@ -141,13 +141,7 @@ export interface LlamaLendUsedAssets {
   [key: string]: LlamaLendUsedAsset,
 }
 
-// Set by getLlamaLendAggregatedData, which _getLlamaLendUserData spreads in. Optional, so objects built by hand still
-// type-check.
-export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData,
-| 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'
-| 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
-
-export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
+export interface LlamaLendUserData {
   debtAmount: string,
   health: string,
   healthPercent: string,
@@ -166,16 +160,4 @@ export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
   loanExists: boolean,
   borrowRate?: string,
   exposure: string,
-  // Fields of LlamaLendView's userData that _getLlamaLendUserData spreads in unconverted. Optional, so objects built
-  // by hand still type-check.
-  collateralPrice?: bigint,
-  marketCollateralAmount?: bigint,
-  debtTokenCollateralAmount?: bigint,
-  N?: bigint,
-  bandRange?: readonly [bigint, bigint],
-  usersBands?: readonly [readonly bigint[], readonly bigint[]],
-  collRatio?: bigint,
-  isInSoftLiquidation?: boolean,
-  debtTokenSuppliedShares?: bigint,
-  debtTokenSuppliedAssets?: bigint,
 }

package/src/types/morphoBlue.ts

@@ -236,9 +236,6 @@ export interface MorphoBluePositionData {
   supplyShares: string,
   borrowShares: string,
   exposure: string,
-  // Set by getMorphoBlueAggregatedPositionData. Optional, so objects built by hand still type-check.
-  minCollRatio?: string,
-  collLiquidationRatio?: string,
 }
 
 export interface MorphoBlueEarnData {