@gearbox-protocol/sdk 16.0.0-next.50 → 16.0.0-next.52

package/dist/cjs/model/index.js

@@ -128,6 +128,7 @@ exports.responseMetadataSchema = require_model_response_schema.responseMetadataS
 exports.responseSchema = require_model_response_schema.responseSchema;
 exports.rewardsPnLSchema = require_model_positions_schema.rewardsPnLSchema;
 exports.rewardsSchema = require_model_opportunities_schema.rewardsSchema;
+exports.safeValue = require_model_result.safeValue;
 exports.sdkErr = require_model_result.sdkErr;
 exports.sdkOk = require_model_result.sdkOk;
 exports.strategyOpportunityChartMetricSchema = require_model_charts_schema.strategyOpportunityChartMetricSchema;

package/dist/cjs/model/result.js

@@ -1,5 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region src/model/result.ts
+/**
+* Builds a {@link SafeValue}. Omits `error` when the value was not degraded.
+**/
+function safeValue(value, error) {
+	return error === void 0 ? { value } : {
+		value,
+		error
+	};
+}
 /** The success half, built. */
 function sdkOk(data) {
 	return {
@@ -23,5 +32,6 @@ function isSDKError(answer) {
 }
 //#endregion
 exports.isSDKError = isSDKError;
+exports.safeValue = safeValue;
 exports.sdkErr = sdkErr;
 exports.sdkOk = sdkOk;

package/dist/cjs/onchain/accounts/intents/leverage-band.js

@@ -37,7 +37,7 @@ function calcLeverageBand({ sdk, creditManager, collateral, targetHF }) {
 	if (!target) return;
 	const ceiling = suite.creditManager.maxLeverage(target, targetHF);
 	const underlying = market.pool.underlying;
-	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount) ?? 0n;
+	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount).value;
 	const netValue = collateral.reduce((acc, a) => acc + convert(a.token, underlying, a.balance), 0n);
 	if (netValue <= 0n) return {
 		min: 1,

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

@@ -12,9 +12,11 @@ const require_onchain_accounts_intents_utils_common = require("./utils/common.js
 * check counts: a holding backed by a quota contributes the lesser of the
 * quota and its threshold-weighted value, an unquoted one — the underlying —
 * its weighted value alone, and dust or a disabled balance nothing at all.
-* Collateral is valued at the lower of its two feeds, the way the facade
-* values a call that hands funds over; the debt is valued at the main feed,
-* as the check does. Zero debt frees the whole balance.
+* Collateral is valued at the protocol safe price (`min` of the two feeds,
+* 0 when there is no reserve), the way the facade values a call that hands
+* funds over; the underlying is exempt and is valued at the main feed, as
+* `CreditManagerV3._safeConvertToUSD` does. The debt is valued at the main
+* feed, as the check does. Zero debt frees the whole balance.
 *
 * Rounding always favours the account, so the answer clears the check rather
 * than landing a wei short of it.
@@ -37,7 +39,7 @@ function maxWithdrawCollateral(props) {
 	/** What a holding backs, in the check's units: USD × PERCENTAGE_FACTOR. */
 	const weigh = (t) => {
 		const lt = BigInt(creditManager.liquidationThresholds.get(t.token) ?? 0);
-		const weighted = (safeUsd(priceOracle, t.token, t.balance) ?? 0n) * lt;
+		const weighted = (require_onchain_accounts_intents_utils_common.eq(t.token, underlying) ? usd(priceOracle, t.token, t.balance) ?? 0n : priceOracle.safeConvertMinUSD(t.token, t.balance).value) * lt;
 		if (t.quota === 0n) return weighted;
 		return require_onchain_utils_bigint_math.BigIntMath.min(quotaUsd(t) * require_onchain_constants_math.PERCENTAGE_FACTOR, weighted);
 	};
@@ -55,8 +57,8 @@ function maxWithdrawCollateral(props) {
 	const shortfall = required - otherMoney;
 	if (target.quota > 0n && quotaUsd(target) * 10000n < shortfall) return 0n;
 	const targetLt = BigInt(creditManager.liquidationThresholds.get(target.token) ?? 0);
-	const targetUsd = safeUsd(priceOracle, target.token, target.balance);
-	if (targetLt === 0n || !targetUsd) return 0n;
+	const targetUsd = require_onchain_accounts_intents_utils_common.eq(target.token, underlying) ? usd(priceOracle, target.token, target.balance) ?? 0n : priceOracle.safeConvertMinUSD(target.token, target.balance).value;
+	if (targetLt === 0n || targetUsd === 0n) return 0n;
 	const keptUsd = require_onchain_utils_bigint_math.BigIntMath.ceilDiv(shortfall, targetLt);
 	const kept = require_onchain_utils_bigint_math.BigIntMath.ceilDiv(target.balance * keptUsd, targetUsd);
 	return kept >= target.balance ? 0n : target.balance - kept;
@@ -69,18 +71,5 @@ function usd(oracle, token, amount) {
 		return;
 	}
 }
-/**
-* USD value at the lower of the token's two feeds — what a call handing funds
-* over is judged at. Falls back to the main feed where there is no second one.
-**/
-function safeUsd(oracle, token, amount) {
-	const main = usd(oracle, token, amount);
-	if (main === void 0) return;
-	try {
-		return require_onchain_utils_bigint_math.BigIntMath.min(main, oracle.convertToUSD(token, amount, true));
-	} catch {
-		return main;
-	}
-}
 //#endregion
 exports.maxWithdrawCollateral = maxWithdrawCollateral;

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

@@ -28,7 +28,7 @@ async function buildOpenStrategyState(props) {
 	const market = sdk.marketRegister.findByCreditManager(creditManager);
 	require_onchain_accounts_intents_guards.assertMarketOperable(suite);
 	const underlying = market.pool.underlying.toLowerCase();
-	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount) ?? 0n;
+	const convert = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount).value;
 	const margin = collateral.reduce((acc, a) => acc + convert(a.token, underlying, a.balance), 0n);
 	if (margin <= 0n) throw new require_onchain_validation_refusal.IntentPreviewError("insufficientSourceBalance", void 0, "openStrategy: collateral is worth nothing in underlying");
 	const debt = require_onchain_accounts_intents_math.debtForLeverage(margin, leverage);

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

@@ -30,7 +30,7 @@ async function realize(steps, props) {
 		slippage
 	});
 	const market = sdk.marketRegister.findByCreditManager(creditAccount.creditManager);
-	const price = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount) ?? 0n;
+	const price = (from, to, amount) => market.priceOracle.safeConvert(from, to, amount).value;
 	const suite = sdk.marketRegister.findCreditManager(creditAccount.creditManager);
 	const start = {
 		initialAssets: creditAccount.tokens,

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

@@ -78,12 +78,13 @@ const LIQUIDATION_THRESHOLDS = {
 const MAX_DEBT = require_onchain_utils_formatter.toBN("200000", 8);
 /** Mock SDK on the shared fixture market. */
 function buildMarketSdk(extras) {
+	const prices = {
+		...PRICES,
+		...extras?.extraPrices
+	};
 	return require_sdk_mock.buildMockSdk({
-		prices: {
-			...PRICES,
-			...extras?.extraPrices
-		},
-		reservePrices: extras?.reservePrices,
+		prices,
+		reservePrices: extras?.reservePrices ?? prices,
 		decimals: {
 			...DECIMALS,
 			...extras?.extraDecimals

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

@@ -2,8 +2,8 @@ require("../../../constants/math.js");
 require("../../../constants/index.js");
 const require_onchain_market_math = require("../../../market/math.js");
 const require_onchain_market_credit_CreditSuite = require("../../../market/credit/CreditSuite.js");
-const require_onchain_market_MarketSuite = require("../../../market/MarketSuite.js");
 const require_onchain_positions_PositionsService = require("../../../positions/PositionsService.js");
+const require_TestPriceOracle_mock = require("../../../market/oracle/TestPriceOracle.mock.js");
 let vitest = require("vitest");
 //#region src/onchain/accounts/intents/testing/sdk-mock.ts
 /**
@@ -94,27 +94,25 @@ function echoEncodableOpCalls(op) {
 /**
 * Mock `OnchainSDK` covering exactly what the intent-service touches:
 * price conversion, quota params, CM/facade lookup and call assembly.
-* Conversion mirrors the legacy price-based math:
-* `amount * price[from] * 10^dec(to) / (price[to] * 10^dec(from))`.
+* Conversion is a real {@link TestPriceOracle} seeded from the fixture records.
 */
 function buildMockSdk(args) {
 	const decimalsOf = (token) => args.decimals[token.toLowerCase()] ?? 18;
-	const convert = (token, to, amount) => {
-		const from = token.toLowerCase();
-		const target = to.toLowerCase();
-		if (from === target) return amount;
-		const fromPrice = args.prices[from];
-		const toPrice = args.prices[target];
-		if (fromPrice === void 0 || toPrice === void 0) throw new Error(`mock priceOracle: missing price for ${from} or ${target}`);
-		return amount * fromPrice * 10n ** BigInt(decimalsOf(target)) / (toPrice * 10n ** BigInt(decimalsOf(from)));
-	};
-	const safeConvert = (token, to, amount) => {
-		try {
-			return convert(token, to, amount);
-		} catch {
-			return null;
-		}
+	const lookup = (record, token) => record?.[token.toLowerCase()] ?? record?.[token];
+	const tokenCfgs = {};
+	for (const token of /* @__PURE__ */ new Set([
+		...Object.keys(args.decimals),
+		...Object.keys(args.prices),
+		...Object.keys(args.reservePrices ?? {})
+	])) tokenCfgs[token] = {
+		decimals: lookup(args.decimals, token) ?? 18,
+		symbol: "TOKEN",
+		name: "TOKEN",
+		price: lookup(args.prices, token),
+		reservePrice: lookup(args.reservePrices, token)
 	};
+	const priceOracle = new require_TestPriceOracle_mock.TestPriceOracle(tokenCfgs);
+	const convert = (from, to, amount) => priceOracle.convert(from, to, amount);
 	const fullQuota = (q) => ({
 		cumulativeIndexLU: 0n,
 		totalQuoted: 0n,
@@ -133,18 +131,6 @@ function buildMockSdk(args) {
 		entries: () => Object.entries(args.liquidationThresholds),
 		get: (token) => args.liquidationThresholds[token.toLowerCase()] ?? args.liquidationThresholds[token]
 	};
-	const _convertToUSD = (token, amount, reserve = false) => {
-		const key = token.toLowerCase();
-		const price = reserve ? args.reservePrices?.[key] : args.prices[key];
-		if (price === void 0) throw new Error(`mock priceOracle: missing ${reserve ? "reserve" : "main"} price for ${token}`);
-		return amount * price / 10n ** BigInt(decimalsOf(token));
-	};
-	const safeUsd = (token, amount) => {
-		const from = token.toLowerCase();
-		const price = args.prices[from] ?? args.prices[token];
-		if (price === void 0) return null;
-		return amount * price / 10n ** BigInt(decimalsOf(from));
-	};
 	const tokenOf = (token) => ({
 		chainId: 1,
 		address: token,
@@ -152,57 +138,19 @@ function buildMockSdk(args) {
 		name: "TOKEN",
 		decimals: decimalsOf(token)
 	});
-	const mainPriceOf = (token) => {
-		const key = token.toLowerCase();
-		const price = args.prices[key] ?? args.prices[token];
-		if (price === void 0) throw new Error(`mock priceOracle: missing main price for ${token}`);
-		return price;
-	};
-	const reservePriceOf = (token) => {
-		const key = token.toLowerCase();
-		const price = args.reservePrices?.[key] ?? args.reservePrices?.[token];
-		if (price === void 0) throw new Error(`mock priceOracle: missing reserve price for ${token}`);
-		return price;
-	};
 	const poolPaused = args.poolPaused ?? false;
 	/** {@inheritDoc MarketSuite.toUnderlyingAmount} */
-	const toUnderlyingAmount = (value) => {
-		const usd = safeUsd(args.underlying, value);
-		return {
-			token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
-			value,
-			valueUsd: usd === null ? null : require_onchain_market_math.usdToNumber(usd)
-		};
-	};
+	const toUnderlyingAmount = (value) => ({
+		token: tokenOf(args.rwaAssets?.[args.underlying.toLowerCase()] ?? args.underlying),
+		...priceOracle.toAmount(args.underlying, value)
+	});
 	const market = {
 		toUnderlyingAmount,
 		/** {@inheritDoc MarketSuite.curator} */
 		curator: MOCK_CURATOR,
 		/** {@inheritDoc MarketSuite.underlying} */
 		underlying: args.underlying,
-		priceOracle: {
-			convert,
-			safeConvert,
-			mainPrice: mainPriceOf,
-			reservePrice: reservePriceOf,
-			convertToUSD: _convertToUSD,
-			toAmount: (token, value) => {
-				const usd = safeUsd(token, value);
-				return {
-					value,
-					valueUsd: usd === null ? null : require_onchain_market_math.usdToNumber(usd)
-				};
-			},
-			toTokenAmount: (token, value) => {
-				const usd = safeUsd(token, value);
-				return {
-					token: tokenOf(token),
-					value,
-					valueUsd: usd === null ? null : require_onchain_market_math.usdToNumber(usd)
-				};
-			},
-			safeConvertToUSD: safeUsd
-		},
+		priceOracle,
 		pool: {
 			pqk: {
 				quotas,
@@ -222,7 +170,6 @@ function buildMockSdk(args) {
 			underlying: args.underlying
 		}
 	};
-	Object.assign(market, { valueInUnderlying: require_onchain_market_MarketSuite.MarketSuite.prototype.valueInUnderlying });
 	const collateralTokens = [args.underlying.toLowerCase(), ...Object.keys(args.liquidationThresholds).map((t) => t.toLowerCase()).filter((t) => t !== args.underlying.toLowerCase())];
 	const forbidden = new Set((args.forbiddenTokens ?? []).map((t) => t.toLowerCase()));
 	const forbiddenTokensMask = collateralTokens.reduce((mask, token, i) => forbidden.has(token) ? mask | 1n << BigInt(i) : mask, 0n);

package/dist/cjs/onchain/accounts/intents/utils/pick-token.js

@@ -37,7 +37,7 @@ function isRedemptionPhantomToken(sdk, token) {
 function rankAccountTokens(args) {
 	const { creditAccount, sdk, exclude = [] } = args;
 	const oracle = sdk.marketRegister.findByCreditManager(creditAccount.creditManager).priceOracle;
-	const convert = (from, to, amount) => oracle.safeConvert(from, to, amount) ?? 0n;
+	const convert = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const candidates = [];
 	for (const t of creditAccount.tokens) {
 		if (t.balance <= 0n) continue;

package/dist/cjs/onchain/accounts/intents/utils/price-impact.js

@@ -15,8 +15,8 @@ function probeBasket(balances, oracle) {
 	let basketWad = 0n;
 	for (const asset of balances) {
 		if (asset.balance <= 0n) continue;
-		const usd = oracle.safeConvertToUSD(asset.token, asset.balance);
-		if (usd !== null && usd > 0n) basketWad += usd * require_onchain_constants_math.WAD / require_onchain_constants_math.PRICE_DECIMALS;
+		const usd = oracle.safeConvertToUSD(asset.token, asset.balance).value;
+		if (usd > 0n) basketWad += usd * require_onchain_constants_math.WAD / require_onchain_constants_math.PRICE_DECIMALS;
 	}
 	if (basketWad <= 0n) return;
 	const probeWad = PROBE_UNIT_USD_WAD;

package/dist/cjs/onchain/accounts/intents/utils/router-path.js

@@ -152,7 +152,7 @@ function createRouterPaths(args) {
 function createOraclePaths(args) {
 	const { sdk, creditAccount } = args;
 	const oracle = sdk.marketRegister.findByCreditManager(creditAccount.creditManager).priceOracle;
-	const price = (from, to, amount) => oracle.safeConvert(from, to, amount) ?? 0n;
+	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const estimate = (amount) => ({
 		amount,
 		minAmount: amount,

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

@@ -12,7 +12,7 @@ const require_onchain_accounts_intents_utils_pick_token = require("./utils/pick-
 function accountView(creditAccount, sdk) {
 	const { underlying, creditManager } = creditAccount;
 	const oracle = sdk.marketRegister.findByCreditManager(creditManager).priceOracle;
-	const price = (from, to, amount) => oracle.safeConvert(from, to, amount) ?? 0n;
+	const price = (from, to, amount) => oracle.safeConvert(from, to, amount).value;
 	const { creditFacade } = sdk.marketRegister.findCreditManager(creditManager);
 	let totalValue = 0n;
 	for (const t of creditAccount.tokens) totalValue += price(t.token, underlying, t.balance);

package/dist/cjs/onchain/accounts/liquidations/LiquidationsService.js

@@ -149,11 +149,11 @@ var LiquidationsService = class extends require_onchain_base_SDKConstruct.SDKCon
 	#anyMarketTokenAmount(token, value) {
 		const meta = this.sdk.tokensMeta.mustGetToken(token);
 		for (const market of this.sdk.marketRegister.markets) {
-			const valueUsd = market.priceOracle.safeUsdValue(token, value);
-			if (valueUsd !== null) return {
+			const priced = market.priceOracle.safeConvertToUSD(token, value);
+			if (!priced.error) return {
 				token: meta,
 				value,
-				valueUsd
+				valueUsd: require_onchain_market_math.usdToNumber(priced.value)
 			};
 		}
 		return {

package/dist/cjs/onchain/chain/chains.js

@@ -114,7 +114,11 @@ const chains = {
 			"0xa4c644f3180d10cd3b2121d455a2a88e1bda2928",
 			"0xb79d6544839d169869476589d2e54014a074317b",
 			"0xc307a074bd5aec2d6ad1d9b74465c24a59b490fd",
-			"0xf5edc34204e67e592bdcb84114571c9e4bd0bdf7"
+			"0xf5edc34204e67e592bdcb84114571c9e4bd0bdf7",
+			"0x29350A3C2627FB78C7E915cd59AF754edf8998c5",
+			"0x5A93bc6983F80f5c55675eA4e77bb46DdC9665e8",
+			"0x5415092F06403F30486EF846dBAE0532c6Bd8759",
+			"0x9D866298f6B8E168a06e313D47059f2C097A92F1"
 		]),
 		isPublic: true,
 		wellKnownToken: {
@@ -226,7 +230,8 @@ const chains = {
 		sunsetPools: new require_onchain_utils_AddressSet.AddressSet([
 			"0x09cA6b76276eC0682adb896418b99CB7E44a58A0",
 			"0x34752948B0dc28969485Df2066fFE86D5dc36689",
-			"0x164A35F31e4E0F6c45D500962a6978D2cbD5a16b"
+			"0x164A35F31e4E0F6c45D500962a6978D2cbD5a16b",
+			"0xc4173359087CE643235420b7bC610d9B0CF2B82D"
 		]),
 		sunsetStrategies: new require_onchain_utils_AddressSet.AddressSet([
 			"0xA1F05494Dab74Eb9C352C3A042836579fE168aa7",
@@ -236,7 +241,8 @@ const chains = {
 			"0xb21f766c193541305C18cE146DCD3Fdf642b40eF",
 			"0x04620081bb818B8CD3996943D0A4a37Dbf296cF4",
 			"0x5452971Fc17d025a1AFFDd5F7a44CCDD1BF0524C",
-			"0x7ea06087C63568f1071c6BEA3AeB51e070ec68B9"
+			"0x7ea06087C63568f1071c6BEA3AeB51e070ec68B9",
+			"0x06F5b5062477DCf6723c30a76232A5C0B6FCb01A"
 		]),
 		rwaFactories: [],
 		isPublic: true,

package/dist/cjs/onchain/index.js

@@ -170,9 +170,9 @@ const require_onchain_market_pricefeeds_WstETHPriceFeed = require("./market/pric
 const require_onchain_market_pricefeeds_YearnPriceFeed = require("./market/pricefeeds/YearnPriceFeed.js");
 const require_onchain_market_pricefeeds_ZeroPriceFeed = require("./market/pricefeeds/ZeroPriceFeed.js");
 const require_onchain_market_pricefeeds_PriceFeedsRegister = require("./market/pricefeeds/PriceFeedsRegister.js");
+const require_onchain_market_oracle_errors = require("./market/oracle/errors.js");
 const require_onchain_market_oracle_PriceOracleV310Contract = require("./market/oracle/PriceOracleV310Contract.js");
 const require_onchain_market_oracle_createPriceOracle = require("./market/oracle/createPriceOracle.js");
-const require_onchain_market_oracle_errors = require("./market/oracle/errors.js");
 const require_onchain_market_pool_GaugeContract = require("./market/pool/GaugeContract.js");
 const require_onchain_market_pool_LinearInterestRateModelContract = require("./market/pool/LinearInterestRateModelContract.js");
 const require_onchain_market_pool_PoolV310Contract = require("./market/pool/PoolV310Contract.js");

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

@@ -1,8 +1,6 @@
 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");
-const require_onchain_constants_math = 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");
@@ -153,32 +151,6 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		...this.priceOracle.toAmount(this.underlying, value)
 	});
 	/**
-	* Sums `assets` in this market's underlying at latest oracle prices.
-	*
-	* Balances at or below `minBalance` are ignored. A token the oracle cannot
-	* price contributes nothing; the first such token is {@link ValueInUnderlying.unpriceable}.
-	*
-	* The counterpart of {@link toUnderlyingAmount}: that method labels a figure
-	* already in underlying, this one produces the figure from mixed holdings.
-	**/
-	valueInUnderlying(assets, minBalance = require_onchain_constants_math.DUST_THRESHOLD) {
-		let unpriceable;
-		let value = 0n;
-		for (const { token, balance } of assets) {
-			if (balance <= minBalance) continue;
-			const converted = this.priceOracle.safeConvert(token, this.underlying, balance);
-			if (converted === null) {
-				unpriceable ??= token;
-				continue;
-			}
-			value += converted;
-		}
-		return unpriceable === void 0 ? { value } : {
-			value,
-			unpriceable
-		};
-	}
-	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.
 	*/
 	get poolName() {

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

@@ -67,11 +67,11 @@ function pickStrategyTargetCollateral(tokens) {
 * nothing but its underlying, or nothing the oracle can price.
 **/
 function dominantCollateral(account, market) {
-	let bestValue = 0;
+	let bestValue = 0n;
 	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;
+		const value = market.priceOracle.safeConvertToUSD(t.token, t.balance).value;
 		if (value > bestValue) {
 			bestValue = value;
 			dominant = t.token;

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

@@ -120,9 +120,9 @@ const require_onchain_market_pricefeeds_YearnPriceFeed = require("./pricefeeds/Y
 const require_onchain_market_pricefeeds_ZeroPriceFeed = require("./pricefeeds/ZeroPriceFeed.js");
 const require_onchain_market_pricefeeds_PriceFeedsRegister = require("./pricefeeds/PriceFeedsRegister.js");
 require("./pricefeeds/index.js");
+const require_onchain_market_oracle_errors = require("./oracle/errors.js");
 const require_onchain_market_oracle_PriceOracleV310Contract = require("./oracle/PriceOracleV310Contract.js");
 const require_onchain_market_oracle_createPriceOracle = require("./oracle/createPriceOracle.js");
-const require_onchain_market_oracle_errors = require("./oracle/errors.js");
 require("./oracle/index.js");
 const require_onchain_market_pool_GaugeContract = require("./pool/GaugeContract.js");
 const require_onchain_market_pool_LinearInterestRateModelContract = require("./pool/LinearInterestRateModelContract.js");

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

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_onchain_utils_AddressMap = require("../../utils/AddressMap.js");
 const require_onchain_utils_AddressSet = require("../../utils/AddressSet.js");
+const require_onchain_utils_bigint_math = require("../../utils/bigint-math.js");
 const require_onchain_constants_address_provider = require("../../constants/address-provider.js");
 const require_onchain_constants_addresses = require("../../constants/addresses.js");
 require("../../constants/math.js");
@@ -11,10 +12,13 @@ require("../../utils/index.js");
 const require_onchain_base_BaseContract = require("../../base/BaseContract.js");
 require("../../base/index.js");
 const require_onchain_market_math = require("../math.js");
+const require_model_result = require("../../../model/result.js");
+require("../../../model/index.js");
 const require_abi_compressors_priceFeedCompressor = require("../../../abi/compressors/priceFeedCompressor.js");
 const require_onchain_market_pricefeeds_PriceFeedRef = require("../pricefeeds/PriceFeedRef.js");
 const require_onchain_market_pricefeeds_getRawPriceUpdates = require("../pricefeeds/getRawPriceUpdates.js");
 require("../pricefeeds/index.js");
+const require_onchain_market_oracle_errors = require("./errors.js");
 const require_onchain_market_oracle_PriceFeedAnswerMap = require("./PriceFeedAnswerMap.js");
 let viem = require("viem");
 let date_fns = require("date-fns");
@@ -142,10 +146,13 @@ var PriceOracleBaseContract = class extends require_onchain_base_BaseContract.Ba
 	**/
 	safeConvert(from, to, amount) {
 		try {
-			return this.convert(from, to, amount);
-		} catch (e) {
-			this.logger?.debug(`cannot convert ${this.labelAddress(from)} to ${this.labelAddress(to)}: ${e}`);
-			return null;
+			return { value: this.convert(from, to, amount) };
+		} catch {
+			try {
+				return { value: this.convert(from, to, amount, true) };
+			} catch {
+				return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(from));
+			}
 		}
 	}
 	/**
@@ -153,26 +160,72 @@ var PriceOracleBaseContract = class extends require_onchain_base_BaseContract.Ba
 	**/
 	safeConvertToUSD(token, amount) {
 		try {
-			return this.convertToUSD(token, amount);
-		} catch (e) {
-			this.logger?.debug(`cannot price ${this.labelAddress(token)}: ${e}`);
-			return null;
+			return { value: this.convertToUSD(token, amount) };
+		} catch {
+			try {
+				return { value: this.convertToUSD(token, amount, true) };
+			} catch {
+				return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+			}
+		}
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.safeConvertMinUSD}
+	**/
+	safeConvertMinUSD(token, amount) {
+		let main;
+		try {
+			main = this.convertToUSD(token, amount);
+		} catch {
+			return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+		}
+		let feedToken = token;
+		if ((0, viem.isAddressEqual)(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) try {
+			feedToken = this.sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0);
+		} catch {}
+		if (!this.reservePriceFeeds.has(feedToken)) return { value: 0n };
+		try {
+			return { value: require_onchain_utils_bigint_math.BigIntMath.min(main, this.convertToUSD(token, amount, true)) };
+		} catch {
+			return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+		}
+	}
+	/**
+	* {@inheritDoc IPriceOracleContract.safeConvertFromUSD}
+	**/
+	safeConvertFromUSD(token, amount) {
+		try {
+			return { value: this.convertFromUSD(token, amount) };
+		} catch {
+			try {
+				return { value: this.convertFromUSD(token, amount, true) };
+			} catch {
+				return require_model_result.safeValue(0n, require_onchain_market_oracle_errors.unpriceableTokenError(token));
+			}
 		}
 	}
 	/**
-	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	* {@inheritDoc IPriceOracleContract.safeConvertAssets}
 	**/
-	safeUsdValue(token, amount) {
-		const usd = this.safeConvertToUSD(token, amount);
-		return usd === null ? null : require_onchain_market_math.usdToNumber(usd);
+	safeConvertAssets(assets, to) {
+		let value = 0n;
+		let error;
+		for (const { token, balance } of assets) {
+			if (balance <= 10n) continue;
+			const converted = this.safeConvert(token, to, balance);
+			value += converted.value;
+			error ??= converted.error;
+		}
+		return require_model_result.safeValue(value, error);
 	}
 	/**
 	* {@inheritDoc IPriceOracleContract.toAmount}
 	**/
 	toAmount = (token, value) => {
+		const priced = this.safeConvertToUSD(token, value);
 		return {
 			value,
-			valueUsd: this.safeUsdValue(token, value)
+			valueUsd: priced.error ? null : require_onchain_market_math.usdToNumber(priced.value)
 		};
 	};
 	/**