@drift-labs/sdk 0.1.36-master.5 → 0.2.0-master.0

package/lib/types.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TradeSide = exports.isVariant = exports.OrderTriggerCondition = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.PositionDirection = exports.SwapDirection = void 0;
+exports.TradeSide = exports.isOneOfVariant = exports.isVariant = exports.OrderTriggerCondition = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.PositionDirection = exports.BankBalanceType = exports.SwapDirection = void 0;
 // # Utility Types / Enums / Constants
 class SwapDirection {
 }
 exports.SwapDirection = SwapDirection;
 SwapDirection.ADD = { add: {} };
 SwapDirection.REMOVE = { remove: {} };
+class BankBalanceType {
+}
+exports.BankBalanceType = BankBalanceType;
+BankBalanceType.DEPOSIT = { deposit: {} };
+BankBalanceType.BORROW = { borrow: {} };
 class PositionDirection {
 }
 exports.PositionDirection = PositionDirection;
@@ -17,6 +22,7 @@ class OracleSource {
 exports.OracleSource = OracleSource;
 OracleSource.PYTH = { pyth: {} };
 OracleSource.SWITCHBOARD = { switchboard: {} };
+OracleSource.QUOTE_ASSET = { quoteAsset: {} };
 class OrderType {
 }
 exports.OrderType = OrderType;
@@ -53,6 +59,12 @@ function isVariant(object, type) {
     return object.hasOwnProperty(type);
 }
 exports.isVariant = isVariant;
+function isOneOfVariant(object, types) {
+    return types.reduce((result, type) => {
+        return result || object.hasOwnProperty(type);
+    }, false);
+}
+exports.isOneOfVariant = isOneOfVariant;
 var TradeSide;
 (function (TradeSide) {
     TradeSide[TradeSide["None"] = 0] = "None";

package/lib/userName.d.ts

@@ -0,0 +1,4 @@
+export declare const MAX_NAME_LENGTH = 32;
+export declare const DEFAULT_USER_NAME = "Main Account";
+export declare function encodeName(name: string): number[];
+export declare function decodeName(bytes: number[]): string;

package/lib/userName.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeName = exports.encodeName = exports.DEFAULT_USER_NAME = exports.MAX_NAME_LENGTH = void 0;
+exports.MAX_NAME_LENGTH = 32;
+exports.DEFAULT_USER_NAME = 'Main Account';
+function encodeName(name) {
+    if (name.length > exports.MAX_NAME_LENGTH) {
+        throw Error(`User name (${name}) longer than 32 characters`);
+    }
+    const buffer = Buffer.alloc(32);
+    buffer.fill(name);
+    buffer.fill(' ', name.length);
+    return Array(...buffer);
+}
+exports.encodeName = encodeName;
+function decodeName(bytes) {
+    const buffer = Buffer.from(bytes);
+    return buffer.toString('utf8').trim();
+}
+exports.decodeName = decodeName;

package/lib/util/computeUnits.js

@@ -1,27 +1,16 @@
 "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.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield connection.getTransaction(txSignature, { commitment });
-        const computeUnits = [];
-        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of 200000 compute units`);
-        tx.meta.logMessages.forEach((logMessage) => {
-            const match = logMessage.match(regex);
-            if (match && match[1]) {
-                computeUnits.push(match[1]);
-            }
-        });
-        return computeUnits;
+async function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    const tx = await connection.getTransaction(txSignature, { commitment });
+    const computeUnits = [];
+    const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of 200000 compute units`);
+    tx.meta.logMessages.forEach((logMessage) => {
+        const match = logMessage.match(regex);
+        if (match && match[1]) {
+            computeUnits.push(match[1]);
+        }
     });
+    return computeUnits;
 }
 exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/lib/util/tps.js

@@ -1,27 +1,16 @@
 "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.estimateTps = void 0;
-function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
-        if (failed) {
-            signatures = signatures.filter((signature) => signature.err);
-        }
-        const numberOfSignatures = signatures.length;
-        if (numberOfSignatures === 0) {
-            return 0;
-        }
-        return (numberOfSignatures /
-            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
-    });
+async function estimateTps(programId, connection, failed) {
+    let signatures = await connection.getSignaturesForAddress(programId, undefined, 'finalized');
+    if (failed) {
+        signatures = signatures.filter((signature) => signature.err);
+    }
+    const numberOfSignatures = signatures.length;
+    if (numberOfSignatures === 0) {
+        return 0;
+    }
+    return (numberOfSignatures /
+        (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
 }
 exports.estimateTps = estimateTps;

package/lib/wallet.js

@@ -1,31 +1,18 @@
 "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.Wallet = void 0;
 class Wallet {
     constructor(payer) {
         this.payer = payer;
     }
-    signTransaction(tx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            tx.partialSign(this.payer);
-            return tx;
-        });
+    async signTransaction(tx) {
+        tx.partialSign(this.payer);
+        return tx;
     }
-    signAllTransactions(txs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return txs.map((t) => {
-                t.partialSign(this.payer);
-                return t;
-            });
+    async signAllTransactions(txs) {
+        return txs.map((t) => {
+            t.partialSign(this.payer);
+            return t;
         });
     }
     get publicKey() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.36-master.5",
+	"version": "0.2.0-master.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -13,6 +13,7 @@
 		"lint": "eslint './**/*.{ts,tsx}' --quiet",
 		"build": "yarn clean && tsc",
 		"clean": "rm -rf lib",
+		"test": "mocha -r ts-node/register tests/**/*.ts",
 		"patch-and-pub": "npm version patch --force && npm publish"
 	},
 	"keywords": [
@@ -31,17 +32,23 @@
 		"@project-serum/anchor": "0.24.2",
 		"@pythnetwork/client": "^2.5.1",
 		"@solana/spl-token": "^0.1.6",
-		"@solana/web3.js": "^1.22.0",
+		"@solana/web3.js": "1.41.0",
 		"@switchboard-xyz/switchboard-v2": "^0.0.67",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"
 	},
 	"devDependencies": {
+		"@types/chai": "^4.3.1",
+		"@types/mocha": "^9.1.1",
 		"@typescript-eslint/eslint-plugin": "^4.28.0",
 		"@typescript-eslint/parser": "^4.28.0",
+		"@types/jest": "^28.1.3",
+		"chai": "^4.3.6",
 		"eslint": "^7.29.0",
 		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-prettier": "^3.4.0"
+		"eslint-plugin-prettier": "^3.4.0",
+		"mocha": "^10.0.0",
+		"ts-node": "^10.8.0"
 	},
 	"description": "SDK for Drift Protocol v1",
 	"engines": {

package/src/accounts/bulkAccountLoader.ts

@@ -1,11 +1,11 @@
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { v4 as uuidv4 } from 'uuid';
-import { AccountData } from './types';
+import { BufferAndSlot } from './types';
 import { promiseTimeout } from '../util/promiseTimeout';
 
 type AccountToLoad = {
 	publicKey: PublicKey;
-	callbacks: Map<string, (buffer: Buffer) => void>;
+	callbacks: Map<string, (buffer: Buffer, slot: number) => void>;
 };
 
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
@@ -17,13 +17,14 @@ export class BulkAccountLoader {
 	commitment: Commitment;
 	pollingFrequency: number;
 	accountsToLoad = new Map<string, AccountToLoad>();
-	accountData = new Map<string, AccountData>();
+	bufferAndSlotMap = new Map<string, BufferAndSlot>();
 	errorCallbacks = new Map<string, (e) => void>();
 	intervalId?: NodeJS.Timer;
 	// to handle clients spamming load
 	loadPromise?: Promise<void>;
 	loadPromiseResolver: () => void;
 	lastTimeLoadingPromiseCleared = Date.now();
+	mostRecentSlot = 0;
 
 	public constructor(
 		connection: Connection,
@@ -37,7 +38,7 @@ export class BulkAccountLoader {
 
 	public addAccount(
 		publicKey: PublicKey,
-		callback: (buffer: Buffer) => void
+		callback: (buffer: Buffer, slot: number) => void
 	): string {
 		const existingSize = this.accountsToLoad.size;
 
@@ -46,7 +47,10 @@ export class BulkAccountLoader {
 		if (existingAccountToLoad) {
 			existingAccountToLoad.callbacks.set(callbackId, callback);
 		} else {
-			const callbacks = new Map<string, (buffer: Buffer) => void>();
+			const callbacks = new Map<
+				string,
+				(buffer: Buffer, slot: number) => void
+			>();
 			callbacks.set(callbackId, callback);
 			const newAccountToLoad = {
 				publicKey,
@@ -159,10 +163,14 @@ export class BulkAccountLoader {
 
 		const newSlot = rpcResponse.result.context.slot;
 
+		if (newSlot > this.mostRecentSlot) {
+			this.mostRecentSlot = newSlot;
+		}
+
 		for (const i in accountsToLoad) {
 			const accountToLoad = accountsToLoad[i];
 			const key = accountToLoad.publicKey.toString();
-			const oldRPCResponse = this.accountData.get(key);
+			const oldRPCResponse = this.bufferAndSlotMap.get(key);
 
 			let newBuffer: Buffer | undefined = undefined;
 			if (rpcResponse.result.value[i]) {
@@ -172,11 +180,11 @@ export class BulkAccountLoader {
 			}
 
 			if (!oldRPCResponse) {
-				this.accountData.set(key, {
+				this.bufferAndSlotMap.set(key, {
 					slot: newSlot,
 					buffer: newBuffer,
 				});
-				this.handleAccountCallbacks(accountToLoad, newBuffer);
+				this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
 				continue;
 			}
 
@@ -186,24 +194,27 @@ export class BulkAccountLoader {
 
 			const oldBuffer = oldRPCResponse.buffer;
 			if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
-				this.accountData.set(key, {
+				this.bufferAndSlotMap.set(key, {
 					slot: newSlot,
 					buffer: newBuffer,
 				});
-				this.handleAccountCallbacks(accountToLoad, newBuffer);
+				this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
 			}
 		}
 	}
 
-	handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer): void {
+	handleAccountCallbacks(
+		accountToLoad: AccountToLoad,
+		buffer: Buffer,
+		slot: number
+	): void {
 		for (const [_, callback] of accountToLoad.callbacks) {
-			callback(buffer);
+			callback(buffer, slot);
 		}
 	}
 
-	public getAccountData(publicKey: PublicKey): Buffer | undefined {
-		const accountData = this.accountData.get(publicKey.toString());
-		return accountData?.buffer;
+	public getBufferAndSlot(publicKey: PublicKey): BufferAndSlot | undefined {
+		return this.bufferAndSlotMap.get(publicKey.toString());
 	}
 
 	public startPolling(): void {

package/src/accounts/bulkUserSubscription.ts

@@ -1,9 +1,6 @@
 import { ClearingHouseUser } from '../clearingHouseUser';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { PollingUserAccountSubscriber } from './pollingUserAccountSubscriber';
-import { UserAccount, UserOrdersAccount } from '../types';
-import { UserPublicKeys } from './types';
-import { ProgramAccount } from '@project-serum/anchor';
 
 /**
  * @param users
@@ -18,53 +15,12 @@ export async function bulkPollingUserSubscribe(
 		return;
 	}
 
-	// Fetch all the accounts first
-	const program = users[0].clearingHouse.program;
-	let userProgramAccounts: ProgramAccount[];
-	let orderProgramAccounts: ProgramAccount[];
-	await Promise.all([
-		(async () => {
-			userProgramAccounts = await program.account.user.all();
-		})(),
-		(async () => {
-			orderProgramAccounts = await program.account.userOrders.all();
-		})(),
-	]);
-
-	// Create a map of the authority to keys
-	const authorityToKeys = new Map<string, UserPublicKeys>();
-	const userToAuthority = new Map<string, string>();
-	for (const userProgramAccount of userProgramAccounts) {
-		const userAccountPublicKey = userProgramAccount.publicKey;
-		const userAccount = userProgramAccount.account as UserAccount;
-
-		authorityToKeys.set(userAccount.authority.toString(), {
-			user: userAccountPublicKey,
-			userPositions: userAccount.positions,
-			userOrders: undefined,
-		});
-
-		userToAuthority.set(
-			userAccountPublicKey.toString(),
-			userAccount.authority.toString()
-		);
-	}
-	for (const orderProgramAccount of orderProgramAccounts) {
-		const userOrderAccountPublicKey = orderProgramAccount.publicKey;
-		const userOrderAccount = orderProgramAccount.account as UserOrdersAccount;
-
-		const authority = userToAuthority.get(userOrderAccount.user.toString());
-		const userPublicKeys = authorityToKeys.get(authority);
-		userPublicKeys.userOrders = userOrderAccountPublicKey;
-	}
-
 	await Promise.all(
 		users.map((user) => {
 			// Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
-			const userPublicKeys = authorityToKeys.get(user.authority.toString());
 			return (
 				user.accountSubscriber as PollingUserAccountSubscriber
-			).addToAccountLoader(userPublicKeys);
+			).addToAccountLoader();
 		})
 	);
 

package/src/accounts/fetch.ts

@@ -0,0 +1,33 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+import { UserAccount } from '../types';
+import { getUserAccountPublicKey } from '../addresses/pda';
+import { Program } from '@project-serum/anchor';
+
+export async function fetchUserAccounts(
+	connection: Connection,
+	program: Program,
+	authority: PublicKey,
+	limit = 8
+): Promise<(UserAccount | undefined)[]> {
+	const userAccountPublicKeys = new Array<PublicKey>();
+	for (let i = 0; i < limit; i++) {
+		userAccountPublicKeys.push(
+			await getUserAccountPublicKey(program.programId, authority, i)
+		);
+	}
+
+	const accountInfos = await connection.getMultipleAccountsInfo(
+		userAccountPublicKeys,
+		'confirmed'
+	);
+
+	return accountInfos.map((accountInfo) => {
+		if (!accountInfo) {
+			return undefined;
+		}
+		return program.account.user.coder.accounts.decode(
+			'User',
+			accountInfo.data
+		) as UserAccount;
+	});
+}