@gearbox-protocol/sdk 15.1.0-next.9 → 16.0.0-next.2

package/dist/esm/offchain/GearboxAPI.js

@@ -1,3 +1,5 @@
+import { OffchainNotices } from "./notices/OffchainNotices.js";
+import "./notices/index.js";
 import { OffchainOpportunities } from "./opportunities/OffchainOpportunities.js";
 import "./opportunities/index.js";
 import { OffchainPositions } from "./positions/OffchainPositions.js";
@@ -33,10 +35,15 @@ var GearboxAPI = class {
 	* Namespace for the positions a wallet holds.
 	**/
 	positions;
+	/**
+	* Namespace for the notices the backend attaches to entities.
+	**/
+	notices;
 	constructor(options) {
 		this.chainIds = [...options.chainIds];
 		this.opportunities = new OffchainOpportunities(options);
 		this.positions = new OffchainPositions(options);
+		this.notices = new OffchainNotices(options);
 	}
 };
 //#endregion

package/dist/esm/offchain/index.js

@@ -10,10 +10,12 @@ import { OffchainValidationError } from "./errors/OffchainValidationError.js";
 import { readResponseBody } from "./errors/readResponseBody.js";
 import "./errors/index.js";
 import { AbstractOffchainNamespace } from "./AbstractOffchainNamespace.js";
+import { OffchainNotices } from "./notices/OffchainNotices.js";
+import "./notices/index.js";
 import { OffchainOpportunities } from "./opportunities/OffchainOpportunities.js";
 import "./opportunities/index.js";
 import { OffchainPositions } from "./positions/OffchainPositions.js";
 import "./positions/index.js";
 import { GearboxAPI } from "./GearboxAPI.js";
 import "./types.js";
-export { AbstractOffchainNamespace, GearboxAPI, OffchainInvalidJsonError, OffchainNotConfiguredError, OffchainNotImplementedError, OffchainOpportunities, OffchainPositions, OffchainRequestFailedError, OffchainStatusError, OffchainTransportError, OffchainValidationError, backendMessage, errorCause, readResponseBody };
+export { AbstractOffchainNamespace, GearboxAPI, OffchainInvalidJsonError, OffchainNotConfiguredError, OffchainNotImplementedError, OffchainNotices, OffchainOpportunities, OffchainPositions, OffchainRequestFailedError, OffchainStatusError, OffchainTransportError, OffchainValidationError, backendMessage, errorCause, readResponseBody };

package/dist/esm/offchain/notices/OffchainNotices.js

@@ -0,0 +1,26 @@
+import { noticeSchema } from "../../model/notices.schema.js";
+import { AbstractOffchainNamespace } from "../AbstractOffchainNamespace.js";
+import { z } from "zod/v4";
+//#region src/offchain/notices/OffchainNotices.ts
+/**
+* Backend counterpart of `sdk.notices`: banners the backend asks a consumer to
+* show for one entity, see {@link Notice}.
+**/
+var OffchainNotices = class extends AbstractOffchainNamespace {
+	#root = "/v2/notices";
+	constructor(options) {
+		super("OffchainNotices", options);
+	}
+	/**
+	* The notices of one pool opportunity or one strategy position.
+	**/
+	async list(subject) {
+		const [kind, address] = subject.kind === "pool" ? ["pool", subject.pool] : ["strategy", subject.creditAccount];
+		return this.get({
+			path: `${this.#root}/${kind}/${subject.chainId}/${address}`,
+			schema: z.array(noticeSchema)
+		});
+	}
+};
+//#endregion
+export { OffchainNotices };

package/dist/esm/offchain/notices/index.js

@@ -0,0 +1,2 @@
+import { OffchainNotices } from "./OffchainNotices.js";
+export { OffchainNotices };

package/dist/esm/offchain/opportunities/OffchainOpportunities.js

