@gearbox-protocol/sdk 16.0.0-next.36 → 16.0.0-next.38

package/dist/cjs/model/liquidations.schema.js

@@ -25,6 +25,7 @@ const liquidatableAccountFilterSchema = zod_v4.z.object({
 const liquidatableAccountSchema = zod_v4.z.object({
 	creditManager: require_onchain_utils_zod.ZodAddress(),
 	name: zod_v4.z.string(),
+	underlyingToken: require_model_primitives_schema.underlyingTokenSchema,
 	curator: require_model_curators_schema.curatorSchema,
 	liquidationDiscount: require_model_primitives_schema.bpsSchema,
 	chainId: require_model_primitives_schema.chainIdSchema,

package/dist/cjs/onchain/accounts/intents/testing/sdk-mock.js

@@ -225,8 +225,19 @@ function buildMockSdk(args) {
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);
 	const facadePaused = args.facadePaused ?? false;
 	const expirationDate = args.expirationDate ?? 0;
+	const strategyTargetCollateral = args.strategyTargetCollateral ?? collateralTokens.find((t) => t !== args.underlying.toLowerCase());
+	const unwrappedUnderlying = args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying;
+	const underlyingToken = {
+		...tokenOf(unwrappedUnderlying),
+		wrappedAddress: unwrappedUnderlying.toLowerCase() === args.underlying.toLowerCase() ? null : args.underlying
+	};
+	const strategyName = strategyTargetCollateral ? `${tokenOf(strategyTargetCollateral).symbol} / ${underlyingToken.symbol}` : void 0;
 	const creditManagerSuite = {
 		name: "TestCreditManager",
+		strategyName,
+		underlyingToken,
+		accountTargetCollateral: () => strategyTargetCollateral ? tokenOf(strategyTargetCollateral) : null,
+		accountStrategyName: () => strategyName ?? underlyingToken.symbol,
 		liquidationFees: () => MOCK_LIQUIDATION_FEES,
 		creditManager: {
 			address: args.creditManager,
@@ -248,7 +259,7 @@ function buildMockSdk(args) {
 		market,
 		isPaused: facadePaused || poolPaused,
 		forbiddenTokens: [...forbidden],
-		strategyTargetCollateral: args.strategyTargetCollateral ?? collateralTokens.find((t) => t !== args.underlying.toLowerCase()),
+		strategyTargetCollateral,
 		isExpired: expirationDate > 0 && expirationDate < (args.timestamp ?? 0)
 	};
 	const routeCalls = (tokenIn, tokenOut) => {

package/dist/cjs/onchain/market/credit/CreditSuite.js

@@ -86,6 +86,16 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		return this.creditManager.underlying;
 	}
 	/**
+	* Pool underlying token as the shared read model describes it.
+	*
+	* For RWA markets this is the unwrapped asset, e.g. USDC rather than
+	* dcUSDC (the pool's on-chain underlying). Same as
+	* {@link MarketSuite.underlyingToken}.
+	*/
+	get underlyingToken() {
+		return this.market.underlyingToken;
+	}
+	/**
 	* Parent market that contains this credit manager
 	*/
 	get market() {
@@ -222,7 +232,31 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	get strategyName() {
 		const collateral = this.strategyTargetCollateral;
 		if (!collateral) return;
-		return require_onchain_market_strategyName.strategyName(this.tokensMeta.mustGetToken(collateral), this.market.underlyingToken);
+		return require_onchain_market_strategyName.strategyName(this.tokensMeta.mustGetToken(collateral), this.underlyingToken);
+	}
+	/**
+	* Collateral token an existing credit account in this suite is a strategy
+	* in. Same as {@link StrategyPosition.targetCollateral}.
+	*
+	* Resolution, in order:
+	* 1. a hardcoded per-account override, when present;
+	* 2. {@link strategyTargetCollateral};
+	* 3. `null` when neither can be resolved.
+	*/
+	accountTargetCollateral(creditAccount) {
+		const addr = require_onchain_chain_chains.getAccountTargetCollateral(creditAccount, this.chainId) ?? this.strategyTargetCollateral;
+		return addr ? this.tokensMeta.mustGetToken(addr) : null;
+	}
+	/**
+	* Display name of an existing credit account in this suite, e.g.
+	* `"wstETH / WETH"`. Same as {@link StrategyPosition.name}.
+	*
+	* {@link accountTargetCollateral} over the underlying, or the underlying
+	* symbol when no target can be resolved.
+	*/
+	accountStrategyName(creditAccount) {
+		const target = this.accountTargetCollateral(creditAccount);
+		return target ? require_onchain_market_strategyName.strategyName(target, this.underlyingToken) : this.underlyingToken.symbol;
 	}
 	/**
 	* Describes this suite's leveraged strategy as the shared read model does,
@@ -245,9 +279,9 @@ var CreditSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 			chainId: this.chainId,
 			creditManager: cm.address,
 			targetCollateral: this.tokensMeta.mustGetToken(collateral),
-			name: this.strategyName ?? this.market.underlyingToken.symbol,
+			name: this.strategyName ?? this.underlyingToken.symbol,
 			curator: market.curator,
-			underlyingToken: market.underlyingToken,
+			underlyingToken: this.underlyingToken,
 			totalBorrowed: oracle.toAmount(pool.underlying, borrowed),
 			allowedDepositTokens: this.#allowedDepositTokens(collateral),
 			paused: this.isPaused,

package/dist/cjs/onchain/market/credit/creditOperationMarket.js

@@ -17,7 +17,7 @@ function totalLiquidationDiscount(suite) {
 /**
 * The market half of every credit operation result, read off the suite that
 * serves it: a preview, a projection, the open-strategy walk and a
-* liquidatable-account row all spread it, so the four fields are filled in one
+* liquidatable-account row all spread it, so the five fields are filled in one
 * place and cannot drift apart between the halves of the SDK.
 *
 * The curator comes from the same getter {@link CreditSuite.strategyOpportunity}
@@ -26,7 +26,8 @@ function totalLiquidationDiscount(suite) {
 function creditOperationMarket(suite) {
 	return {
 		creditManager: suite.creditManager.address,
-		name: suite.name,
+		name: suite.strategyName ?? suite.underlyingToken.symbol,
+		underlyingToken: suite.underlyingToken,
 		curator: suite.market.curator,
 		liquidationDiscount: totalLiquidationDiscount(suite)
 	};

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

@@ -1,13 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_AddressMap = require("../utils/AddressMap.js");
-const require_onchain_chain_chains = require("../chain/chains.js");
 require("../constants/math.js");
 require("../constants/index.js");
 require("../utils/index.js");
 const require_onchain_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
 const require_onchain_market_math = require("../market/math.js");
-const require_onchain_market_strategyName = require("../market/strategyName.js");
 const require_onchain_market_credit_creditOperationMarket = require("../market/credit/creditOperationMarket.js");
 const require_model_filters = require("../../model/filters.js");
 const require_model_positions = require("../../model/positions.js");
@@ -287,9 +285,8 @@ var PositionsService = class extends require_onchain_base_SDKConstruct.SDKConstr
 		const { market } = suite;
 		const { priceOracle } = market;
 		const { pool } = market.pool;
-		const token = market.underlyingToken;
+		const token = suite.underlyingToken;
 		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
-		const target = require_onchain_chain_chains.getAccountTargetCollateral(ca.creditAccount, this.sdk.chainId) ?? suite.strategyTargetCollateral;
 		const priceFailed = !ca.success;
 		const recomputeTotals = ca.debt === 0n || priceFailed;
 		const collaterals = [];
@@ -323,8 +320,8 @@ var PositionsService = class extends require_onchain_base_SDKConstruct.SDKConstr
 			creditManager: ca.creditManager,
 			creditAccount: ca.creditAccount,
 			underlyingToken: token,
-			name: target ? require_onchain_market_strategyName.strategyName(this.sdk.tokensMeta.mustGetToken(target), token) : token.symbol,
-			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
+			name: suite.accountStrategyName(ca.creditAccount),
+			targetCollateral: suite.accountTargetCollateral(ca.creditAccount),
 			leverage: require_onchain_market_math.calcPositionLeverage(totalValue, totalDebtValue),
 			borrowApy: require_onchain_market_math.calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
 			totalDebt: {

package/dist/cjs/preview/index.js

@@ -26,6 +26,7 @@ const require_preview_preview_detectCloseOrRepay = require("./preview/detectClos
 const require_preview_preview_detectDelayedClaim = require("./preview/detectDelayedClaim.js");
 const require_preview_preview_detectDelayedOperation = require("./preview/detectDelayedOperation.js");
 const require_preview_preview_errors = require("./preview/errors.js");
+const require_preview_preview_estimateClaimableAt = require("./preview/estimateClaimableAt.js");
 const require_preview_preview_replayInnerOperations = require("./preview/replayInnerOperations.js");
 const require_preview_preview_replayMulticall = require("./preview/replayMulticall.js");
 const require_preview_preview_previewAdjustStrategyPosition = require("./preview/previewAdjustStrategyPosition.js");
@@ -60,6 +61,7 @@ exports.classifyInnerOperations = require_preview_parse_classifyInnerOperations.
 exports.collateralIssue = require_preview_validate_checkOperation.collateralIssue;
 exports.detectDelayedClaim = require_preview_preview_detectDelayedClaim.detectDelayedClaim;
 exports.detectDelayedOperation = require_preview_preview_detectDelayedOperation.detectDelayedOperation;
+exports.estimateClaimableAt = require_preview_preview_estimateClaimableAt.estimateClaimableAt;
 exports.extractAdapterCallTraces = require_preview_trace_extractAdapterCallTraces.extractAdapterCallTraces;
 exports.extractTransfers = require_preview_trace_extractTransfers.extractTransfers;
 exports.findFacadeCalls = require_preview_trace_findFacadeCalls.findFacadeCalls;

package/dist/cjs/preview/preview/buildDelayedStrategyPositionOperationPreview.js

@@ -164,11 +164,14 @@ function totalValueInUnderlying(post, convert, dust) {
 function buildClosePreview(post, converter, receivedToken, sdk) {
 	const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
 	const oracle = sdk.marketRegister.findByCreditManager(post.creditManager).priceOracle;
+	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
-		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(post.creditManager)),
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(suite),
 		creditAccount: post.creditAccount,
+		name: suite.accountStrategyName(post.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(post.creditAccount),
 		receivedAmount: oracle.toTokenAmount(receivedToken, require_onchain_utils_bigint_math.BigIntMath.max(totalValue - post.totalDebt, 0n)),
 		error: converter.error
 	};
@@ -176,11 +179,14 @@ function buildClosePreview(post, converter, receivedToken, sdk) {
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 	const snap = post.toSnapshot(totalValueInUnderlying(post, converter.convert, require_onchain_constants_math.DUST_THRESHOLD));
 	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	const oracle = market.priceOracle;
 	return {
 		operation: "AdjustCreditAccount",
 		...require_model_previews.asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt })),
 		creditAccount: post.creditAccount,
+		name: suite.accountStrategyName(post.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(post.creditAccount),
 		collateralAdded: [],
 		collateralWithdrawn: collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalDebtChange: market.toUnderlyingAmount(post.totalDebt - before.totalDebt),

package/dist/cjs/preview/preview/estimateClaimableAt.js

@@ -0,0 +1,21 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let viem = require("viem");
+//#region src/preview/preview/estimateClaimableAt.ts
+/**
+* Estimates when a newly requested delayed withdrawal becomes claimable:
+* `now + withdrawalLength` of the cached withdrawable asset whose phantom
+* token matches `phantomToken`. Same formula as
+* `getWithdrawalRequestResult().claimableAt`.
+*
+* Returns `undefined` when the withdrawal compressor is missing, its assets
+* cache is not loaded, or no asset matches the phantom token.
+*/
+function estimateClaimableAt(sdk, phantomToken) {
+	const compressor = sdk.withdrawalCompressor;
+	if (!compressor?.state) return;
+	const asset = compressor.getWithdrawableAssets().find((a) => (0, viem.isAddressEqual)(a.withdrawalPhantomToken, phantomToken));
+	if (!asset) return;
+	return Math.floor(Date.now() / 1e3) + Number(asset.withdrawalLength);
+}
+//#endregion
+exports.estimateClaimableAt = estimateClaimableAt;

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

@@ -5,6 +5,7 @@ const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay
 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_estimateClaimableAt = require("./estimateClaimableAt.js");
 const require_preview_preview_replayInnerOperations = require("./replayInnerOperations.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_previewAdjustStrategyPosition = require("./previewAdjustStrategyPosition.js");
@@ -16,6 +17,7 @@ exports.buildDelayedStrategyPositionOperationPreview = require_preview_preview_b
 exports.classifyCloseOrRepay = require_preview_preview_detectCloseOrRepay.classifyCloseOrRepay;
 exports.detectDelayedClaim = require_preview_preview_detectDelayedClaim.detectDelayedClaim;
 exports.detectDelayedOperation = require_preview_preview_detectDelayedOperation.detectDelayedOperation;
+exports.estimateClaimableAt = require_preview_preview_estimateClaimableAt.estimateClaimableAt;
 exports.isCloseOrRepay = require_preview_preview_detectCloseOrRepay.isCloseOrRepay;
 exports.makeReplayState = require_preview_preview_replayInnerOperations.makeReplayState;
 exports.previewAdjustStrategyPosition = require_preview_preview_previewAdjustStrategyPosition.previewAdjustStrategyPosition;

package/dist/cjs/preview/preview/previewAdjustStrategyPosition.js

@@ -17,6 +17,7 @@ const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCo
 function previewAdjustStrategyPosition(input, operation, options) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	const oracle = market.priceOracle;
 	const { before, after, error: replayError } = require_preview_preview_replayMulticall.replayMulticall(sdk, operation, options);
 	const account = after.account;
@@ -40,6 +41,8 @@ function previewAdjustStrategyPosition(input, operation, options) {
 		operation: "AdjustCreditAccount",
 		...require_model_previews.asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt })),
 		creditAccount: operation.creditAccount,
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		collateralAdded: collateralAdded.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalDebtChange: market.toUnderlyingAmount(account.totalDebt - before.totalDebt),

package/dist/cjs/preview/preview/previewExitOrRepayStrategyPosition.js

@@ -25,6 +25,7 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 	const { sdk } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const { after, error } = replay;
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	let receivedToken = market.underlying;
 	for (const m of operation.multicall) if (m.operation === "WithdrawCollateral" && m.amount === 115792089237316195423570985008687907853269984665640564039457584007913129639935n) {
 		receivedToken = m.token;
@@ -33,8 +34,10 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 	return {
 		operation: "CloseCreditAccount",
 		permanent,
-		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(suite),
 		creditAccount: operation.creditAccount,
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		receivedAmount: market.priceOracle.toTokenAmount(receivedToken, after.collateralWithdrawn.getOrZero(receivedToken)),
 		error
 	};
@@ -50,11 +53,14 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	const { before, after, error: replayError } = replay;
 	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));
 	const error = replayError ?? unwrapError;
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	return {
 		operation: "RepayCreditAccount",
 		permanent,
-		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(suite),
 		creditAccount: operation.creditAccount,
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		debtRepaid: market.toUnderlyingAmount(before.totalDebt - after.account.totalDebt),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),

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

@@ -9,6 +9,7 @@ const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay
 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_estimateClaimableAt = require("./estimateClaimableAt.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_previewAdjustStrategyPosition = require("./previewAdjustStrategyPosition.js");
 const require_preview_preview_previewExitOrRepayStrategyPosition = require("./previewExitOrRepayStrategyPosition.js");
@@ -66,11 +67,15 @@ async function previewMulticallOperation(input, operation, options) {
 	const convert = (token, to, amount) => market.priceOracle.convert(token, to, amount);
 	const meta = sdk.tokensMeta.get(market.underlying);
 	const receivedToken = meta && sdk.tokensMeta.isRWAUnderlying(meta) ? meta.asset : market.underlying;
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	return {
 		operation: "DelayedCreditAccountOperation",
 		creditAccount: operation.creditAccount,
-		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
+		...require_onchain_market_credit_creditOperationMarket.creditOperationMarket(suite),
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		intent: delayed.intent,
+		estClaimableAt: require_preview_preview_estimateClaimableAt.estimateClaimableAt(sdk, delayed.request.phantomToken),
 		instantPreview,
 		delayedPreview: require_preview_preview_buildDelayedStrategyPositionOperationPreview.buildDelayedStrategyPositionOperationPreview(after.account, before, delayed, convert, receivedToken, sdk)
 	};

package/dist/cjs/preview/preview/previewPoolPositionOperation.js

@@ -16,6 +16,7 @@ async function previewPoolPositionOperation(input, operation, options) {
 		operation: operation.operation,
 		pool: operation.pool,
 		name: sdk.tokensMeta.mustGetToken(operation.pool).name,
+		underlyingToken: market.underlyingToken,
 		shareRate: market.pool.pool.dieselRate,
 		tokenIn: market.priceOracle.toTokenAmount(tokenIn, sim.amountIn),
 		tokenOut: market.priceOracle.toTokenAmount(tokenOut, sim.amountOut)

package/dist/esm/model/liquidations.schema.js

@@ -1,5 +1,5 @@
 import { ZodAddress } from "../onchain/utils/zod.js";
-import { assetTypeSchema, bpsSchema, chainIdSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema } from "./primitives.schema.js";
+import { assetTypeSchema, bpsSchema, chainIdSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema, underlyingTokenSchema } from "./primitives.schema.js";
 import { curatorSchema } from "./curators.schema.js";
 import { filterable } from "./filters.schema.js";
 import { z } from "zod/v4";
@@ -24,6 +24,7 @@ const liquidatableAccountFilterSchema = z.object({
 const liquidatableAccountSchema = z.object({
 	creditManager: ZodAddress(),
 	name: z.string(),
+	underlyingToken: underlyingTokenSchema,
 	curator: curatorSchema,
 	liquidationDiscount: bpsSchema,
 	chainId: chainIdSchema,

package/dist/esm/onchain/accounts/intents/testing/sdk-mock.js

@@ -225,8 +225,19 @@ function buildMockSdk(args) {
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);
 	const facadePaused = args.facadePaused ?? false;
 	const expirationDate = args.expirationDate ?? 0;
+	const strategyTargetCollateral = args.strategyTargetCollateral ?? collateralTokens.find((t) => t !== args.underlying.toLowerCase());
+	const unwrappedUnderlying = args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying;
+	const underlyingToken = {
+		...tokenOf(unwrappedUnderlying),
+		wrappedAddress: unwrappedUnderlying.toLowerCase() === args.underlying.toLowerCase() ? null : args.underlying
+	};
+	const strategyName = strategyTargetCollateral ? `${tokenOf(strategyTargetCollateral).symbol} / ${underlyingToken.symbol}` : void 0;
 	const creditManagerSuite = {
 		name: "TestCreditManager",
+		strategyName,
+		underlyingToken,
+		accountTargetCollateral: () => strategyTargetCollateral ? tokenOf(strategyTargetCollateral) : null,
+		accountStrategyName: () => strategyName ?? underlyingToken.symbol,
 		liquidationFees: () => MOCK_LIQUIDATION_FEES,
 		creditManager: {
 			address: args.creditManager,
@@ -248,7 +259,7 @@ function buildMockSdk(args) {
 		market,
 		isPaused: facadePaused || poolPaused,
 		forbiddenTokens: [...forbidden],
-		strategyTargetCollateral: args.strategyTargetCollateral ?? collateralTokens.find((t) => t !== args.underlying.toLowerCase()),
+		strategyTargetCollateral,
 		isExpired: expirationDate > 0 && expirationDate < (args.timestamp ?? 0)
 	};
 	const routeCalls = (tokenIn, tokenOut) => {

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

@@ -1,6 +1,6 @@
 import { AddressMap } from "../../utils/AddressMap.js";
 import { BigIntMath } from "../../utils/bigint-math.js";
-import { getLegacyStrategyTarget, isSunsetStrategy } from "../../chain/chains.js";
+import { getAccountTargetCollateral, getLegacyStrategyTarget, isSunsetStrategy } from "../../chain/chains.js";
 import { PERCENTAGE_FACTOR, RAY } from "../../constants/math.js";
 import "../../constants/index.js";
 import "../../utils/index.js";
@@ -85,6 +85,16 @@ var CreditSuite = class extends SDKConstruct {
 		return this.creditManager.underlying;
 	}
 	/**
+	* Pool underlying token as the shared read model describes it.
+	*
+	* For RWA markets this is the unwrapped asset, e.g. USDC rather than
+	* dcUSDC (the pool's on-chain underlying). Same as
+	* {@link MarketSuite.underlyingToken}.
+	*/
+	get underlyingToken() {
+		return this.market.underlyingToken;
+	}
+	/**
 	* Parent market that contains this credit manager
 	*/
 	get market() {
@@ -221,7 +231,31 @@ var CreditSuite = class extends SDKConstruct {
 	get strategyName() {
 		const collateral = this.strategyTargetCollateral;
 		if (!collateral) return;
-		return strategyName(this.tokensMeta.mustGetToken(collateral), this.market.underlyingToken);
+		return strategyName(this.tokensMeta.mustGetToken(collateral), this.underlyingToken);
+	}
+	/**
+	* Collateral token an existing credit account in this suite is a strategy
+	* in. Same as {@link StrategyPosition.targetCollateral}.
+	*
+	* Resolution, in order:
+	* 1. a hardcoded per-account override, when present;
+	* 2. {@link strategyTargetCollateral};
+	* 3. `null` when neither can be resolved.
+	*/
+	accountTargetCollateral(creditAccount) {
+		const addr = getAccountTargetCollateral(creditAccount, this.chainId) ?? this.strategyTargetCollateral;
+		return addr ? this.tokensMeta.mustGetToken(addr) : null;
+	}
+	/**
+	* Display name of an existing credit account in this suite, e.g.
+	* `"wstETH / WETH"`. Same as {@link StrategyPosition.name}.
+	*
+	* {@link accountTargetCollateral} over the underlying, or the underlying
+	* symbol when no target can be resolved.
+	*/
+	accountStrategyName(creditAccount) {
+		const target = this.accountTargetCollateral(creditAccount);
+		return target ? strategyName(target, this.underlyingToken) : this.underlyingToken.symbol;
 	}
 	/**
 	* Describes this suite's leveraged strategy as the shared read model does,
@@ -244,9 +278,9 @@ var CreditSuite = class extends SDKConstruct {
 			chainId: this.chainId,
 			creditManager: cm.address,
 			targetCollateral: this.tokensMeta.mustGetToken(collateral),
-			name: this.strategyName ?? this.market.underlyingToken.symbol,
+			name: this.strategyName ?? this.underlyingToken.symbol,
 			curator: market.curator,
-			underlyingToken: market.underlyingToken,
+			underlyingToken: this.underlyingToken,
 			totalBorrowed: oracle.toAmount(pool.underlying, borrowed),
 			allowedDepositTokens: this.#allowedDepositTokens(collateral),
 			paused: this.isPaused,

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

@@ -16,7 +16,7 @@ function totalLiquidationDiscount(suite) {
 /**
 * The market half of every credit operation result, read off the suite that
 * serves it: a preview, a projection, the open-strategy walk and a
-* liquidatable-account row all spread it, so the four fields are filled in one
+* liquidatable-account row all spread it, so the five fields are filled in one
 * place and cannot drift apart between the halves of the SDK.
 *
 * The curator comes from the same getter {@link CreditSuite.strategyOpportunity}
@@ -25,7 +25,8 @@ function totalLiquidationDiscount(suite) {
 function creditOperationMarket(suite) {
 	return {
 		creditManager: suite.creditManager.address,
-		name: suite.name,
+		name: suite.strategyName ?? suite.underlyingToken.symbol,
+		underlyingToken: suite.underlyingToken,
 		curator: suite.market.curator,
 		liquidationDiscount: totalLiquidationDiscount(suite)
 	};

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

@@ -1,12 +1,10 @@
 import { AddressMap } from "../utils/AddressMap.js";
-import { getAccountTargetCollateral } from "../chain/chains.js";
 import "../constants/math.js";
 import "../constants/index.js";
 import "../utils/index.js";
 import { SDKConstruct } from "../base/SDKConstruct.js";
 import "../base/index.js";
 import { bpsToRay, calcBorrowApy, calcPositionLeverage, healthFactorBps, usdToNumber } from "../market/math.js";
-import { strategyName } from "../market/strategyName.js";
 import { creditOperationMarket } from "../market/credit/creditOperationMarket.js";
 import { isFilterSet } from "../../model/filters.js";
 import { STRATEGY_POSITION_COLLATERAL_ERROR, matchesPositionFilter } from "../../model/positions.js";
@@ -286,9 +284,8 @@ var PositionsService = class extends SDKConstruct {
 		const { market } = suite;
 		const { priceOracle } = market;
 		const { pool } = market.pool;
-		const token = market.underlyingToken;
+		const token = suite.underlyingToken;
 		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
-		const target = getAccountTargetCollateral(ca.creditAccount, this.sdk.chainId) ?? suite.strategyTargetCollateral;
 		const priceFailed = !ca.success;
 		const recomputeTotals = ca.debt === 0n || priceFailed;
 		const collaterals = [];
@@ -322,8 +319,8 @@ var PositionsService = class extends SDKConstruct {
 			creditManager: ca.creditManager,
 			creditAccount: ca.creditAccount,
 			underlyingToken: token,
-			name: target ? strategyName(this.sdk.tokensMeta.mustGetToken(target), token) : token.symbol,
-			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
+			name: suite.accountStrategyName(ca.creditAccount),
+			targetCollateral: suite.accountTargetCollateral(ca.creditAccount),
 			leverage: calcPositionLeverage(totalValue, totalDebtValue),
 			borrowApy: calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
 			totalDebt: {

package/dist/esm/preview/index.js

@@ -25,6 +25,7 @@ import { classifyCloseOrRepay, isCloseOrRepay } from "./preview/detectCloseOrRep
 import { detectDelayedClaim, resolveDelayedClaimIntent } from "./preview/detectDelayedClaim.js";
 import { detectDelayedOperation } from "./preview/detectDelayedOperation.js";
 import { UnsupportedOperationError } from "./preview/errors.js";
+import { estimateClaimableAt } from "./preview/estimateClaimableAt.js";
 import { makeReplayState, replayInnerOperations } from "./preview/replayInnerOperations.js";
 import { replayMulticall } from "./preview/replayMulticall.js";
 import { previewAdjustStrategyPosition } from "./preview/previewAdjustStrategyPosition.js";
@@ -35,4 +36,4 @@ import "./types.js";
 import { checkOperation, collateralIssue, marketIssues, quotaCountIssue } from "./validate/checkOperation.js";
 import { checkSimulation } from "./validate/checkSimulation.js";
 import "./validate/index.js";
-export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, IntentPreviewError, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedStrategyPositionOperationPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { AllowancePrerequisite, BalancePrerequisite, CreditAccountState, IntentPreviewError, Prerequisite, RWAOpenRequirementsPrerequisite, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, WithdrawCollateralAlignmentError, buildDelayedStrategyPositionOperationPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/esm/preview/preview/buildDelayedStrategyPositionOperationPreview.js

@@ -163,11 +163,14 @@ function totalValueInUnderlying(post, convert, dust) {
 function buildClosePreview(post, converter, receivedToken, sdk) {
 	const totalValue = totalValueInUnderlying(post, converter.convert, 0n);
 	const oracle = sdk.marketRegister.findByCreditManager(post.creditManager).priceOracle;
+	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	return {
 		operation: "CloseCreditAccount",
 		permanent: false,
-		...creditOperationMarket(sdk.marketRegister.findCreditManager(post.creditManager)),
+		...creditOperationMarket(suite),
 		creditAccount: post.creditAccount,
+		name: suite.accountStrategyName(post.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(post.creditAccount),
 		receivedAmount: oracle.toTokenAmount(receivedToken, BigIntMath.max(totalValue - post.totalDebt, 0n)),
 		error: converter.error
 	};
@@ -175,11 +178,14 @@ function buildClosePreview(post, converter, receivedToken, sdk) {
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 	const snap = post.toSnapshot(totalValueInUnderlying(post, converter.convert, DUST_THRESHOLD));
 	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
+	const suite = sdk.marketRegister.findCreditManager(post.creditManager);
 	const oracle = market.priceOracle;
 	return {
 		operation: "AdjustCreditAccount",
 		...asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt })),
 		creditAccount: post.creditAccount,
+		name: suite.accountStrategyName(post.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(post.creditAccount),
 		collateralAdded: [],
 		collateralWithdrawn: collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalDebtChange: market.toUnderlyingAmount(post.totalDebt - before.totalDebt),

package/dist/esm/preview/preview/estimateClaimableAt.js

@@ -0,0 +1,20 @@
+import { isAddressEqual } from "viem";
+//#region src/preview/preview/estimateClaimableAt.ts
+/**
+* Estimates when a newly requested delayed withdrawal becomes claimable:
+* `now + withdrawalLength` of the cached withdrawable asset whose phantom
+* token matches `phantomToken`. Same formula as
+* `getWithdrawalRequestResult().claimableAt`.
+*
+* Returns `undefined` when the withdrawal compressor is missing, its assets
+* cache is not loaded, or no asset matches the phantom token.
+*/
+function estimateClaimableAt(sdk, phantomToken) {
+	const compressor = sdk.withdrawalCompressor;
+	if (!compressor?.state) return;
+	const asset = compressor.getWithdrawableAssets().find((a) => isAddressEqual(a.withdrawalPhantomToken, phantomToken));
+	if (!asset) return;
+	return Math.floor(Date.now() / 1e3) + Number(asset.withdrawalLength);
+}
+//#endregion
+export { estimateClaimableAt };

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

@@ -4,9 +4,10 @@ import { classifyCloseOrRepay, isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { detectDelayedClaim, resolveDelayedClaimIntent } from "./detectDelayedClaim.js";
 import { detectDelayedOperation } from "./detectDelayedOperation.js";
 import { UnsupportedOperationError } from "./errors.js";
+import { estimateClaimableAt } from "./estimateClaimableAt.js";
 import { makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { previewAdjustStrategyPosition } from "./previewAdjustStrategyPosition.js";
 import { previewExitOrRepayStrategyPosition } from "./previewExitOrRepayStrategyPosition.js";
 import { previewOperation } from "./previewOperation.js";
-export { CreditAccountState, UnsupportedOperationError, buildDelayedStrategyPositionOperationPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { CreditAccountState, UnsupportedOperationError, buildDelayedStrategyPositionOperationPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, isCloseOrRepay, makeReplayState, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/esm/preview/preview/previewAdjustStrategyPosition.js

@@ -16,6 +16,7 @@ import { unwrapNativeCollateral } from "./unwrapNativeCollateral.js";
 function previewAdjustStrategyPosition(input, operation, options) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	const oracle = market.priceOracle;
 	const { before, after, error: replayError } = replayMulticall(sdk, operation, options);
 	const account = after.account;
@@ -39,6 +40,8 @@ function previewAdjustStrategyPosition(input, operation, options) {
 		operation: "AdjustCreditAccount",
 		...asEstimated(sdk.positions.projection(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt })),
 		creditAccount: operation.creditAccount,
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		collateralAdded: collateralAdded.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		totalDebtChange: market.toUnderlyingAmount(account.totalDebt - before.totalDebt),

package/dist/esm/preview/preview/previewExitOrRepayStrategyPosition.js

@@ -24,6 +24,7 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 	const { sdk } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const { after, error } = replay;
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	let receivedToken = market.underlying;
 	for (const m of operation.multicall) if (m.operation === "WithdrawCollateral" && m.amount === 115792089237316195423570985008687907853269984665640564039457584007913129639935n) {
 		receivedToken = m.token;
@@ -32,8 +33,10 @@ function previewCloseCreditAccount(input, operation, permanent, replay) {
 	return {
 		operation: "CloseCreditAccount",
 		permanent,
-		...creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
+		...creditOperationMarket(suite),
 		creditAccount: operation.creditAccount,
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		receivedAmount: market.priceOracle.toTokenAmount(receivedToken, after.collateralWithdrawn.getOrZero(receivedToken)),
 		error
 	};
@@ -49,11 +52,14 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	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;
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	return {
 		operation: "RepayCreditAccount",
 		permanent,
-		...creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
+		...creditOperationMarket(suite),
 		creditAccount: operation.creditAccount,
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		collateralAdded: collateralAdded.map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),
 		debtRepaid: market.toUnderlyingAmount(before.totalDebt - after.account.totalDebt),
 		collateralWithdrawn: after.collateralWithdrawn.toAssets().map((a) => market.priceOracle.toTokenAmount(a.token, a.balance)),

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

@@ -8,6 +8,7 @@ import { isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { resolveDelayedClaimIntent } from "./detectDelayedClaim.js";
 import { detectDelayedOperation } from "./detectDelayedOperation.js";
 import { UnsupportedOperationError } from "./errors.js";
+import { estimateClaimableAt } from "./estimateClaimableAt.js";
 import { replayMulticall } from "./replayMulticall.js";
 import { previewAdjustStrategyPosition } from "./previewAdjustStrategyPosition.js";
 import { previewExitOrRepayStrategyPosition } from "./previewExitOrRepayStrategyPosition.js";
@@ -65,11 +66,15 @@ async function previewMulticallOperation(input, operation, options) {
 	const convert = (token, to, amount) => market.priceOracle.convert(token, to, amount);
 	const meta = sdk.tokensMeta.get(market.underlying);
 	const receivedToken = meta && sdk.tokensMeta.isRWAUnderlying(meta) ? meta.asset : market.underlying;
+	const suite = sdk.marketRegister.findCreditManager(operation.creditManager);
 	return {
 		operation: "DelayedCreditAccountOperation",
 		creditAccount: operation.creditAccount,
-		...creditOperationMarket(sdk.marketRegister.findCreditManager(operation.creditManager)),
+		...creditOperationMarket(suite),
+		name: suite.accountStrategyName(operation.creditAccount),
+		targetCollateral: suite.accountTargetCollateral(operation.creditAccount),
 		intent: delayed.intent,
+		estClaimableAt: estimateClaimableAt(sdk, delayed.request.phantomToken),
 		instantPreview,
 		delayedPreview: buildDelayedStrategyPositionOperationPreview(after.account, before, delayed, convert, receivedToken, sdk)
 	};

package/dist/esm/preview/preview/previewPoolPositionOperation.js

@@ -15,6 +15,7 @@ async function previewPoolPositionOperation(input, operation, options) {
 		operation: operation.operation,
 		pool: operation.pool,
 		name: sdk.tokensMeta.mustGetToken(operation.pool).name,
+		underlyingToken: market.underlyingToken,
 		shareRate: market.pool.pool.dieselRate,
 		tokenIn: market.priceOracle.toTokenAmount(tokenIn, sim.amountIn),
 		tokenOut: market.priceOracle.toTokenAmount(tokenOut, sim.amountOut)

package/dist/types/model/liquidations.schema.d.ts

@@ -20,6 +20,15 @@ declare const liquidatableAccountFilterSchema: z.ZodObject<{
 declare const liquidatableAccountSchema: z.ZodObject<{
   creditManager: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
   name: z.ZodString;
+  underlyingToken: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+    symbol: z.ZodString;
+    name: z.ZodString;
+    decimals: z.ZodNumber;
+    assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+  }, z.core.$strip>;
   curator: z.ZodObject<{
     address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
     name: z.ZodOptional<z.ZodEnum<{
@@ -212,6 +221,15 @@ declare const liquidationPositionSchema: z.ZodObject<{
 declare const liquidationDetailsSchema: z.ZodObject<{
   creditManager: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
   name: z.ZodString;
+  underlyingToken: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+    symbol: z.ZodString;
+    name: z.ZodString;
+    decimals: z.ZodNumber;
+    assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+  }, z.core.$strip>;
   curator: z.ZodObject<{
     address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
     name: z.ZodOptional<z.ZodEnum<{

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

@@ -1,4 +1,4 @@
-import { Bps, ChainId, Leverage, TokenAmount } from "./primitives.js";
+import { Bps, ChainId, Leverage, Timestamp, Token, TokenAmount, UnderlyingToken } from "./primitives.js";
 import { Curator } from "./curators.js";
 import { DelayedIntent } from "./delayed-intents.js";
 import { BorrowRateBreakdown } from "./positions.js";
@@ -112,6 +112,13 @@ interface PoolPositionOperationPreview {
    * Human-readable pool name
    */
   name: string;
+  /**
+   * Pool underlying token.
+   *
+   * For RWA markets this is the unwrapped asset, e.g. USDC rather than
+   * dcUSDC (the pool's on-chain underlying). Same as {@link PoolPosition.underlyingToken}.
+   */
+  underlyingToken: UnderlyingToken;
   /**
    * Token that goes from user to pool
    * In case of deposit, underlying for direct deposit, zapper input for zapper-routed deposit
@@ -157,9 +164,18 @@ interface CreditOperationMarket {
    */
   creditManager: Address;
   /**
-   * Human-readable credit manager name.
+   * Human-readable strategy name, e.g. `"wstETH / WETH"`. Same as
+   * {@link StrategyPosition.name}
    */
   name: string;
+  /**
+   * Pool underlying token.
+   *
+   * For RWA markets this is the unwrapped asset, e.g. USDC rather than
+   * dcUSDC (the pool's on-chain underlying). Same as
+   * {@link StrategyPosition.underlyingToken}.
+   */
+  underlyingToken: UnderlyingToken;
   /**
    * Curator of the market {@link creditManager} belongs to, in the same shape
    * {@link StrategyOpportunity} reports it: the market configurator's address,
@@ -403,6 +419,11 @@ interface AdjustStrategyPositionPreview extends EstimatedProjection, AccountStat
    * Credit account that is being adjusted
    */
   creditAccount: Address;
+  /**
+   * Collateral token this position is a strategy in. Same as
+   * {@link StrategyPosition.targetCollateral}
+   */
+  targetCollateral: Token | null;
   /**
    * Tokens that were added as collateral during account opening.
    *
@@ -448,6 +469,11 @@ interface ExitStrategyPositionPreview extends CreditOperationMarket {
    * Credit account that is being closed
    */
   creditAccount: Address;
+  /**
+   * Collateral token this position is a strategy in. Same as
+   * {@link StrategyPosition.targetCollateral}
+   */
+  targetCollateral: Token | null;
   /**
    * Token withdrawn to the user and its minimal guaranteed amount, from the
    * multicall replay (all collateral is swapped into the received token
@@ -488,6 +514,11 @@ interface RepayStrategyPositionPreview extends CreditOperationMarket {
    * Credit account that is being repaid
    */
   creditAccount: Address;
+  /**
+   * Collateral token this position is a strategy in. Same as
+   * {@link StrategyPosition.targetCollateral}
+   */
+  targetCollateral: Token | null;
   /**
    * Tokens added from the wallet to cover the debt (`addCollateral` calls).
    *
@@ -539,11 +570,22 @@ interface DelayedStrategyPositionOperationPreview extends CreditOperationMarket
    * Credit account the operation is performed on
    */
   creditAccount: Address;
+  /**
+   * Collateral token this position is a strategy in. Same as
+   * {@link StrategyPosition.targetCollateral}
+   */
+  targetCollateral: Token | null;
   /**
    * Decoded from the withdrawal request's extraData; undefined when the
    * request carries no intent (e.g. Mellow)
    */
   intent?: DelayedIntent;
+  /**
+   * Estimated unix timestamp (seconds) when the delayed outputs become
+   * claimable: `now + withdrawalLength` of phantom token.
+   * Undefined when the compressor has no information about the asset.
+   */
+  estClaimableAt?: Timestamp;
   /**
    * What this transaction does right now: the delayed withdrawal is
    * represented by the phantom token among the account's assets

package/dist/types/onchain/market/credit/CreditSuite.d.ts

@@ -1,4 +1,4 @@
-import { Timestamp } from "../../../model/primitives.js";
+import { Timestamp, Token, UnderlyingToken } from "../../../model/primitives.js";
 import { StrategyOpportunity, StrategyOpportunityDetail } from "../../../model/opportunities.js";
 import "../../../model/index.js";
 import { CreditAccountData, CreditSuiteState } from "../../base/types.js";
@@ -71,6 +71,14 @@ declare class CreditSuite extends SDKConstruct {
    * Token borrowed from the pool and used as the account debt asset.
    */
   get underlying(): Address;
+  /**
+   * Pool underlying token as the shared read model describes it.
+   *
+   * For RWA markets this is the unwrapped asset, e.g. USDC rather than
+   * dcUSDC (the pool's on-chain underlying). Same as
+   * {@link MarketSuite.underlyingToken}.
+   */
+  get underlyingToken(): UnderlyingToken;
   /**
    * Parent market that contains this credit manager
    */
@@ -164,6 +172,24 @@ declare class CreditSuite extends SDKConstruct {
    * or `undefined` when {@link strategyTargetCollateral} cannot be resolved.
    */
   get strategyName(): string | undefined;
+  /**
+   * Collateral token an existing credit account in this suite is a strategy
+   * in. Same as {@link StrategyPosition.targetCollateral}.
+   *
+   * Resolution, in order:
+   * 1. a hardcoded per-account override, when present;
+   * 2. {@link strategyTargetCollateral};
+   * 3. `null` when neither can be resolved.
+   */
+  accountTargetCollateral(creditAccount: Address): Token | null;
+  /**
+   * Display name of an existing credit account in this suite, e.g.
+   * `"wstETH / WETH"`. Same as {@link StrategyPosition.name}.
+   *
+   * {@link accountTargetCollateral} over the underlying, or the underlying
+   * symbol when no target can be resolved.
+   */
+  accountStrategyName(creditAccount: Address): string;
   /**
    * Describes this suite's leveraged strategy as the shared read model does,
    * or `undefined` when {@link strategyTargetCollateral} cannot be resolved or

package/dist/types/onchain/market/credit/creditOperationMarket.d.ts

@@ -16,7 +16,7 @@ declare function totalLiquidationDiscount(suite: CreditSuite): Bps;
 /**
  * The market half of every credit operation result, read off the suite that
  * serves it: a preview, a projection, the open-strategy walk and a
- * liquidatable-account row all spread it, so the four fields are filled in one
+ * liquidatable-account row all spread it, so the five fields are filled in one
  * place and cannot drift apart between the halves of the SDK.
  *
  * The curator comes from the same getter {@link CreditSuite.strategyOpportunity}

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

@@ -32,6 +32,7 @@ import { buildDelayedStrategyPositionOperationPreview } from "./preview/buildDel
 import { classifyCloseOrRepay, isCloseOrRepay } from "./preview/detectCloseOrRepay.js";
 import { DetectedDelayedClaim, detectDelayedClaim, resolveDelayedClaimIntent } from "./preview/detectDelayedClaim.js";
 import { UnsupportedOperationError } from "./preview/errors.js";
+import { estimateClaimableAt } from "./preview/estimateClaimableAt.js";
 import { previewAdjustStrategyPosition } from "./preview/previewAdjustStrategyPosition.js";
 import { CloseOrRepayOperation, previewExitOrRepayStrategyPosition } from "./preview/previewExitOrRepayStrategyPosition.js";
 import { previewOperation } from "./preview/previewOperation.js";
@@ -41,4 +42,4 @@ import "./preview/index.js";
 import { CheckOperationOptions, WeighedFactors, checkOperation, collateralIssue, marketIssues, quotaCountIssue } from "./validate/checkOperation.js";
 import { checkSimulation } from "./validate/checkSimulation.js";
 import "./validate/index.js";
-export { AdapterOperation, AdapterOperationBase, AddCollateralOp, AllowanceDetail, AllowancePrerequisite, AllowanceResult, BalanceDetail, BalancePrerequisite, BalanceResult, BorrowLimitBinding, CheckOperationOptions, ClassifyInnerOperationsProps, CloseCreditAccountOperation, CloseOrRepayOperation, CompareBalancesOp, CreditAccountOperation, CreditAccountState, CreditAccountStateProps, DecreaseDebtOp, DetectedDelayedClaim, DetectedDelayedOperation, DirectTokenTransferOperation, ExtractTransfersResult, FacadeCallType, FacadeOperationMetadata, FacadeParsedCall, IncreaseDebtOp, InnerFacadeOperation, InnerOperation, IntentPreviewError, LiquidateCreditAccountOperation, MulticallOperation, OpenCreditAccountOperation, Operation, OperationMetadata, OuterFacadeOperation, PartialLiquidationOperation, PoolDepositOperation, PoolMintOperation, PoolOperation, PoolRedeemOperation, PoolWithdrawOperation, Prerequisite, PrerequisiteContext, PrerequisiteError, PrerequisiteKind, PrerequisiteOutcome, PrerequisiteResult, PreviewErrorDetails, PreviewErrorReason, PreviewIssue, PreviewOperationInput, PreviewOperationOptions, PreviewRefusal, RWAMulticallOperation, RWAOpenCreditAccountOperation, RWAOpenRequirementsDetail, RWAOpenRequirementsPrerequisite, RWAOpenRequirementsResult, RWAOperation, RWAOperationMetadata, ReplayMulticallResult, ReplayState, ReplayableOperation, StoreExpectedBalancesOp, TokenTransfer, TraceAdapterExt, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, UpdateQuotaOp, WeighedFactors, WithdrawCollateralAlignmentError, WithdrawCollateralEventInfo, WithdrawCollateralOp, buildDelayedStrategyPositionOperationPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { AdapterOperation, AdapterOperationBase, AddCollateralOp, AllowanceDetail, AllowancePrerequisite, AllowanceResult, BalanceDetail, BalancePrerequisite, BalanceResult, BorrowLimitBinding, CheckOperationOptions, ClassifyInnerOperationsProps, CloseCreditAccountOperation, CloseOrRepayOperation, CompareBalancesOp, CreditAccountOperation, CreditAccountState, CreditAccountStateProps, DecreaseDebtOp, DetectedDelayedClaim, DetectedDelayedOperation, DirectTokenTransferOperation, ExtractTransfersResult, FacadeCallType, FacadeOperationMetadata, FacadeParsedCall, IncreaseDebtOp, InnerFacadeOperation, InnerOperation, IntentPreviewError, LiquidateCreditAccountOperation, MulticallOperation, OpenCreditAccountOperation, Operation, OperationMetadata, OuterFacadeOperation, PartialLiquidationOperation, PoolDepositOperation, PoolMintOperation, PoolOperation, PoolRedeemOperation, PoolWithdrawOperation, Prerequisite, PrerequisiteContext, PrerequisiteError, PrerequisiteKind, PrerequisiteOutcome, PrerequisiteResult, PreviewErrorDetails, PreviewErrorReason, PreviewIssue, PreviewOperationInput, PreviewOperationOptions, PreviewRefusal, RWAMulticallOperation, RWAOpenCreditAccountOperation, RWAOpenRequirementsDetail, RWAOpenRequirementsPrerequisite, RWAOpenRequirementsResult, RWAOperation, RWAOperationMetadata, ReplayMulticallResult, ReplayState, ReplayableOperation, StoreExpectedBalancesOp, TokenTransfer, TraceAdapterExt, TransferAlignmentError, UnexpectedFacadeEventOrderError, UnknownAdapterError, UnknownFacadeCallError, UnsupportedOperationError, UnsupportedPoolFunctionError, UnsupportedTargetError, UnsupportedZapperFunctionError, UpdateQuotaOp, WeighedFactors, WithdrawCollateralAlignmentError, WithdrawCollateralEventInfo, WithdrawCollateralOp, buildDelayedStrategyPositionOperationPreview, checkOperation, checkPrerequisites, checkSimulation, classifyCloseOrRepay, classifyInnerOperations, collateralIssue, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, extractAdapterCallTraces, extractTransfers, findFacadeCalls, isCloseOrRepay, isPoolOperation, isRWAOperation, makeReplayState, marketIssues, parseFacadeOperationCalldata, parseOperationCalldata, parsePoolOperationCalldata, parseRWAFactoryOperationCalldata, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, quotaCountIssue, raise, refuse, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/dist/types/preview/preview/estimateClaimableAt.d.ts

@@ -0,0 +1,19 @@
+import { Timestamp } from "../../model/primitives.js";
+import "../../model/index.js";
+import { PluginsMap } from "../../onchain/plugins/types.js";
+import { OnchainSDK } from "../../onchain/OnchainSDK.js";
+import "../../onchain/index.js";
+import { Address } from "viem";
+//#region src/preview/preview/estimateClaimableAt.d.ts
+/**
+ * Estimates when a newly requested delayed withdrawal becomes claimable:
+ * `now + withdrawalLength` of the cached withdrawable asset whose phantom
+ * token matches `phantomToken`. Same formula as
+ * `getWithdrawalRequestResult().claimableAt`.
+ *
+ * Returns `undefined` when the withdrawal compressor is missing, its assets
+ * cache is not loaded, or no asset matches the phantom token.
+ */
+declare function estimateClaimableAt<P extends PluginsMap>(sdk: OnchainSDK<P>, phantomToken: Address): Timestamp | undefined;
+//#endregion
+export { estimateClaimableAt };

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

@@ -4,9 +4,10 @@ import { buildDelayedStrategyPositionOperationPreview } from "./buildDelayedStra
 import { classifyCloseOrRepay, isCloseOrRepay } from "./detectCloseOrRepay.js";
 import { DetectedDelayedClaim, detectDelayedClaim, resolveDelayedClaimIntent } from "./detectDelayedClaim.js";
 import { UnsupportedOperationError } from "./errors.js";
+import { estimateClaimableAt } from "./estimateClaimableAt.js";
 import { previewAdjustStrategyPosition } from "./previewAdjustStrategyPosition.js";
 import { CloseOrRepayOperation, previewExitOrRepayStrategyPosition } from "./previewExitOrRepayStrategyPosition.js";
 import { previewOperation } from "./previewOperation.js";
 import { ReplayState, makeReplayState, replayInnerOperations } from "./replayInnerOperations.js";
 import { ReplayMulticallResult, ReplayableOperation, replayMulticall } from "./replayMulticall.js";
-export { CloseOrRepayOperation, CreditAccountState, CreditAccountStateProps, DetectedDelayedClaim, DetectedDelayedOperation, ReplayMulticallResult, ReplayState, ReplayableOperation, UnsupportedOperationError, buildDelayedStrategyPositionOperationPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, isCloseOrRepay, makeReplayState, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };
+export { CloseOrRepayOperation, CreditAccountState, CreditAccountStateProps, DetectedDelayedClaim, DetectedDelayedOperation, ReplayMulticallResult, ReplayState, ReplayableOperation, UnsupportedOperationError, buildDelayedStrategyPositionOperationPreview, classifyCloseOrRepay, detectDelayedClaim, detectDelayedOperation, estimateClaimableAt, isCloseOrRepay, makeReplayState, previewAdjustStrategyPosition, previewExitOrRepayStrategyPosition, previewOperation, replayInnerOperations, replayMulticall, resolveDelayedClaimIntent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "16.0.0-next.36",
+  "version": "16.0.0-next.38",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {