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

package/dist/esm/onchain/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.js

@@ -1,6 +1,6 @@
+import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
 import { encodeDelayedIntent } from "./intent-codec.js";
 import { AbstractWithdrawalCompressorContract, iCreditAccountAbi, toClaimableWithdrawal, toPendingWithdrawal, toRequestableWithdrawal } from "./AbstractWithdrawalCompressorContract.js";
-import { iWithdrawalCompressorV313Abi } from "../../../abi/IWithdrawalCompressorV313.js";
 import { toWithdrawalStatus } from "./types.js";
 //#region src/onchain/accounts/withdrawal-compressor/WithdrawalCompressorV313Contract.ts
 const abi = iWithdrawalCompressorV313Abi;

package/dist/esm/onchain/base/TokensMeta.js

@@ -1,12 +1,12 @@
+import { iExpirableAbi } from "../../abi/iExpirable.js";
+import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
+import { iVersionAbi } from "../../abi/iVersion.js";
 import { AddressMap } from "../utils/AddressMap.js";
 import { AddressSet } from "../utils/AddressSet.js";
 import { bytes32ToString } from "../utils/bytes32ToString.js";
 import { getAssetType } from "../chain/chains.js";
 import { formatBN } from "../utils/formatter.js";
 import "../utils/index.js";
-import { iExpirableAbi } from "../../abi/iExpirable.js";
-import { iStateSerializerAbi } from "../../abi/iStateSerializer.js";
-import { iVersionAbi } from "../../abi/iVersion.js";
 import { SdkRWADataNotLoadedError } from "../core/errors.js";
 import { executeMulticallBatches } from "../utils/viem/executeMulticallBatches.js";
 //#region src/onchain/base/TokensMeta.ts

package/dist/esm/onchain/core/createAddressProvider.js

@@ -1,8 +1,8 @@
+import { iVersionAbi } from "../../abi/iVersion.js";
 import { AP_MARKET_COMPRESSOR, AP_PRICE_FEED_COMPRESSOR } from "../constants/address-provider.js";
 import { isV310 } from "../constants/versions.js";
 import "../constants/index.js";
 import { hexEq } from "../utils/hex.js";
-import { iVersionAbi } from "../../abi/iVersion.js";
 import { AddressProviderV310Contract } from "./AddressProviderV310Contract.js";
 //#region src/onchain/core/createAddressProvider.ts
 const OVERRIDE_ADDRESSES = { Mainnet: {

package/dist/esm/onchain/market/adapters/contracts/AccountMigratorAdapterContract.js

@@ -1,5 +1,5 @@
-import { AbstractAdapterContract } from "./AbstractAdapter.js";
 import { accountMigratorAbi } from "../../../../abi/AccountMigrator.js";
+import { AbstractAdapterContract } from "./AbstractAdapter.js";
 //#region src/onchain/market/adapters/contracts/AccountMigratorAdapterContract.ts
 const abi = accountMigratorAbi;
 const protocolAbi = accountMigratorAbi;

package/dist/esm/onchain/market/adapters/contracts/ERC4626AdapterContract.js

@@ -1,6 +1,6 @@
+import { ierc4626AdapterAbi } from "../../../../abi/ierc4626Adapter.js";
 import { MissingSerializedParamsError } from "../../../base/errors.js";
 import "../../../base/index.js";
-import { ierc4626AdapterAbi } from "../../../../abi/ierc4626Adapter.js";
 import { iERC4626Abi } from "../abi/targetContractAbi.js";
 import { fnSigToName, swapFromTransfers } from "../transferHelpers.js";
 import { AbstractAdapterContract } from "./AbstractAdapter.js";

package/dist/esm/onchain/market/credit/CreditFacadeV310BaseContract.js

@@ -1,7 +1,7 @@
+import { iPausableAbi } from "../../../abi/iPausable.js";
 import { iCreditFacadeMulticallV310Abi, iCreditFacadeV310Abi } from "../../../abi/310/generated.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
-import { iPausableAbi } from "../../../abi/iPausable.js";
 //#region src/onchain/market/credit/CreditFacadeV310BaseContract.ts
 const abi = [
 	...iCreditFacadeV310Abi,

package/dist/esm/onchain/market/pool/PoolV310Contract.js

@@ -1,3 +1,4 @@
+import { iPausableAbi } from "../../../abi/iPausable.js";
 import { iPoolV310Abi } from "../../../abi/310/generated.js";
 import { AddressMap } from "../../utils/AddressMap.js";
 import { RAY } from "../../constants/math.js";
@@ -7,7 +8,6 @@ import "../../utils/index.js";
 import { SdkRWADataNotLoadedError } from "../../core/errors.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
-import { iPausableAbi } from "../../../abi/iPausable.js";
 //#region src/onchain/market/pool/PoolV310Contract.ts
 const abi = [...iPoolV310Abi, ...iPausableAbi];
 var PoolV310Contract = class extends BaseContract {

package/dist/esm/onchain/market/zapper/IETHZapperContract.js

@@ -1,5 +1,5 @@
-import { ZapperContract } from "./ZapperContract.js";
 import { iethZapperAbi } from "../../../abi/iETHZapper.js";
+import { ZapperContract } from "./ZapperContract.js";
 //#region src/onchain/market/zapper/IETHZapperContract.ts
 const abi = iethZapperAbi;
 var IETHZapperContract = class extends ZapperContract {

package/dist/esm/onchain/market/zapper/ZapperContract.js

@@ -1,6 +1,6 @@
+import { iZapperAbi } from "../../../abi/iZapper.js";
 import { BaseContract } from "../../base/BaseContract.js";
 import "../../base/index.js";
-import { iZapperAbi } from "../../../abi/iZapper.js";
 import { UnsupportedZapperFunctionError } from "./errors.js";
 //#region src/onchain/market/zapper/ZapperContract.ts
 /**

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

@@ -163,6 +163,85 @@ var PositionsService = class extends SDKConstruct {
 		});
 	}
 	/**
+	* 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) => 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 = 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: calcTimeToLiquidationMs(healthFactor, BigInt(borrowRate.totalOnDebt)),
+			liquidationPrice: calcLiquidationPrice({
+				snapshot,
+				underlying: data.underlying,
+				decimals: data.decimals,
+				liquidationThresholds: data.liquidationThresholds
+			}),
+			leverage: 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 {
+			creditManager,
+			name: this.sdk.marketRegister.findCreditManager(creditManager).name,
+			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/esm/onchain/utils/viem/simulateWithPriceUpdates.js

@@ -1,6 +1,6 @@
 import { errorAbis } from "../../../abi/errors.js";
-import { generateCastTraceCall } from "./cast.js";
 import { iUpdatablePriceFeedAbi } from "../../../abi/iUpdatablePriceFeed.js";
+import { generateCastTraceCall } from "./cast.js";
 import { simulateMulticall } from "./simulateMulticall.js";
 import { BaseError, CallExecutionError, ContractFunctionRevertedError, decodeFunctionData, decodeFunctionResult, encodeFunctionData, parseAbi } from "viem";
 import { getAction, parseAccount } from "viem/utils";

package/dist/esm/preview/index.js

@@ -19,7 +19,7 @@ import { BalancePrerequisite } from "./prerequisites/BalancePrerequisite.js";
 import { RWAOpenRequirementsPrerequisite } from "./prerequisites/RWAOpenRequirementsPrerequisite.js";
 import { checkPrerequisites } from "./prerequisites/checkPrerequisites.js";
 import "./prerequisites/index.js";
-import { buildDelayedPreview } from "./preview/buildDelayedPreview.js";
+import { buildDelayedStrategyVerify } from "./preview/buildDelayedStrategyVerify.js";
 import { CreditAccountState } from "./preview/CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./preview/detectCloseOrRepay.js";
 import { detectDelayedClaim, resolveDelayedClaimIntent } from "./preview/detectDelayedClaim.js";
@@ -27,12 +27,12 @@ import { detectDelayedOperation } from "./preview/detectDelayedOperation.js";
 import { UnsupportedOperationError } from "./preview/errors.js";
 import { makeReplayState, replayInnerOperations } from "./preview/replayInnerOperations.js";
 import { replayMulticall } from "./preview/replayMulticall.js";
-import { previewAdjustCreditAccount } from "./preview/previewAdjustCreditAccount.js";
-import { previewCloseOrRepayCreditAccount } from "./preview/previewCloseOrRepayCreditAccount.js";
+import { previewAdjustStrategyVerify } from "./preview/previewAdjustStrategyVerify.js";
+import { previewExitOrRepayStrategyVerify } from "./preview/previewExitOrRepayStrategyVerify.js";
 import { previewOperation } from "./preview/previewOperation.js";
 import "./preview/index.js";
 import "./types.js";
 import { checkOperation, collateralIssue, marketIssues, quotaCountIssue } from "./validate/checkOperation.js";
 import { checkSimulation } from "./validate/checkSimulation.js";
 import "./validate/index.js";
-export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, IntentPreviewError, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, IntentPreviewError, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedStrategyVerify, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyVerify, previewExitOrRepayStrategyVerify, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

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

@@ -1,12 +1,11 @@
 import { AssetsMap } from "../../onchain/utils/AssetsMap.js";
 import { BigIntMath } from "../../onchain/utils/bigint-math.js";
 import { DUST_THRESHOLD } from "../../onchain/constants/math.js";
-import { calcPositionLeverage } from "../../onchain/market/math.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import { ERROR_UNPRICEABLE_TOKEN, asEstimated } from "../../model/previews.js";
 import "../../model/index.js";
 import "../../onchain/index.js";
 import { isAddressEqual } from "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:
@@ -29,7 +28,7 @@ import { isAddressEqual } from "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);
@@ -174,41 +173,23 @@ function buildClosePreview(post, converter, receivedToken, sdk) {
 	};
 }
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
-	const totalValue = totalValueInUnderlying(post, converter.convert, DUST_THRESHOLD);
-	const assets = post.balances.toAssets(DUST_THRESHOLD);
-	const quotas = post.quotas.toAssets(0n);
-	const snap = post.toSnapshot(totalValue);
+	const snap = post.toSnapshot(totalValueInUnderlying(post, converter.convert, 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,
+		...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(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: calcPositionLeverage(totalValue, post.totalDebt)
+		error: converter.error
 	};
 }
 //#endregion
-export { buildDelayedPreview };
+export { buildDelayedStrategyVerify };

package/dist/esm/preview/preview/index.js

@@ -1,4 +1,4 @@
-import { buildDelayedPreview } from "./buildDelayedPreview.js";
+import { buildDelayedStrategyVerify } from "./buildDelayedStrategyVerify.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { detectDelayedClaim, resolveDelayedClaimIntent } from "./detectDelayedClaim.js";
@@ -6,7 +6,7 @@ import { detectDelayedOperation } from "./detectDelayedOperation.js";
 import { UnsupportedOperationError } from "./errors.js";
 import { makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { replayMulticall } from "./replayMulticall.js";
-import { previewAdjustCreditAccount } from "./previewAdjustCreditAccount.js";
-import { previewCloseOrRepayCreditAccount } from "./previewCloseOrRepayCreditAccount.js";
+import { previewAdjustStrategyVerify } from "./previewAdjustStrategyVerify.js";
+import { previewExitOrRepayStrategyVerify } from "./previewExitOrRepayStrategyVerify.js";
 import { previewOperation } from "./previewOperation.js";
-export { CreditAccountState, UnsupportedOperationError, buildDelayedPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { CreditAccountState, UnsupportedOperationError, buildDelayedStrategyVerify, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustStrategyVerify, previewExitOrRepayStrategyVerify, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

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

@@ -1,12 +1,11 @@
 import { AP_WETH_TOKEN } from "../../onchain/constants/address-provider.js";
 import { DUST_THRESHOLD } from "../../onchain/constants/math.js";
-import { calcPositionLeverage } from "../../onchain/market/math.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import { ERROR_UNPRICEABLE_TOKEN, asEstimated } from "../../model/previews.js";
 import "../../model/index.js";
 import "../../onchain/index.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { unwrapNativeCollateral } from "./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
@@ -14,7 +13,7 @@ import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 * 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;
@@ -23,10 +22,8 @@ async function previewAdjustCreditAccount(input, operation, options) {
 	let error = replayError;
 	const { assets: collateralAdded, error: unwrapError } = unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0));
 	error ??= unwrapError;
-	const assets = account.balances.toAssets(DUST_THRESHOLD);
-	const quotas = account.quotas.toAssets(0n);
 	const assetsChange = account.balances.difference(before.balances).toAssets(DUST_THRESHOLD);
-	const totalValue = assets.reduce((acc, { token, balance }) => {
+	const totalValue = account.balances.toAssets(DUST_THRESHOLD).reduce((acc, { token, balance }) => {
 		try {
 			return acc + oracle.convert(token, market.underlying, balance);
 		} catch {
@@ -40,33 +37,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,
+		...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: calcPositionLeverage(totalValue, account.totalDebt)
+		error
 	};
 }
 //#endregion
-export { previewAdjustCreditAccount };
+export { previewAdjustStrategyVerify };

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

@@ -4,8 +4,8 @@ import "../../onchain/index.js";
 import { classifyCloseOrRepay } from "./detectCloseOrRepay.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { unwrapNativeCollateral } from "./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];
@@ -62,4 +62,4 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	};
 }
 //#endregion
-export { previewCloseOrRepayCreditAccount };
+export { previewExitOrRepayStrategyVerify };

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

@@ -1,7 +1,7 @@
 import { simulatePoolOperation } from "../simulate/simulatePoolOperation.js";
 import "../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);
@@ -21,4 +21,4 @@ async function previewPoolOperation(input, operation, options) {
 	};
 }
 //#endregion
-export { previewPoolOperation };
+export { previewLpVerify };

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

@@ -1,14 +1,12 @@
 import { AP_WETH_TOKEN } from "../../onchain/constants/address-provider.js";
-import { DUST_THRESHOLD } from "../../onchain/constants/math.js";
-import { calcPositionLeverage } from "../../onchain/market/math.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import { ERROR_UNPRICEABLE_TOKEN, asEstimated } from "../../model/previews.js";
 import "../../model/index.js";
 import "../../onchain/index.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { unwrapNativeCollateral } from "./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;
@@ -29,32 +27,14 @@ async function previewOpenCreditAccount(input, operation) {
 	});
 	const { assets: collateral, error: unwrapError } = unwrapNativeCollateral(state.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0));
 	error ??= unwrapError ?? priceError;
-	const assets = account.balances.toAssets(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,
+		...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: calcPositionLeverage(totalValue, account.totalDebt)
+		error
 	};
 }
 /**
@@ -72,4 +52,4 @@ function inferTargetAsset(multicall, balances) {
 	}
 }
 //#endregion
-export { previewOpenCreditAccount };
+export { previewOpenStrategyVerify };

package/dist/esm/preview/preview/previewOperation.js

@@ -1,16 +1,16 @@
 import { parseOperationCalldata } from "../parse/parseOperationCalldata.js";
 import { isPoolOperation } from "../parse/types.js";
 import "../parse/index.js";
-import { buildDelayedPreview } from "./buildDelayedPreview.js";
+import { buildDelayedStrategyVerify } from "./buildDelayedStrategyVerify.js";
 import { isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { resolveDelayedClaimIntent } from "./detectDelayedClaim.js";
 import { detectDelayedOperation } from "./detectDelayedOperation.js";
 import { UnsupportedOperationError } from "./errors.js";
 import { replayMulticall } from "./replayMulticall.js";
-import { previewAdjustCreditAccount } from "./previewAdjustCreditAccount.js";
-import { previewCloseOrRepayCreditAccount } from "./previewCloseOrRepayCreditAccount.js";
-import { previewOpenCreditAccount } from "./previewOpenCreditAccount.js";
-import { previewPoolOperation } from "./previewPoolOperation.js";
+import { previewAdjustStrategyVerify } from "./previewAdjustStrategyVerify.js";
+import { previewExitOrRepayStrategyVerify } from "./previewExitOrRepayStrategyVerify.js";
+import { previewLpVerify } from "./previewLpVerify.js";
+import { previewOpenStrategyVerify } from "./previewOpenStrategyVerify.js";
 //#region src/preview/preview/previewOperation.ts
 /**
 * Previews a raw operation calldata: decodes it into a typed operation and
@@ -18,11 +18,11 @@ import { previewPoolOperation } from "./previewPoolOperation.js";
 */
 async function previewOperation(input, options) {
 	const operation = parseOperationCalldata(input);
-	if (isPoolOperation(operation)) return previewPoolOperation(input, operation, options);
-	if (operation.operation === "OpenCreditAccount" || operation.operation === "RWAOpenCreditAccount") return previewOpenCreditAccount(input, operation);
+	if (isPoolOperation(operation)) return previewLpVerify(input, operation, options);
+	if (operation.operation === "OpenCreditAccount" || operation.operation === "RWAOpenCreditAccount") return previewOpenStrategyVerify(input, operation);
 	if (operation.operation === "CloseCreditAccount") {
 		const resolved = await resolveCreditAccount(input, operation, options);
-		const preview = await previewCloseOrRepayCreditAccount(input, operation, true, resolved);
+		const preview = await previewExitOrRepayStrategyVerify(input, operation, true, resolved);
 		preview.intent = await resolveDelayedClaimIntent(input.sdk, operation.multicall, options?.blockNumber);
 		return preview;
 	}
@@ -52,7 +52,7 @@ async function resolveCreditAccount(input, operation, options) {
 */
 async function previewMulticallOperation(input, operation, options) {
 	const { sdk } = input;
-	const instantPreview = isCloseOrRepay(operation.multicall) ? await previewCloseOrRepayCreditAccount(input, operation, false, options) : await previewAdjustCreditAccount(input, operation, options);
+	const instantPreview = isCloseOrRepay(operation.multicall) ? await previewExitOrRepayStrategyVerify(input, operation, false, options) : await previewAdjustStrategyVerify(input, operation, options);
 	const delayed = detectDelayedOperation(sdk, operation.multicall);
 	if (!delayed) {
 		instantPreview.intent = await resolveDelayedClaimIntent(sdk, operation.multicall, options?.blockNumber);
@@ -70,7 +70,7 @@ async function previewMulticallOperation(input, operation, options) {
 		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		intent: delayed.intent,
 		instantPreview,
-		delayedPreview: buildDelayedPreview(after.account, before, delayed, convert, receivedToken, sdk)
+		delayedPreview: buildDelayedStrategyVerify(after.account, before, delayed, convert, receivedToken, sdk)
 	};
 }
 //#endregion

package/dist/esm/preview/simulate/simulatePoolOperation.js

@@ -1,5 +1,5 @@
-import { iPoolV310Abi } from "../../abi/310/generated.js";
 import { iZapperAbi } from "../../abi/iZapper.js";
+import { iPoolV310Abi } from "../../abi/310/generated.js";
 import { asPreviewSimulationError } from "./errors.js";
 //#region src/preview/simulate/simulatePoolOperation.ts
 function previewRead(operation) {

package/dist/esm/preview/trace/extractTransfers.js

@@ -1,5 +1,5 @@
-import { iCreditFacadeV310Abi } from "../../abi/310/generated.js";
 import { ierc20Abi } from "../../abi/iERC20.js";
+import { iCreditFacadeV310Abi } from "../../abi/310/generated.js";
 import { AddressMap } from "../../onchain/utils/AddressMap.js";
 import "../../onchain/index.js";
 import { UnexpectedFacadeEventOrderError } from "./errors.js";

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

@@ -71,7 +71,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
@@ -82,9 +86,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 checkQuotaCount({
-		count: projection.quotas.filter((q) => q.value > 0n).length,
+		count: account.quotas.filter((q) => q.value > 0n).length,
 		max: suite.creditManager.maxEnabledTokens
 	});
 }
@@ -118,16 +122,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 : checkCollateralised({
-		healthFactor: projection.healthFactor,
+		healthFactor: account.healthFactor,
 		required: minHealthFactor,
 		safePrices: false,
 		improvesFrom: currentHealthFactor
-	})) || (minSafeHealthFactor === void 0 || projection.safeHealthFactor === void 0 ? null : checkCollateralised({
-		healthFactor: projection.safeHealthFactor,
+	})) || (minSafeHealthFactor === void 0 ? null : checkCollateralised({
+		healthFactor: account.safeHealthFactor,
 		required: minSafeHealthFactor,
 		safePrices: true
 	}));
@@ -147,7 +151,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;