@gearbox-protocol/sdk 16.0.0-next.27 → 16.0.0-next.29

package/dist/cjs/model/index.js

@@ -38,6 +38,7 @@ exports.STRATEGY_POSITION_CHART_METRICS = require_model_charts.STRATEGY_POSITION
 exports.STRATEGY_POSITION_COLLATERAL_ERROR = require_model_positions.STRATEGY_POSITION_COLLATERAL_ERROR;
 exports.amountSchema = require_model_primitives_schema.amountSchema;
 exports.apyBreakdownSchema = require_model_opportunities_schema.apyBreakdownSchema;
+exports.asEstimated = require_model_previews.asEstimated;
 exports.assetTypeSchema = require_model_primitives_schema.assetTypeSchema;
 exports.backendPreferred = require_model_compare_schema.backendPreferred;
 exports.booleanParamSchema = require_model_filters_schema.booleanParamSchema;

package/dist/cjs/model/previews.js

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

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

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_onchain_market_math = require("../../market/math.js");
 const require_onchain_validation_refusal = require("../../validation/refusal.js");
 const require_onchain_accounts_intents_guards = require("./guards.js");
 const require_onchain_accounts_intents_math = require("./math.js");
@@ -86,34 +85,22 @@ async function previewOpenStrategy(props) {
 		totalDebt: debt,
 		totalValue: margin + debt
 	};
-	const projectedPool = { availableLiquidityChange: -debt };
-	const metrics = {
-		healthFactor: sdk.positions.healthFactor(snapshot),
-		safeHealthFactor: sdk.positions.healthFactor(snapshot, { safePrices: true }),
-		borrowRate: sdk.positions.borrowRate(snapshot, projectedPool),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snapshot, projectedPool),
-		liquidationPrice: sdk.positions.liquidationPrice(snapshot)
-	};
-	require_onchain_accounts_intents_guards.assertCollateralised(metrics.healthFactor, false);
+	const { assets: _assets, quotas: _quotas, ...projection } = sdk.positions.projection(snapshot, { availableLiquidityChange: -debt });
+	require_onchain_accounts_intents_guards.assertCollateralised(projection.healthFactor, false);
 	const priceImpact = await require_onchain_accounts_intents_utils_price_impact.collectPriceImpact(leg.probe ? [leg.probe] : [], {
 		totalValue: margin + debt,
 		netValue: margin,
 		toUnderlying: (from, amount) => convert(from, underlying, amount)
 	});
 	return {
-		creditManager,
-		name: suite.name,
-		totalDebt: market.toUnderlyingAmount(debt),
-		netValue: market.toUnderlyingAmount(margin),
-		totalValue: market.toUnderlyingAmount(margin + debt),
-		leverage: require_onchain_market_math.calcPositionLeverage(margin + debt, debt),
+		...projection,
+		currentPrice: sdk.positions.currentPrice(snapshot),
 		priceImpact,
 		averageAssets: averageAssets.map(priced),
 		minAssets: minAssets.map(priced),
 		averageQuota,
 		minQuota,
-		calls: [...leg.calls],
-		...metrics
+		calls: [...leg.calls]
 	};
 }
 /** Collateral plus the borrowed underlying, folded into one balance per token. */

package/dist/cjs/onchain/accounts/intents/realize.js

@@ -1,5 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_onchain_market_math = require("../../market/math.js");
 const require_onchain_validation_refusal = require("../../validation/refusal.js");
 const require_onchain_validation_token = require("../../validation/token.js");
 const require_onchain_accounts_intents_utils_common = require("./utils/common.js");
@@ -33,16 +32,36 @@ async function realize(steps, props) {
 	const market = sdk.marketRegister.findByCreditManager(creditAccount.creditManager);
 	const price = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount) ?? 0n;
 	const suite = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
-	const ledger = new require_onchain_accounts_intents_utils_ledger.OperationLedger({
+	const start = {
 		initialAssets: creditAccount.tokens,
 		underlying,
 		debt: creditAccount.totalDebt,
 		convert: price
-	});
+	};
+	/**
+	* The floor: every routed leg counted at the amount it guarantees. This is
+	* what the calls are built from — a repayment may only spend underlying the
+	* route promises to have raised — and what the guards are answered on, since
+	* a floor that does not clear the facade's bar is a transaction that can
+	* revert.
+	*/
+	const ledger = new require_onchain_accounts_intents_utils_ledger.OperationLedger(start);
+	/**
+	* The same walk with every routed leg counted at the amount the pathfinder
+	* expects to return. Nothing is built from it: it is where the position
+	* actually lands, so it is what the reported state is read off.
+	*/
+	const expected = new require_onchain_accounts_intents_utils_ledger.OperationLedger(start);
 	const operations = [];
