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

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)
 	);

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.30.0-beta.1",
+  "version": "2.30.0",
   "name": "drift",
   "instructions": [
     {
@@ -863,6 +863,14 @@
           "type": {
             "option": "u64"
           }
+        },
+        {
+          "name": "reduceOnly",
+          "type": {
+            "option": {
+              "defined": "SwapReduceOnly"
+            }
+          }
         }
       ]
     },
@@ -7449,6 +7457,20 @@
         ]
       }
     },
+    {
+      "name": "SwapReduceOnly",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "In"
+          },
+          {
+            "name": "Out"
+          }
+        ]
+      }
+    },
     {
       "name": "TwapPeriod",
       "type": {

package/src/jupiter/jupiterClient.ts

@@ -89,7 +89,7 @@ export class JupiterClient {
 	/**
 	 * Get a swap transaction for a route
 	 * @param route the route to perform swap
-	 * @param userPublicKey the user's wallet public key
+	 * @param userPublicKey the signer's wallet public key
 	 * @param slippageBps the slippage tolerance in basis points
 	 */
 	public async getSwapTransaction({
@@ -143,7 +143,9 @@ export class JupiterClient {
 			)
 		).filter((lookup) => lookup);
 
-		const transactionMessage = TransactionMessage.decompile(message);
+		const transactionMessage = TransactionMessage.decompile(message, {
+			addressLookupTableAccounts: lookupTables,
+		});
 		return {
 			transactionMessage,
 			lookupTables,
@@ -190,6 +192,12 @@ export class JupiterClient {
 				return false;
 			}
 
+			if (
+				instruction.programId.toString() === '11111111111111111111111111111111'
+			) {
+				return false;
+			}
+
 			if (
 				instruction.programId.toString() ===
 				'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL'

package/src/math/spotBalance.ts

@@ -23,6 +23,15 @@ import { OraclePriceData } from '../oracles/types';
 import { PERCENTAGE_PRECISION } from '../constants/numericConstants';
 import { divCeil } from './utils';
 
+/**
+ * Calculates the balance of a given token amount including any accumulated interest. This
+ * is the same as `SpotPosition.scaledBalance`.
+ *
+ * @param {BN} tokenAmount - the amount of tokens
+ * @param {SpotMarketAccount} spotMarket - the spot market account
+ * @param {SpotBalanceType} balanceType - the balance type ('deposit' or 'borrow')
+ * @return {BN} the calculated balance, scaled by `SPOT_MARKET_BALANCE_PRECISION`
+ */
 export function getBalance(
 	tokenAmount: BN,
 	spotMarket: SpotMarketAccount,
@@ -43,6 +52,14 @@ export function getBalance(
 	return balance;
 }
 
+/**
+ * Calculates the spot token amount including any accumulated interest.
+ *
+ * @param {BN} balanceAmount - The balance amount, typically from `SpotPosition.scaledBalance`
+ * @param {SpotMarketAccount} spotMarket - The spot market account details
+ * @param {SpotBalanceType} balanceType - The balance type to be used for calculation
+ * @returns {BN} The calculated token amount, scaled by `SpotMarketConfig.precision`
+ */
 export function getTokenAmount(
 	balanceAmount: BN,
 	spotMarket: SpotMarketAccount,
@@ -62,6 +79,13 @@ export function getTokenAmount(
 	}
 }
 
+/**
+ * Returns the signed (positive for deposit,negative for borrow) token amount based on the balance type.
+ *
+ * @param {BN} tokenAmount - The token amount to convert (from `getTokenAmount`)
+ * @param {SpotBalanceType} balanceType - The balance type to determine the sign of the token amount.
+ * @returns {BN} - The signed token amount, scaled by `SpotMarketConfig.precision`
+ */
 export function getSignedTokenAmount(
 	tokenAmount: BN,
 	balanceType: SpotBalanceType
@@ -73,6 +97,15 @@ export function getSignedTokenAmount(
 	}
 }
 
+/**
+ * Calculates the value of a given token amount using the worst of the provided oracle price and its TWAP.
+ *
+ * @param {BN} tokenAmount - The amount of tokens to calculate the value for (from `getTokenAmount`)
+ * @param {number} spotDecimals - The number of decimals in the token.
+ * @param {OraclePriceData} oraclePriceData - The oracle price data (typically a token/USD oracle).
+ * @param {BN} oraclePriceTwap - The Time-Weighted Average Price of the oracle.
+ * @return {BN} The calculated value of the given token amount, scaled by `PRICE_PRECISION`
+ */
 export function getStrictTokenValue(
 	tokenAmount: BN,
 	spotDecimals: number,
@@ -95,6 +128,14 @@ export function getStrictTokenValue(
 	return tokenAmount.mul(price).div(precisionDecrease);
 }
 
+/**
+ * Calculates the value of a given token amount in relation to an oracle price data
+ *
+ * @param {BN} tokenAmount - The amount of tokens to calculate the value for (from `getTokenAmount`)
+ * @param {number} spotDecimals - The number of decimal places of the token.
+ * @param {OraclePriceData} oraclePriceData - The oracle price data (typically a token/USD oracle).
+ * @return {BN} The value of the token based on the oracle, scaled by `PRICE_PRECISION`
+ */
 export function getTokenValue(
 	tokenAmount: BN,
 	spotDecimals: number,

package/src/token/index.ts

@@ -1,37 +1,13 @@
-import { AccountInfo, AccountLayout, u64 } from '@solana/spl-token';
-import { PublicKey } from '@solana/web3.js';
-
-export function parseTokenAccount(data: Buffer): AccountInfo {
-	const accountInfo = AccountLayout.decode(data);
-	accountInfo.mint = new PublicKey(accountInfo.mint);
-	accountInfo.owner = new PublicKey(accountInfo.owner);
-	accountInfo.amount = u64.fromBuffer(accountInfo.amount);
-
-	if (accountInfo.delegateOption === 0) {
-		accountInfo.delegate = null;
-		// eslint-disable-next-line new-cap
-		accountInfo.delegatedAmount = u64.fromBuffer(Buffer.from('0'));
-	} else {
-		accountInfo.delegate = new PublicKey(accountInfo.delegate);
-		accountInfo.delegatedAmount = u64.fromBuffer(accountInfo.delegatedAmount);
-	}
-
-	accountInfo.isInitialized = accountInfo.state !== 0;
-	accountInfo.isFrozen = accountInfo.state === 2;
-
-	if (accountInfo.isNativeOption === 1) {
-		accountInfo.rentExemptReserve = u64.fromBuffer(accountInfo.isNative);
-		accountInfo.isNative = true;
-	} else {
-		accountInfo.rentExemptReserve = null;
-		accountInfo.isNative = false;
-	}
-
-	if (accountInfo.closeAuthorityOption === 0) {
-		accountInfo.closeAuthority = null;
-	} else {
-		accountInfo.closeAuthority = new PublicKey(accountInfo.closeAuthority);
-	}
-
-	return accountInfo;
+import { Account, TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
+import { PublicKey, AccountInfo } from '@solana/web3.js';
+
+export function parseTokenAccount(data: Buffer, pubkey: PublicKey): Account {
+	// mock AccountInfo so unpackAccount can be used
+	const accountInfo: AccountInfo<Buffer> = {
+		data,
+		owner: TOKEN_PROGRAM_ID,
+		executable: false,
+		lamports: 0,
+	};
+	return unpackAccount(pubkey, accountInfo, TOKEN_PROGRAM_ID);
 }

package/src/tokenFaucet.ts

@@ -1,10 +1,11 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, Idl, Program } from '@coral-xyz/anchor';
 import {
-	AccountInfo,
-	ASSOCIATED_TOKEN_PROGRAM_ID,
-	Token,
 	TOKEN_PROGRAM_ID,
+	getAccount,
+	Account,
+	createAssociatedTokenAccountInstruction,
+	getAssociatedTokenAddress,
 } from '@solana/spl-token';
 import {
 	ConfirmOptions,
@@ -174,15 +175,12 @@ export class TokenFaucet {
 			{ userPubKey: userPublicKey }
 		);
 
-		const createAssociatedAccountIx =
-			Token.createAssociatedTokenAccountInstruction(
-				ASSOCIATED_TOKEN_PROGRAM_ID,
-				TOKEN_PROGRAM_ID,
-				state.mint,
-				associateTokenPublicKey,
-				userPublicKey,
-				this.wallet.publicKey
-			);
+		const createAssociatedAccountIx = createAssociatedTokenAccountInstruction(
+			this.wallet.publicKey,
+			associateTokenPublicKey,
+			userPublicKey,
+			state.mint
+		);
 
 		const mintToIx = await this.mintToUserIx(associateTokenPublicKey, amount);
 
@@ -194,36 +192,19 @@ export class TokenFaucet {
 	}): Promise<anchor.web3.PublicKey> {
 		const state: any = await this.fetchState();
 
-		return Token.getAssociatedTokenAddress(
-			ASSOCIATED_TOKEN_PROGRAM_ID,
-			TOKEN_PROGRAM_ID,
-			state.mint,
-			props.userPubKey
-		);
+		return getAssociatedTokenAddress(state.mint, props.userPubKey);
 	}
 
 	public async getTokenAccountInfo(props: {
 		userPubKey: PublicKey;
-	}): Promise<AccountInfo> {
-		const assosciatedKey = await this.getAssosciatedMockUSDMintAddress(props);
-
-		const state: any = await this.fetchState();
-
-		const token = new Token(
-			this.connection,
-			state.mint,
-			TOKEN_PROGRAM_ID,
-			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			// @ts-ignore
-			this.provider.payer
-		);
-
-		return await token.getAccountInfo(assosciatedKey);
+	}): Promise<Account> {
+		const associatedKey = await this.getAssosciatedMockUSDMintAddress(props);
+		return await getAccount(this.connection, associatedKey);
 	}
 
 	public async subscribeToTokenAccount(props: {
 		userPubKey: PublicKey;
-		callback: (accountInfo: AccountInfo) => void;
+		callback: (accountInfo: Account) => void;
 	}): Promise<boolean> {
 		try {
 			const tokenAccountKey = await this.getAssosciatedMockUSDMintAddress(

package/src/tx/retryTxSender.ts

@@ -122,6 +122,10 @@ export class RetryTxSender implements TxSender {
 		// @ts-ignore
 		tx.sign((additionalSigners ?? []).concat(this.provider.wallet.payer));
 
+		if (opts === undefined) {
+			opts = this.provider.opts;
+		}
+
 		return this.sendRawTransaction(tx.serialize(), opts);
 	}
 

package/src/types.ts

@@ -1,4 +1,4 @@
-import { PublicKey, Transaction } from '@solana/web3.js';
+import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BN, ZERO } from '.';
 
 // # Utility Types / Enums / Constants
@@ -506,7 +506,7 @@ export type OrderActionRecord = {
 };
 
 export type SwapRecord = {
-	ts: number;
+	ts: BN;
 	user: PublicKey;
 	amountOut: BN;
 	amountIn: BN;
@@ -951,12 +951,26 @@ export type TxParams = {
 	computeUnitsPrice?: number;
 };
 
+export class SwapReduceOnly {
+	static readonly In = { in: {} };
+	static readonly Out = { out: {} };
+}
+
 // # Misc Types
 export interface IWallet {
 	signTransaction(tx: Transaction): Promise<Transaction>;
 	signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
 	publicKey: PublicKey;
 }
+export interface IVersionedWallet {
+	signVersionedTransaction(
+		tx: VersionedTransaction
+	): Promise<VersionedTransaction>;
+	signAllVersionedTransactions(
+		txs: VersionedTransaction[]
+	): Promise<VersionedTransaction[]>;
+	publicKey: PublicKey;
+}
 
 export type FeeStructure = {
 	feeTiers: FeeTier[];