@gearbox-protocol/sdk 15.1.0-next.19 → 15.1.0-next.20

package/dist/cjs/sdk/index.js

@@ -8,7 +8,6 @@ const require_sdk_utils_bigint_math = require("./utils/bigint-math.js");
 const require_sdk_utils_bytes32ToString = require("./utils/bytes32ToString.js");
 const require_sdk_utils_childLogger = require("./utils/childLogger.js");
 const require_sdk_utils_createRawTx = require("./utils/createRawTx.js");
-const require_sdk_utils_mappers = require("./utils/mappers.js");
 const require_sdk_chain_chains = require("./chain/chains.js");
 const require_sdk_chain_detectNetwork = require("./chain/detectNetwork.js");
 require("./chain/index.js");
@@ -17,6 +16,7 @@ const require_sdk_constants_address_provider = require("./constants/address-prov
 const require_sdk_constants_addresses = require("./constants/addresses.js");
 const require_sdk_constants_bot_permissions = require("./constants/bot-permissions.js");
 const require_sdk_constants_math = require("./constants/math.js");
+const require_sdk_utils_mappers = require("./utils/mappers.js");
 const require_sdk_constants_networks = require("./constants/networks.js");
 const require_sdk_constants_periphery = require("./constants/periphery.js");
 const require_sdk_constants_versions = require("./constants/versions.js");
@@ -134,8 +134,8 @@ const require_sdk_market_credit_CreditFacadeV310BaseContract = require("./market
 const require_sdk_market_credit_CreditFacadeV310Contract = require("./market/credit/CreditFacadeV310Contract.js");
 const require_sdk_market_math = require("./market/math.js");
 const require_sdk_market_credit_CreditManagerV310Contract = require("./market/credit/CreditManagerV310Contract.js");
-const require_sdk_market_credit_dominantCollateral = require("./market/credit/dominantCollateral.js");
-const require_sdk_market_credit_isStrategyCollateral = require("./market/credit/isStrategyCollateral.js");
+const require_sdk_market_strategyName = require("./market/strategyName.js");
+const require_sdk_market_credit_collateralUtils = require("./market/credit/collateralUtils.js");
 const require_sdk_market_credit_CreditSuite = require("./market/credit/CreditSuite.js");
 const require_sdk_market_credit_expectedBalanceDeltas = require("./market/credit/expectedBalanceDeltas.js");
 const require_sdk_utils_viem_simulateMulticall = require("./utils/viem/simulateMulticall.js");
@@ -370,7 +370,7 @@ exports.MultichainOpportunitiesService = require_sdk_opportunities_MultichainOpp
 exports.MultichainPositionsService = require_sdk_positions_MultichainPositionsService.MultichainPositionsService;
 exports.MultichainSDK = require_sdk_MultichainSDK.MultichainSDK;
 exports.NATIVE_ADDRESS = require_sdk_constants_addresses.NATIVE_ADDRESS;
-exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = require_sdk_market_credit_isStrategyCollateral.NON_STRATEGY_PHANTOM_TOKEN_TYPES;
+exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = require_sdk_market_credit_collateralUtils.NON_STRATEGY_PHANTOM_TOKEN_TYPES;
 exports.NOT_DEPLOYED = require_sdk_constants_addresses.NOT_DEPLOYED;
 exports.NO_VERSION = require_sdk_constants_address_provider.NO_VERSION;
 exports.NetworkType = require_sdk_chain_chains.NetworkType;
@@ -495,7 +495,7 @@ exports.curveAddLiquidityFromTransfers = require_sdk_market_adapters_transferHel
 exports.curveRemoveLiquidityFromTransfers = require_sdk_market_adapters_transferHelpers.curveRemoveLiquidityFromTransfers;
 exports.decodeDelayedIntent = require_sdk_accounts_withdrawal_compressor_intent_codec.decodeDelayedIntent;
 exports.detectNetwork = require_sdk_chain_detectNetwork.detectNetwork;
-exports.dominantCollateral = require_sdk_market_credit_dominantCollateral.dominantCollateral;
+exports.dominantCollateral = require_sdk_market_credit_collateralUtils.dominantCollateral;
 exports.encodeDelayedIntent = require_sdk_accounts_withdrawal_compressor_intent_codec.encodeDelayedIntent;
 exports.erc4626ReferralAdapterAbi = require_sdk_market_adapters_abi_adapters_erc4626ReferralAdapter.erc4626ReferralAdapterAbi;
 exports.estimateRawTxGas = require_sdk_utils_viem_sendRawTx.estimateRawTxGas;
@@ -521,6 +521,7 @@ exports.formatTimestamp = require_sdk_utils_formatter.formatTimestamp;
 exports.functionArgsToMap = require_sdk_utils_abi_decode.functionArgsToMap;
 exports.functionArgsToRecord = require_sdk_utils_abi_decode.functionArgsToRecord;
 exports.generateCastTraceCall = require_sdk_utils_viem_cast.generateCastTraceCall;
+exports.getAccountTargetCollateral = require_sdk_chain_chains.getAccountTargetCollateral;
 exports.getAdapterActionAbi = require_sdk_market_adapters_abi_utils.getAdapterActionAbi;
 exports.getAdapterDeployParamsAbi = require_sdk_market_adapters_abi_utils.getAdapterDeployParamsAbi;
 exports.getAdapterType = require_sdk_market_adapters_abi_utils.getAdapterType;
@@ -529,9 +530,11 @@ exports.getCastTraceArgs = require_sdk_utils_viem_cast.getCastTraceArgs;
 exports.getChain = require_sdk_chain_chains.getChain;
 exports.getCuratorName = require_sdk_chain_chains.getCuratorName;
 exports.getFunctionSignature = require_sdk_utils_abi_decode.getFunctionSignature;
+exports.getLegacyStrategyTarget = require_sdk_chain_chains.getLegacyStrategyTarget;
 exports.getNetworkType = require_sdk_chain_chains.getNetworkType;
 exports.getRawPriceUpdates = require_sdk_market_pricefeeds_getRawPriceUpdates.getRawPriceUpdates;
 exports.getSimulateWithPriceUpdatesError = require_sdk_utils_viem_simulateWithPriceUpdates.getSimulateWithPriceUpdatesError;
+exports.getTokenPrettyName = require_sdk_chain_chains.getTokenPrettyName;
 exports.getWithdrawalCompressorAddress = require_sdk_accounts_withdrawal_compressor_addresses.getWithdrawalCompressorAddress;
 exports.halfRAY = require_sdk_constants_math.halfRAY;
 exports.hasAdapterDeployParamsAbi = require_sdk_market_adapters_abi_utils.hasAdapterDeployParamsAbi;
@@ -612,7 +615,7 @@ exports.isLPPriceFeed = require_sdk_market_pricefeeds_AbstractLPPriceFeed.isLPPr
 exports.isPublicNetwork = require_sdk_chain_chains.isPublicNetwork;
 exports.isRWAFactory = require_sdk_market_rwa_types.isRWAFactory;
 exports.isRWAToken = require_sdk_chain_chains.isRWAToken;
-exports.isStrategyCollateral = require_sdk_market_credit_isStrategyCollateral.isStrategyCollateral;
+exports.isStrategyCollateral = require_sdk_market_credit_collateralUtils.isStrategyCollateral;
 exports.isSunsetPool = require_sdk_chain_chains.isSunsetPool;
 exports.isSunsetStrategy = require_sdk_chain_chains.isSunsetStrategy;
 exports.isSupportedNetwork = require_sdk_chain_chains.isSupportedNetwork;
@@ -626,7 +629,6 @@ exports.json_stringify = require_sdk_utils_json.json_stringify;
 exports.lidoV1_WETHGatewayAbi = require_sdk_market_adapters_abi_targetContractAbi.lidoV1_WETHGatewayAbi;
 exports.mellowDvvAdapterAbi = require_sdk_market_adapters_abi_adapters_mellowDvvAdapter.mellowDvvAdapterAbi;
 exports.minSeizedAmount = require_sdk_market_math.minSeizedAmount;
-exports.mustGetDominantCollateral = require_sdk_market_credit_dominantCollateral.mustGetDominantCollateral;
 exports.numberWithCommas = require_sdk_utils_formatter.numberWithCommas;
 exports.onchainSDKOptionsSchema = require_sdk_options.onchainSDKOptionsSchema;
 exports.optimalHFForPartialLiquidation = require_sdk_market_math.optimalHFForPartialLiquidation;
@@ -635,6 +637,7 @@ exports.parseAdapterAction = require_sdk_market_adapters_abi_utils.parseAdapterA
 exports.parseAdapterDeployParams = require_sdk_market_adapters_abi_utils.parseAdapterDeployParams;
 exports.parsePosNegAmount = require_sdk_market_adapters_transferHelpers.parsePosNegAmount;
 exports.percentFmt = require_sdk_utils_formatter.percentFmt;
+exports.pickStrategyTargetCollateral = require_sdk_market_credit_collateralUtils.pickStrategyTargetCollateral;
 exports.rayToBps = require_sdk_market_math.rayToBps;
 exports.rayToNumber = require_sdk_utils_formatter.rayToNumber;
 exports.retry = require_sdk_utils_retry.retry;
@@ -645,6 +648,7 @@ exports.shortHash = require_sdk_utils_formatter.shortHash;
 exports.simulateCall = require_sdk_utils_viem_simulateCall.simulateCall;
 exports.simulateMulticall = require_sdk_utils_viem_simulateMulticall.simulateMulticall;
 exports.simulateWithPriceUpdates = require_sdk_utils_viem_simulateWithPriceUpdates.simulateWithPriceUpdates;
+exports.strategyName = require_sdk_market_strategyName.strategyName;
 exports.swapFromTransfers = require_sdk_market_adapters_transferHelpers.swapFromTransfers;
 exports.toAddress = require_sdk_utils_toAddress.toAddress;
 exports.toBN = require_sdk_utils_formatter.toBN;

package/dist/cjs/sdk/market/MarketSuite.js

@@ -17,7 +17,6 @@ const require_sdk_market_oracle_createPriceOracle = require("./oracle/createPric
 require("./oracle/index.js");
 const require_sdk_market_pool_PoolSuite = require("./pool/PoolSuite.js");
 require("./pool/index.js");
-let viem = require("viem");
 //#region src/sdk/market/MarketSuite.ts
 /**
 * Aggregates all SDK wrappers that make up one Gearbox market.
@@ -137,22 +136,12 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		return this.configurator.curator;
 	}
 	/**
-	* Every `(credit suite, collateral)` pair of this market that qualifies as a
-	* leveraged position.
-	*/
-	get strategies() {
-		return this.creditManagers.flatMap((suite) => suite.strategyCollaterals.map((collateral) => ({
-			suite,
-			collateral
-		})));
-	}
-	/**
 	* Tokens a position can actually be built on in this market, deduplicated
 	* across its credit suites.
 	*/
 	get collateralTokens() {
 		const seen = new require_sdk_utils_AddressMap.AddressMap(void 0, "collateralTokens");
-		for (const { collateral } of this.strategies) seen.upsert(collateral, this.tokensMeta.mustGetToken(collateral));
+		for (const suite of this.creditManagers) for (const collateral of suite.strategyCollaterals) seen.upsert(collateral, this.tokensMeta.mustGetToken(collateral));
 		return seen.values();
 	}
 	/**
@@ -160,7 +149,7 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	* token. Read from a hardcoded per-chain list rather than from the chain.
 	*/
 	get rwa() {
-		return this.strategies.some(({ collateral }) => require_sdk_chain_chains.isRWAToken(collateral, this.sdk.networkType));
+		return this.collateralTokens.some((token) => require_sdk_chain_chains.isRWAToken(token.address, this.sdk.networkType));
 	}
 	/**
 	* Whether this market's pool is being wound down and should no longer be
@@ -195,8 +184,8 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		return this.priceOracle.priceFeedSummary(this.underlying, collateral);
 	}
 	/**
-	* Every opportunity this market offers: its pool, plus one row per
-	* `(credit manager, target collateral)` pair.
+	* Every opportunity this market offers: its pool, plus one row per credit
+	* manager that qualifies as a strategy.
 	*
 	* @param filter - Optional narrowing. A filter naming a kind skips building
 	* the other kind entirely; every built row is then checked in full by
@@ -207,7 +196,10 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		const rows = [];
 		const kind = filter?.kind;
 		if (!require_model_filters.isFilterSet(kind) || kind === "pool") rows.push(this.poolOpportunity());
-		if (!require_model_filters.isFilterSet(kind) || kind === "strategy") for (const { suite, collateral } of this.strategies) rows.push(suite.strategyOpportunity(collateral));
+		if (!require_model_filters.isFilterSet(kind) || kind === "strategy") for (const suite of this.creditManagers) {
+			const opportunity = suite.strategyOpportunity();
+			if (opportunity) rows.push(opportunity);
+		}
 		return rows.filter((row) => require_model_opportunities.matchesOpportunityFilter(row, filter));
 	}
 	/**
@@ -246,29 +238,6 @@ var MarketSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		};
 	}
 	/**
-	* Resolves a strategy of this market by its two halves.
-	*
-	* @param creditManager - Credit manager the position is opened in.
-	* @param collateral - Target collateral of the position.
-	* @throws If this market has no such credit manager, or if that manager does
-	* not accept the collateral as a strategy.
-	*/
-	mustFindStrategy(creditManager, collateral) {
-		const strategy = this.strategies.find((s) => (0, viem.isAddressEqual)(s.suite.creditManager.address, creditManager) && (0, viem.isAddressEqual)(s.collateral, collateral));
-		if (!strategy) throw new Error(`${this.labelAddress(collateral)} is not a strategy collateral of credit manager ${this.labelAddress(creditManager)}`);
-		return strategy;
-	}
-	/**
-	* Detailed view of one leveraged position of this market.
-	*
-	* @param creditManager - Credit manager the position is opened in.
-	* @param collateral - Target collateral of the position.
-	* @throws If this market has no such strategy, see {@link mustFindStrategy}.
-	*/
-	strategyOpportunityDetail(creditManager, collateral) {
-		return this.mustFindStrategy(creditManager, collateral).suite.strategyOpportunityDetail(collateral);
-	}
-	/**
 	* Whether any child contract wrapper has observed events that require a
 	* market resync.
 	*/

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

@@ -8,11 +8,11 @@ require("../../utils/index.js");
 const require_sdk_base_SDKConstruct = require("../../base/SDKConstruct.js");
 require("../../base/index.js");
 const require_sdk_market_math = require("../math.js");
+const require_sdk_market_strategyName = require("../strategyName.js");
+const require_sdk_market_credit_collateralUtils = require("./collateralUtils.js");
 const require_sdk_market_credit_createCreditConfigurator = require("./createCreditConfigurator.js");
 const require_sdk_market_credit_createCreditFacade = require("./createCreditFacade.js");
 const require_sdk_market_credit_createCreditManager = require("./createCreditManager.js");
-const require_sdk_market_credit_dominantCollateral = require("./dominantCollateral.js");
-const require_sdk_market_credit_isStrategyCollateral = require("./isStrategyCollateral.js");
 //#region src/sdk/market/credit/CreditSuite.ts
 /**
 * SDK aggregate for one credit-manager branch inside a market.
@@ -181,22 +181,26 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	*/
 	get strategyCollaterals() {
 		if (this.maxBorrowAmount === 0n) return [];
-		const { pqk, unwrappedUnderlying } = this.market.pool;
-		const { mainPrices } = this.market.priceOracle;
-		const { tokensMeta, creditManager } = this;
-		return creditManager.collateralTokens.filter((token) => {
-			const meta = tokensMeta.mustGet(token);
-			return require_sdk_market_credit_isStrategyCollateral.isStrategyCollateral({
-				token,
-				underlying: creditManager.underlying,
-				unwrappedUnderlying,
-				liquidationThreshold: creditManager.liquidationThresholds.mustGet(token),
-				contractType: meta.contractType,
-				isExpired: meta.isExpired,
-				mainPrice: mainPrices.get(token)?.price,
-				hasActiveQuota: pqk.hasActiveQuota(token)
-			});
-		});
+		return this.creditManager.collateralTokens.filter((token) => require_sdk_market_credit_collateralUtils.isStrategyCollateral(this.#strategyCollateralProps(token), true));
+	}
+	/**
+	* The single target collateral of this suite's strategy, or `undefined` when
+	* none can be resolved.
+	*
+	* Resolution, in order:
+	* 1. a hardcoded legacy mapping for this credit manager, when that token is
+	*    still a collateral of the manager (it may be absent on an older
+	*    snapshot, or after it was delisted);
+	* 2. the collateral with the biggest index in
+	*    {@link ICreditManagerContract.collateralTokens} that
+	*    {@link isStrategyCollateral} accepts with quota required;
+	* 3. the biggest-index collateral that {@link isStrategyCollateral} accepts
+	*    without quota.
+	*/
+	get strategyTargetCollateral() {
+		const legacy = require_sdk_chain_chains.getLegacyStrategyTarget(this.creditManager.address, this.chainId);
+		if (legacy && this.creditManager.liquidationThresholds.has(legacy)) return legacy;
+		return require_sdk_market_credit_collateralUtils.pickStrategyTargetCollateral(this.creditManager.collateralTokens.map((token) => this.#strategyCollateralProps(token)));
 	}
 	/**
 	* Largest debt a single new position can take on right now: the tightest of
@@ -209,22 +213,23 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		return require_sdk_utils_bigint_math.BigIntMath.min(debtParams?.available ?? 115792089237316195423570985008687907853269984665640564039457584007913129639935n, pool.availableLiquidity, this.creditFacade.maxDebt);
 	}
 	/**
-	* Display name of a leveraged position built on one collateral token, e.g.
-	* `"wstETH / WETH"`.
-	*
-	* @param collateral - Target collateral of the position.
+	* Display name of this suite's leveraged strategy, e.g. `"wstETH / WETH"`,
+	* or `undefined` when {@link strategyTargetCollateral} cannot be resolved.
 	*/
-	strategyName(collateral) {
-		return `${this.tokensMeta.symbol(collateral)} / ${this.market.underlyingToken.symbol}`;
+	get strategyName() {
+		const collateral = this.strategyTargetCollateral;
+		if (!collateral) return;
+		return require_sdk_market_strategyName.strategyName(this.tokensMeta.mustGetToken(collateral), this.market.underlyingToken, this.chainId);
 	}
 	/**
-	* Describes a leveraged position built on one collateral token as the shared
-	* read model does.
-	*
-	* @param collateral - Target collateral of the position.
-	* @throws If the credit manager does not value the collateral.
+	* Describes this suite's leveraged strategy as the shared read model does,
+	* or `undefined` when {@link strategyTargetCollateral} cannot be resolved or
+	* {@link maxBorrowAmount} is `0`.
 	*/
-	strategyOpportunity(collateral) {
+	strategyOpportunity() {
+		if (this.maxBorrowAmount === 0n) return;
+		const collateral = this.strategyTargetCollateral;
+		if (!collateral) return;
 		const { market, creditManager: cm } = this;
 		const { pool } = market.pool;
 		const oracle = market.priceOracle;
@@ -237,7 +242,7 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 			chainId: this.chainId,
 			creditManager: cm.address,
 			targetCollateral: this.tokensMeta.mustGetToken(collateral),
-			name: this.strategyName(collateral),
+			name: this.strategyName ?? this.market.underlyingToken.symbol,
 			curator: market.curator,
 			underlyingToken: market.underlyingToken,
 			totalBorrow: oracle.toAmount(pool.underlying, borrowed),
@@ -260,14 +265,14 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	}
 	/**
 	* {@link strategyOpportunity} plus the data only its detail screen needs.
-	*
-	* @param collateral - Target collateral of the position.
 	*/
-	strategyOpportunityDetail(collateral) {
+	strategyOpportunityDetail() {
+		const opportunity = this.strategyOpportunity();
+		if (!opportunity) return;
 		return {
-			...this.strategyOpportunity(collateral),
+			...opportunity,
 			rateCurve: this.market.pool.rateCurve,
-			priceFeeds: this.market.priceFeedSummary(collateral)
+			priceFeeds: this.market.priceFeedSummary(opportunity.targetCollateral.address)
 		};
 	}
 	/**
@@ -305,7 +310,26 @@ var CreditSuite = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	* https://github.com/Gearbox-protocol/router-v3/blob/main/contracts/liquidation/AbstractLiquidator.sol#L270
 	*/
 	#bestTokenOut(ca) {
-		return require_sdk_market_credit_dominantCollateral.mustGetDominantCollateral(ca, this.market);
+		const collateral = require_sdk_market_credit_collateralUtils.dominantCollateral(ca, this.market);
+		if (!collateral) throw new Error(`cannot determine tokenOut for partial liquidation of ${this.labelAddress(ca.creditAccount)}: no enabled non-underlying collateral with value`);
+		return collateral;
+	}
+	/**
+	* Shared inputs of {@link isStrategyCollateral} for one of this suite's
+	* collateral tokens.
+	*/
+	#strategyCollateralProps(token) {
+		const meta = this.tokensMeta.mustGet(token);
+		return {
+			token,
+			underlying: this.creditManager.underlying,
+			unwrappedUnderlying: this.market.pool.unwrappedUnderlying,
+			liquidationThreshold: this.creditManager.liquidationThresholds.mustGet(token),
+			contractType: meta.contractType,
+			isExpired: meta.isExpired,
+			mainPrice: this.market.priceOracle.mainPrices.get(token)?.price,
+			hasActiveQuota: this.market.pool.pqk.hasActiveQuota(token)
+		};
 	}
 	/**
 	* Minimum amount of `token` that must be seized when repaying `repaidAmount`

package/dist/cjs/sdk/market/credit/{isStrategyCollateral.js → collateralUtils.js}

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../../constants/math.js");
 require("../../constants/index.js");
 let viem = require("viem");
-//#region src/sdk/market/credit/isStrategyCollateral.ts
+//#region src/sdk/market/credit/collateralUtils.ts
 /**
 * Withdrawal and redemption phantom tokens that can never be acquired as a
 * strategy target. Other `PHANTOM_TOKEN::*` types (Convex, Infrared, staking
@@ -34,17 +34,64 @@ const RWA_UNDERLYING_PREFIX = "RWA_UNDERLYING::";
 * - is not an expired token, e.g. a matured Pendle PT;
 * - has a non-zero main price in the market's oracle — a zero or missing
 *   answer (e.g. a failed or zero price feed) means the position cannot be
-*   valued;
-* - the market still accepts quota for.
+*   valued.
+*
+* Pass `requireQuota` as `true` to also require that the market still accepts
+* quota for the token.
 */
-function isStrategyCollateral({ token, underlying, unwrappedUnderlying, liquidationThreshold, contractType, isExpired, mainPrice, hasActiveQuota }) {
+function isStrategyCollateral({ token, underlying, unwrappedUnderlying, liquidationThreshold, contractType, isExpired, mainPrice, hasActiveQuota }, requireQuota = false) {
 	if ((0, viem.isAddressEqual)(token, underlying) || (0, viem.isAddressEqual)(token, unwrappedUnderlying)) return false;
 	if (liquidationThreshold <= 0 || liquidationThreshold >= Number(10000n)) return false;
 	if (contractType && (NON_STRATEGY_PHANTOM_TOKEN_TYPE_SET.has(contractType) || contractType.startsWith(RWA_UNDERLYING_PREFIX))) return false;
 	if (isExpired) return false;
 	if (!mainPrice) return false;
-	return hasActiveQuota;
+	return !requireQuota || hasActiveQuota;
+}
+/**
+* Picks the single strategy target from a credit manager's collateral list.
+*
+* Walks {@link tokens} from the end (biggest index first) and returns the
+* first token that {@link isStrategyCollateral} accepts with quota required.
+* If none has an active quota, returns the biggest-index candidate that
+* qualifies without quota. `undefined` when nothing qualifies. A hardcoded
+* legacy mapping, when present, is applied by the caller before this function.
+**/
+function pickStrategyTargetCollateral(tokens) {
+	let quotaless;
+	for (let i = tokens.length - 1; i >= 0; i--) {
+		const props = tokens[i];
+		if (!isStrategyCollateral(props)) continue;
+		if (isStrategyCollateral(props, true)) return props.token;
+		quotaless ??= props.token;
+	}
+	return quotaless;
+}
+/**
+* The account's dominant collateral: the most valuable enabled non-underlying
+* token it holds above dust, by USD value.
+*
+* Used to pick the collateral a partial liquidation seizes by default.
+*
+* @param account - Account to inspect.
+* @param market - Market of the account, whose oracle prices the candidates.
+* @returns The dominant collateral, or `undefined` when the account holds
+* nothing but its underlying, or nothing the oracle can price.
+**/
+function dominantCollateral(account, market) {
+	let bestValue = 0;
+	let dominant;
+	for (const t of account.tokens) {
+		if ((0, viem.isAddressEqual)(t.token, account.underlying) || (t.mask & account.enabledTokensMask) === 0n || t.balance <= 10n) continue;
+		const value = market.priceOracle.safeUsdValue(t.token, t.balance) ?? 0;
+		if (value > bestValue) {
+			bestValue = value;
+			dominant = t.token;
+		}
+	}
+	return dominant;
 }
 //#endregion
 exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = NON_STRATEGY_PHANTOM_TOKEN_TYPES;
+exports.dominantCollateral = dominantCollateral;
 exports.isStrategyCollateral = isStrategyCollateral;
+exports.pickStrategyTargetCollateral = pickStrategyTargetCollateral;

package/dist/cjs/sdk/market/credit/index.js

@@ -3,8 +3,7 @@ const require_sdk_market_credit_CreditConfiguratorV310Contract = require("./Cred
 const require_sdk_market_credit_CreditFacadeV310BaseContract = require("./CreditFacadeV310BaseContract.js");
 const require_sdk_market_credit_CreditFacadeV310Contract = require("./CreditFacadeV310Contract.js");
 const require_sdk_market_credit_CreditManagerV310Contract = require("./CreditManagerV310Contract.js");
-const require_sdk_market_credit_dominantCollateral = require("./dominantCollateral.js");
-const require_sdk_market_credit_isStrategyCollateral = require("./isStrategyCollateral.js");
+const require_sdk_market_credit_collateralUtils = require("./collateralUtils.js");
 const require_sdk_market_credit_CreditSuite = require("./CreditSuite.js");
 const require_sdk_market_credit_expectedBalanceDeltas = require("./expectedBalanceDeltas.js");
 require("./types.js");
@@ -13,9 +12,9 @@ exports.CreditFacadeV310BaseContract = require_sdk_market_credit_CreditFacadeV31
 exports.CreditFacadeV310Contract = require_sdk_market_credit_CreditFacadeV310Contract.CreditFacadeV310Contract;
 exports.CreditManagerV310Contract = require_sdk_market_credit_CreditManagerV310Contract.CreditManagerV310Contract;
 exports.CreditSuite = require_sdk_market_credit_CreditSuite.CreditSuite;
-exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = require_sdk_market_credit_isStrategyCollateral.NON_STRATEGY_PHANTOM_TOKEN_TYPES;
+exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = require_sdk_market_credit_collateralUtils.NON_STRATEGY_PHANTOM_TOKEN_TYPES;
 exports.creditFacadeV310Abi = require_sdk_market_credit_CreditFacadeV310BaseContract.creditFacadeV310Abi;
-exports.dominantCollateral = require_sdk_market_credit_dominantCollateral.dominantCollateral;
+exports.dominantCollateral = require_sdk_market_credit_collateralUtils.dominantCollateral;
 exports.expectedBalanceDeltas = require_sdk_market_credit_expectedBalanceDeltas.expectedBalanceDeltas;
-exports.isStrategyCollateral = require_sdk_market_credit_isStrategyCollateral.isStrategyCollateral;
-exports.mustGetDominantCollateral = require_sdk_market_credit_dominantCollateral.mustGetDominantCollateral;
+exports.isStrategyCollateral = require_sdk_market_credit_collateralUtils.isStrategyCollateral;
+exports.pickStrategyTargetCollateral = require_sdk_market_credit_collateralUtils.pickStrategyTargetCollateral;

package/dist/cjs/sdk/market/index.js

@@ -90,8 +90,8 @@ const require_sdk_market_credit_CreditFacadeV310BaseContract = require("./credit
 const require_sdk_market_credit_CreditFacadeV310Contract = require("./credit/CreditFacadeV310Contract.js");
 const require_sdk_market_math = require("./math.js");
 const require_sdk_market_credit_CreditManagerV310Contract = require("./credit/CreditManagerV310Contract.js");
-const require_sdk_market_credit_dominantCollateral = require("./credit/dominantCollateral.js");
-const require_sdk_market_credit_isStrategyCollateral = require("./credit/isStrategyCollateral.js");
+const require_sdk_market_strategyName = require("./strategyName.js");
+const require_sdk_market_credit_collateralUtils = require("./credit/collateralUtils.js");
 const require_sdk_market_credit_CreditSuite = require("./credit/CreditSuite.js");
 const require_sdk_market_credit_expectedBalanceDeltas = require("./credit/expectedBalanceDeltas.js");
 require("./credit/index.js");
@@ -200,7 +200,7 @@ exports.MidasGatewayAdapterContract = require_sdk_market_adapters_contracts_Mida
 exports.MidasIssuanceVaultAdapterContract = require_sdk_market_adapters_contracts_MidasIssuanceVaultAdapterContract.MidasIssuanceVaultAdapterContract;
 exports.MidasLiquidatorContract = require_sdk_market_rwa_midas_MidasLiquidatorContract.MidasLiquidatorContract;
 exports.MidasRedemptionVaultAdapterContract = require_sdk_market_adapters_contracts_MidasRedemptionVaultAdapterContract.MidasRedemptionVaultAdapterContract;
-exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = require_sdk_market_credit_isStrategyCollateral.NON_STRATEGY_PHANTOM_TOKEN_TYPES;
+exports.NON_STRATEGY_PHANTOM_TOKEN_TYPES = require_sdk_market_credit_collateralUtils.NON_STRATEGY_PHANTOM_TOKEN_TYPES;
 exports.PARTIAL_LIQUIDATION_BUFFER_BPS = require_sdk_market_math.PARTIAL_LIQUIDATION_BUFFER_BPS;
 exports.PHANTOM_TOKEN_MIDAS_REDEMPTION = require_sdk_market_rwa_midas_constants.PHANTOM_TOKEN_MIDAS_REDEMPTION;
 exports.PHANTOM_TOKEN_SECURITIZE_REDEMPTION = require_sdk_market_rwa_securitize_constants.PHANTOM_TOKEN_SECURITIZE_REDEMPTION;
@@ -257,7 +257,7 @@ exports.createZapper = require_sdk_market_zapper_createZapper.createZapper;
 exports.creditFacadeV310Abi = require_sdk_market_credit_CreditFacadeV310BaseContract.creditFacadeV310Abi;
 exports.curveAddLiquidityFromTransfers = require_sdk_market_adapters_transferHelpers.curveAddLiquidityFromTransfers;
 exports.curveRemoveLiquidityFromTransfers = require_sdk_market_adapters_transferHelpers.curveRemoveLiquidityFromTransfers;
-exports.dominantCollateral = require_sdk_market_credit_dominantCollateral.dominantCollateral;
+exports.dominantCollateral = require_sdk_market_credit_collateralUtils.dominantCollateral;
 exports.erc4626ReferralAdapterAbi = require_sdk_market_adapters_abi_adapters_erc4626ReferralAdapter.erc4626ReferralAdapterAbi;
 exports.expectedBalanceDeltas = require_sdk_market_credit_expectedBalanceDeltas.expectedBalanceDeltas;
 exports.fetchRedstonePayloads = require_sdk_market_pricefeeds_updates_fetchRedstonePayloads.fetchRedstonePayloads;
@@ -338,21 +338,22 @@ exports.iVelodromeV2RouterAbi = require_sdk_market_adapters_abi_targetContractAb
 exports.iVelodromeV2RouterAdapterAbi = require_sdk_market_adapters_abi_adapters_iVelodromeV2RouterAdapter.iVelodromeV2RouterAdapterAbi;
 exports.isLPPriceFeed = require_sdk_market_pricefeeds_AbstractLPPriceFeed.isLPPriceFeed;
 exports.isRWAFactory = require_sdk_market_rwa_types.isRWAFactory;
-exports.isStrategyCollateral = require_sdk_market_credit_isStrategyCollateral.isStrategyCollateral;
+exports.isStrategyCollateral = require_sdk_market_credit_collateralUtils.isStrategyCollateral;
 exports.isUpdatablePriceFeed = require_sdk_market_pricefeeds_isUpdatablePriceFeed.isUpdatablePriceFeed;
 exports.iwstETHAbi = require_sdk_market_adapters_abi_targetContractAbi.iwstETHAbi;
 exports.iwstEthv1AdapterAbi = require_sdk_market_adapters_abi_adapters_iwstEthv1Adapter.iwstEthv1AdapterAbi;
 exports.lidoV1_WETHGatewayAbi = require_sdk_market_adapters_abi_targetContractAbi.lidoV1_WETHGatewayAbi;
 exports.mellowDvvAdapterAbi = require_sdk_market_adapters_abi_adapters_mellowDvvAdapter.mellowDvvAdapterAbi;
 exports.minSeizedAmount = require_sdk_market_math.minSeizedAmount;
-exports.mustGetDominantCollateral = require_sdk_market_credit_dominantCollateral.mustGetDominantCollateral;
 exports.optimalHFForPartialLiquidation = require_sdk_market_math.optimalHFForPartialLiquidation;
 exports.optimalRepaidAmount = require_sdk_market_math.optimalRepaidAmount;
 exports.parseAdapterAction = require_sdk_market_adapters_abi_utils.parseAdapterAction;
 exports.parseAdapterDeployParams = require_sdk_market_adapters_abi_utils.parseAdapterDeployParams;
 exports.parsePosNegAmount = require_sdk_market_adapters_transferHelpers.parsePosNegAmount;
+exports.pickStrategyTargetCollateral = require_sdk_market_credit_collateralUtils.pickStrategyTargetCollateral;
 exports.rayToBps = require_sdk_market_math.rayToBps;
 exports.rewardsFromTransfers = require_sdk_market_adapters_transferHelpers.rewardsFromTransfers;
+exports.strategyName = require_sdk_market_strategyName.strategyName;
 exports.swapFromTransfers = require_sdk_market_adapters_transferHelpers.swapFromTransfers;
 exports.toNetTransfers = require_sdk_market_adapters_transferHelpers.toNetTransfers;
 exports.usdToNumber = require_sdk_market_math.usdToNumber;

package/dist/cjs/sdk/market/strategyName.js

@@ -0,0 +1,19 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_sdk_chain_chains = require("../chain/chains.js");
+//#region src/sdk/market/strategyName.ts
+/**
+* Display name of a leveraged strategy: the target collateral over the
+* borrowed underlying, e.g. `"wstETH / WETH"`.
+*
+* A curated pretty name from {@link getTokenPrettyName} wins over the target's
+* ticker when one is configured.
+*
+* @param target - Collateral the position is built around.
+* @param underlying - Token the position borrows.
+* @param network - Chain id or network type label of the market.
+**/
+function strategyName(target, underlying, network) {
+	return `${require_sdk_chain_chains.getTokenPrettyName(target.address, network) ?? target.symbol} / ${underlying.symbol}`;
+}
+//#endregion
+exports.strategyName = strategyName;

package/dist/cjs/sdk/opportunities/OpportunitiesService.js

@@ -37,11 +37,13 @@ var OpportunitiesService = class extends require_sdk_base_SDKConstruct.SDKConstr
 	* A single strategy opportunity plus the rate curve of the pool it borrows
 	* from and the price feeds its liquidation price depends on.
 	*
-	* @throws If the credit manager is unknown, or does not accept the requested
-	* collateral as a strategy.
+	* @throws If the credit manager is unknown, or does not currently offer a
+	* strategy.
 	**/
 	async getStrategy(key) {
-		return this.sdk.marketRegister.findByCreditManager(key.creditManager).strategyOpportunityDetail(key.creditManager, key.targetCollateral);
+		const detail = this.sdk.marketRegister.findCreditManager(key.creditManager).strategyOpportunityDetail();
+		if (!detail) throw new Error(`credit manager ${key.creditManager} does not currently offer a strategy`);
+		return detail;
 	}
 };
 //#endregion

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

@@ -1,17 +1,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_utils_AddressMap = require("../utils/AddressMap.js");
+const require_sdk_chain_chains = require("../chain/chains.js");
 require("../constants/math.js");
 require("../constants/index.js");
-const require_sdk_utils_hex = require("../utils/hex.js");
 require("../utils/index.js");
 const require_sdk_base_SDKConstruct = require("../base/SDKConstruct.js");
 require("../base/index.js");
 const require_sdk_market_math = require("../market/math.js");
-const require_sdk_market_credit_dominantCollateral = require("../market/credit/dominantCollateral.js");
+const require_sdk_market_strategyName = require("../market/strategyName.js");
 const require_model_filters = require("../../model/filters.js");
 const require_model_positions = require("../../model/positions.js");
 require("../../model/index.js");
-require("../market/index.js");
 const require_sdk_positions_calcBorrowRate = require("./calcBorrowRate.js");
 const require_sdk_positions_calcHealthFactor = require("./calcHealthFactor.js");
 const require_sdk_positions_calcLiquidationPrice = require("./calcLiquidationPrice.js");
@@ -150,11 +149,7 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 		const { pool } = market.pool;
 		const token = this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying);
 		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
-		let collateral = require_sdk_market_credit_dominantCollateral.dominantCollateral(ca, market);
-		if (collateral) {
-			const source = this.sdk.withdrawalCompressor?.getWithdrawalSourceToken(collateral);
-			if (source) collateral = require_sdk_utils_hex.hexEq(source, market.underlying) ? void 0 : source;
-		}
+		const target = require_sdk_chain_chains.getAccountTargetCollateral(ca.creditAccount, this.sdk.chainId) ?? suite.strategyTargetCollateral;
 		const snapshot = require_sdk_positions_types.accountSnapshotFromCreditAccountData(ca);
 		const borrowRate = this.borrowRate(snapshot);
 		const timeToLiquidation = this.timeToLiquidation(snapshot);
@@ -164,8 +159,8 @@ var PositionsService = class extends require_sdk_base_SDKConstruct.SDKConstruct
 			chainId: this.sdk.chainId,
 			creditManager: ca.creditManager,
 			creditAccount: ca.creditAccount,
-			name: collateral ? suite.strategyName(collateral) : token.symbol,
-			targetCollateral: collateral ? this.sdk.tokensMeta.mustGetToken(collateral) : null,
+			name: target ? require_sdk_market_strategyName.strategyName(this.sdk.tokensMeta.mustGetToken(target), token, this.sdk.chainId) : token.symbol,
+			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
 			leverage: require_sdk_market_math.calcPositionLeverage(ca.totalValue, totalDebtValue),
 			borrowApy: require_sdk_market_math.calcBorrowApy(pool.baseInterestRate, suite.creditManager.feeInterest),
 			totalDebt: {

package/dist/cjs/sdk/utils/index.js

@@ -8,8 +8,8 @@ const require_sdk_utils_bigint_math = require("./bigint-math.js");
 const require_sdk_utils_bytes32ToString = require("./bytes32ToString.js");
 const require_sdk_utils_childLogger = require("./childLogger.js");
 const require_sdk_utils_createRawTx = require("./createRawTx.js");
-const require_sdk_utils_mappers = require("./mappers.js");
 const require_sdk_utils_etherscan = require("./etherscan.js");
+const require_sdk_utils_mappers = require("./mappers.js");
 const require_sdk_utils_isDust = require("./isDust.js");
 const require_sdk_utils_filterDust = require("./filterDust.js");
 const require_sdk_utils_formatter = require("./formatter.js");

package/dist/esm/common-utils/charts/credit-session.js

@@ -1,5 +1,5 @@
-import { TypedObjectUtils } from "../../sdk/utils/mappers.js";
 import { PERCENTAGE_DECIMALS } from "../../sdk/constants/math.js";
+import { TypedObjectUtils } from "../../sdk/utils/mappers.js";
 import { toBigInt } from "../../sdk/utils/formatter.js";
 //#region src/common-utils/charts/credit-session.ts
 const CREDIT_SESSION_STATUS_BY_ID = {

package/dist/esm/model/opportunities.js

@@ -16,17 +16,17 @@ function poolOpportunityId(chainId, pool) {
 *
 * @example
 * ```ts
-* strategyOpportunityId(1, "0x3eb9...", "0x7f39...") // "1:0x3eb9...:0x7f39..."
+* strategyOpportunityId(1, "0x3eb9...") // "1:0x3eb9..."
 * ```
 **/
-function strategyOpportunityId(chainId, creditManager, targetCollateral) {
-	return `${chainId}:${creditManager.toLowerCase()}:${targetCollateral.toLowerCase()}`;
+function strategyOpportunityId(chainId, creditManager) {
+	return `${chainId}:${creditManager.toLowerCase()}`;
 }
 /**
 * Canonical id of any opportunity, dispatching on {@link Opportunity.kind}.
 **/
 function opportunityId(opportunity) {
-	return opportunity.kind === "pool" ? poolOpportunityId(opportunity.chainId, opportunity.pool) : strategyOpportunityId(opportunity.chainId, opportunity.creditManager, opportunity.targetCollateral.address);
+	return opportunity.kind === "pool" ? poolOpportunityId(opportunity.chainId, opportunity.pool) : strategyOpportunityId(opportunity.chainId, opportunity.creditManager);
 }
 /**
 * Whether an opportunity satisfies every condition of a filter.

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

@@ -232,8 +232,7 @@ const poolOpportunityKeySchema = z.object({
 **/
 const strategyOpportunityKeySchema = z.object({
 	chainId: chainIdSchema,
-	creditManager: ZodAddress(),
-	targetCollateral: ZodAddress()
+	creditManager: ZodAddress()
 });
 /**
 * {@link OpportunityKey}