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

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}

@@ -5,8 +5,8 @@ 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];
@@ -63,4 +63,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

@@ -2,16 +2,16 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 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 +19,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 +53,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);
@@ -71,7 +71,7 @@ async function previewMulticallOperation(input, operation, options) {
 		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		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;

package/dist/cjs/rewards/rewards/api.js

@@ -37,10 +37,7 @@ async function getMerklRewards({ sdk, account, reportError, apiKey }) {
 			const key = `${pool}_${rewardTokenAddress}`;
 			const seen = claimable.get(key);
 			if (seen) {
-				claimable.set(key, {
-					...seen,
-					amount: seen.amount + amount
-				});
+				seen.value += amount;
 				continue;
 			}
 			const poolToken = sdk.tokensMeta.getToken(pool);
@@ -49,12 +46,23 @@ async function getMerklRewards({ sdk, account, reportError, apiKey }) {
 				chainId: sdk.chainId,
 				pool,
 				poolToken,
-				rewardToken: toRewardToken(sdk, rewardTokenAddress, reward.token),
-				amount
+				token: toRewardToken(sdk, rewardTokenAddress, reward.token),
+				value: amount,
+				price: reward.token.price
 			});
 		}
 	}
-	return [...claimable.values()];
+	return [...claimable.values()].map(toReward);
+}
+function toReward({ price, token, value, ...rest }) {
+	return {
+		...rest,
+		amount: {
+			token,
+			value,
+			valueUsd: price === void 0 ? null : Number((0, viem.formatUnits)(value, token.decimals)) * price
+		}
+	};
 }
 /**
 * A campaign's incentive token is not protocol collateral, so the registry

package/dist/cjs/sdk/prepare/PrepareApi.js

@@ -6,6 +6,7 @@ const require_onchain_validation_token = require("../../onchain/validation/token
 const require_onchain_accounts_intents_utils_credit_account_slice = require("../../onchain/accounts/intents/utils/credit-account-slice.js");
 const require_onchain_accounts_intents_index = require("../../onchain/accounts/intents/index.js");
 require("../../onchain/index.js");
+const require_sdk_prepare_withdrawable_collaterals = require("./withdrawable-collaterals.js");
 //#region src/sdk/prepare/PrepareApi.ts
 /**
 * {@inheritDoc IOpportunitiesPrepare}
@@ -269,6 +270,12 @@ var PrepareApi = class extends require_onchain_base_MultichainConstruct.Multicha
 		});
 	}
 	/**
+	* {@inheritDoc IOpportunitiesPrepare.withdrawableCollaterals}
+	**/
+	withdrawableCollaterals(position) {
+		return require_sdk_prepare_withdrawable_collaterals.withdrawableCollaterals(this.sdk.chain(position.chainId), position);
+	}
+	/**
 	* {@inheritDoc IOpportunitiesPrepare.maxWithdrawCollateral}
 	**/
 	async maxWithdrawCollateral(position, token, targetHF) {

package/dist/cjs/sdk/prepare/withdrawable-collaterals.js

@@ -0,0 +1,23 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_accounts_intents_utils_pick_token = require("../../onchain/accounts/intents/utils/pick-token.js");
+require("../../onchain/index.js");
+//#region src/sdk/prepare/withdrawable-collaterals.ts
+/**
+* {@inheritDoc IOpportunitiesPrepare.withdrawableCollaterals}
+**/
+function withdrawableCollaterals(sdk, position) {
+	return position.collaterals.filter((c) => !require_onchain_accounts_intents_utils_pick_token.isPhantomToken(sdk, c.collateral.token.address)).sort(byValueThenAddress);
+}
+/**
+* Most valuable first. Address breaks a tie so the order is stable: two
+* collaterals can share a value — a pair of unpriced ones share `null` — and a
+* picker that seeds its default from the first row would otherwise change it
+* between reads.
+*/
+function byValueThenAddress(a, b) {
+	const byValue = (b.collateral.valueUsd ?? 0) - (a.collateral.valueUsd ?? 0);
+	if (byValue !== 0) return byValue;
+	return a.collateral.token.address < b.collateral.token.address ? -1 : 1;
+}
+//#endregion
+exports.withdrawableCollaterals = withdrawableCollaterals;

package/dist/esm/model/index.js

@@ -15,8 +15,8 @@ import { matchesOpportunityFilter, opportunityId, poolOpportunityId, strategyOpp
 import { apyBreakdownSchema, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityKeySchema, opportunityKindSchema, opportunitySchema, opportunityTotalsSchema, pointRewardsSchema, pointsProgramSchema, poolOpportunityDetailSchema, poolOpportunityKeySchema, poolOpportunitySchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, rewardsSchema, strategyOpportunityDetailSchema, strategyOpportunityKeySchema, strategyOpportunitySchema, tokenRewardsSchema } from "./opportunities.schema.js";
 import { STRATEGY_POSITION_COLLATERAL_ERROR, liquidationPositionId, matchesPositionFilter, poolPositionId, positionId, strategyPositionId } from "./positions.js";
 import { borrowRateBreakdownSchema, pnlBreakdownSchema, pointsProgramPnLSchema, pointsRewardsPnLSchema, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, rewardsPnLSchema, strategyPositionKeySchema, strategyPositionSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema } from "./positions.schema.js";
-import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPRICEABLE_TOKEN, ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL } from "./previews.js";
+import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPRICEABLE_TOKEN, ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL, asEstimated } from "./previews.js";
 import "./primitives.js";
 import "./response.js";
 import { chainFailedSchema, chainMetadataSchema, chainSucceededSchema, dataSourceSchema, responseMetadataSchema, responseSchema } from "./response.schema.js";
-export { CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPRICEABLE_TOKEN, ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL, FILTER_ALL, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, STRATEGY_POSITION_COLLATERAL_ERROR, amountSchema, apyBreakdownSchema, assetTypeSchema, backendPreferred, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, opportunityTotalsSchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema, underlyingTokenSchema };
+export { CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPRICEABLE_TOKEN, ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL, FILTER_ALL, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, STRATEGY_POSITION_COLLATERAL_ERROR, amountSchema, apyBreakdownSchema, asEstimated, assetTypeSchema, backendPreferred, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, opportunityTotalsSchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema, underlyingTokenSchema };

package/dist/esm/model/previews.js

@@ -32,5 +32,27 @@ const ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL = 1005;
 const ERROR_INVALID_TRANSACTION_VALUE = 1006;
 /** A token in the preview could not be priced by the oracle */
 const ERROR_UNPRICEABLE_TOKEN = 2001;
+/**
+* Renames a projection's routed fields, for a caller that built one from floor
+* balances.
+*
+* Lives beside the type so the two cannot drift: a field added to
+* {@link RoutedField} fails to compile until it is renamed here too.
+**/
+function asEstimated(p) {
+	const { totalValue, netValue, assets, healthFactor, safeHealthFactor, borrowRate, timeToLiquidation, liquidationPrice, leverage, ...settled } = p;
+	return {
+		...settled,
+		estTotalValue: totalValue,
+		estNetValue: netValue,
+		estAssets: assets,
+		estHealthFactor: healthFactor,
+		estSafeHealthFactor: safeHealthFactor,
+		estBorrowRate: borrowRate,
+		estTimeToLiquidation: timeToLiquidation,
+		estLiquidationPrice: liquidationPrice,
+		estLeverage: leverage
+	};
+}
 //#endregion
-export { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPRICEABLE_TOKEN, ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL };
+export { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPRICEABLE_TOKEN, ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL, asEstimated };

package/dist/esm/onchain/accounts/index.js

@@ -5,6 +5,7 @@ import { CreditAccountCompressorV310Contract } from "./credit-account-compressor
 import { CreditAccountCompressor } from "./credit-account-compressor/CreditAccountCompressor.js";
 import "./credit-account-compressor/index.js";
 import { CreditAccountsServiceV310 } from "./CreditAccountsServiceV310.js";
+import { isPhantomToken } from "./intents/utils/pick-token.js";
 import { borrowable } from "./intents/guards.js";
 import { fetchCreditAccountSlice, toCreditAccountSlice } from "./intents/utils/credit-account-slice.js";
 import { calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, roundUpQuota } from "./quota-utils.js";
