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

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/math/superStake.d.ts

@@ -5,6 +5,7 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
+import fetch from 'node-fetch';
 export type BSOL_STATS_API_RESPONSE = {
     success: boolean;
     stats?: {
@@ -27,8 +28,8 @@ export type BSOL_EMISSIONS_API_RESPONSE = {
         lend: number;
     };
 };
-export declare function fetchBSolMetrics(): Promise<any>;
-export declare function fetchBSolDriftEmissions(): Promise<any>;
+export declare function fetchBSolMetrics(): Promise<fetch.Response>;
+export declare function fetchBSolDriftEmissions(): Promise<fetch.Response>;
 export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     marketIndex: number;
     amount: BN;

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(): BN | undefined;
+    getBestAsk(): 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,102 @@
+"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;
+    }
+    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()));
+    }
+    getBestAsk() {
+        const bestAsk = this.market.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/oracles/switchboardOnDemandClient.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+import { Connection, PublicKey } from '@solana/web3.js';
+import { OracleClient, OraclePriceData } from './types';
+import { BorshAccountsCoder as BorshAccountsCoder30 } from '@coral-xyz/anchor-30';
+export declare class SwitchboardOnDemandClient implements OracleClient {
+    connection: Connection;
+    coder: BorshAccountsCoder30;
+    constructor(connection: Connection);
+    getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
+    getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData;
+}

package/lib/oracles/switchboardOnDemandClient.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchboardOnDemandClient = void 0;
+const anchor_1 = require("@coral-xyz/anchor");
+const switchboard_on_demand_30_json_1 = __importDefault(require("../idl/switchboard_on_demand_30.json"));
+const numericConstants_1 = require("../constants/numericConstants");
+const anchor_30_1 = require("@coral-xyz/anchor-30");
+const SB_PRECISION_EXP = new anchor_1.BN(18);
+const SB_PRECISION = new anchor_1.BN(10).pow(SB_PRECISION_EXP.sub(numericConstants_1.PRICE_PRECISION_EXP));
+class SwitchboardOnDemandClient {
+    constructor(connection) {
+        this.connection = connection;
+        this.coder = new anchor_30_1.BorshAccountsCoder(switchboard_on_demand_30_json_1.default);
+    }
+    async getOraclePriceData(pricePublicKey) {
+        const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
+        return this.getOraclePriceDataFromBuffer(accountInfo.data);
+    }
+    getOraclePriceDataFromBuffer(buffer) {
+        const pullFeedAccountData = this.coder.decodeUnchecked('PullFeedAccountData', buffer);
+        return {
+            price: pullFeedAccountData.result.value.div(SB_PRECISION),
+            slot: pullFeedAccountData.result.slot,
+            confidence: pullFeedAccountData.result.range.div(SB_PRECISION),
+            hasSufficientNumberOfDataPoints: true,
+        };
+    }
+}
+exports.SwitchboardOnDemandClient = SwitchboardOnDemandClient;

package/lib/types.d.ts

@@ -182,6 +182,9 @@ export declare class OracleSource {
     static readonly Prelaunch: {
         prelaunch: {};
     };
+    static readonly SWITCHBOARD_ON_DEMAND: {
+        switchboardOnDemand: {};
+    };
 }
 export declare class OrderType {
     static readonly LIMIT: {
@@ -671,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;
@@ -821,6 +833,7 @@ export type SpotMarketAccount = {
     fuelBoostTaker: number;
     fuelBoostMaker: number;
     fuelBoostInsurance: number;
+    tokenProgram: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;

package/lib/types.js

@@ -114,6 +114,7 @@ OracleSource.QUOTE_ASSET = { quoteAsset: {} };
 OracleSource.PYTH_STABLE_COIN = { pythStableCoin: {} };
 OracleSource.PYTH_STABLE_COIN_PULL = { pythStableCoinPull: {} };
 OracleSource.Prelaunch = { prelaunch: {} };
+OracleSource.SWITCHBOARD_ON_DEMAND = { switchboardOnDemand: {} };
 class OrderType {
 }
 exports.OrderType = OrderType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.87.0-beta.0",
+	"version": "2.87.0-beta.10",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -35,13 +35,16 @@
 	},
 	"dependencies": {
 		"@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",
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
+		"@switchboard-xyz/on-demand": "^1.2.1",
 		"anchor-bankrun": "^0.3.0",
 		"rpc-websockets": "7.5.1",
 		"solana-bankrun": "^0.3.0",
@@ -75,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,
 				},
 			}
 		);
@@ -997,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);
 
