@drift-labs/sdk 2.85.0-beta.3 → 2.85.0-beta.5

package/lib/idl/drift.json

@@ -3934,6 +3934,12 @@
                 {
                     "name": "maxBorrowRate",
                     "type": "u32"
+                },
+                {
+                    "name": "minBorrowRate",
+                    "type": {
+                        "option": "u8"
+                    }
                 }
             ]
         },
@@ -6198,13 +6204,13 @@
                         "type": "i16"
                     },
                     {
-                        "name": "padding1",
-                        "type": {
-                            "array": [
-                                "u8",
-                                2
-                            ]
-                        }
+                        "name": "maxTokenBorrowsFraction",
+                        "docs": [
+                            "What fraction of max_token_deposits",
+                            "disabled when 0, 1 => 1/10000 => .01% of max_token_deposits",
+                            "precision: X/10000"
+                        ],
+                        "type": "u16"
                     },
                     {
                         "name": "flashLoanAmount",
@@ -6240,12 +6246,21 @@
                         ],
                         "type": "u64"
                     },
+                    {
+                        "name": "minBorrowRate",
+                        "docs": [
+                            "The min borrow rate for this market when the market regardless of utilization",
+                            "1 => 1/200 => .5%",
+                            "precision: X/200"
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                48
+                                47
                             ]
                         }
                     }
@@ -12009,6 +12024,11 @@
             "code": 6267,
             "name": "UnableToParsePullOracleMessage",
             "msg": "Unable to parse pull oracle message"
+        },
+        {
+            "code": 6268,
+            "name": "MaxBorrows",
+            "msg": "Can not borow more than max borrows"
         }
     ]
 }

package/lib/testClient.js

@@ -8,12 +8,11 @@ class TestClient extends adminClient_1.AdminClient {
             throw new Error('Test client must be polling');
         }
         super(config);
