@gearbox-protocol/sdk 16.0.0-next.27 → 16.0.0-next.29

package/dist/cjs/onchain/positions/PositionsService.js

@@ -8,9 +8,11 @@ const require_onchain_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
 const require_onchain_market_math = require("../market/math.js");
 const require_onchain_market_strategyName = require("../market/strategyName.js");
+const require_onchain_market_credit_creditOperationMarket = require("../market/credit/creditOperationMarket.js");
 const require_model_filters = require("../../model/filters.js");
 const require_model_positions = require("../../model/positions.js");
 require("../../model/index.js");
+const require_onchain_market_oracle_collateralPriceInUnderlying = require("../market/oracle/collateralPriceInUnderlying.js");
 const require_onchain_market_pool_math = require("../market/pool/math.js");
 const require_onchain_positions_calcBorrowRate = require("./calcBorrowRate.js");
 const require_onchain_positions_calcHealthFactor = require("./calcHealthFactor.js");
@@ -164,6 +166,98 @@ var PositionsService = class extends require_onchain_base_SDKConstruct.SDKConstr
 		});
 	}
 	/**
+	* What the collateral {@link liquidationPrice} is quoted for costs in the
+	* market underlying right now, in the same `PRICE_DECIMALS` fixed point —
+	* the pair a form shows beside the liquidation price. `null` under exactly
+	* the conditions that leave the liquidation price `null`, plus an oracle
+	* that cannot answer for either side.
+	**/
+	currentPrice(snapshot) {
+		const market = this.sdk.marketRegister.findByCreditManager(snapshot.creditManager);
+		const underlying = market.pool.underlying;
+		const collateral = require_onchain_positions_calcLiquidationPrice.soleNonUnderlyingCollateral(snapshot, underlying);
+		if (!collateral) return null;
+		return require_onchain_market_oracle_collateralPriceInUnderlying.collateralPriceInUnderlying(market.priceOracle, collateral, underlying);
+	}
+	/**
+	* Every derived number of an account state at once — the whole
+	* {@link AccountMetrics} half of a projection.
+	*
+	* This is what both halves of the SDK fill their answers from: `prepare`, for
+	* a state it walked an intent into, and `preview`, for one it replayed out of
+	* calldata. One snapshot in, one set of metrics out, so the two descriptions
+	* of the same operation cannot disagree because one of them grew its own
+	* formula.
+	*
+	* Identical to the four methods above field for field, and cheaper than
+	* calling them one by one: the market data is collected once, and the health
+	* factor and borrow rate the time to liquidation decays at are the very ones
+	* reported beside it.
+	**/
+	metrics(snapshot, options) {
+		const data = this.#marketData(snapshot);
+		const factor = (safePrices) => require_onchain_positions_calcHealthFactor.calcHealthFactor({
+			snapshot,
+			underlying: data.underlying,
+			decimals: data.decimals,
+			prices: data.prices,
+			reservePrices: data.reservePrices,
+			safePrices,
+			liquidationThresholds: data.liquidationThresholds,
+			activeQuotas: data.activeQuotas
+		});
+		const healthFactor = factor(false);
+		const borrowRate = require_onchain_positions_calcBorrowRate.calcBorrowRate({
+			snapshot,
+			baseInterestRate: this.#baseInterestRate(snapshot, data, options),
+			feeInterest: data.feeInterest,
+			quotaRates: data.quotaRates,
+			resolveToken: (address) => this.sdk.tokensMeta.mustGetToken(address)
+		});
+		return {
+			healthFactor,
+			safeHealthFactor: factor(true),
+			borrowRate,
+			timeToLiquidation: require_onchain_positions_calcTimeToLiquidationMs.calcTimeToLiquidationMs(healthFactor, BigInt(borrowRate.totalOnDebt)),
+			liquidationPrice: require_onchain_positions_calcLiquidationPrice.calcLiquidationPrice({
+				snapshot,
+				underlying: data.underlying,
+				decimals: data.decimals,
+				liquidationThresholds: data.liquidationThresholds
+			}),
+			leverage: require_onchain_market_math.calcPositionLeverage(snapshot.totalValue, snapshot.totalDebt)
+		};
+	}
+	/**
+	* A projected account state as both halves of the SDK report it: the holdings
+	* priced and named, and the metrics of {@link PositionsService.metrics}.
+	*
+	* The snapshot is taken at its word — what it lists is what comes back, so a
+	* caller that drops dust before the walk reports an account without it, and
+	* one that keeps wei reports them. That is the whole of the policy left to
+	* the caller; everything downstream of the balances is decided here.
+	*
+	* @param options - The operation's effect on the pool, for the rate the
+	* metrics are quoted at, see {@link ProjectedPoolOptions}.
+	**/
+	projection(snapshot, options) {
+		const { creditManager, totalValue, totalDebt } = snapshot;
+		const market = this.sdk.marketRegister.findByCreditManager(creditManager);
+		const { priceOracle } = market;
+		return {
+			...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(this.sdk.marketRegister.findCreditManager(creditManager)),
+			totalValue: market.toUnderlyingAmount(totalValue),
+			totalDebt: market.toUnderlyingAmount(totalDebt),
+			netValue: market.toUnderlyingAmount(totalValue - totalDebt),
+			assets: snapshot.assets.map((a) => priceOracle.toTokenAmount(a.token, a.balance)),
+			quotas: snapshot.quotas.map((q) => ({
+				token: this.sdk.tokensMeta.mustGetToken(q.token),
+				...priceOracle.toAmount(market.underlying, q.balance)
+			})),
+			...this.metrics(snapshot, options)
+		};
+	}
+	/**
 	* Builds one strategy position from an account snapshot.
 	*
 	* @param withdrawals - Delayed withdrawals of the account, keyed by the

package/dist/cjs/onchain/positions/calcLiquidationPrice.js

@@ -11,13 +11,23 @@ let viem = require("viem");
 * holds exactly one non-dust non-underlying asset; otherwise `null`.
 **/
 function calcLiquidationPrice(props) {
-	const { snapshot, underlying } = props;
-	const targets = snapshot.assets.filter((a) => a.balance > 10n && !(0, viem.isAddressEqual)(a.token, underlying));
-	if (targets.length !== 1) return null;
+	const targetToken = soleNonUnderlyingCollateral(props.snapshot, props.underlying);
+	if (!targetToken) return null;
 	return require_onchain_positions_calcLiquidationPriceForTarget.calcLiquidationPriceForTarget({
 		...props,
-		targetToken: targets[0].token
+		targetToken
 	});
 }
