@mysten/deepbook-v3 2.9.2 → 2.10.1

package/src/deployments/types.ts

@@ -38,8 +38,20 @@ export interface DeploymentUnits {
 
 /** Ids for the shared `account` primitive. */
 export interface AccountIds {
+	/**
+	 * The ORIGINAL `account` package ID. Type tags and the derived wrapper and account addresses
+	 * are built from it, because Move types keep their defining package across upgrades. Moving it
+	 * to a newer package would derive addresses nothing lives at.
+	 */
 	accountPackageId: string;
 	accountRegistry: string;
+	/**
+	 * The latest `account` package, once the network has upgraded it: the call target of every
+	 * account call. A PTB can't call a package at an older version than another package in it
+	 * links (Predict's Version 5 links account v2), and `receive_coin` only exists from v2.
+	 * Absent while the network runs v1. Never used for type tags or derived addresses.
+	 */
+	accountPackageIdLatest?: string;
 }
 
 /** Ids for time-limited sessions, including the spot- and Predict-only extras. */
@@ -79,6 +91,8 @@ export interface PredictIds {
 		predictOrdersV1?: string;
 		/** `deepbook_predict_math`, once the network records delayed execution. */
 		predictMath?: string;
+		/** Latest `account`, once the network has upgraded it. `account` stays the original ID. */
+		accountLatest?: string;
 	};
 	objects: {
 		registry: string;

package/src/predict/bindings/expiry-market.ts

@@ -125,3 +125,90 @@ export function redeemLive(options: RedeemLiveOptions) {
 		arguments: renameArguments(options.arguments, TRADE_KEYS),
 	});
 }
+
+// Predict v5 underscore-prefixed the parameters of three more functions: `redeem_settled` and
+// `redeem_settled_permissionless` retired, and `quote_close` ignores its builder code since
+// builder fees moved to each trade (`quote_close_with_builder_fee` quotes one). Their shipped keys
+// are kept here like the immediate trades'.
+const SETTLED_KEYS = {
+	market: 'Market',
+	wrapper: 'Wrapper',
+	auth: 'Auth',
+	config: 'Config',
+	accountRegistry: 'AccountRegistry',
+	orderId: 'OrderId',
+} as const;
+
+type Positional<Options extends { arguments: unknown }> = Extract<
+	Options['arguments'],
+	readonly unknown[]
+>;
+
+export interface RedeemSettledArguments {
+	market: RawTransactionArgument<string>;
+	wrapper: RawTransactionArgument<string>;
+	auth: TransactionArgument;
+	config?: RawTransactionArgument<string>;
+	orderId: RawTransactionArgument<number | bigint>;
+}
+export interface RedeemSettledOptions extends Omit<generated.RedeemSettledOptions, 'arguments'> {
+	arguments: RedeemSettledArguments | Positional<generated.RedeemSettledOptions>;
+}
+/**
+ * @deprecated Retired by delayed execution in Predict v5: it always aborts
+ * `EDelayedExecutionRequired`. A queued fill never enters the account; the order-flow package pays
+ * its Open record at settlement. A network whose Predict call target is still v4 runs it as before.
+ */
+export function redeemSettled(options: RedeemSettledOptions) {
+	return generated.redeemSettled({
+		...options,
+		arguments: renameArguments(options.arguments, SETTLED_KEYS),
+	});
+}
+
+export interface RedeemSettledPermissionlessArguments {
+	market: RawTransactionArgument<string>;
+	accountRegistry: RawTransactionArgument<string>;
+	wrapper: RawTransactionArgument<string>;
+	config?: RawTransactionArgument<string>;
+	orderId: RawTransactionArgument<number | bigint>;
+}
+export interface RedeemSettledPermissionlessOptions extends Omit<
+	generated.RedeemSettledPermissionlessOptions,
+	'arguments'
+> {
+	arguments:
+		RedeemSettledPermissionlessArguments | Positional<generated.RedeemSettledPermissionlessOptions>;
+}
+/**
+ * @deprecated Retired with `redeem_settled` in Predict v5: it always aborts
+ * `EDelayedExecutionRequired`. A network whose Predict call target is still v4 runs it as before.
+ */
+export function redeemSettledPermissionless(options: RedeemSettledPermissionlessOptions) {
+	return generated.redeemSettledPermissionless({
+		...options,
+		arguments: renameArguments(options.arguments, SETTLED_KEYS),
+	});
+}
+
+export interface QuoteCloseArguments {
+	market: RawTransactionArgument<string>;
+	pricer: TransactionArgument;
+	receipt: TransactionArgument;
+	closeQuantity: RawTransactionArgument<number | bigint>;
+	builderCodeId: RawTransactionArgument<string | null>;
+}
+export interface QuoteCloseOptions extends Omit<generated.QuoteCloseOptions, 'arguments'> {
+	arguments: QuoteCloseArguments | Positional<generated.QuoteCloseOptions>;
+}
+/**
+ * The close a sell fill prices, without the trader's floors. From Predict v5 it quotes a sell that
+ * names no builder, whatever `builderCodeId` names; `quoteCloseWithBuilderFee` quotes one that
+ * does. Changes nothing.
+ */
+export function quoteClose(options: QuoteCloseOptions) {
+	return generated.quoteClose({
+		...options,
+		arguments: renameArguments(options.arguments, { builderCodeId: 'BuilderCodeId' }),
+	});
+}

