@defisaver/positions-sdk 2.1.160-morpho-stakehouse-dev → 2.1.160-shifter-v2-dev

package/esm/savings/morphoVaults/options.js

@@ -1,11 +1,9 @@
-import { MorphoVaultType, MorphoVaultVersion, NetworkNumber, } from '../../types';
+import { MorphoVaultType } 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,
 };
@@ -14,8 +12,6 @@ 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,
 };
@@ -24,8 +20,6 @@ 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,
 };
@@ -34,8 +28,6 @@ export const MORPHO_VAULT_RE7_WETH = {
     name: 'RE7 WETH',
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
     asset: 'WETH',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 19121118,
     isLegacy: true,
 };
@@ -44,8 +36,6 @@ 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,
 };
@@ -54,8 +44,6 @@ 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,
 };
@@ -64,8 +52,6 @@ export const MORPHO_VAULT_BOOSTED_USDC = {
     name: 'Boosted USDC',
     address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
     asset: 'USDC',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 20377233,
     isLegacy: true,
 };
@@ -74,8 +60,6 @@ export const MORPHO_VAULT_FLAGSHIP_USDT = {
     name: 'Flagship USDT',
     address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
     asset: 'USDT',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 19127039,
     isLegacy: true,
 };
@@ -84,8 +68,6 @@ 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,
 };
@@ -94,8 +76,6 @@ 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,
 };
@@ -104,8 +84,6 @@ 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,
 };
@@ -115,8 +93,6 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT = {
     name: 'Steakhouse USDT',
     address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
     asset: 'USDT',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -125,8 +101,6 @@ export const MORPHO_VAULT_STEAKHOUSE_USDC = {
     name: 'Steakhouse USDC',
     address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
     asset: 'USDC',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 18928285,
     isLegacy: false,
 };
@@ -135,8 +109,6 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH = {
     name: 'Steakhouse WETH',
     address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
     asset: 'WETH',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 19380443,
     isLegacy: false,
 };
@@ -145,8 +117,6 @@ export const MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     name: 'Steakhouse PYUSD',
     address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 19043398,
     isLegacy: false,
 };
@@ -156,8 +126,6 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDT = {
     name: 'Smokehouse USDT',
     address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
     asset: 'USDT',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 21522238,
     isLegacy: false,
 };
@@ -166,8 +134,6 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDC = {
     name: 'Smokehouse USDC',
     address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
     asset: 'USDC',
-    network: NetworkNumber.Eth,
-    version: MorphoVaultVersion.V1,
     deploymentBlock: 21337719,
     isLegacy: false,
 };
@@ -176,32 +142,9 @@ 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,
@@ -223,8 +166,5 @@ 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/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

