@defisaver/positions-sdk 2.1.161-portfolio-api-2-dev → 2.1.161-portfolio-api-3-dev

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/staking/staking.d.ts

@@ -3,6 +3,26 @@ import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
 export declare const getStakingApy: ((asset: string, network?: number) => Promise<string>) & memoize.Memoized<(asset: string, network?: number) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
+/**
+ * Net APY for positions that have a single known borrow rate (and optionally a single supply rate)
+ * instead of per-asset `assetsData` to feed into `calculateNetApy` (Maker, crvUSD, Liquity v1).
+ * All rates are yearly percentages that are already compounded. `incentives` are extra yields
+ * (e.g. the native staking yield of the collateral) applied to their own USD base and summed into `incentiveUsd`.
+ */
+export declare const calculateNetApyFromRates: ({ suppliedUsd, borrowedUsd, supplyRate, borrowRate, incentives, }: {
+    suppliedUsd: string;
+    borrowedUsd: string;
+    supplyRate?: string;
+    borrowRate?: string;
+    incentives?: {
+        apy: string;
+        amountUsd: string;
+    }[];
+}) => {
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
+};
 export declare const calculateNetApy: ({ usedAssets, assetsData, optionalData, }: {
     usedAssets: MMUsedAssets;
     assetsData: MMAssetsData;

package/esm/staking/staking.js

@@ -182,6 +182,23 @@ export const calculateInterestEarned = (principal, interest, type, apy = false)
     }
     return (+principal * (Math.pow(((1 + (+interest / 100) / BLOCKS_IN_A_YEAR)), (BLOCKS_IN_A_YEAR * interval)))) - +principal; // eslint-disable-line
 };
+/**
+ * Net APY for positions that have a single known borrow rate (and optionally a single supply rate)
+ * instead of per-asset `assetsData` to feed into `calculateNetApy` (Maker, crvUSD, Liquity v1).
+ * All rates are yearly percentages that are already compounded. `incentives` are extra yields
+ * (e.g. the native staking yield of the collateral) applied to their own USD base and summed into `incentiveUsd`.
+ */
+export const calculateNetApyFromRates = ({ suppliedUsd, borrowedUsd, supplyRate = '0', borrowRate = '0', incentives = [], }) => {
+    const supplyInterest = new Dec(calculateInterestEarned(suppliedUsd, supplyRate, 'year', true));
+    const borrowInterest = new Dec(calculateInterestEarned(borrowedUsd, borrowRate, 'year', true));
+    const incentiveUsd = incentives
+        .reduce((acc, { apy, amountUsd }) => acc.add(calculateInterestEarned(amountUsd, apy, 'year', true)), new Dec(0))
+        .toString();
+    const totalInterestUsd = supplyInterest.sub(borrowInterest).add(incentiveUsd).toString();
+    const balance = new Dec(suppliedUsd).sub(borrowedUsd);
+    const netApy = balance.isZero() ? '0' : new Dec(totalInterestUsd).div(balance).times(100).toString();
+    return { netApy, totalInterestUsd, incentiveUsd };
+};
 export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
     const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
         const acc = Object.assign({}, _acc);

package/esm/types/aave.d.ts

@@ -40,6 +40,7 @@ export interface EModeCategoryData {
     borrowAssets: string[];
     ltvzeroBitmap?: string;
     ltvZeroAssets: string[];
+    isolated: boolean;
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];
@@ -133,6 +134,7 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
     minRatio: string;
     collRatio: string;
     safetyRatioWithLtvZeroFallback?: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -172,6 +174,7 @@ export interface AaveV3AggregatedPositionData {
     collRatio: string;
     borrowLimitWithLtvZeroFallbackUsd: string;
     safetyRatioWithLtvZeroFallback: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/esm/types/aaveV4.d.ts

@@ -169,6 +169,7 @@ export interface AaveV4AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     liqRatio: string;
     liqPercent: string;
     leveragedType: LeverageType;
@@ -190,3 +191,47 @@ export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
     healthFactor: string;
     riskPremiumBps: number;
 }
+/** One Aave V4 tokenized spoke (Lend vault) as the view contract returns it for a user. */
+export interface AaveV4TokenizationSpokeData {
+    underlyingAsset: EthAddress;
+    assetId: string;
+    decimals: number;
+    spoke: EthAddress;
+    spokeActive: boolean;
+    spokeHalted: boolean;
+    spokeDepositCap: string;
+    spokeTotalAssets: string;
+    spokeTotalShares: string;
+    hub: EthAddress;
+    hubLiquidity: string;
+    hubDrawnRate: string;
+    convertToShares: string;
+    convertToAssets: string;
+    user: EthAddress;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+}
+/** Parsed tokenization spoke data with human-readable supplied amounts for display */
+export interface AaveV4TokenizationSpokeDataParsed {
+    vaultAddress: EthAddress;
+    key: string | null;
+    symbol: string;
+    hubKey: string;
+    spokeActive: boolean;
+    spokeHalted: boolean;
+    /** Deposit cap in asset units (wei string) */
+    spokeDepositCap: string;
+    /** Total assets currently in spoke in asset units (wei string) */
+    spokeTotalAssets: string;
+    /** Available hub liquidity in asset units (wei string) */
+    hubLiquidity: string;
+    /** The conversion rate from assets to shares expressed in asset units. */
+    convertToShares: string;
+    userSuppliedAssetsEth: string;
+    userSuppliedSharesEth: string;
+    userSuppliedAssets: string;
+    userSuppliedShares: string;
+    underlyingAsset: EthAddress;
+    spoke: EthAddress;
+    decimals: number;
+}

package/esm/types/compound.d.ts

@@ -108,6 +108,7 @@ export interface CompoundAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -127,6 +128,7 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/esm/types/curveUsd.d.ts

@@ -74,6 +74,9 @@ export interface CrvUSDAggregatedPositionData {
     collFactor: string;
     leveragedType: LeverageType;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }
@@ -115,6 +118,9 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
     marketCollateralAmount?: bigint;
     curveUsdCollateralAmount?: bigint;
     N?: bigint;

package/esm/types/fluid.d.ts

