@defisaver/positions-sdk 2.1.146 → 2.1.147-spark-ltv0-fallback-dev

package/cjs/helpers/sparkHelpers/index.d.ts

@@ -19,6 +19,19 @@ export declare const sparkGetEmodeMutableProps: ({ eModeCategory, eModeCategorie
     liquidationRatio: string;
     collateralFactor: string;
 };
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors SparkRatioHelper._getUserAccountDataWithLtvZeroFallback: unlike Aave v3 (eMode ltv-zero
+ * bitmap), Spark's LTV-0 state lives on the RESERVE config (asset offboarding zeroes the reserve ltv),
+ * so a zeroed reserve keeps `ltv` 0 even inside the active eMode category, while its `lltv` stays the
+ * eMode liquidation threshold there (liquidations only consider LLTV). The returned `ltv` is identical
+ * to sparkGetEmodeMutableProps().collateralFactor whenever the reserve ltv is non-zero, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ */
+export declare const sparkGetUserReserveLtvAndLltv: ({ eModeCategory, eModeCategoriesData, assetsData, }: SparkHelperCommon, _asset: string) => {
+    ltv: string;
+    lltv: string;
+};
 export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: SparkMarketData, actions: [{
     action: string;

package/cjs/helpers/sparkHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getApyAfterValuesEstimation = exports.sparkGetAggregatedPositionData = exports.sparkGetEmodeMutableProps = exports.sparkGetSuppliableAsCollAssets = exports.sparkGetSuppliableAssets = exports.sparkGetCollSuppliedAssets = exports.sparkIsInIsolationMode = void 0;
+exports.getApyAfterValuesEstimation = exports.sparkGetAggregatedPositionData = exports.sparkGetUserReserveLtvAndLltv = exports.sparkGetEmodeMutableProps = exports.sparkGetSuppliableAsCollAssets = exports.sparkGetSuppliableAssets = exports.sparkGetCollSuppliedAssets = exports.sparkIsInIsolationMode = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../../moneymarket");
@@ -68,6 +68,37 @@ const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsD
     return ({ liquidationRatio, collateralFactor });
 };
 exports.sparkGetEmodeMutableProps = sparkGetEmodeMutableProps;
+/**
+ * @description Offset subtracted from the liquidation threshold (LLTV) when crediting LTV-0 collateral
+ * in the safety-ratio fallback. Matches SparkView.getSafetyRatioWithLtvZeroFallback ('LLTV - 5%').
+ * Values are fractions (e.g. 0.8), so 5% === 0.05.
+ */
+const LTV_ZERO_FALLBACK_LLTV_OFFSET = '0.05';
+/**
+ * @description Per-asset effective LTV and liquidation threshold (LLTV) for the user, eMode-aware.
+ * Mirrors SparkRatioHelper._getUserAccountDataWithLtvZeroFallback: unlike Aave v3 (eMode ltv-zero
+ * bitmap), Spark's LTV-0 state lives on the RESERVE config (asset offboarding zeroes the reserve ltv),
+ * so a zeroed reserve keeps `ltv` 0 even inside the active eMode category, while its `lltv` stays the
+ * eMode liquidation threshold there (liquidations only consider LLTV). The returned `ltv` is identical
+ * to sparkGetEmodeMutableProps().collateralFactor whenever the reserve ltv is non-zero, so a ratio
+ * built on this matches the regular safety ratio whenever no collateral is LTV-0.
+ */
+const sparkGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
+    const assetData = assetsData[asset];
+    const eModeCategoryData = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory];
+    if (eModeCategory === 0
+        || !eModeCategoryData
+        || !eModeCategoryData.collateralAssets.includes(asset)
+        || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
+        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+    }
+    // In the active eMode category the fallback trigger is still the reserve-level ltv (the contract
+    // checks the reserve config's ltv), so an offboarded asset must not pick up the category-wide eMode ltv.
+    const ltv = new decimal_js_1.default(assetData.collateralFactor || 0).eq(0) ? '0' : eModeCategoryData.collateralFactor;
+    return { ltv, lltv: eModeCategoryData.liquidationRatio };
+};
+exports.sparkGetUserReserveLtvAndLltv = sparkGetUserReserveLtvAndLltv;
 const sparkGetAggregatedPositionData = (_a) => {
     var { usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategoriesData", "assetsData", "selectedMarket", "network"]);
     const data = Object.assign({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network }, rest);
@@ -81,6 +112,17 @@ const sparkGetAggregatedPositionData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    // Safety ratio as evaluated by the automation bots: LTV-0 collateral is credited at (LLTV - 5%)
+    // instead of 0 (SparkView.getSafetyRatioWithLtvZeroFallback). Equals `ratio` when no collateral
+    // is LTV-0. Computed off-chain here so it is available for after-value simulations too.
+    payload.borrowLimitWithLtvZeroFallbackUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const { ltv, lltv } = (0, exports.sparkGetUserReserveLtvAndLltv)(data, symbol);
+        const effectiveLtv = new decimal_js_1.default(ltv).eq(0)
+            ? decimal_js_1.default.max(0, new decimal_js_1.default(lltv).sub(LTV_ZERO_FALLBACK_LLTV_OFFSET))
+            : new decimal_js_1.default(ltv);
+        return new decimal_js_1.default(suppliedUsd).mul(effectiveLtv);
+    });
+    payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/liquityV2/index.js

