@drift-labs/sdk 2.36.1-beta.0 → 2.36.1-beta.1

package/VERSION

@@ -1 +1 @@
-2.36.1-beta.0
+2.36.1-beta.1

package/lib/driftClient.d.ts

@@ -207,6 +207,7 @@ export declare class DriftClient {
     private checkIfAccountExists;
     getWrappedSolAccountCreationIxs(amount: BN, includeRent?: boolean): Promise<{
         ixs: anchor.web3.TransactionInstruction[];
+        /** @deprecated - this array is always going to be empty, in the current implementation */
         signers: Signer[];
         pubkey: PublicKey;
     }>;

package/lib/driftClient.js

@@ -931,12 +931,11 @@ class DriftClient {
         const signerAuthority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAccount.equals(signerAuthority);
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             associatedTokenAccount = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
             });
-            signers.forEach((signer) => additionalSigners.push(signer));
         }
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, true);
         tx.add(depositCollateralIx);
@@ -990,26 +989,30 @@ class DriftClient {
         }
     }
     async getWrappedSolAccountCreationIxs(amount, includeRent) {
-        const wrappedSolAccount = new web3_js_1.Keypair();
+        const authority = this.wallet.publicKey;
+        // Generate a random seed for wrappedSolAccount.
+        const seed = web3_js_1.Keypair.generate().publicKey.toBase58().slice(0, 32);
+        // Calculate a publicKey that will be controlled by the authority.
+        const wrappedSolAccount = await web3_js_1.PublicKey.createWithSeed(authority, seed, spl_token_1.TOKEN_PROGRAM_ID);
         const result = {
             ixs: [],
             signers: [],
-            pubkey: wrappedSolAccount.publicKey,
+            pubkey: wrappedSolAccount,
         };
         const rentSpaceLamports = new anchor_1.BN(web3_js_1.LAMPORTS_PER_SOL / 100);
         const lamports = includeRent
             ? amount.add(rentSpaceLamports)
             : rentSpaceLamports;
-        const authority = this.wallet.publicKey;
-        result.ixs.push(web3_js_1.SystemProgram.createAccount({
+        result.ixs.push(web3_js_1.SystemProgram.createAccountWithSeed({
             fromPubkey: authority,
-            newAccountPubkey: wrappedSolAccount.publicKey,
+            basePubkey: authority,
+            seed,
+            newAccountPubkey: wrappedSolAccount,
             lamports: lamports.toNumber(),
             space: 165,
             programId: spl_token_1.TOKEN_PROGRAM_ID,
         }));
-        result.ixs.push((0, spl_token_1.createInitializeAccountInstruction)(wrappedSolAccount.publicKey, spotMarkets_1.WRAPPED_SOL_MINT, authority));
-        result.signers.push(wrappedSolAccount);
+        result.ixs.push((0, spl_token_1.createInitializeAccountInstruction)(wrappedSolAccount, spotMarkets_1.WRAPPED_SOL_MINT, authority));
         return result;
     }
     getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress) {
@@ -1046,12 +1049,11 @@ class DriftClient {
             !isNaN(fromSubAccountId);
         const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
         if (createWSOLTokenAccount) {
-            const { ixs: startIxs, signers, pubkey, } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             userTokenAccount = pubkey;
             startIxs.forEach((ix) => {
                 tx.add(ix);
             });
-            signers.forEach((signer) => additionalSigners.push(signer));
         }
         const depositCollateralIx = isFromSubaccount
             ? await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, subAccountId)
@@ -1104,12 +1106,11 @@ class DriftClient {
         const authority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAddress.equals(authority);
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, false);
+            const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, false);
             associatedTokenAddress = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
             });
-            signers.forEach((signer) => additionalSigners.push(signer));
         }
         else {
             const accountExists = await this.checkIfAccountExists(associatedTokenAddress);
@@ -2904,12 +2905,11 @@ class DriftClient {
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
         let tokenAccount;
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
             });
-            signers.forEach((signer) => additionalSigners.push(signer));
         }
         else {
             tokenAccount = collateralAccountPublicKey;
@@ -2983,12 +2983,11 @@ class DriftClient {
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
         let tokenAccount;
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(numericConstants_1.ZERO, true);
+            const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(numericConstants_1.ZERO, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
             });
-            signers.forEach((signer) => additionalSigners.push(signer));
         }
         else {
             tokenAccount = collateralAccountPublicKey;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.36.1-beta.0",
+	"version": "2.36.1-beta.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -1568,16 +1568,16 @@ export class DriftClient {
 			isSolMarket && associatedTokenAccount.equals(signerAuthority);
 
 		if (createWSOLTokenAccount) {
-			const { ixs, signers, pubkey } =
-				await this.getWrappedSolAccountCreationIxs(amount, true);
+			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
+				amount,
+				true
+			);
 
 			associatedTokenAccount = pubkey;
 
 			ixs.forEach((ix) => {
 				tx.add(ix);
 			});
-
-			signers.forEach((signer) => additionalSigners.push(signer));
 		}
 
 		const depositCollateralIx = await this.getDepositInstruction(
@@ -1677,15 +1677,26 @@ export class DriftClient {
 		includeRent?: boolean
 	): Promise<{
 		ixs: anchor.web3.TransactionInstruction[];
+		/** @deprecated - this array is always going to be empty, in the current implementation */
 		signers: Signer[];
 		pubkey: PublicKey;
 	}> {
-		const wrappedSolAccount = new Keypair();
+		const authority = this.wallet.publicKey;
+
+		// Generate a random seed for wrappedSolAccount.
+		const seed = Keypair.generate().publicKey.toBase58().slice(0, 32);
+
+		// Calculate a publicKey that will be controlled by the authority.
+		const wrappedSolAccount = await PublicKey.createWithSeed(
+			authority,
+			seed,
+			TOKEN_PROGRAM_ID
+		);
 
 		const result = {
 			ixs: [],
 			signers: [],
-			pubkey: wrappedSolAccount.publicKey,
+			pubkey: wrappedSolAccount,
 		};
 
 		const rentSpaceLamports = new BN(LAMPORTS_PER_SOL / 100);
@@ -1694,12 +1705,12 @@ export class DriftClient {
 			? amount.add(rentSpaceLamports)
 			: rentSpaceLamports;
 
-		const authority = this.wallet.publicKey;
-
 		result.ixs.push(
-			SystemProgram.createAccount({
+			SystemProgram.createAccountWithSeed({
 				fromPubkey: authority,
-				newAccountPubkey: wrappedSolAccount.publicKey,
+				basePubkey: authority,
+				seed,
+				newAccountPubkey: wrappedSolAccount,
 				lamports: lamports.toNumber(),
 				space: 165,
 				programId: TOKEN_PROGRAM_ID,
@@ -1708,14 +1719,12 @@ export class DriftClient {
 
 		result.ixs.push(
 			createInitializeAccountInstruction(
-				wrappedSolAccount.publicKey,
+				wrappedSolAccount,
 				WRAPPED_SOL_MINT,
 				authority
 			)
 		);
 
-		result.signers.push(wrappedSolAccount);
-
 		return result;
 	}
 
@@ -1791,19 +1800,14 @@ export class DriftClient {
 			isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
 
 		if (createWSOLTokenAccount) {
-			const {
-				ixs: startIxs,
-				signers,
-				pubkey,
-			} = await this.getWrappedSolAccountCreationIxs(amount, true);
+			const { ixs: startIxs, pubkey } =
+				await this.getWrappedSolAccountCreationIxs(amount, true);
 
 			userTokenAccount = pubkey;
 
 			startIxs.forEach((ix) => {
 				tx.add(ix);
 			});
-
-			signers.forEach((signer) => additionalSigners.push(signer));
 		}
 
 		const depositCollateralIx = isFromSubaccount
@@ -1935,16 +1939,16 @@ export class DriftClient {
 			isSolMarket && associatedTokenAddress.equals(authority);
 
 		if (createWSOLTokenAccount) {
-			const { ixs, signers, pubkey } =
-				await this.getWrappedSolAccountCreationIxs(amount, false);
+			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
+				amount,
+				false
+			);
 
 			associatedTokenAddress = pubkey;
 
 			ixs.forEach((ix) => {
 				tx.add(ix);
 			});
-
-			signers.forEach((signer) => additionalSigners.push(signer));
 		} else {
 			const accountExists = await this.checkIfAccountExists(
 				associatedTokenAddress
@@ -5251,14 +5255,14 @@ export class DriftClient {
 		let tokenAccount;
 
 		if (createWSOLTokenAccount) {
-			const { ixs, signers, pubkey } =
-				await this.getWrappedSolAccountCreationIxs(amount, true);
+			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
+				amount,
+				true
+			);
 			tokenAccount = pubkey;
 			ixs.forEach((ix) => {
 				tx.add(ix);
 			});
-
-			signers.forEach((signer) => additionalSigners.push(signer));
 		} else {
 			tokenAccount = collateralAccountPublicKey;
 		}
@@ -5400,14 +5404,14 @@ export class DriftClient {
 		let tokenAccount;
 
 		if (createWSOLTokenAccount) {
-			const { ixs, signers, pubkey } =
-				await this.getWrappedSolAccountCreationIxs(ZERO, true);
+			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
+				ZERO,
+				true
+			);
 			tokenAccount = pubkey;
 			ixs.forEach((ix) => {
 				tx.add(ix);
 			});
-
-			signers.forEach((signer) => additionalSigners.push(signer));
 		} else {
 			tokenAccount = collateralAccountPublicKey;
 		}