@gearbox-protocol/sdk 16.0.0-next.2 → 16.0.0-next.21

package/dist/cjs/preview/prerequisites/BalancePrerequisite.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../sdk/constants/addresses.js");
-const require_sdk_utils_hex = require("../../sdk/utils/hex.js");
-require("../../sdk/index.js");
+require("../../onchain/constants/addresses.js");
+const require_onchain_utils_hex = require("../../onchain/utils/hex.js");
+require("../../onchain/index.js");
 const require_preview_prerequisites_Prerequisite = require("./Prerequisite.js");
 let viem = require("viem");
 //#region src/preview/prerequisites/BalancePrerequisite.ts
@@ -35,7 +35,7 @@ var BalancePrerequisite = class extends require_preview_prerequisites_Prerequisi
 		};
 	}
 	async #readBalance(ctx) {
-		if (require_sdk_utils_hex.hexEq(this.#detail.token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) return ctx.sdk.client.getBalance({
+		if (require_onchain_utils_hex.hexEq(this.#detail.token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) return ctx.sdk.client.getBalance({
 			address: this.#detail.owner,
 			blockNumber: ctx.blockNumber
 		});

package/dist/cjs/preview/prerequisites/buildCollateralPrerequisites.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_utils_AssetsMap = require("../../sdk/utils/AssetsMap.js");
-const require_sdk_constants_address_provider = require("../../sdk/constants/address-provider.js");
-const require_sdk_constants_addresses = require("../../sdk/constants/addresses.js");
-require("../../sdk/index.js");
+const require_onchain_utils_AssetsMap = require("../../onchain/utils/AssetsMap.js");
+const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
+const require_onchain_constants_addresses = require("../../onchain/constants/addresses.js");
+require("../../onchain/index.js");
 const require_preview_prerequisites_AllowancePrerequisite = require("./AllowancePrerequisite.js");
 const require_preview_prerequisites_BalancePrerequisite = require("./BalancePrerequisite.js");
 const require_preview_prerequisites_helpers = require("./helpers.js");
@@ -20,7 +20,7 @@ let viem = require("viem");
 */
 async function buildCollateralPrerequisites(spenderOptions, multicall, ctx) {
 	const { sdk, wallet, value = 0n } = ctx;
-	const required = new require_sdk_utils_AssetsMap.AssetsMap();
+	const required = new require_onchain_utils_AssetsMap.AssetsMap();
 	for (const op of multicall) {
 		if (op.operation !== "AddCollateral" || op.amount === 0n) continue;
 		required.inc(op.token, op.amount);
@@ -28,13 +28,13 @@ async function buildCollateralPrerequisites(spenderOptions, multicall, ctx) {
 	if (required.size === 0 && value === 0n) return [];
 	const prereqs = [];
 	if (value > 0n) prereqs.push(new require_preview_prerequisites_BalancePrerequisite.BalancePrerequisite({
-		token: require_sdk_constants_addresses.NATIVE_ADDRESS,
+		token: require_onchain_constants_addresses.NATIVE_ADDRESS,
 		owner: wallet,
 		required: value
 	}));
 	if (required.size === 0) return prereqs;
 	const spender = await sdk.accounts.getApprovalAddress(spenderOptions);
-	const weth = sdk.addressProvider.getAddress(require_sdk_constants_address_provider.AP_WETH_TOKEN, 0);
+	const weth = sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0);
 	for (const [token, amount] of required.entries()) {
 		if (value > 0n && (0, viem.isAddressEqual)(token, weth)) {
 			prereqs.push(new require_preview_prerequisites_AllowancePrerequisite.AllowancePrerequisite({

package/dist/cjs/preview/prerequisites/buildPoolPrerequisites.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../sdk/constants/addresses.js");
-require("../../sdk/index.js");
+require("../../onchain/constants/addresses.js");
+require("../../onchain/index.js");
 const require_preview_prerequisites_AllowancePrerequisite = require("./AllowancePrerequisite.js");
 const require_preview_prerequisites_BalancePrerequisite = require("./BalancePrerequisite.js");
 const require_preview_prerequisites_helpers = require("./helpers.js");

package/dist/cjs/preview/prerequisites/buildRWAPrerequisites.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_utils_AddressSet = require("../../sdk/utils/AddressSet.js");
-require("../../sdk/index.js");
+const require_onchain_utils_AddressSet = require("../../onchain/utils/AddressSet.js");
+require("../../onchain/index.js");
 const require_preview_prerequisites_RWAOpenRequirementsPrerequisite = require("./RWAOpenRequirementsPrerequisite.js");
 //#region src/preview/prerequisites/buildRWAPrerequisites.ts
 /**
@@ -21,8 +21,8 @@ const require_preview_prerequisites_RWAOpenRequirementsPrerequisite = require(".
 function buildRWAPrerequisites(multicall, creditManager, providedArgs, ctx) {
 	const { rwaFactory } = ctx.sdk.marketRegister.findByCreditManager(creditManager);
 	if (!rwaFactory) return [];
-	const rwaTokens = new require_sdk_utils_AddressSet.AddressSet(rwaFactory.getTokens());
-	const candidates = new require_sdk_utils_AddressSet.AddressSet();
+	const rwaTokens = new require_onchain_utils_AddressSet.AddressSet(rwaFactory.getTokens());
+	const candidates = new require_onchain_utils_AddressSet.AddressSet();
 	for (const op of multicall) if (op.operation === "AddCollateral" || op.operation === "UpdateQuota") candidates.add(op.token);
 	const prereqs = [];
 	for (const token of candidates) {

package/dist/cjs/preview/preview/CreditAccountState.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_utils_AssetsMap = require("../../sdk/utils/AssetsMap.js");
-const require_sdk_constants_math = require("../../sdk/constants/math.js");
-require("../../sdk/index.js");
+const require_onchain_utils_AssetsMap = require("../../onchain/utils/AssetsMap.js");
+const require_onchain_constants_math = require("../../onchain/constants/math.js");
+require("../../onchain/index.js");
 let viem = require("viem");
 //#region src/preview/preview/CreditAccountState.ts
 /**
@@ -41,8 +41,8 @@ var CreditAccountState = class CreditAccountState {
 		this.creditAccount = props.creditAccount;
 		this.creditManager = props.creditManager;
 		this.underlying = props.underlying;
-		this.balances = props.balances ?? new require_sdk_utils_AssetsMap.AssetsMap();
-		this.quotas = props.quotas ?? new require_sdk_utils_AssetsMap.AssetsMap();
+		this.balances = props.balances ?? new require_onchain_utils_AssetsMap.AssetsMap();
+		this.quotas = props.quotas ?? new require_onchain_utils_AssetsMap.AssetsMap();
 		this.debt = props.debt ?? 0n;
 		this.totalDebt = props.totalDebt ?? 0n;
 	}
@@ -63,8 +63,8 @@ var CreditAccountState = class CreditAccountState {
 	* balances and quotas (≤ 1 wei) filtered out.
 	*/
 	static fromCreditAccountData(ca) {
-		const balances = new require_sdk_utils_AssetsMap.AssetsMap();
-		const quotas = new require_sdk_utils_AssetsMap.AssetsMap();
+		const balances = new require_onchain_utils_AssetsMap.AssetsMap();
+		const quotas = new require_onchain_utils_AssetsMap.AssetsMap();
 		for (const t of ca.tokens) {
 			if (t.balance > 1n) balances.upsert(t.token, t.balance);
 			if (t.quota > 1n) quotas.upsert(t.token, t.quota);
@@ -86,7 +86,7 @@ var CreditAccountState = class CreditAccountState {
 	toSnapshot(totalValue) {
 		return {
 			creditManager: this.creditManager,
-			assets: this.balances.toAssets(require_sdk_constants_math.DUST_THRESHOLD),
+			assets: this.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD),
 			quotas: this.quotas.toAssets(0n),
 			totalDebt: this.totalDebt,
 			totalValue

package/dist/cjs/preview/preview/buildDelayedPreview.js

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_utils_AssetsMap = require("../../sdk/utils/AssetsMap.js");
-const require_sdk_utils_bigint_math = require("../../sdk/utils/bigint-math.js");
-const require_sdk_constants_math = require("../../sdk/constants/math.js");
-const require_sdk_market_math = require("../../sdk/market/math.js");
+const require_onchain_utils_AssetsMap = require("../../onchain/utils/AssetsMap.js");
+const require_onchain_utils_bigint_math = require("../../onchain/utils/bigint-math.js");
+const require_onchain_constants_math = require("../../onchain/constants/math.js");
+const require_onchain_market_math = require("../../onchain/market/math.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
-require("../../sdk/index.js");
+require("../../onchain/index.js");
 require("../../common-utils/index.js");
 let viem = require("viem");
 //#region src/preview/preview/buildDelayedPreview.ts
@@ -36,7 +36,7 @@ function buildDelayedPreview(afterInstant, before, detected, convert, receivedTo
 	const post = afterInstant.clone();
 	const converter = makeSafeConverter(convert);
 	const claimed = applyClaim(post, request);
-	const collateralWithdrawn = new require_sdk_utils_AssetsMap.AssetsMap();
+	const collateralWithdrawn = new require_onchain_utils_AssetsMap.AssetsMap();
 	switch (intent?.type) {
 		case "CLOSE_ACCOUNT": return buildClosePreview(post, converter, receivedToken, sdk);
 		case "DECREASE_LEVERAGE":
@@ -113,7 +113,7 @@ function applyWithdrawCollateral(post, request, intent, converter, collateralWit
 	const { withdrawToken, withdrawAmount, debtRepaid } = intent;
 	const { claimToken } = request;
 	const sameToken = (0, viem.isAddressEqual)(withdrawToken, claimToken);
-	const fromBalance = require_sdk_utils_bigint_math.BigIntMath.min(withdrawAmount, post.balances.getOrZero(withdrawToken));
+	const fromBalance = require_onchain_utils_bigint_math.BigIntMath.min(withdrawAmount, post.balances.getOrZero(withdrawToken));
 	post.balances.dec(withdrawToken, fromBalance);
 	let withdrawn = fromBalance;
 	const missing = withdrawAmount - fromBalance;
@@ -134,7 +134,7 @@ function applyWithdrawCollateral(post, request, intent, converter, collateralWit
 		const proceeds = converter.convert(claimToken, post.underlying, remaining);
 		post.balances.dec(claimToken, remaining);
 		post.balances.inc(post.underlying, proceeds);
-		post.repay(require_sdk_utils_bigint_math.BigIntMath.min(proceeds, debtRepaid));
+		post.repay(require_onchain_utils_bigint_math.BigIntMath.min(proceeds, debtRepaid));
 	}
 }
 /**
@@ -143,7 +143,7 @@ function applyWithdrawCollateral(post, request, intent, converter, collateralWit
 * with it.
 */
 function repayFromClaim(post, claimToken, convert, amount) {
-	const spent = require_sdk_utils_bigint_math.BigIntMath.min(amount, post.balances.getOrZero(claimToken));
+	const spent = require_onchain_utils_bigint_math.BigIntMath.min(amount, post.balances.getOrZero(claimToken));
 	if (spent <= 0n) return;
 	const received = convert(claimToken, post.underlying, spent);
 	post.balances.dec(claimToken, spent);
@@ -171,13 +171,13 @@ function buildClosePreview(post, converter, receivedToken, sdk) {
 		creditManager: post.creditManager,
 		name: sdk.marketRegister.findCreditManager(post.creditManager).name,
 		creditAccount: post.creditAccount,
-		receivedAmount: oracle.toTokenAmount(receivedToken, require_sdk_utils_bigint_math.BigIntMath.max(totalValue - post.totalDebt, 0n)),
+		receivedAmount: oracle.toTokenAmount(receivedToken, require_onchain_utils_bigint_math.BigIntMath.max(totalValue - post.totalDebt, 0n)),
 		error: converter.error
 	};
 }
 function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
-	const totalValue = totalValueInUnderlying(post, converter.convert, require_sdk_constants_math.DUST_THRESHOLD);
-	const assets = post.balances.toAssets(require_sdk_constants_math.DUST_THRESHOLD);
+	const totalValue = totalValueInUnderlying(post, converter.convert, require_onchain_constants_math.DUST_THRESHOLD);
+	const assets = post.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
 	const quotas = post.quotas.toAssets(0n);
 	const snap = post.toSnapshot(totalValue);
 	const market = sdk.marketRegister.findByCreditManager(post.creditManager);
@@ -201,13 +201,14 @@ function buildAdjustPreview(post, before, collateralWithdrawn, converter, sdk) {
 			...oracle.toAmount(market.underlying, q.balance)
 		})),
 		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
-		assetsChange: post.balances.difference(before.balances).toAssets(require_sdk_constants_math.DUST_THRESHOLD).map((a) => oracle.toTokenAmount(a.token, a.balance)),
+		assetsChange: post.balances.difference(before.balances).toAssets(require_onchain_constants_math.DUST_THRESHOLD).map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		error: converter.error,
 		healthFactor: sdk.positions.healthFactor(snap),
+		safeHealthFactor: sdk.positions.healthFactor(snap, { safePrices: true }),
 		borrowRate: sdk.positions.borrowRate(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt }),
 		timeToLiquidation: sdk.positions.timeToLiquidation(snap, { availableLiquidityChange: before.totalDebt - post.totalDebt }),
 		liquidationPrice: sdk.positions.liquidationPrice(snap),
-		leverage: require_sdk_market_math.calcPositionLeverage(totalValue, post.totalDebt)
+		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, post.totalDebt)
 	};
 }
 //#endregion

package/dist/cjs/preview/preview/detectCloseOrRepay.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../sdk/constants/math.js");
-require("../../sdk/index.js");
+require("../../onchain/constants/math.js");
+require("../../onchain/index.js");
 let viem = require("viem");
 //#region src/preview/preview/detectCloseOrRepay.ts
 /**

package/dist/cjs/preview/preview/detectDelayedClaim.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_market_adapters_contracts_AbstractAdapter = require("../../sdk/market/adapters/contracts/AbstractAdapter.js");
-require("../../sdk/index.js");
+const require_onchain_market_adapters_contracts_AbstractAdapter = require("../../onchain/market/adapters/contracts/AbstractAdapter.js");
+require("../../onchain/index.js");
 //#region src/preview/preview/detectDelayedClaim.ts
 /**
 * Scans a credit-facade multicall for a delayed-withdrawal claim call.
@@ -14,7 +14,7 @@ function detectDelayedClaim(sdk, multicall) {
 	for (const op of multicall) {
 		if (op.operation !== "Execute") continue;
 		const adapter = sdk.getContract(op.adapter);
-		if (!(adapter instanceof require_sdk_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract)) continue;
+		if (!(adapter instanceof require_onchain_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract)) continue;
 		const claim = adapter.parseDelayedWithdrawalClaim(op.calldata);
 		if (claim) return {
 			adapter: op.adapter,

package/dist/cjs/preview/preview/detectDelayedOperation.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_market_adapters_contracts_AbstractAdapter = require("../../sdk/market/adapters/contracts/AbstractAdapter.js");
-const require_sdk_accounts_withdrawal_compressor_intent_codec = require("../../sdk/accounts/withdrawal-compressor/intent-codec.js");
-const require_sdk_accounts_withdrawal_compressor_errors = require("../../sdk/accounts/withdrawal-compressor/errors.js");
-require("../../sdk/index.js");
+const require_onchain_market_adapters_contracts_AbstractAdapter = require("../../onchain/market/adapters/contracts/AbstractAdapter.js");
+const require_onchain_accounts_withdrawal_compressor_intent_codec = require("../../onchain/accounts/withdrawal-compressor/intent-codec.js");
+const require_onchain_accounts_withdrawal_compressor_errors = require("../../onchain/accounts/withdrawal-compressor/errors.js");
+require("../../onchain/index.js");
 let viem = require("viem");
 //#region src/preview/preview/detectDelayedOperation.ts
 /**
@@ -28,15 +28,15 @@ function detectDelayedOperation(sdk, multicall) {
 		}
 		if (op.operation !== "Execute") continue;
 		const adapter = sdk.getContract(op.adapter);
-		if (!(adapter instanceof require_sdk_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract)) continue;
+		if (!(adapter instanceof require_onchain_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract)) continue;
 		const request = adapter.parseDelayedWithdrawalRequest(op.calldata);
 		if (!request) continue;
 		if (!bracketDeltas.some(({ token, balance }) => balance > 0n && (0, viem.isAddressEqual)(token, request.phantomToken))) continue;
 		let intent;
 		if (request.extraData && request.extraData !== "0x") try {
-			intent = require_sdk_accounts_withdrawal_compressor_intent_codec.decodeDelayedIntent(request.extraData);
+			intent = require_onchain_accounts_withdrawal_compressor_intent_codec.decodeDelayedIntent(request.extraData);
 		} catch (e) {
-			throw new require_sdk_accounts_withdrawal_compressor_errors.InvalidDelayedIntentError(request.extraData, e);
+			throw new require_onchain_accounts_withdrawal_compressor_errors.InvalidDelayedIntentError(request.extraData, e);
 		}
 		return {
 			request,

package/dist/cjs/preview/preview/previewAdjustCreditAccount.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_constants_address_provider = require("../../sdk/constants/address-provider.js");
-const require_sdk_constants_math = require("../../sdk/constants/math.js");
-const require_sdk_market_math = require("../../sdk/market/math.js");
+const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
+const require_onchain_constants_math = require("../../onchain/constants/math.js");
+const require_onchain_market_math = require("../../onchain/market/math.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
-require("../../sdk/index.js");
+require("../../onchain/index.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
 //#region src/preview/preview/previewAdjustCreditAccount.ts
@@ -22,11 +22,11 @@ async function previewAdjustCreditAccount(input, operation, options) {
 	const { before, after, error: replayError } = await require_preview_preview_replayMulticall.replayMulticall(sdk, operation, options);
 	const account = after.account;
 	let error = replayError;
-	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_sdk_constants_address_provider.AP_WETH_TOKEN, 0));
+	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
 	error ??= unwrapError;
-	const assets = account.balances.toAssets(require_sdk_constants_math.DUST_THRESHOLD);
+	const assets = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
 	const quotas = account.quotas.toAssets(0n);
-	const assetsChange = account.balances.difference(before.balances).toAssets(require_sdk_constants_math.DUST_THRESHOLD);
+	const assetsChange = account.balances.difference(before.balances).toAssets(require_onchain_constants_math.DUST_THRESHOLD);
 	const totalValue = assets.reduce((acc, { token, balance }) => {
 		try {
 			return acc + oracle.convert(token, market.underlying, balance);
@@ -61,10 +61,11 @@ async function previewAdjustCreditAccount(input, operation, options) {
 		assetsChange: assetsChange.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		error,
 		healthFactor: sdk.positions.healthFactor(snap),
+		safeHealthFactor: sdk.positions.healthFactor(snap, { safePrices: true }),
 		borrowRate: sdk.positions.borrowRate(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt }),
 		timeToLiquidation: sdk.positions.timeToLiquidation(snap, { availableLiquidityChange: before.totalDebt - account.totalDebt }),
 		liquidationPrice: sdk.positions.liquidationPrice(snap),
-		leverage: require_sdk_market_math.calcPositionLeverage(totalValue, account.totalDebt)
+		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, account.totalDebt)
 	};
 }
 //#endregion

package/dist/cjs/preview/preview/previewCloseOrRepayCreditAccount.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_constants_address_provider = require("../../sdk/constants/address-provider.js");
-require("../../sdk/constants/math.js");
-require("../../sdk/index.js");
+const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
+require("../../onchain/constants/math.js");
+require("../../onchain/index.js");
 const require_preview_preview_detectCloseOrRepay = require("./detectCloseOrRepay.js");
 const require_preview_preview_replayMulticall = require("./replayMulticall.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
@@ -48,7 +48,7 @@ function previewRepayCreditAccount(input, operation, permanent, replay) {
 	const { sdk, value = 0n } = input;
 	const market = sdk.marketRegister.findByCreditManager(operation.creditManager);
 	const { before, after, error: replayError } = replay;
-	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_sdk_constants_address_provider.AP_WETH_TOKEN, 0));
+	const { assets: collateralAdded, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(after.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
 	const error = replayError ?? unwrapError;
 	return {
 		operation: "RepayCreditAccount",

package/dist/cjs/preview/preview/previewOpenCreditAccount.js

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_constants_address_provider = require("../../sdk/constants/address-provider.js");
-const require_sdk_constants_math = require("../../sdk/constants/math.js");
-const require_sdk_market_math = require("../../sdk/market/math.js");
+const require_onchain_constants_address_provider = require("../../onchain/constants/address-provider.js");
+const require_onchain_constants_math = require("../../onchain/constants/math.js");
+const require_onchain_market_math = require("../../onchain/market/math.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
-require("../../sdk/index.js");
+require("../../onchain/index.js");
 const require_preview_preview_CreditAccountState = require("./CreditAccountState.js");
 const require_preview_preview_replayInnerOperations = require("./replayInnerOperations.js");
 const require_preview_preview_unwrapNativeCollateral = require("./unwrapNativeCollateral.js");
@@ -28,9 +28,9 @@ async function previewOpenCreditAccount(input, operation) {
 			return 0n;
 		}
 	});
-	const { assets: collateral, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(state.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_sdk_constants_address_provider.AP_WETH_TOKEN, 0));
+	const { assets: collateral, error: unwrapError } = require_preview_preview_unwrapNativeCollateral.unwrapNativeCollateral(state.collateralAdded.toAssets(), value, sdk.addressProvider.getAddress(require_onchain_constants_address_provider.AP_WETH_TOKEN, 0));
 	error ??= unwrapError ?? priceError;
-	const assets = account.balances.toAssets(require_sdk_constants_math.DUST_THRESHOLD);
+	const assets = account.balances.toAssets(require_onchain_constants_math.DUST_THRESHOLD);
 	const quotas = account.quotas.toAssets(0n);
 	const totalValue = collateralValue + account.totalDebt;
 	const snap = account.toSnapshot(totalValue);
@@ -51,10 +51,11 @@ async function previewOpenCreditAccount(input, operation) {
 		assets: assets.map((a) => oracle.toTokenAmount(a.token, a.balance)),
 		error,
 		healthFactor: sdk.positions.healthFactor(snap),
+		safeHealthFactor: sdk.positions.healthFactor(snap, { safePrices: true }),
 		borrowRate: sdk.positions.borrowRate(snap, { availableLiquidityChange: -account.totalDebt }),
 		timeToLiquidation: sdk.positions.timeToLiquidation(snap, { availableLiquidityChange: -account.totalDebt }),
 		liquidationPrice: sdk.positions.liquidationPrice(snap),
-		leverage: require_sdk_market_math.calcPositionLeverage(totalValue, account.totalDebt)
+		leverage: require_onchain_market_math.calcPositionLeverage(totalValue, account.totalDebt)
 	};
 }
 /**

package/dist/cjs/preview/preview/replayInnerOperations.js

@@ -1,12 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_utils_AssetsMap = require("../../sdk/utils/AssetsMap.js");
-require("../../sdk/constants/math.js");
-const require_sdk_market_adapters_contracts_AbstractAdapter = require("../../sdk/market/adapters/contracts/AbstractAdapter.js");
-const require_sdk_market_adapters_contracts_ERC4626AdapterContract = require("../../sdk/market/adapters/contracts/ERC4626AdapterContract.js");
+const require_onchain_utils_AssetsMap = require("../../onchain/utils/AssetsMap.js");
+require("../../onchain/constants/math.js");
+const require_onchain_market_adapters_contracts_AbstractAdapter = require("../../onchain/market/adapters/contracts/AbstractAdapter.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
-require("../../sdk/index.js");
-const require_preview_preview_applyRWAWrapUnwrap = require("./applyRWAWrapUnwrap.js");
+require("../../onchain/index.js");
 //#region src/preview/preview/replayInnerOperations.ts
 /**
 * Creates a {@link ReplayState} around the given account seed, with empty
@@ -15,8 +13,8 @@ const require_preview_preview_applyRWAWrapUnwrap = require("./applyRWAWrapUnwrap
 function makeReplayState(account) {
 	return {
 		account,
-		collateralAdded: new require_sdk_utils_AssetsMap.AssetsMap(),
-		collateralWithdrawn: new require_sdk_utils_AssetsMap.AssetsMap()
+		collateralAdded: new require_onchain_utils_AssetsMap.AssetsMap(),
+		collateralWithdrawn: new require_onchain_utils_AssetsMap.AssetsMap()
 	};
 }
 /**
@@ -94,28 +92,27 @@ function applyWithdrawCollateral(state, op) {
 *
 * Inside a bracket, the adapter's balance changes are previewed via
 * {@link AbstractAdapterContract.previewBalanceChanges}. Outside a bracket,
-* only RWA wrap/unwrap calls are allowed (see {@link applyRWAWrapUnwrap});
-* nothing enforces the outcome of any other out-of-bracket adapter call
-* on-chain, so its effect on balances cannot be previewed.
+* only calls that {@link AbstractAdapterContract.replayOutOfBracketCall}
+* accepts are allowed; nothing enforces the outcome of any other out-of-bracket
+* adapter call on-chain, so its effect on balances cannot be previewed.
 */
 async function applyExecute(sdk, op, inBracket, balances) {
 	const adapter = sdk.getContract(op.adapter);
 	if (!inBracket) {
-		if (!isRWAShare(sdk, adapter)) return {
-			code: require_model_previews.ERROR_ADAPTER_CALL_OUTSIDE_BRACKET,
-			message: `call to ${op.adapter} outside of a storeExpectedBalances/compareBalances bracket`
-		};
-		try {
-			require_preview_preview_applyRWAWrapUnwrap.applyRWAWrapUnwrap(adapter, op.calldata, balances);
-			return;
+		if (adapter instanceof require_onchain_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract) try {
+			if (adapter.replayOutOfBracketCall(balances, op.calldata)) return;
 		} catch (e) {
 			return {
-				code: require_model_previews.ERROR_UNPREVIEWABLE_RWA_WRAP_UNWRAP,
+				code: require_model_previews.ERROR_UNSUPPORTED_OUT_OF_BRACKET_CALL,
 				message: e instanceof Error ? e.message : String(e)
 			};
 		}
+		return {
+			code: require_model_previews.ERROR_ADAPTER_CALL_OUTSIDE_BRACKET,
+			message: `call to ${op.adapter} outside of a storeExpectedBalances/compareBalances bracket`
+		};
 	}
-	if (!(adapter instanceof require_sdk_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract)) return {
+	if (!(adapter instanceof require_onchain_market_adapters_contracts_AbstractAdapter.AbstractAdapterContract)) return {
 		code: require_model_previews.ERROR_NON_ADAPTER_CALL_IN_BRACKET,
 		message: `call to ${op.adapter} between storeExpectedBalances and compareBalances is not an adapter call`
 	};
@@ -129,18 +126,6 @@ async function applyExecute(sdk, op, inBracket, balances) {
 		};
 	}
 }
-/**
-* True when the ERC4626 adapter converts an RWA underlying, i.e. it is the
-* wrap/unwrap adapter of an RWA market rather than a regular vault strategy
-* adapter.
-*/
-function isRWAShare(sdk, adapter) {
-	if (adapter instanceof require_sdk_market_adapters_contracts_ERC4626AdapterContract.ERC4626AdapterContract) {
-		const meta = sdk.tokensMeta.get(adapter.share);
-		return !!meta && sdk.tokensMeta.isRWAUnderlying(meta);
-	}
-	return false;
-}
 //#endregion
 exports.makeReplayState = makeReplayState;
 exports.replayInnerOperations = replayInnerOperations;

package/dist/cjs/preview/preview/unwrapNativeCollateral.js

@@ -1,9 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_utils_AssetsMap = require("../../sdk/utils/AssetsMap.js");
-const require_sdk_constants_addresses = require("../../sdk/constants/addresses.js");
+const require_onchain_utils_AssetsMap = require("../../onchain/utils/AssetsMap.js");
+const require_onchain_constants_addresses = require("../../onchain/constants/addresses.js");
 const require_model_previews = require("../../model/previews.js");
 require("../../model/index.js");
-require("../../sdk/index.js");
+require("../../onchain/index.js");
 //#region src/preview/preview/unwrapNativeCollateral.ts
 /**
 * Represents the transaction's attached native value as a `NATIVE_ADDRESS`
@@ -28,7 +28,7 @@ require("../../sdk/index.js");
 */
 function unwrapNativeCollateral(collateral, nativeAmount, wethToken) {
 	if (nativeAmount === 0n) return { assets: collateral };
-	const balances = new require_sdk_utils_AssetsMap.AssetsMap(collateral);
+	const balances = new require_onchain_utils_AssetsMap.AssetsMap(collateral);
 	const wethBalance = balances.get(wethToken) ?? 0n;
 	if (wethBalance < nativeAmount) return {
 		assets: collateral,
@@ -38,7 +38,7 @@ function unwrapNativeCollateral(collateral, nativeAmount, wethToken) {
 		}
 	};
 	balances.upsert(wethToken, wethBalance === nativeAmount ? void 0 : wethBalance - nativeAmount);
-	balances.inc(require_sdk_constants_addresses.NATIVE_ADDRESS, nativeAmount);
+	balances.inc(require_onchain_constants_addresses.NATIVE_ADDRESS, nativeAmount);
 	return { assets: balances.toAssets() };
 }
 //#endregion

package/dist/cjs/preview/trace/extractTransfers.js

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_abi_iERC20 = require("../../abi/iERC20.js");
 const require_abi_310_generated = require("../../abi/310/generated.js");
-const require_sdk_utils_AddressMap = require("../../sdk/utils/AddressMap.js");
-require("../../sdk/index.js");
+const require_onchain_utils_AddressMap = require("../../onchain/utils/AddressMap.js");
+require("../../onchain/index.js");
 const require_preview_trace_errors = require("./errors.js");
 let viem = require("viem");
 //#region src/preview/trace/extractTransfers.ts
@@ -15,7 +15,7 @@ function extractTransfers(logs, creditAccount, pool, creditFacade) {
 	let currentEntries = [];
 	const executeTransfers = [];
 	const directTransfers = [];
-	const phantomTokens = new require_sdk_utils_AddressMap.AddressMap();
+	const phantomTokens = new require_onchain_utils_AddressMap.AddressMap();
 	const withdrawCollateralEvents = [];
 	let liquidationRemainingFunds;
 	for (const log of logs) {