@@ -52,7 +52,7 @@ var OffchainOpportunities = class extends AbstractOffchainNamespace {
 		return `${this.#root}/pools/${key.chainId}/${key.pool}`;
 	}
 	#strategyPath(key) {
-		return `${this.#root}/strategies/${key.chainId}/${key.creditManager}/${key.targetCollateral}`;
+		return `${this.#root}/strategies/${key.chainId}/${key.creditManager}`;
 	}
 	#chartRoot(key) {
 		return key.kind === "pool" ? this.#poolPath(key) : this.#strategyPath(key);

package/dist/esm/offchain/positions/OffchainPositions.js

@@ -1,6 +1,4 @@
 import { positionFilterQuerySchema, positionSchema } from "../../model/positions.schema.js";
-import { OffchainNotImplementedError } from "../errors/OffchainNotImplementedError.js";
-import "../errors/index.js";
 import { AbstractOffchainNamespace } from "../AbstractOffchainNamespace.js";
 import { z } from "zod/v4";
 //#region src/offchain/positions/OffchainPositions.ts
@@ -27,13 +25,18 @@ var OffchainPositions = class extends AbstractOffchainNamespace {
 	}
 	/**
 	* Charts of one position: one series per metric, on a shared grid.
-	*
-	* @throws {OffchainNotImplementedError} Until the backend serves it. An empty
-	* bundle would be the one answer this model exists to rule out: a chart that
-	* could not be read is not a chart with no points.
 	**/
-	async getCharts(key, _metrics, _range) {
-		throw new OffchainNotImplementedError(`${this.#root}/${key.chainId}/charts`);
+	async getCharts(key, metrics, range) {
+		return this.readCharts(`${this.#chartRoot(key)}/charts`, metrics, range);
+	}
+	#poolPath(key) {
+		return `${this.#root}/pool/${key.chainId}/${key.pool}/${key.wallet}`;
+	}
+	#strategyPath(key) {
+		return `${this.#root}/strategy/${key.chainId}/${key.creditAccount}`;
+	}
+	#chartRoot(key) {
+		return key.kind === "pool" ? this.#poolPath(key) : this.#strategyPath(key);
 	}
 };
 //#endregion

package/dist/esm/permissionless/bindings/factory/credit-factory.js

@@ -1,6 +1,6 @@
-import { adapterConstructorAbi } from "../../../plugins/adapters/abi/conctructorAbi.js";
-import { parseAdapterAction, parseAdapterDeployParams } from "../../../plugins/adapters/abi/utils.js";
-import "../../../plugins/adapters/index.js";
+import { adapterConstructorAbi } from "../../../sdk/market/adapters/abi/conctructorAbi.js";
+import { parseAdapterAction, parseAdapterDeployParams } from "../../../sdk/market/adapters/abi/utils.js";
+import "../../../sdk/index.js";
 import { iCreditConfigureActionsAbi } from "../../../abi/310/configure/iCreditConfigureActions.js";
 import { AbstractFactory } from "./abstract-factory.js";
 import { decodeFunctionData, hexToString } from "viem";

package/dist/esm/plugins/accounts-counter/AccountsCounterPlugin.js

@@ -1,8 +1,8 @@
 import { AddressMap } from "../../sdk/utils/AddressMap.js";
-import { TypedObjectUtils } from "../../sdk/utils/mappers.js";
 import { AP_CREDIT_ACCOUNT_COMPRESSOR } from "../../sdk/constants/address-provider.js";
 import { ADDRESS_0X0 } from "../../sdk/constants/addresses.js";
 import { MAX_UINT256 } from "../../sdk/constants/math.js";
+import { TypedObjectUtils } from "../../sdk/utils/mappers.js";
 import { VERSION_RANGE_310 } from "../../sdk/constants/versions.js";
 import { creditAccountCompressorAbi } from "../../abi/compressors/creditAccountCompressor.js";
 import { BasePlugin } from "../../sdk/plugins/BasePlugin.js";

package/dist/esm/preview/index.js

