@drift-labs/sdk 0.1.36-master.7 → 0.2.0-master.10

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -1,4 +1,5 @@
 import {
+	DataAndSlot,
 	AccountSubscriber,
 	NotSubscribedError,
 	UserAccountEvents,
@@ -8,30 +9,21 @@ import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import {
-	getUserAccountPublicKey,
-	getUserOrdersAccountPublicKey,
-} from '../addresses';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
-import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
-import { ClearingHouseConfigType } from '../factory/clearingHouse';
+import { UserAccount } from '../types';
 
 export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
-	authority: PublicKey;
+	userAccountPublicKey: PublicKey;
 
 	userDataAccountSubscriber: AccountSubscriber<UserAccount>;
-	userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
-	userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
-
-	type: ClearingHouseConfigType = 'websocket';
 
-	public constructor(program: Program, authority: PublicKey) {
+	public constructor(program: Program, userAccountPublicKey: PublicKey) {
 		this.isSubscribed = false;
 		this.program = program;
-		this.authority = authority;
+		this.userAccountPublicKey = userAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
 	}
 
@@ -40,62 +32,23 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			return true;
 		}
 
-		const userPublicKey = await getUserAccountPublicKey(
-			this.program.programId,
-			this.authority
-		);
 		this.userDataAccountSubscriber = new WebSocketAccountSubscriber(
 			'user',
 			this.program,
-			userPublicKey
+			this.userAccountPublicKey
 		);
 		await this.userDataAccountSubscriber.subscribe((data: UserAccount) => {
-			this.eventEmitter.emit('userAccountData', data);
+			this.eventEmitter.emit('userAccountUpdate', data);
 			this.eventEmitter.emit('update');
 		});
 
-		const userAccountData = this.userDataAccountSubscriber.data;
-		this.userPositionsAccountSubscriber = new WebSocketAccountSubscriber(
-			'userPositions',
-			this.program,
-			userAccountData.positions
-		);
-
-		await this.userPositionsAccountSubscriber.subscribe(
-			(data: UserPositionsAccount) => {
-				this.eventEmitter.emit('userPositionsData', data);
-				this.eventEmitter.emit('update');
-			}
-		);
-
-		const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
-			this.program.programId,
-			userPublicKey
-		);
-
-		this.userOrdersAccountSubscriber = new WebSocketAccountSubscriber(
-			'userOrders',
-			this.program,
-			userOrdersPublicKey
-		);
-		await this.userOrdersAccountSubscriber.subscribe(
-			(data: UserOrdersAccount) => {
-				this.eventEmitter.emit('userOrdersData', data);
-				this.eventEmitter.emit('update');
-			}
-		);
-
 		this.eventEmitter.emit('update');
 		this.isSubscribed = true;
 		return true;
 	}
 
 	async fetch(): Promise<void> {
-		await Promise.all([
-			this.userDataAccountSubscriber.fetch(),
-			this.userPositionsAccountSubscriber.fetch(),
-			this.userOrdersAccountSubscriber.fetch(),
-		]);
+		await Promise.all([this.userDataAccountSubscriber.fetch()]);
 	}
 
 	async unsubscribe(): Promise<void> {
@@ -103,11 +56,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			return;
 		}
 
-		await Promise.all([
-			this.userDataAccountSubscriber.unsubscribe(),
-			this.userPositionsAccountSubscriber.unsubscribe(),
-			await this.userOrdersAccountSubscriber.unsubscribe(),
-		]);
+		await Promise.all([this.userDataAccountSubscriber.unsubscribe()]);
 
 		this.isSubscribed = false;
 	}
@@ -120,17 +69,8 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 		}
 	}
 
-	public getUserAccount(): UserAccount {
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
 		this.assertIsSubscribed();
-		return this.userDataAccountSubscriber.data;
-	}
-
-	public getUserPositionsAccount(): UserPositionsAccount {
-		this.assertIsSubscribed();
-		return this.userPositionsAccountSubscriber.data;
-	}
-
-	public getUserOrdersAccount(): UserOrdersAccount {
-		return this.userOrdersAccountSubscriber.data;
+		return this.userDataAccountSubscriber.dataAndSlot;
 	}
 }

