@drift-labs/sdk 2.87.0-beta.5 → 2.87.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.87.0-beta.5
+2.87.0-beta.6

package/lib/addresses/pda.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN } from '@coral-xyz/anchor';
+import { SpotMarketAccount } from '..';
 export declare function getDriftStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
 export declare function getDriftStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
 export declare function getUserAccountPublicKeyAndNonce(programId: PublicKey, authority: PublicKey, subAccountId?: number): Promise<[PublicKey, number]>;
@@ -22,3 +23,4 @@ export declare function getReferrerNamePublicKeySync(programId: PublicKey, nameB
 export declare function getProtocolIfSharesTransferConfigPublicKey(programId: PublicKey): PublicKey;
 export declare function getPrelaunchOraclePublicKey(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getPythPullOraclePublicKey(progarmId: PublicKey, feedId: Uint8Array): PublicKey;
+export declare function getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;

package/lib/addresses/pda.js

@@ -23,9 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
+const spl_token_1 = require("@solana/spl-token");
 async function getDriftStateAccountPublicKeyAndNonce(programId) {
     return web3_js_1.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('drift_state'))], programId);
 }
@@ -158,3 +159,10 @@ function getPythPullOraclePublicKey(progarmId, feedId) {
     ], progarmId)[0];
 }
 exports.getPythPullOraclePublicKey = getPythPullOraclePublicKey;
+function getTokenProgramForSpotMarket(spotMarketAccount) {
+    if (spotMarketAccount.tokenProgram === 1) {
+        return spl_token_1.TOKEN_2022_PROGRAM_ID;
+    }
+    return spl_token_1.TOKEN_PROGRAM_ID;
+}
+exports.getTokenProgramForSpotMarket = getTokenProgramForSpotMarket;

package/lib/adminClient.js

@@ -82,6 +82,7 @@ class AdminClient extends driftClient_1.DriftClient {
         const spotMarket = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
         const spotMarketVault = await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, spotMarketIndex);
         const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, spotMarketIndex);
