@drift-labs/sdk 2.31.1-beta.2 → 2.31.1-beta.20

package/src/accounts/mockUserAccountSubscriber.ts

@@ -0,0 +1,53 @@
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './types';
+import { PublicKey } from '@solana/web3.js';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { UserAccount } from '../types';
+
+export class MockUserAccountSubscriber implements UserAccountSubscriber {
+	isSubscribed: boolean;
+	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+	userAccountPublicKey: PublicKey;
+
+	callbackId?: string;
+	errorCallbackId?: string;
+
+	user: DataAndSlot<UserAccount>;
+
+	public constructor(
+		userAccountPublicKey: PublicKey,
+		data: UserAccount,
+		slot: number
+	) {
+		this.isSubscribed = true;
+		this.eventEmitter = new EventEmitter();
+		this.userAccountPublicKey = userAccountPublicKey;
+		this.user = { data, slot };
+	}
+
+	async subscribe(_userAccount?: UserAccount): Promise<boolean> {
+		return true;
+	}
+
+	async addToAccountLoader(): Promise<void> {}
+
+	async fetch(): Promise<void> {}
+
+	doesAccountExist(): boolean {
+		return this.user !== undefined;
+	}
+
+	async unsubscribe(): Promise<void> {}
+
+	assertIsSubscribed(): void {}
+
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
+		return this.user;
+	}
+
+	public updateData(userAccount: UserAccount, slot: number): void {
+		this.user = { data: userAccount, slot };
+		this.eventEmitter.emit('userAccountUpdate', userAccount);
+		this.eventEmitter.emit('update');
+	}
+}

package/src/config.ts

@@ -131,7 +131,7 @@ export async function findAllMarketAndOracles(program: Program): Promise<{
 		(await program.account.spotMarket.all()) as ProgramAccount<SpotMarketAccount>[];
 
 	for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
-		const perpMarket = perpMarketProgramAccount.account;
+		const perpMarket = perpMarketProgramAccount.account as PerpMarketAccount;
 		perpMarketIndexes.push(perpMarket.marketIndex);
 		oracleInfos.set(perpMarket.amm.oracle.toString(), {
 			publicKey: perpMarket.amm.oracle,
@@ -140,7 +140,7 @@ export async function findAllMarketAndOracles(program: Program): Promise<{
 	}
 
 	for (const spotMarketProgramAccount of spotMarketProgramAccounts) {
-		const spotMarket = spotMarketProgramAccount.account;
+		const spotMarket = spotMarketProgramAccount.account as SpotMarketAccount;
 		spotMarketIndexes.push(spotMarket.marketIndex);
 		oracleInfos.set(spotMarket.oracle.toString(), {
 			publicKey: spotMarket.oracle,

package/src/constants/perpMarkets.ts

@@ -134,6 +134,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'RNDR',
+		category: ['Infra'],
+		symbol: 'RNDR-PERP',
+		baseAssetSymbol: 'RNDR',
+		marketIndex: 12,
+		oracle: new PublicKey('C2QvUPBiU3fViSyqA4nZgGyYqLgYf9PRpd8B8oLoo48w'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -257,6 +267,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'RNDR',
+		category: ['Infra'],
+		symbol: 'RNDR-PERP',
+		baseAssetSymbol: 'RNDR',
+		marketIndex: 12,
+		oracle: new PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/dlob/orderBookLevels.ts

@@ -12,6 +12,7 @@ import {
 	PositionDirection,
 	standardizePrice,
 	SwapDirection,
+	ZERO,
 } from '..';
 import { PublicKey } from '@solana/web3.js';
 
@@ -169,7 +170,7 @@ export function getVammL2Generator({
 		pegMultiplier: updatedAmm.pegMultiplier,
 	};
 	const getL2Bids = function* () {
-		while (numBids < numOrders) {
+		while (numBids < numOrders && baseSize.gt(ZERO)) {
 			const [afterSwapQuoteReserves, afterSwapBaseReserves] =
 				calculateAmmReservesAfterSwap(
 					bidAmm,
@@ -208,7 +209,7 @@ export function getVammL2Generator({
 		pegMultiplier: updatedAmm.pegMultiplier,
 	};
 	const getL2Asks = function* () {
-		while (numAsks < numOrders) {
+		while (numAsks < numOrders && askSize.gt(ZERO)) {
 			const [afterSwapQuoteReserves, afterSwapBaseReserves] =
 				calculateAmmReservesAfterSwap(
 					askAmm,