@drift-labs/sdk 2.77.0-beta.3 → 2.77.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.77.0-beta.3
+2.77.0-beta.4

package/lib/driftClient.d.ts

@@ -661,6 +661,7 @@ export declare class DriftClient {
         marketType: MarketType;
     } | undefined;
     private handleSignedTransaction;
+    private isVersionedTransaction;
     sendTransaction(tx: Transaction | VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     /**
      *

package/lib/driftClient.js

@@ -2524,9 +2524,10 @@ class DriftClient {
         };
         let placeAndTakeTx = await this.buildTransaction(ixs, txParamsWithoutImplicitSimulation);
         if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
-            const simulationResult = await txParamProcessor_1.TransactionProcessor.getTxSimComputeUnits(
-            // @ts-ignore :: TODO - TEST WITH LEGACY TRANSACTION
-            placeAndTakeTx, this.connection);
+            const versionedPlaceAndTakeTx = this.isVersionedTransaction(placeAndTakeTx)
+                ? placeAndTakeTx
+                : (await this.buildTransaction(ixs, txParamsWithoutImplicitSimulation, undefined, undefined, true));
+            const simulationResult = await txParamProcessor_1.TransactionProcessor.getTxSimComputeUnits(versionedPlaceAndTakeTx, this.connection);
             if (shouldExitIfSimulationFails && !simulationResult.success) {
                 return;
             }
@@ -3517,6 +3518,11 @@ class DriftClient {
     handleSignedTransaction() {
         this.metricsEventEmitter.emit('txSigned');
     }
+    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;
+    }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
         const extraConfirmationOptions = this
             .enableMetricsEvents
@@ -3524,8 +3530,7 @@ class DriftClient {
                 onSignedCb: this.handleSignedTransaction.bind(this),
             }
             : undefined;
-        const version = tx === null || tx === void 0 ? void 0 : tx.version;
-        const isVersionedTx = tx instanceof web3_js_1.VersionedTransaction || version !== undefined;
+        const isVersionedTx = this.isVersionedTransaction(tx);
         if (isVersionedTx) {
             return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned, extraConfirmationOptions);
         }
@@ -3559,6 +3564,8 @@ class DriftClient {
                 txParamProcessingParams: {
                     useSimulatedComputeUnits: txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnits,
                     computeUnitsBufferMultiplier: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsBufferMultiplier,
+                    useSimulatedComputeUnitsForCUPriceCalculation: txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnitsForCUPriceCalculation,
+                    getCUPriceFromComputeUnits: txParams === null || txParams === void 0 ? void 0 : txParams.getCUPriceFromComputeUnits,
                 },
             };
             const processedTxParams = await this.getProcessedTransactionParams({

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.75.0",
+    "version": "2.76.0",
     "name": "drift",
     "instructions": [
         {

package/lib/tx/txParamProcessor.js

@@ -64,6 +64,18 @@ class TransactionProcessor {
                 };
             }
         }
+        if (processConfig === null || processConfig === void 0 ? void 0 : processConfig.useSimulatedComputeUnitsForCUPriceCalculation) {
+            if (!(processConfig === null || processConfig === void 0 ? void 0 : processConfig.useSimulatedComputeUnits)) {
+                throw new Error(`encountered useSimulatedComputeUnitsForFees=true, but useSimulatedComputeUnits is false`);
+            }
+            if (!(processConfig === null || processConfig === void 0 ? void 0 : processConfig.getCUPriceFromComputeUnits)) {
+                throw new Error(`encountered useSimulatedComputeUnitsForFees=true, but getComputeUnitPriceFromUnitsToUse helper method is undefined`);
+            }
+            const simulatedComputeUnits = finalTxProps.txParams.computeUnits;
+            const computeUnitPrice = processConfig.getCUPriceFromComputeUnits(simulatedComputeUnits);
+            console.debug(`🔧:: Adjusting compute unit price for simulated compute unit budget :: ${finalTxProps.txParams.computeUnitsPrice}=>${computeUnitPrice}`);
+            finalTxProps.txParams.computeUnitsPrice = computeUnitPrice;
+        }
         // # Return Final Tx Params
         return finalTxProps.txParams;
     }

package/lib/tx/whileValidTxSender.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ExtraConfirmationOptions, TxSigAndSlot } from './types';
-import { AddressLookupTableAccount, ConfirmOptions, Connection, Signer, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, Commitment, ConfirmOptions, Connection, Signer, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 type ResolveReference = {
@@ -18,13 +18,15 @@ export declare class WhileValidTxSender extends BaseTxSender {
         blockhash: string;
         lastValidBlockHeight: number;
     }>;
-    constructor({ connection, wallet, opts, retrySleep, additionalConnections, additionalTxSenderCallbacks, }: {
+    blockhashCommitment: Commitment;
+    constructor({ connection, wallet, opts, retrySleep, additionalConnections, additionalTxSenderCallbacks, blockhashCommitment, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
         retrySleep?: number;
         additionalConnections?: any;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+        blockhashCommitment?: Commitment;
     });
     sleep(reference: ResolveReference): Promise<void>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions, preSigned?: boolean): Promise<Transaction>;

package/lib/tx/whileValidTxSender.js

@@ -11,7 +11,7 @@ const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_RETRY = 2000;
 const PLACEHOLDER_BLOCKHASH = 'Fdum64WVeej6DeL85REV9NvfSxEJNPZ74DBk7A8kTrKP';
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], }) {
+    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], blockhashCommitment = 'finalized', }) {
         super({
             connection,
             wallet,
@@ -22,6 +22,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         this.timoutCount = 0;
         this.untilValid = new Map();
         this.retrySleep = retrySleep;
+        this.blockhashCommitment = blockhashCommitment;
     }
     async sleep(reference) {
         return new Promise((resolve) => {
@@ -31,7 +32,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     }
     async prepareTx(tx, additionalSigners, opts, preSigned) {
         var _a;
-        const latestBlockhash = await this.connection.getLatestBlockhash(opts.preflightCommitment);
+        const latestBlockhash = await this.connection.getLatestBlockhash(this.blockhashCommitment);
         // handle tx
         let signedTx = tx;
         if (!preSigned) {
@@ -59,7 +60,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         return tx;
     }
     async sendVersionedTransaction(tx, additionalSigners, opts, preSigned, extraConfirmationOptions) {
-        const latestBlockhash = await this.connection.getLatestBlockhash();
+        const latestBlockhash = await this.connection.getLatestBlockhash(this.blockhashCommitment);
         let signedTx;
         if (preSigned) {
             signedTx = tx;

package/lib/types.d.ts

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

package/package.json

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

package/src/driftClient.ts

@@ -4577,10 +4577,21 @@ export class DriftClient {
 		);
 
 		if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
+			const versionedPlaceAndTakeTx = this.isVersionedTransaction(
+				placeAndTakeTx
+			)
+				? (placeAndTakeTx as VersionedTransaction)
+				: ((await this.buildTransaction(
+						ixs,
+						txParamsWithoutImplicitSimulation,
+						undefined,
+						undefined,
+						true
+				  )) as VersionedTransaction);
+
 			const simulationResult =
 				await TransactionParamProcessor.getTxSimComputeUnits(
-					// @ts-ignore :: TODO - TEST WITH LEGACY TRANSACTION
-					placeAndTakeTx,
+					versionedPlaceAndTakeTx,
 					this.connection
 				);
 
@@ -6541,6 +6552,16 @@ export class DriftClient {
 		this.metricsEventEmitter.emit('txSigned');
 	}
 
+	private isVersionedTransaction(
+		tx: Transaction | VersionedTransaction
+	): boolean {
+		const version = (tx as VersionedTransaction)?.version;
+		const isVersionedTx =
+			tx instanceof VersionedTransaction || version !== undefined;
+
+		return isVersionedTx;
+	}
+
 	sendTransaction(
 		tx: Transaction | VersionedTransaction,
 		additionalSigners?: Array<Signer>,
@@ -6554,9 +6575,7 @@ export class DriftClient {
 			  }
 			: undefined;
 
-		const version = (tx as VersionedTransaction)?.version;
-		const isVersionedTx =
-			tx instanceof VersionedTransaction || version !== undefined;
+		const isVersionedTx = this.isVersionedTransaction(tx);
 
 		if (isVersionedTx) {
 			return this.txSender.sendVersionedTransaction(
@@ -6614,6 +6633,9 @@ export class DriftClient {
 				txParamProcessingParams: {
 					useSimulatedComputeUnits: txParams?.useSimulatedComputeUnits,
 					computeUnitsBufferMultiplier: txParams?.computeUnitsBufferMultiplier,
+					useSimulatedComputeUnitsForCUPriceCalculation:
+						txParams?.useSimulatedComputeUnitsForCUPriceCalculation,
+					getCUPriceFromComputeUnits: txParams?.getCUPriceFromComputeUnits,
 				},
 			};
 
@@ -6643,7 +6665,9 @@ export class DriftClient {
 				})
 			);
 		}
+
 		const computeUnitsPrice = baseTxParams?.computeUnitsPrice;
+
 		if (computeUnitsPrice !== 0) {
 			allIx.push(
 				ComputeBudgetProgram.setComputeUnitPrice({

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.75.0",
+  "version": "2.76.0",
   "name": "drift",
   "instructions": [
     {

package/src/tx/txParamProcessor.ts

@@ -120,6 +120,31 @@ export class TransactionProcessor {
 			}
 		}
 
+		if (processConfig?.useSimulatedComputeUnitsForCUPriceCalculation) {
+			if (!processConfig?.useSimulatedComputeUnits) {
+				throw new Error(
+					`encountered useSimulatedComputeUnitsForFees=true, but useSimulatedComputeUnits is false`
+				);
+			}
+			if (!processConfig?.getCUPriceFromComputeUnits) {
+				throw new Error(
+					`encountered useSimulatedComputeUnitsForFees=true, but getComputeUnitPriceFromUnitsToUse helper method is undefined`
+				);
+			}
+
+			const simulatedComputeUnits = finalTxProps.txParams.computeUnits;
+
+			const computeUnitPrice = processConfig.getCUPriceFromComputeUnits(
+				simulatedComputeUnits
+			);
+
+			console.debug(
+				`🔧:: Adjusting compute unit price for simulated compute unit budget :: ${finalTxProps.txParams.computeUnitsPrice}=>${computeUnitPrice}`
+			);
+
+			finalTxProps.txParams.computeUnitsPrice = computeUnitPrice;
+		}
+
 		// # Return Final Tx Params
 		return finalTxProps.txParams;
 	}

package/src/tx/whileValidTxSender.ts

@@ -1,6 +1,7 @@
 import { ExtraConfirmationOptions, TxSigAndSlot } from './types';
 import {
 	AddressLookupTableAccount,
+	Commitment,
 	ConfirmOptions,
 	Connection,
 	Signer,
@@ -33,6 +34,7 @@ export class WhileValidTxSender extends BaseTxSender {
 		string,
 		{ blockhash: string; lastValidBlockHeight: number }
 	>();
+	blockhashCommitment: Commitment;
 
 	public constructor({
 		connection,
@@ -41,6 +43,7 @@ export class WhileValidTxSender extends BaseTxSender {
 		retrySleep = DEFAULT_RETRY,
 		additionalConnections = new Array<Connection>(),
 		additionalTxSenderCallbacks = [],
+		blockhashCommitment = 'finalized',
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -48,6 +51,7 @@ export class WhileValidTxSender extends BaseTxSender {
 		retrySleep?: number;
 		additionalConnections?;
 		additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+		blockhashCommitment?: Commitment;
 	}) {
 		super({
 			connection,
@@ -57,6 +61,7 @@ export class WhileValidTxSender extends BaseTxSender {
 			additionalTxSenderCallbacks,
 		});
 		this.retrySleep = retrySleep;
+		this.blockhashCommitment = blockhashCommitment;
 	}
 
 	async sleep(reference: ResolveReference): Promise<void> {
@@ -73,7 +78,7 @@ export class WhileValidTxSender extends BaseTxSender {
 		preSigned?: boolean
 	): Promise<Transaction> {
 		const latestBlockhash = await this.connection.getLatestBlockhash(
-			opts.preflightCommitment
+			this.blockhashCommitment
 		);
 
 		// handle tx
@@ -125,7 +130,9 @@ export class WhileValidTxSender extends BaseTxSender {
 		preSigned?: boolean,
 		extraConfirmationOptions?: ExtraConfirmationOptions
 	): Promise<TxSigAndSlot> {
-		const latestBlockhash = await this.connection.getLatestBlockhash();
+		const latestBlockhash = await this.connection.getLatestBlockhash(
+			this.blockhashCommitment
+		);
 
 		let signedTx;
 		if (preSigned) {

package/src/types.ts

@@ -1007,6 +1007,8 @@ export type BaseTxParams = {
 export type ProcessingTxParams = {
 	useSimulatedComputeUnits?: boolean;
 	computeUnitsBufferMultiplier?: number;
+	useSimulatedComputeUnitsForCUPriceCalculation?: boolean;
+	getCUPriceFromComputeUnits?: (computeUnits: number) => number;
 };
 
 export type TxParams = BaseTxParams & ProcessingTxParams;