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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.36-master.7",
+	"version": "0.2.0-master.10",
 	"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": [
@@ -29,19 +30,25 @@
 	},
 	"dependencies": {
 		"@project-serum/anchor": "0.24.2",
-		"@pythnetwork/client": "^2.5.1",
+		"@pythnetwork/client": "2.5.3",
 		"@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/jest": "^28.1.3",
+		"@types/mocha": "^9.1.1",
 		"@typescript-eslint/eslint-plugin": "^4.28.0",
 		"@typescript-eslint/parser": "^4.28.0",
+		"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.js

@@ -0,0 +1,197 @@
+"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.BulkAccountLoader = void 0;
+const uuid_1 = require("uuid");
+const promiseTimeout_1 = require("../util/promiseTimeout");
+const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
+const oneMinute = 60 * 1000;
+class BulkAccountLoader {
+    constructor(connection, commitment, pollingFrequency) {
+        this.accountsToLoad = new Map();
+        this.bufferAndSlotMap = new Map();
+        this.errorCallbacks = new Map();
+        this.lastTimeLoadingPromiseCleared = Date.now();
+        this.mostRecentSlot = 0;
+        this.connection = connection;
+        this.commitment = commitment;
+        this.pollingFrequency = pollingFrequency;
+    }
+    addAccount(publicKey, callback) {
+        const existingSize = this.accountsToLoad.size;
+        const callbackId = uuid_1.v4();
+        const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
+        if (existingAccountToLoad) {
+            existingAccountToLoad.callbacks.set(callbackId, callback);
+        }
+        else {
+            const callbacks = new Map();
+            callbacks.set(callbackId, callback);
+            const newAccountToLoad = {
+                publicKey,
+                callbacks,
+            };
+            this.accountsToLoad.set(publicKey.toString(), newAccountToLoad);
+        }
+        if (existingSize === 0) {
+            this.startPolling();
+        }
+        // if a new account needs to be polled, remove the cached loadPromise in case client calls load immediately after
+        this.loadPromise = undefined;
+        return callbackId;
+    }
+    removeAccount(publicKey, callbackId) {
+        const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
+        if (existingAccountToLoad) {
+            existingAccountToLoad.callbacks.delete(callbackId);
+            if (existingAccountToLoad.callbacks.size === 0) {
+                this.accountsToLoad.delete(existingAccountToLoad.publicKey.toString());
+            }
+        }
+        if (this.accountsToLoad.size === 0) {
+            this.stopPolling();
+        }
+    }
+    addErrorCallbacks(callback) {
+        const callbackId = uuid_1.v4();
+        this.errorCallbacks.set(callbackId, callback);
+        return callbackId;
+    }
+    removeErrorCallbacks(callbackId) {
+        this.errorCallbacks.delete(callbackId);
+    }
+    chunks(array, size) {
+        return new Array(Math.ceil(array.length / size))
+            .fill(null)
+            .map((_, index) => index * size)
+            .map((begin) => array.slice(begin, begin + size));
+    }
+    load() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.loadPromise) {
+                const now = Date.now();
+                if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
+                    this.loadPromise = undefined;
+                }
+                else {
+                    return this.loadPromise;
+                }
+            }
+            this.loadPromise = new Promise((resolver) => {
+                this.loadPromiseResolver = resolver;
+            });
+            this.lastTimeLoadingPromiseCleared = Date.now();
+            try {
+                const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
+                yield Promise.all(chunks.map((chunk) => {
+                    return this.loadChunk(chunk);
+                }));
+            }
+            catch (e) {
+                console.error(`Error in bulkAccountLoader.load()`);
+                console.error(e);
+                for (const [_, callback] of this.errorCallbacks) {
+                    callback(e);
+                }
+            }
+            finally {
+                this.loadPromiseResolver();
+                this.loadPromise = undefined;
+            }
+        });
+    }
+    loadChunk(accountsToLoad) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accountsToLoad.length === 0) {
+                return;
+            }
+            const args = [
+                accountsToLoad.map((accountToLoad) => {
+                    return accountToLoad.publicKey.toBase58();
+                }),
+                { commitment: this.commitment },
+            ];
+            const rpcResponse = yield promiseTimeout_1.promiseTimeout(
+            // @ts-ignore
+            this.connection._rpcRequest('getMultipleAccounts', args), 10 * 1000 // 30 second timeout
+            );
+            if (rpcResponse === null) {
+                this.log('request to rpc timed out');
+                return;
+            }
+            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.bufferAndSlotMap.get(key);
+                let newBuffer = undefined;
+                if (rpcResponse.result.value[i]) {
+                    const raw = rpcResponse.result.value[i].data[0];
+                    const dataType = rpcResponse.result.value[i].data[1];
+                    newBuffer = Buffer.from(raw, dataType);
+                }
+                if (!oldRPCResponse) {
+                    this.bufferAndSlotMap.set(key, {
+                        slot: newSlot,
+                        buffer: newBuffer,
+                    });
+                    this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+                    continue;
+                }
+                if (newSlot <= oldRPCResponse.slot) {
+                    continue;
+                }
+                const oldBuffer = oldRPCResponse.buffer;
+                if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+                    this.bufferAndSlotMap.set(key, {
+                        slot: newSlot,
+                        buffer: newBuffer,
+                    });
+                    this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+                }
+            }
+        });
+    }
+    handleAccountCallbacks(accountToLoad, buffer, slot) {
+        for (const [_, callback] of accountToLoad.callbacks) {
+            callback(buffer, slot);
+        }
+    }
+    getBufferAndSlot(publicKey) {
+        return this.bufferAndSlotMap.get(publicKey.toString());
+    }
+    startPolling() {
+        if (this.intervalId) {
+            return;
+        }
+        this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
+    }
+    stopPolling() {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        }
+    }
+    log(msg) {
+        console.log(msg);
+    }
+    updatePollingFrequency(pollingFrequency) {
+        this.stopPolling();
+        this.pollingFrequency = pollingFrequency;
+        if (this.accountsToLoad.size > 0) {
+            this.startPolling();
+        }
+    }
+}
+exports.BulkAccountLoader = BulkAccountLoader;

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,7 +17,7 @@ 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
@@ -38,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;
 
