@drift-labs/sdk 2.87.0-beta.1 → 2.87.0-beta.10

package/lib/driftClient.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriftClient = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
+const anchor_30_1 = require("@coral-xyz/anchor-30");
 const bs58_1 = __importDefault(require("bs58"));
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("./types");
@@ -65,6 +66,8 @@ const config_2 = require("./config");
 const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
+const on_demand_1 = require("@switchboard-xyz/on-demand");
+const switchboard_on_demand_30_json_1 = __importDefault(require("./idl/switchboard_on_demand_30.json"));
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -1059,7 +1062,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 },
@@ -1071,7 +1074,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]),
@@ -1130,6 +1133,8 @@ class DriftClient {
             });
         }
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
         return await this.program.instruction.deposit(marketIndex, amount, reduceOnly, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1139,7 +1144,7 @@ class DriftClient {
                 userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
                 authority: this.wallet.publicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -1181,6 +1186,21 @@ class DriftClient {
         result.ixs.push((0, spl_token_1.createInitializeAccountInstruction)(wrappedSolAccount, spotMarkets_1.WRAPPED_SOL_MINT, authority));
         return result;
     }
+    getTokenProgramForSpotMarket(spotMarketAccount) {
+        if (spotMarketAccount.tokenProgram === 1) {
+            return spl_token_1.TOKEN_2022_PROGRAM_ID;
+        }
+        return spl_token_1.TOKEN_PROGRAM_ID;
+    }
+    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);
     }
@@ -1344,6 +1364,8 @@ class DriftClient {
             readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
         return await this.program.instruction.withdraw(marketIndex, amount, reduceOnly, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1354,7 +1376,7 @@ class DriftClient {
                 userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
                 authority: this.wallet.publicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -2354,14 +2376,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 = 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 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 = this.getTokenProgramForSpotMarket(outMarket);
+                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
             }
         }
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
@@ -2476,6 +2500,27 @@ class DriftClient {
         });
         const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
         const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const outTokenProgram = this.getTokenProgramForSpotMarket(outSpotMarket);
+        const inTokenProgram = this.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(),
@@ -2486,7 +2531,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,
             },
@@ -2502,7 +2547,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,
             },
@@ -3188,6 +3233,44 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    async liquidatePerpWithFill(userAccountPublicKey, userAccount, marketIndex, makerInfos, txParams, liquidatorSubAccountId) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpWithFillIx(userAccountPublicKey, userAccount, marketIndex, makerInfos, liquidatorSubAccountId), txParams), [], this.opts);
+        this.perpMarketLastSlotCache.set(marketIndex, slot);
+        return txSig;
+    }
+    async getLiquidatePerpWithFillIx(userAccountPublicKey, userAccount, marketIndex, makerInfos, liquidatorSubAccountId) {
+        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
+        const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            useMarketLastSlotCache: true,
+            writablePerpMarketIndexes: [marketIndex],
+        });
+        for (const makerInfo of makerInfos) {
+            remainingAccounts.push({
+                pubkey: makerInfo.maker,
+                isSigner: false,
+                isWritable: true,
+            });
+            remainingAccounts.push({
+                pubkey: makerInfo.makerStats,
+                isSigner: false,
+                isWritable: true,
+            });
+        }
+        return await this.program.instruction.liquidatePerpWithFill(marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                liquidator,
+                liquidatorStats: liquidatorStatsPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
     async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
@@ -3312,6 +3395,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(),
@@ -3441,14 +3525,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 = this.getTokenProgramForSpotMarket(spotMarket);
         const ix = this.program.instruction.addInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3460,7 +3542,7 @@ class DriftClient {
                 insuranceFundVault: spotMarket.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -3497,7 +3579,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, []));
@@ -3509,10 +3591,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(),
@@ -3522,7 +3600,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);
@@ -3531,11 +3608,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(),
@@ -3545,7 +3617,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);
@@ -3574,10 +3645,9 @@ class DriftClient {
                 removeIfStakeIxs.push(createTokenAccountIx);
             }
         }
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [],
-            writableSpotMarketIndexes: [marketIndex],
-        });
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
         const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3588,7 +3658,7 @@ class DriftClient {
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
                 userTokenAccount: tokenAccount,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
             remainingAccounts,
         });
@@ -3601,18 +3671,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(),
@@ -3652,6 +3719,9 @@ class DriftClient {
     }
     async getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey) {
         const spotMarket = await this.getSpotMarketAccount(marketIndex);
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
         const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3659,7 +3729,7 @@ class DriftClient {
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
                 userTokenAccount: userTokenAccountPublicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram,
             },
         });
         return ix;
@@ -3751,6 +3821,12 @@ class DriftClient {
         }
         return this.receiverProgram;
     }
+    getSwitchboardOnDemandProgram() {
+        if (this.sbOnDemandProgram === undefined) {
+            this.sbOnDemandProgram = new anchor_30_1.Program(switchboard_on_demand_30_json_1.default, this.provider);
+        }
+        return this.sbOnDemandProgram;
+    }
     async postPythPullOracleUpdateAtomic(vaaString, feedId) {
         const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(vaaString, feedId);
         const tx = await this.buildTransaction(postIxs);
@@ -3845,6 +3921,44 @@ class DriftClient {
             },
         });
     }
+    async getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures = 3) {
+        const program = this.getSwitchboardOnDemandProgram();
+        const feedAccount = new on_demand_1.PullFeed(program, feed);
+        if (!this.sbProgramFeedConfigs) {
+            this.sbProgramFeedConfigs = new Map();
+        }
+        if (!this.sbProgramFeedConfigs.has(feedAccount.pubkey.toString())) {
+            const feedConfig = await feedAccount.loadConfigs();
+            this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
+        }
+        const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
+            numSignatures,
+            feedConfigs: this.sbProgramFeedConfigs.get(feed.toString()),
+        });
+        if (!success) {
+            return undefined;
+        }
+        return pullIx;
+    }
+    async postSwitchboardOnDemandUpdate(feed, numSignatures = 3) {
+        const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures);
+        if (!pullIx) {
+            return undefined;
+        }
+        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) {
         const postIxs = [];
         if (this.wormholeProgram === undefined) {

package/lib/events/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Commitment, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord } from '../index';
 import { EventEmitter } from 'events';
 export type EventSubscriptionOptions = {
     address?: PublicKey;
@@ -40,9 +40,10 @@ export type EventMap = {
     InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
     CurveRecord: Event<CurveRecord>;
     SwapRecord: Event<SwapRecord>;
+    SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }

package/lib/events/types.js

@@ -17,6 +17,7 @@ exports.DefaultEventSubscriptionOptions = {
         'InsuranceFundStakeRecord',
         'CurveRecord',
         'SwapRecord',
+        'SpotMarketVaultDepositRecord',
     ],
     maxEventsPerType: 4096,
     orderBy: 'blockchain',

package/lib/factory/oracleClient.js

@@ -9,6 +9,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const prelaunchOracleClient_1 = require("../oracles/prelaunchOracleClient");
 const switchboardClient_1 = require("../oracles/switchboardClient");
 const pythPullClient_1 = require("../oracles/pythPullClient");
+const switchboardOnDemandClient_1 = require("../oracles/switchboardOnDemandClient");
 function getOracleClient(oracleSource, connection, program) {
     if ((0, types_1.isVariant)(oracleSource, 'pyth')) {
         return new pythClient_1.PythClient(connection);
@@ -43,6 +44,9 @@ function getOracleClient(oracleSource, connection, program) {
     if ((0, types_1.isVariant)(oracleSource, 'quoteAsset')) {
         return new quoteAssetOracleClient_1.QuoteAssetOracleClient();
     }
+    if ((0, types_1.isVariant)(oracleSource, 'switchboardOnDemand')) {
+        return new switchboardOnDemandClient_1.SwitchboardOnDemandClient(connection);
+    }
     throw new Error(`Unknown oracle source ${oracleSource}`);
 }
 exports.getOracleClient = getOracleClient;

package/lib/idl/drift.json

@@ -1675,6 +1675,47 @@
                 }
             ]
         },
+        {
+            "name": "liquidatePerpWithFill",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "liquidator",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "liquidatorStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "liquidateSpot",
             "accounts": [
@@ -2341,7 +2382,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2401,7 +2442,7 @@
             "accounts": [
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2441,7 +2482,7 @@
             "accounts": [
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2482,7 +2523,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -3593,6 +3634,47 @@
                 }
             ]
         },
+        {
+            "name": "depositIntoSpotMarketVault",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "sourceVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "amount",
+                    "type": "u64"
+                }
+            ]
+        },
         {
             "name": "depositIntoSpotMarketRevenuePool",
             "accounts": [
@@ -6835,12 +6917,16 @@
                         ],
                         "type": "u8"
                     },
+                    {
+                        "name": "tokenProgram",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                42
+                                41
                             ]
                         }
                     }
@@ -9833,6 +9919,9 @@
                     },
                     {
                         "name": "PlaceAndTake"
+                    },
+                    {
+                        "name": "Liquidation"
                     }
                 ]
             }
@@ -9945,6 +10034,9 @@
                     },
                     {
                         "name": "PythStableCoinPull"
+                    },
+                    {
+                        "name": "SwitchboardOnDemand"
                     }
                 ]
             }
@@ -11349,6 +11441,46 @@
                     "index": false
                 }
             ]
+        },
+        {
+            "name": "SpotMarketVaultDepositRecord",
+            "fields": [
+                {
+                    "name": "ts",
+                    "type": "i64",
+                    "index": false
+                },
+                {
+                    "name": "marketIndex",
+                    "type": "u16",
+                    "index": false
+                },
+                {
+                    "name": "depositBalance",
+                    "type": "u128",
+                    "index": false
+                },
+                {
+                    "name": "cumulativeDepositInterestBefore",
+                    "type": "u128",
+                    "index": false
+                },
+                {
+                    "name": "cumulativeDepositInterestAfter",
+                    "type": "u128",
+                    "index": false
+                },
+                {
+                    "name": "depositTokenAmountBefore",
+                    "type": "u64",
+                    "index": false
+                },
+                {
+                    "name": "amount",
+                    "type": "u64",
+                    "index": false
+                }
+            ]
         }
     ],
     "errors": [
@@ -12761,6 +12893,16 @@
             "code": 6281,
             "name": "InvalidOpenbookV2Market",
             "msg": "InvalidOpenbookV2Market"
+        },
+        {
+            "code": 6282,
+            "name": "NonZeroTransferFee",
+            "msg": "Non zero transfer fee"
+        },
+        {
+            "code": 6283,
+            "name": "LiquidationOrderFailedToFill",
+            "msg": "Liquidation order failed to fill"
         }
     ],
     "metadata": {