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

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

@@ -16,22 +16,31 @@ const FULL = Number(require_sdk_constants_math.PERCENTAGE_FACTOR);
 *
 * @example
 * ```ts
-* rayToBps(50_000_000_000_000_000_000_000_000n) // 500, i.e. 5%
+* // ray: 5% (0.05 × 10²⁷)
+* rayToBps(50_000_000_000_000_000_000_000_000n) // 500 bps = 5%
 * ```
 **/
 function rayToBps(ray) {
 	return Number(ray * require_sdk_constants_math.PERCENTAGE_FACTOR / require_sdk_constants_math.RAY);
 }
 /**
+* Raw 8-decimal USD values below this are compressor leftover dust (typically
+* 1-wei balances on empty accounts) and report as `0`.
+**/
+const USD_DUST_THRESHOLD = 1000n;
+/**
 * Converts a USD value in the oracle's 8-decimal fixed point to a float.
 *
+* Values below {@link USD_DUST_THRESHOLD} report as `0`.
+*
 * @example
 * ```ts
+* // usd: $1500.50 in 8-decimal fixed point
 * usdToNumber(150_050_000_000n) // 1500.5
 * ```
 **/
 function usdToNumber(usd) {
-	return Number(usd) / Number(require_sdk_constants_math.PRICE_DECIMALS);
+	return usd < USD_DUST_THRESHOLD ? 0 : Number(usd) / Number(require_sdk_constants_math.PRICE_DECIMALS);
 }
 /**
 * Share of capital currently borrowed, in basis points. Returns `0` when there
@@ -39,56 +48,66 @@ function usdToNumber(usd) {
 *
 * @example
 * ```ts
-* utilizationBps(750n, 1000n) // 7500, i.e. 75%
+* // borrowed: 750, total: 1000
+* calcUtilization(750n, 1000n) // 750 / 1000 = 7500 bps = 75%
 * ```
 **/
