@defisaver/positions-sdk 2.1.160 → 2.1.161-portfolio-api-dev

package/cjs/portfolio/index.js

@@ -521,9 +521,11 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            // 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) => {
                 var _a;
-                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                return ((_a = makerCdps[address.toLowerCase()]) !== null && _a !== void 0 ? _a : []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo);
                         if (cdpData) {
@@ -535,7 +537,7 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                         positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
                     }
                 }));
-            })).flat(),
+            }),
             ...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield (0, aaveV2_1._getAaveV2AccountData)(client, network, address, aaveV2MarketsData[market.value].assetsData, market);

package/cjs/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -84,6 +84,8 @@ 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> = {
@@ -121,7 +123,12 @@ export type AaveUsedAssets<T> = {
 };
 export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
-export interface AavePositionData extends MMPositionData {
+/**
+ * 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 {
     ratio: string;
     minRatio: string;
     collRatio: string;
@@ -138,6 +145,12 @@ export interface AavePositionData extends MMPositionData {
 }
 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/cjs/types/compound.d.ts

@@ -52,6 +52,7 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
+    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -63,6 +64,17 @@ 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;
@@ -123,9 +135,21 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     automationResubscribeRequired?: boolean;
 }
-export interface CompoundV2PositionData extends CompoundPositionData {
+/**
+ * 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 {
     usedAssets: CompoundV2UsedAssets;
+    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData {
+export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
     usedAssets: CompoundV3UsedAssets;
+    isAllowed?: boolean;
 }

package/cjs/types/curveUsd.d.ts

@@ -60,6 +60,7 @@ export interface CrvUSDGlobalMarketData {
     leftToBorrow: string;
     bands: BandData[];
     loanDiscount: string;
+    A?: bigint;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;
@@ -91,7 +92,8 @@ export interface CrvUSDUsedAsset {
 export interface CrvUSDUsedAssets {
     [key: string]: CrvUSDUsedAsset;
 }
-export interface CrvUSDUserData {
+export type CrvUSDPositionAggregatedFields = Partial<Pick<CrvUSDAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
+export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -113,4 +115,10 @@ export interface CrvUSDUserData {
     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/cjs/types/llamaLend.d.ts

@@ -138,7 +138,8 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-export interface LlamaLendUserData {
+export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice' | 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
+export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -157,4 +158,14 @@ export interface LlamaLendUserData {
     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/cjs/types/morphoBlue.d.ts

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

package/cjs/types/spark.d.ts

@@ -46,6 +46,21 @@ 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;
@@ -100,7 +115,12 @@ export interface SparkAggregatedPositionData {
     minHealthRatio: string;
     exposure: string;
 }
-export interface SparkPositionData extends MMPositionData {
+/**
+ * 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 {
     ratio: string;
     minRatio: string;
     collRatio: string;

package/esm/portfolio/index.js

@@ -501,9 +501,11 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                     positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+            // 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) => {
                 var _a;
-                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
+                return ((_a = makerCdps[address.toLowerCase()]) !== null && _a !== void 0 ? _a : []).map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const cdpData = yield _getMakerCdpData(client, network, cdpInfo);
                         if (cdpData) {
@@ -515,7 +517,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
                         positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
                     }
                 }));
-            })).flat(),
+            }),
             ...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield _getAaveV2AccountData(client, network, address, aaveV2MarketsData[market.value].assetsData, market);

package/esm/types/aave.d.ts

@@ -1,4 +1,4 @@
-import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum AaveVersions {
     AaveV1 = "v1",
     AaveV2 = "v2default",
@@ -84,6 +84,8 @@ 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> = {
@@ -121,7 +123,12 @@ export type AaveUsedAssets<T> = {
 };
 export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
-export interface AavePositionData extends MMPositionData {
+/**
+ * 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 {
     ratio: string;
     minRatio: string;
     collRatio: string;
@@ -138,6 +145,12 @@ export interface AavePositionData extends MMPositionData {
 }
 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,6 +52,7 @@ export interface CompoundAssetData extends MMAssetData {
     sortIndex?: number;
 }
 export interface CompoundV2AssetData extends CompoundAssetData {
+    exchangeRate?: string;
 }
 export interface CompoundV3AssetData extends CompoundAssetData {
     borrowCollateralFactor: string;
@@ -63,6 +64,17 @@ 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;
@@ -123,9 +135,21 @@ export interface CompoundPositionData extends MMPositionData {
     isSubscribedToAutomation?: boolean;
     automationResubscribeRequired?: boolean;
 }
-export interface CompoundV2PositionData extends CompoundPositionData {
+/**
+ * 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 {
     usedAssets: CompoundV2UsedAssets;
+    borrowStableSupplyUnstable?: boolean;
 }
-export interface CompoundV3PositionData extends CompoundPositionData {
+export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
     usedAssets: CompoundV3UsedAssets;
+    isAllowed?: boolean;
 }

package/esm/types/curveUsd.d.ts

@@ -60,6 +60,7 @@ export interface CrvUSDGlobalMarketData {
     leftToBorrow: string;
     bands: BandData[];
     loanDiscount: string;
+    A?: bigint;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;
@@ -91,7 +92,8 @@ export interface CrvUSDUsedAsset {
 export interface CrvUSDUsedAssets {
     [key: string]: CrvUSDUsedAsset;
 }
-export interface CrvUSDUserData {
+export type CrvUSDPositionAggregatedFields = Partial<Pick<CrvUSDAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
+export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -113,4 +115,10 @@ export interface CrvUSDUserData {
     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,7 +138,8 @@ export interface LlamaLendUsedAsset {
 export interface LlamaLendUsedAssets {
     [key: string]: LlamaLendUsedAsset;
 }
-export interface LlamaLendUserData {
+export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice' | 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
+export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
     debtAmount: string;
     health: string;
     healthPercent: string;
@@ -157,4 +158,14 @@ export interface LlamaLendUserData {
     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,6 +214,8 @@ export interface MorphoBluePositionData {
     supplyShares: string;
     borrowShares: string;
     exposure: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBlueEarnData {
     apy: string;

package/esm/types/spark.d.ts

@@ -46,6 +46,21 @@ 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;
@@ -100,7 +115,12 @@ export interface SparkAggregatedPositionData {
     minHealthRatio: string;
     exposure: string;
 }
-export interface SparkPositionData extends MMPositionData {
+/**
+ * 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 {
     ratio: string;
     minRatio: string;
     collRatio: string;

package/package.json

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

package/src/portfolio/index.ts

@@ -506,7 +506,9 @@ 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(),
-    ...addresses.map(async (address) => makerCdps[address.toLowerCase() as EthAddress]?.map(async (cdpInfo) => {
+    // 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) => {
       try {
         const cdpData = await _getMakerCdpData(client, network, cdpInfo);
         if (cdpData) {
@@ -516,7 +518,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);

package/src/types/aave.ts

@@ -1,4 +1,5 @@
 import {
+  EthAddress,
   IncentiveData,
   LeverageType,
   MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber,
@@ -96,6 +97,9 @@ 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>;
@@ -137,7 +141,15 @@ export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
 
 export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
 
-export interface AavePositionData extends MMPositionData {
+/**
+ * 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 {
   ratio: string,
   minRatio: string,
   collRatio: string,
@@ -156,6 +168,11 @@ export interface AavePositionData extends MMPositionData {
 
 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 {

package/src/types/compound.ts

@@ -70,6 +70,8 @@ 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,
@@ -81,6 +83,20 @@ 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> {
@@ -141,10 +157,30 @@ export interface CompoundPositionData extends MMPositionData {
   automationResubscribeRequired?: boolean,
 }
 
-export interface CompoundV2PositionData extends CompoundPositionData {
+/**
+ * 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 {
   usedAssets: CompoundV2UsedAssets,
+  // Always false: _getCompoundV2AccountData starts from EMPTY_COMPOUND_DATA, which carries it.
+  borrowStableSupplyUnstable?: boolean,
 }
 
-export interface CompoundV3PositionData extends CompoundPositionData {
+export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
   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,6 +66,9 @@ 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 {
@@ -101,7 +104,12 @@ export interface CrvUSDUsedAssets {
   [key: string]: CrvUSDUsedAsset,
 }
 
-export interface CrvUSDUserData {
+// 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 {
   debtAmount: string,
   health: string,
   healthPercent: string,
@@ -123,4 +131,12 @@ export interface CrvUSDUserData {
   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/llamaLend.ts

@@ -141,7 +141,13 @@ export interface LlamaLendUsedAssets {
   [key: string]: LlamaLendUsedAsset,
 }
 
-export interface LlamaLendUserData {
+// 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 {
   debtAmount: string,
   health: string,
   healthPercent: string,
@@ -160,4 +166,16 @@ export interface LlamaLendUserData {
   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,6 +236,9 @@ 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 {

package/src/types/spark.ts

@@ -57,6 +57,22 @@ export interface SparkAssetData extends MMAssetData {
   eModeCategory: number,
   liquidationBonus: string,
   liquidationRatio: string,
+  // Set by _getSparkMarketsData. Optional, so objects built by hand still type-check.
+  debtCeilingForIsolationMode?: string,
+  isSiloed?: boolean,
+  isolationModeTotalDebt?: string,
+  isolationModeBorrowingEnabled?: boolean,
+  assetId?: number,
+  borrowRateStable?: string,
+  supplyCap?: string,
+  isInactive?: boolean,
+  isFrozen?: boolean,
+  isPaused?: boolean,
+  canBeWithdrawn?: boolean,
+  canBePayBacked?: boolean,
+  disabledStableBorrowing?: boolean,
+  isFlashLoanEnabled?: boolean,
+  aTokenAddress?: EthAddress,
 }
 
 export interface SparkAssetsData {
@@ -115,7 +131,15 @@ export interface SparkAggregatedPositionData {
   exposure: string,
 }
 
-export interface SparkPositionData extends MMPositionData {
+/**
+ * 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 {
   ratio: string,
   minRatio: string,
   collRatio: string,