@drift-labs/sdk 2.87.0-beta.8 → 2.88.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.87.0-beta.8
+2.88.0-beta.0

package/lib/adminClient.d.ts

@@ -41,6 +41,8 @@ export declare class AdminClient extends DriftClient {
     getResetPerpMarketAmmOracleTwapIx(perpMarketIndex: number): Promise<TransactionInstruction>;
     depositIntoPerpMarketFeePool(perpMarketIndex: number, amount: BN, sourceVault: PublicKey): Promise<TransactionSignature>;
     getDepositIntoPerpMarketFeePoolIx(perpMarketIndex: number, amount: BN, sourceVault: PublicKey): Promise<TransactionInstruction>;
+    depositIntoSpotMarketVault(spotMarketIndex: number, amount: BN, sourceVault: PublicKey): Promise<TransactionSignature>;
+    getDepositIntoSpotMarketVaultIx(spotMarketIndex: number, amount: BN, sourceVault: PublicKey): Promise<TransactionInstruction>;
     updateAdmin(admin: PublicKey): Promise<TransactionSignature>;
     getUpdateAdminIx(admin: PublicKey): Promise<TransactionInstruction>;
     updatePerpMarketCurveUpdateIntensity(perpMarketIndex: number, curveUpdateIntensity: number): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -433,6 +433,30 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async depositIntoSpotMarketVault(spotMarketIndex, amount, sourceVault) {
+        const depositIntoPerpMarketFeePoolIx = await this.getDepositIntoSpotMarketVaultIx(spotMarketIndex, amount, sourceVault);
+        const tx = await this.buildTransaction(depositIntoPerpMarketFeePoolIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getDepositIntoSpotMarketVaultIx(spotMarketIndex, amount, sourceVault) {
+        const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+        const remainingAccounts = [];
+        this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
+        return await this.program.instruction.depositIntoSpotMarketVault(amount, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                sourceVault,
+                spotMarket: spotMarket.pubkey,
+                spotMarketVault: spotMarket.vault,
+                tokenProgram,
+            },
+        });
+    }
     async updateAdmin(admin) {
         const updateAdminIx = await this.getUpdateAdminIx(admin);
         const tx = await this.buildTransaction(updateAdminIx);

package/lib/config.d.ts

@@ -11,6 +11,7 @@ type DriftConfig = {
     USDC_MINT_ADDRESS: string;
     SERUM_V3: string;
     PHOENIX: string;
+    OPENBOOK: string;
     V2_ALPHA_TICKET_MINT_ADDRESS: string;
     PERP_MARKETS: PerpMarketConfig[];
     SPOT_MARKETS: SpotMarketConfig[];

package/lib/config.js

@@ -14,6 +14,7 @@ exports.configs = {
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
         PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
+        OPENBOOK: 'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
         PERP_MARKETS: perpMarkets_1.DevnetPerpMarkets,
         SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets,
@@ -28,6 +29,7 @@ exports.configs = {
         USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
         SERUM_V3: 'srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX',
         PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
+        OPENBOOK: 'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
         PERP_MARKETS: perpMarkets_1.MainnetPerpMarkets,
         SPOT_MARKETS: spotMarkets_1.MainnetSpotMarkets,

package/lib/constants/numericConstants.js

@@ -71,4 +71,4 @@ exports.IDLE_TIME_SLOTS = 9000;
 exports.SLOT_TIME_ESTIMATE_MS = 400;
 exports.DUST_POSITION_SIZE = exports.QUOTE_PRECISION.divn(100); // Dust position is any position smaller than 1c
 exports.FUEL_WINDOW = new __1.BN(60 * 60 * 24 * 28); // 28 days
-exports.FUEL_START_TS = new __1.BN(1722384000); // unix timestamp
+exports.FUEL_START_TS = new __1.BN(1723075200); // unix timestamp

package/lib/constants/spotMarkets.d.ts

@@ -11,6 +11,7 @@ export type SpotMarketConfig = {
     precisionExp: BN;
     serumMarket?: PublicKey;
     phoenixMarket?: PublicKey;
+    openbookMarket?: PublicKey;
     launchTs?: number;
     pythFeedId?: string;
 };

package/lib/driftClient.d.ts

@@ -250,6 +250,7 @@ export declare class DriftClient {
         signers: Signer[];
         pubkey: PublicKey;
     }>;
+    getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): 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]>;

package/lib/driftClient.js

@@ -52,7 +52,6 @@ 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");
@@ -1135,7 +1134,7 @@ class DriftClient {
         }
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
-        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarketAccount);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
         return await this.program.instruction.deposit(marketIndex, amount, reduceOnly, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1187,6 +1186,12 @@ 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({
@@ -1360,7 +1365,7 @@ class DriftClient {
         });
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
-        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarketAccount);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
         return await this.program.instruction.withdraw(marketIndex, amount, reduceOnly, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -2371,7 +2376,7 @@ class DriftClient {
             outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false);
             const accountInfo = await this.connection.getAccountInfo(outAssociatedTokenAccount);
             if (!accountInfo) {
-                const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(outMarket);
+                const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
                 preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint, tokenProgram));
             }
         }
@@ -2379,7 +2384,7 @@ class DriftClient {
             inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false);
             const accountInfo = await this.connection.getAccountInfo(inAssociatedTokenAccount);
             if (!accountInfo) {
-                const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(outMarket);
+                const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
                 preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
             }
         }
