@mysten/deepbook-v3 2.5.1 → 2.6.0

package/src/predict/decode.ts

@@ -50,8 +50,8 @@ function eventBytes(e: DecodableEvent): Uint8Array | null {
 }
 
 // Match by defining package + module + struct name. Events are typed by the
-// ORIGINAL package id; for the current v1 deployments that equals the config
-// package id.
+// package version that introduced their struct, not the latest Move-call target.
+// All events decoded here were introduced in v1.
 function matches(e: DecodableEvent, pkg: string, module: string, name: string): boolean {
 	const tag = e.eventType ?? e.type;
 	if (tag) {
@@ -246,7 +246,7 @@ export interface BuilderCodeReceipt {
 export function decodeMints(cfg: PredictConfig, result: DecodableTransactionResult): MintReceipt[] {
 	return decodeAll(
 		result,
-		cfg.packages.predict,
+		cfg.packages.predictV1 ?? cfg.packages.predict,
 		'order_events',
 		'OrderMinted',
 		orderEvents.OrderMinted,
@@ -288,7 +288,7 @@ export function decodeRedeems(
 	cfg: PredictConfig,
 	result: DecodableTransactionResult,
 ): RedeemReceipt[] {
-	const pkg = cfg.packages.predict;
+	const pkg = cfg.packages.predictV1 ?? cfg.packages.predict;
 	const live = decodeAll(
 		result,
 		pkg,
@@ -341,7 +341,7 @@ export function decodeClaims(
 ): ClaimReceipt[] {
 	return decodeAll(
 		result,
-		cfg.packages.predict,
+		cfg.packages.predictV1 ?? cfg.packages.predict,
 		'order_events',
 		'SettledOrderRedeemed',
 		orderEvents.SettledOrderRedeemed,
@@ -403,7 +403,7 @@ export function decodePlpRequests(
 	cfg: PredictConfig,
 	result: DecodableTransactionResult,
 ): PlpRequestReceipt[] {
-	const pkg = cfg.packages.predict;
+	const pkg = cfg.packages.predictV1 ?? cfg.packages.predict;
 	// Supply/WithdrawRequested differ only in their min-out field (unused here);
 	// pick the fields both share so either generated struct's parse feeds `make`.
 	type RequestedCommon = Pick<
@@ -441,7 +441,7 @@ export function decodePlpCancels(
 ): PlpCancelReceipt[] {
 	return decodeAll(
 		result,
-		cfg.packages.predict,
+		cfg.packages.predictV1 ?? cfg.packages.predict,
 		'vault_events',
 		'RequestCancelled',
 		vaultEvents.RequestCancelled,
@@ -462,7 +462,7 @@ export function decodeBuilderCodeSets(
 ): BuilderCodeReceipt[] {
 	return decodeAll(
 		result,
-		cfg.packages.predict,
+		cfg.packages.predictV1 ?? cfg.packages.predict,
 		'builder_code_events',
 		'BuilderCodeSet',
 		builderCodeEvents.BuilderCodeSet,

package/src/predict/index.ts

@@ -14,6 +14,7 @@ export type {
 	MarketDescriptor,
 	MarketSummary,
 	MintAmountOptions,
+	MintCostOptions,
 	MintOptions,
 	MintQuote,
 	PlpSupplyOptions,
@@ -92,6 +93,14 @@ export type { Side } from './ticks.js';
 export * as pricing from './pricing.js';
 export type { PricerSnapshot } from './reads/pricing.js';
 
+// === Client-side cost === the deployed FEE math as an exact integer port, so a quote needs no
+// chain call: `cost.mintCost` (all-in debit for a quantity), `cost.mintCostForBudget` (the
+// `mint_exact_cost` budget search), `cost.redeemLiveProceeds` (net credited by a live close),
+// plus the components they are built from. Probabilities come from `pricing.*` or from the
+// chain (`read.price`); the fee policy is the market's `MarketCreated` snapshot, with
+// `cost.SHIPPED_FEE_POLICY` as the shipped template.
+export * as cost from './cost.js';
+
 // === Errors ===
 export { PredictInputError, PredictMoveError, decodeMoveAbort } from './errors.js';
 export type { MoveAbortError } from './errors.js';

package/src/predict/reads/positions.ts

@@ -83,7 +83,7 @@ export async function resolvePositionsTable(
 	// The PredictData field id is derivable — no listing needed for this hop.
 	const dataFieldId = deriveDynamicFieldID(
 		accountUid,
-		`${config.accountPackageId}::account::DataKey<${config.predictPackageId}::predict_account::PredictApp>`,
+		`${config.accountPackageId}::account::DataKey<${config.predictPackageIdV1}::predict_account::PredictApp>`,
 		new Uint8Array([0]), // DataKey's hidden dummy_field: bool = false
 	);
 	const fieldContent = await contentOf(client, dataFieldId);

package/src/predict/tx/trade.ts

@@ -6,11 +6,12 @@ import { U64_MAX } from '../units.js';
 import * as expiryMarket from '../../contracts/deepbook_predict/expiry_market.js';
 import { withAuth } from './common.js';
 
-// The four trade calls with their `auth` argument already supplied (see `withAuth`): each
+// The trade calls with their `auth` argument already supplied (see `withAuth`): each
 // takes its generated options minus that slot and expands to auth → call.
 const authed = {
 	mintExactQuantity: withAuth(expiryMarket.mintExactQuantity),
 	mintExactAmount: withAuth(expiryMarket.mintExactAmount),
+	mintExactCost: withAuth(expiryMarket.mintExactCost),
 	redeemLive: withAuth(expiryMarket.redeemLive),
 	redeemSettled: withAuth(expiryMarket.redeemSettled),
 };
@@ -127,6 +128,34 @@ export function mintExactAmount(
 	);
 }
 
+/** Mint within an all-in budget, including fees, using the v2 entrypoint. */
+export function mintExactCost(
+	config: GeneratedConfig,
+	args: {
+		expiryMarketId: string;
+		wrapperId: string;
+		lowerTick: bigint;
+		higherTick: bigint;
+		maxCostRaw: bigint;
+		minQuantityRaw: bigint;
+	} & MarketFeeds,
+): (tx: Transaction) => TransactionResult {
+	return liveTrade(config, args, (pricer) =>
+		authed.mintExactCost({
+			config,
+			arguments: {
+				market: args.expiryMarketId,
+				wrapper: args.wrapperId,
+				pricer,
+				lowerTick: args.lowerTick,
+				higherTick: args.higherTick,
+				maxCost: args.maxCostRaw,
+				minQuantity: args.minQuantityRaw,
+			},
+		}),
+	);
+}
+
 // Owner-authorized redeem of a live (not-yet-settled) position: close `closeQuantityRaw`
 // of `orderId` at the live pricer's mark, enforcing close-side slippage floors
 // (`minProbabilityRaw`/`minProceedsRaw`, default 0 = uncapped). Returns `Option<u256>`:

package/src/sessions.ts

@@ -26,8 +26,10 @@ import { SessionsData } from './contracts/deepbook_sessions/sessions.js';
  * registry. `sessionsPackageId` and `sessionsConfig` come from the sessions deployment.
  */
 export interface SessionsConfig extends DeepbookSessionsConfig {
-	/** The `deepbook_sessions` Move package id. */
+	/** The latest `deepbook_sessions` Move-call package id. */
 	sessionsPackageId: string;
+	/** Original ID for v1 structs. Omit only for an unupgraded custom deployment. */
+	sessionsPackageIdV1?: string;
 	/** The shared `SessionsConfig` object id. */
 	sessionsConfig: string;
 	/** The shared `account` Move package id. */
@@ -196,7 +198,7 @@ export class SessionsContract {
 		// `0x2::derived_object::DerivedObjectKey<..>` and yield an id that points at nothing.
 		return deriveDynamicFieldID(
 			this.deriveAccountId(owner),
-			`${this.#config.accountPackageId}::account::DataKey<${this.#config.sessionsPackageId}::sessions::SessionsApp>`,
+			`${this.#config.accountPackageId}::account::DataKey<${this.#config.sessionsPackageIdV1 ?? this.#config.sessionsPackageId}::sessions::SessionsApp>`,
 			// DataKey is source-empty; Move's hidden `dummy_field: bool` is the key's one byte.
 			new Uint8Array([0]),
 		);
@@ -342,6 +344,39 @@ export class SessionsContract {
 			);
 	}
 
+	/**
+	 * Mint within an all-in budget as a session. Amounts are raw Move units.
+	 * Requires Sessions/Predict v2 (currently Testnet; Mainnet is still v1).
+	 */
+	mintExactCost(params: {
+		expiryMarketId: string;
+		wrapperId: string;
+		protocolConfig: string;
+		pricer: TransactionArgument;
+		lowerTick: number | bigint;
+		higherTick: number | bigint;
+		maxCost: number | bigint;
+		minQuantity: number | bigint;
+	}) {
+		return (tx: Transaction): TransactionResult =>
+			tx.add(
+				sessions.mintExactCost({
+					config: this.#generatedConfig,
+					arguments: {
+						market: params.expiryMarketId,
+						accountRegistry: this.#config.accountRegistry,
+						wrapper: params.wrapperId,
+						config: params.protocolConfig,
+						pricer: params.pricer,
+						lowerTick: params.lowerTick,
+						higherTick: params.higherTick,
+						maxCost: params.maxCost,
+						minQuantity: params.minQuantity,
+					},
+				}),
+			);
+	}
+
 	/**
 	 * @description Close part or all of a live position at the pricer's mark, as `session`.
 	 * `minProbability` / `minProceeds` are close-side slippage floors; `0` disables either,