@@ -26,4 +27,4 @@ import { toWithdrawalStatus } from "./withdrawal-compressor/types.js";
 import { WithdrawalCompressorV313Contract } from "./withdrawal-compressor/WithdrawalCompressorV313Contract.js";
 import { createWithdrawalCompressor } from "./withdrawal-compressor/createWithdrawalCompressor.js";
 import "./withdrawal-compressor/index.js";
-export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, borrowable, calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, roundUpQuota, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };
+export { AbstractWithdrawalCompressorContract, AccountBotsService, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountOperationsService, CreditAccountsServiceV310, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, LiquidationsService, MultichainLiquidationsService, PeripheryCompressorV310Contract, RedemptionLoggerV310Contract, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, borrowable, calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, isPhantomToken, roundUpQuota, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };

package/dist/esm/onchain/accounts/intents/index.js

@@ -1,6 +1,7 @@
 import { SDKConstruct } from "../../base/SDKConstruct.js";
 import { MIN_HF_LIMITED } from "../../validation/checks.js";
 import { IntentPreviewError, refuse } from "../../validation/refusal.js";
+import { isPhantomToken } from "./utils/pick-token.js";
 import { assertMarketOperable, borrowable } from "./guards.js";
 import { calcLeverageBand } from "./leverage-band.js";
 import { maxProportionalWithdrawal } from "./math.js";
@@ -314,4 +315,4 @@ function isUnroutable(e) {
 	return false;
 }
 //#endregion
-export { CreditAccountOperationsService, borrowable, fetchCreditAccountSlice, toCreditAccountSlice };
+export { CreditAccountOperationsService, borrowable, fetchCreditAccountSlice, isPhantomToken, toCreditAccountSlice };

package/dist/esm/onchain/accounts/intents/open-strategy.js

@@ -1,4 +1,3 @@
-import { calcPositionLeverage } from "../../market/math.js";
 import { IntentPreviewError } from "../../validation/refusal.js";
 import { assertCanBorrow, assertCollateralised, assertGrowthAllowed, assertMarketOperable, assertQuotaHeadroom } from "./guards.js";
 import { assertDebtInBand, assertLeverageAtLeastOne, debtForLeverage } from "./math.js";
@@ -85,34 +84,21 @@ async function previewOpenStrategy(props) {
 		totalDebt: debt,
 		totalValue: margin + debt
 	};
-	const projectedPool = { availableLiquidityChange: -debt };
-	const metrics = {
-		healthFactor: sdk.positions.healthFactor(snapshot),
-		safeHealthFactor: sdk.positions.healthFactor(snapshot, { safePrices: true }),
-		borrowRate: sdk.positions.borrowRate(snapshot, projectedPool),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snapshot, projectedPool),
-		liquidationPrice: sdk.positions.liquidationPrice(snapshot)
-	};
-	assertCollateralised(metrics.healthFactor, false);
+	const { assets: _assets, quotas: _quotas, ...projection } = sdk.positions.projection(snapshot, { availableLiquidityChange: -debt });
+	assertCollateralised(projection.healthFactor, false);
 	const priceImpact = await collectPriceImpact(leg.probe ? [leg.probe] : [], {
 		totalValue: margin + debt,
 		netValue: margin,
 		toUnderlying: (from, amount) => convert(from, underlying, amount)
 	});
 	return {
-		creditManager,
-		name: suite.name,
-		totalDebt: market.toUnderlyingAmount(debt),
-		netValue: market.toUnderlyingAmount(margin),
-		totalValue: market.toUnderlyingAmount(margin + debt),
-		leverage: calcPositionLeverage(margin + debt, debt),
+		...projection,
 		priceImpact,
 		averageAssets: averageAssets.map(priced),
 		minAssets: minAssets.map(priced),
 		averageQuota,
 		minQuota,
-		calls: [...leg.calls],
-		...metrics
+		calls: [...leg.calls]
 	};
 }
 /** Collateral plus the borrowed underlying, folded into one balance per token. */