@drift-labs/sdk 2.85.0-beta.1 → 2.85.0-beta.11

package/lib/tx/txParamProcessor.d.ts

@@ -8,7 +8,8 @@ type TransactionBuildingProps = {
  */
 export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
-    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number): Promise<{
+    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+    lowerBoundCu?: number): Promise<{
         success: boolean;
         computeUnits: number;
     }>;

package/lib/tx/txParamProcessor.js

@@ -15,8 +15,8 @@ class TransactionParamProcessor {
         }
         return undefined;
     }
-    static async getTxSimComputeUnits(tx, connection, bufferMultiplier // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
-    ) {
+    static async getTxSimComputeUnits(tx, connection, bufferMultiplier, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+    lowerBoundCu) {
         var _a, _b, _c;
         try {
             if (TEST_SIMS_ALWAYS_FAIL)
@@ -29,7 +29,11 @@ class TransactionParamProcessor {
             }
             const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
             // Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
-            const bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
+            let bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
+            // If a lower bound CU is passed then enforce it
+            if (lowerBoundCu) {
+                bufferedComputeUnits = Math.max(bufferedComputeUnits, Math.min(lowerBoundCu, MAX_COMPUTE_UNITS));
+            }
             return {
                 success: true,
                 computeUnits: bufferedComputeUnits,

package/lib/tx/utils.d.ts

@@ -0,0 +1,2 @@
+import { Transaction, VersionedTransaction } from '@solana/web3.js';
+export declare const isVersionedTransaction: (tx: Transaction | VersionedTransaction) => boolean;

package/lib/tx/utils.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVersionedTransaction = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const isVersionedTransaction = (tx) => {
+    const version = tx === null || tx === void 0 ? void 0 : tx.version;
+    const isVersionedTx = tx instanceof web3_js_1.VersionedTransaction || version !== undefined;
+    return isVersionedTx;
+};
+exports.isVersionedTransaction = isVersionedTransaction;

package/lib/types.d.ts

@@ -1085,6 +1085,7 @@ export type ProcessingTxParams = {
     computeUnitsBufferMultiplier?: number;
     useSimulatedComputeUnitsForCUPriceCalculation?: boolean;
     getCUPriceFromComputeUnits?: (computeUnits: number) => number;
+    lowerBoundCu?: number;
 };
 export type TxParams = BaseTxParams & ProcessingTxParams;
 export declare class SwapReduceOnly {

package/lib/user.js

@@ -27,7 +27,7 @@ class User {
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
-            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader);
+            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.connection, config.userAccountPublicKey, config.accountSubscription.accountLoader, this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts));
         }
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.85.0-beta.1",
+	"version": "2.85.0-beta.11",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -41,7 +41,9 @@
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
+		"anchor-bankrun": "^0.3.0",
 		"rpc-websockets": "7.5.1",
+		"solana-bankrun": "^0.3.0",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2",
 		"zstddec": "^0.1.0"
@@ -63,6 +65,7 @@
 		"mocha": "^10.0.0",
 		"object-sizeof": "^2.6.3",
 		"prettier": "3.0.1",
+		"sinon": "^18.0.0",
 		"ts-node": "^10.8.0",
 		"typescript": "^4.9.5"
 	},

package/src/accounts/bulkAccountLoader.ts

@@ -1,9 +1,10 @@
-import { Commitment, Connection, PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { v4 as uuidv4 } from 'uuid';
 import { BufferAndSlot } from './types';
 import { promiseTimeout } from '../util/promiseTimeout';
+import { Connection } from '../bankrun/bankrunConnection';
 
-type AccountToLoad = {
+export type AccountToLoad = {
 	publicKey: PublicKey;
 	callbacks: Map<string, (buffer: Buffer, slot: number) => void>;
 };

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -288,14 +288,20 @@ export class PollingDriftClientAccountSubscriber
 	public async fetch(): Promise<void> {
 		await this.accountLoader.load();
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+			const bufferAndSlot = this.accountLoader.getBufferAndSlot(
 				accountToPoll.publicKey
 			);
+
+			if (!bufferAndSlot) {
+				continue;
+			}
+
+			const { buffer, slot } = bufferAndSlot;
+
 			if (buffer) {
 				const account = this.program.account[
 					accountToPoll.key
 				].coder.accounts.decodeUnchecked(capitalize(accountToPoll.key), buffer);
-
 				if (accountToPoll.mapKey != undefined) {
 					this[accountToPoll.key].set(accountToPoll.mapKey, {
 						data: account,
@@ -311,9 +317,16 @@ export class PollingDriftClientAccountSubscriber
 		}
 
 		for (const [_, oracleToPoll] of this.oraclesToPoll) {
-			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+			const bufferAndSlot = this.accountLoader.getBufferAndSlot(
 				oracleToPoll.publicKey
 			);
+
+			if (!bufferAndSlot) {
+				continue;
+			}
+
+			const { buffer, slot } = bufferAndSlot;
+
 			if (buffer) {
 				const oracleClient = this.oracleClientCache.get(
 					oracleToPoll.source,

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -4,7 +4,7 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { Connection } from '../bankrun/bankrunConnection';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
@@ -13,7 +13,7 @@ import { BulkAccountLoader } from './bulkAccountLoader';
 
 export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
-	program: Program;
+	connection: Connection;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
 
@@ -21,18 +21,22 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	callbackId?: string;
 	errorCallbackId?: string;
 
+	decode: (name, buffer) => UserAccount;
+
 	user?: DataAndSlot<UserAccount>;
 
 	public constructor(
-		program: Program,
+		connection: Connection,
 		userAccountPublicKey: PublicKey,
-		accountLoader: BulkAccountLoader
+		accountLoader: BulkAccountLoader,
+		decode: (name, buffer) => UserAccount
 	) {
 		this.isSubscribed = false;
-		this.program = program;
+		this.connection = connection;
 		this.accountLoader = accountLoader;
 		this.eventEmitter = new EventEmitter();
 		this.userAccountPublicKey = userAccountPublicKey;
+		this.decode = decode;
 	}
 
 	async subscribe(userAccount?: UserAccount): Promise<boolean> {
@@ -71,10 +75,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					return;
 				}
 
-				const account = this.program.account.user.coder.accounts.decode(
-					'User',
-					buffer
-				);
+				const account = this.decode('User', buffer);
 				this.user = { data: account, slot };
 				this.eventEmitter.emit('userAccountUpdate', account);
 				this.eventEmitter.emit('update');
@@ -94,19 +95,19 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 
 	async fetch(): Promise<void> {
 		try {
-			const dataAndContext = await this.program.account.user.fetchAndContext(
+			const dataAndContext = await this.connection.getAccountInfoAndContext(
 				this.userAccountPublicKey,
 				this.accountLoader.commitment
 			);
 			if (dataAndContext.context.slot > (this.user?.slot ?? 0)) {
 				this.user = {
-					data: dataAndContext.data as UserAccount,
+					data: this.decode('User', dataAndContext.value.data),
 					slot: dataAndContext.context.slot,
 				};
 			}
 		} catch (e) {
 			console.log(
-				`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`
+				`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}-${e.stack}`
 			);
 		}
 	}

package/src/accounts/testBulkAccountLoader.ts

@@ -0,0 +1,53 @@
+import { AccountToLoad, BulkAccountLoader } from './bulkAccountLoader';
+
+export class TestBulkAccountLoader extends BulkAccountLoader {
+	async loadChunk(accountsToLoadChunks: AccountToLoad[][]): Promise<void> {
+		if (accountsToLoadChunks.length === 0) {
+			return;
+		}
+
+		const accounts = [];
+		for (const accountsToLoadChunk of accountsToLoadChunks) {
+			for (const accountToLoad of accountsToLoadChunk) {
+				const account = await this.connection.getAccountInfoAndContext(
+					accountToLoad.publicKey,
+					this.commitment
+				);
+				accounts.push(account);
+				const newSlot = account.context.slot;
+				if (newSlot > this.mostRecentSlot) {
+					this.mostRecentSlot = newSlot;
+				}
+
+				if (accountToLoad.callbacks.size === 0) {
+					return;
+				}
+
+				const key = accountToLoad.publicKey.toBase58();
+				const prev = this.bufferAndSlotMap.get(key);
+
+				if (prev && newSlot < prev.slot) {
+					return;
+				}
+
+				let newBuffer: Buffer | undefined = undefined;
+
+				if (account.value) {
+					newBuffer = account.value.data;
+				}
+
+				if (!prev) {
+					this.bufferAndSlotMap.set(key, { slot: newSlot, buffer: newBuffer });
+					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+					return;
+				}
+
+				const oldBuffer = prev.buffer;
+				if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+					this.bufferAndSlotMap.set(key, { slot: newSlot, buffer: newBuffer });
+					this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
+				}
+			}
+		}
+	}
+}