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

package/lib/index.d.ts

@@ -72,6 +72,8 @@ export * from './serum/serumFulfillmentConfigMap';
 export * from './phoenix/phoenixSubscriber';
 export * from './priorityFee';
 export * from './phoenix/phoenixFulfillmentConfigMap';
+export * from './openbook/openbookV2Subscriber';
+export * from './openbook/openbookV2FulfillmentConfigMap';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/lib/index.js

@@ -95,6 +95,8 @@ __exportStar(require("./serum/serumFulfillmentConfigMap"), exports);
 __exportStar(require("./phoenix/phoenixSubscriber"), exports);
 __exportStar(require("./priorityFee"), exports);
 __exportStar(require("./phoenix/phoenixFulfillmentConfigMap"), exports);
+__exportStar(require("./openbook/openbookV2Subscriber"), exports);
+__exportStar(require("./openbook/openbookV2FulfillmentConfigMap"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);

package/lib/math/spotMarket.d.ts

@@ -3,3 +3,9 @@ import { BN } from '@coral-xyz/anchor';
 import { MarginCategory, SpotBalanceType, SpotMarketAccount } from '../types';
 export declare function castNumberToSpotPrecision(value: number | BN, spotMarket: SpotMarketAccount): BN;
 export declare function calculateSpotMarketMarginRatio(market: SpotMarketAccount, oraclePrice: BN, marginCategory: MarginCategory, size: BN, balanceType: SpotBalanceType, customMarginRatio?: number): number;
+/**
+ * Returns the maximum remaining deposit that can be made to the spot market. If the maxTokenDeposits on the market is zero then there is no limit and this function will also return zero. (so that needs to be checked)
+ * @param market
+ * @returns
+ */
+export declare function calculateMaxRemainingDeposit(market: SpotMarketAccount): BN;

package/lib/math/spotMarket.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateSpotMarketMarginRatio = exports.castNumberToSpotPrecision = void 0;
+exports.calculateMaxRemainingDeposit = exports.calculateSpotMarketMarginRatio = exports.castNumberToSpotPrecision = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const spotBalance_1 = require("./spotBalance");
@@ -32,3 +32,18 @@ function calculateSpotMarketMarginRatio(market, oraclePrice, marginCategory, siz
     return marginRatio;
 }
 exports.calculateSpotMarketMarginRatio = calculateSpotMarketMarginRatio;
+/**
+ * Returns the maximum remaining deposit that can be made to the spot market. If the maxTokenDeposits on the market is zero then there is no limit and this function will also return zero. (so that needs to be checked)
+ * @param market
+ * @returns
+ */
+function calculateMaxRemainingDeposit(market) {
+    const marketMaxTokenDeposits = market.maxTokenDeposits;
+    if (marketMaxTokenDeposits.eq(numericConstants_1.ZERO)) {
+        // If the maxTokenDeposits is set to zero then that means there is no limit. Return the largest number we can to represent infinite available deposit.
+        return numericConstants_1.ZERO;
+    }
+    const totalDepositsTokenAmount = (0, spotBalance_1.getTokenAmount)(market.depositBalance, market, types_1.SpotBalanceType.DEPOSIT);
+    return marketMaxTokenDeposits.sub(totalDepositsTokenAmount);
+}
+exports.calculateMaxRemainingDeposit = calculateMaxRemainingDeposit;

package/lib/openbook/openbookV2FulfillmentConfigMap.d.ts

@@ -0,0 +1,10 @@
+import { PublicKey } from '@solana/web3.js';
+import { OpenbookV2FulfillmentConfigAccount } from '../types';
+import { DriftClient } from '../driftClient';
+export declare class OpenbookV2FulfillmentConfigMap {
+    driftClient: DriftClient;
+    map: Map<number, OpenbookV2FulfillmentConfigAccount>;
+    constructor(driftClient: DriftClient);
+    add(marketIndex: number, openbookV2MarketAddress: PublicKey): Promise<void>;
+    get(marketIndex: number): OpenbookV2FulfillmentConfigAccount | undefined;
+}

package/lib/openbook/openbookV2FulfillmentConfigMap.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenbookV2FulfillmentConfigMap = void 0;
+class OpenbookV2FulfillmentConfigMap {
+    constructor(driftClient) {
+        this.map = new Map();
+        this.driftClient = driftClient;
+    }
+    async add(marketIndex, openbookV2MarketAddress) {
+        const account = await this.driftClient.getOpenbookV2FulfillmentConfig(openbookV2MarketAddress);
+        this.map.set(marketIndex, account);
+    }
+    get(marketIndex) {
+        return this.map.get(marketIndex);
+    }
+}
+exports.OpenbookV2FulfillmentConfigMap = OpenbookV2FulfillmentConfigMap;

package/lib/openbook/openbookV2Subscriber.d.ts

@@ -0,0 +1,36 @@
+/// <reference types="bn.js" />
+import { Connection, PublicKey } from '@solana/web3.js';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { BN } from '@coral-xyz/anchor';
+import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';
+import { Market, OpenBookV2Client } from '@openbook-dex/openbook-v2';
+export type OpenbookV2SubscriberConfig = {
+    connection: Connection;
+    programId: PublicKey;
+    marketAddress: PublicKey;
+    accountSubscription: {
+        type: 'polling';
+        accountLoader: BulkAccountLoader;
+    } | {
+        type: 'websocket';
+    };
+};
+export declare class OpenbookV2Subscriber implements L2OrderBookGenerator {
+    connection: Connection;
+    programId: PublicKey;
+    marketAddress: PublicKey;
+    subscriptionType: 'polling' | 'websocket';
+    accountLoader: BulkAccountLoader | undefined;
+    subscribed: boolean;
+    market: Market;
+    marketCallbackId: string | number;
+    client: OpenBookV2Client;
+    constructor(config: OpenbookV2SubscriberConfig);
+    subscribe(): Promise<void>;
+    getBestBid(): Promise<BN | undefined>;
+    getBestAsk(): Promise<BN | undefined>;
+    getL2Bids(): Generator<L2Level>;
+    getL2Asks(): Generator<L2Level>;
+    getL2Levels(side: 'bids' | 'asks'): Generator<L2Level>;
+    unsubscribe(): Promise<void>;
+}

package/lib/openbook/openbookV2Subscriber.js

@@ -0,0 +1,104 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenbookV2Subscriber = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const numericConstants_1 = require("../constants/numericConstants");
+const anchor_1 = require("@coral-xyz/anchor");
+const openbook_v2_1 = require("@openbook-dex/openbook-v2");
+const openbook_json_1 = __importDefault(require("../idl/openbook.json"));
+class OpenbookV2Subscriber {
+    constructor(config) {
+        this.connection = config.connection;
+        this.programId = config.programId;
+        this.marketAddress = config.marketAddress;
+        this.subscribed = false;
+        if (config.accountSubscription.type === 'polling') {
+            this.subscriptionType = 'polling';
+            this.accountLoader = config.accountSubscription.accountLoader;
+        }
+        else {
+            this.subscriptionType = 'websocket';
+        }
+    }
+    async subscribe() {
+        if (this.subscribed === true) {
+            return;
+        }
+        const anchorProvider = new anchor_1.AnchorProvider(this.connection, new anchor_1.Wallet(web3_js_1.Keypair.generate()), {});
+        const openbookV2Program = new anchor_1.Program(openbook_json_1.default, this.programId, anchorProvider);
+        this.client = new openbook_v2_1.OpenBookV2Client(anchorProvider);
+        const market = await openbook_v2_1.Market.load(this.client, this.marketAddress);
+        this.market = await market.loadOrderBook();
+        if (this.subscriptionType === 'websocket') {
+            this.marketCallbackId = this.connection.onAccountChange(this.marketAddress, async (accountInfo, _) => {
+                const marketRaw = openbookV2Program.coder.accounts.decode('Market', accountInfo.data);
+                this.market = new openbook_v2_1.Market(this.client, this.marketAddress, marketRaw);
+                await this.market.loadOrderBook();
+            });
+        }
+        else {
+            this.marketCallbackId = await this.accountLoader.addAccount(this.marketAddress, (buffer, _) => {
+                const marketRaw = openbookV2Program.coder.accounts.decode('Market', buffer);
+                this.market = new openbook_v2_1.Market(this.client, this.marketAddress, marketRaw);
+                (async () => {
+                    await this.market.loadOrderBook();
+                })();
+            });
+        }
+        this.subscribed = true;
+    }
+    async getBestBid() {
+        const bids = await this.market.loadBids();
+        const bestBid = 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();
+        if (bestAsk === undefined) {
+            return undefined;
+        }
+        return new anchor_1.BN(Math.floor(bestAsk.price * numericConstants_1.PRICE_PRECISION.toNumber()));
+    }
+    getL2Bids() {
+        return this.getL2Levels('bids');
+    }
+    getL2Asks() {
+        return this.getL2Levels('asks');
+    }
+    *getL2Levels(side) {
+        const basePrecision = Math.ceil(1 / this.market.baseNativeFactor.toNumber());
+        const pricePrecision = numericConstants_1.PRICE_PRECISION.toNumber();
+        const levels = side === 'bids' ? this.market.bids : this.market.asks;
+        for (const order of levels.items()) {
+            const size = new anchor_1.BN(order.size * basePrecision);
+            const price = new anchor_1.BN(order.price * pricePrecision);
+            yield {
+                price,
+                size,
+                sources: {
+                    openbook: size,
+                },
+            };
+        }
+    }
+    async unsubscribe() {
+        if (!this.subscribed) {
+            return;
+        }
+        if (this.subscriptionType === 'websocket') {
+            await this.connection.removeAccountChangeListener(this.marketCallbackId);
+        }
+        else {
+            this.accountLoader.removeAccount(this.marketAddress, this.marketCallbackId);
+        }
+        this.subscribed = false;
+    }
+}
+exports.OpenbookV2Subscriber = OpenbookV2Subscriber;

package/lib/types.d.ts

@@ -824,6 +824,7 @@ export type SpotMarketAccount = {
     fuelBoostTaker: number;
     fuelBoostMaker: number;
     fuelBoostInsurance: number;
+    tokenProgram: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.87.0-beta.5",
+	"version": "2.87.0-beta.6",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -37,6 +37,7 @@
 		"@coral-xyz/anchor": "0.28.0",
 		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
+		"@openbook-dex/openbook-v2": "^0.2.10",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@pythnetwork/price-service-sdk": "^1.7.1",
@@ -77,6 +78,7 @@
 		"node": ">=18"
 	},
 	"resolutions": {
-		"@solana/errors": "2.0.0-preview.4"
+		"@solana/errors": "2.0.0-preview.4",
+		"@solana/codecs-data-structures": "2.0.0-preview.4"
 	}
 }

