@drift-labs/sdk 2.88.0-beta.1 → 2.88.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.88.0-beta.1
+2.88.0-beta.3

package/lib/constants/spotMarkets.js

@@ -301,6 +301,16 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.NINE,
         launchTs: 1721316817000,
     },
+    {
+        symbol: 'PYUSD',
+        marketIndex: 22,
+        oracle: new web3_js_1.PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
+        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        mint: new web3_js_1.PublicKey('2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692',
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

package/lib/driftClient.d.ts

@@ -228,8 +228,9 @@ export declare class DriftClient {
      * Get the associated token address for the given spot market
      * @param marketIndex
      * @param useNative
+     * @param tokenProgram
      */
-    getAssociatedTokenAccount(marketIndex: number, useNative?: boolean): Promise<PublicKey>;
+    getAssociatedTokenAccount(marketIndex: number, useNative?: boolean, tokenProgram?: anchor.web3.PublicKey): Promise<PublicKey>;
     createAssociatedTokenAccountIdempotentInstruction(account: PublicKey, payer: PublicKey, owner: PublicKey, mint: PublicKey, tokenProgram?: anchor.web3.PublicKey): TransactionInstruction;
     createDepositTxn(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, txParams?: TxParams): Promise<VersionedTransaction | Transaction>;
     /**

package/lib/driftClient.js

@@ -1053,14 +1053,15 @@ class DriftClient {
      * Get the associated token address for the given spot market
      * @param marketIndex
      * @param useNative
+     * @param tokenProgram
      */
-    async getAssociatedTokenAccount(marketIndex, useNative = true) {
+    async getAssociatedTokenAccount(marketIndex, useNative = true, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         if (useNative && spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
             return this.wallet.publicKey;
         }
         const mint = spotMarket.mint;
-        return await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.wallet.publicKey);
+        return await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.wallet.publicKey, undefined, tokenProgram);
     }
     createAssociatedTokenAccountIdempotentInstruction(account, payer, owner, mint, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
         return new web3_js_1.TransactionInstruction({
@@ -2373,18 +2374,18 @@ class DriftClient {
         });
         const preInstructions = [];
         if (!outAssociatedTokenAccount) {
-            outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false);
+            const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
+            outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false, tokenProgram);
             const accountInfo = await this.connection.getAccountInfo(outAssociatedTokenAccount);
             if (!accountInfo) {
-                const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
                 preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint, tokenProgram));
             }
         }
         if (!inAssociatedTokenAccount) {
-            inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false);
+            const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
+            inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false, tokenProgram);
             const accountInfo = await this.connection.getAccountInfo(inAssociatedTokenAccount);
             if (!accountInfo) {
-                const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
                 preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
             }
         }
@@ -2440,17 +2441,19 @@ class DriftClient {
         });
         const preInstructions = [];
         if (!outAssociatedTokenAccount) {
-            outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false);
+            const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
+            outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false, tokenProgram);
             const accountInfo = await this.connection.getAccountInfo(outAssociatedTokenAccount);
             if (!accountInfo) {
-                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint));
+                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint, tokenProgram));
             }
         }
         if (!inAssociatedTokenAccount) {
-            inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false);
+            const tokenProgram = this.getTokenProgramForSpotMarket(inMarket);
+            inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false, tokenProgram);
             const accountInfo = await this.connection.getAccountInfo(inAssociatedTokenAccount);
             if (!accountInfo) {
-                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint));
+                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
             }
         }
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({

package/package.json

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

package/src/constants/spotMarkets.ts

@@ -373,6 +373,17 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precisionExp: NINE,
 		launchTs: 1721316817000,
 	},
+	{
+		symbol: 'PYUSD',
+		marketIndex: 22,
+		oracle: new PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
+		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
+		mint: new PublicKey('2b1kV6DkPAnxd5ixfnxCpjxmKwqjjaYmCZfHsFu24GXo'),
+		precision: new BN(10).pow(SIX),
+		precisionExp: SIX,
+		pythFeedId:
+			'0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692',
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

package/src/driftClient.ts

@@ -1813,17 +1813,24 @@ export class DriftClient {
 	 * Get the associated token address for the given spot market
 	 * @param marketIndex
 	 * @param useNative
+	 * @param tokenProgram
 	 */
 	public async getAssociatedTokenAccount(
 		marketIndex: number,
-		useNative = true
+		useNative = true,
+		tokenProgram = TOKEN_PROGRAM_ID
 	): Promise<PublicKey> {
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
 		if (useNative && spotMarket.mint.equals(WRAPPED_SOL_MINT)) {
 			return this.wallet.publicKey;
 		}
 		const mint = spotMarket.mint;
-		return await getAssociatedTokenAddress(mint, this.wallet.publicKey);
+		return await getAssociatedTokenAddress(
+			mint,
+			this.wallet.publicKey,
+			undefined,
+			tokenProgram
+		);
 	}
 
 	public createAssociatedTokenAccountIdempotentInstruction(
@@ -4250,17 +4257,17 @@ export class DriftClient {
 
 		const preInstructions = [];
 		if (!outAssociatedTokenAccount) {
+			const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
 			outAssociatedTokenAccount = await this.getAssociatedTokenAccount(
 				outMarket.marketIndex,
-				false
+				false,
+				tokenProgram
 			);
 
 			const accountInfo = await this.connection.getAccountInfo(
 				outAssociatedTokenAccount
 			);
 			if (!accountInfo) {
-				const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
-
 				preInstructions.push(
 					this.createAssociatedTokenAccountIdempotentInstruction(
 						outAssociatedTokenAccount,
@@ -4274,17 +4281,17 @@ export class DriftClient {
 		}
 
 		if (!inAssociatedTokenAccount) {
+			const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
 			inAssociatedTokenAccount = await this.getAssociatedTokenAccount(
 				inMarket.marketIndex,
-				false
+				false,
+				tokenProgram
 			);
 
 			const accountInfo = await this.connection.getAccountInfo(
 				inAssociatedTokenAccount
 			);
 			if (!accountInfo) {
-				const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
-
 				preInstructions.push(
 					this.createAssociatedTokenAccountIdempotentInstruction(
 						inAssociatedTokenAccount,
@@ -4390,9 +4397,11 @@ export class DriftClient {
 
 		const preInstructions = [];
 		if (!outAssociatedTokenAccount) {
+			const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
 			outAssociatedTokenAccount = await this.getAssociatedTokenAccount(
 				outMarket.marketIndex,
-				false
+				false,
+				tokenProgram
 			);
 
 			const accountInfo = await this.connection.getAccountInfo(
@@ -4404,16 +4413,19 @@ export class DriftClient {
 						outAssociatedTokenAccount,
 						this.provider.wallet.publicKey,
 						this.provider.wallet.publicKey,
-						outMarket.mint
+						outMarket.mint,
+						tokenProgram
 					)
 				);
 			}
 		}
 
 		if (!inAssociatedTokenAccount) {
+			const tokenProgram = this.getTokenProgramForSpotMarket(inMarket);
 			inAssociatedTokenAccount = await this.getAssociatedTokenAccount(
 				inMarket.marketIndex,
-				false
+				false,
+				tokenProgram
 			);
 
 			const accountInfo = await this.connection.getAccountInfo(
@@ -4425,7 +4437,8 @@ export class DriftClient {
 						inAssociatedTokenAccount,
 						this.provider.wallet.publicKey,
 						this.provider.wallet.publicKey,
-						inMarket.mint
+						inMarket.mint,
+						tokenProgram
 					)
 				);
 			}