package/src/addresses/marketAddresses.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMarketAddress = void 0;
+const pda_1 = require("./pda");
+const CACHE = new Map();
+function getMarketAddress(programId, marketIndex) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
+        if (CACHE.has(cacheKey)) {
+            return CACHE.get(cacheKey);
+        }
+        const publicKey = yield pda_1.getMarketPublicKey(programId, marketIndex);
+        CACHE.set(cacheKey, publicKey);
+        return publicKey;
+    });
+}
+exports.getMarketAddress = getMarketAddress;

package/src/addresses/marketAddresses.ts

@@ -0,0 +1,18 @@
+import { PublicKey } from '@solana/web3.js';
+import { BN } from '@project-serum/anchor';
+import { getMarketPublicKey } from './pda';
+
+const CACHE = new Map<string, PublicKey>();
+export async function getMarketAddress(
+	programId: PublicKey,
+	marketIndex: BN
+): Promise<PublicKey> {
+	const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
+	if (CACHE.has(cacheKey)) {
+		return CACHE.get(cacheKey);
+	}
+
+	const publicKey = await getMarketPublicKey(programId, marketIndex);
+	CACHE.set(cacheKey, publicKey);
+	return publicKey;
+}

package/{lib/addresses.js → src/addresses/pda.js}

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -32,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSettlementStatePublicKey = exports.getUserOrdersAccountPublicKey = exports.getUserOrdersAccountPublicKeyAndNonce = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getOrderStateAccountPublicKeyAndNonce = exports.getOrderStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+exports.getBankVaultAuthorityPublicKey = exports.getBankVaultPublicKey = exports.getBankPublicKey = exports.getMarketPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
 const anchor = __importStar(require("@project-serum/anchor"));
 function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -40,54 +36,69 @@ function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     });
 }
 exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
-function getOrderStateAccountPublicKey(programId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield getOrderStateAccountPublicKeyAndNonce(programId))[0];
-    });
-}
-exports.getOrderStateAccountPublicKey = getOrderStateAccountPublicKey;
-function getOrderStateAccountPublicKeyAndNonce(programId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('order_state'))], programId);
-    });
-}
-exports.getOrderStateAccountPublicKeyAndNonce = getOrderStateAccountPublicKeyAndNonce;
 function getClearingHouseStateAccountPublicKey(programId) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
     });
 }
 exports.getClearingHouseStateAccountPublicKey = getClearingHouseStateAccountPublicKey;
-function getUserAccountPublicKeyAndNonce(programId, authority) {
+function getUserAccountPublicKeyAndNonce(programId, authority, userId = 0) {
     return __awaiter(this, void 0, void 0, function* () {
-        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('user')), authority.toBuffer()], programId);
+        return anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+            authority.toBuffer(),
+            Uint8Array.from([userId]),
+        ], programId);
     });
 }
 exports.getUserAccountPublicKeyAndNonce = getUserAccountPublicKeyAndNonce;
-function getUserAccountPublicKey(programId, authority) {
+function getUserAccountPublicKey(programId, authority, userId = 0) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield getUserAccountPublicKeyAndNonce(programId, authority))[0];
+        return (yield getUserAccountPublicKeyAndNonce(programId, authority, userId))[0];
     });
 }
 exports.getUserAccountPublicKey = getUserAccountPublicKey;
-function getUserOrdersAccountPublicKeyAndNonce(programId, userAccount) {
+function getUserAccountPublicKeySync(programId, authority, userId = 0) {
+    return anchor.web3.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+        authority.toBuffer(),
+        Uint8Array.from([userId]),
+    ], programId)[0];
+}
+exports.getUserAccountPublicKeySync = getUserAccountPublicKeySync;
+function getMarketPublicKey(programId, marketIndex) {
     return __awaiter(this, void 0, void 0, function* () {
-        return anchor.web3.PublicKey.findProgramAddress([
-            Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
-            userAccount.toBuffer(),
-        ], programId);
+        return (yield anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('market')),
+            marketIndex.toArrayLike(Buffer, 'le', 8),
+        ], programId))[0];
+    });
+}
+exports.getMarketPublicKey = getMarketPublicKey;
+function getBankPublicKey(programId, bankIndex) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('bank')),
+            bankIndex.toArrayLike(Buffer, 'le', 8),
+        ], programId))[0];
     });
 }
