@drift-labs/sdk-browser 2.163.0-beta.11 → 2.163.0-beta.13

package/src/config.ts

@@ -13,7 +13,7 @@ import {
 	MainnetSpotMarkets,
 } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
-import { Program, ProgramAccount } from '@coral-xyz/anchor';
+import { Program, ProgramAccount } from './isomorphic/anchor';
 import { getOracleId } from './oracles/oracleId';
 import { Drift } from './idl/drift';
 

package/src/constants/numericConstants.ts

@@ -1,5 +1,5 @@
 import { LAMPORTS_PER_SOL } from '@solana/web3.js';
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 import { BigNum } from '../factory/bigNum';
 
 export const ZERO = new BN(0);

package/src/constants/perpMarkets.ts

@@ -25,7 +25,7 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'SOL-PERP',
 		baseAssetSymbol: 'SOL',
 		marketIndex: 0,
-		oracle: new PublicKey('57ZE6W8mGWPQokUHjyfTAexvVLK8xuMbWn9HGg6fG7oW'),
+		oracle: new PublicKey('2k3UHX6ehRFzx5fTVvbL6FwXhMjkucjJDL9MuVKLo8TV'),
 		launchTs: 1655751353000,
 		oracleSource: OracleSource.PYTH_LAZER,
 		pythLazerId: 6,

package/src/constants/spotMarkets.ts

@@ -10,7 +10,7 @@ import {
 	FIVE,
 } from './numericConstants';
 import { OracleSource } from '../types';
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 import { DriftEnv } from '../config';
 import { MarketStatus } from '@ellipsis-labs/phoenix-sdk';
 
@@ -43,17 +43,18 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'dUSDT',
 		marketIndex: 0,
 		poolId: 0,