@@ -47,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,
@@ -167,7 +170,7 @@ export class BulkAccountLoader {
 		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]) {
@@ -177,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;
 			}
 
@@ -191,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.js

@@ -0,0 +1,33 @@
+"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.bulkPollingUserSubscribe = void 0;
+/**
+ * @param users
+ * @param accountLoader
+ */
+function bulkPollingUserSubscribe(users, accountLoader) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (users.length === 0) {
+            yield accountLoader.load();
+            return;
+        }
+        yield Promise.all(users.map((user) => {
+            // Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
+            return user.accountSubscriber.addToAccountLoader();
+        }));
+        yield accountLoader.load();
+        yield Promise.all(users.map((user) => __awaiter(this, void 0, void 0, function* () {
+            return user.subscribe();
+        })));
+    });
+}
+exports.bulkPollingUserSubscribe = bulkPollingUserSubscribe;

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.js

@@ -0,0 +1,29 @@
+"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.fetchUserAccounts = void 0;
+const pda_1 = require("../addresses/pda");
+function fetchUserAccounts(connection, program, authority, limit = 8) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const userAccountPublicKeys = new Array();
+        for (let i = 0; i < limit; i++) {
+            userAccountPublicKeys.push(yield pda_1.getUserAccountPublicKey(program.programId, authority, i));
+        }
+        const accountInfos = yield connection.getMultipleAccountsInfo(userAccountPublicKeys, 'confirmed');
+        return accountInfos.map((accountInfo) => {
+            if (!accountInfo) {
+                return undefined;
+            }
+            return program.account.user.coder.accounts.decode('User', accountInfo.data);
+        });
+    });
+}
+exports.fetchUserAccounts = fetchUserAccounts;

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;
+	});
+}