@gearbox-protocol/sdk 16.0.0-next.21 → 16.0.0-next.23

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

@@ -30,7 +30,7 @@ function checkOperation(input, options = {}) {
 		case "RWAOpenCreditAccount":
 		case "AdjustCreditAccount": return creditIssues(sdk, preview, options);
 		case "CloseCreditAccount":
-		case "RepayCreditAccount": return marketIssues(sdk, preview.creditManager);
+		case "RepayCreditAccount": return marketIssues(sdk.marketRegister.findCreditManager(preview.creditManager));
 	}
 }
 function poolIssues(sdk, preview, options, isDeposit) {
@@ -49,8 +49,8 @@ function poolIssues(sdk, preview, options, isDeposit) {
 	})) || fundingIssue(options, [preview.tokenIn]);
 }
 /** What the market itself refuses, whatever the operation does. */
-function marketIssues(sdk, creditManager) {
-	const suite = sdk.marketRegister.findCreditManager(creditManager);
+function marketIssues(suite) {
+	const creditManager = suite.creditManager.address;
 	return checkCreditManagerPaused({
 		isPaused: suite.isPaused,
 		creditManager
@@ -65,29 +65,42 @@ function creditIssues(sdk, preview, options) {
 	const market = suite.market;
 	const underlying = toToken(sdk, market.pool.underlying);
 	const isOpening = preview.operation === "OpenCreditAccount" || preview.operation === "RWAOpenCreditAccount";
-	return marketIssues(sdk, preview.creditManager) || checkDebtInBand({
-		debt: preview.debt,
+	return marketIssues(suite) || checkDebtInBand({
+		debt: preview.totalDebt.value,
 		minDebt: suite.creditFacade.minDebt,
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying,
 		allowZero: !isOpening
-	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || checkQuotaCount({
-		count: preview.quotas.filter((q) => q.value > 0n).length,
+	}) || borrowIssue(suite, preview, underlying) || forbiddenIssue(suite, preview) || quotaCountIssue(suite, preview) || quotaIssue(market, preview, underlying) || collateralIssue(preview, options) || fundingIssue(options, preview.collateralAdded);
+}
+/**
+* A bar that reads nothing but the projected account, so a parsed transaction
+* and a simulated one are held to it by the same code.
+*
+* These stay separate functions rather than one block because the order the
+* checks run in is the answer: `checkOperation` interleaves the checks that
+* need an operation's *delta* between them, and the caller acts on the first
+* issue reported.
+*/
+function quotaCountIssue(suite, projection) {
+	return checkQuotaCount({
+		count: projection.quotas.filter((q) => q.value > 0n).length,
 		max: suite.creditManager.maxEnabledTokens
-	}) || quotaIssue(market, preview, underlying) || (preview.debt === 0n ? null : collateralIssue(preview, options)) || fundingIssue(options, collateralOf(preview));
+	});
 }
 /**
 * What the transaction draws, against what the market can lend right now.
 *
 * Only a draw is weighed: repaying, or leaving the debt alone, can never exceed
-* a ceiling. Opening borrows the whole debt; adjusting borrows `debtChange`.
+* a ceiling. Opening borrows the whole debt; adjusting borrows
+* `totalDebtChange`.
 *
 * The engine holds every simulation to this already (`assertCanBorrow`), so
 * this is here for the transactions it never saw — a pasted calldata reaches
 * the confirm screen with nothing else standing between it and a revert.
 */
 function borrowIssue(suite, preview, underlying) {
-	const drawn = preview.operation === "AdjustCreditAccount" ? preview.debtChange : preview.debt;
+	const drawn = preview.operation === "AdjustCreditAccount" ? preview.totalDebtChange.value : preview.totalDebt.value;
 	if (drawn <= 0n) return null;
 	const { limit, binding } = borrowable(suite);
 	return checkBorrowLimit({
@@ -97,12 +110,27 @@ function borrowIssue(suite, preview, underlying) {
 		underlying
 	});
 }
-/** The account against whichever bars the caller holds it to. */
-function collateralIssue(preview, options) {
-	return collateralIssuesOf({
-		healthFactor: preview.healthFactor,
-		safeHealthFactor: preview.safeHealthFactor
-	}, options);
+/**
+* The account against whichever bars the caller holds it to.
+*
+* A loan-free account is nothing to weigh: the health factor reports its
+* zero-debt sentinel and no bar applies.
+*
+* {@inheritDoc quotaCountIssue}
+*/
+function collateralIssue(projection, options) {
+	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
+	if (projection.totalDebt.value === 0n) return null;
+	return (minHealthFactor === void 0 ? null : checkCollateralised({
+		healthFactor: projection.healthFactor,
+		required: minHealthFactor,
+		safePrices: false,
+		improvesFrom: currentHealthFactor
+	})) || (minSafeHealthFactor === void 0 || projection.safeHealthFactor === void 0 ? null : checkCollateralised({
+		healthFactor: projection.safeHealthFactor,
+		required: minSafeHealthFactor,
+		safePrices: true
+	}));
 }
 /** The wallet's side of the operation, against the balances it was given. */
 function fundingIssue(options, puts) {
@@ -118,12 +146,6 @@ function fundingIssue(options, puts) {
 	}
 	return null;
 }
-/** What the wallet puts in, which is what its balances have to cover. */
-function collateralOf(preview) {
-	if ("collateral" in preview) return preview.collateral;
-	if ("collateralAdded" in preview) return preview.collateralAdded;
-	return [];
-}
 function forbiddenIssue(suite, preview) {
 	const obtained = preview.operation === "AdjustCreditAccount" ? preview.assetsChange : preview.assets;
 	const forbidden = suite.forbiddenTokens;
@@ -153,19 +175,5 @@ function quotaIssue(market, preview, underlying) {
 	}
 	return null;
 }
-/** The two collateral bars, shared by the preview and the simulation paths. */
-function collateralIssuesOf(factors, options) {
-	const { minHealthFactor, minSafeHealthFactor, currentHealthFactor } = options;
-	return (minHealthFactor === void 0 ? null : checkCollateralised({
-		healthFactor: factors.healthFactor,
-		required: minHealthFactor,
-		safePrices: false,
-		improvesFrom: currentHealthFactor
-	})) || (minSafeHealthFactor === void 0 || factors.safeHealthFactor === void 0 ? null : checkCollateralised({
-		healthFactor: factors.safeHealthFactor,
-		required: minSafeHealthFactor,
-		safePrices: true
-	}));
-}
 //#endregion
-export { checkOperation, collateralIssuesOf };
+export { checkOperation, collateralIssue, marketIssues, quotaCountIssue };

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

@@ -1,7 +1,7 @@
-import { checkCreditManagerPaused, checkDebtInBand, checkMarketExpired, checkQuotaCount } from "../../onchain/validation/checks.js";
+import { checkDebtInBand } from "../../onchain/validation/checks.js";
 import { toToken } from "../../onchain/validation/token.js";
 import "../../onchain/index.js";
-import { collateralIssuesOf } from "./checkOperation.js";
+import { collateralIssue, marketIssues, quotaCountIssue } from "./checkOperation.js";
 //#region src/preview/validate/checkSimulation.ts
 /**
 * Whether a simulated operation clears the caller's own bars.
@@ -26,26 +26,13 @@ import { collateralIssuesOf } from "./checkOperation.js";
 function checkSimulation(input, options = {}) {
 	const { sdk, state, creditManager } = input;
 	const suite = sdk.marketRegister.findCreditManager(creditManager);
-	return checkCreditManagerPaused({
-		isPaused: suite.isPaused,
-		creditManager
-	}) || checkMarketExpired({
-		isExpired: suite.isExpired,
-		creditManager,
-		expirationDate: suite.creditFacade.expirationDate
-	}) || checkDebtInBand({
-		debt: state.accountDebt,
+	return marketIssues(suite) || checkDebtInBand({
+		debt: state.totalDebt.value,
 		minDebt: suite.creditFacade.minDebt,
 		maxDebt: suite.creditFacade.maxDebt,
 		underlying: toToken(sdk, suite.market.pool.underlying),
 		allowZero: true
-	}) || checkQuotaCount({
-		count: Object.values(state.quotas).filter((q) => q.balance > 0n).length,
-		max: suite.creditManager.maxEnabledTokens
-	}) || (state.accountDebt === 0n ? null : collateralIssuesOf({
-		healthFactor: state.healthFactor,
-		safeHealthFactor: state.safeHealthFactor
-	}, options));
+	}) || quotaCountIssue(suite, state) || collateralIssue(state, options);
 }
 //#endregion
 export { checkSimulation };

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

@@ -1,3 +1,3 @@
-import { checkOperation, collateralIssuesOf } from "./checkOperation.js";
+import { checkOperation, collateralIssue, marketIssues, quotaCountIssue } from "./checkOperation.js";
 import { checkSimulation } from "./checkSimulation.js";
-export { checkOperation, checkSimulation, collateralIssuesOf };
+export { checkOperation, checkSimulation, collateralIssue, marketIssues, quotaCountIssue };

package/dist/esm/rewards/rewards/api.js

@@ -2,7 +2,6 @@ import { AddressMap } from "../../onchain/utils/AddressMap.js";
 import { BigIntMath } from "../../onchain/utils/bigint-math.js";
 import { toBigInt } from "../../onchain/utils/formatter.js";
 import "../../onchain/index.js";
-import "../../common-utils/index.js";
 import { MerkleXYZApi } from "./merkl-api.js";
 import { getAddress, isAddress } from "viem";
 //#region src/rewards/rewards/api.ts

package/dist/esm/rewards/rewards/extra-apy.js

@@ -3,7 +3,6 @@ import { chains } from "../../onchain/chain/chains.js";
 import { PERCENTAGE_FACTOR } from "../../onchain/constants/math.js";
 import { toBN } from "../../onchain/utils/formatter.js";
 import "../../onchain/index.js";
-import "../../common-utils/index.js";
 import axios from "axios";
 //#region src/rewards/rewards/extra-apy.ts
 function getKeyForPoolPointsInfo(i) {

package/dist/esm/sdk/execute/ExecuteApi.js

@@ -24,21 +24,24 @@ function poolTx(sdk, request) {
 	const { pool, wallet, sim } = request;
 	const { tokenIn, tokenOut } = sim.preview;
 	if (request.op === "deposit") {
-		const meta = sdk.pools.getDepositMetadata(pool, tokenIn.token, tokenOut.token);
+		const meta = sdk.pools.getDepositMetadata(pool, tokenIn.token.address, tokenOut.token.address);
 		const result = sdk.pools.addLiquidity({
 			pool,
 			wallet,
-			collateral: tokenIn,
+			collateral: {
+				token: tokenIn.token.address,
+				balance: tokenIn.value
+			},
 			meta
 		});
-		if (!result) throw new Error(`pool ${pool} takes no deposit transaction for ${tokenIn.token} (${meta.type})`);
+		if (!result) throw new Error(`pool ${pool} takes no deposit transaction for ${tokenIn.token.address} (${meta.type})`);
 		return result.tx;
 	}
-	const meta = sdk.pools.getWithdrawalMetadata(pool, tokenIn.token, tokenOut.token);
+	const meta = sdk.pools.getWithdrawalMetadata(pool, tokenIn.token.address, tokenOut.token.address);
 	return sdk.pools.removeLiquidity({
 		pool,
 		wallet,
-		amount: request.op === "withdraw" ? tokenOut.balance : tokenIn.balance,
+		amount: request.op === "withdraw" ? tokenOut.value : tokenIn.value,
 		permit: void 0,
 		meta,
 		mode: request.op === "withdraw" ? "withdraw" : "redeem"
@@ -52,7 +55,7 @@ async function openTx(sdk, request) {
 		to: wallet,
 		collateral,
 		ethAmount,
-		debt: preview.debt,
+		debt: preview.totalDebt.value,
 		calls: preview.calls,
 		averageQuota: preview.averageQuota,
 		minQuota: preview.minQuota,

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

@@ -65,7 +65,10 @@ var PrepareApi = class extends MultichainConstruct {
 			tokenOut
 		});
 		const call = pools.addLiquidity({
-			collateral: preview.tokenIn,
+			collateral: {
+				token: preview.tokenIn.token.address,
+				balance: preview.tokenIn.value
+			},
 			pool: pool.pool,
 			wallet: params.wallet,
 			meta: pools.getDepositMetadata(pool.pool, tokenIn, tokenOut)

package/dist/types/history/classifyMulticallOperations.d.ts

@@ -1,6 +1,6 @@
 import { AddressMap } from "../onchain/utils/AddressMap.js";
 import { ParsedCallV2 } from "../onchain/base/types.js";
-import { CallTrace } from "../common-utils/utils/trace.js";
+import { CallTrace } from "../onchain/utils/trace.js";
 import { ChainContractsRegister } from "../onchain/base/ChainContractsRegister.js";
 import "../onchain/index.js";
 import { TokenTransfer } from "../preview/parse/types-adapters.js";

package/dist/types/model/index.d.ts

@@ -15,8 +15,8 @@ import { Notice, NoticeKind, NoticeSubject } from "./notices.js";
 import { noticeKindSchema, noticeSchema } from "./notices.schema.js";
 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 { 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 { AdjustCreditAccountPreview, CloseCreditAccountPreview, DelayedCreditAccountOperationPreview, 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, InstantOperationPreview, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, PoolOperationPreview, PoolOperationType, PreviewOperationInput, PreviewOperationOptions, RepayCreditAccountPreview } from "./previews.js";
+import { AccountProjection, AdjustCreditAccountPreview, CloseCreditAccountPreview, DelayedCreditAccountOperationPreview, 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, InstantOperationPreview, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, PoolOperationPreview, PoolOperationType, PreviewOperationInput, PreviewOperationOptions, RepayCreditAccountPreview } from "./previews.js";
 import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema, underlyingTokenSchema } from "./primitives.schema.js";
 import { ChainFailed, ChainMetadata, ChainScoped, ChainSucceeded, DataResponse, DataSource, ResponseMetadata } from "./response.js";
 import { chainFailedSchema, chainMetadataSchema, chainSucceededSchema, dataSourceSchema, responseMetadataSchema, responseSchema } from "./response.schema.js";
-export { AdjustCreditAccountPreview, Amount, ApyBreakdown, Asset, AssetType, BorrowRateBreakdown, Bps, CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ChainFailed, ChainId, ChainMetadata, ChainScoped, ChainScopedFilter, ChainSucceeded, ChartBundle, ChartDenomination, ChartMetric, ChartQuery, ChartRange, ChartSeries, ChartSeriesOk, ChartSeriesUnavailable, ChartUnavailableCode, ChartUnit, ChartValue, ChartWindow, CloseCreditAccountPreview, CompareTag, CompareTolerance, Curator, CuratorName, DataResponse, DataSource, DelayedAddCollateralIntent, DelayedCloseAccountIntent, DelayedCreditAccountOperationPreview, DelayedDecreaseLeverageIntent, DelayedDepositAndIncreaseLeverageIntent, DelayedDepositIntent, DelayedIncreaseLeverageIntent, DelayedIntent, DelayedReceivedAsset, DelayedWithdrawCollateralIntent, 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, FilterAll, Filterable, GridSampling, InstantOperationPreview, InstantReceivedAsset, Leverage, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, Notice, NoticeKind, NoticeSubject, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, Opportunity, OpportunityBase, OpportunityChartMetric, OpportunityDetail, OpportunityFilter, OpportunityId, OpportunityKey, OpportunityKind, OpportunityTotals, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PnlBreakdown, PointRewards, PointsProgram, PointsProgramPnL, PointsRewardsPnL, PoolOperationPreview, PoolOperationType, PoolOpportunity, PoolOpportunityChartMetric, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PoolPosition, PoolPositionChartMetric, PoolPositionKey, PoolPositionRef, Position, PositionChartMetric, PositionCollateral, PositionFilter, PositionId, PositionKey, PositionKind, PositionTransaction, PositionTransactionKind, PositionsTotals, PreviewOperationInput, PreviewOperationOptions, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, ReceivedAsset, RepayCreditAccountPreview, ResponseMetadata, Rewards, RewardsPnL, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, STRATEGY_POSITION_COLLATERAL_ERROR, StrategyOpportunity, StrategyOpportunityChartMetric, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, StrategyPosition, StrategyPositionChartMetric, StrategyPositionKey, StrategyPositionRef, Timestamp, Token, TokenAmount, TokenQuotaRate, TokenRewards, TokenRewardsPnL, ToleranceCompareTag, TxCall, UnderlyingToken, 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 { AccountProjection, AdjustCreditAccountPreview, Amount, ApyBreakdown, Asset, AssetType, BorrowRateBreakdown, Bps, CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ChainFailed, ChainId, ChainMetadata, ChainScoped, ChainScopedFilter, ChainSucceeded, ChartBundle, ChartDenomination, ChartMetric, ChartQuery, ChartRange, ChartSeries, ChartSeriesOk, ChartSeriesUnavailable, ChartUnavailableCode, ChartUnit, ChartValue, ChartWindow, CloseCreditAccountPreview, CompareTag, CompareTolerance, Curator, CuratorName, DataResponse, DataSource, DelayedAddCollateralIntent, DelayedCloseAccountIntent, DelayedCreditAccountOperationPreview, DelayedDecreaseLeverageIntent, DelayedDepositAndIncreaseLeverageIntent, DelayedDepositIntent, DelayedIncreaseLeverageIntent, DelayedIntent, DelayedReceivedAsset, DelayedWithdrawCollateralIntent, 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, FilterAll, Filterable, GridSampling, InstantOperationPreview, InstantReceivedAsset, Leverage, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, Notice, NoticeKind, NoticeSubject, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, Opportunity, OpportunityBase, OpportunityChartMetric, OpportunityDetail, OpportunityFilter, OpportunityId, OpportunityKey, OpportunityKind, OpportunityTotals, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PnlBreakdown, PointRewards, PointsProgram, PointsProgramPnL, PointsRewardsPnL, PoolOperationPreview, PoolOperationType, PoolOpportunity, PoolOpportunityChartMetric, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PoolPosition, PoolPositionChartMetric, PoolPositionKey, PoolPositionRef, Position, PositionChartMetric, PositionCollateral, PositionFilter, PositionId, PositionKey, PositionKind, PositionTransaction, PositionTransactionKind, PositionsTotals, PreviewOperationInput, PreviewOperationOptions, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, ReceivedAsset, RepayCreditAccountPreview, ResponseMetadata, Rewards, RewardsPnL, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, STRATEGY_POSITION_COLLATERAL_ERROR, StrategyOpportunity, StrategyOpportunityChartMetric, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, StrategyPosition, StrategyPositionChartMetric, StrategyPositionKey, StrategyPositionRef, Timestamp, Token, TokenAmount, TokenQuotaRate, TokenRewards, TokenRewardsPnL, ToleranceCompareTag, TxCall, UnderlyingToken, 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 };

package/dist/types/model/previews.d.ts

@@ -137,8 +137,16 @@ interface PoolOperationPreview {
    */
   error?: OperationPreviewError;
 }
-interface OpenCreditAccountPreview {
-  operation: "OpenCreditAccount" | "RWAOpenCreditAccount";
+/**
+ * A credit account as an operation leaves it, answered by both halves of the
+ * SDK: `prepare`, which walks a request forward into the calls that realise it,
+ * and `preview`, which decodes calls that already exist and replays them back.
+ *
+ * `totalDebt`, `totalValue`, `leverage` and `healthFactor` mean here exactly
+ * what they mean on a {@link StrategyPosition}, down to the token an amount
+ * names — an RWA market reports USDC, not the dcUSDC wrapper the pool holds.
+ **/
+interface AccountProjection {
   /**
    * Health factor in basis points: below `10000` the account is liquidatable.
    *
@@ -150,12 +158,14 @@ interface OpenCreditAccountPreview {
    * token's main and reserve oracle feeds, which is what the credit manager
    * switches to for a call that hands funds over.
    *
-   * Always reported, so a caller that needs the stricter reading does not have
-   * to recompute it; whether to hold the account to it is the caller's call.
+   * Absent only where the walk had no reason to weigh it: the intents engine
+   * computes it for an operation that hands funds over, which is the one the
+   * credit manager holds to safe prices on-chain. Both preview builders and
+   * `openNewStrategy` always report it.
    *
    * @example `11800` where `healthFactor` is `12500`
    **/
-  safeHealthFactor: Bps;
+  safeHealthFactor?: Bps;
   /**
    * Cost of the debt, broken down by source.
    **/
@@ -177,6 +187,29 @@ interface OpenCreditAccountPreview {
    * unleveraged; `0` if underwater.
    **/
   leverage: Leverage;
+  /**
+   * Everything the account holds, denominated in the market's underlying.
+   **/
+  totalValue: TokenAmount;
+  /**
+   * What it would take to settle the loan: principal plus accrued interest and
+   * fees, in the market's underlying.
+   **/
+  totalDebt: TokenAmount;
+  /**
+   * What the account holds, token by token.
+   **/
+  assets: TokenAmount[];
+  /**
+   * Quota bought for each collateral, denominated in the market's underlying
+   * rather than in the collateral token — the same convention as
+   * {@link PositionCollateral.quota}. A token the account leaves unquoted is
+   * absent rather than present at zero.
+   **/
+  quotas: TokenAmount[];
+}
+interface OpenCreditAccountPreview extends AccountProjection {
+  operation: "OpenCreditAccount" | "RWAOpenCreditAccount";
   /**
    * Credit manager the account is opened in
    */
@@ -186,10 +219,10 @@ interface OpenCreditAccountPreview {
    */
   name: string;
   /**
-   * Target token of strategy: the first quoted token, with its balance taken
-   * from `assets`. Undefined when nothing is quoted.
+   * Collateral token this position is a strategy in: the first quoted token,
+   * with its balance taken from `assets`. Undefined when nothing is quoted.
    */
-  target?: TokenAmount;
+  targetCollateral?: TokenAmount;
   /**
    * Tokens that were added as collateral during account opening.
    *
@@ -197,81 +230,21 @@ interface OpenCreditAccountPreview {
    * `NATIVE_ADDRESS` entry, with the wrapped native token amount reduced
    * accordingly (omitted entirely when it reaches zero).
    */
-  collateral: TokenAmount[];
-  /**
-   * Sum of collateral tokens in underlying
-   */
-  collateralValue: bigint;
-  /**
-   * Total account value after opening: collateral plus borrowed amount, in
-   * underlying.
-   */
-  totalValue: bigint;
-  /**
-   * Borrowed amount in underlying
-   */
-  debt: bigint;
-  /**
-   * WARNING: unlike every other `TokenAmount` in this model, `value` is
-   * denominated in the market underlying, NOT in `token`. `token` only
-   * identifies which collateral the quota applies to; `valueUsd` prices the
-   * underlying amount.
-   *
-   * Desired quotas
-   */
-  quotas: TokenAmount[];
+  collateralAdded: TokenAmount[];
   /**
-   * Minimum amount of assets on credit account after it's opened,
-   * as estimated by router
+   * Own funds in the position: what the wallet put in, valued in underlying.
+   * `totalValue` is this plus the borrowed amount.
    */
-  assets: TokenAmount[];
+  netValue: TokenAmount;
   /**
    * Set when preview encountered non-fatal errors, all fields are
-   * still computed best-effort, but derived fields (`assets`, `target`,
-   * `collateralValue`) may be unreliable in that case.
+   * still computed best-effort, but derived fields (`assets`,
+   * `targetCollateral`, `netValue`) may be unreliable in that case.
    */
   error?: OperationPreviewError;
 }
-interface AdjustCreditAccountPreview {
+interface AdjustCreditAccountPreview extends AccountProjection {
   operation: "AdjustCreditAccount";
-  /**
-   * Health factor in basis points: below `10000` the account is liquidatable.
-   *
-   * @example `12500` for a health factor of 1.25
-   **/
-  healthFactor: Bps;
-  /**
-   * The same factor with collateral valued at safe prices — the lower of each
-   * token's main and reserve oracle feeds, which is what the credit manager
-   * switches to for a call that hands funds over.
-   *
-   * Always reported, so a caller that needs the stricter reading does not have
-   * to recompute it; whether to hold the account to it is the caller's call.
-   *
-   * @example `11800` where `healthFactor` is `12500`
-   **/
-  safeHealthFactor: Bps;
-  /**
-   * Cost of the debt, broken down by source.
-   **/
-  borrowRate: BorrowRateBreakdown;
-  /**
-   * Estimated milliseconds until the health factor decays to `10000` under
-   * the current borrow rate, or `null` when the debt carries no rate (or the
-   * account is already liquidatable).
-   **/
-  timeToLiquidation: bigint | null;
-  /**
-   * Price of the single non-underlying collateral at which the account
-   * becomes liquidatable, in the oracle's 8-decimal fixed point, or `null`
-   * when the account holds zero or several non-underlying assets.
-   **/
-  liquidationPrice: bigint | null;
-  /**
-   * Total-value leverage: `totalValue / (totalValue − totalDebt)`. `1` =
-   * unleveraged; `0` if underwater.
-   **/
-  leverage: Leverage;
   /**
    * Credit manager the account is opened in
    */
@@ -296,45 +269,18 @@ interface AdjustCreditAccountPreview {
    * Tokens that were withdrawn as collateral during account adjustment.
    */
   collateralWithdrawn: TokenAmount[];
-  /**
-   * Sum of collateral tokens in underlying
-   */
-  totalValue: bigint;
-  /**
-   * What the account owes in underlying once the operation lands: principal
-   * plus accrued interest and fees, which is the amount it would take to
-   * settle the loan — the same quantity `prepare` projects as `accountDebt`.
-   */
-  debt: bigint;
   /**
    * Debt after minus debt before. A repayment settles interest and fees
    * before principal, so this is the payment itself rather than the part of
    * it the principal happened to absorb.
    */
-  debtChange: bigint;
+  totalDebtChange: TokenAmount;
   /**
-   * WARNING: unlike every other `TokenAmount` in this model, `value` is
-   * denominated in the market underlying, NOT in `token`. `token` only
-   * identifies which collateral the quota applies to; `valueUsd` prices the
-   * underlying amount.
-   *
-   * Desired quotas
-   */
-  quotas: TokenAmount[];
-  /**
-   * WARNING: unlike every other `TokenAmount` in this model, `value` is
-   * denominated in the market underlying, NOT in `token`. `token` only
-   * identifies which collateral the quota applies to; `valueUsd` prices the
-   * underlying amount.
-   *
-   * Quotas after minus quotas before
+   * Quotas after minus quotas before. Denominated in the market's underlying
+   * like {@link AccountProjection.quotas}, so `token` names the collateral the
+   * quota applies to rather than the amount's own unit.
    */
   quotasChange: TokenAmount[];
-  /**
-   * Minimum amount of assets on credit account after the operation,
-   * as estimated by router
-   */
-  assets: TokenAmount[];
   /**
    * Assets after minus assets before
    */
@@ -425,9 +371,13 @@ interface RepayCreditAccountPreview {
    */
   collateralWithdrawn: TokenAmount[];
   /**
-   * Total debt repaid: principal + accrued interest + fees, in underlying
+   * Total debt repaid: principal + accrued interest + fees, in underlying.
+   *
+   * The same quantity an {@link AdjustCreditAccountPreview} reports as
+   * `totalDebtChange`, with the sign a repayment screen reads: positive for
+   * what the wallet parted with.
    */
-  debtRepaid: bigint;
+  debtRepaid: TokenAmount;
   /**
    * Intent of the delayed withdrawal this transaction claims; set when the
    * multicall claims a delayed withdrawal
@@ -490,4 +440,4 @@ interface DelayedCreditAccountOperationPreview {
  */
 type OperationPreview = PoolOperationPreview | OpenCreditAccountPreview | AdjustCreditAccountPreview | CloseCreditAccountPreview | RepayCreditAccountPreview | DelayedCreditAccountOperationPreview;
 //#endregion
-export { AdjustCreditAccountPreview, CloseCreditAccountPreview, DelayedCreditAccountOperationPreview, 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, InstantOperationPreview, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, PoolOperationPreview, PoolOperationType, PreviewOperationInput, PreviewOperationOptions, RepayCreditAccountPreview };
+export { AccountProjection, AdjustCreditAccountPreview, CloseCreditAccountPreview, DelayedCreditAccountOperationPreview, 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, InstantOperationPreview, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, PoolOperationPreview, PoolOperationType, PreviewOperationInput, PreviewOperationOptions, RepayCreditAccountPreview };

package/dist/types/onchain/accounts/index.d.ts

@@ -22,6 +22,7 @@ import "./bots/index.js";
 import { CreditAccountsServiceV310 } from "./CreditAccountsServiceV310.js";
 import { borrowable } from "./intents/guards.js";
 import { LeverageBand } from "./intents/leverage-band.js";
+import { CalcDefaultQuotaProps, CalcQuotaUpdateProps, CalcRecommendedQuotaProps, calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, roundUpQuota } from "./quota-utils.js";
 import { AccountCalculatorOperation } from "./intents/operations.js";
 import { AddCollateralIntent, AdjustLeverageIntent, CreditAccountSlice, DelayableIntent, DelayedRoute, DelayedStart, DelayedStartResult, DepositStrategyIntent, FinishIntentProps, InstantRoute, IntentPreviewResult, IntentRoutesResult, OperationState, PathLossRate, RepayStrategyIntent, ResumableIntent, RouteRefusals, StartIntent, WithdrawAssetIntent, WithdrawStrategyIntent } from "./intents/types.js";
 import { OpenStrategyPreview, OpenStrategyProps } from "./intents/open-strategy.js";
@@ -32,4 +33,4 @@ import { BuildLiquidationTxProps, BuildLiquidationTxPropsBase, GetLiquidatableAc
 import { LiquidationsService } from "./liquidations/LiquidationsService.js";
 import { MultichainLiquidationsService } from "./liquidations/MultichainLiquidationsService.js";
 import "./liquidations/index.js";
-export { AbstractWithdrawalCompressorContract, AccountBotsService, type AccountCalculatorOperation, AccountToCheck, type AddCollateralIntent, type AdjustLeverageIntent, AssembleCaOperationsProps, AssembleClaimDelayedCallsProps, AssembleCloseCreditAccountCallsProps, AssembleRepayCreditAccountCallsProps, AssembleStartDelayedWithdrawalCallsProps, BotStatusCall, BotsDirectResponse, BuildLiquidationTxProps, BuildLiquidationTxPropsBase, CMSlice, ClaimFarmRewardsProps, ClaimableWithdrawal, CloseCreditAccountResult, ConnectedBotsCall, ConnectedBotsPerAccount, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountDataCall, CreditAccountFilter, CreditAccountOperationResult, CreditAccountOperationsService, CreditAccountReadOptions, type CreditAccountSlice, CreditAccountsCall, CreditAccountsQuery, CreditAccountsReadOptions, CreditAccountsServiceV310, CreditAccountsTarget, CreditManagerFilter, CreditManagerOperationResult, CurrentWithdrawals, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, type DelayableIntent, DelayedIntentExtended, type DelayedRoute, type DelayedStart, type DelayedStartResult, type DepositStrategyIntent, EncodableCreditAccountOperation, type FinishIntentProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResponse, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsArgs, GetCreditAccountsOptions, GetExternalAccountCurrentWithdrawalsProps, GetLiquidatableAccountsProps, GetLiquidationDetailsProps, GetLiquidationDetailsPropsBase, GetLiquidationPositionsProps, GetLiquidationPositionsPropsBase, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, GetWithdrawalRequestResultProps, ICreditAccountsService, IRedemptionLoggerContract, IWithdrawalCompressorContract, type InstantRoute, type IntentPreviewResult, type IntentRoutesResult, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, type LeverageBand, LiquidationsService, LoadRWALiquidatorsProps, MulticallWithFailure, MultichainLiquidationsService, OnchainLiquidationCall, OnchainLiquidationData, OnchainLiquidationOutput, OnchainRequestableWithdrawal, OpenCAProps, type OpenStrategyPreview, OpenStrategyPreviewResult, type OpenStrategyProps, type OperationState, PartiallyLiquidateProps, type PathLossRate, PendingWithdrawal, PeripheryCompressorV310Contract, PreviewDelayedWithdrawalProps, RWALiquidatorInfo, RedemptionLog, RedemptionLoggerV310Contract, type RepayStrategyIntent, RequestableWithdrawal, type ResumableIntent, Rewards, type RouteRefusals, SetBotProps, SetBotResult, type StartIntent, type WithdrawAssetIntent, type WithdrawStrategyIntent, WithdrawableAsset, WithdrawalCompressorLocation, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, WithdrawalCompressorVersion, WithdrawalOutput, WithdrawalStatus, WithdrawalsState, borrowable, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };
+export { AbstractWithdrawalCompressorContract, AccountBotsService, type AccountCalculatorOperation, AccountToCheck, type AddCollateralIntent, type AdjustLeverageIntent, AssembleCaOperationsProps, AssembleClaimDelayedCallsProps, AssembleCloseCreditAccountCallsProps, AssembleRepayCreditAccountCallsProps, AssembleStartDelayedWithdrawalCallsProps, BotStatusCall, BotsDirectResponse, BuildLiquidationTxProps, BuildLiquidationTxPropsBase, CMSlice, CalcDefaultQuotaProps, CalcQuotaUpdateProps, CalcRecommendedQuotaProps, ClaimFarmRewardsProps, ClaimableWithdrawal, CloseCreditAccountResult, ConnectedBotsCall, ConnectedBotsPerAccount, CreditAccountCompressor, CreditAccountCompressorV310Contract, CreditAccountDataCall, CreditAccountFilter, CreditAccountOperationResult, CreditAccountOperationsService, CreditAccountReadOptions, type CreditAccountSlice, CreditAccountsCall, CreditAccountsQuery, CreditAccountsReadOptions, CreditAccountsServiceV310, CreditAccountsTarget, CreditManagerFilter, CreditManagerOperationResult, CurrentWithdrawals, DELAYED_INTENT_TYPES, DELAYED_INTENT_VERSION, type DelayableIntent, DelayedIntentExtended, type DelayedRoute, type DelayedStart, type DelayedStartResult, type DepositStrategyIntent, EncodableCreditAccountOperation, type FinishIntentProps, FullyLiquidateProps, FullyLiquidateResult, GetApprovalAddressProps, GetConnectedBotsResponse, GetConnectedBotsResult, GetConnectedMigrationBotsResult, GetCreditAccountsArgs, GetCreditAccountsOptions, GetExternalAccountCurrentWithdrawalsProps, GetLiquidatableAccountsProps, GetLiquidationDetailsProps, GetLiquidationDetailsPropsBase, GetLiquidationPositionsProps, GetLiquidationPositionsPropsBase, GetPendingWithdrawalsProps, GetPendingWithdrawalsResult, GetWithdrawalRequestResultProps, ICreditAccountsService, IRedemptionLoggerContract, IWithdrawalCompressorContract, type InstantRoute, type IntentPreviewResult, type IntentRoutesResult, InvalidDelayedIntentError, LIQUIDATION_APPROVAL_BUFFER, LIQUIDATION_COMPRESSOR_V313_ADDRESS, type LeverageBand, LiquidationsService, LoadRWALiquidatorsProps, MulticallWithFailure, MultichainLiquidationsService, OnchainLiquidationCall, OnchainLiquidationData, OnchainLiquidationOutput, OnchainRequestableWithdrawal, OpenCAProps, type OpenStrategyPreview, OpenStrategyPreviewResult, type OpenStrategyProps, type OperationState, PartiallyLiquidateProps, type PathLossRate, PendingWithdrawal, PeripheryCompressorV310Contract, PreviewDelayedWithdrawalProps, RWALiquidatorInfo, RedemptionLog, RedemptionLoggerV310Contract, type RepayStrategyIntent, RequestableWithdrawal, type ResumableIntent, Rewards, type RouteRefusals, SetBotProps, SetBotResult, type StartIntent, type WithdrawAssetIntent, type WithdrawStrategyIntent, WithdrawableAsset, WithdrawalCompressorLocation, WithdrawalCompressorV310Contract, WithdrawalCompressorV311Contract, WithdrawalCompressorV313Contract, WithdrawalCompressorVersion, WithdrawalOutput, WithdrawalStatus, WithdrawalsState, borrowable, calcDefaultQuota, calcQuotaUpdate, calcRecommendedQuota, createRedemptionLogger, createWithdrawalCompressor, decodeDelayedIntent, encodeDelayedIntent, fetchCreditAccountSlice, getWithdrawalCompressorAddress, iCreditAccountAbi, roundUpQuota, toClaimableWithdrawal, toCreditAccountSlice, toPendingWithdrawal, toRequestableWithdrawal, toWithdrawalStatus };

package/dist/types/onchain/accounts/intents/open-strategy.d.ts

@@ -1,5 +1,5 @@
 import { Bps, TokenAmount } from "../../../model/primitives.js";
-import { BorrowRateBreakdown } from "../../../model/positions.js";
+import { AccountProjection } from "../../../model/previews.js";
 import "../../../model/index.js";
 import { Asset } from "../../base/types.js";
 import { MultiCall } from "../../types/transactions.js";
@@ -32,42 +32,28 @@ interface OpenStrategyProps {
  * hands back expected and floor balances from a single call, and `openCA` wants
  * both `minQuota` and `averageQuota`, so there is nothing to gain by dropping one.
  */
-interface OpenStrategyPreview {
+interface OpenStrategyPreview extends Omit<AccountProjection, "assets" | "quotas"> {
   /**
-   * Health factor in basis points: below `10000` the account is liquidatable.
-   *
-   * @example `12500` for a health factor of 1.25
-   **/
-  healthFactor: Bps;
-  /**
-   * Cost of the debt, broken down by source.
-   **/
-  borrowRate: BorrowRateBreakdown;
-  /**
-   * Estimated milliseconds until the health factor decays to `10000` under
-   * the current borrow rate, or `null` when the debt carries no rate (or the
-   * account is already liquidatable).
+   * The same factor with collateral valued at safe prices, which is what the
+   * credit manager weighs an opening at on-chain. Always reported here: an
+   * opening always hands the pool's funds over.
    **/
-  timeToLiquidation: bigint | null;
-  /**
-   * Price of the single non-underlying collateral at which the account
-   * becomes liquidatable, in the oracle's 8-decimal fixed point, or `null`
-   * when the account holds zero or several non-underlying assets.
-   **/
-  liquidationPrice: bigint | null;
-  /** Debt drawn, in underlying. */
-  debt: bigint;
-  /** Collateral supplied, valued in underlying. */
-  collateral: bigint;
-  /** Position size — collateral plus debt, in underlying. */
-  totalValue: bigint;
+  safeHealthFactor: Bps;
+  /** Own funds put in, valued in underlying. */
+  netValue: TokenAmount;
   /** What the routed leg lost to market depth; `undefined` if not measured. */
   priceImpact: PathLossRate | undefined;
   /** Expected post-open balances. */
   averageAssets: TokenAmount[];
   /** Floor post-open balances after slippage. */
   minAssets: TokenAmount[];
-  /** Quotas to buy against `averageAssets`; feeds `openCA.averageQuota`. */
+  /**
+   * Quotas to buy against `averageAssets`; feeds `openCA.averageQuota`.
+   *
+   * Bare pairs rather than priced amounts, like `calls` below: these three are
+   * transport for the transaction, handed to `openCA` untouched, and are the
+   * only fields here a caller is not meant to display.
+   **/
   averageQuota: Asset[];
   /** Quotas to buy against `minAssets`; feeds `openCA.minQuota`. */
   minQuota: Asset[];

package/dist/types/onchain/accounts/intents/operations.d.ts

@@ -3,7 +3,7 @@ import { Asset } from "../../base/types.js";
 import { MultiCall } from "../../types/transactions.js";
 import { OnchainSDK } from "../../OnchainSDK.js";
 import { EncodableCreditAccountOperation } from "../types.js";
-import { calcQuotaUpdate } from "../../../common-utils/utils/creditAccount/quota-utils.js";
+import { calcQuotaUpdate } from "../quota-utils.js";
 import { CreditAccountSlice } from "./types.js";
 import "../../index.js";
 import { Address } from "viem";