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

package/src/bankrun/bankrunConnection.ts

@@ -0,0 +1,466 @@
+import {
+	TransactionConfirmationStatus,
+	AccountInfo,
+	Keypair,
+	PublicKey,
+	Transaction,
+	RpcResponseAndContext,
+	Commitment,
+	TransactionSignature,
+	SignatureStatusConfig,
+	SignatureStatus,
+	GetVersionedTransactionConfig,
+	GetTransactionConfig,
+	VersionedTransaction,
+	SimulateTransactionConfig,
+	SimulatedTransactionResponse,
+	TransactionReturnData,
+	TransactionError,
+	SignatureResultCallback,
+	ClientSubscriptionId,
+	Connection as SolanaConnection,
+	SystemProgram,
+	Blockhash,
+	LogsFilter,
+	LogsCallback,
+	AccountChangeCallback,
+	LAMPORTS_PER_SOL,
+} from '@solana/web3.js';
+import {
+	ProgramTestContext,
+	BanksClient,
+	BanksTransactionResultWithMeta,
+	Clock,
+} from 'solana-bankrun';
+import { BankrunProvider } from 'anchor-bankrun';
+import bs58 from 'bs58';
+import { BN, Wallet } from '@coral-xyz/anchor';
+import { Account, TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
+
+export type Connection = SolanaConnection | BankrunConnection;
+
+type BankrunTransactionMetaNormalized = {
+	logMessages: string[];
+	err: TransactionError;
+};
+
+type BankrunTransactionRespose = {
+	slot: number;
+	meta: BankrunTransactionMetaNormalized;
+};
+
+export class BankrunContextWrapper {
+	public readonly connection: BankrunConnection;
+	public readonly context: ProgramTestContext;
+	public readonly provider: BankrunProvider;
+	public readonly commitment: Commitment = 'confirmed';
+
+	constructor(context: ProgramTestContext) {
+		this.context = context;
+		this.provider = new BankrunProvider(context);
+		this.connection = new BankrunConnection(
+			this.context.banksClient,
+			this.context
+		);
+	}
+
+	async sendTransaction(
+		tx: Transaction,
+		additionalSigners?: Keypair[]
+	): Promise<TransactionSignature> {
+		tx.recentBlockhash = (await this.getLatestBlockhash()).toString();
+		tx.feePayer = this.context.payer.publicKey;
+		if (!additionalSigners) {
+			additionalSigners = [];
+		}
+		tx.sign(this.context.payer, ...additionalSigners);
+		return await this.connection.sendTransaction(tx);
+	}
+
+	async getMinimumBalanceForRentExemption(_: number): Promise<number> {
+		return 10 * LAMPORTS_PER_SOL;
+	}
+
+	async fundKeypair(
+		keypair: Keypair | Wallet,
+		lamports: number | bigint
+	): Promise<TransactionSignature> {
+		const ixs = [
+			SystemProgram.transfer({
+				fromPubkey: this.context.payer.publicKey,
+				toPubkey: keypair.publicKey,
+				lamports,
+			}),
+		];
+		const tx = new Transaction().add(...ixs);
+		return await this.sendTransaction(tx);
+	}
+
+	async getLatestBlockhash(): Promise<Blockhash> {
+		const blockhash = await this.connection.getLatestBlockhash('finalized');
+
+		return blockhash.blockhash;
+	}
+
+	printTxLogs(signature: string): void {
+		this.connection.printTxLogs(signature);
+	}
+
+	async moveTimeForward(increment: number): Promise<void> {
+		const currentClock = await this.context.banksClient.getClock();
+		const newUnixTimestamp = currentClock.unixTimestamp + BigInt(increment);
+		const newClock = new Clock(
+			currentClock.slot,
+			currentClock.epochStartTimestamp,
+			currentClock.epoch,
+			currentClock.leaderScheduleEpoch,
+			newUnixTimestamp
+		);
+		await this.context.setClock(newClock);
+	}
+}
+
+export class BankrunConnection {
+	private readonly _banksClient: BanksClient;
+	private readonly context: ProgramTestContext;
+	private transactionToMeta: Map<
+		TransactionSignature,
+		BanksTransactionResultWithMeta
+	> = new Map();
+	private clock: Clock;
+
+	private nextClientSubscriptionId = 0;
+	private onLogCallbacks = new Map<number, LogsCallback>();
+	private onAccountChangeCallbacks = new Map<
+		number,
+		[PublicKey, AccountChangeCallback]
+	>();
+
+	constructor(banksClient: BanksClient, context: ProgramTestContext) {
+		this._banksClient = banksClient;
+		this.context = context;
+	}
+
+	getSlot(): Promise<bigint> {
+		return this._banksClient.getSlot();
+	}
+
+	toConnection(): SolanaConnection {
+		return this as unknown as SolanaConnection;
+	}
+
+	async getTokenAccount(publicKey: PublicKey): Promise<Account> {
+		const info = await this.getAccountInfo(publicKey);
+		return unpackAccount(publicKey, info, TOKEN_PROGRAM_ID);
+	}
+
+	async getMultipleAccountsInfo(
+		publicKeys: PublicKey[],
+		_commitmentOrConfig?: Commitment
+	): Promise<AccountInfo<Buffer>[]> {
+		const accountInfos = [];
+
+		for (const publicKey of publicKeys) {
+			const accountInfo = await this.getAccountInfo(publicKey);
+			accountInfos.push(accountInfo);
+		}
+
+		return accountInfos;
+	}
+
+	async getAccountInfo(
+		publicKey: PublicKey
+	): Promise<null | AccountInfo<Buffer>> {
+		const parsedAccountInfo = await this.getParsedAccountInfo(publicKey);
+		return parsedAccountInfo ? parsedAccountInfo.value : null;
+	}
+
+	async getAccountInfoAndContext(
+		publicKey: PublicKey,
+		_commitment?: Commitment
+	): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>> {
+		return await this.getParsedAccountInfo(publicKey);
+	}
+	async sendRawTransaction(
+		rawTransaction: Buffer | Uint8Array | Array<number>,
+		// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+		_options?: any
+	): Promise<TransactionSignature> {
+		const tx = Transaction.from(rawTransaction);
+		const signature = await this.sendTransaction(tx);
+		return signature;
+	}
+
+	async sendTransaction(tx: Transaction): Promise<TransactionSignature> {
+		const banksTransactionMeta = await this._banksClient.tryProcessTransaction(
+			tx
+		);
+		if (banksTransactionMeta.result) {
+			throw new Error(banksTransactionMeta.result);
+		}
+		const signature = bs58.encode(tx.signatures[0].signature);
+		this.transactionToMeta.set(signature, banksTransactionMeta);
+		let finalizedCount = 0;
+		while (finalizedCount < 10) {
+			const signatureStatus = (await this.getSignatureStatus(signature)).value
+				.confirmationStatus;
+			if (signatureStatus.toString() == '"finalized"') {
+				finalizedCount += 1;
+			}
+		}
+
+		// update the clock slot/timestamp
+		// sometimes race condition causes failures so we retry
+		try {
+			await this.updateSlotAndClock();
+		} catch (e) {
+			await this.updateSlotAndClock();
+		}
+
+		if (this.onLogCallbacks.size > 0) {
+			const transaction = await this.getTransaction(signature);
+
+			const context = { slot: transaction.slot };
+			const logs = {
+				logs: transaction.meta.logMessages,
+				err: transaction.meta.err,
+				signature,
+			};
+			for (const logCallback of this.onLogCallbacks.values()) {
+				logCallback(logs, context);
+			}
+		}
+
+		for (const [
+			publicKey,
+			callback,
+		] of this.onAccountChangeCallbacks.values()) {
+			const accountInfo = await this.getParsedAccountInfo(publicKey);
+			callback(accountInfo.value, accountInfo.context);
+		}
+
+		return signature;
+	}
+
+	private async updateSlotAndClock() {
+		const currentSlot = await this.getSlot();
+		const nextSlot = currentSlot + BigInt(1);
+		this.context.warpToSlot(nextSlot);
+		const currentClock = await this._banksClient.getClock();
+		const newClock = new Clock(
+			nextSlot,
+			currentClock.epochStartTimestamp,
+			currentClock.epoch,
+			currentClock.leaderScheduleEpoch,
+			currentClock.unixTimestamp + BigInt(1)
+		);
+		this.context.setClock(newClock);
+		this.clock = newClock;
+	}
+
+	getTime(): number {
+		return Number(this.clock.unixTimestamp);
+	}
+
+	async getParsedAccountInfo(
+		publicKey: PublicKey
+	): Promise<RpcResponseAndContext<AccountInfo<Buffer>>> {
+		const accountInfoBytes = await this._banksClient.getAccount(publicKey);
+		if (accountInfoBytes === null) {
+			return {
+				context: { slot: Number(await this._banksClient.getSlot()) },
+				value: null,
+			};
+		}
+		accountInfoBytes.data = Buffer.from(accountInfoBytes.data);
+		const accountInfoBuffer = accountInfoBytes as AccountInfo<Buffer>;
+		return {
+			context: { slot: Number(await this._banksClient.getSlot()) },
+			value: accountInfoBuffer,
+		};
+	}
+
+	async getLatestBlockhash(commitment?: Commitment): Promise<
+		Readonly<{
+			blockhash: string;
+			lastValidBlockHeight: number;
+		}>
+	> {
+		const blockhashAndBlockheight = await this._banksClient.getLatestBlockhash(
+			commitment
+		);
+		return {
+			blockhash: blockhashAndBlockheight[0],
+			lastValidBlockHeight: Number(blockhashAndBlockheight[1]),
+		};
+	}
+
+	async getSignatureStatus(
+		signature: string,
+		_config?: SignatureStatusConfig
+	): Promise<RpcResponseAndContext<null | SignatureStatus>> {
+		const transactionStatus = await this._banksClient.getTransactionStatus(
+			signature
+		);
+		if (transactionStatus === null) {
+			return {
+				context: { slot: Number(await this._banksClient.getSlot()) },
+				value: null,
+			};
+		}
+		return {
+			context: { slot: Number(await this._banksClient.getSlot()) },
+			value: {
+				slot: Number(transactionStatus.slot),
+				confirmations: Number(transactionStatus.confirmations),
+				err: transactionStatus.err,
+				confirmationStatus:
+					transactionStatus.confirmationStatus as TransactionConfirmationStatus,
+			},
+		};
+	}
+
+	/**
+	 * There's really no direct equivalent to getTransaction exposed by SolanaProgramTest, so we do the best that we can here - it's a little hacky.
+	 */
+	async getTransaction(
+		signature: string,
+		_rawConfig?: GetTransactionConfig | GetVersionedTransactionConfig
+	): Promise<BankrunTransactionRespose | null> {
+		const txMeta = this.transactionToMeta.get(
+			signature as TransactionSignature
+		);
+		if (txMeta === undefined) {
+			return null;
+		}
+		const transactionStatus = await this._banksClient.getTransactionStatus(
+			signature
+		);
+		const meta: BankrunTransactionMetaNormalized = {
+			logMessages: txMeta.meta.logMessages,
+			err: txMeta.result,
+		};
+		return {
+			slot: Number(transactionStatus.slot),
+			meta,
+		};
+	}
+
+	findComputeUnitConsumption(signature: string): bigint {
+		const txMeta = this.transactionToMeta.get(
+			signature as TransactionSignature
+		);
+		if (txMeta === undefined) {
+			throw new Error('Transaction not found');
+		}
+		return txMeta.meta.computeUnitsConsumed;
+	}
+
+	printTxLogs(signature: string): void {
+		const txMeta = this.transactionToMeta.get(
+			signature as TransactionSignature
+		);
+		if (txMeta === undefined) {
+			throw new Error('Transaction not found');
+		}
+		console.log(txMeta.meta.logMessages);
+	}
+
+	async simulateTransaction(
+		transaction: Transaction | VersionedTransaction,
+		_config?: SimulateTransactionConfig
+	): Promise<RpcResponseAndContext<SimulatedTransactionResponse>> {
+		const simulationResult = await this._banksClient.simulateTransaction(
+			transaction
+		);
+		const returnDataProgramId =
+			simulationResult.meta?.returnData?.programId.toBase58();
+		const returnDataNormalized = Buffer.from(
+			simulationResult.meta?.returnData?.data
+		).toString('base64');
+		const returnData: TransactionReturnData = {
+			programId: returnDataProgramId,
+			data: [returnDataNormalized, 'base64'],
+		};
+		return {
+			context: { slot: Number(await this._banksClient.getSlot()) },
+			value: {
+				err: simulationResult.result,
+				logs: simulationResult.meta.logMessages,
+				accounts: undefined,
+				unitsConsumed: Number(simulationResult.meta.computeUnitsConsumed),
+				returnData,
+			},
+		};
+	}
+
+	onSignature(
+		signature: string,
+		callback: SignatureResultCallback,
+		commitment?: Commitment
+	): ClientSubscriptionId {
+		const txMeta = this.transactionToMeta.get(
+			signature as TransactionSignature
+		);
+		this._banksClient.getSlot(commitment).then((slot) => {
+			if (txMeta) {
+				callback({ err: txMeta.result }, { slot: Number(slot) });
+			}
+		});
+		return 0;
+	}
+
+	async removeSignatureListener(_clientSubscriptionId: number): Promise<void> {
+		// Nothing actually has to happen here! Pretty cool, huh?
+		// This function signature only exists to match the web3js interface
+	}
+
+	onLogs(
+		filter: LogsFilter,
+		callback: LogsCallback,
+		_commitment?: Commitment
+	): ClientSubscriptionId {
+		const subscriptId = this.nextClientSubscriptionId;
+
+		this.onLogCallbacks.set(subscriptId, callback);
+
+		this.nextClientSubscriptionId += 1;
+
+		return subscriptId;
+	}
+
+	async removeOnLogsListener(
+		clientSubscriptionId: ClientSubscriptionId
+	): Promise<void> {
+		this.onLogCallbacks.delete(clientSubscriptionId);
+	}
+
+	onAccountChange(
+		publicKey: PublicKey,
+		callback: AccountChangeCallback,
+		// @ts-ignore
+		_commitment?: Commitment
+	): ClientSubscriptionId {
+		const subscriptId = this.nextClientSubscriptionId;
+
+		this.onAccountChangeCallbacks.set(subscriptId, [publicKey, callback]);
+
+		this.nextClientSubscriptionId += 1;
+
+		return subscriptId;
+	}
+
+	async removeAccountChangeListener(
+		clientSubscriptionId: ClientSubscriptionId
+	): Promise<void> {
+		this.onAccountChangeCallbacks.delete(clientSubscriptionId);
+	}
+
+	async getMinimumBalanceForRentExemption(_: number): Promise<number> {
+		return 10 * LAMPORTS_PER_SOL;
+	}
+}
+
+export function asBN(value: number | bigint): BN {
+	return new BN(Number(value));
+}

package/src/events/eventSubscriber.ts

@@ -45,6 +45,7 @@ export class EventSubscriber {
 
 		if (this.options.logProviderConfig.type === 'websocket') {
 			this.logProvider = new WebSocketLogProvider(
+				// @ts-ignore
 				this.connection,
 				this.address,
 				this.options.commitment,
@@ -52,6 +53,7 @@ export class EventSubscriber {
 			);
 		} else {
 			this.logProvider = new PollingLogProvider(
+				// @ts-ignore
 				this.connection,
 				this.address,
 				options.commitment,
@@ -101,6 +103,7 @@ export class EventSubscriber {
 									this.logProvider.eventEmitter.removeAllListeners('reconnect');
 									this.unsubscribe().then(() => {
 										this.logProvider = new PollingLogProvider(
+											// @ts-ignore
 											this.connection,
 											this.address,
 											this.options.commitment,
@@ -148,6 +151,7 @@ export class EventSubscriber {
 		}
 
 		const wrappedEvents = this.parseEventsFromLogs(txSig, slot, logs);
+
 		for (const wrappedEvent of wrappedEvents) {
 			this.eventListMap.get(wrappedEvent.eventType).insert(wrappedEvent);
 		}
@@ -188,6 +192,7 @@ export class EventSubscriber {
 		const untilTx: TransactionSignature = this.options.untilTx;
 		while (txFetched < this.options.maxTx) {
 			const response = await fetchLogs(
+				// @ts-ignore
 				this.connection,
 				this.address,
 				this.options.commitment === 'finalized' ? 'finalized' : 'confirmed',

package/src/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/src/testClient.ts

@@ -10,8 +10,6 @@ export class TestClient extends AdminClient {
 			throw new Error('Test client must be polling');
 		}
 		super(config);
-		// @ts-ignore
-		this.txHandler.blockhashCommitment = 'recent';
 	}
 
 	async sendTransaction(
@@ -30,6 +28,7 @@ export class TestClient extends AdminClient {
 		let lastFetchedSlot = (
 			this.accountSubscriber as PollingDriftClientAccountSubscriber
 		).accountLoader.mostRecentSlot;
+		await this.fetchAccounts();
 		while (lastFetchedSlot < slot) {
 			await this.fetchAccounts();
 			lastFetchedSlot = (