add new bulk instruction packaging

Author: moosecat2

sdk/src/driftClient.ts

@@ -10478,15 +10478,7 @@ export class DriftClient {
 		inAmount: BN,
 		minOutAmount: BN,
 		lpPool: PublicKey,
-		constituentTargetBase: PublicKey,
-		constituentInTokenAccount: PublicKey,
-		constituentOutTokenAccount: PublicKey,
-		userInTokenAccount: PublicKey,
-		userOutTokenAccount: PublicKey,
-		inConstituent: PublicKey,
-		outConstituent: PublicKey,
-		inMarketMint: PublicKey,
-		outMarketMint: PublicKey,
+		userAuthority: PublicKey,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
@@ -10497,15 +10489,7 @@ export class DriftClient {
 					inAmount,
 					minOutAmount,
 					lpPool,
-					constituentTargetBase,
-					constituentInTokenAccount,
-					constituentOutTokenAccount,
-					userInTokenAccount,
-					userOutTokenAccount,
-					inConstituent,
-					outConstituent,
-					inMarketMint,
-					outMarketMint
+					userAuthority
 				),
 				txParams
 			),
@@ -10521,21 +10505,49 @@ export class DriftClient {
 		inAmount: BN,
 		minOutAmount: BN,
 		lpPool: PublicKey,
-		constituentTargetBase: PublicKey,
-		constituentInTokenAccount: PublicKey,
-		constituentOutTokenAccount: PublicKey,
-		userInTokenAccount: PublicKey,
-		userOutTokenAccount: PublicKey,
-		inConstituent: PublicKey,
-		outConstituent: PublicKey,
-		inMarketMint: PublicKey,
-		outMarketMint: PublicKey
+		userAuthority: PublicKey
 	): Promise<TransactionInstruction> {
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [],
 			readableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
 		});
 
+		const constituentInTokenAccount = getConstituentVaultPublicKey(
+			this.program.programId,
+			lpPool,
+			inMarketIndex
+		);
+		const constituentOutTokenAccount = getConstituentVaultPublicKey(
+			this.program.programId,
+			lpPool,
+			outMarketIndex
+		);
+		const userInTokenAccount = await getAssociatedTokenAddress(
+			this.getSpotMarketAccount(inMarketIndex).mint,
+			userAuthority
+		);
+		const userOutTokenAccount = await getAssociatedTokenAddress(
+			this.getSpotMarketAccount(outMarketIndex).mint,
+			userAuthority
+		);
+		const inConstituent = getConstituentPublicKey(
+			this.program.programId,
+			lpPool,
+			inMarketIndex
+		);
+		const outConstituent = getConstituentPublicKey(
+			this.program.programId,
+			lpPool,
+			outMarketIndex
+		);
+		const inMarketMint = this.getSpotMarketAccount(inMarketIndex).mint;
+		const outMarketMint = this.getSpotMarketAccount(outMarketIndex).mint;
+
+		const constituentTargetBase = getConstituentTargetBasePublicKey(
+			this.program.programId,
+			lpPool
+		);
+
 		return this.program.instruction.lpPoolSwap(
 			inMarketIndex,
 			outMarketIndex,
@@ -11245,6 +11257,30 @@ export class DriftClient {
 		return ixs;
 	}
 
+	async getAllLpPoolSwapIxs(
+		lpPool: LPPoolAccount,
+		constituentMap: ConstituentMap,
+		inMarketIndex: number,
+		outMarketIndex: number,
+		inAmount: BN,
+		minOutAmount: BN,
+		userAuthority: PublicKey
+	): Promise<TransactionInstruction[]> {
+		const ixs: TransactionInstruction[] = [];
+		ixs.push(...(await this.getAllUpdateLpPoolAumIxs(lpPool, constituentMap)));
+		ixs.push(
+			await this.getLpPoolSwapIx(
+				inMarketIndex,
+				outMarketIndex,
+				inAmount,
+				minOutAmount,
+				lpPool.pubkey,
+				userAuthority
+			)
+		);
+		return ixs;
+	}
+
 	async settlePerpToLpPool(
 		lpPoolName: number[],
 		perpMarketIndexes: number[]

tests/lpPoolSwap.ts

@@ -425,11 +425,6 @@ describe('LP Pool', () => {
 		expect(lpPool2.lastAum.gt(lpPool1.lastAum)).to.be.true;
 		console.log(`AUM: ${convertToNumber(lpPool2.lastAum, QUOTE_PRECISION)}`);
 
-		const constituentTargetWeightsPublicKey = getConstituentTargetBasePublicKey(
-			program.programId,
-			lpPoolKey
-		);
-
 		// swap c0 for c1
 
 		const adminAuth = adminClient.wallet.publicKey;
@@ -467,15 +462,7 @@ describe('LP Pool', () => {
 				new BN(224_300_000),
 				new BN(0),
 				lpPoolKey,
-				constituentTargetWeightsPublicKey,
-				const0TokenAccount,
-				const1TokenAccount,
-				c0UserTokenAccount,
-				c1UserTokenAccount,
-				const0Key,
-				const1Key,
-				usdcMint.publicKey,
-				spotTokenMint.publicKey
+				adminAuth
 			)
 		);