+/**
+* The one collateral a liquidation price — and the current price beside it —
+* can be quoted for: the account's single non-dust, non-underlying asset.
+* `null` when it holds none or several, which is the case neither figure
+* exists for.
+**/
+function soleNonUnderlyingCollateral(snapshot, underlying) {
+	const targets = snapshot.assets.filter((a) => a.balance > 10n && !(0, viem.isAddressEqual)(a.token, underlying));
+	return targets.length === 1 ? targets[0].token : null;
+}
 //#endregion
 exports.calcLiquidationPrice = calcLiquidationPrice;
+exports.soleNonUnderlyingCollateral = soleNonUnderlyingCollateral;

package/dist/cjs/onchain/positions/index.js

@@ -15,3 +15,4 @@ exports.calcHealthFactor = require_onchain_positions_calcHealthFactor.calcHealth
 exports.calcLiquidationPrice = require_onchain_positions_calcLiquidationPrice.calcLiquidationPrice;
 exports.calcLiquidationPriceForTarget = require_onchain_positions_calcLiquidationPriceForTarget.calcLiquidationPriceForTarget;
 exports.calcTimeToLiquidationMs = require_onchain_positions_calcTimeToLiquidationMs.calcTimeToLiquidationMs;
+exports.soleNonUnderlyingCollateral = require_onchain_positions_calcLiquidationPrice.soleNonUnderlyingCollateral;

package/dist/cjs/preview/index.js