@@ -126,6 +126,7 @@ export interface AavePositionData extends MMPositionData {
     minRatio: string;
     collRatio: string;
     safetyRatioWithLtvZeroFallback?: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -159,6 +160,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;

package/esm/types/compound.d.ts

@@ -96,6 +96,7 @@ export interface CompoundAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -115,6 +116,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

@@ -73,6 +73,9 @@ export interface CrvUSDAggregatedPositionData {
     collFactor: string;
     leveragedType: LeverageType;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }
@@ -113,4 +116,7 @@ export interface CrvUSDUserData {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

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,7 +24,11 @@ export interface LiquityTroveInfo {
     totalETH: string;
     totalLUSD: string;
     minCollateralRatio: number;
+    safetyRatio: string;
     priceForRecovery: string;
     debtInFront: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

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

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

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

@@ -1,4 +1,4 @@
-import { EthAddress, NetworkNumber } from '../common';
+import { EthAddress } from '../common';
 export declare enum MorphoVaultType {
     MorphoVaultFlagshipEth = "morpho_vault_flagship_eth",
     MorphoVaultGauntletUSDCCore = "morpho_vault_gauntlet_usdc_core",
@@ -17,21 +17,13 @@ export declare enum MorphoVaultType {
     MorphoVaultSteakhousePYUSD = "morpho_vault_steakhouse_pyusd",
     MorphoVaultSmokehouseUSDT = "morpho_vault_smokehouse_usdt",
     MorphoVaultSmokehouseUSDC = "morpho_vault_smokehouse_usdc",
-    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
+    MorphoVaultSmokehouseDAI = "morpho_vault_smokehouse_dai"
 }
 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,12 +20,4 @@ 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

@@ -85,6 +85,7 @@ export interface SparkAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -104,6 +105,7 @@ export interface SparkPositionData extends MMPositionData {
     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.160-morpho-stakehouse-dev",
+  "version": "2.1.160-shifter-v2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

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) => {

package/src/curveUsd/index.ts

@@ -14,6 +14,13 @@ import { getCrvUsdAggregatedData } from '../helpers/curveUsdHelpers';
 import { CrvUsdMarkets } from '../markets';
 import { wethToEth } from '../services/utils';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+
+/** Converts a per-second AMM rate (wei, 18 decimals) into a yearly compounded borrow APY in %. */
+const ammRateToBorrowApy = (rateWei: string) => {
+  const exponent = new Dec(assetAmountInEth(rateWei)).mul(365).mul(86400);
+  return new Dec(new Dec(2.718281828459).pow(exponent).minus(1)).mul(100).toString();
+};
 
 const getAndFormatBands = async (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData, _minBand: string, _maxBand: string) => {
   const contract = CrvUSDViewContractViem(provider, network);
@@ -69,15 +76,8 @@ export const _getCurveUsdGlobalData = async (provider: Client, network: NetworkN
   const totalDebt = assetAmountInEth(data.totalDebt.toString(), debtAsset);
   const ammPrice = assetAmountInEth(data.ammPrice.toString(), debtAsset);
 
-  const rate = assetAmountInEth(data.ammRate.toString());
-  const futureRate = assetAmountInEth(data.monetaryPolicyRate.toString());
-
-  const exponentRate = new Dec(rate).mul(365).mul(86400);
-  const exponentFutureRate = new Dec(futureRate).mul(365).mul(86400);
-  const borrowRate = new Dec(new Dec(2.718281828459).pow(exponentRate).minus(1)).mul(100)
-    .toString();
-  const futureBorrowRate = new Dec(new Dec(2.718281828459).pow(exponentFutureRate).minus(1)).mul(100)
-    .toString();
+  const borrowRate = ammRateToBorrowApy(data.ammRate.toString());
+  const futureBorrowRate = ammRateToBorrowApy(data.monetaryPolicyRate.toString());
 
   const bandsData = await getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
 
@@ -164,13 +164,22 @@ export const getCrvUsdAccountBalances = async (
   controllerAddress: EthAddress,
 ): Promise<PositionBalances> => _getCrvUsdAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, controllerAddress);
 
-export const _getCurveUsdUserData = async (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string): Promise<CrvUSDUserData> => {
+/**
+ * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
+ */
+export const _getCurveUsdUserData = async (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string): Promise<CrvUSDUserData> => {
   const contract = CrvUSDViewContractViem(provider, network);
-
-  const data = await contract.read.userData([selectedMarket.controllerAddress, address]);
   const collAsset = selectedMarket.collAsset;
   const debtAsset = selectedMarket.baseAsset;
 
+  const [data, collStakingApy, marketBorrowRate] = await Promise.all([
+    contract.read.userData([selectedMarket.controllerAddress, address]),
+    STAKING_ASSETS.includes(collAsset) ? getStakingApy(collAsset) : Promise.resolve('0'),
+    borrowRate !== undefined
+      ? Promise.resolve(borrowRate)
+      : contract.read.globalData([selectedMarket.controllerAddress]).then((globalData) => ammRateToBorrowApy(globalData.ammRate.toString())),
+  ]);
+
   const health = assetAmountInEth(data.health.toString());
   const healthPercent = new Dec(health).mul(100).toString();
   const collPrice = assetAmountInEth(data.collateralPrice.toString(), debtAsset);
@@ -202,7 +211,7 @@ export const _getCurveUsdUserData = async (provider: Client, network: NetworkNum
       isBorrowed: new Dec(debtBorrowed).gt('0'),
       symbol: 'crvUSD',
       price: '1',
-      interestRate: '0',
+      interestRate: marketBorrowRate,
     },
   } : {};
 
@@ -232,8 +241,15 @@ export const _getCurveUsdUserData = async (provider: Client, network: NetworkNum
     numOfBands: data.N.toString(),
     usedAssets,
     status,
+    borrowRate: marketBorrowRate,
     ...getCrvUsdAggregatedData({
-      loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N.toString(),
+      loanExists: data.loanExists,
+      usedAssets,
+      network: NetworkNumber.Eth,
+      selectedMarket,
+      numOfBands: data.N.toString(),
+      borrowRate: marketBorrowRate,
+      collStakingApy,
     }),
     userBands,
   };
@@ -245,10 +261,11 @@ export const getCurveUsdUserData = async (
   address: EthAddress,
   selectedMarket: CrvUSDMarketData,
   activeBand: string,
-): Promise<CrvUSDUserData> => _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand);
+  borrowRate?: string,
+): Promise<CrvUSDUserData> => _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand, borrowRate);
 
 export const getCurveUsdFullPositionData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData): Promise<CrvUSDUserData> => {
   const marketData = await getCurveUsdGlobalData(provider, network, selectedMarket);
-  const positionData = await getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand);
+  const positionData = await getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate);
   return positionData;
 };

package/src/fluid/index.ts

@@ -1830,3 +1830,43 @@ export const _getUserPositionsPortfolio = async (provider: PublicClient, network
     userData: userData[i],
   })).filter(md => md.marketData !== undefined);
 };