-	const push = (op) => {
+	/**
+	* @param asExpected - The operation as the expected branch sees it, for the
+	* legs where the two differ. Defaults to the operation itself, which is the
+	* case for everything whose amount the calldata fixes.
+	*/
+	const push = (op, asExpected = op) => {
 		operations.push(op);
 		ledger.apply(op);
+		expected.apply(asExpected);
 	};
 	/** One per routed leg, each already awaiting its quote; folded after the guards. */
 	const probes = [];
@@ -138,13 +157,17 @@ async function realize(steps, props) {
 				keep: held - amount
 			});
 			if (leg.probe) probes.push(leg.probe);
-			push(require_onchain_accounts_intents_operations.buildSwapOperation({
+			const swap = require_onchain_accounts_intents_operations.buildSwapOperation({
 				tokenIn: step.from,
 				amountIn: amount,
 				tokenOut: step.to,
 				amountOut: leg.minAmount,
 				calls: leg.calls
-			}));
+			});
+			push(swap, {
+				...swap,
+				amountOut: leg.amount
+			});
 			raised = leg.minAmount;
 			break;
 		}
@@ -155,12 +178,22 @@ async function realize(steps, props) {
 			if (balances.length > 0) {
 				const leg = await paths.closeAll({ balances });
 				if (leg.probe) probes.push(leg.probe);
-				if (leg.calls.length > 0 || leg.minAmount > 0n) push(require_onchain_accounts_intents_operations.buildCloseSwapOperation({
-					from: balances,
-					tokenOut: underlying,
-					amountOut: leg.minAmount,
-					calls: leg.calls
-				}));
+				if (leg.calls.length > 0 || leg.minAmount > 0n) {
+					const sale = require_onchain_accounts_intents_operations.buildCloseSwapOperation({
+						from: balances,
+						tokenOut: underlying,
+						amountOut: leg.minAmount,
+						calls: leg.calls
+					});
+					push(sale, {
+						...sale,
+						from: balances.map((a) => ({
+							token: a.token,
+							balance: expected.balanceOf(a.token)
+						})),
+						amountOut: leg.amount
+					});
+				}
 			}
 			raised = ledger.balanceOf(underlying);
 			break;
@@ -226,24 +259,32 @@ async function realize(steps, props) {
 				creditAccount,
 				sdk
 			}));
-			for (const { token, balance } of ledger.snapshot().assets) push(require_onchain_accounts_intents_operations.buildWithdrawCollateralOperation({
-				token,
-				amount: balance,
-				to: step.to,
-				all: true,
-				creditAccount,
-				sdk
-			}));
+			for (const { token, balance } of ledger.snapshot().assets) {
+				const payout = require_onchain_accounts_intents_operations.buildWithdrawCollateralOperation({
+					token,
+					amount: balance,
+					to: step.to,
+					all: true,
+					creditAccount,
+					sdk
+				});
+				push(payout, {
+					...payout,
+					amount: expected.balanceOf(token)
+				});
+			}
 			break;
 		}
 	}
-	const { assets, totalValue, debt } = ledger.snapshot();
+	const floor = ledger.snapshot();
+	const { assets, debt } = floor;
+	const projected = expected.snapshot();
 	require_onchain_accounts_intents_guards.assertGrowthAllowed({
 		sdk,
 		suite,
 		market,
 		before: creditAccount.tokens,
-		after: assets
+		after: projected.assets
 	});
 	const quotas = cleared ?? require_onchain_accounts_intents_utils_quotas_for_update.getQuotasForUpdate({
 		assetsBefore: creditAccount.tokens,
@@ -265,42 +306,29 @@ async function realize(steps, props) {
 		}));
 	}
 	const quotasAfter = require_onchain_accounts_intents_utils_quotas_for_update.quotasAfterUpdate(creditAccount.tokens, quotas.desiredQuota);