@@ -323,6 +323,7 @@ export interface FluidAggregatedVaultData {
     merklBorrowIncentives: IncentiveData[];
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     minRatio: string;
     totalInterestUsd: string;
     leveragedType?: LeverageType;

package/esm/types/liquity.d.ts

@@ -24,9 +24,13 @@ export interface LiquityTroveInfo {
     totalETH: string;
     totalLUSD: string;
     minCollateralRatio: number;
+    safetyRatio: string;
     priceForRecovery: string;
     debtInFront: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }
 /** LQTY staking and the LUSD stability pool deposit of an address, from getLiquityStakingData. */
 export interface LiquityStakingData {

package/esm/types/liquityV2.d.ts

@@ -94,6 +94,7 @@ export interface LiquityV2AggregatedTroveData {
     liquidationPrice: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     exposure: string;
 }
 export interface LiquityV2TroveData {
@@ -101,6 +102,7 @@ export interface LiquityV2TroveData {
     troveId: string;
     ratio: string;
     collRatio: string;
+    safetyRatio?: string;
     liqRatio: string;
     borrowLimitRatio: string;
     interestRate: string;

package/esm/types/maker.d.ts

@@ -43,6 +43,7 @@ export interface CdpData {
     debtAssetMarketPrice: string;
     liquidationPrice: string;
     ratio: string;
+    safetyRatio: string;
     liqRatio: string;
     liqPercent: number;
     assetPrice: string;
@@ -58,4 +59,7 @@ export interface CdpData {
     liquidationFee: string;
     lastUpdated: number;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/esm/types/morphoBlue.d.ts

@@ -185,6 +185,7 @@ export interface MorphoBlueAggregatedPositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
+    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;
@@ -207,6 +208,7 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
+    safetyRatio?: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/esm/types/morphoMidnight.d.ts

@@ -170,6 +170,7 @@ export interface MorphoMidnightAggregatedPositionData {
     ltv: string;
     ratio: string;
     healthRatio: string;
+    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/esm/types/portfolio.d.ts

@@ -4,11 +4,11 @@ import { AaveRewardsClaimableToken, EthenaAirdropClaimableToken, KingRewardsClai
 import { EthAddress } from './common';
 import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
 import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidEarnPositionData, FluidVaultData } from './fluid';
+import { FluidEarnPositionData, FluidMarketData, FluidVaultData } from './fluid';
 import { LiquityStakingData, LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2Versions } from './liquityV2';
+import { LiquityV2MarketData, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
 import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData } from './maker';
+import { CdpData, IlkInfo } from './maker';
 import { MorphoBlueEarnData, MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
 import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
 import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
@@ -21,12 +21,26 @@ export interface PortfolioProtocolError {
     error: string;
     data: null;
 }
-/** What getPortfolioData reads besides positions and markets. Both default to true. */
+/** What getPortfolioData reads besides markets. */
 export interface PortfolioDataOptions {
-    /** stakingPositions; with false it comes back as {} and no staking source is read. */
+    /** positions (lending); default true. With false it comes back as {} and no lending position is read. */
+    positions?: boolean;
+    /** stakingPositions; default true. With false it comes back as {} and no staking source is read. */
     staking?: boolean;
-    /** rewardsData; with false it comes back as {} and no rewards source is read. */
+    /** rewardsData; default true. With false it comes back as {} and no rewards source is read. */
     rewards?: boolean;
+    /**
+     * Liquity V2 troves in positions[address].liquityV2; default false, as the DeFi Saver app reads them on its own.
+     * Mainnet only: elsewhere liquityV2 is {}. Needs positions.
+     */
+    liquityV2?: boolean;
+}
+/** One Liquity V2 market's troves of an address, by trove id — with an error when the ids or any trove failed to load. */
+export interface PortfolioLiquityV2Troves {
+    error: string;
+    data: {
+        [troveId: string]: LiquityV2TroveData;
+    };
 }
 export interface PortfolioPositionsDataForAddress {
     aaveV3: {
@@ -69,6 +83,10 @@ export interface PortfolioPositionsDataForAddress {
     aaveV4: {
         [key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
     };
+    /** Only with the liquityV2 option. Every trove the address holds, by market. */
+    liquityV2?: {
+        [key in LiquityV2Versions]?: PortfolioLiquityV2Troves;
+    };
 }
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
@@ -137,3 +155,43 @@ export interface PortfolioMarketsData {
     liquityV2MarketsData: Record<string, LiquityV2MarketData>;
     aaveV4SpokesData: Record<string, AaveV4SpokeData>;
 }
+/**
+ * The `markets` getShifterPortfolioData returns: the portfolio's markets, plus Fluid's and Maker's, which the shifter
+ * offers as destinations. Kept apart from PortfolioMarketsData, which getPortfolioData does not fill these into.
+ */
+export interface ShifterPortfolioMarketsData extends PortfolioMarketsData {
+    fluidMarketsData: Record<string, FluidMarketData>;
+    makerMarketsData: Record<string, IlkInfo>;
+}
+/** The markets that could not be read, by their key in PortfolioMarketsData, then by market or spoke: the error. */
+export type PortfolioMarketsErrors = {
+    [key in keyof PortfolioMarketsData]?: Record<string, string>;
+};
+/**
+ * What the portfolio fetch could not read and has no `{ error, data }` entry of its own to report it in. A key is
+ * present only when something under it failed; {} when everything was read.
+ */
+export interface PortfolioErrors {
+    /** Markets missing from `markets`; every position on such a market is an entry with an error. */
+    markets?: PortfolioMarketsErrors;
+    /** Addresses whose Maker vault list could not be read: their `maker` is {}, which would otherwise read as "no vaults". */
+    makerCdps?: Record<EthAddress, string>;
+}
+/** getPortfolioMarketsData's result. */
+export interface PortfolioMarketsResult {
+    /** Every market read; one that failed is missing and named in `errors`. */
+    markets: PortfolioMarketsData;
+    errors: PortfolioMarketsErrors;
+}
+/** getPortfolioUserData's result: what is read per address. */
+export interface PortfolioUserData {
+    positions: PortfolioPositionsData;
+    stakingPositions: PortfolioStakingPositionsData;
+    rewardsData: PortfolioRewardsData;
+    errors: Pick<PortfolioErrors, 'makerCdps'>;
+}
+/** getPortfolioData's result. */
+export interface PortfolioData extends Omit<PortfolioUserData, 'errors'> {
+    markets: PortfolioMarketsData;
+    errors: PortfolioErrors;
+}

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

@@ -20,4 +20,12 @@ export interface SavingsVaultData {
     asset: string;
     optionType: string;
 }
-export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType, SavingsVaultData>>;
+/** The key of every savings vault getSavingsData reads. */
+export type SavingsVaultKey = MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | SummerVaultType | YearnV3VaultType;
+export type SavingsData = Partial<Record<SavingsVaultKey, SavingsVaultData>>;
+/** Why each vault that was read for a network came back without data. */
+export type SavingsErrors = Partial<Record<SavingsVaultKey, string>>;
+export interface SavingsDataWithErrors {
+    data: SavingsData;
+    errors: SavingsErrors;
+}

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

@@ -100,6 +100,7 @@ export interface SparkAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -124,6 +125,7 @@ export interface SparkPositionData extends MMPositionData, SparkPositionAggregat
     ratio: string;
     minRatio: string;
     collRatio: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.161-portfolio-api-2-dev",
+  "version": "2.1.161-portfolio-api-3-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -18,7 +18,8 @@
     "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
   },
   "keywords": [],
-  "author": "",
+  "author": "DeFi Saver",
+  "repository": "https://github.com/defisaver/defisaver-positions-sdk",
   "license": "ISC",
   "dependencies": {
     "@defisaver/tokens": "^1.7.45",

package/src/aaveV2/index.ts

@@ -210,6 +210,8 @@ export const _getAaveV2AccountData = async (provider: Client, network: NetworkNu
   payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
     ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
     : '0';
+  // Aave v2 has no LTV-0 fallback (AaveV3View only), so its safety ratio is the plain ratio.
+  payload.safetyRatio = payload.ratio;
 
   // Calculate borrow limits per asset
   Object.values(payload.usedAssets).forEach((item) => {