+        const tokenProgram = (await this.connection.getAccountInfo(mint)).owner;
         const nameBuffer = (0, userName_1.encodeName)(name);
         const initializeIx = await this.program.instruction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, nameBuffer, {
             accounts: {
@@ -97,7 +98,7 @@ class AdminClient extends driftClient_1.DriftClient {
                 oracle,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
         });
         return initializeIx;

package/lib/bankrun/bankrunConnection.js

@@ -78,7 +78,7 @@ class BankrunConnection {
     }
     async getTokenAccount(publicKey) {
         const info = await this.getAccountInfo(publicKey);
-        return (0, spl_token_1.unpackAccount)(publicKey, info, spl_token_1.TOKEN_PROGRAM_ID);
+        return (0, spl_token_1.unpackAccount)(publicKey, info, info.owner);
     }
     async getMultipleAccountsInfo(publicKeys, _commitmentOrConfig) {
         const accountInfos = [];

package/lib/constants/spotMarkets.js

@@ -39,6 +39,16 @@ exports.DevnetSpotMarkets = [
         serumMarket: new web3_js_1.PublicKey('AGsmbVu3MS9u68GEYABWosQQCZwmLcBHu4pWEuBYH7Za'),
         pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
     },
+    {
+        symbol: 'PYUSD',
+        marketIndex: 3,
+        oracle: new web3_js_1.PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('GLfF72ZCUnS6N9iDJw8kedHzd6WFVf3VbpwdKKy76FRk'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692',
+    },
 ];
 exports.MainnetSpotMarkets = [
     {

package/lib/dlob/orderBookLevels.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { BN, DLOBNode, OraclePriceData, PerpMarketAccount } from '..';
 import { PublicKey } from '@solana/web3.js';
-type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix';
+type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix' | 'openbook';
 export type L2Level = {
     price: BN;
     size: BN;

package/lib/driftClient.d.ts

@@ -230,8 +230,8 @@ export declare class DriftClient {
      * @param useNative
      */
     getAssociatedTokenAccount(marketIndex: number, useNative?: boolean): Promise<PublicKey>;
-    createAssociatedTokenAccountIdempotentInstruction(account: PublicKey, payer: PublicKey, owner: PublicKey, mint: PublicKey): TransactionInstruction;
-    createDepositTxn(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, txParams?: TxParams): Promise<ReturnType<typeof this.buildTransaction>>;
+    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>;
     /**
      * Deposit funds into the given spot market
      *
@@ -250,6 +250,7 @@ export declare class DriftClient {
         signers: Signer[];
         pubkey: PublicKey;
     }>;
+    addTokenMintToRemainingAccounts(spotMarketAccount: SpotMarketAccount, remainingAccounts: AccountMeta[]): void;
     getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: 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]>;
     /**
@@ -662,7 +663,7 @@ export declare class DriftClient {
     getOracleDataForSpotMarket(marketIndex: number): OraclePriceData;
     initializeInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getInitializeInsuranceFundStakeIx(marketIndex: number): Promise<TransactionInstruction>;
-    getAddInsuranceFundStakeIx(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey, fromSubAccount?: boolean): Promise<TransactionInstruction>;
+    getAddInsuranceFundStakeIx(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     /**
      * Add to an insurance fund stake and optionally initialize the account
      */
@@ -689,8 +690,8 @@ export declare class DriftClient {
     requestRemoveInsuranceFundStake(marketIndex: number, amount: BN, txParams?: TxParams): Promise<TransactionSignature>;
     cancelRequestRemoveInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
-    settleRevenueToInsuranceFund(spotMarketIndex: number, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
-    getSettleRevenueToInsuranceFundIx(spotMarketIndex: number, subAccountId?: number): Promise<TransactionInstruction>;
+    settleRevenueToInsuranceFund(spotMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getSettleRevenueToInsuranceFundIx(spotMarketIndex: number): Promise<TransactionInstruction>;
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;
     getDepositIntoSpotMarketRevenuePoolIx(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -52,6 +52,7 @@ const spotPosition_1 = require("./math/spotPosition");
 const market_1 = require("./math/market");
 const fetch_1 = require("./accounts/fetch");
 const spotMarket_1 = require("./math/spotMarket");
+const pda_2 = require("./addresses/pda");
 const memcmp_1 = require("./memcmp");
 const marinade_1 = require("./marinade");
 const orderParams_1 = require("./orderParams");
@@ -1062,7 +1063,7 @@ class DriftClient {
         const mint = spotMarket.mint;
         return await (0, spl_token_1.getAssociatedTokenAddress)(mint, this.wallet.publicKey);
     }
-    createAssociatedTokenAccountIdempotentInstruction(account, payer, owner, mint) {
+    createAssociatedTokenAccountIdempotentInstruction(account, payer, owner, mint, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
         return new web3_js_1.TransactionInstruction({
             keys: [
                 { pubkey: payer, isSigner: true, isWritable: true },
@@ -1074,7 +1075,7 @@ class DriftClient {
                     isSigner: false,
                     isWritable: false,
                 },
-                { pubkey: spl_token_1.TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+                { pubkey: tokenProgram, isSigner: false, isWritable: false },
             ],
             programId: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             data: Buffer.from([0x1]),
@@ -1133,6 +1134,8 @@ class DriftClient {
             });
         }
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarketAccount);
         return await this.program.instruction.deposit(marketIndex, amount, reduceOnly, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1142,7 +1145,7 @@ class DriftClient {
                 userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
                 authority: this.wallet.publicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -1184,6 +1187,15 @@ class DriftClient {
         result.ixs.push((0, spl_token_1.createInitializeAccountInstruction)(wrappedSolAccount, spotMarkets_1.WRAPPED_SOL_MINT, authority));
         return result;
     }
+    addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts) {
+        if (spotMarketAccount.tokenProgram === 1) {
+            remainingAccounts.push({
+                pubkey: spotMarketAccount.mint,
+                isSigner: false,
+                isWritable: false,
+            });
+        }
+    }
     getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress) {
         return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress);
     }
@@ -1347,6 +1359,8 @@ class DriftClient {
             readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarketAccount);
         return await this.program.instruction.withdraw(marketIndex, amount, reduceOnly, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1357,7 +1371,7 @@ class DriftClient {
                 userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
                 authority: this.wallet.publicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -2357,14 +2371,16 @@ class DriftClient {
             outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false);
             const accountInfo = await this.connection.getAccountInfo(outAssociatedTokenAccount);
             if (!accountInfo) {
-                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint));
+                const tokenProgram = (0, pda_2.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 accountInfo = await this.connection.getAccountInfo(inAssociatedTokenAccount);
             if (!accountInfo) {
-                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint));
+                const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(outMarket);
+                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
             }
         }
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
@@ -2479,6 +2495,27 @@ class DriftClient {
         });
         const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
         const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const outTokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(outSpotMarket);
+        const inTokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(inSpotMarket);
+        if (!outTokenProgram.equals(inTokenProgram)) {
+            remainingAccounts.push({
+                pubkey: outTokenProgram,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
+        if (outSpotMarket.tokenProgram === 1 || inSpotMarket.tokenProgram === 1) {
+            remainingAccounts.push({
+                pubkey: inSpotMarket.mint,
+                isWritable: false,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: outSpotMarket.mint,
+                isWritable: false,
+                isSigner: false,
+            });
+        }
         const beginSwapIx = await this.program.instruction.beginSwap(inMarketIndex, outMarketIndex, amountIn, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -2489,7 +2526,7 @@ class DriftClient {
                 inSpotMarketVault: inSpotMarket.vault,
                 inTokenAccount,
                 outTokenAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: inTokenProgram,
                 driftSigner: this.getStateAccount().signer,
                 instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
@@ -2505,7 +2542,7 @@ class DriftClient {
                 inSpotMarketVault: inSpotMarket.vault,
                 inTokenAccount,
                 outTokenAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: inTokenProgram,
                 driftSigner: this.getStateAccount().signer,
                 instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
@@ -3315,6 +3352,7 @@ class DriftClient {
             writableSpotMarketIndexes: [marketIndex],
         });
         const spotMarket = this.getSpotMarketAccount(marketIndex);
+        this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
         return await this.program.instruction.resolveSpotBankruptcy(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3444,14 +3482,12 @@ class DriftClient {
             },
         });
     }
-    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey, fromSubAccount) {
+    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: fromSubAccount ? [this.getUserAccount()] : [],
-            useMarketLastSlotCache: fromSubAccount ? true : false,
-            writableSpotMarketIndexes: [marketIndex],
-        });
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
+        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarket);
         const ix = this.program.instruction.addInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3463,7 +3499,7 @@ class DriftClient {
                 insuranceFundVault: spotMarket.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -3500,7 +3536,7 @@ class DriftClient {
             const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
             addIfStakeIxs.push(initializeIx);
         }
-        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount, fromSubaccount);
+        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount);
         addIfStakeIxs.push(addFundsIx);
         if (createWSOLTokenAccount) {
             addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
@@ -3512,10 +3548,6 @@ class DriftClient {
     async requestRemoveInsuranceFundStake(marketIndex, amount, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [],
-            writableSpotMarketIndexes: [marketIndex],
-        });
         const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3525,7 +3557,6 @@ class DriftClient {
                 authority: this.wallet.publicKey,
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
             },
-            remainingAccounts,
         });
         const tx = await this.buildTransaction(ix, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -3534,11 +3565,6 @@ class DriftClient {
     async cancelRequestRemoveInsuranceFundStake(marketIndex, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
-            useMarketLastSlotCache: true,
-            writableSpotMarketIndexes: [marketIndex],
-        });
         const ix = await this.program.instruction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3548,7 +3574,6 @@ class DriftClient {
                 authority: this.wallet.publicKey,
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
             },
-            remainingAccounts,
         });
         const tx = await this.buildTransaction(ix, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -3577,10 +3602,9 @@ class DriftClient {
                 removeIfStakeIxs.push(createTokenAccountIx);
             }
         }
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [],
-            writableSpotMarketIndexes: [marketIndex],
-        });
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarketAccount);
         const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3591,7 +3615,7 @@ class DriftClient {
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
                 userTokenAccount: tokenAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -3604,18 +3628,15 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
-    async settleRevenueToInsuranceFund(spotMarketIndex, subAccountId, txParams) {
-        const tx = await this.buildTransaction(await this.getSettleRevenueToInsuranceFundIx(spotMarketIndex, subAccountId), txParams);
+    async settleRevenueToInsuranceFund(spotMarketIndex, txParams) {
+        const tx = await this.buildTransaction(await this.getSettleRevenueToInsuranceFundIx(spotMarketIndex), txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getSettleRevenueToInsuranceFundIx(spotMarketIndex, subAccountId) {
+    async getSettleRevenueToInsuranceFundIx(spotMarketIndex) {
         const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
-            useMarketLastSlotCache: true,
-            writableSpotMarketIndexes: [spotMarketIndex],
-        });
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
         const ix = await this.program.instruction.settleRevenueToInsuranceFund(spotMarketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3655,6 +3676,9 @@ class DriftClient {
     }
     async getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey) {
         const spotMarket = await this.getSpotMarketAccount(marketIndex);
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
+        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarket);
         const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3662,7 +3686,7 @@ class DriftClient {
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
                 userTokenAccount: userTokenAccountPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
         });
         return ix;
@@ -3878,10 +3902,18 @@ class DriftClient {
         if (!pullIx) {
             return undefined;
         }
-        const tx = await this.buildTransaction(pullIx, undefined, 0, [
-            await this.fetchMarketLookupTableAccount(),
-        ]);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        const tx = await (0, on_demand_1.asV0Tx)({
+            connection: this.connection,
+            ixs: [pullIx],
+            payer: this.wallet.publicKey,
+            computeUnitLimitMultiple: 1.3,
+            lookupTables: [await this.fetchMarketLookupTableAccount()],
+        });
+        const { txSig } = await this.sendTransaction(tx, [], {
+            commitment: 'processed',
+            skipPreflight: true,
+            maxRetries: 0,
+        });
         return txSig;
     }
     async getBuildEncodedVaaIxs(vaa, guardianSet) {

package/lib/idl/drift.json

@@ -2341,7 +2341,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2401,7 +2401,7 @@
             "accounts": [
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2441,7 +2441,7 @@
             "accounts": [
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2482,7 +2482,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -3362,6 +3362,27 @@
                 }
             ]
         },
+        {
+            "name": "initializePredictionMarket",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "deleteInitializedPerpMarket",
             "accounts": [
@@ -6835,12 +6856,16 @@
                         ],
                         "type": "u8"
                     },
+                    {
+                        "name": "tokenProgram",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                42
+                                41
                             ]
                         }
                     }
@@ -10100,6 +10125,9 @@
                     },
                     {
                         "name": "Future"
+                    },
+                    {
+                        "name": "Prediction"
                     }
                 ]
             }
@@ -12764,6 +12792,11 @@
             "code": 6281,
             "name": "InvalidOpenbookV2Market",
             "msg": "InvalidOpenbookV2Market"
+        },
+        {
+            "code": 6282,
+            "name": "NonZeroTransferFee",
+            "msg": "Non zero transfer fee"
         }
     ],
     "metadata": {