package/src/addresses/pda.ts

@@ -1,6 +1,8 @@
 import { PublicKey } from '@solana/web3.js';
 import * as anchor from '@coral-xyz/anchor';
 import { BN } from '@coral-xyz/anchor';
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { SpotMarketAccount } from '..';
 
 export async function getDriftStateAccountPublicKeyAndNonce(
 	programId: PublicKey
@@ -264,3 +266,11 @@ export function getPythPullOraclePublicKey(
 		progarmId
 	)[0];
 }
+export function getTokenProgramForSpotMarket(
+	spotMarketAccount: SpotMarketAccount
+): PublicKey {
+	if (spotMarketAccount.tokenProgram === 1) {
+		return TOKEN_2022_PROGRAM_ID;
+	}
+	return TOKEN_PROGRAM_ID;
+}

package/src/adminClient.ts

@@ -198,6 +198,8 @@ export class AdminClient extends DriftClient {
 			spotMarketIndex
 		);
 
+		const tokenProgram = (await this.connection.getAccountInfo(mint)).owner;
+
 		const nameBuffer = encodeName(name);
 		const initializeIx = await this.program.instruction.initializeSpotMarket(
 			optimalUtilization,
@@ -233,7 +235,7 @@ export class AdminClient extends DriftClient {
 					oracle,
 					rent: SYSVAR_RENT_PUBKEY,
 					systemProgram: anchor.web3.SystemProgram.programId,
-					tokenProgram: TOKEN_PROGRAM_ID,
+					tokenProgram,
 				},
 			}
 		);

