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

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.30.0-beta.1",
+  "version": "2.31.0-beta.0",
   "name": "drift",
   "instructions": [
     {
@@ -863,6 +863,14 @@
           "type": {
             "option": "u64"
           }
+        },
+        {
+          "name": "reduceOnly",
+          "type": {
+            "option": {
+              "defined": "SwapReduceOnly"
+            }
+          }
         }
       ]
     },
@@ -3636,6 +3644,32 @@
         }
       ]
     },
+    {
+      "name": "updatePerpMarketTargetBaseAssetAmountPerLp",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "targetBaseAssetAmountPerLp",
+          "type": "i32"
+        }
+      ]
+    },
     {
       "name": "updateLpCooldownTime",
       "accounts": [
@@ -6441,7 +6475,8 @@
           {
             "name": "lastOracleNormalisedPrice",
             "docs": [
-              "the last seen oracle price partially shrunk toward the amm reserve price"
+              "the last seen oracle price partially shrunk toward the amm reserve price",
+              "precision: PRICE_PRECISION"
             ],
             "type": "i64"
           },
@@ -6455,21 +6490,24 @@
           {
             "name": "lastBidPriceTwap",
             "docs": [
-              "average estimate of bid price over funding_period"
+              "average estimate of bid price over funding_period",
+              "precision: PRICE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "lastAskPriceTwap",
             "docs": [
-              "average estimate of ask price over funding_period"
+              "average estimate of ask price over funding_period",
+              "precision: PRICE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "lastMarkPriceTwap",
             "docs": [
-              "average estimate of (bid+ask)/2 price over funding_period"
+              "average estimate of (bid+ask)/2 price over funding_period",
+              "precision: PRICE_PRECISION"
             ],
             "type": "u64"
           },
@@ -6491,14 +6529,15 @@
             "name": "lastOracleConfPct",
             "docs": [
               "the pct size of the oracle confidence interval",
-              "PERCENTAGE_PRECISION"
+              "precision: PERCENTAGE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "netRevenueSinceLastFunding",
             "docs": [
-              "the total_fee_minus_distribution change since the last funding update"
+              "the total_fee_minus_distribution change since the last funding update",
+              "precision: QUOTE_PRECISION"
             ],
             "type": "i64"
           },
@@ -6519,28 +6558,32 @@
           {
             "name": "orderStepSize",
             "docs": [
-              "the base step size (increment) of orders"
+              "the base step size (increment) of orders",
+              "precision: BASE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "orderTickSize",
             "docs": [
-              "the price tick size of orders"
+              "the price tick size of orders",
+              "precision: PRICE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "minOrderSize",
             "docs": [
-              "the minimum base size of an order"
+              "the minimum base size of an order",
+              "precision: BASE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "maxPositionSize",
             "docs": [
-              "the max base size a single user can have"
+              "the max base size a single user can have",
+              "precision: BASE_PRECISION"
             ],
             "type": "u64"
           },
@@ -6576,14 +6619,16 @@
           {
             "name": "markStd",
             "docs": [
-              "estimate of standard deviation of the fill (mark) prices"
+              "estimate of standard deviation of the fill (mark) prices",
+              "precision: PRICE_PRECISION"
             ],
             "type": "u64"
           },
           {
             "name": "oracleStd",
             "docs": [
-              "estimate of standard deviation of the oracle price at each update"
+              "estimate of standard deviation of the oracle price at each update",
+              "precision: PRICE_PRECISION"
             ],
             "type": "u64"
           },
@@ -6660,7 +6705,8 @@
           {
             "name": "ammJitIntensity",
             "docs": [
-              "the jit intensity of AMM. larger intensity means larger participation in jit. 0 means no jit participation."
+              "the jit intensity of AMM. larger intensity means larger participation in jit. 0 means no jit participation.",
+              "(0, 100] is intensity for protocol-owned AMM. (100, 200] is intensity for user LP-owned AMM."
             ],
             "type": "u8"
           },
@@ -6680,12 +6726,20 @@
             ],
             "type": "bool"
           },
+          {
+            "name": "targetBaseAssetAmountPerLp",
+            "docs": [
+              "the target value for `base_asset_amount_per_lp`, used during AMM JIT with LP split",
+              "precision: BASE_PRECISION"
+            ],
+            "type": "i32"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                48
+                44
               ]
             }
           }
@@ -7449,6 +7503,20 @@
         ]
       }
     },