package/src/predict/bindings/queue.ts

@@ -0,0 +1,42 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// The public `queueMoveCalls`: the generated order-flow `queue` bindings, with the argument key
+// `quote_redeem_open` shipped with (see `rename.ts`). Its `wrapper` parameter became `_wrapper` in
+// predict_orders v2 (Testnet v3), when builder fees moved from the account to each trade.
+
+import type { TransactionArgument } from '@mysten/sui/transactions';
+import * as generated from '../../contracts/deepbook_predict_orders/queue.js';
+import type { RawTransactionArgument } from '../../contracts/utils/index.js';
+import { renameArguments } from './rename.js';
+
+export * from '../../contracts/deepbook_predict_orders/queue.js';
+
+export interface QuoteRedeemOpenArguments {
+	queue: RawTransactionArgument<string>;
+	market: RawTransactionArgument<string>;
+	wrapper: RawTransactionArgument<string>;
+	pricer: TransactionArgument;
+	recordId: RawTransactionArgument<number | bigint>;
+	closeQuantity: RawTransactionArgument<number | bigint>;
+}
+export interface QuoteRedeemOpenOptions extends Omit<
+	generated.QuoteRedeemOpenOptions,
+	'arguments'
+> {
+	arguments:
+		| QuoteRedeemOpenArguments
+		| Extract<generated.QuoteRedeemOpenOptions['arguments'], readonly unknown[]>;
+}
+/**
+ * Quote an early sell of `closeQuantity` from the Open record `recordId` at a live `Pricer`: the
+ * close a queued sell fills, with no builder fee, matching `enqueue_redeem_open`.
+ * `quoteRedeemOpenWithBuilderFee` quotes a sell that names a builder. Changes nothing. The
+ * `wrapper` is no longer read, because the fee comes from the trade, not the account.
+ */
+export function quoteRedeemOpen(options: QuoteRedeemOpenOptions) {
+	return generated.quoteRedeemOpen({
+		...options,
+		arguments: renameArguments(options.arguments, { wrapper: 'Wrapper' }),
+	});
+}

package/src/predict/bindings/rename.ts

@@ -6,8 +6,12 @@
 // move-call exports keep the keys these bindings shipped with, renamed here before calling the
 // generated binding, so the emitted move call is unchanged.
 