@@ -2495,8 +2500,8 @@ 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);
+        const outTokenProgram = this.getTokenProgramForSpotMarket(outSpotMarket);
+        const inTokenProgram = this.getTokenProgramForSpotMarket(inSpotMarket);
         if (!outTokenProgram.equals(inTokenProgram)) {
             remainingAccounts.push({
                 pubkey: outTokenProgram,
@@ -3525,7 +3530,7 @@ class DriftClient {
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
-        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarket);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
         const ix = this.program.instruction.addInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3642,7 +3647,7 @@ class DriftClient {
         }
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
-        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarketAccount);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
         const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3716,7 +3721,7 @@ class DriftClient {
         const spotMarket = await this.getSpotMarketAccount(marketIndex);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
-        const tokenProgram = (0, pda_2.getTokenProgramForSpotMarket)(spotMarket);
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
         const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(amount, {
             accounts: {
                 state: await this.getStatePublicKey(),

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/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.86.0",
+    "version": "2.87.0",
     "name": "drift",
     "instructions": [
         {
@@ -3403,6 +3403,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": [
@@ -3634,6 +3655,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": [
@@ -10148,6 +10210,9 @@
                     },
                     {
                         "name": "Future"
+                    },
+                    {
+                        "name": "Prediction"
                     }
                 ]
             }
@@ -11400,6 +11465,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": [

package/lib/openbook/openbookV2Subscriber.d.ts

@@ -27,8 +27,8 @@ export declare class OpenbookV2Subscriber implements L2OrderBookGenerator {
     client: OpenBookV2Client;
     constructor(config: OpenbookV2SubscriberConfig);
     subscribe(): Promise<void>;
-    getBestBid(): Promise<BN | undefined>;
-    getBestAsk(): Promise<BN | undefined>;
+    getBestBid(): BN | undefined;
+    getBestAsk(): BN | undefined;
     getL2Bids(): Generator<L2Level>;
     getL2Asks(): Generator<L2Level>;
     getL2Levels(side: 'bids' | 'asks'): Generator<L2Level>;

package/lib/openbook/openbookV2Subscriber.js

@@ -50,17 +50,15 @@ class OpenbookV2Subscriber {
         }
         this.subscribed = true;
     }
-    async getBestBid() {
-        const bids = await this.market.loadBids();
-        const bestBid = bids.best();
+    getBestBid() {
+        const bestBid = this.market.bids.best();
         if (bestBid === undefined) {
             return undefined;
         }
         return new anchor_1.BN(Math.floor(bestBid.price * numericConstants_1.PRICE_PRECISION.toNumber()));
     }
-    async getBestAsk() {
-        const asks = await this.market.loadAsks();
-        const bestAsk = asks.best();
+    getBestAsk() {
+        const bestAsk = this.market.asks.best();
         if (bestAsk === undefined) {
             return undefined;
         }

package/lib/types.d.ts

@@ -674,6 +674,15 @@ export type SwapRecord = {
     inOraclePrice: BN;
     fee: BN;
 };
+export type SpotMarketVaultDepositRecord = {
+    ts: BN;
+    marketIndex: number;
+    depositBalance: BN;
+    cumulativeDepositInterestBefore: BN;
+    cumulativeDepositInterestAfter: BN;
+    depositTokenAmountBefore: BN;
+    amount: BN;
+};
 export type StateAccount = {
     admin: PublicKey;
     exchangeStatus: number;

package/package.json

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

package/src/adminClient.ts

@@ -999,6 +999,49 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
+	public async depositIntoSpotMarketVault(
+		spotMarketIndex: number,
+		amount: BN,
+		sourceVault: PublicKey
+	): Promise<TransactionSignature> {
+		const depositIntoPerpMarketFeePoolIx =
+			await this.getDepositIntoSpotMarketVaultIx(
+				spotMarketIndex,
+				amount,
+				sourceVault
+			);
+
+		const tx = await this.buildTransaction(depositIntoPerpMarketFeePoolIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getDepositIntoSpotMarketVaultIx(
+		spotMarketIndex: number,
+		amount: BN,
+		sourceVault: PublicKey
+	): Promise<TransactionInstruction> {
+		const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+
+		const remainingAccounts = [];
+		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
+		return await this.program.instruction.depositIntoSpotMarketVault(amount, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				sourceVault,
+				spotMarket: spotMarket.pubkey,
+				spotMarketVault: spotMarket.vault,
+				tokenProgram,
+			},
+		});
+	}
+
 	public async updateAdmin(admin: PublicKey): Promise<TransactionSignature> {
 		const updateAdminIx = await this.getUpdateAdminIx(admin);
 

package/src/config.ts

@@ -23,6 +23,7 @@ type DriftConfig = {
 	USDC_MINT_ADDRESS: string;
 	SERUM_V3: string;
 	PHOENIX: string;
+	OPENBOOK: string;
 	V2_ALPHA_TICKET_MINT_ADDRESS: string;
 	PERP_MARKETS: PerpMarketConfig[];
 	SPOT_MARKETS: SpotMarketConfig[];
@@ -46,6 +47,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
 		PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
+		OPENBOOK: 'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb',
 		V2_ALPHA_TICKET_MINT_ADDRESS:
 			'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
 		PERP_MARKETS: DevnetPerpMarkets,
@@ -61,6 +63,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
 		SERUM_V3: 'srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX',
 		PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
+		OPENBOOK: 'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb',
 		V2_ALPHA_TICKET_MINT_ADDRESS:
 			'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
 		PERP_MARKETS: MainnetPerpMarkets,

package/src/constants/numericConstants.ts

@@ -108,4 +108,4 @@ export const SLOT_TIME_ESTIMATE_MS = 400;
 export const DUST_POSITION_SIZE = QUOTE_PRECISION.divn(100); // Dust position is any position smaller than 1c
 
 export const FUEL_WINDOW = new BN(60 * 60 * 24 * 28); // 28 days
-export const FUEL_START_TS = new BN(1722384000); // unix timestamp
+export const FUEL_START_TS = new BN(1723075200); // unix timestamp

package/src/constants/spotMarkets.ts

@@ -20,6 +20,7 @@ export type SpotMarketConfig = {
 	precisionExp: BN;
 	serumMarket?: PublicKey;
 	phoenixMarket?: PublicKey;
+	openbookMarket?: PublicKey;
 	launchTs?: number;
 	pythFeedId?: string;
 };

package/src/driftClient.ts

@@ -14,6 +14,7 @@ import {
 	createInitializeAccountInstruction,
 	getAssociatedTokenAddress,
 	TOKEN_PROGRAM_ID,
+	TOKEN_2022_PROGRAM_ID,
 } from '@solana/spl-token';
 import {
 	StateAccount,
@@ -119,7 +120,6 @@ import { isSpotPositionAvailable } from './math/spotPosition';
 import { calculateMarketMaxAvailableInsurance } from './math/market';
 import { fetchUserStatsAccount } from './accounts/fetch';
 import { castNumberToSpotPrecision } from './math/spotMarket';
-import { getTokenProgramForSpotMarket } from './addresses/pda';
 import {
 	JupiterClient,
 	QuoteResponse,
@@ -1973,7 +1973,7 @@ export class DriftClient {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 
 		this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
-		const tokenProgram = getTokenProgramForSpotMarket(spotMarketAccount);
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
 		return await this.program.instruction.deposit(
 			marketIndex,
 			amount,
@@ -2060,6 +2060,15 @@ export class DriftClient {
 		return result;
 	}
 
+	public getTokenProgramForSpotMarket(
+		spotMarketAccount: SpotMarketAccount
+	): PublicKey {
+		if (spotMarketAccount.tokenProgram === 1) {
+			return TOKEN_2022_PROGRAM_ID;
+		}
+		return TOKEN_PROGRAM_ID;
+	}
+
 	public addTokenMintToRemainingAccounts(
 		spotMarketAccount: SpotMarketAccount,
 		remainingAccounts: AccountMeta[]
@@ -2486,7 +2495,7 @@ export class DriftClient {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 
 		this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
-		const tokenProgram = getTokenProgramForSpotMarket(spotMarketAccount);
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
 
 		return await this.program.instruction.withdraw(
 			marketIndex,
@@ -4250,7 +4259,7 @@ export class DriftClient {
 				outAssociatedTokenAccount
 			);
 			if (!accountInfo) {
-				const tokenProgram = getTokenProgramForSpotMarket(outMarket);
+				const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
 
 				preInstructions.push(
 					this.createAssociatedTokenAccountIdempotentInstruction(
@@ -4274,7 +4283,7 @@ export class DriftClient {
 				inAssociatedTokenAccount
 			);
 			if (!accountInfo) {
-				const tokenProgram = getTokenProgramForSpotMarket(outMarket);
+				const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
 
 				preInstructions.push(
 					this.createAssociatedTokenAccountIdempotentInstruction(
@@ -4497,8 +4506,8 @@ export class DriftClient {
 		const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
 		const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
 
-		const outTokenProgram = getTokenProgramForSpotMarket(outSpotMarket);
-		const inTokenProgram = getTokenProgramForSpotMarket(inSpotMarket);
+		const outTokenProgram = this.getTokenProgramForSpotMarket(outSpotMarket);
+		const inTokenProgram = this.getTokenProgramForSpotMarket(inSpotMarket);
 
 		if (!outTokenProgram.equals(inTokenProgram)) {
 			remainingAccounts.push({
@@ -6651,7 +6660,7 @@ export class DriftClient {
 
 		const remainingAccounts = [];
 		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
-		const tokenProgram = getTokenProgramForSpotMarket(spotMarket);
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
 		const ix = this.program.instruction.addInsuranceFundStake(
 			marketIndex,
 			amount,
@@ -6891,7 +6900,7 @@ export class DriftClient {
 
 		const remainingAccounts = [];
 		this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
-		const tokenProgram = getTokenProgramForSpotMarket(spotMarketAccount);
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
 		const removeStakeIx =
 			await this.program.instruction.removeInsuranceFundStake(marketIndex, {
 				accounts: {
@@ -7022,7 +7031,7 @@ export class DriftClient {
 
 		const remainingAccounts = [];
 		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
-		const tokenProgram = getTokenProgramForSpotMarket(spotMarket);
+		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
 		const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(
 			amount,
 			{

package/src/events/types.ts

@@ -14,6 +14,7 @@ import {
 	InsuranceFundStakeRecord,
 	CurveRecord,
 	SwapRecord,
+	SpotMarketVaultDepositRecord,
 } from '../index';
 import { EventEmitter } from 'events';
 
@@ -47,6 +48,7 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'InsuranceFundStakeRecord',
 		'CurveRecord',
 		'SwapRecord',
+		'SpotMarketVaultDepositRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -89,6 +91,7 @@ export type EventMap = {
 	InsuranceFundStakeRecord: Event<InsuranceFundStakeRecord>;
 	CurveRecord: Event<CurveRecord>;
 	SwapRecord: Event<SwapRecord>;
+	SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
 };
 
 export type EventType = keyof EventMap;
@@ -107,7 +110,8 @@ export type DriftEvent =
 	| Event<SpotInterestRecord>
 	| Event<InsuranceFundStakeRecord>
 	| Event<CurveRecord>
-	| Event<SwapRecord>;
+	| Event<SwapRecord>
+	| Event<SpotMarketVaultDepositRecord>;
 
 export interface EventSubscriberEvents {
 	newEvent: (event: WrappedEvent<EventType>) => void;

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.86.0",
+  "version": "2.87.0",
   "name": "drift",
   "instructions": [
     {
@@ -3403,6 +3403,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": [
@@ -3634,6 +3655,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": [
@@ -10148,6 +10210,9 @@
           },
           {
             "name": "Future"
+          },
+          {
+            "name": "Prediction"
           }
         ]
       }
@@ -11400,6 +11465,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": [
@@ -12827,4 +12932,4 @@
   "metadata": {
     "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
   }
-}
+}

package/src/openbook/openbookV2Subscriber.ts

@@ -95,9 +95,8 @@ export class OpenbookV2Subscriber implements L2OrderBookGenerator {
 		this.subscribed = true;
 	}
 
-	public async getBestBid(): Promise<BN | undefined> {
-		const bids = await this.market.loadBids();
-		const bestBid = bids.best();
+	public getBestBid(): BN | undefined {
+		const bestBid = this.market.bids.best();
 
 		if (bestBid === undefined) {
 			return undefined;
@@ -106,9 +105,8 @@ export class OpenbookV2Subscriber implements L2OrderBookGenerator {
 		return new BN(Math.floor(bestBid.price * PRICE_PRECISION.toNumber()));
 	}
 
-	public async getBestAsk(): Promise<BN | undefined> {
-		const asks = await this.market.loadAsks();
-		const bestAsk = asks.best();
+	public getBestAsk(): BN | undefined {
+		const bestAsk = this.market.asks.best();
 
 		if (bestAsk === undefined) {
 			return undefined;

package/src/types.ts

@@ -576,6 +576,16 @@ export type SwapRecord = {
 	fee: BN;
 };
 
+export type SpotMarketVaultDepositRecord = {
+	ts: BN;
+	marketIndex: number;
+	depositBalance: BN;
+	cumulativeDepositInterestBefore: BN;
+	cumulativeDepositInterestAfter: BN;
+	depositTokenAmountBefore: BN;
+	amount: BN;
+};
+
 export type StateAccount = {
 	admin: PublicKey;
 	exchangeStatus: number;