-function utilizationBps(borrowed, total) {
+function calcUtilization(borrowed, total) {
 	if (total <= 0n || borrowed <= 0n) return 0;
 	const utilization = Number(borrowed * require_sdk_constants_math.PERCENTAGE_FACTOR / total);
 	return Math.min(utilization, FULL);
 }
 /**
-* Annual cost of debt for a credit manager, in basis points: the pool's base
-* rate plus the protocol's cut of the accrued interest.
+* Annual cost of debt for a credit manager, in basis points:
+* `baseInterestRate × (1 + feeInterest)` — the pool's base rate plus the
+* protocol's cut of the accrued interest.
 *
 * @param baseInterestRate - Pool base rate in ray.
 * @param feeInterest - Credit manager interest fee in basis points.
 *
 * @example
 * ```ts
-* // 5% base rate, 50% interest fee
-* borrowApyBps(50_000_000_000_000_000_000_000_000n, 5000) // 750, i.e. 7.5%
+* // baseInterestRate: 5% in ray, feeInterest: 5000 bps = 50%
+* calcBorrowApy(50_000_000_000_000_000_000_000_000n, 5000) // 5% × 1.5 = 750 bps = 7.5%
 * ```
 **/
-function borrowApyBps(baseInterestRate, feeInterest) {
+function calcBorrowApy(baseInterestRate, feeInterest) {
 	return rayToBps(baseInterestRate * (require_sdk_constants_math.PERCENTAGE_FACTOR + BigInt(feeInterest)) / require_sdk_constants_math.PERCENTAGE_FACTOR);
 }
 /**
-* Highest leverage a liquidation threshold allows: `1 / (1 - lt)`.
-*
-* A threshold of 100% or more would allow unbounded leverage; such tokens are
-* not strategies and are filtered out before this is called, so the guard here
-* only exists to keep the function total.
+* 5% safety margin subtracted from 100% in {@link calcMaxLeverage}, so a
+* maxed position opens with HF slightly above 1.
+**/
+const MAX_LEVERAGE_BUFFER_BPS = 500;
+/**
+* Highest total-value leverage a liquidation threshold allows:
+* `(100% − buffer) / (100% − liquidationThreshold)`. At HF = 1, debt is
+* `liquidationThreshold × totalValue`, leaving `1 − liquidationThreshold` of
+* equity per unit of exposure; the {@link MAX_LEVERAGE_BUFFER_BPS} buffer
+* keeps the maxed position slightly away from that boundary.
 *
 * @example
 * ```ts
-* maxLeverage(9000) // 10
-* maxLeverage(8000) // 5
+* // liquidationThreshold: 9000 bps = 90%
+* calcMaxLeverage(9000) // (1 − 0.05) / (1 − 0.9) = 9.5x total exposure
 * ```
 **/
-function maxLeverage(liquidationThreshold) {
-	const equity = FULL - liquidationThreshold;
-	return equity > 0 ? FULL / equity : Number.POSITIVE_INFINITY;
+function calcMaxLeverage(liquidationThreshold) {
+	if (liquidationThreshold >= FULL) return 0;
+	const leverage = (FULL - 500) / (FULL - liquidationThreshold);
+	return Math.max(leverage, 1);
 }
 /**
 * Converts a credit account's health factor from the 18-decimal fixed point the
 * contracts store to basis points.
 *
-* An account with no debt return MAX_UINT256 from contract, here we return 0
+* Accounts with no debt store `MAX_UINT256` on-chain; for those this
+* returns `0`.
 *
 * @example
 * ```ts
-* healthFactorBps(1_250_000_000_000_000_000n) // 12500, i.e. 1.25
+* // healthFactor: 1.25 in 18-decimal fixed point
+* healthFactorBps(1_250_000_000_000_000_000n) // 12500 bps = 1.25
 * ```
 **/
 function healthFactorBps(healthFactor) {
@@ -96,39 +115,39 @@ function healthFactorBps(healthFactor) {
 	return Number(healthFactor * require_sdk_constants_math.PERCENTAGE_FACTOR / require_sdk_constants_math.WAD);
 }
 /**
-* Leverage of an open position: `totalDebt / equity`, where equity is what is
-* left of the position's value once its debt is repaid.
-*
-* Returns `0` for a position that carries no debt and for one that is
-* underwater, where there is no equity to lever.
+* Total-value leverage of an open position:
+* `totalValue / (totalValue − totalDebt)`. `1` when unleveraged, `0` when
+* underwater.
 *
-* @param totalDebt - Debt principal plus accrued interest and fees.
-* @param totalValue - Total value of the position, in the same token.
+* @param totalValue - Total value of the position.
+* @param totalDebt - Debt principal plus accrued interest and fees, same token.
 *
 * @example
 * ```ts
-* positionLeverage(800n, 1000n) // 4, i.e. 4x debt per unit of equity
+* // totalValue: 100k, totalDebt: 80k → equity: 100k − 80k = 20k
+* calcPositionLeverage(100_000n, 80_000n) // 100k / 20k = 5x
 * ```
 **/
-function positionLeverage(totalDebt, totalValue) {
+function calcPositionLeverage(totalValue, totalDebt) {
 	const equity = totalValue - totalDebt;
-	if (equity <= 0n || totalDebt <= 0n) return 0;
-	return Number(totalDebt) / Number(equity);
+	if (totalValue <= 0n || equity <= 0n) return 0;
+	if (totalDebt <= 0n) return 1;
+	return Number(totalValue) / Number(equity);
 }
 /**
-* Annual quota cost scaled to the debt a maximally leveraged position carries,
-* in basis points. Every unit of own capital carries `maxLeverage - 1` units of
-* debt, and the quota is paid on the whole quoted position.
+* Annual quota cost on equity, in basis points:
+* `quotaRate × (1 + feeInterest) × leverage`. Quota accrues on the whole
+* quoted position, and the DAO takes `feeInterest` of it as with base interest.
 *
 * @example
 * ```ts
-* // 2.5% quota rate at 5x leverage
-* additionalBorrowApyBps(250, 5) // 1000, i.e. 10%
+* // quotaRate: 200 bps = 2%, feeInterest: 2500 bps = 25%, leverage: 9.5x
+* calcAdditionalBorrowApy(200, 2500, 9.5) // 2% × 1.25 × 9.5 = 2375 bps = 23.75%
 * ```
 **/
-function additionalBorrowApyBps(quotaRate, leverage) {
-	if (!Number.isFinite(leverage)) return 0;
-	return Math.round(quotaRate * Math.max(leverage - 1, 0));
+function calcAdditionalBorrowApy(quotaRate, feeInterest, leverage) {
+	if (!Number.isFinite(leverage) || leverage <= 0) return 0;
+	return Math.round(quotaRate * (1 + feeInterest / FULL) * leverage);
 }
 /**
 * {@link PERCENTAGE_FACTOR} less a 0.1% safety buffer.
@@ -186,15 +205,16 @@ function optimalHFForPartialLiquidation(borrowRate) {
 	return require_sdk_constants_math.PERCENTAGE_FACTOR + (borrowRate < 100n ? borrowRate : 100n);
 }
 //#endregion
+exports.MAX_LEVERAGE_BUFFER_BPS = MAX_LEVERAGE_BUFFER_BPS;
 exports.PARTIAL_LIQUIDATION_BUFFER_BPS = PARTIAL_LIQUIDATION_BUFFER_BPS;
-exports.additionalBorrowApyBps = additionalBorrowApyBps;
-exports.borrowApyBps = borrowApyBps;
+exports.calcAdditionalBorrowApy = calcAdditionalBorrowApy;
+exports.calcBorrowApy = calcBorrowApy;
+exports.calcMaxLeverage = calcMaxLeverage;
+exports.calcPositionLeverage = calcPositionLeverage;
+exports.calcUtilization = calcUtilization;
 exports.healthFactorBps = healthFactorBps;
-exports.maxLeverage = maxLeverage;
 exports.minSeizedAmount = minSeizedAmount;
 exports.optimalHFForPartialLiquidation = optimalHFForPartialLiquidation;
 exports.optimalRepaidAmount = optimalRepaidAmount;
-exports.positionLeverage = positionLeverage;
 exports.rayToBps = rayToBps;
 exports.usdToNumber = usdToNumber;
-exports.utilizationBps = utilizationBps;

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

@@ -2,6 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_utils_AddressMap = require("../../utils/AddressMap.js");
 const require_sdk_utils_AddressSet = require("../../utils/AddressSet.js");
 const require_sdk_constants_address_provider = require("../../constants/address-provider.js");
+const require_sdk_constants_addresses = require("../../constants/addresses.js");
 require("../../constants/math.js");
 const require_sdk_constants_versions = require("../../constants/versions.js");
 require("../../constants/index.js");
@@ -109,10 +110,12 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	**/
 	convert(from, to, amount, reserve = false) {
 		if (from === to) return amount;
-		const fromPrice = reserve ? this.reservePrice(from) : this.mainPrice(from);
-		const fromScale = 10n ** BigInt(this.tokensMeta.decimals(from));
-		const toPrice = reserve ? this.reservePrice(to) : this.mainPrice(to);
-		const toScale = 10n ** BigInt(this.tokensMeta.decimals(to));
+		const fromToken = this.#priceableToken(from);
+		const toToken = this.#priceableToken(to);
+		const fromPrice = reserve ? this.reservePrice(fromToken) : this.mainPrice(fromToken);
+		const fromScale = 10n ** BigInt(this.tokensMeta.decimals(fromToken));
+		const toPrice = reserve ? this.reservePrice(toToken) : this.mainPrice(toToken);
+		const toScale = 10n ** BigInt(this.tokensMeta.decimals(toToken));
 		return amount * fromPrice * toScale / (toPrice * fromScale);
 	}
 	/**
@@ -120,8 +123,9 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	**/
 	convertToUSD(from, amount, reserve = false) {
 		if (amount === 0n) return 0n;
-		const price = reserve ? this.reservePrice(from) : this.mainPrice(from);
-		const scale = 10n ** BigInt(this.tokensMeta.decimals(from));
+		const token = this.#priceableToken(from);
+		const price = reserve ? this.reservePrice(token) : this.mainPrice(token);
+		const scale = 10n ** BigInt(this.tokensMeta.decimals(token));
 		return amount * price / scale;
 	}
 	/**
@@ -129,21 +133,29 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	**/
 	convertFromUSD(to, amount, reserve = false) {
 		if (amount === 0n) return 0n;
-		const price = reserve ? this.reservePrice(to) : this.mainPrice(to);
-		return amount * 10n ** BigInt(this.tokensMeta.decimals(to)) / price;
+		const token = this.#priceableToken(to);
+		const price = reserve ? this.reservePrice(token) : this.mainPrice(token);
+		return amount * 10n ** BigInt(this.tokensMeta.decimals(token)) / price;
 	}
 	/**
-	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	* {@inheritDoc IPriceOracleContract.safeConvertToUSD}
 	**/
-	safeUsdValue(token, amount) {
+	safeConvertToUSD(token, amount) {
 		try {
-			return require_sdk_market_math.usdToNumber(this.convertToUSD(token, amount));
+			return this.convertToUSD(token, amount);
 		} catch (e) {
 			this.logger?.debug(`cannot price ${this.labelAddress(token)}: ${e}`);
 			return null;
 		}
 	}
 	/**
+	* {@inheritDoc IPriceOracleContract.safeUsdValue}
+	**/
+	safeUsdValue(token, amount) {
+		const usd = this.safeConvertToUSD(token, amount);
+		return usd === null ? null : require_sdk_market_math.usdToNumber(usd);
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.toAmount}
 	**/
 	toAmount = (token, value) => {
@@ -156,12 +168,32 @@ var PriceOracleBaseContract = class extends require_sdk_base_BaseContract.BaseCo
 	* {@inheritDoc IPriceOracleContract.toTokenAmount}
 	**/
 	toTokenAmount = (token, value) => {
+		if ((0, viem.isAddressEqual)(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE")) {
+			const { symbol, name, decimals } = this.sdk.chain.nativeCurrency;
+			return {
+				token: {
+					chainId: this.sdk.chainId,
+					address: require_sdk_constants_addresses.NATIVE_ADDRESS,
+					symbol,
+					name,
+					decimals
+				},
+				...this.toAmount(token, value)
+			};
+		}
 		return {
 			token: this.tokensMeta.mustGetToken(token),
 			...this.toAmount(token, value)
 		};
 	};
 	/**
+	* The native pseudo-address has no feed of its own; it is priced through
+	* WETH. All other tokens price as themselves.
+	**/
+	#priceableToken(token) {
+		return (0, viem.isAddressEqual)(token, "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE") ? this.sdk.addressProvider.getAddress(require_sdk_constants_address_provider.AP_WETH_TOKEN, 0) : token;
+	}
+	/**
 	* {@inheritDoc IPriceOracleContract.priceFeedData}
 	**/
 	priceFeedData(token) {

package/dist/cjs/sdk/market/pool/PoolV310Contract.js

@@ -51,7 +51,7 @@ var PoolV310Contract = class extends require_sdk_base_BaseContract.BaseContract
 	* {@inheritDoc IPoolContract.utilization}
 	*/
 	get utilization() {
-		return require_sdk_market_math.utilizationBps(this.borrowed, this.expectedLiquidity);
+		return require_sdk_market_math.calcUtilization(this.borrowed, this.expectedLiquidity);
 	}
 	/**
 	* {@inheritDoc IPoolContract.unwrappedUnderlying}
@@ -137,6 +137,20 @@ var PoolV310Contract = class extends require_sdk_base_BaseContract.BaseContract
 			]
 		});
 	}
+	/**
+	* Burns as many of the owner's shares as it takes to send `assets` of the
+	* underlying to the receiver.
+	*/
+	withdraw(assets, receiver, owner) {
+		return this.createRawTx({
+			functionName: "withdraw",
+			args: [
+				assets,
+				receiver,
+				owner
+			]
+		});
+	}
 	stringifyFunctionParams(params) {
 		switch (params.functionName) {
 			case "deposit": {

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

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

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

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

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

@@ -1,18 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sdk_market_math = require("../market/math.js");
 const require_sdk_opportunities_MultichainOpportunitiesService = require("./MultichainOpportunitiesService.js");
 const require_sdk_opportunities_OpportunitiesService = require("./OpportunitiesService.js");
 exports.MultichainOpportunitiesService = require_sdk_opportunities_MultichainOpportunitiesService.MultichainOpportunitiesService;
 exports.OpportunitiesService = require_sdk_opportunities_OpportunitiesService.OpportunitiesService;
-exports.PARTIAL_LIQUIDATION_BUFFER_BPS = require_sdk_market_math.PARTIAL_LIQUIDATION_BUFFER_BPS;
-exports.additionalBorrowApyBps = require_sdk_market_math.additionalBorrowApyBps;
-exports.borrowApyBps = require_sdk_market_math.borrowApyBps;
-exports.healthFactorBps = require_sdk_market_math.healthFactorBps;
-exports.maxLeverage = require_sdk_market_math.maxLeverage;
-exports.minSeizedAmount = require_sdk_market_math.minSeizedAmount;
-exports.optimalHFForPartialLiquidation = require_sdk_market_math.optimalHFForPartialLiquidation;
-exports.optimalRepaidAmount = require_sdk_market_math.optimalRepaidAmount;
-exports.positionLeverage = require_sdk_market_math.positionLeverage;
-exports.rayToBps = require_sdk_market_math.rayToBps;
-exports.usdToNumber = require_sdk_market_math.usdToNumber;
-exports.utilizationBps = require_sdk_market_math.utilizationBps;

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

@@ -15,6 +15,12 @@ const require_sdk_market_zapper_IERC20ZapperContract = require("../market/zapper
 const require_sdk_market_zapper_IETHZapperContract = require("../market/zapper/IETHZapperContract.js");
 require("../market/index.js");
 //#region src/sdk/pools/PoolService.ts
+/**
+* Haircut on reported pool liquidity, so a withdrawal sized against the reported
+* figure is not defeated by rounding in the share conversion.
+*/
+const LIQUIDITY_SAFETY_NUM = 99999n;
+const LIQUIDITY_SAFETY_DENOM = 100000n;
 var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 	/**
 	* {@inheritDoc IPoolsService.getDepositTokensIn}
@@ -116,10 +122,87 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		return this.#withdrawalTokensOut(pool, tokenIn, true);
 	}
 	/**
+	* {@inheritDoc IPoolsService.simulateDeposit}
+	*/
+	simulateDeposit(props) {
+		const { pool: poolAddr, amount } = props;
+		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const tokenIn = props.tokenIn ?? pool.underlying;
+		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getDepositTokensOut(poolAddr, tokenIn), {
+			poolAddr,
+			tokenIn,
+			operation: "deposit"
+		});
+		const { zapper } = this.getDepositMetadata(poolAddr, tokenIn, tokenOut);
+		return {
+			tokenIn: {
+				token: tokenIn,
+				balance: amount
+			},
+			tokenOut: {
+				token: tokenOut,
+				balance: toShares(pool.pool, amount)
+			},
+			zapper: zapper?.baseParams.addr
+		};
+	}
+	/**
+	* {@inheritDoc IPoolsService.simulateWithdraw}
+	*/
+	simulateWithdraw(props) {
+		const { pool: poolAddr, amount } = props;
+		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const tokenIn = props.tokenIn ?? poolAddr;
+		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getWithdrawalTokensOut(poolAddr, tokenIn), {
+			poolAddr,
+			tokenIn,
+			operation: "withdrawal"
+		});
+		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
+		return {
+			tokenIn: {
+				token: tokenIn,
+				balance: toSharesUp(pool.pool, amount)
+			},
+			tokenOut: {
+				token: tokenOut,
+				balance: amount
+			},
+			zapper: zapper?.baseParams.addr,
+			availableLiquidity: pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM
+		};
+	}
+	/**
+	* {@inheritDoc IPoolsService.simulateRedeem}
+	*/
+	simulateRedeem(props) {
+		const { pool: poolAddr, amount } = props;
+		const { pool } = this.sdk.marketRegister.findByPool(poolAddr);
+		const tokenIn = props.tokenIn ?? poolAddr;
+		const tokenOut = this.#resolveTokenOut(props.tokenOut, () => this.getWithdrawalTokensOut(poolAddr, tokenIn), {
+			poolAddr,
+			tokenIn,
+			operation: "withdrawal"
+		});
+		const { zapper } = this.getWithdrawalMetadata(poolAddr, tokenIn, tokenOut);
+		return {
+			tokenIn: {
+				token: tokenIn,
+				balance: amount
+			},
+			tokenOut: {
+				token: tokenOut,
+				balance: toAssets(pool.pool, amount)
+			},
+			zapper: zapper?.baseParams.addr,
+			availableLiquidity: pool.pool.availableLiquidity * LIQUIDITY_SAFETY_NUM / LIQUIDITY_SAFETY_DENOM
+		};
+	}
+	/**
 	* {@inheritDoc IPoolsService.removeLiquidity}
 	*/
 	removeLiquidity(props) {
-		const { pool, amount, meta, wallet, permit } = props;
+		const { pool, amount, meta, wallet, permit, mode = "withdraw" } = props;
 		const underlying = this.#describeUnderlying(pool);
 		if (this.sdk.tokensMeta.isRWAUnderlying(underlying)) {
 			if (underlying.contractType === "RWA_UNDERLYING::ON_DEMAND") {
@@ -140,8 +223,10 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 				};
 			}
 		}
+		const poolContract = this.sdk.marketRegister.findByPool(pool).pool.pool;
 		if (meta.zapper instanceof require_sdk_market_zapper_IETHZapperContract.IETHZapperContract || meta.zapper instanceof require_sdk_market_zapper_IERC20ZapperContract.IERC20ZapperContract) {
-			const tx = permit ? meta.zapper.redeemWithPermit(amount, wallet, permit.deadline, permit.v, permit.r, permit.s) : meta.zapper.redeem(amount, wallet);
+			const shares = mode === "withdraw" ? toSharesUp(poolContract, amount) : amount;
+			const tx = permit ? meta.zapper.redeemWithPermit(shares, wallet, permit.deadline, permit.v, permit.r, permit.s) : meta.zapper.redeem(shares, wallet);
 			return {
 				tx,
 				calls: [{
@@ -150,7 +235,7 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 				}]
 			};
 		}
-		const tx = this.sdk.marketRegister.findByPool(pool).pool.pool.redeem(amount, wallet, wallet);
+		const tx = mode === "withdraw" ? poolContract.withdraw(amount, wallet, wallet) : poolContract.redeem(amount, wallet, wallet);
 		return {
 			tx,
 			calls: [{
@@ -310,6 +395,18 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 			type
 		};
 	}
+	/**
+	* Picks the route output when the caller left it open.
+	*
+	* Only an unambiguous single route can be defaulted: with several outputs the
+	* choice is the caller's, and with none there is no route to preview.
+	*/
+	#resolveTokenOut(requested, candidates, ctx) {
+		if (requested) return requested;
+		const options = candidates();
+		if (options.length !== 1) throw new Error(`tokenOut is required: ${options.length} ${ctx.operation} routes from ${this.labelAddress(ctx.tokenIn)} on pool ${this.labelAddress(ctx.poolAddr)}`);
+		return options[0];
+	}
 	#describeUnderlying(pool) {
 		const market = this.sdk.marketRegister.findByPool(pool);
 		return this.sdk.tokensMeta.mustGet(market.underlying);
@@ -318,7 +415,7 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		const { pool } = market.pool;
 		return {
 			kind: "pool",
-			name: market.poolName,
+			name: this.sdk.tokensMeta.mustGetToken(pool.address).name,
 			chainId: this.chainId,
 			pool: pool.address,
 			netValue: {
@@ -329,5 +426,37 @@ var PoolService = class extends require_sdk_base_SDKConstruct.SDKConstruct {
 		};
 	}
 };
+/**
+* Shares minted for `assets`, as `previewDeposit` would report them.
+*
+* Both directions convert through the diesel rate — underlying per RAY of
+* shares — because that is the rate the pool itself divides by, and the only
+* exact one the SDK holds: `totalAssets` is this rate multiplied out, so
+* converting back through it costs a wei on large amounts. Rounds down, as
+* minting does.
+*/
+function toShares(pool, assets) {
+	const { dieselRate } = pool;
+	return dieselRate === 0n ? assets : assets * require_sdk_constants_math.RAY / dieselRate;
+}
+/**
+* Shares a withdrawal of `assets` burns, as `previewWithdraw` would report
+* them: {@link toShares} rounded the other way, since the burn has to cover
+* the payout the caller asked for.
+*/
+function toSharesUp(pool, assets) {
+	const { dieselRate } = pool;
+	return dieselRate === 0n ? assets : (assets * require_sdk_constants_math.RAY + dieselRate - 1n) / dieselRate;
+}
+/**
+* Underlying paid out for `shares`, as `previewRedeem` would report it:
+* {@link toShares} run backwards, less the pool's withdrawal fee.
+*/
+function toAssets(pool, shares) {
+	const { dieselRate, withdrawFee } = pool;
+	return (dieselRate === 0n ? shares : shares * dieselRate / require_sdk_constants_math.RAY) * (require_sdk_constants_math.PERCENTAGE_FACTOR - withdrawFee) / require_sdk_constants_math.PERCENTAGE_FACTOR;
+}
 //#endregion
 exports.PoolService = PoolService;
+exports.toShares = toShares;
+exports.toSharesUp = toSharesUp;

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

@@ -2,3 +2,5 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_sdk_pools_PoolService = require("./PoolService.js");
 require("./types.js");
 exports.PoolService = require_sdk_pools_PoolService.PoolService;
+exports.toShares = require_sdk_pools_PoolService.toShares;
+exports.toSharesUp = require_sdk_pools_PoolService.toSharesUp;