-/** Rename an arguments object's keys by `keys` (shipped key → generated key). */
+/**
+ * Rename an arguments object's keys by `keys` (shipped key → generated key). A positional tuple
+ * has no keys, so it passes through unchanged.
+ */
 export function renameArguments<T>(args: object, keys: Readonly<Record<string, string>>): T {
+	if (Array.isArray(args)) return args as T;
 	return Object.fromEntries(
 		Object.entries(args).map(([key, value]) => [keys[key] ?? key, value]),
 	) as T;

package/src/predict/client.ts

@@ -44,6 +44,7 @@ import {
 } from './errors.js';
 import {
 	ORDER_FLOW_PACKAGE_VERSION,
+	PREDICT_PACKAGE_VERSION,
 	ORDER_KIND,
 	ORDER_STATUS,
 	budgetMintLimits,
@@ -1286,6 +1287,16 @@ export class PredictClient {
 		return Boolean(predictDelayedExecution && predictOrders && orderDesk && queueRegistry);
 	}
 
+	// The version constants the configured call targets compile: the network's own pins, else the
+	// versions these bindings were generated from. A watermark above one retires that code.
+	#predictCurrentVersion(): bigint {
+		return this.cfg.packages.predictCurrentVersion ?? PREDICT_PACKAGE_VERSION;
+	}
+
+	#ordersCurrentVersion(): bigint {
+		return this.cfg.packages.predictOrdersCurrentVersion ?? ORDER_FLOW_PACKAGE_VERSION;
+	}
+
 	// The market's queue ID, once its `MarketQueue` is known to exist. A missing queue would abort
 	// every read and order with an opaque error, so it is refused here with a typed one.
 	async #existingQueueId(orders: OrdersGeneratedConfig, marketId: string): Promise<string> {
@@ -1333,7 +1344,12 @@ export class PredictClient {
 				"queued orders aren't live yet: the protocol hasn't enabled the order-flow package",
 			);
 		}