@@ -20,7 +20,7 @@ const require_preview_prerequisites_BalancePrerequisite = require("./prerequisit
 const require_preview_prerequisites_RWAOpenRequirementsPrerequisite = require("./prerequisites/RWAOpenRequirementsPrerequisite.js");
 const require_preview_prerequisites_checkPrerequisites = require("./prerequisites/checkPrerequisites.js");
 require("./prerequisites/index.js");
-const require_preview_preview_buildDelayedPreview = require("./preview/buildDelayedPreview.js");
+const require_preview_preview_buildDelayedStrategyVerify = require("./preview/buildDelayedStrategyVerify.js");
 const require_preview_preview_CreditAccountState = require("./preview/CreditAccountState.js");
 const require_preview_preview_detectCloseOrRepay = require("./preview/detectCloseOrRepay.js");
 const require_preview_preview_detectDelayedClaim = require("./preview/detectDelayedClaim.js");
@@ -28,8 +28,8 @@ const require_preview_preview_detectDelayedOperation = require("./preview/detect
 const require_preview_preview_errors = require("./preview/errors.js");
 const require_preview_preview_replayInnerOperations = require("./preview/replayInnerOperations.js");
 const require_preview_preview_replayMulticall = require("./preview/replayMulticall.js");
-const require_preview_preview_previewAdjustCreditAccount = require("./preview/previewAdjustCreditAccount.js");
-const require_preview_preview_previewCloseOrRepayCreditAccount = require("./preview/previewCloseOrRepayCreditAccount.js");
+const require_preview_preview_previewAdjustStrategyVerify = require("./preview/previewAdjustStrategyVerify.js");
+const require_preview_preview_previewExitOrRepayStrategyVerify = require("./preview/previewExitOrRepayStrategyVerify.js");
 const require_preview_preview_previewOperation = require("./preview/previewOperation.js");
 require("./preview/index.js");
 require("./types.js");
@@ -51,7 +51,7 @@ exports.UnsupportedPoolFunctionError = require_preview_parse_errors.UnsupportedP
 exports.UnsupportedTargetError = require_preview_parse_errors.UnsupportedTargetError;
 exports.UnsupportedZapperFunctionError = require_onchain_market_zapper_errors.UnsupportedZapperFunctionError;
 exports.WithdrawCollateralAlignmentError = require_preview_trace_errors.WithdrawCollateralAlignmentError;
-exports.buildDelayedPreview = require_preview_preview_buildDelayedPreview.buildDelayedPreview;
+exports.buildDelayedStrategyVerify = require_preview_preview_buildDelayedStrategyVerify.buildDelayedStrategyVerify;
 exports.checkOperation = require_preview_validate_checkOperation.checkOperation;
 exports.checkPrerequisites = require_preview_prerequisites_checkPrerequisites.checkPrerequisites;
 exports.checkSimulation = require_preview_validate_checkSimulation.checkSimulation;
@@ -72,8 +72,8 @@ exports.parseFacadeOperationCalldata = require_preview_parse_parseFacadeOperatio
 exports.parseOperationCalldata = require_preview_parse_parseOperationCalldata.parseOperationCalldata;
 exports.parsePoolOperationCalldata = require_preview_parse_parsePoolOperationCalldata.parsePoolOperationCalldata;
 exports.parseRWAFactoryOperationCalldata = require_preview_parse_parseRWAFactoryOperationCalldata.parseRWAFactoryOperationCalldata;
-exports.previewAdjustCreditAccount = require_preview_preview_previewAdjustCreditAccount.previewAdjustCreditAccount;
-exports.previewCloseOrRepayCreditAccount = require_preview_preview_previewCloseOrRepayCreditAccount.previewCloseOrRepayCreditAccount;
+exports.previewAdjustStrategyVerify = require_preview_preview_previewAdjustStrategyVerify.previewAdjustStrategyVerify;
+exports.previewExitOrRepayStrategyVerify = require_preview_preview_previewExitOrRepayStrategyVerify.previewExitOrRepayStrategyVerify;
 exports.previewOperation = require_preview_preview_previewOperation.previewOperation;
 exports.quotaCountIssue = require_preview_validate_checkOperation.quotaCountIssue;
 exports.raise = require_onchain_validation_refusal.raise;

package/dist/cjs/preview/preview/{buildDelayedPreview.js → buildDelayedStrategyVerify.js}

@@ -2,12 +2,12 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_AssetsMap = require("../../onchain/utils/AssetsMap.js");
 const require_onchain_utils_bigint_math = require("../../onchain/utils/bigint-math.js");
 const require_onchain_constants_math = require("../../onchain/constants/math.js");
-const require_onchain_market_math = require("../../onchain/market/math.js");
+const require_onchain_market_credit_creditOperationMarket = require("../../onchain/market/credit/creditOperationMarket.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
 require("../../onchain/index.js");
 let viem = require("viem");
-//#region src/preview/preview/buildDelayedPreview.ts
+//#region src/preview/preview/buildDelayedStrategyVerify.ts
 /**
 * Builds the best-effort preview of the account state after the detected
 * delayed withdrawal is claimed and its intent (if any) is resumed:
@@ -30,7 +30,7 @@ let viem = require("viem");
 * @param sdk - Market data source for the position metrics of the resulting
 * state; read synchronously, no network access.
 */
-function buildDelayedPreview(afterInstant, before, detected, convert, receivedToken, sdk) {
+function buildDelayedStrategyVerify(afterInstant, before, detected, convert, receivedToken, sdk) {
 	const { request, intent } = detected;
 	const post = afterInstant.clone();
 	const converter = makeSafeConverter(convert);
@@ -167,49 +167,30 @@ function buildClosePreview(post, converter, receivedToken, sdk) {
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
-		creditManager: post.creditManager,
-		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(post.creditManager)),
 		creditAccount: post.creditAccount,
 		receivedAmount: oracle.toTokenAmount(receivedToken, require_onchain_utils_bigint_math.BigIntMath.max(totalValue - post.totalDebt, 0n)),
 		error: converter.error
 	};
 }
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
-	const totalValue = totalValueInUnderlying(post, converter.convert, require_onchain_constants_math.DUST_THRESHOLD);
-	const assets = post.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
-	const quotas = post.quotas.toAssets(0n);
-	const snap = post.toSnapshot(totalValue);
+	const snap = post.toSnapshot(totalValueInUnderlying(post, converter.convert, require_onchain_constants_math.DUST_THRESHOLD));
 	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
 	const oracle = market.priceOracle;
 	return {
 		operation: "AdjustCreditAccount",
-		creditManager: post.creditManager,
-		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
+		...require_model_previews.asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt })),
 		creditAccount: post.creditAccount,
 		collateralAdded: [],
 		collateralWithdrawn: collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		totalValue: market.toUnderlyingAmount(totalValue),
-		totalDebt: market.toUnderlyingAmount(post.totalDebt),
-		netValue: market.toUnderlyingAmount(totalValue - post.totalDebt),
 		totalDebtChange: market.toUnderlyingAmount(post.totalDebt - before.totalDebt),
-		quotas: quotas.map((q) => ({
-			token: sdk.tokensMeta.mustGetToken(q.token),
-			...oracle.toAmount(market.underlying, q.balance)
-		})),
 		quotasChange: post.quotas.difference(before.quotas).toAssets().map((q) => ({
 			token: sdk.tokensMeta.mustGetToken(q.token),
 			...oracle.toAmount(market.underlying, q.balance)
 		})),
-		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		assetsChange: post.balances.difference(before.balances).toAssets(require_onchain_constants_math.DUST_THRESHOLD).map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		error: converter.error,
-		healthFactor: sdk.positions.healthFactor(snap),
-		safeHealthFactor: sdk.positions.healthFactor(snap, { safePrices: true }),
-		borrowRate: sdk.positions.borrowRate(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt }),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt }),
-		liquidationPrice: sdk.positions.liquidationPrice(snap),
-		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, post.totalDebt)
+		error: converter.error
 	};
 }
 //#endregion