+
+
+export const _getAllFluidMarketDataPortfolio = async (provider: PublicClient, network: NetworkNumber): Promise<Record<string, FluidMarketData>> => {
+  const versions = getFluidVersionsDataForNetwork(network);
+  if (versions.length === 0) return {};
+
+  const view = FluidViewContractViem(provider, network);
+  const vaultsData = await Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
+
+  const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
+    const vaultTokens = [getAssetInfoByAddress(vaultData.supplyToken0, network).symbol, getAssetInfoByAddress(vaultData.borrowToken0, network).symbol];
+    if (vaultData.supplyToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.supplyToken1)) vaultTokens.push(getAssetInfoByAddress(vaultData.supplyToken1, network).symbol);
+    if (vaultData.borrowToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.borrowToken1)) vaultTokens.push(getAssetInfoByAddress(vaultData.borrowToken1, network).symbol);
+    return vaultTokens;
+  }).flat()));
+
+  // ETH and WBTC needed for other tokens prices
+  if (!tokens.includes('ETH')) tokens.push('ETH');
+  if (!tokens.includes('WBTC')) tokens.push('WBTC');
+
+  const [tokenPrices, merklCampaigns] = await Promise.all([
+    getTokensPricesForPortfolio(tokens, provider, network),
+    getFluidMerklCampaigns(network),
+  ]);
+
+  const parsedMarketsData = await Promise.all(vaultsData.map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices)));
+
+  const marketsData: Record<string, FluidMarketData> = {};
+  parsedMarketsData.forEach((marketData, i) => {
+    if (!marketData) return;
+    marketsData[versions[i].value] = attachFluidMerklIncentives(marketData, merklCampaigns);
+  });
+
+  return marketsData;
+};
+
+export const getAllFluidMarketDataPortfolio = async (
+  provider: EthereumProvider,
+  network: NetworkNumber,
+): Promise<Record<string, FluidMarketData>> => _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network);

package/src/helpers/aaveHelpers/index.ts

@@ -169,6 +169,9 @@ export const aaveAnyGetAggregatedPositionData = ({
     },
   );
   payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+  // Normalised safety ratio (100 = liquidation on every protocol): the automation ratio above, falling back
+  // to the regular ratio when the fallback carries its '0' placeholder.
+  payload.safetyRatio = +payload.safetyRatioWithLtvZeroFallback ? payload.safetyRatioWithLtvZeroFallback : payload.ratio;
   payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
   payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
   const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);