@drift-labs/sdk 2.30.0-beta.1 → 2.31.0-beta.0

package/lib/wallet.js

@@ -15,12 +15,22 @@ class Wallet {
         tx.partialSign(this.payer);
         return tx;
     }
+    async signVersionedTransaction(tx) {
+        tx.sign([this.payer]);
+        return tx;
+    }
     async signAllTransactions(txs) {
         return txs.map((t) => {
             t.partialSign(this.payer);
             return t;
         });
     }
+    async signAllVersionedTransactions(txs) {
+        return txs.map((t) => {
+            t.sign([this.payer]);
+            return t;
+        });
+    }
     get publicKey() {
         return this.payer.publicKey;
     }
@@ -30,15 +40,17 @@ function loadKeypair(privateKey) {
     // try to load privateKey as a filepath
     let loadedKey;
     if (fs_1.default.existsSync(privateKey)) {
-        loadedKey = new Uint8Array(JSON.parse(fs_1.default.readFileSync(privateKey).toString()));
+        privateKey = fs_1.default.readFileSync(privateKey).toString();
+    }
+    if (privateKey.includes('[') && privateKey.includes(']')) {
+        loadedKey = Uint8Array.from(JSON.parse(privateKey));
+    }
+    else if (privateKey.includes(',')) {
+        loadedKey = Uint8Array.from(privateKey.split(',').map((val) => Number(val)));
     }
     else {
-        if (privateKey.includes(',')) {
-            loadedKey = Uint8Array.from(privateKey.split(',').map((val) => Number(val)));
-        }
-        else {
-            loadedKey = new Uint8Array(bs58_1.default.decode(privateKey));
-        }
+        privateKey = privateKey.replace(/\s/g, '');
+        loadedKey = new Uint8Array(bs58_1.default.decode(privateKey));
     }
     return web3_js_1.Keypair.fromSecretKey(Uint8Array.from(loadedKey));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.30.0-beta.1",
+	"version": "2.31.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -37,7 +37,7 @@
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
-		"@solana/spl-token": "^0.1.6",
+		"@solana/spl-token": "^0.3.7",
 		"@solana/web3.js": "1.73.2",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -9,7 +9,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
-import { AccountInfo } from '@solana/spl-token';
+import { Account } from '@solana/spl-token';
 import { parseTokenAccount } from '../token';
 
 export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
@@ -22,7 +22,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 	callbackId?: string;
 	errorCallbackId?: string;
 
-	tokenAccountAndSlot?: DataAndSlot<AccountInfo>;
+	tokenAccountAndSlot?: DataAndSlot<Account>;
 
 	public constructor(publicKey: PublicKey, accountLoader: BulkAccountLoader) {
 		this.isSubscribed = false;
@@ -61,7 +61,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		this.callbackId = await this.accountLoader.addAccount(
 			this.publicKey,
 			(buffer, slot: number) => {
-				const tokenAccount = parseTokenAccount(buffer);
+				const tokenAccount = parseTokenAccount(buffer, this.publicKey);
 				this.tokenAccountAndSlot = { data: tokenAccount, slot };
 				// @ts-ignore
 				this.eventEmitter.emit('tokenAccountUpdate', tokenAccount);
@@ -79,7 +79,10 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		const { buffer, slot } = this.accountLoader.getBufferAndSlot(
 			this.publicKey
 		);
-		this.tokenAccountAndSlot = { data: parseTokenAccount(buffer), slot };
+		this.tokenAccountAndSlot = {
+			data: parseTokenAccount(buffer, this.publicKey),
+			slot,
+		};
 	}
 
 	async unsubscribe(): Promise<void> {
@@ -104,7 +107,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		}
 	}
 
-	public getTokenAccountAndSlot(): DataAndSlot<AccountInfo> {
+	public getTokenAccountAndSlot(): DataAndSlot<Account> {
 		this.assertIsSubscribed();
 		return this.tokenAccountAndSlot;
 	}

package/src/accounts/types.ts

@@ -9,7 +9,7 @@ import {
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { AccountInfo } from '@solana/spl-token';
+import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
 
 export interface AccountSubscriber<T> {
@@ -82,7 +82,7 @@ export interface UserAccountSubscriber {
 }
 
 export interface TokenAccountEvents {
-	tokenAccountUpdate: (payload: AccountInfo) => void;
+	tokenAccountUpdate: (payload: Account) => void;
 	update: void;
 	error: (e: Error) => void;
 }
@@ -95,7 +95,7 @@ export interface TokenAccountSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getTokenAccountAndSlot(): DataAndSlot<AccountInfo>;
+	getTokenAccountAndSlot(): DataAndSlot<Account>;
 }
 
 export interface OracleEvents {

package/src/adminClient.ts

@@ -544,6 +544,25 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async updatePerpMarketTargetBaseAssetAmountPerLp(
+		perpMarketIndex: number,
+		targetBaseAssetAmountPerLP: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updatePerpMarketTargetBaseAssetAmountPerLp(
+			targetBaseAssetAmountPerLP,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketMarginRatio(
 		perpMarketIndex: number,
 		marginRatioInitial: number,

package/src/constants/spotMarkets.ts

@@ -6,6 +6,7 @@ import {
 	LAMPORTS_EXP,
 	LAMPORTS_PRECISION,
 	SIX,
+	NINE,
 } from './numericConstants';
 
 export type SpotMarketConfig = {
@@ -82,6 +83,16 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 			'4DoNfFBfF7UokCC2FQzriy7yHK6DY6NVdYpuekQ5pRgg'
 		),
 	},
+	{
+		symbol: 'mSOL',
+		marketIndex: 2,
+		oracle: new PublicKey('E4v1BBgoso9s64TQvmyownAVJbhbEPGyzA3qn4n46qj9'),
+		oracleSource: OracleSource.PYTH,
+		mint: new PublicKey('mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		serumMarket: new PublicKey('9Lyhks5bQQxb9EyyX55NtgKQzpM4WK7JCmeaWuQ5MoXD'),
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

package/src/dlob/DLOB.ts

@@ -1,5 +1,6 @@
 import { getOrderSignature, getVammNodeGenerator, NodeList } from './NodeList';
 import {
+	BASE_PRECISION,
 	BN,
 	calculateAskPrice,
 	calculateBidPrice,
@@ -24,12 +25,15 @@ import {
 	OrderActionRecord,
 	OrderRecord,
 	PerpMarketAccount,
+	PositionDirection,
 	PRICE_PRECISION,
+	QUOTE_PRECISION,
 	SlotSubscriber,
 	SpotMarketAccount,
 	StateAccount,
 	TriggerOrderNode,
 	UserMap,
+	ZERO,
 } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { ammPaused, exchangePaused, fillPaused } from '../math/exchangeStatus';
@@ -1849,4 +1853,75 @@ export class DLOB {
 			asks,
 		};
 	}
+
+	private estimateFillExactBaseAmountInForSide(
+		baseAmountIn: BN,
+		oraclePriceData: OraclePriceData,
+		slot: number,
+		dlobSide: Generator<DLOBNode>
+	): BN {
+		let runningSumQuote = ZERO;
+		let runningSumBase = ZERO;
+		for (const side of dlobSide) {
+			const price = side.getPrice(oraclePriceData, slot); //side.order.quoteAssetAmount.div(side.order.baseAssetAmount);
+			const baseAmountRemaining = side.order.baseAssetAmount.sub(
+				side.order.baseAssetAmountFilled
+			);
+			if (runningSumBase.add(baseAmountRemaining).gt(baseAmountIn)) {
+				const remainingBase = baseAmountIn.sub(runningSumBase);
+				runningSumBase = runningSumBase.add(remainingBase);
+				runningSumQuote = runningSumQuote.add(remainingBase.mul(price));
+				break;
+			} else {
+				runningSumBase = runningSumBase.add(baseAmountRemaining);
+				runningSumQuote = runningSumQuote.add(baseAmountRemaining.mul(price));
+			}
+		}
+
+		return runningSumQuote
+			.mul(QUOTE_PRECISION)
+			.div(BASE_PRECISION.mul(PRICE_PRECISION));
+	}
+
+	/**
+	 *
+	 * @param param.marketIndex the index of the market
+	 * @param param.marketType the type of the market
+	 * @param param.baseAmount the base amount in to estimate
+	 * @param param.orderDirection the direction of the trade
+	 * @param param.slot current slot for estimating dlob node price
+	 * @param param.oraclePriceData the oracle price data
+	 * @returns the estimated quote amount filled: QUOTE_PRECISION
+	 */
+	public estimateFillWithExactBaseAmount({
+		marketIndex,
+		marketType,
+		baseAmount,
+		orderDirection,
+		slot,
+		oraclePriceData,
+	}: {
+		marketIndex: number;
+		marketType: MarketType;
+		baseAmount: BN;
+		orderDirection: PositionDirection;
+		slot: number;
+		oraclePriceData: OraclePriceData;
+	}): BN {
+		if (isVariant(orderDirection, 'long')) {
+			return this.estimateFillExactBaseAmountInForSide(
+				baseAmount,
+				oraclePriceData,
+				slot,
+				this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)
+			);
+		} else if (isVariant(orderDirection, 'short')) {
+			return this.estimateFillExactBaseAmountInForSide(
+				baseAmount,
+				oraclePriceData,
+				slot,
+				this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)
+			);
+		}
+	}
 }

package/src/driftClient.ts

@@ -8,7 +8,10 @@ import {
 import bs58 from 'bs58';
 import {
 	ASSOCIATED_TOKEN_PROGRAM_ID,
-	Token,
+	createAssociatedTokenAccountInstruction,
+	createCloseAccountInstruction,
+	createInitializeAccountInstruction,
+	getAssociatedTokenAddress,
 	TOKEN_PROGRAM_ID,
 } from '@solana/spl-token';
 import {
@@ -39,6 +42,7 @@ import {
 	ModifyOrderParams,
 	PhoenixV1FulfillmentConfigAccount,
 	ModifyOrderPolicy,
+	SwapReduceOnly,
 } from './types';
 import * as anchor from '@coral-xyz/anchor';
 import driftIDL from './idl/drift.json';
@@ -113,7 +117,7 @@ import { isSpotPositionAvailable } from './math/spotPosition';
 import { calculateMarketMaxAvailableInsurance } from './math/market';
 import { fetchUserStatsAccount } from './accounts/fetch';
 import { castNumberToSpotPrecision } from './math/spotMarket';
-import { JupiterClient } from './jupiter/jupiterClient';
+import { JupiterClient, Route, SwapMode } from './jupiter/jupiterClient';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -720,9 +724,7 @@ export class DriftClient {
 
 		const state = this.getStateAccount();
 		if (!state.whitelistMint.equals(PublicKey.default)) {
-			const associatedTokenPublicKey = await Token.getAssociatedTokenAddress(
-				ASSOCIATED_TOKEN_PROGRAM_ID,
-				TOKEN_PROGRAM_ID,
+			const associatedTokenPublicKey = await getAssociatedTokenAddress(
 				state.whitelistMint,
 				this.wallet.publicKey
 			);
@@ -1489,20 +1491,15 @@ export class DriftClient {
 			return this.wallet.publicKey;
 		}
 		const mint = spotMarket.mint;
-		return await Token.getAssociatedTokenAddress(
-			ASSOCIATED_TOKEN_PROGRAM_ID,
-			TOKEN_PROGRAM_ID,
-			mint,
-			this.wallet.publicKey
-		);
+		return await getAssociatedTokenAddress(mint, this.wallet.publicKey);
 	}
 
-	public async createAssociatedTokenAccountIdempotentInstruction(
+	public createAssociatedTokenAccountIdempotentInstruction(
 		account: PublicKey,
 		payer: PublicKey,
 		owner: PublicKey,
 		mint: PublicKey
-	): Promise<TransactionInstruction> {
+	): TransactionInstruction {
 		return new TransactionInstruction({
 			keys: [
 				{ pubkey: payer, isSigner: true, isWritable: true },
@@ -1510,7 +1507,7 @@ export class DriftClient {
 				{ pubkey: owner, isSigner: false, isWritable: false },
 				{ pubkey: mint, isSigner: false, isWritable: false },
 				{
-					pubkey: SystemProgram.programId,
+					pubkey: anchor.web3.SystemProgram.programId,
 					isSigner: false,
 					isWritable: false,
 				},
@@ -1582,8 +1579,7 @@ export class DriftClient {
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
 			tx.add(
-				Token.createCloseAccountInstruction(
-					TOKEN_PROGRAM_ID,
+				createCloseAccountInstruction(
 					associatedTokenAccount,
 					signerAuthority,
 					signerAuthority,
@@ -1696,10 +1692,9 @@ export class DriftClient {
 		);
 
 		result.ixs.push(
-			Token.createInitAccountInstruction(
-				TOKEN_PROGRAM_ID,
-				WRAPPED_SOL_MINT,
+			createInitializeAccountInstruction(
 				wrappedSolAccount.publicKey,
+				WRAPPED_SOL_MINT,
 				authority
 			)
 		);
@@ -1713,17 +1708,12 @@ export class DriftClient {
 		tokenMintAddress: PublicKey,
 		associatedTokenAddress: PublicKey
 	): anchor.web3.TransactionInstruction {
-		const createAssociatedAccountIx =
-			Token.createAssociatedTokenAccountInstruction(
-				ASSOCIATED_TOKEN_PROGRAM_ID,
-				TOKEN_PROGRAM_ID,
-				tokenMintAddress,
-				associatedTokenAddress,
-				this.wallet.publicKey,
-				this.wallet.publicKey
-			);
-
-		return createAssociatedAccountIx;
+		return createAssociatedTokenAccountInstruction(
+			this.wallet.publicKey,
+			associatedTokenAddress,
+			this.wallet.publicKey,
+			tokenMintAddress
+		);
 	}
 
 	/**
@@ -1825,8 +1815,7 @@ export class DriftClient {
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
 			tx.add(
-				Token.createCloseAccountInstruction(
-					TOKEN_PROGRAM_ID,
+				createCloseAccountInstruction(
 					userTokenAccount,
 					authority,
 					authority,
@@ -1965,8 +1954,7 @@ export class DriftClient {
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
 			tx.add(
-				Token.createCloseAccountInstruction(
-					TOKEN_PROGRAM_ID,
+				createCloseAccountInstruction(
 					associatedTokenAddress,
 					authority,
 					authority,
@@ -3300,6 +3288,7 @@ export class DriftClient {
 	 * @param inAssociatedTokenAccount the token account to
 	 * @param amount the amount of the token to sell
 	 * @param slippageBps the max slippage passed to jupiter api
+	 * @param route the jupiter route to use for the swap
 	 * @param txParams
 	 */
 	public async swap({
@@ -3310,32 +3299,42 @@ export class DriftClient {
 		inAssociatedTokenAccount,
 		amount,
 		slippageBps,
+		swapMode,
+		route,
+		reduceOnly,
 		txParams,
 	}: {
 		jupiterClient: JupiterClient;
 		outMarketIndex: number;
 		inMarketIndex: number;
-		outAssociatedTokenAccount: PublicKey;
-		inAssociatedTokenAccount: PublicKey;
+		outAssociatedTokenAccount?: PublicKey;
+		inAssociatedTokenAccount?: PublicKey;
 		amount: BN;
-		slippageBps: number;
+		slippageBps?: number;
+		swapMode?: SwapMode;
+		route?: Route;
+		reduceOnly?: SwapReduceOnly;
 		txParams?: TxParams;
 	}): Promise<TransactionSignature> {
 		const outMarket = this.getSpotMarketAccount(outMarketIndex);
 		const inMarket = this.getSpotMarketAccount(inMarketIndex);
 
-		const routes = await jupiterClient.getRoutes({
-			inputMint: inMarket.mint,
-			outputMint: outMarket.mint,
-			amount,
-			slippageBps,
-		});
+		if (!route) {
+			const routes = await jupiterClient.getRoutes({
+				inputMint: inMarket.mint,
+				outputMint: outMarket.mint,
+				amount,
+				slippageBps,
+				swapMode,
+			});
+
+			if (!routes || routes.length === 0) {
+				throw new Error('No jupiter routes found');
+			}
 
-		if (!routes || routes.length === 0) {
-			throw new Error('No jupiter routes found');
+			route = routes[0];
 		}
 
-		const route = routes[0];
 		const transaction = await jupiterClient.getSwapTransaction({
 			route,
 			userPublicKey: this.provider.wallet.publicKey,
@@ -3356,7 +3355,8 @@ export class DriftClient {
 		const preInstructions = [];
 		if (!outAssociatedTokenAccount) {
 			outAssociatedTokenAccount = await this.getAssociatedTokenAccount(
-				outMarket.marketIndex
+				outMarket.marketIndex,
+				false
 			);
 
 			const accountInfo = await this.connection.getAccountInfo(
@@ -3376,7 +3376,8 @@ export class DriftClient {
 
 		if (!inAssociatedTokenAccount) {
 			inAssociatedTokenAccount = await this.getAssociatedTokenAccount(
-				inMarket.marketIndex
+				inMarket.marketIndex,
+				false
 			);
 
 			const accountInfo = await this.connection.getAccountInfo(
@@ -3400,6 +3401,7 @@ export class DriftClient {
 			amountIn: amount,
 			inTokenAccount: inAssociatedTokenAccount,
 			outTokenAccount: outAssociatedTokenAccount,
+			reduceOnly,
 		});
 
 		const instructions = [
@@ -3440,6 +3442,7 @@ export class DriftClient {
 		inTokenAccount,
 		outTokenAccount,
 		limitPrice,
+		reduceOnly,
 	}: {
 		outMarketIndex: number;
 		inMarketIndex: number;
@@ -3447,6 +3450,7 @@ export class DriftClient {
 		inTokenAccount: PublicKey;
 		outTokenAccount: PublicKey;
 		limitPrice?: BN;
+		reduceOnly?: SwapReduceOnly;
 	}): Promise<{
 		beginSwapIx: TransactionInstruction;
 		endSwapIx: TransactionInstruction;
@@ -3487,6 +3491,7 @@ export class DriftClient {
 			inMarketIndex,
 			outMarketIndex,
 			limitPrice ?? null,
+			reduceOnly ?? null,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
@@ -5011,8 +5016,7 @@ export class DriftClient {
 
 		if (createWSOLTokenAccount) {
 			tx.add(
-				Token.createCloseAccountInstruction(
-					TOKEN_PROGRAM_ID,
+				createCloseAccountInstruction(
 					tokenAccount,
 					this.wallet.publicKey,
 					this.wallet.publicKey,
@@ -5162,8 +5166,7 @@ export class DriftClient {
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
 			tx.add(
-				Token.createCloseAccountInstruction(
-					TOKEN_PROGRAM_ID,
+				createCloseAccountInstruction(
 					tokenAccount,
 					this.wallet.publicKey,
 					this.wallet.publicKey,
@@ -5364,7 +5367,8 @@ export class DriftClient {
 			allIx.push(instructions);
 		}
 
-		if (this.txVersion === 'legacy') {
+		txVersion = txVersion ?? this.txVersion;
+		if (txVersion === 'legacy') {
 			return new Transaction().add(...allIx);
 		} else {
 			const marketLookupTable = await this.fetchMarketLookupTableAccount();

package/src/examples/makeTradeExample.ts

@@ -5,7 +5,7 @@ import {
 	getMarketOrderParams,
 	Wallet,
 } from '..';
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { getAssociatedTokenAddress } from '@solana/spl-token';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import {
 	DriftClient,
@@ -25,9 +25,7 @@ export const getTokenAddress = (
 	mintAddress: string,
 	userPubKey: string
 ): Promise<PublicKey> => {
-	return Token.getAssociatedTokenAddress(
-		new PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`),
-		TOKEN_PROGRAM_ID,
+	return getAssociatedTokenAddress(
 		new PublicKey(mintAddress),
 		new PublicKey(userPubKey)
 	);