@defisaver/positions-sdk 2.1.161-portfolio-api-1-dev → 2.1.162

package/esm/savings/morphoVaults/options.js

@@ -1,9 +1,11 @@
-import { MorphoVaultType } from '../../types';
+import { MorphoVaultType, MorphoVaultVersion, NetworkNumber, } from '../../types';
 export const MORPHO_VAULT_FLAGSHIP_ETH = {
     type: MorphoVaultType.MorphoVaultFlagshipEth,
     name: 'Flagship ETH',
     address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 18927491,
     isLegacy: true,
 };
@@ -12,6 +14,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_CORE = {
     name: 'Gauntlet USDC Core',
     address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19777569,
     isLegacy: true,
 };
@@ -20,6 +24,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_PRIME = {
     name: 'Gauntlet USDC Prime',
     address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19777569,
     isLegacy: true,
 };
@@ -28,6 +34,8 @@ export const MORPHO_VAULT_RE7_WETH = {
     name: 'RE7 WETH',
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19121118,
     isLegacy: true,
 };
@@ -36,6 +44,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     name: 'Gauntlet WETH Core',
     address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19541126,
     isLegacy: true,
 };
@@ -44,6 +54,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     name: 'Gauntlet WETH Prime',
     address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19372149,
     isLegacy: true,
 };
@@ -52,6 +64,8 @@ export const MORPHO_VAULT_BOOSTED_USDC = {
     name: 'Boosted USDC',
     address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 20377233,
     isLegacy: true,
 };
@@ -60,6 +74,8 @@ export const MORPHO_VAULT_FLAGSHIP_USDT = {
     name: 'Flagship USDT',
     address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19127039,
     isLegacy: true,
 };
@@ -68,6 +84,8 @@ export const MORPHO_VAULT_GAUNTLET_USDA_CORE = {
     name: 'Gauntlet USDA Core',
     address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
     asset: 'USDA',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19633608,
     isLegacy: true,
 };
@@ -76,6 +94,8 @@ export const MORPHO_VAULT_GAUNTLET_USDT_PRIME = {
     name: 'Gauntlet USDT Prime',
     address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19486541,
     isLegacy: true,
 };
@@ -84,6 +104,8 @@ export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC = {
     name: 'Gauntlet Resolv USDC',
     address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 21487882,
     isLegacy: true,
 };