@@ -1115,9 +1160,7 @@ export class AdminClient extends DriftClient {
 			},
 			{
 				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
+					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 					perpMarket: await getPerpMarketPublicKey(
 						this.program.programId,

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/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/perpMarkets.ts

@@ -160,16 +160,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 			'0x385f64d993f7b77d8182ed5003d97c60aa3361f3cecfe711544d2d59165e9bdf',
 	},
 	{
-		fullName: 'RNDR',
+		fullName: 'RENDER',
 		category: ['Infra'],
-		symbol: 'RNDR-PERP',
-		baseAssetSymbol: 'RNDR',
+		symbol: 'RENDER-PERP',
+		baseAssetSymbol: 'RENDER',
 		marketIndex: 12,
-		oracle: new PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
+		oracle: new PublicKey('8TQztfGcNjHGRusX4ejQQtPZs3Ypczt9jWF6pkgQMqUX'),
 		launchTs: 1687201081000,
 		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
-			'0xab7347771135fc733f8f38db462ba085ed3309955f42554a14fa13e855ac0e2f',
+			'0x3d4a2bd9535be6ce8059d75eadeba507b043257321aa544717c56fa19b49e35d',
 	},
 	{
 		fullName: 'XRP',
@@ -297,9 +297,9 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'W-PERP',
 		baseAssetSymbol: 'W',
 		marketIndex: 23,
-		oracle: new PublicKey('4HbitGsdcFbtFotmYscikQFAAKJ3nYx4t7sV7fTvsk8U'),
+		oracle: new PublicKey('4iCi4DvXrubHQne8jzbMaWL3pd7v1Fip8iTe4H9vHNXB'),
 		launchTs: 1709852537000,
-		oracleSource: OracleSource.PYTH_PULL,
+		oracleSource: OracleSource.SWITCHBOARD_ON_DEMAND,
 		pythFeedId:
 			'0xeff7446475e218517566ea99e72a4abec2e1bd8498b43b7d8331e29dcb059389',
 	},
@@ -475,16 +475,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 			'0x385f64d993f7b77d8182ed5003d97c60aa3361f3cecfe711544d2d59165e9bdf',
 	},
 	{
-		fullName: 'RNDR',
+		fullName: 'RENDER',
 		category: ['Infra', 'Solana'],
-		symbol: 'RNDR-PERP',
-		baseAssetSymbol: 'RNDR',
+		symbol: 'RENDER-PERP',
+		baseAssetSymbol: 'RENDER',
 		marketIndex: 12,
-		oracle: new PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
+		oracle: new PublicKey('8TQztfGcNjHGRusX4ejQQtPZs3Ypczt9jWF6pkgQMqUX'),
 		launchTs: 1687201081000,
 		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
-			'0xab7347771135fc733f8f38db462ba085ed3309955f42554a14fa13e855ac0e2f',
+			'0x3d4a2bd9535be6ce8059d75eadeba507b043257321aa544717c56fa19b49e35d',
 	},
 	{
 		fullName: 'XRP',

package/src/constants/spotMarkets.ts

@@ -20,6 +20,7 @@ export type SpotMarketConfig = {
 	precisionExp: BN;
 	serumMarket?: PublicKey;
 	phoenixMarket?: PublicKey;
+	openbookMarket?: PublicKey;
 	launchTs?: number;
 	pythFeedId?: string;
 };
@@ -67,6 +68,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[] = [
@@ -235,9 +247,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 			'0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996',
 	},
 	{
-		symbol: 'RNDR',
+		symbol: 'RENDER',
 		marketIndex: 12,
-		oracle: new PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
+		oracle: new PublicKey('8TQztfGcNjHGRusX4ejQQtPZs3Ypczt9jWF6pkgQMqUX'),
 		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof'),
 		precision: new BN(10).pow(EIGHT),
@@ -245,7 +257,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		serumMarket: new PublicKey('2m7ZLEKtxWF29727DSb5D91erpXPUY1bqhRWRC3wQX7u'),
 		launchTs: 1708964021000,
 		pythFeedId:
-			'0xab7347771135fc733f8f38db462ba085ed3309955f42554a14fa13e855ac0e2f',
+			'0x3d4a2bd9535be6ce8059d75eadeba507b043257321aa544717c56fa19b49e35d',
 	},
 	{
 		symbol: 'W',

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;