-        // @ts-ignore
-        this.txHandler.blockhashCommitment = 'recent';
     }
     async sendTransaction(tx, additionalSigners, opts, preSigned) {
         const { txSig, slot } = await super.sendTransaction(tx, additionalSigners, opts, preSigned);
         let lastFetchedSlot = this.accountSubscriber.accountLoader.mostRecentSlot;
+        await this.fetchAccounts();
         while (lastFetchedSlot < slot) {
             await this.fetchAccounts();
             lastFetchedSlot = this.accountSubscriber.accountLoader.mostRecentSlot;

package/lib/tokenFaucet.d.ts

@@ -5,14 +5,16 @@ import { Account } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { BN } from '.';
 import { IWallet } from './types';
+import { BankrunContextWrapper } from './bankrun/bankrunConnection';
 export declare class TokenFaucet {
+    context?: BankrunContextWrapper;
     connection: Connection;
     wallet: IWallet;
     program: Program;
     provider: AnchorProvider;
     mint: PublicKey;
     opts?: ConfirmOptions;
-    constructor(connection: Connection, wallet: IWallet, programId: PublicKey, mint: PublicKey, opts?: ConfirmOptions);
+    constructor(connection: Connection, wallet: IWallet, programId: PublicKey, mint: PublicKey, opts?: ConfirmOptions, context?: BankrunContextWrapper);
     getFaucetConfigPublicKeyAndNonce(): Promise<[
         PublicKey,
         number

package/lib/tokenFaucet.js

@@ -33,12 +33,15 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));
 class TokenFaucet {
-    constructor(connection, wallet, programId, mint, opts) {
+    constructor(connection, wallet, programId, mint, opts, context) {
         this.connection = connection;
+        this.context = context;
         this.wallet = wallet;
         this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
         // @ts-ignore
-        const provider = new anchor_1.AnchorProvider(connection, wallet, this.opts);
+        const provider = new anchor_1.AnchorProvider(context ? context.connection.toConnection() : this.connection, 
+        // @ts-ignore
+        wallet, this.opts);
         this.provider = provider;
         this.program = new anchor_1.Program(token_faucet_json_1.default, programId, provider);
         this.mint = mint;
@@ -60,7 +63,7 @@ class TokenFaucet {
     }
     async initialize() {
         const [faucetConfigPublicKey] = await this.getFaucetConfigPublicKeyAndNonce();
-        return await this.program.rpc.initialize({
+        const ix = this.program.instruction.initialize({
             accounts: {
                 faucetConfig: faucetConfigPublicKey,
                 admin: this.wallet.publicKey,
@@ -70,6 +73,9 @@ class TokenFaucet {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
+        const tx = new web3_js_1.Transaction().add(ix);
+        const txSig = await this.context.sendTransaction(tx);
+        return txSig;
     }
     async fetchState() {
         return await this.program.account.faucetConfig.fetch(await this.getFaucetConfigPublicKey());
@@ -88,10 +94,28 @@ class TokenFaucet {
     async mintToUser(userTokenAccount, amount) {
         const mintIx = await this.mintToUserIx(userTokenAccount, amount);
         const tx = new web3_js_1.Transaction().add(mintIx);
-        const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
-        return txSig;
+        if (this.context) {
+            return await this.context.sendTransaction(tx);
+        }
+        else {
+            return await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        }
     }
     async transferMintAuthority() {
+        if (this.context) {
+            const ix = this.program.instruction.transferMintAuthority({
+                accounts: {
+                    faucetConfig: await this.getFaucetConfigPublicKey(),
+                    mintAccount: this.mint,
+                    mintAuthority: await this.getMintAuthority(),
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    admin: this.wallet.publicKey,
+                },
+            });
+            const tx = new web3_js_1.Transaction().add(ix);
+            const txSig = await this.context.sendTransaction(tx);
+            return txSig;
+        }
         return await this.program.rpc.transferMintAuthority({
             accounts: {
                 faucetConfig: await this.getFaucetConfigPublicKey(),
@@ -107,7 +131,7 @@ class TokenFaucet {
         const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = await this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
         let associatedTokenAccountExists = false;
         try {
-            const assosciatedTokenAccount = await this.connection.getAccountInfo(associatedTokenPublicKey);
+            const assosciatedTokenAccount = await this.context.connection.getAccountInfo(associatedTokenPublicKey);
             associatedTokenAccountExists = !!assosciatedTokenAccount;
         }
         catch (e) {
@@ -118,7 +142,13 @@ class TokenFaucet {
         if (!skipAccountCreation)
             tx.add(createAssociatedAccountIx);
         tx.add(mintToTx);
-        const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        let txSig;
+        if (this.context) {
+            txSig = await this.context.sendTransaction(tx);
+        }
+        else {
+            txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
+        }
         return [associatedTokenPublicKey, txSig];
     }
     async createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount) {
@@ -134,6 +164,9 @@ class TokenFaucet {
     }
     async getTokenAccountInfo(props) {
         const associatedKey = await this.getAssosciatedMockUSDMintAddress(props);
+        if (this.context) {
+            return await this.context.connection.getTokenAccount(associatedKey);
+        }
         return await (0, spl_token_1.getAccount)(this.connection, associatedKey);
     }
     async subscribeToTokenAccount(props) {
@@ -141,7 +174,7 @@ class TokenFaucet {
             const tokenAccountKey = await this.getAssosciatedMockUSDMintAddress(props);
             props.callback(await this.getTokenAccountInfo(props));
             // Couldn't find a way to do it using anchor framework subscription, someone on serum discord recommended this way
-            this.connection.onAccountChange(tokenAccountKey, async (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => {
+            this.context.connection.onAccountChange(tokenAccountKey, async (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => {
                 props.callback(await this.getTokenAccountInfo(props));
             });
             return true;

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.3",
+	"version": "2.85.0-beta.5",
 	"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"

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