@@ -93,6 +115,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT = {
     name: 'Steakhouse USDT',
     address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -101,6 +125,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDC = {
     name: 'Steakhouse USDC',
     address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 18928285,
     isLegacy: false,
 };
@@ -109,6 +135,8 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH = {
     name: 'Steakhouse WETH',
     address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
     asset: 'WETH',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19380443,
     isLegacy: false,
 };
@@ -117,6 +145,8 @@ export const MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     name: 'Steakhouse PYUSD',
     address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -126,6 +156,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDT = {
     name: 'Smokehouse USDT',
     address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
     asset: 'USDT',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 21522238,
     isLegacy: false,
 };
@@ -134,6 +166,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDC = {
     name: 'Smokehouse USDC',
     address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
     asset: 'USDC',
+    network: NetworkNumber.Eth,
+    version: MorphoVaultVersion.V1,
     deploymentBlock: 21337719,
     isLegacy: false,
 };
@@ -142,9 +176,32 @@ export const MORPHO_VAULT_SMOKEHOUSE_DAI = {
     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 = {
+    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 = {
+    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 = {
     [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
     [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -166,5 +223,8 @@ export const MORPHO_VAULTS = {
     [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) => MORPHO_VAULTS[type];

package/esm/spark/index.js

@@ -81,6 +81,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
             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 ({
             symbol: selectedMarket.assets[i],

package/esm/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -40,6 +40,7 @@ export interface EModeCategoryData {
     borrowAssets: string[];
     ltvzeroBitmap?: string;
     ltvZeroAssets: string[];
+    isolated: boolean;
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];
@@ -84,8 +85,6 @@ export interface AaveV3AssetData extends AaveAssetData {
     liquidationBonus: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
-    aTokenAddress?: EthAddress;
-    vTokenAddress?: EthAddress;
 }
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
 export type AaveAssetsData<T> = {
@@ -123,12 +122,7 @@ export type AaveUsedAssets<T> = {
 };
 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;
@@ -145,12 +139,6 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
 }
 export interface AaveV2PositionData extends AavePositionData {
     usedAssets: AaveV2UsedAssets;
-    eModeCategory?: number;
-    isInIsolationMode?: boolean;
-    isInSiloedMode?: boolean;
-    eModeCategories?: {
-        [key: number]: EModeCategoryDataMapping;
-    };
 }
 export interface AaveV3PositionData extends AavePositionData {
     usedAssets: AaveV3UsedAssets;

package/esm/types/compound.d.ts

@@ -52,7 +52,6 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
-    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -64,17 +63,6 @@ export interface CompoundV3AssetData extends CompoundAssetData {
     supplyCap: string;
     priceInBaseAsset: string;
     canBeWithdrawn: boolean;
-    tokenAddr?: EthAddress;
-    isBase?: boolean;
-    baseBorrowMin?: string;
-    baseTrackingBorrowRewardsSpeed?: string;
-    baseTrackingSupplyRewardsSpeed?: string;
-    borrowIndex?: string;
-    supplyIndex?: string;
-    trackingBorrowIndex?: string;
-    trackingSupplyIndex?: string;
-    rewardSupplySpeed?: string;
-    rewardBorrowSpeed?: string;
 }
 export interface CompoundAssetsData<T> {
     [token: string]: T;
@@ -135,21 +123,9 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     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;
-    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
+export interface CompoundV3PositionData extends CompoundPositionData {
     usedAssets: CompoundV3UsedAssets;
-    isAllowed?: boolean;
 }

package/esm/types/curveUsd.d.ts

@@ -60,7 +60,6 @@ export interface CrvUSDGlobalMarketData {
     leftToBorrow: string;
     bands: BandData[];
     loanDiscount: string;
-    A?: bigint;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;
@@ -92,8 +91,7 @@ export interface CrvUSDUsedAsset {
 export interface CrvUSDUsedAssets {
     [key: string]: CrvUSDUsedAsset;
 }
-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;
@@ -115,10 +113,4 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
-    marketCollateralAmount?: bigint;
-    curveUsdCollateralAmount?: bigint;
-    N?: bigint;
-    bandRange?: readonly [bigint, bigint];
-    usersBands?: readonly [readonly bigint[], readonly bigint[]];
-    isInSoftLiquidation?: boolean;
 }

package/esm/types/llamaLend.d.ts

@@ -138,8 +138,7 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-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;
@@ -158,14 +157,4 @@ export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     loanExists: boolean;
     borrowRate?: string;
     exposure: string;
-    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/esm/types/morphoBlue.d.ts

@@ -214,8 +214,6 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
     exposure: string;
-    minCollRatio?: string;
-    collLiquidationRatio?: string;
 }
 export interface MorphoBlueEarnData {
     apy: string;

package/esm/types/portfolio.d.ts

@@ -1,16 +1,15 @@
-import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions } from './aave';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
+import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
 import { FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData } from './liquityV2';
-import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
 import { CdpData } from './maker';
-import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
+import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
     data: T | null;
@@ -60,17 +59,3 @@ export interface PortfolioPositionsDataForAddress {
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
-/** 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>;
-    compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
-    sparkMarketsData: Record<string, SparkMarketsData>;
-    aaveV3MarketsData: Record<string, AaveV3MarketData>;
-    aaveV2MarketsData: Record<string, AaveV2MarketData>;
-    compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
-    crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
-    llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
-    liquityV2MarketsData: Record<string, LiquityV2MarketData>;
-    aaveV4SpokesData: Record<string, AaveV4SpokeData>;
-}

package/esm/types/savings/morphoVaults.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '../common';
+import { EthAddress, NetworkNumber } from '../common';
 export declare enum MorphoVaultType {
     MorphoVaultFlagshipEth = "morpho_vault_flagship_eth",
     MorphoVaultGauntletUSDCCore = "morpho_vault_gauntlet_usdc_core",
@@ -17,13 +17,21 @@ export declare enum MorphoVaultType {
     MorphoVaultSteakhousePYUSD = "morpho_vault_steakhouse_pyusd",
     MorphoVaultSmokehouseUSDT = "morpho_vault_smokehouse_usdt",
     MorphoVaultSmokehouseUSDC = "morpho_vault_smokehouse_usdc",
-    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai"
+    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai",
+    MorphoVaultGauntletUSDGPremium = "morpho_vault_gauntlet_usdg_premium",
+    MorphoVaultSteakhouseUSDGPro = "morpho_vault_steakhouse_usdg_pro"
+}
+export declare enum MorphoVaultVersion {
+    V1 = 1,
+    V2 = 2
 }
 export interface MorphoVault {
     type: MorphoVaultType;
     name: string;
     address: EthAddress;
     asset: string;
+    network: NetworkNumber;
+    version: MorphoVaultVersion;
     deploymentBlock: number;
     isLegacy: boolean;
 }

package/esm/types/savings/morphoVaults.js

@@ -20,4 +20,12 @@ export var MorphoVaultType;
     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";
 })(MorphoVaultType || (MorphoVaultType = {}));
+export var MorphoVaultVersion;
+(function (MorphoVaultVersion) {
+    MorphoVaultVersion[MorphoVaultVersion["V1"] = 1] = "V1";
+    MorphoVaultVersion[MorphoVaultVersion["V2"] = 2] = "V2";
+})(MorphoVaultVersion || (MorphoVaultVersion = {}));

package/esm/types/spark.d.ts

@@ -46,21 +46,6 @@ export interface SparkAssetData extends MMAssetData {
     eModeCategory: number;
     liquidationBonus: string;
     liquidationRatio: string;
-    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 {
     [token: string]: SparkAssetData;
@@ -115,12 +100,7 @@ export interface SparkAggregatedPositionData {
     minHealthRatio: string;
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.161-portfolio-api-1-dev",
+  "version": "2.1.162",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -61,7 +61,10 @@ export const aaveV3EmodeCategoriesMapping = (extractedState: any, usedAssets: Aa
       ...extractedState, usedAssets, eModeCategory: e.id,
     });
     const willStayOverCollateralized = new Dec(afterEnteringCategory.ratio === 'NaN' ? '0' : afterEnteringCategory.ratio).eq(0) || new Dec(afterEnteringCategory.ratio).gt(afterEnteringCategory.liqPercent);
-    const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized];
+    const collateralOnlyFromCategory = e.id === 0 || !e.isolated
+      ? true
+      : !usedAssetsValues.filter(u => u.isSupplied && u.collateral && !e.collateralAssets.includes(u.symbol)).length;
+    const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized, collateralOnlyFromCategory];
     categoriesMapping[e.id] = {
       enteringTerms,
       canEnterCategory: !enteringTerms.includes(false),
@@ -118,6 +121,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
         collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
         ltvzeroBitmap: eModesInfo[i].ltvzeroBitmap.toString(),
+        isolated: eModesInfo[i].isolated ?? false,
         borrowAssets: [],
         collateralAssets: [],
         ltvZeroAssets: [],
@@ -345,6 +349,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     collateralAssets: assetsData.map((a) => a.symbol),
     borrowAssets: assetsData.map((a) => a.symbol),
     ltvZeroAssets: [],
+    isolated: false,
   };
 
   return { assetsData: payload, eModeCategoriesData };

package/src/helpers/aaveHelpers/index.ts

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { Client } from 'viem';
 import {
-  AaveAssetData, AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions,
+  AaveAssetData, AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions, EModeCategoriesData,
 } from '../../types';
 import { getNativeAssetFromWrapped, getWrappedNativeAssetFromUnwrapped } from '../../services/utils';
 import {
@@ -24,6 +24,13 @@ export const isAaveV3 = ({ selectedMarket }: { selectedMarket: Partial<AaveMarke
 export const aaveV3IsInIsolationMode = ({ usedAssets, assetsData }: { usedAssets: AaveV3UsedAssets, assetsData: AaveV3AssetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
 export const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }: { usedAssets: AaveV3UsedAssets, assetsData: AaveV3AssetsData }) => Object.values(usedAssets).some(({ symbol, debt }) => debt && assetsData[symbol].isSiloed);
 
+export const aaveV3IsEmodeIsolated = ({ eModeCategory, eModeCategoriesData }: { eModeCategory: number, eModeCategoriesData?: EModeCategoriesData }) => eModeCategory !== 0 && !!eModeCategoriesData?.[eModeCategory]?.isolated;
+
+export const aaveV3CanBeCollateralInEmode = ({ eModeCategory, eModeCategoriesData }: { eModeCategory: number, eModeCategoriesData?: EModeCategoriesData }, _asset: string) => {
+  if (!aaveV3IsEmodeIsolated({ eModeCategory, eModeCategoriesData })) return true;
+  return eModeCategoriesData![eModeCategory].collateralAssets.includes(getNativeAssetFromWrapped(_asset));
+};
+
 export const aaveAnyGetCollSuppliedAssets = ({ usedAssets }: { usedAssets: AaveV3UsedAssets }) => Object.values(usedAssets)
   .filter(({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral);
 
@@ -37,14 +44,18 @@ export const aaveAnyGetSuppliableAssets = ({
   const collAccountAssets = aaveAnyGetCollSuppliedAssets(data);
   const marketAssets = Object.values(assetsData) as AaveAssetData[];
 
-  if (collAccountAssets.length === 0 || !isAaveV3(data)) return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+  if (!isAaveV3(data)) return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+
+  const canBeCollateralInEmode = (symbol: string) => aaveV3CanBeCollateralInEmode(data, symbol);
+
+  if (collAccountAssets.length === 0) return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: canBeCollateralInEmode(symbol) }));
 
   if (aaveV3IsInIsolationMode(data)) {
     const collAsset = collAccountAssets[0].symbol;
-    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset }));
+    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset && canBeCollateralInEmode(symbol) }));
   }
 
-  return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
+  return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated && canBeCollateralInEmode(symbol) }));
 };
 
 export const aaveAnyGetSuppliableAsCollAssets = ({
@@ -62,8 +73,8 @@ export const aaveAnyGetEmodeMutableProps = (
   const asset = getNativeAssetFromWrapped(_asset);
 
   const assetData = assetsData[asset];
-  const eModeCategoryData: { collateralAssets: string[], collateralFactor: string, liquidationRatio: string, ltvZeroAssets: string[] } = eModeCategoriesData?.[eModeCategory] || {
-    collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0',
+  const eModeCategoryData: { collateralAssets: string[], collateralFactor: string, liquidationRatio: string, ltvZeroAssets: string[], isolated?: boolean } = eModeCategoriesData?.[eModeCategory] || {
+    collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0', isolated: false,
   };
 
   if (
@@ -72,6 +83,9 @@ export const aaveAnyGetEmodeMutableProps = (
     || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)
   ) {
     const { liquidationRatio, collateralFactor } = assetData;
+    if (eModeCategory !== 0 && eModeCategoryData.isolated && !eModeCategoryData.collateralAssets.includes(asset)) {
+      return ({ liquidationRatio, collateralFactor: '0' });
+    }
     return ({ liquidationRatio, collateralFactor });
   }
   if (eModeCategoryData.ltvZeroAssets.includes(asset)) return ({ liquidationRatio: '0', collateralFactor: '0' });
@@ -118,7 +132,10 @@ export const aaveAnyGetUserReserveLtvAndLltv = (
     || !eModeCategoryData.collateralAssets.includes(asset)
     || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)
   ) {
-    return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+    const ltv = eModeCategory !== 0 && eModeCategoryData?.isolated && !eModeCategoryData.collateralAssets.includes(asset)
+      ? '0'
+      : assetData.collateralFactor;
+    return { ltv, lltv: assetData.liquidationRatio };
   }
 
   const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;

package/src/portfolio/index.ts

@@ -27,7 +27,6 @@ import {
   LlamaLendGlobalMarketData,
   MorphoBlueMarketInfo,
   MorphoMidnightMarketInfo,
-  PortfolioMarketsData,
   PortfolioPositionsData,
   SparkMarketsData,
 } from '../types';
@@ -56,7 +55,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   positions: PortfolioPositionsData;
   stakingPositions: any;
   rewardsData: any;
-  markets: PortfolioMarketsData;
+  markets: any;
 }> {
   const isMainnet = network === NetworkNumber.Eth;
   const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
@@ -97,7 +96,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
   const liquityV2MarketsData: Record<string, LiquityV2MarketData> = {};
   const aaveV4SpokesData: Record<string, AaveV4SpokeData> = {};
 
-  const markets: PortfolioMarketsData = {
+  const markets = {
     morphoMarketsData,
     morphoMidnightMarketsData,
     compoundV3MarketsData,
@@ -507,9 +506,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
       }
     })).flat(),
-    // flatMap, not map: each CDP's fetch has to be one of the awaited promises, or getPortfolioData can return
-    // before a vault's data lands and the vault is missing from the result.
-    ...addresses.flatMap((address) => (makerCdps[address.toLowerCase() as EthAddress] ?? []).map(async (cdpInfo) => {
+    ...addresses.map(async (address) => makerCdps[address.toLowerCase() as EthAddress]?.map(async (cdpInfo) => {
       try {
         const cdpData = await _getMakerCdpData(client, network, cdpInfo);
         if (cdpData) {
@@ -519,7 +516,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
         console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
         positions[address.toLowerCase() as EthAddress].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
       }
-    })),
+    })).flat(),
     ...aaveV2Markets.map((market) => addresses.map(async (address) => {
       try {
         const accData = await _getAaveV2AccountData(client, network, address, aaveV2MarketsData[market.value].assetsData, market);