@@ -18,7 +18,6 @@ import { BalancePrerequisite } from "./prerequisites/BalancePrerequisite.js";
 import { RWAOpenRequirementsPrerequisite } from "./prerequisites/RWAOpenRequirementsPrerequisite.js";
 import { checkPrerequisites } from "./prerequisites/checkPrerequisites.js";
 import "./prerequisites/index.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_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN } from "./preview/types.js";
 import { buildDelayedPreview } from "./preview/buildDelayedPreview.js";
 import { CreditAccountState } from "./preview/CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./preview/detectCloseOrRepay.js";
@@ -32,4 +31,4 @@ import { previewCloseOrRepayCreditAccount } from "./preview/previewCloseOrRepayC
 import { previewOperation } from "./preview/previewOperation.js";
 import "./preview/index.js";
 import "./types.js";
-export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedPreview, checkPrerequisites, classifyCloseOrRepay, classifyInnerOperations, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedPreview, checkPrerequisites, classifyCloseOrRepay, classifyInnerOperations, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/esm/preview/parse/classifyInnerOperations.js

@@ -1,5 +1,5 @@
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import "../../plugins/adapters/index.js";
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
+import "../../sdk/index.js";
 //#region src/preview/parse/classifyInnerOperations.ts
 /**
 * Maps each inner multicall entry to an {@link InnerOperation}:

package/dist/esm/preview/parse/parseRWAFactoryOperationCalldata.js

@@ -1,10 +1,9 @@
 import { hexEq } from "../../sdk/utils/hex.js";
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
 import { CreditFacadeV310Contract } from "../../sdk/market/credit/CreditFacadeV310Contract.js";
 import { RWA_FACTORY_SECURITIZE } from "../../sdk/market/rwa/securitize/constants.js";
 import { isRWAFactory } from "../../sdk/market/rwa/types.js";
 import "../../sdk/index.js";
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import "../../plugins/adapters/index.js";
 import { classifyInnerOperations } from "./classifyInnerOperations.js";
 //#region src/preview/parse/parseRWAFactoryOperationCalldata.ts
 /**

package/dist/esm/preview/preview/buildDelayedPreview.js

@@ -1,9 +1,11 @@
 import { AssetsMap } from "../../sdk/utils/AssetsMap.js";
 import { BigIntMath } from "../../sdk/utils/bigint-math.js";
 import { DUST_THRESHOLD } from "../../sdk/constants/math.js";
+import { calcPositionLeverage } from "../../sdk/market/math.js";
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
 import "../../common-utils/index.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { isAddressEqual } from "viem";
 //#region src/preview/preview/buildDelayedPreview.ts
 /**
@@ -35,7 +37,7 @@ function buildDelayedPreview(afterInstant, before, detected, convert, receivedTo
 	const claimed = applyClaim(post, request);
 	const collateralWithdrawn = new AssetsMap();
 	switch (intent?.type) {
-		case "CLOSE_ACCOUNT": return buildClosePreview(post, converter, receivedToken);
+		case "CLOSE_ACCOUNT": return buildClosePreview(post, converter, receivedToken, sdk);
 		case "DECREASE_LEVERAGE":
 			repayFromClaim(post, request.claimToken, converter.convert, claimed);
 			break;
@@ -159,17 +161,16 @@ function totalValueInUnderlying(post, convert, dust) {
 * underlying, the debt is repaid in full and the remainder is withdrawn to
 * the user as `receivedToken`.
 */
-function buildClosePreview(post, converter, receivedToken) {
+function buildClosePreview(post, converter, receivedToken, sdk) {
 	const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
+	const oracle = sdk.marketRegister.findByCreditManager(post.creditManager).priceOracle;
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
 		creditManager: post.creditManager,
+		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
 		creditAccount: post.creditAccount,
-		receivedAmount: {
-			token: receivedToken,
-			balance: BigIntMath.max(totalValue - post.totalDebt, 0n)
-		},
+		receivedAmount: oracle.toTokenAmount(receivedToken, BigIntMath.max(totalValue - post.totalDebt, 0n)),
 		error: converter.error
 	};
 }