-exports.getUserOrdersAccountPublicKeyAndNonce = getUserOrdersAccountPublicKeyAndNonce;
-function getUserOrdersAccountPublicKey(programId, userAccount) {
+exports.getBankPublicKey = getBankPublicKey;
+function getBankVaultPublicKey(programId, bankIndex) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, userAccount))[0];
+        return (yield anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault')),
+            bankIndex.toArrayLike(Buffer, 'le', 8),
+        ], programId))[0];
     });
 }
-exports.getUserOrdersAccountPublicKey = getUserOrdersAccountPublicKey;
-function getSettlementStatePublicKey(programId) {
+exports.getBankVaultPublicKey = getBankVaultPublicKey;
+function getBankVaultAuthorityPublicKey(programId, bankIndex) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('settlement_state'))], programId))[0];
+        return (yield anchor.web3.PublicKey.findProgramAddress([
+            Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault_authority')),
+            bankIndex.toArrayLike(Buffer, 'le', 8),
+        ], programId))[0];
     });
 }
-exports.getSettlementStatePublicKey = getSettlementStatePublicKey;
+exports.getBankVaultAuthorityPublicKey = getBankVaultAuthorityPublicKey;

package/src/addresses/pda.ts

@@ -0,0 +1,118 @@
+import { PublicKey } from '@solana/web3.js';
+import * as anchor from '@project-serum/anchor';
+import { BN } from '@project-serum/anchor';
+
+export async function getClearingHouseStateAccountPublicKeyAndNonce(
+	programId: PublicKey
+): Promise<[PublicKey, number]> {
+	return anchor.web3.PublicKey.findProgramAddress(
+		[Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))],
+		programId
+	);
+}
+
+export async function getClearingHouseStateAccountPublicKey(
+	programId: PublicKey
+): Promise<PublicKey> {
+	return (await getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
+}
+
+export async function getUserAccountPublicKeyAndNonce(
+	programId: PublicKey,
+	authority: PublicKey,
+	userId = 0
+): Promise<[PublicKey, number]> {
+	return anchor.web3.PublicKey.findProgramAddress(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+			authority.toBuffer(),
+			Uint8Array.from([userId]),
+		],
+		programId
+	);
+}
+
+export async function getUserAccountPublicKey(
+	programId: PublicKey,
+	authority: PublicKey,
+	userId = 0
+): Promise<PublicKey> {
+	return (
+		await getUserAccountPublicKeyAndNonce(programId, authority, userId)
+	)[0];
+}
+
+export function getUserAccountPublicKeySync(
+	programId: PublicKey,
+	authority: PublicKey,
+	userId = 0
+): PublicKey {
+	return anchor.web3.PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('user')),
+			authority.toBuffer(),
+			Uint8Array.from([userId]),
+		],
+		programId
+	)[0];
+}
+
+export async function getMarketPublicKey(
+	programId: PublicKey,
+	marketIndex: BN
+): Promise<PublicKey> {
+	return (
+		await anchor.web3.PublicKey.findProgramAddress(
+			[
+				Buffer.from(anchor.utils.bytes.utf8.encode('market')),
+				marketIndex.toArrayLike(Buffer, 'le', 8),
+			],
+			programId
+		)
+	)[0];
+}
+
+export async function getBankPublicKey(
+	programId: PublicKey,
+	bankIndex: BN
+): Promise<PublicKey> {
+	return (
+		await anchor.web3.PublicKey.findProgramAddress(
+			[
+				Buffer.from(anchor.utils.bytes.utf8.encode('bank')),
+				bankIndex.toArrayLike(Buffer, 'le', 8),
+			],
+			programId
+		)
+	)[0];
+}
+
+export async function getBankVaultPublicKey(
+	programId: PublicKey,
+	bankIndex: BN
+): Promise<PublicKey> {
+	return (
+		await anchor.web3.PublicKey.findProgramAddress(
+			[
+				Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault')),
+				bankIndex.toArrayLike(Buffer, 'le', 8),
+			],
+			programId
+		)
+	)[0];
+}
+
+export async function getBankVaultAuthorityPublicKey(
+	programId: PublicKey,
+	bankIndex: BN
+): Promise<PublicKey> {
+	return (
+		await anchor.web3.PublicKey.findProgramAddress(
+			[
+				Buffer.from(anchor.utils.bytes.utf8.encode('bank_vault_authority')),
+				bankIndex.toArrayLike(Buffer, 'le', 8),
+			],
+			programId
+		)
+	)[0];
+}