+    {
+      "name": "SwapReduceOnly",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "In"
+          },
+          {
+            "name": "Out"
+          }
+        ]
+      }
+    },
     {
       "name": "TwapPeriod",
       "type": {
@@ -7681,6 +7749,12 @@
           },
           {
             "name": "OrderFillWithPhoenix"
+          },
+          {
+            "name": "OrderFilledWithAMMJitLPSplit"
+          },
+          {
+            "name": "OrderFilledWithLPJit"
           }
         ]
       }
@@ -7897,6 +7971,23 @@
         ]
       }
     },
+    {
+      "name": "AMMLiquiditySplit",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "ProtocolOwned"
+          },
+          {
+            "name": "LPOwned"
+          },
+          {
+            "name": "Shared"
+          }
+        ]
+      }
+    },
     {
       "name": "SpotBalanceType",
       "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
@@ -133,6 +133,12 @@ export class OrderActionExplanation {
 	static readonly ORDER_FILLED_WITH_AMM_JIT = {
 		orderFilledWithAmmJit: {},
 	};
+	static readonly ORDER_FILLED_WITH_AMM_JIT_LP_SPLIT = {
+		orderFilledWithAmmJitLpSplit: {},
+	};
+	static readonly ORDER_FILLED_WITH_LP_JIT = {
+		orderFilledWithAmmJitLpSplit: {},
+	};
 	static readonly ORDER_FILLED_WITH_MATCH = {
 		orderFilledWithMatch: {},
 	};
@@ -506,7 +512,7 @@ export type OrderActionRecord = {
 };
 
 export type SwapRecord = {
-	ts: number;
+	ts: BN;
 	user: PublicKey;
 	amountOut: BN;
 	amountIn: BN;
@@ -730,6 +736,7 @@ export type AMM = {
 
 	baseAssetAmountPerLp: BN;
 	quoteAssetAmountPerLp: BN;
+	targetBaseAssetAmountPerLp: number;
 
 	ammJitIntensity: number;
 	maxOpenInterest: BN;
@@ -951,12 +958,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[];

package/src/wallet.ts

@@ -1,9 +1,14 @@
-import { Keypair, PublicKey, Transaction } from '@solana/web3.js';
-import { IWallet } from './types';
+import {
+	Keypair,
+	PublicKey,
+	Transaction,
+	VersionedTransaction,
+} from '@solana/web3.js';
+import { IWallet, IVersionedWallet } from './types';
 import fs from 'fs';
 import bs58 from 'bs58';
 
-export class Wallet implements IWallet {
+export class Wallet implements IWallet, IVersionedWallet {
 	constructor(readonly payer: Keypair) {}
 
 	async signTransaction(tx: Transaction): Promise<Transaction> {
@@ -11,6 +16,13 @@ export class Wallet implements IWallet {
 		return tx;
 	}
 
+	async signVersionedTransaction(
+		tx: VersionedTransaction
+	): Promise<VersionedTransaction> {
+		tx.sign([this.payer]);
+		return tx;
+	}
+
 	async signAllTransactions(txs: Transaction[]): Promise<Transaction[]> {
 		return txs.map((t) => {
 			t.partialSign(this.payer);
@@ -18,6 +30,15 @@ export class Wallet implements IWallet {
 		});
 	}
 
+	async signAllVersionedTransactions(
+		txs: VersionedTransaction[]
+	): Promise<VersionedTransaction[]> {
+		return txs.map((t) => {
+			t.sign([this.payer]);
+			return t;
+		});
+	}
+
 	get publicKey(): PublicKey {
 		return this.payer.publicKey;
 	}
@@ -27,17 +48,18 @@ export function loadKeypair(privateKey: string): Keypair {
 	// try to load privateKey as a filepath
 	let loadedKey: Uint8Array;
 	if (fs.existsSync(privateKey)) {
-		loadedKey = new Uint8Array(
-			JSON.parse(fs.readFileSync(privateKey).toString())
+		privateKey = fs.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.decode(privateKey));
-		}
+		privateKey = privateKey.replace(/\s/g, '');
+		loadedKey = new Uint8Array(bs58.decode(privateKey));
 	}
 
 	return Keypair.fromSecretKey(Uint8Array.from(loadedKey));

package/tests/dlob/helpers.ts

@@ -114,6 +114,7 @@ export const mockAMM: AMM = {
 	totalSocialLoss: new BN(0),
 	baseAssetAmountPerLp: new BN(0),
 	quoteAssetAmountPerLp: new BN(0),
+	targetBaseAssetAmountPerLp: 0,
 
 	quoteBreakEvenAmountLong: new BN(0),
 	quoteBreakEvenAmountShort: new BN(0),