-exports.buildDelayedPreview = buildDelayedPreview;
+exports.buildDelayedStrategyVerify = buildDelayedStrategyVerify;

package/dist/cjs/preview/preview/index.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_preview_preview_buildDelayedPreview = require("./buildDelayedPreview.js");
+const require_preview_preview_buildDelayedStrategyVerify = require("./buildDelayedStrategyVerify.js");
 const require_preview_preview_CreditAccountState = require("./CreditAccountState.js");
 const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay.js");
 const require_preview_preview_detectDelayedClaim = require("./detectDelayedClaim.js");
@@ -7,19 +7,19 @@ const require_preview_preview_detectDelayedOperation = require("./detectDelayedO
 const require_preview_preview_errors = require("./errors.js");
 const require_preview_preview_replayInnerOperations = require("./replayInnerOperations.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
-const require_preview_preview_previewAdjustCreditAccount = require("./previewAdjustCreditAccount.js");
-const require_preview_preview_previewCloseOrRepayCreditAccount = require("./previewCloseOrRepayCreditAccount.js");
+const require_preview_preview_previewAdjustStrategyVerify = require("./previewAdjustStrategyVerify.js");
+const require_preview_preview_previewExitOrRepayStrategyVerify = require("./previewExitOrRepayStrategyVerify.js");
 const require_preview_preview_previewOperation = require("./previewOperation.js");
 exports.CreditAccountState = require_preview_preview_CreditAccountState.CreditAccountState;
 exports.UnsupportedOperationError = require_preview_preview_errors.UnsupportedOperationError;
-exports.buildDelayedPreview = require_preview_preview_buildDelayedPreview.buildDelayedPreview;
+exports.buildDelayedStrategyVerify = require_preview_preview_buildDelayedStrategyVerify.buildDelayedStrategyVerify;
 exports.classifyCloseOrRepay = require_preview_preview_detectCloseOrRepay.classifyCloseOrRepay;
 exports.detectDelayedClaim = require_preview_preview_detectDelayedClaim.detectDelayedClaim;
 exports.detectDelayedOperation = require_preview_preview_detectDelayedOperation.detectDelayedOperation;
 exports.isCloseOrRepay = require_preview_preview_detectCloseOrRepay.isCloseOrRepay;
 exports.makeReplayState = require_preview_preview_replayInnerOperations.makeReplayState;
-exports.previewAdjustCreditAccount = require_preview_preview_previewAdjustCreditAccount.previewAdjustCreditAccount;
-exports.previewCloseOrRepayCreditAccount = require_preview_preview_previewCloseOrRepayCreditAccount.previewCloseOrRepayCreditAccount;
+exports.previewAdjustStrategyVerify = require_preview_preview_previewAdjustStrategyVerify.previewAdjustStrategyVerify;
+exports.previewExitOrRepayStrategyVerify = require_preview_preview_previewExitOrRepayStrategyVerify.previewExitOrRepayStrategyVerify;
 exports.previewOperation = require_preview_preview_previewOperation.previewOperation;
 exports.replayInnerOperations = require_preview_preview_replayInnerOperations.replayInnerOperations;
 exports.replayMulticall = require_preview_preview_replayMulticall.replayMulticall;

package/dist/cjs/preview/preview/{previewAdjustCreditAccount.js → previewAdjustStrategyVerify.js}

@@ -1,13 +1,12 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
 const require_onchain_constants_math = require("../../onchain/constants/math.js");
-const require_onchain_market_math = require("../../onchain/market/math.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
 require("../../onchain/index.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
-//#region src/preview/preview/previewAdjustCreditAccount.ts
+//#region src/preview/preview/previewAdjustStrategyVerify.ts
 /**
 * Previews a `multicall`/`botMulticall` operation on an existing credit
 * account: threads the multicall through {@link replayMulticall} over the
@@ -15,7 +14,7 @@ const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCo
 * minimal guaranteed post-state alongside the changes relative to the
 * pre-state.
 */
-async function previewAdjustCreditAccount(input, operation, options) {
+async function previewAdjustStrategyVerify(input, operation, options) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const oracle = market.priceOracle;
@@ -24,10 +23,8 @@ async function previewAdjustCreditAccount(input, operation, options) {
 	let error = replayError;
 	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
 	error ??= unwrapError;
-	const assets = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
-	const quotas = account.quotas.toAssets(0n);
 	const assetsChange = account.balances.difference(before.balances).toAssets(require_onchain_constants_math.DUST_THRESHOLD);
-	const totalValue = assets.reduce((acc, { token, balance }) => {
+	const totalValue = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD).reduce((acc, { token, balance }) => {
 		try {
 			return acc + oracle.convert(token, market.underlying, balance);
 		} catch {
@@ -41,33 +38,18 @@ async function previewAdjustCreditAccount(input, operation, options) {
 	const snap = account.toSnapshot(totalValue);
 	return {
 		operation: "AdjustCreditAccount",
-		creditManager: operation.creditManager,
-		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		...require_model_previews.asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt })),
 		creditAccount: operation.creditAccount,
 		collateralAdded: collateralAdded.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		totalValue: market.toUnderlyingAmount(totalValue),
-		totalDebt: market.toUnderlyingAmount(account.totalDebt),
-		netValue: market.toUnderlyingAmount(totalValue - account.totalDebt),
 		totalDebtChange: market.toUnderlyingAmount(account.totalDebt - before.totalDebt),
-		quotas: quotas.map((q) => ({
-			token: sdk.tokensMeta.mustGetToken(q.token),
-			...oracle.toAmount(market.underlying, q.balance)
-		})),
 		quotasChange: account.quotas.difference(before.quotas).toAssets().map((q) => ({
 			token: sdk.tokensMeta.mustGetToken(q.token),
 			...oracle.toAmount(market.underlying, q.balance)
 		})),
-		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		assetsChange: assetsChange.map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		error,
-		healthFactor: sdk.positions.healthFactor(snap),
-		safeHealthFactor: sdk.positions.healthFactor(snap, { safePrices: true }),
-		borrowRate: sdk.positions.borrowRate(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt }),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt }),
-		liquidationPrice: sdk.positions.liquidationPrice(snap),
-		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, account.totalDebt)
+		error
 	};
 }
 //#endregion
-exports.previewAdjustCreditAccount = previewAdjustCreditAccount;
+exports.previewAdjustStrategyVerify = previewAdjustStrategyVerify;

package/dist/cjs/preview/preview/{previewCloseOrRepayCreditAccount.js → previewExitOrRepayStrategyVerify.js}

@@ -1,12 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
 require("../../onchain/constants/math.js");
+const require_onchain_market_credit_creditOperationMarket = require("../../onchain/market/credit/creditOperationMarket.js");
 require("../../onchain/index.js");
 const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
-//#region src/preview/preview/previewCloseOrRepayCreditAccount.ts
-async function previewCloseOrRepayCreditAccount(input, operation, permanent, options) {
+//#region src/preview/preview/previewExitOrRepayStrategyVerify.ts
+async function previewExitOrRepayStrategyVerify(input, operation, permanent, options) {
 	const { sdk } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const exitTokens = [market.underlying];
@@ -32,8 +33,7 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 	return {
 		operation: "CloseCreditAccount",
 		permanent,
-		creditManager: operation.creditManager,
-		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
 		creditAccount: operation.creditAccount,
 		receivedAmount: market.priceOracle.toTokenAmount(receivedToken, after.collateralWithdrawn.getOrZero(receivedToken)),
 		error
@@ -53,8 +53,7 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	return {
 		operation: "RepayCreditAccount",
 		permanent,
-		creditManager: operation.creditManager,
-		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
 		creditAccount: operation.creditAccount,
 		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		debtRepaid: market.toUnderlyingAmount(before.totalDebt - after.account.totalDebt),
@@ -63,4 +62,4 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	};
 }
 //#endregion
-exports.previewCloseOrRepayCreditAccount = previewCloseOrRepayCreditAccount;
+exports.previewExitOrRepayStrategyVerify = previewExitOrRepayStrategyVerify;

package/dist/cjs/preview/preview/{previewPoolOperation.js → previewLpVerify.js}

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_preview_simulate_simulatePoolOperation = require("../simulate/simulatePoolOperation.js");
 require("../simulate/index.js");
-//#region src/preview/preview/previewPoolOperation.ts
-async function previewPoolOperation(input, operation, options) {
+//#region src/preview/preview/previewLpVerify.ts
+async function previewLpVerify(input, operation, options) {
 	const { sdk, to, calldata } = input;
 	const { tokenIn, tokenOut } = operation;
 	const market = sdk.marketRegister.findByPool(operation.pool);
@@ -22,4 +22,4 @@ async function previewPoolOperation(input, operation, options) {
 	};
 }
 //#endregion
-exports.previewPoolOperation = previewPoolOperation;
+exports.previewLpVerify = previewLpVerify;

package/dist/cjs/preview/preview/{previewOpenCreditAccount.js → previewOpenStrategyVerify.js}

@@ -1,15 +1,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
-const require_onchain_constants_math = require("../../onchain/constants/math.js");
-const require_onchain_market_math = require("../../onchain/market/math.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
 require("../../onchain/index.js");
 const require_preview_preview_CreditAccountState = require("./CreditAccountState.js");
 const require_preview_preview_replayInnerOperations = require("./replayInnerOperations.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
-//#region src/preview/preview/previewOpenCreditAccount.ts
-async function previewOpenCreditAccount(input, operation) {
+//#region src/preview/preview/previewOpenStrategyVerify.ts
+async function previewOpenStrategyVerify(input, operation) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const oracle = market.priceOracle;
@@ -30,32 +28,14 @@ async function previewOpenCreditAccount(input, operation) {
 	});
 	const { assets: collateral, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(state.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
 	error ??= unwrapError ?? priceError;
-	const assets = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
-	const quotas = account.quotas.toAssets(0n);
-	const totalValue = netValue + account.totalDebt;
-	const snap = account.toSnapshot(totalValue);
+	const snap = account.toSnapshot(netValue + account.totalDebt);
 	const targetAsset = inferTargetAsset(operation.multicall, account.balances);
 	return {
 		operation: operation.operation,
-		creditManager: operation.creditManager,
-		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		...require_model_previews.asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: -account.totalDebt })),
 		targetCollateral: targetAsset ? oracle.toTokenAmount(targetAsset.token, targetAsset.balance) : void 0,
 		collateralAdded: collateral.map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		netValue: market.toUnderlyingAmount(netValue),
-		totalValue: market.toUnderlyingAmount(totalValue),
-		totalDebt: market.toUnderlyingAmount(account.totalDebt),
-		quotas: quotas.map((q) => ({
-			token: sdk.tokensMeta.mustGetToken(q.token),
-			...oracle.toAmount(market.underlying, q.balance)
-		})),
-		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		error,
-		healthFactor: sdk.positions.healthFactor(snap),
-		safeHealthFactor: sdk.positions.healthFactor(snap, { safePrices: true }),
-		borrowRate: sdk.positions.borrowRate(snap, { availableLiquidityChange: -account.totalDebt }),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snap, { availableLiquidityChange: -account.totalDebt }),
-		liquidationPrice: sdk.positions.liquidationPrice(snap),
-		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, account.totalDebt)
+		error
 	};
 }
 /**
@@ -73,4 +53,4 @@ function inferTargetAsset(multicall, balances) {
 	}
 }
 //#endregion
-exports.previewOpenCreditAccount = previewOpenCreditAccount;
+exports.previewOpenStrategyVerify = previewOpenStrategyVerify;

package/dist/cjs/preview/preview/previewOperation.js

@@ -1,17 +1,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_market_credit_creditOperationMarket = require("../../onchain/market/credit/creditOperationMarket.js");
+require("../../onchain/index.js");
 const require_preview_parse_parseOperationCalldata = require("../parse/parseOperationCalldata.js");
 const require_preview_parse_types = require("../parse/types.js");
 require("../parse/index.js");
-const require_preview_preview_buildDelayedPreview = require("./buildDelayedPreview.js");
+const require_preview_preview_buildDelayedStrategyVerify = require("./buildDelayedStrategyVerify.js");
 const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay.js");
 const require_preview_preview_detectDelayedClaim = require("./detectDelayedClaim.js");
 const require_preview_preview_detectDelayedOperation = require("./detectDelayedOperation.js");
 const require_preview_preview_errors = require("./errors.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
-const require_preview_preview_previewAdjustCreditAccount = require("./previewAdjustCreditAccount.js");
-const require_preview_preview_previewCloseOrRepayCreditAccount = require("./previewCloseOrRepayCreditAccount.js");
-const require_preview_preview_previewOpenCreditAccount = require("./previewOpenCreditAccount.js");
-const require_preview_preview_previewPoolOperation = require("./previewPoolOperation.js");
+const require_preview_preview_previewAdjustStrategyVerify = require("./previewAdjustStrategyVerify.js");
+const require_preview_preview_previewExitOrRepayStrategyVerify = require("./previewExitOrRepayStrategyVerify.js");
+const require_preview_preview_previewLpVerify = require("./previewLpVerify.js");
+const require_preview_preview_previewOpenStrategyVerify = require("./previewOpenStrategyVerify.js");
 //#region src/preview/preview/previewOperation.ts
 /**
 * Previews a raw operation calldata: decodes it into a typed operation and
@@ -19,11 +21,11 @@ const require_preview_preview_previewPoolOperation = require("./previewPoolOpera
 */
 async function previewOperation(input, options) {
 	const operation = require_preview_parse_parseOperationCalldata.parseOperationCalldata(input);
-	if (require_preview_parse_types.isPoolOperation(operation)) return require_preview_preview_previewPoolOperation.previewPoolOperation(input, operation, options);
-	if (operation.operation === "OpenCreditAccount" || operation.operation === "RWAOpenCreditAccount") return require_preview_preview_previewOpenCreditAccount.previewOpenCreditAccount(input, operation);
+	if (require_preview_parse_types.isPoolOperation(operation)) return require_preview_preview_previewLpVerify.previewLpVerify(input, operation, options);
+	if (operation.operation === "OpenCreditAccount" || operation.operation === "RWAOpenCreditAccount") return require_preview_preview_previewOpenStrategyVerify.previewOpenStrategyVerify(input, operation);
 	if (operation.operation === "CloseCreditAccount") {
 		const resolved = await resolveCreditAccount(input, operation, options);
-		const preview = await require_preview_preview_previewCloseOrRepayCreditAccount.previewCloseOrRepayCreditAccount(input, operation, true, resolved);
+		const preview = await require_preview_preview_previewExitOrRepayStrategyVerify.previewExitOrRepayStrategyVerify(input, operation, true, resolved);
 		preview.intent = await require_preview_preview_detectDelayedClaim.resolveDelayedClaimIntent(input.sdk, operation.multicall, options?.blockNumber);
 		return preview;
 	}
@@ -53,7 +55,7 @@ async function resolveCreditAccount(input, operation, options) {
 */
 async function previewMulticallOperation(input, operation, options) {
 	const { sdk } = input;
-	const instantPreview = require_preview_preview_detectCloseOrRepay.isCloseOrRepay(operation.multicall) ? await require_preview_preview_previewCloseOrRepayCreditAccount.previewCloseOrRepayCreditAccount(input, operation, false, options) : await require_preview_preview_previewAdjustCreditAccount.previewAdjustCreditAccount(input, operation, options);
+	const instantPreview = require_preview_preview_detectCloseOrRepay.isCloseOrRepay(operation.multicall) ? await require_preview_preview_previewExitOrRepayStrategyVerify.previewExitOrRepayStrategyVerify(input, operation, false, options) : await require_preview_preview_previewAdjustStrategyVerify.previewAdjustStrategyVerify(input, operation, options);
 	const delayed = require_preview_preview_detectDelayedOperation.detectDelayedOperation(sdk, operation.multicall);
 	if (!delayed) {
 		instantPreview.intent = await require_preview_preview_detectDelayedClaim.resolveDelayedClaimIntent(sdk, operation.multicall, options?.blockNumber);
@@ -67,11 +69,10 @@ async function previewMulticallOperation(input, operation, options) {
 	return {
 		operation: "DelayedCreditAccountOperation",
 		creditAccount: operation.creditAccount,
-		creditManager: operation.creditManager,
-		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
 		intent: delayed.intent,
 		instantPreview,
-		delayedPreview: require_preview_preview_buildDelayedPreview.buildDelayedPreview(after.account, before, delayed, convert, receivedToken, sdk)
+		delayedPreview: require_preview_preview_buildDelayedStrategyVerify.buildDelayedStrategyVerify(after.account, before, delayed, convert, receivedToken, sdk)
 	};
 }
 //#endregion

package/dist/cjs/preview/validate/checkOperation.js

@@ -72,7 +72,11 @@ function creditIssues(sdk, preview, options) {
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying,
 		allowZero: !isOpening
-	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || quotaCountIssue(suite, preview) || quotaIssue(market, preview, underlying) || collateralIssue(preview, options) || fundingIssue(options, preview.collateralAdded);
+	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || quotaCountIssue(suite, preview) || quotaIssue(market, preview, underlying) || collateralIssue({
+		totalDebt: preview.totalDebt,
+		healthFactor: preview.estHealthFactor,
+		safeHealthFactor: preview.estSafeHealthFactor
+	}, options) || fundingIssue(options, preview.collateralAdded);
 }
 /**
 * A bar that reads nothing but the projected account, so a parsed transaction
@@ -83,9 +87,9 @@ function creditIssues(sdk, preview, options) {
 * need an operation's *delta* between them, and the caller acts on the first
 * issue reported.
 */
-function quotaCountIssue(suite, projection) {
+function quotaCountIssue(suite, account) {
 	return require_onchain_validation_checks.checkQuotaCount({
-		count: projection.quotas.filter((q) => q.value > 0n).length,
+		count: account.quotas.filter((q) => q.value > 0n).length,
 		max: suite.creditManager.maxEnabledTokens
 	});
 }
@@ -119,16 +123,16 @@ function borrowIssue(suite, preview, underlying) {
 *
 * {@inheritDoc quotaCountIssue}
 */
-function collateralIssue(projection, options) {
+function collateralIssue(account, options) {
 	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
-	if (projection.totalDebt.value === 0n) return null;
+	if (account.totalDebt.value === 0n) return null;
 	return (minHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
-		healthFactor: projection.healthFactor,
+		healthFactor: account.healthFactor,
 		required: minHealthFactor,
 		safePrices: false,
 		improvesFrom: currentHealthFactor
-	})) || (minSafeHealthFactor === void 0 || projection.safeHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
-		healthFactor: projection.safeHealthFactor,
+	})) || (minSafeHealthFactor === void 0 ? null : require_onchain_validation_checks.checkCollateralised({
+		healthFactor: account.safeHealthFactor,
 		required: minSafeHealthFactor,
 		safePrices: true
 	}));
@@ -148,7 +152,7 @@ function fundingIssue(options, puts) {
 	return null;
 }
 function forbiddenIssue(suite, preview) {
-	const obtained = preview.operation === "AdjustCreditAccount" ? preview.assetsChange : preview.assets;
+	const obtained = preview.operation === "AdjustCreditAccount" ? preview.assetsChange : preview.estAssets;
 	const forbidden = suite.forbiddenTokens;
 	for (const asset of obtained) {
 		if (asset.value <= 0n) continue;