+	const quoted = Object.values(quotasAfter);
 	const snapshot = {
 		creditManager: creditAccount.creditManager,
-		assets,
-		quotas: Object.values(quotasAfter),
+		assets: projected.assets,
+		quotas: quoted,
 		totalDebt: debt,
-		totalValue
-	};
-	const projectedPool = { availableLiquidityChange: creditAccount.totalDebt - debt };
-	const metrics = {
-		healthFactor: sdk.positions.healthFactor(snapshot),
-		safeHealthFactor: paysOut ? sdk.positions.healthFactor(snapshot, { safePrices: true }) : void 0,
-		borrowRate: sdk.positions.borrowRate(snapshot, projectedPool),
-		timeToLiquidation: sdk.positions.timeToLiquidation(snapshot, projectedPool),
-		liquidationPrice: sdk.positions.liquidationPrice(snapshot)
+		totalValue: projected.totalValue
 	};
-	require_onchain_accounts_intents_guards.assertCollateralised(paysOut ? sdk.positions.healthFactor(snapshot, { safePrices: true }) : metrics.healthFactor, paysOut);
+	const projection = sdk.positions.projection(snapshot, { availableLiquidityChange: creditAccount.totalDebt - debt });
+	require_onchain_accounts_intents_guards.assertCollateralised(sdk.positions.healthFactor({
+		...snapshot,
+		assets,
+		totalValue: floor.totalValue
+	}, { safePrices: paysOut }), paysOut);
 	const priceImpact = await require_onchain_accounts_intents_utils_price_impact.collectPriceImpact(probes, {
-		totalValue,
-		netValue: totalValue - debt,
+		totalValue: projected.totalValue,
+		netValue: projected.totalValue - debt,
 		toUnderlying: (from, amount) => price(from, underlying, amount)
 	});
-	const oracle = market.priceOracle;
 	const state = {
-		creditManager: creditAccount.creditManager,
-		name: suite.name,
-		totalValue: market.toUnderlyingAmount(totalValue),
-		totalDebt: market.toUnderlyingAmount(debt),
-		netValue: market.toUnderlyingAmount(totalValue - debt),
-		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, debt),
-		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		quotas: Object.values(quotasAfter).map((q) => ({
-			token: sdk.tokensMeta.mustGetToken(q.token),
-			...oracle.toAmount(underlying, q.balance)
-		})),
+		...projection,
 		priceImpact,