-		oracle: new PublicKey('Gkiwe1rmbnAMCAiBiaQWhqfDtb1tAefuQY8uJp2siVs'),
+		oracle: new PublicKey('Dai8hT1YRBBm5rBSJUSKcdR11psM55LVAkshbypfC4k4'),
 		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
 		mint: new PublicKey('8FfvSRKMZRDHrCBy142XMUXrKEkXnxDQ4YmJv7xbAw8Q'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
+		pythLazerId: 8,
 	},
 	{
 		symbol: 'SOL',
 		marketIndex: 1,
 		poolId: 0,
-		oracle: new PublicKey('57ZE6W8mGWPQokUHjyfTAexvVLK8xuMbWn9HGg6fG7oW'),
+		oracle: new PublicKey('2k3UHX6ehRFzx5fTVvbL6FwXhMjkucjJDL9MuVKLo8TV'),
 		oracleSource: OracleSource.PYTH_LAZER,
 		mint: WRAPPED_SOL_MINT,
 		precision: LAMPORTS_PRECISION,

package/src/core/DriftCore.ts

@@ -0,0 +1,326 @@
+import type {
+	AccountMeta,
+	Connection,
+	PublicKey,
+	TransactionInstruction,
+} from '@solana/web3.js';
+
+import * as pdas from '../addresses/pda';
+import * as constants from '../constants';
+import { decodeUser } from '../decode/user';
+import { CustomBorshCoder } from '../decode/customCoder';
+import driftIDL from '../idl/drift.json';
+import type { Drift } from '../idl/drift';
+import type { UserAccount } from '../types';
+import type { DriftProgram } from '../config';
+import { fetchAccount } from '../accounts/fetch';
+import type { BN } from '@coral-xyz/anchor';
+import { buildDepositInstruction } from './instructions/deposit';
+import { buildWithdrawInstruction } from './instructions/withdraw';
+import {
+	buildCancelOrdersInstruction,
+	buildPlaceOrdersInstruction,
+} from './instructions/orders';
+import { buildFillPerpOrderInstruction } from './instructions/fill';
+import { buildTriggerOrderInstruction } from './instructions/trigger';
+import { buildSettlePnlInstruction } from './instructions/settlement';
+import { buildLiquidatePerpInstruction } from './instructions/liquidation';
+import { buildUpdateFundingRateInstruction } from './instructions/funding';
+import {
+	buildCancelOrderByUserIdInstruction,
+	buildCancelOrderInstruction,
+	buildCancelOrdersByIdsInstruction,
+	buildModifyOrderByUserIdInstruction,
+	buildModifyOrderInstruction,
+	buildPlaceAndMakePerpOrderInstruction,
+	buildPlaceAndTakePerpOrderInstruction,
+	buildPlacePerpOrderInstruction,
+} from './instructions/perpOrders';
+import * as remainingAccounts from './remainingAccounts';
+import * as signedMsg from './signedMsg';
+
+export type DriftCoreContext = {
+	/** Drift program id. */
+	programId: PublicKey;
+
+	/** Anchor IDL json for Drift (defaults to bundled `idl/drift.json`). */
+	idl?: Drift;
+};
+
+/**
+ * DriftCore is the minimal, core SDK surface:
+ * - No subscriptions / polling / websockets.
+ * - Pure helpers for PDAs, decoding, constants, and instruction building.
+ *
+ * Transaction/instruction builders will be progressively moved here from `DriftClient`.
+ */
+export class DriftCore {
+	/** Re-export PDA helpers (pure). */
+	static readonly pdas = pdas;
+
+	/** Re-export SDK constants (market configs, numeric constants, etc). */
+	static readonly constants = constants;
+
+	/** Re-export remaining-accounts logic (pure). */
+	static readonly remainingAccounts = remainingAccounts;
+	static readonly signedMsg = signedMsg;
+
+	static defaultIdl(): Drift {
+		return driftIDL as unknown as Drift;
+	}
+
+	static coder(idl: Drift = DriftCore.defaultIdl()): CustomBorshCoder {
+		return new CustomBorshCoder(idl as any);
+	}
+
+	/** Decode a Drift `User` account buffer without creating a Program. */
+	static decodeUserAccount(buffer: Buffer): UserAccount {
+		return decodeUser(buffer);
+	}
+
+	/** Fetch and decode a Drift `User` account. */
+	static async fetchUserAccount(
+		connection: Connection,
+		userAccountPublicKey: PublicKey
+	): Promise<UserAccount | null> {
+		const data = await fetchAccount(connection, userAccountPublicKey);
+		return data ? DriftCore.decodeUserAccount(data) : null;
+	}
+
+	static async buildDepositInstruction(args: {
+		program: DriftProgram;
+		marketIndex: number;
+		amount: BN;
+		reduceOnly: boolean;
+		state: PublicKey;
+		spotMarket: PublicKey;
+		spotMarketVault: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		userTokenAccount: PublicKey;
+		authority: PublicKey;
+		tokenProgram: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildDepositInstruction(args);
+	}
+
+	static async buildWithdrawInstruction(args: {
+		program: DriftProgram;
+		marketIndex: number;
+		amount: BN;
+		reduceOnly: boolean;
+		state: PublicKey;
+		spotMarket: PublicKey;
+		spotMarketVault: PublicKey;
+		driftSigner: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		userTokenAccount: PublicKey;
+		authority: PublicKey;
+		tokenProgram: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildWithdrawInstruction(args);
+	}
+
+	static async buildPlaceOrdersInstruction(args: {
+		program: DriftProgram;
+		formattedParams: any[];
+		state: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildPlaceOrdersInstruction(args);
+	}
+
+	static async buildCancelOrdersInstruction(args: {
+		program: DriftProgram;
+		marketType: any;
+		marketIndex: number | null;
+		direction: any;
+		user: PublicKey;
+		state: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildCancelOrdersInstruction(args);
+	}
+
+	static async buildFillPerpOrderInstruction(args: {
+		program: DriftProgram;
+		orderId: number | null;
+		state: PublicKey;
+		filler: PublicKey;
+		fillerStats: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildFillPerpOrderInstruction(args);
+	}
+
+	static async buildTriggerOrderInstruction(args: {
+		program: DriftProgram;
+		orderId: number;
+		state: PublicKey;
+		filler: PublicKey;
+		user: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildTriggerOrderInstruction(args);
+	}
+
+	static async buildSettlePnlInstruction(args: {
+		program: DriftProgram;
+		marketIndex: number;
+		state: PublicKey;
+		authority: PublicKey;
+		user: PublicKey;
+		spotMarketVault: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildSettlePnlInstruction(args);
+	}
+
+	static async buildLiquidatePerpInstruction(args: {
+		program: DriftProgram;
+		marketIndex: number;
+		maxBaseAssetAmount: any;
+		limitPrice: any | null;
+		state: PublicKey;
+		authority: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		liquidator: PublicKey;
+		liquidatorStats: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildLiquidatePerpInstruction(args);
+	}
+
+	static async buildPlacePerpOrderInstruction(args: {
+		program: DriftProgram;
+		orderParams: any;
+		state: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildPlacePerpOrderInstruction(args);
+	}
+
+	static async buildPlaceAndTakePerpOrderInstruction(args: {
+		program: DriftProgram;
+		orderParams: any;
+		optionalParams: number | null;
+		state: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildPlaceAndTakePerpOrderInstruction(args);
+	}
+
+	static async buildPlaceAndMakePerpOrderInstruction(args: {
+		program: DriftProgram;
+		orderParams: any;
+		takerOrderId: number;
+		state: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		taker: PublicKey;
+		takerStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildPlaceAndMakePerpOrderInstruction(args);
+	}
+
+	static async buildCancelOrderInstruction(args: {
+		program: DriftProgram;
+		orderId: number | null;
+		state: PublicKey;
+		user: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildCancelOrderInstruction(args);
+	}
+
+	static async buildCancelOrderByUserIdInstruction(args: {
+		program: DriftProgram;
+		userOrderId: number;
+		state: PublicKey;
+		user: PublicKey;
+		authority: PublicKey;
+		oracle: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildCancelOrderByUserIdInstruction(args);
+	}
+
+	static async buildCancelOrdersByIdsInstruction(args: {
+		program: DriftProgram;
+		orderIds: number[] | undefined;
+		state: PublicKey;
+		user: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildCancelOrdersByIdsInstruction(args);
+	}
+
+	static async buildModifyOrderInstruction(args: {
+		program: DriftProgram;
+		orderId: number;
+		modifyParams: any;
+		state: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildModifyOrderInstruction(args);
+	}
+
+	static async buildModifyOrderByUserIdInstruction(args: {
+		program: DriftProgram;
+		userOrderId: number;
+		modifyParams: any;
+		state: PublicKey;
+		user: PublicKey;
+		userStats: PublicKey;
+		authority: PublicKey;
+		remainingAccounts: AccountMeta[];
+	}): Promise<TransactionInstruction> {
+		return await buildModifyOrderByUserIdInstruction(args);
+	}
+
+	static async buildUpdateFundingRateInstruction(args: {
+		program: DriftProgram;
+		perpMarketIndex: number;
+		state: PublicKey;
+		perpMarket: PublicKey;
+		oracle: PublicKey;
+	}): Promise<TransactionInstruction> {
+		return await buildUpdateFundingRateInstruction(args);
+	}
+
+	/**
+	 * Placeholder for instruction builders.
+	 *
+	 * In follow-up refactors, DriftClient methods like `getDepositInstruction`,
+	 * `getPlaceOrdersIx`, etc. will be moved here as pure builders.
+	 */
+	static buildInstructions(_ctx: DriftCoreContext): TransactionInstruction[] {
+		return [];
+	}
+}

package/src/core/index.ts

@@ -0,0 +1,12 @@
+export * from './DriftCore';
+export * from './remainingAccounts';
+export * from './signedMsg';
+export * from './instructions/deposit';
+export * from './instructions/withdraw';
+export * from './instructions/orders';
+export * from './instructions/fill';
+export * from './instructions/trigger';
+export * from './instructions/settlement';
+export * from './instructions/liquidation';
+export * from './instructions/perpOrders';
+export * from './instructions/funding';

package/src/core/instructions/deposit.ts

@@ -0,0 +1,42 @@
+import type {
+	AccountMeta,
+	PublicKey,
+	TransactionInstruction,
+} from '@solana/web3.js';
+import type { BN } from '../../isomorphic/anchor';
+import type { DriftProgram } from '../../config';
+
+export async function buildDepositInstruction(args: {
+	program: DriftProgram;
+	marketIndex: number;
+	amount: BN;
+	reduceOnly: boolean;
+	state: PublicKey;
+	spotMarket: PublicKey;
+	spotMarketVault: PublicKey;
+	user: PublicKey;
+	userStats: PublicKey;
+	userTokenAccount: PublicKey;
+	authority: PublicKey;
+	tokenProgram: PublicKey;
+	remainingAccounts: AccountMeta[];
+}): Promise<TransactionInstruction> {
+	return await (args.program.instruction as any).deposit(
+		args.marketIndex,
+		args.amount,
+		args.reduceOnly,
+		{
+			accounts: {
+				state: args.state,
+				spotMarket: args.spotMarket,
+				spotMarketVault: args.spotMarketVault,
+				user: args.user,
+				userStats: args.userStats,
+				userTokenAccount: args.userTokenAccount,
+				authority: args.authority,
+				tokenProgram: args.tokenProgram,
+			},
+			remainingAccounts: args.remainingAccounts,
+		}
+	);
+}

package/src/core/instructions/fill.ts

@@ -0,0 +1,34 @@
+import type {
+	AccountMeta,
+	PublicKey,
+	TransactionInstruction,
+} from '@solana/web3.js';
+import type { DriftProgram } from '../../config';
+
+export async function buildFillPerpOrderInstruction(args: {
+	program: DriftProgram;
+	orderId: number | null;
+	state: PublicKey;
+	filler: PublicKey;
+	fillerStats: PublicKey;
+	user: PublicKey;
+	userStats: PublicKey;
+	authority: PublicKey;
+	remainingAccounts: AccountMeta[];
+}): Promise<TransactionInstruction> {
+	return await (args.program.instruction as any).fillPerpOrder(
+		args.orderId,
+		null,
+		{
+			accounts: {
+				state: args.state,
+				filler: args.filler,
+				fillerStats: args.fillerStats,
+				user: args.user,
+				userStats: args.userStats,
+				authority: args.authority,
+			},
+			remainingAccounts: args.remainingAccounts,
+		}
+	);
+}

package/src/core/instructions/funding.ts

@@ -0,0 +1,21 @@
+import type { PublicKey, TransactionInstruction } from '@solana/web3.js';
+import type { DriftProgram } from '../../config';
+
+export async function buildUpdateFundingRateInstruction(args: {
+	program: DriftProgram;
+	perpMarketIndex: number;
+	state: PublicKey;
+	perpMarket: PublicKey;
+	oracle: PublicKey;
+}): Promise<TransactionInstruction> {
+	return await (args.program.instruction as any).updateFundingRate(
+		args.perpMarketIndex,
+		{
+			accounts: {
+				state: args.state,
+				perpMarket: args.perpMarket,
+				oracle: args.oracle,
+			},
+		}
+	);
+}

package/src/core/instructions/liquidation.ts

@@ -0,0 +1,37 @@
+import type {
+	AccountMeta,
+	PublicKey,
+	TransactionInstruction,
+} from '@solana/web3.js';
+import type { DriftProgram } from '../../config';
+
+export async function buildLiquidatePerpInstruction(args: {
+	program: DriftProgram;
+	marketIndex: number;
+	maxBaseAssetAmount: any;
+	limitPrice: any | null;
+	state: PublicKey;
+	authority: PublicKey;
+	user: PublicKey;
+	userStats: PublicKey;
+	liquidator: PublicKey;
+	liquidatorStats: PublicKey;
+	remainingAccounts: AccountMeta[];
+}): Promise<TransactionInstruction> {
+	return await (args.program.instruction as any).liquidatePerp(
+		args.marketIndex,
+		args.maxBaseAssetAmount,
+		args.limitPrice,
+		{
+			accounts: {
+				state: args.state,
+				authority: args.authority,
+				user: args.user,
+				userStats: args.userStats,
+				liquidator: args.liquidator,
+				liquidatorStats: args.liquidatorStats,
+			},
+			remainingAccounts: args.remainingAccounts,
+		}
+	);
+}

package/src/core/instructions/orders.ts

@@ -0,0 +1,56 @@
+import type {
+	AccountMeta,
+	PublicKey,
+	TransactionInstruction,
+} from '@solana/web3.js';
+import type { DriftProgram } from '../../config';
+
+export async function buildPlaceOrdersInstruction(args: {
+	program: DriftProgram;
+	formattedParams: any[];
+	state: PublicKey;
+	user: PublicKey;
+	userStats: PublicKey;
+	authority: PublicKey;
+	remainingAccounts: AccountMeta[];
+}): Promise<TransactionInstruction> {
+	return await (args.program.instruction as any).placeOrders(
+		args.formattedParams,
+		{
+			accounts: {
+				state: args.state,
+				user: args.user,
+				userStats: args.userStats,
+				authority: args.authority,
+			},
+			remainingAccounts: args.remainingAccounts,
+		}
+	);
+}
+
+export async function buildCancelOrdersInstruction(args: {
+	program: DriftProgram;
+	marketType: any;
+	marketIndex: number | null;
+	direction: any;
+	user: PublicKey;
+	state: PublicKey;
+	userStats: PublicKey;
+	authority: PublicKey;
+	remainingAccounts: AccountMeta[];
+}): Promise<TransactionInstruction> {
+	return await (args.program.instruction as any).cancelOrders(
+		args.marketType,
+		args.marketIndex,
+		args.direction,
+		{
+			accounts: {
+				state: args.state,
+				user: args.user,
+				userStats: args.userStats,
+				authority: args.authority,
+			},
+			remainingAccounts: args.remainingAccounts,
+		}
+	);
+}