-		const mode = executionModeFor(state.protocol.versionWatermark, true);
+		const mode = executionModeFor(
+			state.protocol.versionWatermark,
+			true,
+			true,
+			this.#predictCurrentVersion(),
+		);
 		if (mode === 'retired') {
 			throw new PredictPreflightError(
 				'retired',
@@ -1346,7 +1362,7 @@ export class PredictClient {
 				"queued orders aren't live yet: the protocol's version watermark hasn't been raised",
 			);
 		}
-		if (state.desk.versionWatermark > ORDER_FLOW_PACKAGE_VERSION) {
+		if (state.desk.versionWatermark > this.#ordersCurrentVersion()) {
 			throw new PredictPreflightError(
 				'retired',
 				'the order-flow package version this SDK calls is retired: update the SDK',
@@ -2385,6 +2401,7 @@ export class PredictClient {
 				await versionWatermark(this.#client, this.cfg.objects.protocolConfig),
 				this.#recordsDelayedExecution(),
 				this.cfg.packages.predictDelayedExecution != null,
+				this.#predictCurrentVersion(),
 			),
 
 		/**
@@ -2400,7 +2417,12 @@ export class PredictClient {
 			const state = await this.#queueState(orders, id, { owner });
 			const nowMs = BigInt(Date.now());
 			const policy = state.desk.policy;
-			const mode = executionModeFor(state.protocol.versionWatermark, true);
+			const mode = executionModeFor(
+				state.protocol.versionWatermark,
+				true,
+				true,
+				this.#predictCurrentVersion(),
+			);
 			const timing = previewTiming({
 				nowMs,
 				policy,

package/src/predict/config/generated.ts

@@ -26,6 +26,7 @@ export type GeneratedConfig = DeepbookPredictConfig &
 	AccountConfig & {
 		predictPackageId: string;
 		predictPackageIdV1: string;
+		/** The ORIGINAL account ID: type tags and derived addresses are built from it. */
 		accountPackageId: string;
 		accountRegistry: string;
 	};
@@ -35,6 +36,8 @@ export function toGeneratedConfig(cfg: PredictConfig): GeneratedConfig {
 		predictPackageId: cfg.packages.predict,
 		predictPackageIdV1: cfg.packages.predictV1 ?? cfg.packages.predict,
 		accountPackageId: cfg.packages.account,
+		// The account bindings call this when present (see `account-bindings/latest.ts`).
+		accountPackageIdLatest: cfg.packages.accountLatest,
 		protocolConfig: cfg.objects.protocolConfig,
 		poolVault: cfg.objects.poolVault,
 		registry: cfg.objects.registry,

package/src/predict/config/mainnet.ts

@@ -27,6 +27,10 @@ export const MAINNET_CONFIG: PredictConfig = Object.freeze({
 	packages: Object.freeze({
 		...MAINNET_PREDICT.packages,
 		predictDelayedExecution: '0x98235c5842831c9b5f51dc637cf34c91db2aca5510802eb6ebfec63f5b71a7bb',
+		// The version constants the call targets compile: Predict v4 compiles 4 and orders v1 compiles
+		// 1. Move them with the call targets at the Version 5 upgrade (to 5 and 2).
+		predictCurrentVersion: 4n,
+		predictOrdersCurrentVersion: 1n,
 	}),
 	objects: Object.freeze({
 		...MAINNET_PREDICT.objects,

package/src/predict/config/testnet.ts

@@ -27,6 +27,10 @@ export const TESTNET_CONFIG: PredictConfig = Object.freeze({
 	packages: Object.freeze({
 		...TESTNET_PREDICT.packages,
 		predictDelayedExecution: '0x0654ecbed7c0f2645d9de7cb6cf08e65c2ee05cdbb39a415f17a6bd1cd92e267',
+		// The version constants the call targets compile (Version 5: Predict 5, orders 2, as Mainnet
+		// will ship them), not their Testnet package numbers (v8, v3). Move them with the call targets.
+		predictCurrentVersion: 5n,
+		predictOrdersCurrentVersion: 2n,
 	}),
 	objects: Object.freeze({
 		...TESTNET_PREDICT.objects,

package/src/predict/config/types.ts

@@ -37,8 +37,31 @@ export interface PredictPackages {
 	predictOrdersV1?: string;
 	/** The `deepbook_predict_math` package ID, for its pure calls and layouts. */
 	predictMath?: string;
+	/**
+	 * ORIGINAL `account` package ID: type tags (`DataKey`, events) and the derived wrapper and
+	 * account addresses are built from it, so it never moves.
+	 */
 	account: string;
+	/**
+	 * Latest `account` package once the network has upgraded it: the call target of every account
+	 * call in a Predict PTB (`generate_auth`, `deposit_funds`, `load_account`, …). A PTB can't call
+	 * a package at an older version than another package in it links, and Predict's Version 5
+	 * links account v2. Omit while account is at v1: calls then target `account`.
+	 */
+	accountLatest?: string;
 	propbook: string;
+	/**
+	 * Predict's `constants::current_version` compiled into `predict`, the call target. A
+	 * `ProtocolConfig.version_watermark` above it retires the code this config calls. It follows the
+	 * Mainnet package number, not the Testnet one (Testnet's package v8 compiles 5). Defaults to
+	 * `PREDICT_PACKAGE_VERSION`, the version these bindings were generated from.
+	 */
+	predictCurrentVersion?: bigint;
+	/**
+	 * `desk::current_version` compiled into `predictOrders`. A desk floor above it retires the
+	 * order-flow code this config calls. Defaults to `ORDER_FLOW_PACKAGE_VERSION`.
+	 */
+	predictOrdersCurrentVersion?: bigint;
 }
 
 /**

package/src/predict/cost.ts

@@ -545,7 +545,11 @@ interface MintInputsBase {
 	nowMs?: number | bigint;
 	/** Boundary probabilities, or a pricer snapshot plus the range's strikes. */
 	probabilities: ProbabilitySource;
-	/** Whether the minting account carries a builder code (it pays the builder fee). */
+	/**
+	 * Whether the minting account carries a builder code and pays the account-attached builder fee:
+	 * Predict v4 semantics. From Predict Version 5 an attached code charges nothing (a builder fee
+	 * is passed on each trade instead), so leave this `false` on a network running Version 5.
+	 */
 	builderCode?: boolean;
 	/** The expiry's remaining sponsored fee balance (`fee_incentive_balance`). Default `0n`. */
 	feeIncentiveBalance?: number | bigint;
@@ -902,6 +906,10 @@ export interface RedeemLiveInputs {
 	closeQuantity: number | bigint;
 	/** Current position payout quantity, when known. Validates the close and returns the remainder. */
 	positionQuantity?: number | bigint;
+	/**
+	 * Whether the selling account pays the account-attached builder fee: Predict v4 semantics.
+	 * Leave it `false` on a network running Version 5, where an attached code charges nothing.
+	 */
 	builderCode?: boolean;
 	penaltyRate?: bigint;
 	/** Pre-trade payout-tree terms. Required when inventory impact is enabled. */

package/src/predict/errors.ts

@@ -114,6 +114,8 @@ export const ABORT_NAMES: Readonly<Record<string, readonly string[]>> = Object.f
 		'ECutoverNotReached',
 		'EEwmaRetired',
 		'EOrderFlowNotAllowed',
+		// Predict v5: a builder trade before the watermark reaches the builder-fee version.
+		'EBuilderFeeCutoverNotReached',
 	],
 	// Predict's live pricer, which every quote, plan and enqueue loads.
 	pricing: [
@@ -234,7 +236,15 @@ export const ABORT_NAMES: Readonly<Record<string, readonly string[]>> = Object.f
 	// The math library (`deepbook_predict_math`).
 	lazer_price: ['EPropertyNotRequested', 'EGenerationAfterEnvelope', 'EFeedMissing'],
 	// Sessions (`deepbook_sessions`), which the `/sessions` Predict wrappers abort in.
-	sessions: ['EInvalidSessionDuration', 'ESessionNotAuthorized', 'ESessionLimitExceeded'],
+	sessions: [
+		'EInvalidSessionDuration',
+		'ESessionNotAuthorized',
+		'ESessionLimitExceeded',
+		// Session builder approvals (Sessions v4, the Mainnet number).
+		'EBuilderNotApproved',
+		'EBuilderFeeAboveApproved',
+		'EBuilderApprovalsNotEnabled',
+	],
 	session_config: ['EPackageVersionDisabled', 'EVersionWatermarkNotAdvanced'],
 	// The shared account (`deepbook_account`).
 	account_registry: ['EAppAlreadyAuthorized', 'EAppNotAuthorized', 'EAccountAlreadyExists'],

package/src/predict/index.ts

@@ -81,7 +81,7 @@ export * as vaultEvents from '../contracts/deepbook_predict/vault_events.js';
 // `config: toOrdersConfig(cfg)`, which adds the companion package and the desk to the projected
 // config. `deepbook_predict_math` is the pure math library (`predictMathMoveCalls`) and the
 // `LazerPrice` a verified Pyth Lazer update decodes to (`lazerPriceMoveCalls`).
-export * as queueMoveCalls from '../contracts/deepbook_predict_orders/queue.js';
+export * as queueMoveCalls from './bindings/queue.js';
 export * as deskMoveCalls from '../contracts/deepbook_predict_orders/desk.js';
 export * as orderQueueMoveCalls from '../contracts/deepbook_predict_orders/order_queue.js';
 export * as delayedExecutionConfigMoveCalls from '../contracts/deepbook_predict_orders/delayed_execution_config.js';

package/src/predict/queue.ts

@@ -38,16 +38,20 @@ export const DELAYED_EXECUTION_VERSION = 4n;
  * Predict's `constants::current_version` of the package these bindings were generated from. Every
  * version-gated Predict call checks `chk_version`, which aborts `EPackageVersionDisabled` once
  * `ProtocolConfig.version_watermark` is above it, so a higher watermark retires the Predict code
- * this SDK calls. Bump it with Predict when regenerating.
+ * this SDK calls. Bump it with Predict when regenerating. Like `DELAYED_EXECUTION_VERSION` it is the
+ * code's version constant, which follows the Mainnet package number (5 ships as Mainnet v5 and runs
+ * as Testnet package v8), never the Testnet package number.
  */
-export const PREDICT_PACKAGE_VERSION = 4n;
+export const PREDICT_PACKAGE_VERSION = 5n;
 
 /**
  * `desk::current_version` of the order-flow package these bindings were generated from. The desk's
  * version floor retires older companion code, so a floor above it means the package this SDK calls
- * aborts `EPackageVersionDisabled`. Bump it with the companion when regenerating.
+ * aborts `EPackageVersionDisabled`. Bump it with the companion when regenerating. It follows the
+ * Mainnet package number (2 ships as Mainnet v2 and runs as Testnet package v3), never the Testnet
+ * package number.
  */
-export const ORDER_FLOW_PACKAGE_VERSION = 1n;
+export const ORDER_FLOW_PACKAGE_VERSION = 2n;
 
 /** `queue::phase_*`: what `settle_step` returns, the phase the next call runs. */
 export const SETTLE_PHASE = Object.freeze({

package/src/predict/reads/queue.ts

@@ -29,6 +29,7 @@ import { DelayedExecutionPolicy as DelayedExecutionPolicyBcs } from '../../contr
 import * as desk from '../../contracts/deepbook_predict_orders/desk.js';
 import { OrderView as OrderViewBcs } from '../../contracts/deepbook_predict_orders/order_queue.js';
 import * as queue from '../../contracts/deepbook_predict_orders/queue.js';
+import { quoteRedeemOpen as quoteRedeemOpenCall } from '../bindings/queue.js';
 import { inspectReturns, type ReadClient } from './inspect.js';
 import { parseOptionalU64, parseU64LE } from './parse.js';
 
@@ -294,8 +295,9 @@ export async function versionWatermark(
  *   `EDelayedExecutionRequired`.
  * - `'unsupported'`: the watermark is raised but this SDK's config has no delayed-execution
  *   record for the network. Upgrade the SDK, or pass a config that records it.
- * - `'retired'`: the watermark is above the Predict code version this SDK calls
- *   (`PREDICT_PACKAGE_VERSION`), so every version-gated call aborts `EPackageVersionDisabled`.
+ * - `'retired'`: the watermark is above the Predict code version the config calls
+ *   (`packages.predictCurrentVersion`, else `PREDICT_PACKAGE_VERSION`), so every version-gated
+ *   call aborts `EPackageVersionDisabled`.
  *   Upgrade the SDK.
  */
 export type ExecutionMode =
@@ -312,10 +314,11 @@ export function executionModeFor(
 	watermark: bigint,
 	recordsDelayedExecution: boolean,
 	recordsPredictUpgrade: boolean = recordsDelayedExecution,
+	predictCurrentVersion: bigint = PREDICT_PACKAGE_VERSION,
 ): ExecutionMode {
 	if (watermark >= DELAYED_EXECUTION_VERSION) {
 		if (!recordsDelayedExecution) return 'unsupported';
-		return watermark > PREDICT_PACKAGE_VERSION ? 'retired' : 'delayed';
+		return watermark > predictCurrentVersion ? 'retired' : 'delayed';
 	}
 	return recordsDelayedExecution || recordsPredictUpgrade ? 'awaiting-cutover' : 'immediate';
 }
@@ -400,7 +403,7 @@ export async function quoteRedeemOpen(
 	const tx = new Transaction();
 	const pricer = tx.add(loadLivePricer(config, args));
 	tx.add(
-		queue.quoteRedeemOpen({
+		quoteRedeemOpenCall({
 			config,
 			arguments: {
 				queue: queueIdOf(config, args),

package/src/predict/tx/common.ts

@@ -15,6 +15,7 @@ export function accountContract(cfg: PredictConfig): AccountContract {
 	return new AccountContract({
 		accountPackageId: cfg.packages.account,
 		accountRegistry: cfg.objects.accountRegistry,
+		accountPackageIdLatest: cfg.packages.accountLatest,
 	});
 }
 
@@ -84,6 +85,7 @@ export function deriveAccountWrapperIdFrom(
 	config: Pick<GeneratedConfig, 'accountRegistry' | 'accountPackageId'>,
 	owner: string,
 ): string {
+	// The original ID: the key type's defining package, whatever account version runs.
 	return new AccountContract({
 		accountPackageId: config.accountPackageId,
 		accountRegistry: config.accountRegistry,

package/src/predict/tx/trade.ts

@@ -5,12 +5,14 @@ import type { GeneratedConfig } from '../config/generated.js';
 import { U64_MAX } from '../units.js';
 import { accountMoveCalls as account } from '../../account.js';
 import * as expiryMarket from '../../contracts/deepbook_predict/expiry_market.js';
+import * as expiryMarketBindings from '../bindings/expiry-market.js';
 import { withAuth } from './common.js';
 
 // 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 = {
-	redeemSettled: withAuth(expiryMarket.redeemSettled),
+	// The shipped argument keys: Predict v5 underscore-prefixed the retired call's parameters.
+	redeemSettled: withAuth(expiryMarketBindings.redeemSettled),
 };
 
 // The oracle feed object ids a live market's pricer reads. Grouped so callers pass one

package/src/sessions.ts

@@ -33,10 +33,19 @@ export interface SessionsConfig extends DeepbookSessionsConfig {
 	sessionsPackageIdV1?: string;
 	/** The shared `SessionsConfig` object id. */
 	sessionsConfig: string;
-	/** The shared `account` Move package id. */
+	/**
+	 * The ORIGINAL shared `account` package id. The derived account and wrapper ids and the
+	 * session data key's type are built from it, so it never moves to an upgraded package.
+	 */
 	accountPackageId: string;
 	/** The shared `AccountRegistry` object id. */
 	accountRegistry: string;
+	/**
+	 * The latest `account` package once the network has upgraded it: the call target for any
+	 * account call composed into the same PTB as these sessions calls, which link it. A PTB can't
+	 * call account at an older version (`InvalidLinkage`). Absent while the network runs v1.
+	 */
+	accountPackageIdLatest?: string;
 }
 
 /**

package/src/utils/constants.ts

@@ -26,8 +26,9 @@ export const testnetPackageIds = {
 	MARGIN_PACKAGE_ID: '0x0ad965f35189c7eca57d4718c8f5bf1b7f9f7eb4ced6d5b7aa6496a16d71e8d2',
 	MARGIN_V1: '0xb8620c24c9ea1a4a41e79613d2b3d1d93648d1bb6f6b789a7c8f261c94110e4b',
 	MARGIN_REGISTRY_ID: '0x48d7640dfae2c6e9ceeada197a7a1643984b5a24c55a0c6c023dac77e0339f75',
-	// margin_liquidation v4 — carries liquidate_base_upgraded / liquidate_quote_upgraded.
-	LIQUIDATION_PACKAGE_ID: '0x29bccec5261b7d040555a13e98bbc6bef7bad007d62759aac8b71c19916f6476',
+	// margin_liquidation v5, linked to core v21 and margin v17 — the same source as mainnet v6
+	// (legacy-Pyth liquidate_base / liquidate_quote retired; the builders call the _upgraded pair).
+	LIQUIDATION_PACKAGE_ID: '0x4f4916fc38892fe335a8aab45e3f42700060eb2d20f854607489ad88a88393a9',
 } satisfies DeepbookPackageIds;
 
 export const mainnetPackageIds = {
@@ -43,7 +44,11 @@ export const mainnetPackageIds = {
 	MARGIN_PACKAGE_ID: '0x40fa183b5602cd0f6c4d7b16c08766ad8d7d581608fbe3b2570fe72ab4f5625f',
 	MARGIN_V1: '0x97d9473771b01f77b0940c589484184b49f6444627ec121314fae6a6d36fb86b',
 	MARGIN_REGISTRY_ID: '0x0e40998b359a9ccbab22a98ed21bd4346abf19158bc7980c8291908086b3a742',
-	LIQUIDATION_PACKAGE_ID: '0xba2b39c026650fef52038c93c526fc5314a4286318a0d2a7054b65815178fb74',
+	// margin_liquidation v6, linked to core v9 and margin v8. Older versions link margin v7, so
+	// their liquidations abort once margin version 7 is disabled on the MarginRegistry. v6
+	// retires the legacy-Pyth liquidate_base / liquidate_quote; the builders here call the
+	// _upgraded pair.
+	LIQUIDATION_PACKAGE_ID: '0xd61f264aaf707285a712347fccfb8e905e99d7dc72a6bd1053829ddebf420c2b',
 } satisfies DeepbookPackageIds;
 
 /**