@mysten/deepbook-v3 1.6.7 → 2.0.1

package/src/transactions/marginManager.ts

@@ -8,6 +8,7 @@ import type { DepositParams, DepositDuringInitParams } from '../types/index.js';
 import { FLOAT_SCALAR } from '../utils/config.js';
 import { convertPrice, convertQuantity } from '../utils/conversion.js';
 import * as marginManagerMoveCalls from '../contracts/deepbook_margin/margin_manager.js';
+import * as marginManagerUpgradedMoveCalls from '../contracts/deepbook_margin/margin_manager_upgraded.js';
 
 /**
  * MarginManagerContract class for managing MarginManager operations.
@@ -22,6 +23,15 @@ export class MarginManagerContract {
 		this.#config = config;
 	}
 
+	/**
+	 * Oracle-taking entrypoints live in the parallel `_upgraded` module, which takes Pyth's
+	 * upgraded-Core `PriceInfoObject`. Entrypoints with no oracle argument stay on the base
+	 * module, which is the only place they exist.
+	 */
+	get #oracleCalls() {
+		return marginManagerUpgradedMoveCalls;
+	}
+
 	/**
 	 * @description Create a new margin manager
 	 * @param {string} poolKey The key to identify the pool
@@ -155,13 +165,13 @@ export class MarginManagerContract {
 				: params.coin;
 
 		tx.add(
-			marginManagerMoveCalls.deposit({
+			this.#oracleCalls.deposit({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager,
 					registry: this.#config.MARGIN_REGISTRY_ID,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					coin,
 				},
 				typeArguments: [baseCoin.type, quoteCoin.type, depositCoin.type],
@@ -188,13 +198,13 @@ export class MarginManagerContract {
 					})
 				: params.coin;
 		tx.add(
-			marginManagerMoveCalls.deposit({
+			this.#oracleCalls.deposit({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					coin,
 				},
 				typeArguments: [baseCoin.type, quoteCoin.type, baseCoin.type],
@@ -221,13 +231,13 @@ export class MarginManagerContract {
 					})
 				: params.coin;
 		tx.add(
-			marginManagerMoveCalls.deposit({
+			this.#oracleCalls.deposit({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					coin,
 				},
 				typeArguments: [baseCoin.type, quoteCoin.type, quoteCoin.type],
@@ -255,13 +265,13 @@ export class MarginManagerContract {
 					})
 				: params.coin;
 		tx.add(
-			marginManagerMoveCalls.deposit({
+			this.#oracleCalls.deposit({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					coin,
 				},
 				typeArguments: [baseCoin.type, quoteCoin.type, deepCoin.type],
@@ -283,15 +293,15 @@ export class MarginManagerContract {
 		const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		return tx.add(
-			marginManagerMoveCalls.withdraw({
+			this.#oracleCalls.withdraw({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					pool: pool.address,
 					withdrawAmount: convertQuantity(amount, baseCoin.scalar),
 				},
@@ -314,15 +324,15 @@ export class MarginManagerContract {
 		const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		return tx.add(
-			marginManagerMoveCalls.withdraw({
+			this.#oracleCalls.withdraw({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					pool: pool.address,
 					withdrawAmount: convertQuantity(amount, quoteCoin.scalar),
 				},
@@ -346,15 +356,15 @@ export class MarginManagerContract {
 		const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		return tx.add(
-			marginManagerMoveCalls.withdraw({
+			this.#oracleCalls.withdraw({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					pool: pool.address,
 					withdrawAmount: convertQuantity(amount, deepCoin.scalar),
 				},
@@ -376,14 +386,14 @@ export class MarginManagerContract {
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 		const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 		return tx.add(
-			marginManagerMoveCalls.borrowBase({
+			this.#oracleCalls.borrowBase({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					baseMarginPool: baseMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					pool: pool.address,
 					loanAmount: convertQuantity(amount, baseCoin.scalar),
 				},
@@ -405,14 +415,14 @@ export class MarginManagerContract {
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		return tx.add(
-			marginManagerMoveCalls.borrowQuote({
+			this.#oracleCalls.borrowQuote({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					pool: pool.address,
 					loanAmount: convertQuantity(amount, quoteCoin.scalar),
 				},
@@ -496,13 +506,13 @@ export class MarginManagerContract {
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const marginPool = debtIsBase ? baseMarginPool : quoteMarginPool;
 			return tx.add(
-				marginManagerMoveCalls.liquidate({
+				this.#oracleCalls.liquidate({
 					package: this.#config.MARGIN_PACKAGE_ID,
 					arguments: {
 						self: managerAddress,
 						registry: this.#config.MARGIN_REGISTRY_ID,
-						baseOracle: baseCoin.priceInfoObjectId!,
-						quoteOracle: quoteCoin.priceInfoObjectId!,
+						baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+						quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 						marginPool: marginPool.address,
 						pool: pool.address,
 						repayCoin,
@@ -770,13 +780,13 @@ export class MarginManagerContract {
 		const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		return tx.add(
-			marginManagerMoveCalls.managerState({
+			this.#oracleCalls.managerState({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: marginManagerId,
 					registry: this.#config.MARGIN_REGISTRY_ID,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					pool: pool.address,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,

package/src/transactions/marginTPSL.ts

@@ -12,6 +12,7 @@ import { OrderType, SelfMatchingOptions } from '../types/index.js';
 import { MAX_TIMESTAMP, FLOAT_SCALAR } from '../utils/config.js';
 import { convertQuantity, convertPrice } from '../utils/conversion.js';
 import * as marginManagerMoveCalls from '../contracts/deepbook_margin/margin_manager.js';
+import * as marginManagerUpgradedMoveCalls from '../contracts/deepbook_margin/margin_manager_upgraded.js';
 import * as tpslMoveCalls from '../contracts/deepbook_margin/tpsl.js';
 
 /**
@@ -27,6 +28,15 @@ export class MarginTPSLContract {
 		this.#config = config;
 	}
 
+	/**
+	 * Oracle-taking entrypoints live in the parallel `_upgraded` module, which takes Pyth's
+	 * upgraded-Core `PriceInfoObject`. Entrypoints with no oracle argument stay on the base
+	 * module, which is the only place they exist.
+	 */
+	get #oracleCalls() {
+		return marginManagerUpgradedMoveCalls;
+	}
+
 	// === Helper Functions ===
 
 	/**
@@ -153,13 +163,13 @@ export class MarginTPSLContract {
 			: this.newPendingMarketOrder(manager.poolKey, pendingOrder as PendingMarketOrderParams)(tx);
 
 		tx.add(
-			marginManagerMoveCalls.addConditionalOrder({
+			this.#oracleCalls.addConditionalOrder({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					self: manager.address,
 					pool: pool.address,
-					basePriceInfoObject: baseCoin.priceInfoObjectId!,
-					quotePriceInfoObject: quoteCoin.priceInfoObjectId!,
+					basePriceInfoObject: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quotePriceInfoObject: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					conditionalOrderId: BigInt(conditionalOrderId),
 					condition,
@@ -229,15 +239,15 @@ export class MarginTPSLContract {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			return tx.add(
-				marginManagerMoveCalls.executeConditionalOrdersV2({
+				this.#oracleCalls.executeConditionalOrdersV2({
 					package: this.#config.MARGIN_PACKAGE_ID,
 					arguments: {
 						self: managerAddress,
 						pool: pool.address,
 						baseMarginPool: baseMarginPool.address,
 						quoteMarginPool: quoteMarginPool.address,
-						basePriceInfoObject: baseCoin.priceInfoObjectId!,
-						quotePriceInfoObject: quoteCoin.priceInfoObjectId!,
+						basePriceInfoObject: this.#config.getPriceInfoObjectId(pool.baseCoin),
+						quotePriceInfoObject: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 						registry: this.#config.MARGIN_REGISTRY_ID,
 						maxOrdersToExecute,
 					},
@@ -271,15 +281,15 @@ export class MarginTPSLContract {
 			const baseMarginPool = this.#config.getMarginPool(pool.baseCoin);
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			return tx.add(
-				marginManagerMoveCalls.executeConditionalOrdersV3({
+				this.#oracleCalls.executeConditionalOrdersV3({
 					package: this.#config.MARGIN_PACKAGE_ID,
 					arguments: {
 						self: managerAddress,
 						pool: pool.address,
 						baseMarginPool: baseMarginPool.address,
 						quoteMarginPool: quoteMarginPool.address,
-						basePriceInfoObject: baseCoin.priceInfoObjectId!,
-						quotePriceInfoObject: quoteCoin.priceInfoObjectId!,
+						basePriceInfoObject: this.#config.getPriceInfoObjectId(pool.baseCoin),
+						quotePriceInfoObject: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 						registry: this.#config.MARGIN_REGISTRY_ID,
 						maxOrdersToExecute,
 					},

package/src/transactions/poolProxy.ts

@@ -12,6 +12,7 @@ import { OrderType, SelfMatchingOptions } from '../types/index.js';
 import { MAX_TIMESTAMP, FLOAT_SCALAR } from '../utils/config.js';
 import { convertQuantity, convertPrice, convertRate } from '../utils/conversion.js';
 import * as poolProxyMoveCalls from '../contracts/deepbook_margin/pool_proxy.js';
+import * as poolProxyUpgradedMoveCalls from '../contracts/deepbook_margin/pool_proxy_upgraded.js';
 
 /**
  * PoolProxyContract class for managing PoolProxy operations.
@@ -26,6 +27,15 @@ export class PoolProxyContract {
 		this.#config = config;
 	}
 
+	/**
+	 * Oracle-taking entrypoints live in the parallel `_upgraded` module, which takes Pyth's
+	 * upgraded-Core `PriceInfoObject`. Entrypoints with no oracle argument stay on the base
+	 * module, which is the only place they exist.
+	 */
+	get #oracleCalls() {
+		return poolProxyUpgradedMoveCalls;
+	}
+
 	/**
 	 * @description Place a limit order. Enforces a post-trade `risk_ratio >=
 	 * min_borrow_risk_ratio` invariant on the manager (skipped when the manager
@@ -55,7 +65,7 @@ export class PoolProxyContract {
 		const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 		const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 		return tx.add(
-			poolProxyMoveCalls.placeLimitOrderV2({
+			this.#oracleCalls.placeLimitOrderV2({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					registry: this.#config.MARGIN_REGISTRY_ID,
@@ -63,8 +73,8 @@ export class PoolProxyContract {
 					pool: pool.address,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					clientOrderId: BigInt(clientOrderId),
 					orderType,
 					selfMatchingOption,
@@ -104,7 +114,7 @@ export class PoolProxyContract {
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 		return tx.add(
-			poolProxyMoveCalls.placeMarketOrderV2({
+			this.#oracleCalls.placeMarketOrderV2({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					registry: this.#config.MARGIN_REGISTRY_ID,
@@ -112,8 +122,8 @@ export class PoolProxyContract {
 					pool: pool.address,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					clientOrderId: BigInt(clientOrderId),
 					selfMatchingOption,
 					quantity: inputQuantity,
@@ -155,7 +165,7 @@ export class PoolProxyContract {
 		const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 		const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 		return tx.add(
-			poolProxyMoveCalls.placeReduceOnlyLimitOrderV2({
+			this.#oracleCalls.placeReduceOnlyLimitOrderV2({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					registry: this.#config.MARGIN_REGISTRY_ID,
@@ -163,8 +173,8 @@ export class PoolProxyContract {
 					pool: pool.address,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					clientOrderId: BigInt(clientOrderId),
 					orderType,
 					selfMatchingOption,
@@ -205,7 +215,7 @@ export class PoolProxyContract {
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 		return tx.add(
-			poolProxyMoveCalls.placeReduceOnlyMarketOrderV2({
+			this.#oracleCalls.placeReduceOnlyMarketOrderV2({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					registry: this.#config.MARGIN_REGISTRY_ID,
@@ -213,8 +223,8 @@ export class PoolProxyContract {
 					pool: pool.address,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					clientOrderId: BigInt(clientOrderId),
 					selfMatchingOption,
 					quantity: inputQuantity,
@@ -255,7 +265,7 @@ export class PoolProxyContract {
 		const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 		const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 		return tx.add(
-			poolProxyMoveCalls.placeMarketOrderAndRepayLoan({
+			this.#oracleCalls.placeMarketOrderAndRepayLoan({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					registry: this.#config.MARGIN_REGISTRY_ID,
@@ -263,8 +273,8 @@ export class PoolProxyContract {
 					pool: pool.address,
 					baseMarginPool: baseMarginPool.address,
 					quoteMarginPool: quoteMarginPool.address,
-					baseOracle: baseCoin.priceInfoObjectId!,
-					quoteOracle: quoteCoin.priceInfoObjectId!,
+					baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 					clientOrderId: BigInt(clientOrderId),
 					selfMatchingOption,
 					quantity: inputQuantity,
@@ -308,7 +318,7 @@ export class PoolProxyContract {
 			const inputPrice = convertPrice(price, FLOAT_SCALAR, quoteCoin.scalar, baseCoin.scalar);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 			return tx.add(
-				poolProxyMoveCalls.placeReduceOnlyLimitOrderAndRepayLoan({
+				this.#oracleCalls.placeReduceOnlyLimitOrderAndRepayLoan({
 					package: this.#config.MARGIN_PACKAGE_ID,
 					arguments: {
 						registry: this.#config.MARGIN_REGISTRY_ID,
@@ -316,8 +326,8 @@ export class PoolProxyContract {
 						pool: pool.address,
 						baseMarginPool: baseMarginPool.address,
 						quoteMarginPool: quoteMarginPool.address,
-						baseOracle: baseCoin.priceInfoObjectId!,
-						quoteOracle: quoteCoin.priceInfoObjectId!,
+						baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+						quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 						clientOrderId: BigInt(clientOrderId),
 						orderType,
 						selfMatchingOption,
@@ -360,7 +370,7 @@ export class PoolProxyContract {
 			const quoteMarginPool = this.#config.getMarginPool(pool.quoteCoin);
 			const inputQuantity = convertQuantity(quantity, baseCoin.scalar);
 			return tx.add(
-				poolProxyMoveCalls.placeReduceOnlyMarketOrderAndRepayLoan({
+				this.#oracleCalls.placeReduceOnlyMarketOrderAndRepayLoan({
 					package: this.#config.MARGIN_PACKAGE_ID,
 					arguments: {
 						registry: this.#config.MARGIN_REGISTRY_ID,
@@ -368,8 +378,8 @@ export class PoolProxyContract {
 						pool: pool.address,
 						baseMarginPool: baseMarginPool.address,
 						quoteMarginPool: quoteMarginPool.address,
-						baseOracle: baseCoin.priceInfoObjectId!,
-						quoteOracle: quoteCoin.priceInfoObjectId!,
+						baseOracle: this.#config.getPriceInfoObjectId(pool.baseCoin),
+						quoteOracle: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 						clientOrderId: BigInt(clientOrderId),
 						selfMatchingOption,
 						quantity: inputQuantity,
@@ -670,20 +680,14 @@ export class PoolProxyContract {
 		const pool = this.#config.getPool(poolKey);
 		const baseCoin = this.#config.getCoin(pool.baseCoin);
 		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
-		if (!baseCoin.priceInfoObjectId) {
-			throw new Error(`Missing priceInfoObjectId for ${pool.baseCoin}`);
-		}
-		if (!quoteCoin.priceInfoObjectId) {
-			throw new Error(`Missing priceInfoObjectId for ${pool.quoteCoin}`);
-		}
 		tx.add(
-			poolProxyMoveCalls.updateCurrentPrice({
+			this.#oracleCalls.updateCurrentPrice({
 				package: this.#config.MARGIN_PACKAGE_ID,
 				arguments: {
 					registry: this.#config.MARGIN_REGISTRY_ID,
 					pool: pool.address,
-					basePriceInfoObject: baseCoin.priceInfoObjectId,
-					quotePriceInfoObject: quoteCoin.priceInfoObjectId,
+					basePriceInfoObject: this.#config.getPriceInfoObjectId(pool.baseCoin),
+					quotePriceInfoObject: this.#config.getPriceInfoObjectId(pool.quoteCoin),
 				},
 				typeArguments: [baseCoin.type, quoteCoin.type],
 			}),

package/src/types/index.ts

@@ -25,6 +25,22 @@ export interface Coin {
 	priceInfoObjectId?: string;
 }
 
+/** State objects identifying the Pyth deployment margin prices against. */
+export interface PythConfig {
+	pythStateId: string;
+	wormholeStateId: string;
+	/** Hermes endpoint serving update data for this deployment. */
+	hermesEndpoint?: string;
+	/**
+	 * Bearer token for the Hermes endpoint. The one serving Pyth's upgraded Core answers
+	 * 401 without it, so pushing price updates needs this set.
+	 *
+	 * Prefer the client-level `pythAccessToken` option, which sets this without having to
+	 * restate the state object ids. Supply the token at runtime — do not commit it.
+	 */
+	accessToken?: string;
+}
+
 export interface Pool {
 	address: string;
 	baseCoin: string;
@@ -287,8 +303,7 @@ export interface PoolBookParams {
 	minSize: number;
 }
 export type PoolDeepPrice =
-	| { asset_is_base: true; deep_per_base: number }
-	| { asset_is_base: false; deep_per_quote: number };
+	{ asset_is_base: true; deep_per_base: number } | { asset_is_base: false; deep_per_quote: number };
 
 // Quantity calculations
 export interface QuoteQuantityOut {

package/src/utils/config.ts

@@ -4,7 +4,14 @@ import type { SuiClientTypes } from '@mysten/sui/client';
 import { normalizeSuiAddress } from '@mysten/sui/utils';
 
 import { BalanceManagerContract } from '../transactions/balanceManager.js';
-import type { BalanceManager, MarginManager, Coin, Pool, MarginPool } from '../types/index.js';
+import type {
+	BalanceManager,
+	MarginManager,
+	Coin,
+	Pool,
+	MarginPool,
+	PythConfig,
+} from '../types/index.js';
 import type { CoinMap, PoolMap, MarginPoolMap, DeepbookPackageIds } from './constants.js';
 import { ResourceNotFoundError, ConfigurationError, ErrorMessages } from './errors.js';
 import {
@@ -40,10 +47,7 @@ export class DeepBookConfig {
 	balanceManagers: { [key: string]: BalanceManager };
 	marginManagers: { [key: string]: MarginManager };
 	address: string;
-	pyth: {
-		pythStateId: string;
-		wormholeStateId: string;
-	};
+	pyth: PythConfig;
 
 	DEEPBOOK_PACKAGE_ID: string;
 	REGISTRY_ID: string;
@@ -71,6 +75,7 @@ export class DeepBookConfig {
 		marginPools,
 		packageIds,
 		pyth,
+		pythAccessToken,
 	}: {
 		network: SuiClientTypes.Network;
 		address: string;
@@ -83,7 +88,16 @@ export class DeepBookConfig {
 		pools?: PoolMap;
 		marginPools?: MarginPoolMap;
 		packageIds?: DeepbookPackageIds;
-		pyth?: { pythStateId: string; wormholeStateId: string };
+		pyth?: PythConfig;
+		/**
+		 * Bearer token for the Hermes serving Pyth's upgraded Core, which answers 401
+		 * without one. Set this rather than `pyth` when the built-in state objects are
+		 * correct and only the credential is missing — `pyth` replaces the whole config,
+		 * so setting a token through it means restating the state object ids.
+		 *
+		 * Applied after `pyth`, so if both carry a token this one wins.
+		 */
+		pythAccessToken?: string;
 	}) {
 		this.network = network;
 		this.address = normalizeSuiAddress(address);
@@ -116,7 +130,7 @@ export class DeepBookConfig {
 			this.MARGIN_V1 = mainnetPackageIds.MARGIN_V1;
 			this.MARGIN_REGISTRY_ID = mainnetPackageIds.MARGIN_REGISTRY_ID;
 			this.LIQUIDATION_PACKAGE_ID = mainnetPackageIds.LIQUIDATION_PACKAGE_ID;
-			this.pyth = mainnetPythConfigs;
+			this.pyth = pyth || mainnetPythConfigs;
 		} else if (network === 'testnet') {
 			this.#coins = coins || testnetCoins;
 			this.#pools = pools || testnetPools;
@@ -128,24 +142,70 @@ export class DeepBookConfig {
 			this.MARGIN_V1 = testnetPackageIds.MARGIN_V1;
 			this.MARGIN_REGISTRY_ID = testnetPackageIds.MARGIN_REGISTRY_ID;
 			this.LIQUIDATION_PACKAGE_ID = testnetPackageIds.LIQUIDATION_PACKAGE_ID;
-			this.pyth = testnetPythConfigs;
+			this.pyth = pyth || testnetPythConfigs;
 		} else {
 			throw new Error(
 				`Network '${network}' is not supported by default. Provide custom 'packageIds' for non-standard networks.`,
 			);
 		}
 
+		// Applied after the branches so a token composes with the built-in state objects
+		// instead of forcing the caller to restate them.
+		// Empty is treated as absent rather than as a credential: `PYTH_TOKEN=` exported
+		// blank is the common way this arrives, and a blank bearer header 401s with a
+		// worse message than the configuration error.
+		if (pythAccessToken) {
+			this.pyth = { ...this.pyth, accessToken: pythAccessToken };
+		}
+
 		this.balanceManager = new BalanceManagerContract(this);
 	}
 
 	requirePyth() {
-		if (!this.pyth.pythStateId || !this.pyth.wormholeStateId) {
+		const { pythStateId, wormholeStateId } = this.pyth;
+		if (!pythStateId || !wormholeStateId) {
 			throw new ConfigurationError(
 				"Pyth configuration is required for price feed operations. Provide 'pyth' when using custom packageIds.",
 			);
 		}
 	}
 
+	/**
+	 * The Pyth feed id for a coin under the active deployment.
+	 *
+	 * Pairs with {@link getPriceInfoObjectId}: Hermes is queried by feed id and the Move
+	 * call takes the object, so the two must come from the same deployment or the update
+	 * lands on an object the on-chain feed-id check then rejects.
+	 */
+	getFeedId(coinKey: string): string {
+		const { feed } = this.getCoin(coinKey);
+
+		if (!feed) {
+			throw new ConfigurationError(`Coin '${coinKey}' has no Pyth feed id configured.`);
+		}
+
+		return feed;
+	}
+
+	/**
+	 * The `PriceInfoObject` id for a coin on Pyth's upgraded Core.
+	 *
+	 * Throws rather than passing `undefined` into a move call: a feed may simply have no
+	 * object on the upgraded deployment yet, and the resulting on-chain abort
+	 * (`EPriceFeedIdMismatch`) does not say which coin was at fault.
+	 */
+	getPriceInfoObjectId(coinKey: string): string {
+		const { priceInfoObjectId } = this.getCoin(coinKey);
+
+		if (!priceInfoObjectId) {
+			throw new ConfigurationError(
+				`Coin '${coinKey}' has no priceInfoObjectId. Pyth's upgraded Core has no price feed object for it on ${this.network}, or the id is missing from your coin config.`,
+			);
+		}
+
+		return priceInfoObjectId;
+	}
+
 	// Getters
 	getCoin(key: string): Coin {
 		const coin = this.#coins[key];