package/src/bankrun/bankrunConnection.ts

@@ -35,7 +35,7 @@ import {
 import { BankrunProvider } from 'anchor-bankrun';
 import bs58 from 'bs58';
 import { BN, Wallet } from '@coral-xyz/anchor';
-import { Account, TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
+import { Account, unpackAccount } from '@solana/spl-token';
 
 export type Connection = SolanaConnection | BankrunConnection;
 
@@ -164,7 +164,7 @@ export class BankrunConnection {
 
 	async getTokenAccount(publicKey: PublicKey): Promise<Account> {
 		const info = await this.getAccountInfo(publicKey);
-		return unpackAccount(publicKey, info, TOKEN_PROGRAM_ID);
+		return unpackAccount(publicKey, info, info.owner);
 	}
 
 	async getMultipleAccountsInfo(

package/src/constants/spotMarkets.ts

@@ -67,6 +67,17 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 		pythFeedId:
 			'0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
 	},
+	{
+		symbol: 'PYUSD',
+		marketIndex: 3,
+		oracle: new PublicKey('HpMoKp3TCd3QT4MWYUKk2zCBwmhr5Df45fB6wdxYqEeh'),
+		oracleSource: OracleSource.PYTH_PULL,
+		mint: new PublicKey('GLfF72ZCUnS6N9iDJw8kedHzd6WFVf3VbpwdKKy76FRk'),
+		precision: new BN(10).pow(SIX),
+		precisionExp: SIX,
+		pythFeedId:
+			'0xc1da1b73d7f01e7ddd54b3766cf7fcd644395ad14f70aa706ec5384c59e76692',
+	},
 ];
 
 export const MainnetSpotMarkets: SpotMarketConfig[] = [

package/src/dlob/orderBookLevels.ts

@@ -21,7 +21,7 @@ import {
 import { PublicKey } from '@solana/web3.js';
 import { assert } from '../assert/assert';
 
-type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix';
+type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix' | 'openbook';
 
 export type L2Level = {
 	price: BN;