-		...metrics
+		currentPrice: sdk.positions.currentPrice(snapshot)
 	};
 	return {
 		operations,

package/dist/cjs/onchain/accounts/intents/testing/market.js

@@ -96,6 +96,7 @@ function buildMarketSdk(extras) {
 		creditFacade: CREDIT_FACADE,
 		underlying: UND,
 		routeQuote: extras?.routeQuote,
+		routeFloor: extras?.routeFloor,
 		rwaAssets: extras?.rwaAssets,
 		phantoms: extras?.phantoms,
 		creditAccounts: extras?.creditAccounts,

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

@@ -13,6 +13,17 @@ let vitest = require("vitest");
 * from their inputs, so `result.calls` pins down which ops reached the
 * assembler and in which order.
 */
+/** Market configurator the mock market is governed by — the curator's address. */
+const MOCK_MARKET_CONFIGURATOR = "0x00000000000000000000000000000000000c0f16";
+/**
+* Liquidation fees of the mock suite: a 3% premium (the manager reports its
+* complement) on top of a 1.5% protocol fee, so the discount a screen shows is
+* 450bps.
+*/
+const MOCK_LIQUIDATION_FEES = {
+	feeLiquidation: 150,
+	liquidationDiscount: 9700
+};
 /** Recognizable router call embedded in routed leg results. */
 const MOCK_ROUTER_CALL = {
 	target: "0x9999999999999999999999999999999999999999",
@@ -155,6 +166,8 @@ function buildMockSdk(args) {
 	};
 	const market = {
 		toUnderlyingAmount,
+		/** {@inheritDoc MarketSuite.underlying} */
+		underlying: args.underlying,
 		priceOracle: {
 			convert,
 			safeConvert,
@@ -204,6 +217,8 @@ function buildMockSdk(args) {
 	const expirationDate = args.expirationDate ?? 0;
 	const creditManagerSuite = {
 		name: "TestCreditManager",
+		marketConfigurator: { address: MOCK_MARKET_CONFIGURATOR },
+		liquidationFees: () => MOCK_LIQUIDATION_FEES,
 		creditManager: {
 			address: args.creditManager,
 			liquidationThresholds,
@@ -238,10 +253,12 @@ function buildMockSdk(args) {
 	};
 	/** Linear unless the case says otherwise — see `routeQuote`. */
 	const quote = args.routeQuote ?? ((amount) => amount);
+	/** Slippage-free unless the case says otherwise — see `routeFloor`. */
+	const floor = args.routeFloor ?? ((amount) => amount);
 	const router = {
 		findOneTokenPath: vitest.vi.fn(async ({ amount, tokenIn, tokenOut }) => ({
 			amount: quote(amount),
-			minAmount: quote(amount),
+			minAmount: floor(quote(amount)),
 			calls: routeCalls(tokenIn, tokenOut)
 		})),
 		findManyToOnePath: vitest.vi.fn(async ({ expectedBalances, leftoverBalances, target }) => {
@@ -249,7 +266,7 @@ function buildMockSdk(args) {
 			const tokenIn = expectedBalances[0]?.token ?? target;
 			return {
 				amount: quote(spent),
-				minAmount: quote(spent),
+				minAmount: floor(quote(spent)),
 				calls: routeCalls(tokenIn, target)
 			};
 		}),
@@ -270,11 +287,15 @@ function buildMockSdk(args) {
 				amount += convert(token, targetLc, spend);
 			}
 			balances[targetLc] = (balances[targetLc] ?? 0n) + amount;
+			const untouched = (balances[targetLc] ?? 0n) - amount;
 			return {
 				amount,
-				minAmount: amount,
+				minAmount: floor(amount),
 				balances,
-				minBalances: { ...balances },
+				minBalances: {
+					...balances,
+					[targetLc]: untouched + floor(amount)
+				},
 				calls: [MOCK_ROUTER_CALL]
 			};
 		}),
@@ -284,7 +305,7 @@ function buildMockSdk(args) {
 			const amount = sold.reduce((acc, a) => acc + convert(a.token, underlying, a.balance), 0n);
 			return {
 				amount,
-				minAmount: amount,
+				minAmount: floor(amount),
 				underlyingBalance: amount,
 				calls: sold.length === 0 ? [] : [MOCK_CLOSE_CALL]
 			};
@@ -383,6 +404,8 @@ function payloadOf(slice) {
 exports.CA_OP_CALLS = CA_OP_CALLS;
 exports.MOCK_CLAIM_CALL = MOCK_CLAIM_CALL;
 exports.MOCK_CLOSE_CALL = MOCK_CLOSE_CALL;
+exports.MOCK_LIQUIDATION_FEES = MOCK_LIQUIDATION_FEES;
+exports.MOCK_MARKET_CONFIGURATOR = MOCK_MARKET_CONFIGURATOR;
 exports.MOCK_REQUEST_CALL = MOCK_REQUEST_CALL;
 exports.MOCK_ROUTER_CALL = MOCK_ROUTER_CALL;
 exports.MOCK_RWA_UNWRAP_CALL = MOCK_RWA_UNWRAP_CALL;

package/dist/cjs/onchain/index.js

@@ -139,6 +139,7 @@ const require_onchain_market_credit_CreditManagerV310Contract = require("./marke
 const require_onchain_market_strategyName = require("./market/strategyName.js");
 const require_onchain_market_credit_collateralUtils = require("./market/credit/collateralUtils.js");
 const require_onchain_market_credit_CreditSuite = require("./market/credit/CreditSuite.js");
+const require_onchain_market_credit_creditOperationMarket = require("./market/credit/creditOperationMarket.js");
 const require_onchain_market_credit_expectedBalanceDeltas = require("./market/credit/expectedBalanceDeltas.js");
 const require_onchain_utils_viem_simulateMulticall = require("./utils/viem/simulateMulticall.js");
 const require_onchain_utils_viem_simulateWithPriceUpdates = require("./utils/viem/simulateWithPriceUpdates.js");
@@ -146,6 +147,7 @@ const require_onchain_utils_viem_executeDelegatedMulticalls = require("./utils/v
 const require_onchain_utils_viem_sendRawTx = require("./utils/viem/sendRawTx.js");
 const require_onchain_utils_viem_watchBlocksAsync = require("./utils/viem/watchBlocksAsync.js");
 require("./utils/viem/index.js");
+const require_onchain_market_oracle_collateralPriceInUnderlying = require("./market/oracle/collateralPriceInUnderlying.js");
 const require_onchain_market_pricefeeds_isUpdatablePriceFeed = require("./market/pricefeeds/isUpdatablePriceFeed.js");
 const require_onchain_market_pricefeeds_PriceFeedRef = require("./market/pricefeeds/PriceFeedRef.js");
 const require_onchain_market_pricefeeds_AbstractPriceFeed = require("./market/pricefeeds/AbstractPriceFeed.js");
@@ -519,6 +521,7 @@ exports.checkQuotaCount = require_onchain_validation_checks.checkQuotaCount;
 exports.checkQuotaLimit = require_onchain_validation_checks.checkQuotaLimit;
 exports.childLogger = require_onchain_utils_childLogger.childLogger;
 exports.classifyCurveOperation = require_onchain_market_adapters_transferHelpers.classifyCurveOperation;
+exports.collateralPriceInUnderlying = require_onchain_market_oracle_collateralPriceInUnderlying.collateralPriceInUnderlying;
 exports.collectTraces = require_onchain_utils_trace.collectTraces;
 exports.createAdapter = require_onchain_market_adapters_createAdapter.createAdapter;
 exports.createAddressProvider = require_onchain_core_createAddressProvider.createAddressProvider;
@@ -529,6 +532,7 @@ exports.createRouter = require_onchain_router_createRouter.createRouter;
 exports.createWithdrawalCompressor = require_onchain_accounts_withdrawal_compressor_createWithdrawalCompressor.createWithdrawalCompressor;
 exports.createZapper = require_onchain_market_zapper_createZapper.createZapper;
 exports.creditFacadeV310Abi = require_onchain_market_credit_CreditFacadeV310BaseContract.creditFacadeV310Abi;
+exports.creditOperationMarket = require_onchain_market_credit_creditOperationMarket.creditOperationMarket;
 exports.curveAddLiquidityFromTransfers = require_onchain_market_adapters_transferHelpers.curveAddLiquidityFromTransfers;
 exports.curveRemoveLiquidityFromTransfers = require_onchain_market_adapters_transferHelpers.curveRemoveLiquidityFromTransfers;
 exports.decodeDelayedIntent = require_onchain_accounts_withdrawal_compressor_intent_codec.decodeDelayedIntent;
@@ -695,6 +699,7 @@ exports.shortHash = require_onchain_utils_formatter.shortHash;
 exports.simulateCall = require_onchain_utils_viem_simulateCall.simulateCall;
 exports.simulateMulticall = require_onchain_utils_viem_simulateMulticall.simulateMulticall;
 exports.simulateWithPriceUpdates = require_onchain_utils_viem_simulateWithPriceUpdates.simulateWithPriceUpdates;
+exports.soleNonUnderlyingCollateral = require_onchain_positions_calcLiquidationPrice.soleNonUnderlyingCollateral;
 exports.strategyName = require_onchain_market_strategyName.strategyName;
 exports.swapFromTransfers = require_onchain_market_adapters_transferHelpers.swapFromTransfers;
 exports.toAddress = require_onchain_utils_toAddress.toAddress;
@@ -712,5 +717,6 @@ exports.toSignificant = require_onchain_utils_formatter.toSignificant;
 exports.toToken = require_onchain_validation_token.toToken;
 exports.toTokenAmount = require_onchain_validation_token.toTokenAmount;
 exports.toWithdrawalStatus = require_onchain_accounts_withdrawal_compressor_types.toWithdrawalStatus;
+exports.totalLiquidationDiscount = require_onchain_market_credit_creditOperationMarket.totalLiquidationDiscount;
 exports.usdToNumber = require_onchain_market_math.usdToNumber;
 exports.watchBlocksAsync = require_onchain_utils_viem_watchBlocksAsync.watchBlocksAsync;

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

@@ -0,0 +1,32 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_constants_math = require("../../constants/math.js");
+//#region src/onchain/market/credit/creditOperationMarket.ts
+/**
+* What a liquidation takes off an account, in basis points: the premium the
+* liquidator keeps plus the protocol's own fee, with the suite's expiration
+* already resolved.
+*
+* Not {@link LiquidationFees.liquidationDiscount}, which is the complement of
+* the premium alone (`100% - liquidationPremium`) and says what share of the
+* seized collateral repays the debt.
+**/
+function totalLiquidationDiscount(suite) {
+	const { feeLiquidation, liquidationDiscount } = suite.liquidationFees();
+	return Number(require_onchain_constants_math.PERCENTAGE_FACTOR) - liquidationDiscount + feeLiquidation;
+}
+/**
+* The market half of every credit operation result, read off the suite that
+* serves it. Spread into a preview or a projection so the four fields are
+* filled in one place and cannot drift apart between the two halves of the SDK.
+**/
+function creditOperationMarket(suite) {
+	return {
+		creditManager: suite.creditManager.address,
+		name: suite.name,
+		curator: suite.marketConfigurator.address,
+		liquidationDiscount: totalLiquidationDiscount(suite)
+	};
+}
+//#endregion
+exports.creditOperationMarket = creditOperationMarket;
+exports.totalLiquidationDiscount = totalLiquidationDiscount;

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

@@ -5,6 +5,7 @@ const require_onchain_market_credit_CreditFacadeV310Contract = require("./Credit
 const require_onchain_market_credit_CreditManagerV310Contract = require("./CreditManagerV310Contract.js");
 const require_onchain_market_credit_collateralUtils = require("./collateralUtils.js");
 const require_onchain_market_credit_CreditSuite = require("./CreditSuite.js");
+const require_onchain_market_credit_creditOperationMarket = require("./creditOperationMarket.js");
 const require_onchain_market_credit_expectedBalanceDeltas = require("./expectedBalanceDeltas.js");
 require("./types.js");
 exports.CreditConfiguratorV310Contract = require_onchain_market_credit_CreditConfiguratorV310Contract.CreditConfiguratorV310Contract;
@@ -13,7 +14,9 @@ exports.CreditFacadeV310Contract = require_onchain_market_credit_CreditFacadeV31
 exports.CreditManagerV310Contract = require_onchain_market_credit_CreditManagerV310Contract.CreditManagerV310Contract;
 exports.CreditSuite = require_onchain_market_credit_CreditSuite.CreditSuite;
 exports.creditFacadeV310Abi = require_onchain_market_credit_CreditFacadeV310BaseContract.creditFacadeV310Abi;
+exports.creditOperationMarket = require_onchain_market_credit_creditOperationMarket.creditOperationMarket;
 exports.dominantCollateral = require_onchain_market_credit_collateralUtils.dominantCollateral;
 exports.expectedBalanceDeltas = require_onchain_market_credit_expectedBalanceDeltas.expectedBalanceDeltas;
 exports.isStrategyCollateral = require_onchain_market_credit_collateralUtils.isStrategyCollateral;
 exports.pickStrategyTargetCollateral = require_onchain_market_credit_collateralUtils.pickStrategyTargetCollateral;
+exports.totalLiquidationDiscount = require_onchain_market_credit_creditOperationMarket.totalLiquidationDiscount;

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

@@ -93,8 +93,10 @@ const require_onchain_market_credit_CreditManagerV310Contract = require("./credi
 const require_onchain_market_strategyName = require("./strategyName.js");
 const require_onchain_market_credit_collateralUtils = require("./credit/collateralUtils.js");
 const require_onchain_market_credit_CreditSuite = require("./credit/CreditSuite.js");
+const require_onchain_market_credit_creditOperationMarket = require("./credit/creditOperationMarket.js");
 const require_onchain_market_credit_expectedBalanceDeltas = require("./credit/expectedBalanceDeltas.js");
 require("./credit/index.js");
+const require_onchain_market_oracle_collateralPriceInUnderlying = require("./oracle/collateralPriceInUnderlying.js");
 const require_onchain_market_pricefeeds_isUpdatablePriceFeed = require("./pricefeeds/isUpdatablePriceFeed.js");
 const require_onchain_market_pricefeeds_PriceFeedRef = require("./pricefeeds/PriceFeedRef.js");
 const require_onchain_market_pricefeeds_AbstractPriceFeed = require("./pricefeeds/AbstractPriceFeed.js");
@@ -255,10 +257,12 @@ exports.calcQuotaRate = require_onchain_market_math.calcQuotaRate;
 exports.calcUtilization = require_onchain_market_math.calcUtilization;
 exports.calcUtilizationRaw = require_onchain_market_math.calcUtilizationRaw;
 exports.classifyCurveOperation = require_onchain_market_adapters_transferHelpers.classifyCurveOperation;
+exports.collateralPriceInUnderlying = require_onchain_market_oracle_collateralPriceInUnderlying.collateralPriceInUnderlying;
 exports.createAdapter = require_onchain_market_adapters_createAdapter.createAdapter;
 exports.createPriceOracle = require_onchain_market_oracle_createPriceOracle.createPriceOracle;
 exports.createZapper = require_onchain_market_zapper_createZapper.createZapper;
 exports.creditFacadeV310Abi = require_onchain_market_credit_CreditFacadeV310BaseContract.creditFacadeV310Abi;
+exports.creditOperationMarket = require_onchain_market_credit_creditOperationMarket.creditOperationMarket;
 exports.curveAddLiquidityFromTransfers = require_onchain_market_adapters_transferHelpers.curveAddLiquidityFromTransfers;
 exports.curveRemoveLiquidityFromTransfers = require_onchain_market_adapters_transferHelpers.curveRemoveLiquidityFromTransfers;
 exports.dominantCollateral = require_onchain_market_credit_collateralUtils.dominantCollateral;
@@ -360,4 +364,5 @@ exports.rewardsFromTransfers = require_onchain_market_adapters_transferHelpers.r
 exports.strategyName = require_onchain_market_strategyName.strategyName;
 exports.swapFromTransfers = require_onchain_market_adapters_transferHelpers.swapFromTransfers;
 exports.toNetTransfers = require_onchain_market_adapters_transferHelpers.toNetTransfers;
+exports.totalLiquidationDiscount = require_onchain_market_credit_creditOperationMarket.totalLiquidationDiscount;
 exports.usdToNumber = require_onchain_market_math.usdToNumber;

package/dist/cjs/onchain/market/oracle/collateralPriceInUnderlying.js

@@ -0,0 +1,27 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_constants_math = require("../../constants/math.js");
+//#region src/onchain/market/oracle/collateralPriceInUnderlying.ts
+/**
+* What one unit of `collateral` costs in `underlying` right now, in the
+* oracle's 8-decimal (`PRICE_DECIMALS`) fixed point — the scale and the
+* denomination `calcLiquidationPrice` answers in, so the two figures are read
+* as a pair.
+*
+* Both sides come from the oracle's **main** feeds: this is the price the
+* market quotes, not the conservative one a hand-over is weighed at.
+*
+* `null` when the oracle cannot answer for either token, or prices the
+* underlying at zero — a screen shows a gap rather than a number derived from
+* a missing feed.
+**/
+function collateralPriceInUnderlying(oracle, collateral, underlying) {
+	try {
+		const underlyingPrice = oracle.mainPrice(underlying);
+		if (underlyingPrice <= 0n) return null;
+		return oracle.mainPrice(collateral) * require_onchain_constants_math.PRICE_DECIMALS / underlyingPrice;
+	} catch {
+		return null;
+	}
+}
+//#endregion
+exports.collateralPriceInUnderlying = collateralPriceInUnderlying;

package/dist/cjs/onchain/market/oracle/index.js

@@ -1,6 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_market_oracle_collateralPriceInUnderlying = require("./collateralPriceInUnderlying.js");
 const require_onchain_market_oracle_PriceOracleV310Contract = require("./PriceOracleV310Contract.js");
 const require_onchain_market_oracle_createPriceOracle = require("./createPriceOracle.js");
 require("./types.js");
 exports.PriceOracleV310Contract = require_onchain_market_oracle_PriceOracleV310Contract.PriceOracleV310Contract;
+exports.collateralPriceInUnderlying = require_onchain_market_oracle_collateralPriceInUnderlying.collateralPriceInUnderlying;
 exports.createPriceOracle = require_onchain_market_oracle_createPriceOracle.createPriceOracle;