@@ -178,25 +179,34 @@ function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 	const assets = post.balances.toAssets(DUST_THRESHOLD);
 	const quotas = post.quotas.toAssets(0n);
 	const snap = post.toSnapshot(totalValue);
+	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const oracle = market.priceOracle;
 	return {
 		operation: "AdjustCreditAccount",
 		creditManager: post.creditManager,
+		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
 		creditAccount: post.creditAccount,
 		collateralAdded: [],
-		collateralWithdrawn: collateralWithdrawn.toAssets(),
+		collateralWithdrawn: collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalValue,
-		debt: post.debt,
-		debtChange: post.debt - before.debt,
-		quotas,
-		quotasChange: post.quotas.difference(before.quotas).toAssets(),
-		assets,
-		assetsChange: post.balances.difference(before.balances).toAssets(DUST_THRESHOLD),
+		debt: post.totalDebt,
+		debtChange: 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),
-		overallApy: 0,
-		borrowRate: sdk.positions.borrowRate(snap),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snap),
-		liquidationPrice: sdk.positions.liquidationPrice(snap)
+		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)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/detectDelayedClaim.js

@@ -1,10 +1,10 @@
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import "../../plugins/adapters/index.js";
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
+import "../../sdk/index.js";
 //#region src/preview/preview/detectDelayedClaim.ts
 /**
 * Scans a credit-facade multicall for a delayed-withdrawal claim call.
 *
-* @param sdk - SDK with the adapters plugin attached.
+* @param sdk - Attached SDK.
 * @param multicall - Parsed inner operations of the multicall.
 * @returns The detected claim, or `undefined` when the multicall contains no
 * delayed-withdrawal claim call.
@@ -26,7 +26,7 @@ function detectDelayedClaim(sdk, multicall) {
 * the claim call and reads the recorded intent of the claimed redeemer from
 * the `RedemptionLogger` contract.
 *
-* @param sdk - SDK with the adapters plugin attached.
+* @param sdk - Attached SDK.
 * @param multicall - Parsed inner operations of the multicall.
 * @param blockNumber - Optional block number to read the log at.
 * @returns The decoded intent, or `undefined` when the multicall claims

package/dist/esm/preview/preview/detectDelayedOperation.js

@@ -1,14 +1,13 @@
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
 import { decodeDelayedIntent } from "../../sdk/accounts/withdrawal-compressor/intent-codec.js";
 import { InvalidDelayedIntentError } from "../../sdk/accounts/withdrawal-compressor/errors.js";
 import "../../sdk/index.js";
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import "../../plugins/adapters/index.js";
 import { isAddressEqual } from "viem";
 //#region src/preview/preview/detectDelayedOperation.ts
 /**
 * Scans a credit-facade multicall for a delayed-withdrawal request.
 *
-* @param sdk - SDK with the adapters plugin attached.
+* @param sdk - Attached SDK.
 * @param multicall - Parsed inner operations of the multicall.
 * @returns The detected request, or `undefined` when
 * the multicall contains no delayed-withdrawal request.

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

@@ -1,4 +1,3 @@
-import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { buildDelayedPreview } from "./buildDelayedPreview.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { classifyCloseOrRepay, isCloseOrRepay } from "./detectCloseOrRepay.js";
@@ -10,4 +9,4 @@ import { replayMulticall } from "./replayMulticall.js";
 import { previewAdjustCreditAccount } from "./previewAdjustCreditAccount.js";
 import { previewCloseOrRepayCreditAccount } from "./previewCloseOrRepayCreditAccount.js";
 import { previewOperation } from "./previewOperation.js";
-export { CreditAccountState, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, UnsupportedOperationError, buildDelayedPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { CreditAccountState, UnsupportedOperationError, buildDelayedPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustCreditAccount, previewCloseOrRepayCreditAccount, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/esm/preview/preview/previewAdjustCreditAccount.js

@@ -1,7 +1,9 @@
 import { AP_WETH_TOKEN } from "../../sdk/constants/address-provider.js";
 import { DUST_THRESHOLD } from "../../sdk/constants/math.js";
+import { calcPositionLeverage } from "../../sdk/market/math.js";
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 //#region src/preview/preview/previewAdjustCreditAccount.ts
@@ -15,6 +17,7 @@ import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 async function previewAdjustCreditAccount(input, operation, options) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
+	const oracle = market.priceOracle;
 	const { before, after, error: replayError } = await replayMulticall(sdk, operation, options);
 	const account = after.account;
 	let error = replayError;
@@ -25,7 +28,7 @@ async function previewAdjustCreditAccount(input, operation, options) {
 	const assetsChange = account.balances.difference(before.balances).toAssets(DUST_THRESHOLD);
 	const totalValue = assets.reduce((acc, { token, balance }) => {
 		try {
-			return acc + market.priceOracle.convert(token, market.underlying, balance);
+			return acc + oracle.convert(token, market.underlying, balance);
 		} catch {
 			error ??= {
 				code: ERROR_UNPRICEABLE_TOKEN,
@@ -38,22 +41,29 @@ async function previewAdjustCreditAccount(input, operation, options) {
 	return {
 		operation: "AdjustCreditAccount",
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
-		collateralAdded,
-		collateralWithdrawn: after.collateralWithdrawn.toAssets(),
+		collateralAdded: collateralAdded.map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalValue,
-		debt: account.debt,
-		debtChange: account.debt - before.debt,
-		quotas,
-		quotasChange: account.quotas.difference(before.quotas).toAssets(),
-		assets,
-		assetsChange,
+		debt: account.totalDebt,
+		debtChange: 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),
-		overallApy: 0,
-		borrowRate: sdk.positions.borrowRate(snap),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snap),
-		liquidationPrice: sdk.positions.liquidationPrice(snap)
+		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)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -32,11 +32,9 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 		operation: "CloseCreditAccount",
 		permanent,
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
-		receivedAmount: {
-			token: receivedToken,
-			balance: after.collateralWithdrawn.getOrZero(receivedToken)
-		},
+		receivedAmount: market.priceOracle.toTokenAmount(receivedToken, after.collateralWithdrawn.getOrZero(receivedToken)),
 		error
 	};
 }
@@ -47,6 +45,7 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 */
 function previewRepayCreditAccount(input, operation, permanent, replay) {
 	const { sdk, value = 0n } = input;
+	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const { before, after, error: replayError } = replay;
 	const { assets: collateralAdded, error: unwrapError } = unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(AP_WETH_TOKEN, 0));
 	const error = replayError ?? unwrapError;
@@ -54,10 +53,11 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 		operation: "RepayCreditAccount",
 		permanent,
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		creditAccount: operation.creditAccount,
-		collateralAdded,
+		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		debtRepaid: before.totalDebt - after.account.totalDebt,
-		collateralWithdrawn: after.collateralWithdrawn.toAssets(),
+		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		error
 	};
 }

package/dist/esm/preview/preview/previewOpenCreditAccount.js

@@ -1,7 +1,9 @@
 import { AP_WETH_TOKEN } from "../../sdk/constants/address-provider.js";
 import { DUST_THRESHOLD } from "../../sdk/constants/math.js";
+import { calcPositionLeverage } from "../../sdk/market/math.js";
+import { ERROR_UNPRICEABLE_TOKEN } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { ERROR_UNPRICEABLE_TOKEN } from "./types.js";
 import { CreditAccountState } from "./CreditAccountState.js";
 import { makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
@@ -9,13 +11,14 @@ import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 async function previewOpenCreditAccount(input, operation) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
+	const oracle = market.priceOracle;
 	const state = makeReplayState(CreditAccountState.beforeOpen(operation.creditManager, market.underlying));
 	let error = await replayInnerOperations(sdk, operation.multicall, state);
 	const account = state.account;
 	let priceError;
 	const collateralValue = state.collateralAdded.sum((token, balance) => {
 		try {
-			return market.priceOracle.convert(token, market.underlying, balance);
+			return oracle.convert(token, market.underlying, balance);
 		} catch {
 			priceError ??= {
 				code: ERROR_UNPRICEABLE_TOKEN,
@@ -28,22 +31,29 @@ async function previewOpenCreditAccount(input, operation) {
 	error ??= unwrapError ?? priceError;
 	const assets = account.balances.toAssets(DUST_THRESHOLD);
 	const quotas = account.quotas.toAssets(0n);
-	const snap = account.toSnapshot(collateralValue + account.totalDebt);
+	const totalValue = collateralValue + account.totalDebt;
+	const snap = account.toSnapshot(totalValue);
+	const targetAsset = inferTargetAsset(operation.multicall, account.balances);
 	return {
 		operation: operation.operation,
 		creditManager: operation.creditManager,
-		target: inferTargetAsset(operation.multicall, account.balances),
-		collateral,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
+		target: targetAsset ? oracle.toTokenAmount(targetAsset.token, targetAsset.balance) : void 0,
+		collateral: collateral.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		collateralValue,
+		totalValue,
 		debt: account.debt,
-		quotas,
-		assets,
+		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),
-		overallApy: 0,
-		borrowRate: sdk.positions.borrowRate(snap),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snap),
-		liquidationPrice: sdk.positions.liquidationPrice(snap)
+		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)
 	};
 }
 /**

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

@@ -67,6 +67,7 @@ async function previewMulticallOperation(input, operation, options) {
 		operation: "DelayedCreditAccountOperation",
 		creditAccount: operation.creditAccount,
 		creditManager: operation.creditManager,
+		name: sdk.marketRegister.findCreditManager(operation.creditManager).name,
 		intent: delayed.intent,
 		instantPreview,
 		delayedPreview: buildDelayedPreview(after.account, before, delayed, convert, receivedToken, sdk)

package/dist/esm/preview/preview/previewPoolOperation.js

@@ -4,6 +4,7 @@ import "../simulate/index.js";
 async function previewPoolOperation(input, operation, options) {
 	const { sdk, to, calldata } = input;
 	const { tokenIn, tokenOut } = operation;
+	const market = sdk.marketRegister.findByPool(operation.pool);
 	const sim = await simulatePoolOperation({
 		sdk,
 		operation,
@@ -13,14 +14,10 @@ async function previewPoolOperation(input, operation, options) {
 	return {
 		operation: operation.operation,
 		pool: operation.pool,
-		tokenIn: {
-			token: tokenIn,
-			balance: sim.amountIn
-		},
-		tokenOut: {
-			token: tokenOut,
-			balance: sim.amountOut
-		}
+		name: sdk.tokensMeta.mustGetToken(operation.pool).name,
+		shareRate: market.pool.pool.dieselRate,
+		tokenIn: market.priceOracle.toTokenAmount(tokenIn, sim.amountIn),
+		tokenOut: market.priceOracle.toTokenAmount(tokenOut, sim.amountOut)
 	};
 }
 //#endregion

package/dist/esm/preview/preview/replayInnerOperations.js

@@ -1,10 +1,10 @@
 import { AssetsMap } from "../../sdk/utils/AssetsMap.js";
 import "../../sdk/constants/math.js";
+import { AbstractAdapterContract } from "../../sdk/market/adapters/contracts/AbstractAdapter.js";
+import { ERC4626AdapterContract } from "../../sdk/market/adapters/contracts/ERC4626AdapterContract.js";
+import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { AbstractAdapterContract } from "../../plugins/adapters/contracts/AbstractAdapter.js";
-import { ERC4626AdapterContract } from "../../plugins/adapters/contracts/ERC4626AdapterContract.js";
-import "../../plugins/adapters/index.js";
-import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP } from "./types.js";
 import { applyRWAWrapUnwrap } from "./applyRWAWrapUnwrap.js";
 //#region src/preview/preview/replayInnerOperations.ts
 /**

package/dist/esm/preview/preview/unwrapNativeCollateral.js

@@ -1,7 +1,8 @@
 import { AssetsMap } from "../../sdk/utils/AssetsMap.js";
 import { NATIVE_ADDRESS } from "../../sdk/constants/addresses.js";
+import { ERROR_INVALID_TRANSACTION_VALUE } from "../../model/previews.js";
+import "../../model/index.js";
 import "../../sdk/index.js";
-import { ERROR_INVALID_TRANSACTION_VALUE } from "./types.js";
 //#region src/preview/preview/unwrapNativeCollateral.ts
 /**
 * Represents the transaction's attached native value as a `NATIVE_ADDRESS`

package/dist/esm/sdk/OnchainSDK.js

@@ -1,7 +1,7 @@
-import { TypedObjectUtils } from "./utils/mappers.js";
 import { getChain } from "./chain/chains.js";
 import "./chain/index.js";
 import { ADDRESS_PROVIDER_V310, AP_GEAR_TOKEN, AP_ROUTER } from "./constants/address-provider.js";
+import { TypedObjectUtils } from "./utils/mappers.js";
 import { VERSION_RANGE_310, isV310 } from "./constants/versions.js";
 import "./constants/index.js";
 import { formatTimestamp } from "./utils/formatter.js";
@@ -152,7 +152,7 @@ var OnchainSDK = class extends ChainContractsRegister {
 	async attach(options) {
 		if (this.#attached) throw new SdkAlreadyAttachedError();
 		const { addressProvider = ADDRESS_PROVIDER_V310, blockNumber, ignoreUpdateablePrices, ignoreMarkets, marketConfigurators: mcs, redstone } = options ?? {};
-		const marketConfigurators = mcs ?? TypedObjectUtils.keys(this.client.chain.defaultMarketConfigurators);
+		const marketConfigurators = mcs ?? this.client.chain.defaultMarketConfigurators.keys();
 		const rwaFactories = options?.rwaFactories ?? this.client.chain.rwaFactories;
 		this.logger?.info({
 			networkType: this.networkType,
@@ -228,6 +228,21 @@ var OnchainSDK = class extends ChainContractsRegister {
 			...this.#withdrawalCompressor ? [this.#withdrawalCompressor.getLoadWithdrawableAssetsMulticall(force)] : [],
 			this.tokensMeta.getLoadTokenDataMulticall()
 		], { blockNumber: this.currentBlock });
+		this.#renameRedemptionPhantoms();
+	}
+	/**
+	* Rewrites redemption phantom display symbols from the withdrawal
+	* compressor's source/target mapping. No-op when the compressor is missing
+	* or its assets cache has not been loaded.
+	**/
+	#renameRedemptionPhantoms() {
+		const compressor = this.#withdrawalCompressor;
+		if (!compressor?.state) return;
+		this.tokensMeta.renameRedemptionPhantoms(compressor.getWithdrawableAssets().map((a) => ({
+			phantom: a.withdrawalPhantomToken,
+			source: a.token,
+			target: a.underlying
+		})));
 	}
 	/**
 	* Restores SDK state from a previously serialised {@link GearboxState}
@@ -256,6 +271,7 @@ var OnchainSDK = class extends ChainContractsRegister {
 		this.#rwa.setState(state.rwa);
 		if (state.withdrawals) this.#withdrawalCompressor?.hydrate(state.withdrawals);
 		if (state.tokens) this.tokensMeta.hydrate(state.tokens);
+		this.#renameRedemptionPhantoms();
 		for (const [name, plugin] of TypedObjectUtils.entries(this.plugins)) {
 			const pluginState = state.plugins[name];
 			if (plugin.hydrate && pluginState) {