@drift-labs/sdk 2.94.0-beta.5 → 2.94.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.94.0-beta.5
+2.94.0-beta.7

package/lib/bankrun/bankrunConnection.d.ts

@@ -20,7 +20,7 @@ export declare class BankrunContextWrapper {
     readonly provider: BankrunProvider;
     readonly commitment: Commitment;
     constructor(context: ProgramTestContext, verifySignatures?: boolean);
-    sendTransaction(tx: Transaction, additionalSigners?: Keypair[]): Promise<TransactionSignature>;
+    sendTransaction(tx: Transaction | VersionedTransaction, additionalSigners?: Keypair[]): Promise<TransactionSignature>;
     getMinimumBalanceForRentExemption(_: number): Promise<number>;
     fundKeypair(keypair: Keypair | Wallet, lamports: number | bigint): Promise<TransactionSignature>;
     getLatestBlockhash(): Promise<Blockhash>;
@@ -45,7 +45,7 @@ export declare class BankrunConnection {
     getAccountInfo(publicKey: PublicKey): Promise<null | AccountInfo<Buffer>>;
     getAccountInfoAndContext(publicKey: PublicKey, _commitment?: Commitment): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array | Array<number>, _options?: any): Promise<TransactionSignature>;
-    sendTransaction(tx: Transaction): Promise<TransactionSignature>;
+    sendTransaction(tx: Transaction | VersionedTransaction): Promise<TransactionSignature>;
     private updateSlotAndClock;
     getTime(): number;
     getParsedAccountInfo(publicKey: PublicKey): Promise<RpcResponseAndContext<AccountInfo<Buffer>>>;

package/lib/bankrun/bankrunConnection.js

@@ -10,6 +10,7 @@ const anchor_bankrun_1 = require("anchor-bankrun");
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
+const utils_1 = require("../tx/utils");
 class BankrunContextWrapper {
     constructor(context, verifySignatures = true) {
         this.commitment = 'confirmed';
@@ -18,12 +19,24 @@ class BankrunContextWrapper {
         this.connection = new BankrunConnection(this.context.banksClient, this.context, verifySignatures);
     }
     async sendTransaction(tx, additionalSigners) {
-        tx.recentBlockhash = (await this.getLatestBlockhash()).toString();
-        tx.feePayer = this.context.payer.publicKey;
+        const isVersioned = (0, utils_1.isVersionedTransaction)(tx);
         if (!additionalSigners) {
             additionalSigners = [];
         }
-        tx.sign(this.context.payer, ...additionalSigners);
+        if (isVersioned) {
+            tx = tx;
+            tx.message.recentBlockhash = await this.getLatestBlockhash();
+            if (!additionalSigners) {
+                additionalSigners = [];
+            }
+            tx.sign([this.context.payer, ...additionalSigners]);
+        }
+        else {
+            tx = tx;
+            tx.recentBlockhash = await this.getLatestBlockhash();
+            tx.feePayer = this.context.payer.publicKey;
+            tx.sign(this.context.payer, ...additionalSigners);
+        }
         return await this.connection.sendTransaction(tx);
     }
     async getMinimumBalanceForRentExemption(_) {
@@ -104,19 +117,24 @@ class BankrunConnection {
         return signature;
     }
     async sendTransaction(tx) {
-        const serialized = tx.serialize({
-            verifySignatures: this.verifySignatures,
-        });
+        const isVersioned = (0, utils_1.isVersionedTransaction)(tx);
+        const serialized = isVersioned
+            ? tx.serialize()
+            : tx.serialize({
+                verifySignatures: this.verifySignatures,
+            });
         // @ts-ignore
         const internal = this._banksClient.inner;
-        const inner = tx instanceof web3_js_1.Transaction
-            ? await internal.tryProcessLegacyTransaction(serialized)
-            : await internal.tryProcessVersionedTransaction(serialized);
+        const inner = isVersioned
+            ? await internal.tryProcessVersionedTransaction(serialized)
+            : await internal.tryProcessLegacyTransaction(serialized);
         const banksTransactionMeta = new solana_bankrun_1.BanksTransactionResultWithMeta(inner);
         if (banksTransactionMeta.result) {
             throw new Error(banksTransactionMeta.result);
         }
-        const signature = bs58_1.default.encode(tx.signatures[0].signature);
+        const signature = isVersioned
+            ? bs58_1.default.encode(tx.signatures[0])
+            : bs58_1.default.encode(tx.signatures[0].signature);
         this.transactionToMeta.set(signature, banksTransactionMeta);
         let finalizedCount = 0;
         while (finalizedCount < 10) {

package/lib/driftClient.js

@@ -1720,28 +1720,11 @@ class DriftClient {
         return txSig;
     }
     async getSettleExpiredMarketIx(marketIndex) {
-        const marketAccountInfos = [];
-        const oracleAccountInfos = [];
-        const spotMarketAccountInfos = [];
-        const market = this.getPerpMarketAccount(marketIndex);
-        marketAccountInfos.push({
-            pubkey: market.pubkey,
-            isWritable: true,
-            isSigner: false,
-        });
-        oracleAccountInfos.push({
-            pubkey: market.amm.oracle,
-            isWritable: false,
-            isSigner: false,
-        });
-        spotMarketAccountInfos.push({
-            pubkey: this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).pubkey,
-            isSigner: false,
-            isWritable: true,
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            writablePerpMarketIndexes: [marketIndex],
+            writableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
-        const remainingAccounts = oracleAccountInfos
-            .concat(spotMarketAccountInfos)
-            .concat(marketAccountInfos);
         return await this.program.instruction.settleExpiredMarket(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),

package/lib/idl/drift.json

@@ -1893,6 +1893,11 @@
                     "name": "user",
                     "isMut": true,
                     "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
                 }
             ],
             "args": []

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.94.0-beta.5",
+	"version": "2.94.0-beta.7",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/bankrun/bankrunConnection.ts

@@ -36,6 +36,7 @@ import { BankrunProvider } from 'anchor-bankrun';
 import bs58 from 'bs58';
 import { BN, Wallet } from '@coral-xyz/anchor';
 import { Account, unpackAccount } from '@solana/spl-token';
+import { isVersionedTransaction } from '../tx/utils';
 
 export type Connection = SolanaConnection | BankrunConnection;
 
@@ -66,15 +67,26 @@ export class BankrunContextWrapper {
 	}
 
 	async sendTransaction(
-		tx: Transaction,
+		tx: Transaction | VersionedTransaction,
 		additionalSigners?: Keypair[]
 	): Promise<TransactionSignature> {
-		tx.recentBlockhash = (await this.getLatestBlockhash()).toString();
-		tx.feePayer = this.context.payer.publicKey;
+		const isVersioned = isVersionedTransaction(tx);
 		if (!additionalSigners) {
 			additionalSigners = [];
 		}
-		tx.sign(this.context.payer, ...additionalSigners);
+		if (isVersioned) {
+			tx = tx as VersionedTransaction;
+			tx.message.recentBlockhash = await this.getLatestBlockhash();
+			if (!additionalSigners) {
+				additionalSigners = [];
+			}
+			tx.sign([this.context.payer, ...additionalSigners]);
+		} else {
+			tx = tx as Transaction;
+			tx.recentBlockhash = await this.getLatestBlockhash();
+			tx.feePayer = this.context.payer.publicKey;
+			tx.sign(this.context.payer, ...additionalSigners);
+		}
 		return await this.connection.sendTransaction(tx);
 	}
 
@@ -212,22 +224,28 @@ export class BankrunConnection {
 		return signature;
 	}
 
-	async sendTransaction(tx: Transaction): Promise<TransactionSignature> {
-		const serialized = tx.serialize({
-			verifySignatures: this.verifySignatures,
-		});
+	async sendTransaction(
+		tx: Transaction | VersionedTransaction
+	): Promise<TransactionSignature> {
+		const isVersioned = isVersionedTransaction(tx);
+		const serialized = isVersioned
+			? tx.serialize()
+			: tx.serialize({
+					verifySignatures: this.verifySignatures,
+			  });
 		// @ts-ignore
 		const internal = this._banksClient.inner;
-		const inner =
-			tx instanceof Transaction
-				? await internal.tryProcessLegacyTransaction(serialized)
-				: await internal.tryProcessVersionedTransaction(serialized);
+		const inner = isVersioned
+			? await internal.tryProcessVersionedTransaction(serialized)
+			: await internal.tryProcessLegacyTransaction(serialized);
 		const banksTransactionMeta = new BanksTransactionResultWithMeta(inner);
 
 		if (banksTransactionMeta.result) {
 			throw new Error(banksTransactionMeta.result);
 		}
-		const signature = bs58.encode(tx.signatures[0].signature);
+		const signature = isVersioned
+			? bs58.encode((tx as VersionedTransaction).signatures[0])
+			: bs58.encode((tx as Transaction).signatures[0].signature);
 		this.transactionToMeta.set(signature, banksTransactionMeta);
 		let finalizedCount = 0;
 		while (finalizedCount < 10) {

package/src/driftClient.ts

@@ -3216,31 +3216,12 @@ export class DriftClient {
 	public async getSettleExpiredMarketIx(
 		marketIndex: number
 	): Promise<TransactionInstruction> {
-		const marketAccountInfos = [];
-		const oracleAccountInfos = [];
-		const spotMarketAccountInfos = [];
-		const market = this.getPerpMarketAccount(marketIndex);
-		marketAccountInfos.push({
-			pubkey: market.pubkey,
-			isWritable: true,
-			isSigner: false,
-		});
-		oracleAccountInfos.push({
-			pubkey: market.amm.oracle,
-			isWritable: false,
-			isSigner: false,
-		});
-
-		spotMarketAccountInfos.push({
-			pubkey: this.getSpotMarketAccount(QUOTE_SPOT_MARKET_INDEX).pubkey,
-			isSigner: false,
-			isWritable: true,
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [],
+			writablePerpMarketIndexes: [marketIndex],
+			writableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX],
 		});
 
-		const remainingAccounts = oracleAccountInfos
-			.concat(spotMarketAccountInfos)
-			.concat(marketAccountInfos);
-
 		return await this.program.instruction.settleExpiredMarket(marketIndex, {
 			accounts: {
 				state: await this.getStatePublicKey(),

package/src/idl/drift.json

@@ -1893,6 +1893,11 @@
           "name": "user",
           "isMut": true,
           "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
         }
       ],
       "args": []