@drift-labs/sdk 2.162.0-beta.2 → 2.163.0-beta.9

package/src/constants/spotMarkets.ts

@@ -36,125 +36,30 @@ export const WRAPPED_SOL_MINT = new PublicKey(
 	'So11111111111111111111111111111111111111112'
 );
 
+// Reflects what is actually deployed on devnet (per on-chain enumeration of
+// State.numberOfSpotMarkets). Update when devnet adds/changes a spot market.
 export const DevnetSpotMarkets: SpotMarketConfig[] = [
 	{
-		symbol: 'USDC',
+		symbol: 'dUSDT',
 		marketIndex: 0,
 		poolId: 0,
-		oracle: new PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
+		oracle: new PublicKey('Gkiwe1rmbnAMCAiBiaQWhqfDtb1tAefuQY8uJp2siVs'),
 		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
-		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
+		mint: new PublicKey('8FfvSRKMZRDHrCBy142XMUXrKEkXnxDQ4YmJv7xbAw8Q'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
-		pythFeedId:
-			'0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-		pythLazerId: 7,
 	},
 	{
 		symbol: 'SOL',
 		marketIndex: 1,
 		poolId: 0,
-		oracle: new PublicKey('3m6i4RFWEDw2Ft4tFHPJtYgmpPe21k56M3FHeWYrgGBz'),
+		oracle: new PublicKey('57ZE6W8mGWPQokUHjyfTAexvVLK8xuMbWn9HGg6fG7oW'),
 		oracleSource: OracleSource.PYTH_LAZER,
-		mint: new PublicKey(WRAPPED_SOL_MINT),
+		mint: WRAPPED_SOL_MINT,
 		precision: LAMPORTS_PRECISION,
 		precisionExp: LAMPORTS_EXP,
-		serumMarket: new PublicKey('8N37SsnTu8RYxtjrV9SStjkkwVhmU8aCWhLvwduAPEKW'),
-		phoenixMarket: new PublicKey(
-			'78ehDnHgbkFxqXZwdFxa8HK7saX58GymeX2wNGdkqYLp'
-		),
-		pythFeedId:
-			'0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
 		pythLazerId: 6,
 	},
-	{
-		symbol: 'BTC',
-		marketIndex: 2,
-		poolId: 0,
-		oracle: new PublicKey('486kr3pmFPfTsS4aZgcsQ7kS4i9rjMsYYZup6HQNSTT4'),
-		oracleSource: OracleSource.PYTH_PULL,
-		mint: new PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
-		precision: new BN(10).pow(SIX),
-		precisionExp: SIX,
-		serumMarket: new PublicKey('AGsmbVu3MS9u68GEYABWosQQCZwmLcBHu4pWEuBYH7Za'),
-		pythFeedId:
-			'0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
-		pythLazerId: 1,
-	},
-	{
-		symbol: 'PYUSD',
-		marketIndex: 3,
-		poolId: 0,
-		oracle: new PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
-		oracleSource: OracleSource.PYTH_PULL,
-		mint: new PublicKey('GLfF72ZCUnS6N9iDJw8kedHzd6WFVf3VbpwdKKy76FRk'),
-		precision: new BN(10).pow(SIX),
-		precisionExp: SIX,
-		pythFeedId:
-			'0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692',
-	},
-	{
-		symbol: 'Bonk',
-		marketIndex: 4,
-		poolId: 0,
-		oracle: new PublicKey('GojbSnJuPdKDT1ZuHuAM5t9oz6bxTo1xhUKpTua2F72p'),
-		oracleSource: OracleSource.PYTH_PULL,
-		mint: new PublicKey('7SekVZDmKCCDgTP8m6Hk4CfexFSru9RkwDCczmcwcsP6'),
-		precision: new BN(10).pow(FIVE),
-		precisionExp: FIVE,
-		pythFeedId:
-			'0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419',
-		pythLazerId: 9,
-	},
-	{
-		symbol: 'JLP',
-		marketIndex: 5,
-		poolId: 1,
-		oracle: new PublicKey('5Mb11e5rt1Sp6A286B145E4TmgMzsM2UX9nCF2vas5bs'),
-		oracleSource: OracleSource.PYTH_PULL,
-		mint: new PublicKey('HGe9FejFyhWSx6zdvx2RjynX7rmoEXFiJiLU437NXemZ'),
-		precision: new BN(10).pow(SIX),
-		precisionExp: SIX,
-		pythFeedId:
-			'0xc811abc82b4bad1f9bd711a2773ccaa935b03ecef974236942cec5e0eb845a3a',
-	},
-	{
-		symbol: 'USDC',
-		marketIndex: 6,
-		poolId: 1,
-		oracle: new PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
-		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
-		precision: new BN(10).pow(SIX),
-		precisionExp: SIX,
-		pythFeedId:
-			'0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
-		pythLazerId: 7,
-	},
-	{
-		symbol: 'GLXY',
-		marketIndex: 7,
-		poolId: 2,
-		oracle: new PublicKey('4wFrjUQHzRBc6qjVtMDbt28aEVgn6GaNiWR6vEff4KxR'),
-		oracleSource: OracleSource.Prelaunch,
-		mint: new PublicKey('2vVfXmcWXEaFzp7iaTVnQ4y1gR41S6tJQQMo1S5asJyC'),
-		precision: new BN(10).pow(SIX),
-		precisionExp: SIX,
-		pythFeedId:
-			'0x67e031d1723e5c89e4a826d80b2f3b41a91b05ef6122d523b8829a02e0f563aa',
-	},
-	{
-		symbol: 'GLXY',
-		marketIndex: 8,
-		poolId: 2,
-		oracle: new PublicKey('4wFrjUQHzRBc6qjVtMDbt28aEVgn6GaNiWR6vEff4KxR'),
-		oracleSource: OracleSource.Prelaunch,
-		mint: new PublicKey('2vVfXmcWXEaFzp7iaTVnQ4y1gR41S6tJQQMo1S5asJyC'),
-		precision: new BN(10).pow(SIX),
-		precisionExp: SIX,
-		pythFeedId:
-			'0x67e031d1723e5c89e4a826d80b2f3b41a91b05ef6122d523b8829a02e0f563aa',
-	},
 ];
 
 export const MainnetSpotMarkets: SpotMarketConfig[] = [

package/src/constituentMap/constituentMap.ts

@@ -119,10 +119,9 @@ export class ConstituentMap implements ConstituentMapInterface {
 	}
 
 	private decode(name: string, buffer: Buffer): ConstituentAccount {
-		return this.driftClient.program.account.constituent.coder.accounts.decodeUnchecked(
-			name,
-			buffer
-		);
+		return (
+			this.driftClient.program.account as any
+		).constituent.coder.accounts.decodeUnchecked(name, buffer);
 	}
 
 	public async sync(): Promise<void> {
@@ -170,11 +169,11 @@ export class ConstituentMap implements ConstituentMapInterface {
 
 					if (currAccountWithSlot) {
 						if (slot >= currAccountWithSlot.slot) {
-							const constituentAcc = this.decode('Constituent', buffer);
+							const constituentAcc = this.decode('constituent', buffer);
 							this.updateConstituentAccount(key, constituentAcc, slot);
 						}
 					} else {
-						const constituentAcc = this.decode('Constituent', buffer);
+						const constituentAcc = this.decode('constituent', buffer);
 						this.updateConstituentAccount(key, constituentAcc, slot);
 					}
 				}

package/src/constituentMap/pollingConstituentAccountSubscriber.ts

@@ -3,7 +3,7 @@ import {
 	ConstituentAccountEvents,
 	ConstituentAccountSubscriber,
 } from '../accounts/types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, MemcmpFilter } from '@solana/web3.js';
@@ -13,7 +13,7 @@ export class PollingConstituentAccountSubscriber
 	implements ConstituentAccountSubscriber
 {
 	isSubscribed: boolean;
-	program: Program;
+	program: DriftProgram;
 	frequency: number;
 	commitment?: Commitment;
 	additionalFilters?: MemcmpFilter[];
@@ -24,7 +24,7 @@ export class PollingConstituentAccountSubscriber
 
 	public constructor(
 		constituentMap: ConstituentMap,
-		program: Program,
+		program: DriftProgram,
 		frequency: number,
 		commitment?: Commitment,
 		additionalFilters?: MemcmpFilter[]

package/src/constituentMap/webSocketConstituentAccountSubscriber.ts

@@ -3,7 +3,7 @@ import {
 	ConstituentAccountEvents,
 	ConstituentAccountSubscriber,
 } from '../accounts/types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
@@ -18,7 +18,7 @@ export class WebSocketConstituentAccountSubscriber
 	isSubscribed: boolean;
 	resubTimeoutMs?: number;
 	commitment?: Commitment;
-	program: Program;
+	program: DriftProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, ConstituentAccountEvents>;
 
 	constituentDataAccountSubscriber: WebSocketProgramAccountSubscriber<ConstituentAccount>;
@@ -27,7 +27,7 @@ export class WebSocketConstituentAccountSubscriber
 
 	public constructor(
 		constituentMap: ConstituentMap,
-		program: Program,
+		program: DriftProgram,
 		resubTimeoutMs?: number,
 		commitment?: Commitment,
 		additionalFilters?: MemcmpFilter[]
@@ -48,10 +48,10 @@ export class WebSocketConstituentAccountSubscriber
 		this.constituentDataAccountSubscriber =
 			new WebSocketProgramAccountSubscriber<ConstituentAccount>(
 				'LpPoolConstituent',
-				'Constituent',
+				'constituent',
 				this.program,
-				this.program.account.constituent.coder.accounts.decode.bind(
-					this.program.account.constituent.coder.accounts
+				(this.program.account as any).constituent.coder.accounts.decode.bind(
+					(this.program.account as any).constituent.coder.accounts
 				),
 				{
 					filters: [getConstituentFilter(), ...(this.additionalFilters || [])],

package/src/decode/customCoder.ts

@@ -1,21 +1,16 @@
 import { Buffer } from 'buffer';
-import camelcase from 'camelcase';
-import { Idl, IdlTypeDef } from '@coral-xyz/anchor/dist/cjs/idl';
 import {
-	AccountsCoder,
+	Idl,
 	BorshAccountsCoder,
 	BorshEventCoder,
 	BorshInstructionCoder,
-	Coder,
-} from '@coral-xyz/anchor/dist/cjs/coder';
-import { BorshTypesCoder } from '@coral-xyz/anchor/dist/cjs/coder/borsh/types';
-import { discriminator } from '@coral-xyz/anchor/dist/cjs/coder/borsh/discriminator';
+	BorshCoder,
+} from '@coral-xyz/anchor';
 
 export class CustomBorshCoder<
 	A extends string = string,
-	T extends string = string,
-> implements Coder
-{
+	_T extends string = string,
+> {
 	readonly idl: Idl;
 
 	/**
@@ -36,13 +31,14 @@ export class CustomBorshCoder<
 	/**
 	 * Coder for user-defined types.
 	 */
-	readonly types: BorshTypesCoder<T>;
+	readonly types: any;
 
 	constructor(idl: Idl) {
-		this.instruction = new BorshInstructionCoder(idl);
+		const baseCoder = new BorshCoder(idl);
+		this.instruction = baseCoder.instruction as BorshInstructionCoder;
 		this.accounts = new CustomBorshAccountsCoder(idl);
-		this.events = new BorshEventCoder(idl);
-		this.types = new BorshTypesCoder(idl);
+		this.events = baseCoder.events as BorshEventCoder;
+		this.types = baseCoder.types;
 		this.idl = idl;
 	}
 }
@@ -50,9 +46,7 @@ export class CustomBorshCoder<
 /**
  * Custom accounts coder that wraps BorshAccountsCoder to fix encode buffer sizing.
  */
-export class CustomBorshAccountsCoder<A extends string = string>
-	implements AccountsCoder
-{
+export class CustomBorshAccountsCoder<A extends string = string> {
 	private baseCoder: BorshAccountsCoder<A>;
 	private idl: Idl;
 
@@ -62,19 +56,17 @@ export class CustomBorshAccountsCoder<A extends string = string>
 	}
 
 	public async encode<T = any>(accountName: A, account: T): Promise<Buffer> {
-		const idlAcc = this.idl.accounts?.find((acc) => acc.name === accountName);
-		if (!idlAcc) {
-			throw new Error(`Unknown account not found in idl: ${accountName}`);
-		}
-
-		const buffer = Buffer.alloc(this.size(idlAcc)); // fix encode issue - use proper size instead of fixed 1000
-		const layout = this.baseCoder['accountLayouts'].get(accountName);
+		const layout = (this.baseCoder as any)['accountLayouts'].get(accountName);
 		if (!layout) {
 			throw new Error(`Unknown account: ${accountName}`);
 		}
-		const len = layout.encode(account, buffer);
+
+		// Fix: compute proper buffer size instead of the hardcoded 1000 bytes
+		const size = this.baseCoder.size(accountName);
+		const buffer = Buffer.alloc(Math.max(size, 1000));
+		const len = layout.layout.encode(account, buffer);
 		const accountData = buffer.slice(0, len);
-		const discriminator = BorshAccountsCoder.accountDiscriminator(accountName);
+		const discriminator = Buffer.from(layout.discriminator);
 		return Buffer.concat([discriminator, accountData]);
 	}
 
@@ -95,20 +87,19 @@ export class CustomBorshAccountsCoder<A extends string = string>
 		return this.baseCoder.memcmp(accountName, appendData);
 	}
 
-	public size(idlAccount: IdlTypeDef): number {
-		return this.baseCoder.size(idlAccount);
+	public size(accountName: A | string): number {
+		return this.baseCoder.size(accountName as A);
 	}
 
 	/**
 	 * Calculates and returns a unique 8 byte discriminator prepended to all anchor accounts.
 	 *
-	 * @param name The name of the account to calculate the discriminator.
+	 * @param name The name of the account to get the discriminator of.
 	 */
-	public static accountDiscriminator(name: string): Buffer {
-		const discriminatorPreimage = `account:${camelcase(name, {
-			pascalCase: true,
-			preserveConsecutiveUppercase: true,
-		})}`;
-		return discriminator(discriminatorPreimage);
+	public static accountDiscriminator(_name: string): Buffer {
+		// Delegate to an instance method since anchor 0.32 uses IDL discriminators
+		throw new Error(
+			'accountDiscriminator requires an instance; use coder.accountDiscriminator(name)'
+		);
 	}
 }

package/src/decode/user.ts

@@ -1,6 +1,5 @@
 import { BN } from '@coral-xyz/anchor';
 import {
-	MarginMode,
 	MarketType,
 	Order,
 	OrderStatus,
@@ -84,7 +83,7 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		const baseAssetAmount = readSignedBigInt64LE(buffer, offset + 8);
 		const quoteAssetAmount = readSignedBigInt64LE(buffer, offset + 16);
 		const lpShares = readUnsignedBigInt64LE(buffer, offset + 64);
-		const isolatedPositionScaledBalance = readSignedBigInt64LE(
+		const isolatedPositionScaledBalance = readUnsignedBigInt64LE(
 			buffer,
 			offset + 72
 		);
@@ -121,12 +120,11 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		offset += 24;
 		const lastQuoteAssetAmountPerLp = readSignedBigInt64LE(buffer, offset);
 		offset += 8;
-		const maxMarginRatio = buffer.readUInt16LE(offset);
-		offset += 4;
-		const marketIndex = buffer.readUInt16LE(offset);
-		offset += 3;
-		const perLpBase = buffer.readUInt8(offset);
-		offset += 1;
+		offset += 2; // skip padding[u8; 2]
+		const maxMarginRatio = buffer.readUInt16LE(offset); // offset+90
+		offset += 2;
+		const marketIndex = buffer.readUInt16LE(offset); // offset+92
+		offset += 4; // advance past marketIndex(2) + openOrders(1) + positionFlag(1)
 		perpPositions.push({
 			lastCumulativeFundingRate,
 			baseAssetAmount,
@@ -141,7 +139,6 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			lastQuoteAssetAmountPerLp,
 			marketIndex,
 			openOrders,
-			perLpBase,
 			maxMarginRatio,
 			positionFlag,
 			isolatedPositionScaledBalance,
@@ -344,21 +341,7 @@ export function decodeUser(buffer: Buffer): UserAccount {
 	const hasOpenAuction = buffer.readUInt8(offset) === 1;
 	offset += 1;
 
-	let marginMode: MarginMode;
-	const marginModeNum = buffer.readUInt8(offset);
-	if (marginModeNum === 0) {
-		marginMode = MarginMode.DEFAULT;
-	} else if (marginModeNum === 1) {
-		marginMode = MarginMode.HIGH_LEVERAGE;
-	} else if (marginModeNum === 2) {
-		marginMode = MarginMode.HIGH_LEVERAGE_MAINTENANCE;
-	} else {
-		console.error(
-			`Detected unknown margin mode: ${marginModeNum}. Please update @drift-labs/sdk for latest IDL.`
-		);
-		marginMode = MarginMode.DEFAULT;
-	}
-	offset += 1;
+	offset += 1; // marginMode (removed)
 
 	const poolId = buffer.readUint8(offset);
 	offset += 1;
@@ -393,7 +376,6 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		hasOpenOrder,
 		openAuctions,
 		hasOpenAuction,
-		marginMode,
 		poolId,
 		lastFuelBonusUpdateTs,
 	};

package/src/dlob/DLOB.ts

@@ -1,3 +1,15 @@
+/**
+ * DLOB — Decentralized Limit Order Book.
+ *
+ * Maintains an in-memory order book built from on-chain `User` accounts.
+ * Used by keeper bots to identify the best maker orders to match against taker fills.
+ *
+ * Key types:
+ *   {@link DLOBNode}        — a single order node with price/size/user info (DLOBNode.ts)
+ *   {@link DLOBSubscriber}  — subscribes to on-chain accounts and keeps the DLOB live (DLOBSubscriber.ts)
+ *   {@link NodeList}        — sorted linked list of DLOBNodes per side/market (NodeList.ts)
+ *   `orderBookLevels.ts`    — aggregated L2/L3 book level construction for quoting
+ */
 import { getOrderSignature, NodeList } from './NodeList';
 import { BN } from '@coral-xyz/anchor';
 import {

package/src/dlob/orderBookLevels.ts

@@ -213,7 +213,6 @@ export function getVammL2Generator({
 		updatedAmm,
 		mmOraclePriceData,
 		now,
-		isVariant(marketAccount.contractType, 'prediction'),
 		latestSlot
 	);