@@ -32,8 +32,9 @@ const getLiquityV2ViewContract = (provider, network, isLegacy) => {
 const _getLiquityV2MarketData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const { marketAddress, debtToken, collateralToken, isLegacy, } = selectedMarket;
-    const viewContract = getLiquityV2ViewContract(provider, network, isLegacy);
-    const data = yield viewContract.read.getMarketData([marketAddress]);
+    const data = isLegacy
+        ? yield (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network).read.getMarketData([marketAddress])
+        : (yield (0, contracts_1.LiquityV2ViewContractViem)(provider, network).simulate.getMarketData([marketAddress])).result;
     const hintHelperAddress = data.hintHelpers;
     const troveNFTAddress = data.troveNFT;
     const borrowerOperationsAddress = data.borrowerOperations;
@@ -285,11 +286,15 @@ const _getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, pr
 const getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0') { return _getDebtInFrontForInterestRateLiquityV2(markets, selectedMarket, (0, viem_1.getViemProvider)(provider, network), network, isLegacy, interestRate, debtInFrontBeingMoved); });
 exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;
 const _getLiquityV2TroveData = (provider_1, network_1, _a, ...args_1) => __awaiter(void 0, [provider_1, network_1, _a, ...args_1], void 0, function* (provider, network, { selectedMarket, assetsData, troveId, allMarketsData, }, fetchDebtInFront = true) {
-    const viewContract = getLiquityV2ViewContract(provider, network, selectedMarket.isLegacy);
     const { minCollRatio, batchCollRatio } = allMarketsData[selectedMarket.value].marketData;
     const { collateralToken, marketAddress, debtToken } = selectedMarket;
+    const troveInfoPromise = selectedMarket.isLegacy
+        ? (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network).read.getTroveInfo([marketAddress, BigInt(troveId)])
+        : (0, contracts_1.LiquityV2ViewContractViem)(provider, network).simulate
+            .getTroveInfo([marketAddress, BigInt(troveId)])
+            .then(({ result }) => result);
     const [_data, debtInFront] = yield Promise.all([
-        viewContract.read.getTroveInfo([marketAddress, BigInt(troveId)]),
+        troveInfoPromise,
         fetchDebtInFront ? getDebtInFrontLiquityV2(allMarketsData, selectedMarket.value, provider, network, selectedMarket.isLegacy, troveId) : Promise.resolve('0'),
     ]);
     const data = Object.assign(Object.assign({}, _data), { TCRatio: _data.TCRatio.toString() === utils_1.MAXUINT ? '0' : _data.TCRatio.toString() });

package/cjs/types/spark.d.ts

@@ -85,6 +85,8 @@ export interface SparkAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    borrowLimitWithLtvZeroFallbackUsd: string;
+    safetyRatioWithLtvZeroFallback: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -104,6 +106,7 @@ export interface SparkPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
+    safetyRatioWithLtvZeroFallback?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;