@gearbox-protocol/sdk 16.0.0-next.6 → 16.0.0-next.8

package/dist/cjs/model/index.js

@@ -140,3 +140,4 @@ exports.tokenRewardsSchema = require_model_opportunities_schema.tokenRewardsSche
 exports.tokenSchema = require_model_primitives_schema.tokenSchema;
 exports.tolerance = require_model_compare_schema.tolerance;
 exports.txCallSchema = require_model_primitives_schema.txCallSchema;
+exports.underlyingTokenSchema = require_model_primitives_schema.underlyingTokenSchema;

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

@@ -58,7 +58,7 @@ const opportunityBaseSchema = zod_v4.z.object({
 	chainId: require_model_primitives_schema.chainIdSchema,
 	name: zod_v4.z.string(),
 	curator: require_model_curators_schema.curatorSchema,
-	underlyingToken: require_model_primitives_schema.tokenSchema,
+	underlyingToken: require_model_primitives_schema.underlyingTokenSchema,
 	allowedDepositTokens: zod_v4.z.array(require_model_primitives_schema.tokenSchema),
 	paused: zod_v4.z.boolean(),
 	rwa: zod_v4.z.boolean(),

package/dist/cjs/model/positions.js

@@ -79,8 +79,8 @@ function matchesPositionFilter(position, filter) {
 **/
 function positionUnderlying(position) {
 	switch (position.kind) {
-		case "pool": return position.netValue.token;
-		case "strategy": return position.totalValue.token;
+		case "pool":
+		case "strategy": return position.underlyingToken;
 		case "liquidation": return;
 	}
 }

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

@@ -69,6 +69,7 @@ const poolPositionSchema = zod_v4.z.object({
 	name: zod_v4.z.string(),
 	chainId: require_model_primitives_schema.chainIdSchema,
 	pool: require_onchain_utils_zod.ZodAddress(),
+	underlyingToken: require_model_primitives_schema.underlyingTokenSchema,
 	netValue: require_model_compare_schema.tolerance(require_model_primitives_schema.tokenAmountSchema, "amount"),
 	apy: require_model_opportunities_schema.apyBreakdownSchema,
 	apyAvg7D: require_model_compare_schema.offchainOnly(require_model_opportunities_schema.apyBreakdownSchema).optional(),
@@ -99,6 +100,7 @@ const strategyPositionSchema = zod_v4.z.object({
 	chainId: require_model_primitives_schema.chainIdSchema,
 	creditManager: require_onchain_utils_zod.ZodAddress(),
 	creditAccount: require_onchain_utils_zod.ZodAddress(),
+	underlyingToken: require_model_primitives_schema.underlyingTokenSchema,
 	targetCollateral: require_model_primitives_schema.tokenSchema.nullable(),
 	leverage: require_model_compare_schema.tolerance(require_model_primitives_schema.leverageSchema, "float"),
 	borrowApy: require_model_compare_schema.tolerance(require_model_primitives_schema.bpsSchema, "bps"),

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

@@ -55,6 +55,13 @@ const tokenSchema = zod_v4.z.object({
 	assetType: assetTypeSchema.optional()
 });
 /**
+* {@link UnderlyingToken}
+**/
+const underlyingTokenSchema = zod_v4.z.object({
+	...tokenSchema.shape,
+	wrappedAddress: require_onchain_utils_zod.ZodAddress().nullable()
+});
+/**
 * {@link TokenAmount}
 **/
 const tokenAmountSchema = amountSchema.extend({ token: tokenSchema });
@@ -76,3 +83,4 @@ exports.timestampSchema = timestampSchema;
 exports.tokenAmountSchema = tokenAmountSchema;
 exports.tokenSchema = tokenSchema;
 exports.txCallSchema = txCallSchema;
+exports.underlyingTokenSchema = underlyingTokenSchema;

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

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_onchain_utils_bigint_math = require("../../utils/bigint-math.js");
 const require_onchain_constants_math = require("../../constants/math.js");
 const require_onchain_accounts_intents_types = require("./types.js");
 //#region src/onchain/accounts/intents/math.ts
@@ -32,10 +33,9 @@ function maxProportionalWithdrawal(position, band) {
 	if (debt === 0n) return allButLast;
 	const repayable = debt - band.minDebt;
 	if (repayable < 0n) return 0n;
-	const bound = ceilDiv(collateral * (repayable + 1n), debt) - 1n;
+	const bound = require_onchain_utils_bigint_math.BigIntMath.ceilDiv(collateral * (repayable + 1n), debt) - 1n;
 	return bound < allButLast ? bound : allButLast;
 }
-const ceilDiv = (a, b) => (a + b - 1n) / b;
 /** Total leverage cannot drop below 1x — that would be negative debt. */
 function assertLeverageAtLeastOne(leverage) {
 	if (leverage < 100n) throw new require_onchain_accounts_intents_types.IntentPreviewError("leverageOutOfRange", `target leverage ${leverage} is below 1x`);

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

@@ -57,8 +57,8 @@ function maxWithdrawCollateral(props) {
 	const targetLt = BigInt(creditManager.liquidationThresholds.get(target.token) ?? 0);
 	const targetUsd = safeUsd(priceOracle, target.token, target.balance);
 	if (targetLt === 0n || !targetUsd) return 0n;
-	const keptUsd = ceilDiv(shortfall, targetLt);
-	const kept = ceilDiv(target.balance * keptUsd, targetUsd);
+	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;
 }
 /** USD value at the main feed, or `undefined` when the token has no price. */
@@ -82,8 +82,5 @@ function safeUsd(oracle, token, amount) {
 		return main;
 	}
 }
-function ceilDiv(a, b) {
-	return (a + b - 1n) / b;
-}
 //#endregion
 exports.maxWithdrawCollateral = maxWithdrawCollateral;

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

@@ -96,7 +96,8 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		this.lossPolicy = require_onchain_market_loss_policy_createLossPolicy.createLossPolicy(sdk, marketData.lossPolicy);
 	}
 	/**
-	* Underlying token of the market pool.
+	* Underlying token of the market pool, as returned by contract.
+	* For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
 	*/
 	get underlying() {
 		return this.pool.underlying;
@@ -118,11 +119,13 @@ var MarketSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 	* The market's underlying as the shared read model describes it.
 	*
 	* For an RWA market this is the token the underlying wraps rather than the
-	* wrapper itself, because only that token means anything to a reader. The
-	* wrapper converts one-for-one, so amounts denominated in it stay exact.
+	* wrapper itself, e.g. USDC rather than dcUSDC (which will be "wrappedAddress" in this case)
 	*/
 	get underlyingToken() {
-		return this.tokensMeta.mustGetToken(this.unwrappedUnderlying);
+		return {
+			...this.tokensMeta.mustGetToken(this.unwrappedUnderlying),
+			wrappedAddress: (0, viem.isAddressEqual)(this.underlying, this.unwrappedUnderlying) ? null : this.underlying
+		};
 	}
 	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.

package/dist/cjs/onchain/market/pool/PoolSuite.js

@@ -93,8 +93,8 @@ var PoolSuite = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 		return this.register.mustGetContract(this.#marketConfigurator);
 	}
 	/**
-	* Underlying asset deposited into the pool and borrowed by connected credit
-	* suites.
+	* Underlying token of the market pool, as returned by contract.
+	* For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
 	*/
 	get underlying() {
 		return this.pool.underlying;

package/dist/cjs/onchain/pools/PoolService.js

@@ -418,6 +418,7 @@ var PoolService = class extends require_onchain_base_SDKConstruct.SDKConstruct {
 			name: this.sdk.tokensMeta.mustGetToken(pool.address).name,
 			chainId: this.chainId,
 			pool: pool.address,
+			underlyingToken: market.underlyingToken,
 			netValue: {
 				token: this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying),
 				...market.priceOracle.toAmount(market.underlying, shares * pool.dieselRate / require_onchain_constants_math.RAY)

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

@@ -177,7 +177,7 @@ var PositionsService = class extends require_onchain_base_SDKConstruct.SDKConstr
 		const { market } = suite;
 		const { priceOracle } = market;
 		const { pool } = market.pool;
-		const token = this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying);
+		const token = market.underlyingToken;
 		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
 		const target = require_onchain_chain_chains.getAccountTargetCollateral(ca.creditAccount, this.sdk.chainId) ?? suite.strategyTargetCollateral;
 		const snapshot = require_onchain_positions_types.accountSnapshotFromCreditAccountData(ca);
@@ -207,6 +207,7 @@ var PositionsService = class extends require_onchain_base_SDKConstruct.SDKConstr
 			chainId: this.sdk.chainId,
 			creditManager: ca.creditManager,
 			creditAccount: ca.creditAccount,
+			underlyingToken: token,
 			name: target ? require_onchain_market_strategyName.strategyName(this.sdk.tokensMeta.mustGetToken(target), token) : token.symbol,
 			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
 			leverage: require_onchain_market_math.calcPositionLeverage(totalValue, totalDebtValue),

package/dist/cjs/onchain/utils/bigint-math.js

@@ -42,6 +42,15 @@ var BigIntMath = class {
 	* @returns A non-positive bigint representation of `a`.
 	*/
 	static neg = (a) => a > 0 ? a * -1n : a;
+	/**
+	* Divides rounding toward positive infinity.
+	*
+	* @param a - Dividend; must not be negative.
+	* @param b - Divisor; must be positive — zero throws, negative returns
+	* nonsense rather than the ceiling.
+	* @returns The smallest integer that is at least `a / b`.
+	**/
+	static ceilDiv = (a, b) => (a + b - 1n) / b;
 };
 //#endregion
 exports.BigIntMath = BigIntMath;

package/dist/esm/model/index.js

@@ -1,6 +1,6 @@
 import { CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS } from "./charts.js";
 import { compareTagOf, offchainOnly, onchainOnly, tolerance } from "./compare.schema.js";
-import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema } from "./primitives.schema.js";
+import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema, underlyingTokenSchema } from "./primitives.schema.js";
 import { chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, poolOpportunityChartMetricSchema, poolPositionChartMetricSchema, strategyOpportunityChartMetricSchema, strategyPositionChartMetricSchema } from "./charts.schema.js";
 import "./curators.js";
 import { curatorNameSchema, curatorSchema } from "./curators.schema.js";
@@ -19,4 +19,4 @@ import { ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ER
 import "./primitives.js";
 import "./response.js";
 import { chainFailedSchema, chainMetadataSchema, chainSucceededSchema, dataSourceSchema, responseMetadataSchema, responseSchema } from "./response.schema.js";
-export { CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, FILTER_ALL, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, amountSchema, apyBreakdownSchema, assetTypeSchema, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema };
+export { CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, FILTER_ALL, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, amountSchema, apyBreakdownSchema, assetTypeSchema, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema, underlyingTokenSchema };

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

@@ -1,6 +1,6 @@
 import { ZodAddress } from "../onchain/utils/zod.js";
 import { offchainOnly, tolerance } from "./compare.schema.js";
-import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenSchema } from "./primitives.schema.js";
+import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenSchema, underlyingTokenSchema } from "./primitives.schema.js";
 import { curatorSchema } from "./curators.schema.js";
 import { isFilterSet } from "./filters.js";
 import { booleanParamSchema, encodeFlag, filterable } from "./filters.schema.js";
@@ -57,7 +57,7 @@ const opportunityBaseSchema = z.object({
 	chainId: chainIdSchema,
 	name: z.string(),
 	curator: curatorSchema,
-	underlyingToken: tokenSchema,
+	underlyingToken: underlyingTokenSchema,
 	allowedDepositTokens: z.array(tokenSchema),
 	paused: z.boolean(),
 	rwa: z.boolean(),

package/dist/esm/model/positions.js

@@ -78,8 +78,8 @@ function matchesPositionFilter(position, filter) {
 **/
 function positionUnderlying(position) {
 	switch (position.kind) {
-		case "pool": return position.netValue.token;
-		case "strategy": return position.totalValue.token;
+		case "pool":
+		case "strategy": return position.underlyingToken;
 		case "liquidation": return;
 	}
 }

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

@@ -1,6 +1,6 @@
 import { ZodAddress, ZodBigInt, ZodHex } from "../onchain/utils/zod.js";
 import { offchainOnly, onchainOnly, tolerance } from "./compare.schema.js";
-import { assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema } from "./primitives.schema.js";
+import { assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, underlyingTokenSchema } from "./primitives.schema.js";
 import { isFilterSet } from "./filters.js";
 import { booleanParamSchema, encodeFlag, filterable } from "./filters.schema.js";
 import { delayedReceivedAssetSchema, liquidationPositionSchema } from "./liquidations.schema.js";
@@ -68,6 +68,7 @@ const poolPositionSchema = z.object({
 	name: z.string(),
 	chainId: chainIdSchema,
 	pool: ZodAddress(),
+	underlyingToken: underlyingTokenSchema,
 	netValue: tolerance(tokenAmountSchema, "amount"),
 	apy: apyBreakdownSchema,
 	apyAvg7D: offchainOnly(apyBreakdownSchema).optional(),
@@ -98,6 +99,7 @@ const strategyPositionSchema = z.object({
 	chainId: chainIdSchema,
 	creditManager: ZodAddress(),
 	creditAccount: ZodAddress(),
+	underlyingToken: underlyingTokenSchema,
 	targetCollateral: tokenSchema.nullable(),
 	leverage: tolerance(leverageSchema, "float"),
 	borrowApy: tolerance(bpsSchema, "bps"),

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

@@ -54,6 +54,13 @@ const tokenSchema = z.object({
 	assetType: assetTypeSchema.optional()
 });
 /**
+* {@link UnderlyingToken}
+**/
+const underlyingTokenSchema = z.object({
+	...tokenSchema.shape,
+	wrappedAddress: ZodAddress().nullable()
+});
+/**
 * {@link TokenAmount}
 **/
 const tokenAmountSchema = amountSchema.extend({ token: tokenSchema });
@@ -66,4 +73,4 @@ const txCallSchema = z.object({
 	value: ZodBigInt().optional()
 });
 //#endregion
-export { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema };
+export { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema, underlyingTokenSchema };

package/dist/esm/onchain/accounts/intents/math.js

@@ -1,3 +1,4 @@
+import { BigIntMath } from "../../utils/bigint-math.js";
 import { LEVERAGE_DECIMALS } from "../../constants/math.js";
 import { IntentPreviewError } from "./types.js";
 //#region src/onchain/accounts/intents/math.ts
@@ -31,10 +32,9 @@ function maxProportionalWithdrawal(position, band) {
 	if (debt === 0n) return allButLast;
 	const repayable = debt - band.minDebt;
 	if (repayable < 0n) return 0n;
-	const bound = ceilDiv(collateral * (repayable + 1n), debt) - 1n;
+	const bound = BigIntMath.ceilDiv(collateral * (repayable + 1n), debt) - 1n;
 	return bound < allButLast ? bound : allButLast;
 }
-const ceilDiv = (a, b) => (a + b - 1n) / b;
 /** Total leverage cannot drop below 1x — that would be negative debt. */
 function assertLeverageAtLeastOne(leverage) {
 	if (leverage < 100n) throw new IntentPreviewError("leverageOutOfRange", `target leverage ${leverage} is below 1x`);

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

@@ -56,8 +56,8 @@ function maxWithdrawCollateral(props) {
 	const targetLt = BigInt(creditManager.liquidationThresholds.get(target.token) ?? 0);
 	const targetUsd = safeUsd(priceOracle, target.token, target.balance);
 	if (targetLt === 0n || !targetUsd) return 0n;
-	const keptUsd = ceilDiv(shortfall, targetLt);
-	const kept = ceilDiv(target.balance * keptUsd, targetUsd);
+	const keptUsd = BigIntMath.ceilDiv(shortfall, targetLt);
+	const kept = BigIntMath.ceilDiv(target.balance * keptUsd, targetUsd);
 	return kept >= target.balance ? 0n : target.balance - kept;
 }
 /** USD value at the main feed, or `undefined` when the token has no price. */
@@ -81,8 +81,5 @@ function safeUsd(oracle, token, amount) {
 		return main;
 	}
 }
-function ceilDiv(a, b) {
-	return (a + b - 1n) / b;
-}
 //#endregion
 export { maxWithdrawCollateral };

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

@@ -95,7 +95,8 @@ var MarketSuite = class extends SDKConstruct {
 		this.lossPolicy = createLossPolicy(sdk, marketData.lossPolicy);
 	}
 	/**
-	* Underlying token of the market pool.
+	* Underlying token of the market pool, as returned by contract.
+	* For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
 	*/
 	get underlying() {
 		return this.pool.underlying;
@@ -117,11 +118,13 @@ var MarketSuite = class extends SDKConstruct {
 	* The market's underlying as the shared read model describes it.
 	*
 	* For an RWA market this is the token the underlying wraps rather than the
-	* wrapper itself, because only that token means anything to a reader. The
-	* wrapper converts one-for-one, so amounts denominated in it stay exact.
+	* wrapper itself, e.g. USDC rather than dcUSDC (which will be "wrappedAddress" in this case)
 	*/
 	get underlyingToken() {
-		return this.tokensMeta.mustGetToken(this.unwrappedUnderlying);
+		return {
+			...this.tokensMeta.mustGetToken(this.unwrappedUnderlying),
+			wrappedAddress: isAddressEqual(this.underlying, this.unwrappedUnderlying) ? null : this.underlying
+		};
 	}
 	/**
 	* Display name of this market's pool, e.g. `"USDC Pool"`.

package/dist/esm/onchain/market/pool/PoolSuite.js

@@ -92,8 +92,8 @@ var PoolSuite = class extends SDKConstruct {
 		return this.register.mustGetContract(this.#marketConfigurator);
 	}
 	/**
-	* Underlying asset deposited into the pool and borrowed by connected credit
-	* suites.
+	* Underlying token of the market pool, as returned by contract.
+	* For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
 	*/
 	get underlying() {
 		return this.pool.underlying;

package/dist/esm/onchain/pools/PoolService.js

@@ -417,6 +417,7 @@ var PoolService = class extends SDKConstruct {
 			name: this.sdk.tokensMeta.mustGetToken(pool.address).name,
 			chainId: this.chainId,
 			pool: pool.address,
+			underlyingToken: market.underlyingToken,
 			netValue: {
 				token: this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying),
 				...market.priceOracle.toAmount(market.underlying, shares * pool.dieselRate / RAY)

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

@@ -176,7 +176,7 @@ var PositionsService = class extends SDKConstruct {
 		const { market } = suite;
 		const { priceOracle } = market;
 		const { pool } = market.pool;
-		const token = this.sdk.tokensMeta.mustGetToken(market.unwrappedUnderlying);
+		const token = market.underlyingToken;
 		const totalDebtValue = ca.debt + ca.accruedInterest + ca.accruedFees;
 		const target = getAccountTargetCollateral(ca.creditAccount, this.sdk.chainId) ?? suite.strategyTargetCollateral;
 		const snapshot = accountSnapshotFromCreditAccountData(ca);
@@ -206,6 +206,7 @@ var PositionsService = class extends SDKConstruct {
 			chainId: this.sdk.chainId,
 			creditManager: ca.creditManager,
 			creditAccount: ca.creditAccount,
+			underlyingToken: token,
 			name: target ? strategyName(this.sdk.tokensMeta.mustGetToken(target), token) : token.symbol,
 			targetCollateral: target ? this.sdk.tokensMeta.mustGetToken(target) : null,
 			leverage: calcPositionLeverage(totalValue, totalDebtValue),

package/dist/esm/onchain/utils/bigint-math.js

@@ -41,6 +41,15 @@ var BigIntMath = class {
 	* @returns A non-positive bigint representation of `a`.
 	*/
 	static neg = (a) => a > 0 ? a * -1n : a;
+	/**
+	* Divides rounding toward positive infinity.
+	*
+	* @param a - Dividend; must not be negative.
+	* @param b - Divisor; must be positive — zero throws, negative returns
+	* nonsense rather than the ceiling.
+	* @returns The smallest integer that is at least `a / b`.
+	**/
+	static ceilDiv = (a, b) => (a + b - 1n) / b;
 };
 //#endregion
 export { BigIntMath };

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

@@ -1,4 +1,4 @@
-import { Amount, Asset, AssetType, Bps, ChainId, Leverage, Timestamp, Token, TokenAmount, TxCall } from "./primitives.js";
+import { Amount, Asset, AssetType, Bps, ChainId, Leverage, Timestamp, Token, TokenAmount, TxCall, UnderlyingToken } from "./primitives.js";
 import { CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ChartBundle, ChartDenomination, ChartMetric, ChartQuery, ChartRange, ChartSeries, ChartSeriesOk, ChartSeriesUnavailable, ChartUnavailableCode, ChartUnit, ChartValue, ChartWindow, GridSampling, OpportunityChartMetric, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PoolOpportunityChartMetric, PoolPositionChartMetric, PositionChartMetric, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, StrategyOpportunityChartMetric, StrategyPositionChartMetric } from "./charts.js";
 import { chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, poolOpportunityChartMetricSchema, poolPositionChartMetricSchema, strategyOpportunityChartMetricSchema, strategyPositionChartMetricSchema } from "./charts.schema.js";
 import { CompareTag, CompareTolerance, ToleranceCompareTag, compareTagOf, offchainOnly, onchainOnly, tolerance } from "./compare.schema.js";
@@ -16,7 +16,7 @@ import { noticeKindSchema, noticeSchema } from "./notices.schema.js";
 import { apyBreakdownSchema, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pointRewardsSchema, pointsProgramSchema, poolOpportunityDetailSchema, poolOpportunityKeySchema, poolOpportunitySchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, rewardsSchema, strategyOpportunityDetailSchema, strategyOpportunityKeySchema, strategyOpportunitySchema, tokenRewardsSchema } from "./opportunities.schema.js";
 import { borrowRateBreakdownSchema, pnlBreakdownSchema, pointsProgramPnLSchema, pointsRewardsPnLSchema, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, rewardsPnLSchema, strategyPositionKeySchema, strategyPositionSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema } from "./positions.schema.js";
 import { AdjustCreditAccountPreview, CloseCreditAccountPreview, DelayedCreditAccountOperationPreview, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, InstantOperationPreview, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, PoolOperationPreview, PoolOperationType, PreviewOperationInput, PreviewOperationOptions, RepayCreditAccountPreview } from "./previews.js";
-import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema } from "./primitives.schema.js";
+import { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema, underlyingTokenSchema } from "./primitives.schema.js";
 import { ChainFailed, ChainMetadata, ChainScoped, ChainSucceeded, DataResponse, DataSource, ResponseMetadata } from "./response.js";
 import { chainFailedSchema, chainMetadataSchema, chainSucceededSchema, dataSourceSchema, responseMetadataSchema, responseSchema } from "./response.schema.js";
-export { AdjustCreditAccountPreview, Amount, ApyBreakdown, Asset, AssetType, BorrowRateBreakdown, Bps, CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ChainFailed, ChainId, ChainMetadata, ChainScoped, ChainScopedFilter, ChainSucceeded, ChartBundle, ChartDenomination, ChartMetric, ChartQuery, ChartRange, ChartSeries, ChartSeriesOk, ChartSeriesUnavailable, ChartUnavailableCode, ChartUnit, ChartValue, ChartWindow, CloseCreditAccountPreview, CompareTag, CompareTolerance, Curator, CuratorName, DataResponse, DataSource, DelayedAddCollateralIntent, DelayedCloseAccountIntent, DelayedCreditAccountOperationPreview, DelayedDecreaseLeverageIntent, DelayedDepositAndIncreaseLeverageIntent, DelayedDepositIntent, DelayedIncreaseLeverageIntent, DelayedIntent, DelayedReceivedAsset, DelayedWithdrawCollateralIntent, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, FILTER_ALL, FilterAll, Filterable, GridSampling, InstantOperationPreview, InstantReceivedAsset, Leverage, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, Notice, NoticeKind, NoticeSubject, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, Opportunity, OpportunityBase, OpportunityChartMetric, OpportunityDetail, OpportunityFilter, OpportunityId, OpportunityKey, OpportunityKind, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PnlBreakdown, PointRewards, PointsProgram, PointsProgramPnL, PointsRewardsPnL, PoolOperationPreview, PoolOperationType, PoolOpportunity, PoolOpportunityChartMetric, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PoolPosition, PoolPositionChartMetric, PoolPositionKey, PoolPositionRef, Position, PositionChartMetric, PositionCollateral, PositionFilter, PositionId, PositionKey, PositionKind, PositionTransaction, PositionTransactionKind, PositionsTotals, PreviewOperationInput, PreviewOperationOptions, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, ReceivedAsset, RepayCreditAccountPreview, ResponseMetadata, Rewards, RewardsPnL, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, StrategyOpportunity, StrategyOpportunityChartMetric, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, StrategyPosition, StrategyPositionChartMetric, StrategyPositionKey, StrategyPositionRef, Timestamp, Token, TokenAmount, TokenQuotaRate, TokenRewards, TokenRewardsPnL, ToleranceCompareTag, TxCall, amountSchema, apyBreakdownSchema, assetTypeSchema, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema };
+export { AdjustCreditAccountPreview, Amount, ApyBreakdown, Asset, AssetType, BorrowRateBreakdown, Bps, CHART_METRIC_UNITS, CHART_RANGES, CHART_UNAVAILABLE_CODES, ChainFailed, ChainId, ChainMetadata, ChainScoped, ChainScopedFilter, ChainSucceeded, ChartBundle, ChartDenomination, ChartMetric, ChartQuery, ChartRange, ChartSeries, ChartSeriesOk, ChartSeriesUnavailable, ChartUnavailableCode, ChartUnit, ChartValue, ChartWindow, CloseCreditAccountPreview, CompareTag, CompareTolerance, Curator, CuratorName, DataResponse, DataSource, DelayedAddCollateralIntent, DelayedCloseAccountIntent, DelayedCreditAccountOperationPreview, DelayedDecreaseLeverageIntent, DelayedDepositAndIncreaseLeverageIntent, DelayedDepositIntent, DelayedIncreaseLeverageIntent, DelayedIntent, DelayedReceivedAsset, DelayedWithdrawCollateralIntent, ERROR_ADAPTER_CALL_OUTSIDE_BRACKET, ERROR_INVALID_TRANSACTION_VALUE, ERROR_MALFORMED_BRACKET, ERROR_NON_ADAPTER_CALL_IN_BRACKET, ERROR_UNPREVIEWABLE_ADAPTER_CALL, ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP, ERROR_UNPRICEABLE_TOKEN, FILTER_ALL, FilterAll, Filterable, GridSampling, InstantOperationPreview, InstantReceivedAsset, Leverage, LiquidatableAccount, LiquidatableAccountFilter, LiquidationApproval, LiquidationDetails, LiquidationPosition, Notice, NoticeKind, NoticeSubject, OpenCreditAccountPreview, OperationPreview, OperationPreviewError, Opportunity, OpportunityBase, OpportunityChartMetric, OpportunityDetail, OpportunityFilter, OpportunityId, OpportunityKey, OpportunityKind, POOL_OPPORTUNITY_CHART_METRICS, POOL_POSITION_CHART_METRICS, PnlBreakdown, PointRewards, PointsProgram, PointsProgramPnL, PointsRewardsPnL, PoolOperationPreview, PoolOperationType, PoolOpportunity, PoolOpportunityChartMetric, PoolOpportunityDetail, PoolOpportunityKey, PoolOpportunityRef, PoolPosition, PoolPositionChartMetric, PoolPositionKey, PoolPositionRef, Position, PositionChartMetric, PositionCollateral, PositionFilter, PositionId, PositionKey, PositionKind, PositionTransaction, PositionTransactionKind, PositionsTotals, PreviewOperationInput, PreviewOperationOptions, PriceFeedData, PriceFeedSummary, QuotaAsset, RateCurve, RateCurvePoint, ReceivedAsset, RepayCreditAccountPreview, ResponseMetadata, Rewards, RewardsPnL, STRATEGY_OPPORTUNITY_CHART_METRICS, STRATEGY_POSITION_CHART_METRICS, StrategyOpportunity, StrategyOpportunityChartMetric, StrategyOpportunityDetail, StrategyOpportunityKey, StrategyOpportunityRef, StrategyPosition, StrategyPositionChartMetric, StrategyPositionKey, StrategyPositionRef, Timestamp, Token, TokenAmount, TokenQuotaRate, TokenRewards, TokenRewardsPnL, ToleranceCompareTag, TxCall, UnderlyingToken, amountSchema, apyBreakdownSchema, assetTypeSchema, booleanParamSchema, borrowRateBreakdownSchema, bpsSchema, chainFailedSchema, chainIdSchema, chainMetadataSchema, chainSucceededSchema, chartBundleSchemaFor, chartDenominationSchema, chartMetricSchema, chartQueryCodec, chartQueryParamsSchema, chartQuerySchema, chartRangeSchema, chartSeriesSchema, chartValueSchema, chartWindowSchema, compareTagOf, curatorNameSchema, curatorSchema, dataSourceSchema, delayedReceivedAssetSchema, encodeFlag, filterAllSchema, filterable, instantReceivedAssetSchema, isFilterSet, leverageSchema, liquidatableAccountFilterSchema, liquidatableAccountSchema, liquidationApprovalSchema, liquidationDetailsSchema, liquidationPositionId, liquidationPositionSchema, matchesLiquidatableAccountFilter, matchesOpportunityFilter, matchesPositionFilter, noticeKindSchema, noticeSchema, offchainOnly, onchainOnly, opportunityBaseSchema, opportunityDetailSchema, opportunityFilterQueryParamsSchema, opportunityFilterQuerySchema, opportunityFilterSchema, opportunityId, opportunityKeySchema, opportunityKindSchema, opportunitySchema, pnlBreakdownSchema, pointRewardsSchema, pointsProgramPnLSchema, pointsProgramSchema, pointsRewardsPnLSchema, poolOpportunityChartMetricSchema, poolOpportunityDetailSchema, poolOpportunityId, poolOpportunityKeySchema, poolOpportunitySchema, poolPositionChartMetricSchema, poolPositionId, poolPositionKeySchema, poolPositionSchema, positionCollateralSchema, positionFilterQueryParamsSchema, positionFilterQuerySchema, positionFilterSchema, positionId, positionKeySchema, positionKindSchema, positionSchema, positionTransactionKindSchema, positionTransactionSchema, positionsTotalsSchema, priceFeedDataSchema, priceFeedSummarySchema, quotaAssetSchema, rateCurvePointSchema, rateCurveSchema, receivedAssetSchema, responseMetadataSchema, responseSchema, rewardsPnLSchema, rewardsSchema, strategyOpportunityChartMetricSchema, strategyOpportunityDetailSchema, strategyOpportunityId, strategyOpportunityKeySchema, strategyOpportunitySchema, strategyPositionChartMetricSchema, strategyPositionId, strategyPositionKeySchema, strategyPositionSchema, timestampSchema, tokenAmountSchema, tokenQuotaRateSchema, tokenRewardsPnLSchema, tokenRewardsSchema, tokenSchema, tolerance, txCallSchema, underlyingTokenSchema };

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

@@ -1,4 +1,4 @@
-import { Amount, AssetType, Bps, ChainId, Leverage, Timestamp, Token } from "./primitives.js";
+import { Amount, AssetType, Bps, ChainId, Leverage, Timestamp, Token, UnderlyingToken } from "./primitives.js";
 import { Curator } from "./curators.js";
 import { ChainScopedFilter, Filterable } from "./filters.js";
 import { Address } from "viem";
@@ -127,10 +127,10 @@ interface OpportunityBase {
    * Token that is supplied to the pool and borrowed by credit accounts. All
    * amounts of the opportunity are denominated in it.
    *
-   * For RWA markets it's an unwrapped, e.g. — `USDC`, not `dcUSDC` (pool underlying according to contract).
-   * The wrapper converts one-for-one, so every amount stays exact.
+   * For RWA markets this is the unwrapped asset, e.g. USDC rather than
+   * dcUSDC (the pool's on-chain underlying).
    **/
-  underlyingToken: Token;
+  underlyingToken: UnderlyingToken;
   /**
    * Tokens a user can transfer from their wallet to deposit into a pool
    * position or to use when opening a credit account. They are not necessarily

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

@@ -126,6 +126,7 @@ declare const opportunityBaseSchema: z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -199,6 +200,7 @@ declare const poolOpportunitySchema: z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -331,6 +333,7 @@ declare const strategyOpportunitySchema: z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -469,6 +472,7 @@ declare const opportunitySchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -597,6 +601,7 @@ declare const opportunitySchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -842,6 +847,7 @@ declare const poolOpportunityDetailSchema: z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -982,6 +988,7 @@ declare const strategyOpportunityDetailSchema: z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -1145,6 +1152,7 @@ declare const opportunityDetailSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;
@@ -1281,6 +1289,7 @@ declare const opportunityDetailSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     name: z.ZodString;
     decimals: z.ZodNumber;
     assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
   }, z.core.$strip>;
   allowedDepositTokens: z.ZodArray<z.ZodObject<{
     chainId: z.ZodNumber;

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

@@ -1,4 +1,4 @@
-import { AssetType, Bps, ChainId, Leverage, Timestamp, Token, TokenAmount } from "./primitives.js";
+import { AssetType, Bps, ChainId, Leverage, Timestamp, Token, TokenAmount, UnderlyingToken } from "./primitives.js";
 import { ChainScopedFilter, Filterable } from "./filters.js";
 import { DelayedReceivedAsset, LiquidationPosition } from "./liquidations.js";
 import { ApyBreakdown, PointsProgram } from "./opportunities.js";
@@ -113,6 +113,13 @@ interface PoolPosition {
    * Address of the ERC-4626 pool contract.
    **/
   pool: Address;
+  /**
+   * Pool underlying token.
+   *
+   * For RWA markets this is the unwrapped asset, e.g. USDC rather than
+   * dcUSDC (the pool's on-chain underlying).
+   **/
+  underlyingToken: UnderlyingToken;
   /**
    * Underlying the held shares are worth at the current share rate, i.e.
    * `pool.convertToAssets(pool.balanceOf(wallet))`.
@@ -199,6 +206,13 @@ interface StrategyPosition {
    * Credit account address.
    **/
   creditAccount: Address;
+  /**
+   * Pool underlying token.
+   *
+   * For RWA markets this is the unwrapped asset, e.g. USDC rather than
+   * dcUSDC (the pool's on-chain underlying).
+   **/
+  underlyingToken: UnderlyingToken;
   /**
    * Collateral token this position is a strategy in.
    **/

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

@@ -171,6 +171,15 @@ declare const poolPositionSchema: z.ZodObject<{
   name: z.ZodString;
   chainId: z.ZodNumber;
   pool: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+  underlyingToken: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+    symbol: z.ZodString;
+    name: z.ZodString;
+    decimals: z.ZodNumber;
+    assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+  }, z.core.$strip>;
   netValue: z.ZodObject<{
     value: z.ZodCodec<z.ZodUnion<[z.ZodString, z.ZodBigInt]>, z.ZodBigInt>;
     valueUsd: z.ZodNullable<z.ZodNumber>;
@@ -321,6 +330,15 @@ declare const strategyPositionSchema: z.ZodObject<{
   chainId: z.ZodNumber;
   creditManager: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
   creditAccount: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+  underlyingToken: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+    symbol: z.ZodString;
+    name: z.ZodString;
+    decimals: z.ZodNumber;
+    assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+  }, z.core.$strip>;
   targetCollateral: z.ZodNullable<z.ZodObject<{
     chainId: z.ZodNumber;
     address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
@@ -536,6 +554,15 @@ declare const positionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   name: z.ZodString;
   chainId: z.ZodNumber;
   pool: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+  underlyingToken: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+    symbol: z.ZodString;
+    name: z.ZodString;
+    decimals: z.ZodNumber;
+    assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+  }, z.core.$strip>;
   netValue: z.ZodObject<{
     value: z.ZodCodec<z.ZodUnion<[z.ZodString, z.ZodBigInt]>, z.ZodBigInt>;
     valueUsd: z.ZodNullable<z.ZodNumber>;
@@ -649,6 +676,15 @@ declare const positionSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   chainId: z.ZodNumber;
   creditManager: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
   creditAccount: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+  underlyingToken: z.ZodObject<{
+    chainId: z.ZodNumber;
+    address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+    symbol: z.ZodString;
+    name: z.ZodString;
+    decimals: z.ZodNumber;
+    assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+    wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+  }, z.core.$strip>;
   targetCollateral: z.ZodNullable<z.ZodObject<{
     chainId: z.ZodNumber;
     address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;

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

@@ -156,6 +156,22 @@ interface Token {
    **/
   assetType?: AssetType;
 }
+/**
+ * A market's underlying as the shared read model describes it.
+ *
+ * For an RWA market this is the token the wrapper holds (e.g. USDC) rather
+ * than the wrapper itself (e.g. dcUSDC). The wrapper converts one-for-one, so
+ * amounts denominated in it stay exact; {@link wrappedAddress} names the
+ * wrapper when there is one.
+ **/
+interface UnderlyingToken extends Token {
+  /**
+   * Address of the compliance wrapper the pool actually holds (e.g. dcUSDC)
+   * when the market underlying is an RWA wrapper, or `null` when the
+   * underlying is the token itself.
+   **/
+  wrappedAddress: Address | null;
+}
 /**
  * An {@link Amount} that names its own token.
  **/
@@ -186,4 +202,4 @@ interface TxCall {
   value?: bigint;
 }
 //#endregion
-export { Amount, Asset, AssetType, Bps, ChainId, Leverage, Timestamp, Token, TokenAmount, TxCall };
+export { Amount, Asset, AssetType, Bps, ChainId, Leverage, Timestamp, Token, TokenAmount, TxCall, UnderlyingToken };

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

@@ -47,6 +47,18 @@ declare const tokenSchema: z.ZodObject<{
   decimals: z.ZodNumber;
   assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
 }, z.core.$strip>;
+/**
+ * {@link UnderlyingToken}
+ **/
+declare const underlyingTokenSchema: z.ZodObject<{
+  chainId: z.ZodNumber;
+  address: z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>;
+  symbol: z.ZodString;
+  name: z.ZodString;
+  decimals: z.ZodNumber;
+  assetType: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"Stable">, z.ZodLiteral<"ETH">, z.ZodLiteral<"BTC">]>>;
+  wrappedAddress: z.ZodNullable<z.ZodCodec<z.ZodString, z.ZodCustom<`0x${string}`, `0x${string}`>>>;
+}, z.core.$strip>;
 /**
  * {@link TokenAmount}
  **/
@@ -71,4 +83,4 @@ declare const txCallSchema: z.ZodObject<{
   value: z.ZodOptional<z.ZodCodec<z.ZodUnion<[z.ZodString, z.ZodBigInt]>, z.ZodBigInt>>;
 }, z.core.$strip>;
 //#endregion
-export { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema };
+export { amountSchema, assetTypeSchema, bpsSchema, chainIdSchema, leverageSchema, timestampSchema, tokenAmountSchema, tokenSchema, txCallSchema, underlyingTokenSchema };

package/dist/types/onchain/market/MarketSuite.d.ts

@@ -1,4 +1,4 @@
-import { Token } from "../../model/primitives.js";
+import { Token, UnderlyingToken } from "../../model/primitives.js";
 import { Curator } from "../../model/curators.js";
 import { Opportunity, OpportunityFilter, PoolOpportunity, PoolOpportunityDetail, PriceFeedSummary, QuotaAsset } from "../../model/opportunities.js";
 import "../../model/index.js";
@@ -81,7 +81,8 @@ declare class MarketSuite extends SDKConstruct {
    */
   constructor(sdk: OnchainSDK, marketData: MarketData);
   /**
-   * Underlying token of the market pool.
+   * Underlying token of the market pool, as returned by contract.
+   * For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
    */
   get underlying(): Address;
   /**
@@ -97,10 +98,9 @@ declare class MarketSuite extends SDKConstruct {
    * The market's underlying as the shared read model describes it.
    *
    * For an RWA market this is the token the underlying wraps rather than the
-   * wrapper itself, because only that token means anything to a reader. The
-   * wrapper converts one-for-one, so amounts denominated in it stay exact.
+   * wrapper itself, e.g. USDC rather than dcUSDC (which will be "wrappedAddress" in this case)
    */
-  get underlyingToken(): Token;
+  get underlyingToken(): UnderlyingToken;
   /**
    * Display name of this market's pool, e.g. `"USDC Pool"`.
    */

package/dist/types/onchain/market/pool/PoolSuite.d.ts

@@ -80,8 +80,8 @@ declare class PoolSuite extends SDKConstruct {
    */
   get marketConfigurator(): MarketConfiguratorContract;
   /**
-   * Underlying asset deposited into the pool and borrowed by connected credit
-   * suites.
+   * Underlying token of the market pool, as returned by contract.
+   * For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
    */
   get underlying(): Address;
   /**

package/dist/types/onchain/market/pool/types.d.ts

@@ -45,6 +45,7 @@ interface IPoolContract extends IBaseContract {
   interestRateModel: Address;
   /**
    * Pool's underlying token, same as `asset()`.
+   * For RWA markets this is a wrapped token (e.g. dcUSDC, rather than USDC)
    */
   underlying: Address;
   /**

package/dist/types/onchain/utils/bigint-math.d.ts

@@ -37,6 +37,15 @@ declare class BigIntMath {
    * @returns A non-positive bigint representation of `a`.
    */
   static neg: (a: bigint) => bigint;
+  /**
+   * Divides rounding toward positive infinity.
+   *
+   * @param a - Dividend; must not be negative.
+   * @param b - Divisor; must be positive — zero throws, negative returns
+   * nonsense rather than the ceiling.
+   * @returns The smallest integer that is at least `a / b`.
+   **/
+  static ceilDiv: (a: bigint, b: bigint) => bigint;
 }
 //#endregion
 export { BigIntMath };

package/package.json

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