@drift-labs/sdk 2.90.0-beta.3 → 2.90.0-beta.5

package/VERSION

@@ -1 +1 @@
-2.90.0-beta.3
+2.90.0-beta.5

package/lib/adminClient.js

@@ -446,15 +446,14 @@ class AdminClient extends driftClient_1.DriftClient {
         const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
         return await this.program.instruction.depositIntoSpotMarketVault(amount, {
             accounts: {
-                admin: this.isSubscribed
-                    ? this.getStateAccount().admin
-                    : this.wallet.publicKey,
+                admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 sourceVault,
                 spotMarket: spotMarket.pubkey,
                 spotMarketVault: spotMarket.vault,
                 tokenProgram,
             },
+            remainingAccounts,
         });
     }
     async updateAdmin(admin) {

package/lib/driftClient.d.ts

@@ -253,7 +253,7 @@ export declare class DriftClient {
     }>;
     getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
     addTokenMintToRemainingAccounts(spotMarketAccount: SpotMarketAccount, remainingAccounts: AccountMeta[]): void;
-    getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey): anchor.web3.TransactionInstruction;
+    getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey, tokenProgram: PublicKey): anchor.web3.TransactionInstruction;
     createInitializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number): Promise<[Transaction | VersionedTransaction, PublicKey]>;
     /**
      * Creates the User account for a user, and deposits some initial collateral

package/lib/driftClient.js

@@ -1202,8 +1202,8 @@ class DriftClient {
             });
         }
     }
-    getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress) {
-        return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress);
+    getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress, tokenProgram) {
+        return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress, tokenProgram);
     }
     async createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
         const ixs = [];
@@ -1306,7 +1306,7 @@ class DriftClient {
         else {
             const accountExists = await this.checkIfAccountExists(associatedTokenAddress);
             if (!accountExists) {
-                const createAssociatedTokenAccountIx = this.getAssociatedTokenAccountCreationIx(spotMarketAccount.mint, associatedTokenAddress);
+                const createAssociatedTokenAccountIx = this.getAssociatedTokenAccountCreationIx(spotMarketAccount.mint, associatedTokenAddress, this.getTokenProgramForSpotMarket(spotMarketAccount));
                 withdrawIxs.push(createAssociatedTokenAccountIx);
             }
         }

package/package.json

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

package/src/adminClient.ts

@@ -1030,15 +1030,14 @@ export class AdminClient extends DriftClient {
 		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
 		return await this.program.instruction.depositIntoSpotMarketVault(amount, {
 			accounts: {
-				admin: this.isSubscribed
-					? this.getStateAccount().admin
-					: this.wallet.publicKey,
+				admin: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),
 				sourceVault,
 				spotMarket: spotMarket.pubkey,
 				spotMarketVault: spotMarket.vault,
 				tokenProgram,
 			},
+			remainingAccounts,
 		});
 	}
 

package/src/driftClient.ts

@@ -2091,13 +2091,15 @@ export class DriftClient {
 
 	public getAssociatedTokenAccountCreationIx(
 		tokenMintAddress: PublicKey,
-		associatedTokenAddress: PublicKey
+		associatedTokenAddress: PublicKey,
+		tokenProgram: PublicKey
 	): anchor.web3.TransactionInstruction {
 		return createAssociatedTokenAccountInstruction(
 			this.wallet.publicKey,
 			associatedTokenAddress,
 			this.wallet.publicKey,
-			tokenMintAddress
+			tokenMintAddress,
+			tokenProgram
 		);
 	}
 
@@ -2359,7 +2361,8 @@ export class DriftClient {
 				const createAssociatedTokenAccountIx =
 					this.getAssociatedTokenAccountCreationIx(
 						spotMarketAccount.mint,
-						associatedTokenAddress
+						associatedTokenAddress,
+						this.getTokenProgramForSpotMarket(spotMarketAccount)
 					);
 
 				withdrawIxs.push(createAssociatedTokenAccountIx);