@drift-labs/sdk 2.49.0-beta.5 → 2.49.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.49.0-beta.5
+2.49.0-beta.7

package/lib/driftClient.js

@@ -421,7 +421,7 @@ class DriftClient {
         }
         return result;
     }
-    async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+    async initializeUserAccount(subAccountId = 0, name, referrerInfo) {
         const initializeIxs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         if (subAccountId === 0) {
@@ -435,7 +435,7 @@ class DriftClient {
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
-    async getInitializeUserInstructions(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+    async getInitializeUserInstructions(subAccountId = 0, name, referrerInfo) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, subAccountId);
         const remainingAccounts = new Array();
         if (referrerInfo !== undefined) {
@@ -459,6 +459,14 @@ class DriftClient {
                 isSigner: false,
             });
         }
+        if (name === undefined) {
+            if (subAccountId === 0) {
+                name = userName_1.DEFAULT_USER_NAME;
+            }
+            else {
+                name = `Subaccount ${subAccountId + 1}`;
+            }
+        }
         const nameBuffer = (0, userName_1.encodeName)(name);
         const initializeUserAccountIx = await this.program.instruction.initializeUser(subAccountId, nameBuffer, {
             accounts: {
@@ -975,7 +983,7 @@ class DriftClient {
         return txSig;
     }
     async getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, reduceOnly = false, userInitialized = true) {
-        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId);
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
         let remainingAccounts = [];
         if (userInitialized) {
             remainingAccounts = this.getRemainingAccounts({
@@ -1055,7 +1063,7 @@ class DriftClient {
      * @param fromSubAccountId
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo, txParams) {
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, txParams) {
         var _a;
         const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);

package/package.json

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

package/src/driftClient.ts

@@ -710,7 +710,7 @@ export class DriftClient {
 
 	public async initializeUserAccount(
 		subAccountId = 0,
-		name = DEFAULT_USER_NAME,
+		name?: string,
 		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
 		const initializeIxs = [];
@@ -729,6 +729,7 @@ export class DriftClient {
 				initializeIxs.push(await this.getInitializeUserStatsIx());
 			}
 		}
+
 		initializeIxs.push(initializeUserAccountIx);
 		const tx = await this.buildTransaction(initializeIxs);
 
@@ -741,7 +742,7 @@ export class DriftClient {
 
 	async getInitializeUserInstructions(
 		subAccountId = 0,
-		name = DEFAULT_USER_NAME,
+		name?: string,
 		referrerInfo?: ReferrerInfo
 	): Promise<[PublicKey, TransactionInstruction]> {
 		const userAccountPublicKey = await getUserAccountPublicKey(
@@ -777,6 +778,14 @@ export class DriftClient {
 			});
 		}
 
+		if (name === undefined) {
+			if (subAccountId === 0) {
+				name = DEFAULT_USER_NAME;
+			} else {
+				name = `Subaccount ${subAccountId + 1}`;
+			}
+		}
+
 		const nameBuffer = encodeName(name);
 		const initializeUserAccountIx =
 			await this.program.instruction.initializeUser(subAccountId, nameBuffer, {
@@ -1677,7 +1686,7 @@ export class DriftClient {
 		const userAccountPublicKey = await getUserAccountPublicKey(
 			this.program.programId,
 			this.authority,
-			subAccountId
+			subAccountId ?? this.activeSubAccountId
 		);
 
 		let remainingAccounts = [];
@@ -1809,7 +1818,7 @@ export class DriftClient {
 		userTokenAccount: PublicKey,
 		marketIndex = 0,
 		subAccountId = 0,
-		name = DEFAULT_USER_NAME,
+		name?: string,
 		fromSubAccountId?: number,
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams