@drift-labs/sdk 2.83.0-beta.0 → 2.83.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.83.0-beta.0
+2.83.0-beta.1

package/lib/constants/perpMarkets.js

@@ -556,6 +556,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1712593532000,
         oracleSource: __1.OracleSource.SWITCHBOARD,
     },
+    {
+        fullName: 'Drift',
+        category: ['DEX', 'Solana'],
+        symbol: 'DRIFT-PERP',
+        baseAssetSymbol: 'DRIFT',
+        marketIndex: 30,
+        oracle: new web3_js_1.PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
+        launchTs: 1716595200000,
+        oracleSource: __1.OracleSource.SWITCHBOARD,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/constants/spotMarkets.js

@@ -208,6 +208,26 @@ exports.MainnetSpotMarkets = [
         phoenixMarket: new web3_js_1.PublicKey('8BV6rrWsUabnTDA3dE6A69oUDJAj3hMhtBHTJyXB7czp'),
         launchTs: 1715860800000,
     },
+    {
+        symbol: 'INF',
+        marketIndex: 16,
+        oracle: new web3_js_1.PublicKey('6AQHz9mpGNjyVafcWdqzzgsJq14Cs8gG6MiQKmdAgCuP'),
+        oracleSource: __1.OracleSource.SWITCHBOARD,
+        mint: new web3_js_1.PublicKey('5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm'),
+        precision: new __1.BN(10).pow(numericConstants_1.NINE),
+        precisionExp: numericConstants_1.NINE,
+        launchTs: 1716595200000,
+    },
+    {
+        symbol: 'dSOL',
+        marketIndex: 17,
+        oracle: new web3_js_1.PublicKey('HJ9K9AamqVMp86j3uQgpA1tdJNRAwfVuL75FD9P3QBrn'),
+        oracleSource: __1.OracleSource.SWITCHBOARD,
+        mint: new web3_js_1.PublicKey('Dso1bDeDjCQxTrWHqUUi63oBvV7Mdm6WaobLbQ7gnPQ'),
+        precision: new __1.BN(10).pow(numericConstants_1.NINE),
+        precisionExp: numericConstants_1.NINE,
+        launchTs: 1716595200000,
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

package/lib/driftClient.js

@@ -2500,6 +2500,7 @@ class DriftClient {
         return txSig;
     }
     async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, simulateFirst) {
+        var _a;
         const placeAndTakeIxs = [];
         const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId);
         const txsToSign = [];
@@ -2517,13 +2518,13 @@ class DriftClient {
         const shouldExitIfSimulationFails = simulateFirst;
         const txParamsWithoutImplicitSimulation = {
             ...txParams,
-            useSimulationComputeUnits: false,
+            useSimulatedComputeUnits: false,
         };
         // Get recent block hash so that we can re-use it for all transactions. Makes this logic run faster with fewer RPC requests
         const recentBlockHash = await this.txHandler.getLatestBlockhashForTransaction();
         if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
             const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParamsWithoutImplicitSimulation, undefined, undefined, true, recentBlockHash));
-            const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection);
+            const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2);
             if (shouldExitIfSimulationFails && !simulationResult.success) {
                 return;
             }
@@ -2538,7 +2539,7 @@ class DriftClient {
         else {
             txsToSign.push({
                 key: keys.placeAndTakeIx,
-                tx: await this.buildTransaction(placeAndTakeIxs, txParamsWithoutImplicitSimulation, undefined, undefined, undefined, recentBlockHash),
+                tx: await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, undefined, recentBlockHash),
             });
         }
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
@@ -3591,7 +3592,7 @@ class DriftClient {
         return this.txHandler.buildTransaction({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
-            txParams,
+            txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
             preFlightCommitment: this.opts.preflightCommitment,
             fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),
@@ -3604,7 +3605,7 @@ class DriftClient {
         return this.txHandler.buildBulkTransactions({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
-            txParams,
+            txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
             preFlightCommitment: this.opts.preflightCommitment,
             fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),
@@ -3616,7 +3617,7 @@ class DriftClient {
         return this.txHandler.buildAndSignTransactionMap({
             instructions,
             txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
-            txParams,
+            txParams: txParams !== null && txParams !== void 0 ? txParams : this.txParams,
             connection: this.connection,
             preFlightCommitment: this.opts.preflightCommitment,
             fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),

package/lib/tx/txParamProcessor.d.ts

@@ -8,7 +8,7 @@ type TransactionBuildingProps = {
  */
 export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
-    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection): Promise<{
+    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number): Promise<{
         success: boolean;
         computeUnits: number;
     }>;

package/lib/tx/txParamProcessor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionParamProcessor = void 0;
 const COMPUTE_UNIT_BUFFER_FACTOR = 1.2;
+const MAX_COMPUTE_UNITS = 1400000;
 const TEST_SIMS_ALWAYS_FAIL = false;
 /**
  * This class is responsible for running through a "processing" pipeline for a base transaction, to adjust the standard transaction parameters based on a given configuration.
@@ -14,7 +15,8 @@ class TransactionParamProcessor {
         }
         return undefined;
     }
-    static async getTxSimComputeUnits(tx, connection) {
+    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
+    ) {
         var _a, _b, _c;
         try {
             if (TEST_SIMS_ALWAYS_FAIL)
@@ -26,9 +28,11 @@ class TransactionParamProcessor {
                 throw new Error((_c = (_b = simTxResult === null || simTxResult === void 0 ? void 0 : simTxResult.value) === null || _b === void 0 ? void 0 : _b.err) === null || _c === void 0 ? void 0 : _c.toString());
             }
             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));
             return {
                 success: true,
-                computeUnits: computeUnits,
+                computeUnits: bufferedComputeUnits,
             };
         }
         catch (e) {
@@ -53,14 +57,12 @@ class TransactionParamProcessor {
         // # Run Processes
         if (processConfig.useSimulatedComputeUnits) {
             const txToSim = await txBuilder({
-                txParams: { ...finalTxParams, computeUnits: 1400000 },
+                txParams: { ...finalTxParams, computeUnits: MAX_COMPUTE_UNITS },
             });
-            const txSimComputeUnitsResult = await this.getTxSimComputeUnits(txToSim, processProps.connection);
+            const txSimComputeUnitsResult = await this.getTxSimComputeUnits(txToSim, processProps.connection, (_a = processConfig === null || processConfig === void 0 ? void 0 : processConfig.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : COMPUTE_UNIT_BUFFER_FACTOR);
             if (txSimComputeUnitsResult.success) {
-                const bufferedComputeUnits = txSimComputeUnitsResult.computeUnits *
-                    ((_a = processConfig === null || processConfig === void 0 ? void 0 : processConfig.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : COMPUTE_UNIT_BUFFER_FACTOR);
                 // Adjust the transaction based on the simulated compute units
-                finalTxParams.computeUnits = Math.ceil(bufferedComputeUnits); // Round the compute units to a whole number
+                finalTxParams.computeUnits = txSimComputeUnitsResult.computeUnits;
             }
         }
         if (processConfig === null || processConfig === void 0 ? void 0 : processConfig.useSimulatedComputeUnitsForCUPriceCalculation) {

package/lib/user.d.ts

@@ -119,7 +119,7 @@ export declare class User {
     /**
      * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
      */
-    getMaintenanceMarginRequirement(liquidationBuffer?: BN): BN;
+    getMaintenanceMarginRequirement(): BN;
     getActivePerpPositionsForUserAccount(userAccount: UserAccount): PerpPosition[];
     getActivePerpPositions(): PerpPosition[];
     getActivePerpPositionsAndSlot(): DataAndSlot<PerpPosition[]>;

package/lib/user.js

@@ -447,7 +447,12 @@ class User {
     /**
      * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
      */
-    getMaintenanceMarginRequirement(liquidationBuffer) {
+    getMaintenanceMarginRequirement() {
+        // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
+        let liquidationBuffer = undefined;
+        if (this.isBeingLiquidated()) {
+            liquidationBuffer = new _1.BN(this.driftClient.getStateAccount().liquidationMarginBufferRatio);
+        }
         return this.getMarginRequirement('Maintenance', liquidationBuffer);
     }
     getActivePerpPositionsForUserAccount(userAccount) {
@@ -1025,12 +1030,7 @@ class User {
     }
     canBeLiquidated() {
         const totalCollateral = this.getTotalCollateral('Maintenance');
-        // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
-        let liquidationBuffer = undefined;
-        if (this.isBeingLiquidated()) {
-            liquidationBuffer = new _1.BN(this.driftClient.getStateAccount().liquidationMarginBufferRatio);
-        }
-        const marginRequirement = this.getMaintenanceMarginRequirement(liquidationBuffer);
+        const marginRequirement = this.getMaintenanceMarginRequirement();
         const canBeLiquidated = totalCollateral.lt(marginRequirement);
         return {
             canBeLiquidated,

package/package.json

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

package/src/constants/perpMarkets.ts

@@ -567,6 +567,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1712593532000,
 		oracleSource: OracleSource.SWITCHBOARD,
 	},
+	{
+		fullName: 'Drift',
+		category: ['DEX', 'Solana'],
+		symbol: 'DRIFT-PERP',
+		baseAssetSymbol: 'DRIFT',
+		marketIndex: 30,
+		oracle: new PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
+		launchTs: 1716595200000,
+		oracleSource: OracleSource.SWITCHBOARD,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/constants/spotMarkets.ts

@@ -253,6 +253,26 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		),
 		launchTs: 1715860800000,
 	},
+	{
+		symbol: 'INF',
+		marketIndex: 16,
+		oracle: new PublicKey('6AQHz9mpGNjyVafcWdqzzgsJq14Cs8gG6MiQKmdAgCuP'),
+		oracleSource: OracleSource.SWITCHBOARD,
+		mint: new PublicKey('5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		launchTs: 1716595200000,
+	},
+	{
+		symbol: 'dSOL',
+		marketIndex: 17,
+		oracle: new PublicKey('HJ9K9AamqVMp86j3uQgpA1tdJNRAwfVuL75FD9P3QBrn'),
+		oracleSource: OracleSource.SWITCHBOARD,
+		mint: new PublicKey('Dso1bDeDjCQxTrWHqUUi63oBvV7Mdm6WaobLbQ7gnPQ'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		launchTs: 1716595200000,
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

package/src/driftClient.ts

@@ -4561,9 +4561,9 @@ export class DriftClient {
 		const shouldUseSimulationComputeUnits = txParams?.useSimulatedComputeUnits;
 		const shouldExitIfSimulationFails = simulateFirst;
 
-		const txParamsWithoutImplicitSimulation = {
+		const txParamsWithoutImplicitSimulation: TxParams = {
 			...txParams,
-			useSimulationComputeUnits: false,
+			useSimulatedComputeUnits: false,
 		};
 
 		// Get recent block hash so that we can re-use it for all transactions. Makes this logic run faster with fewer RPC requests
@@ -4583,7 +4583,8 @@ export class DriftClient {
 			const simulationResult =
 				await TransactionParamProcessor.getTxSimComputeUnits(
 					placeAndTakeTxToSim,
-					this.connection
+					this.connection,
+					txParams.computeUnitsBufferMultiplier ?? 1.2
 				);
 
 			if (shouldExitIfSimulationFails && !simulationResult.success) {
@@ -4609,7 +4610,7 @@ export class DriftClient {
 				key: keys.placeAndTakeIx,
 				tx: await this.buildTransaction(
 					placeAndTakeIxs,
-					txParamsWithoutImplicitSimulation,
+					txParams,
 					undefined,
 					undefined,
 					undefined,
@@ -6694,7 +6695,7 @@ export class DriftClient {
 		return this.txHandler.buildTransaction({
 			instructions,
 			txVersion: txVersion ?? this.txVersion,
-			txParams,
+			txParams: txParams ?? this.txParams,
 			connection: this.connection,
 			preFlightCommitment: this.opts.preflightCommitment,
 			fetchMarketLookupTableAccount:
@@ -6715,7 +6716,7 @@ export class DriftClient {
 		return this.txHandler.buildBulkTransactions({
 			instructions,
 			txVersion: txVersion ?? this.txVersion,
-			txParams,
+			txParams: txParams ?? this.txParams,
 			connection: this.connection,
 			preFlightCommitment: this.opts.preflightCommitment,
 			fetchMarketLookupTableAccount:
@@ -6736,7 +6737,7 @@ export class DriftClient {
 		return this.txHandler.buildAndSignTransactionMap({
 			instructions,
 			txVersion: txVersion ?? this.txVersion,
-			txParams,
+			txParams: txParams ?? this.txParams,
 			connection: this.connection,
 			preFlightCommitment: this.opts.preflightCommitment,
 			fetchMarketLookupTableAccount:

package/src/tx/txParamProcessor.ts

@@ -7,6 +7,7 @@ import {
 import { BaseTxParams, ProcessingTxParams } from '..';
 
 const COMPUTE_UNIT_BUFFER_FACTOR = 1.2;
+const MAX_COMPUTE_UNITS = 1_400_000;
 
 const TEST_SIMS_ALWAYS_FAIL = false;
 
@@ -30,7 +31,8 @@ export class TransactionParamProcessor {
 
 	public static async getTxSimComputeUnits(
 		tx: VersionedTransaction,
-		connection: Connection
+		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
 	): Promise<{ success: boolean; computeUnits: number }> {
 		try {
 			if (TEST_SIMS_ALWAYS_FAIL)
@@ -46,9 +48,14 @@ export 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)
+			);
+
 			return {
 				success: true,
-				computeUnits: computeUnits,
+				computeUnits: bufferedComputeUnits,
 			};
 		} catch (e) {
 			console.warn(
@@ -92,22 +99,19 @@ export class TransactionParamProcessor {
 		// # Run Processes
 		if (processConfig.useSimulatedComputeUnits) {
 			const txToSim = await txBuilder({
-				txParams: { ...finalTxParams, computeUnits: 1_400_000 },
+				txParams: { ...finalTxParams, computeUnits: MAX_COMPUTE_UNITS },
 			});
 
 			const txSimComputeUnitsResult = await this.getTxSimComputeUnits(
 				txToSim,
-				processProps.connection
+				processProps.connection,
+				processConfig?.computeUnitsBufferMultiplier ??
+					COMPUTE_UNIT_BUFFER_FACTOR
 			);
 
 			if (txSimComputeUnitsResult.success) {
-				const bufferedComputeUnits =
-					txSimComputeUnitsResult.computeUnits *
-					(processConfig?.computeUnitsBufferMultiplier ??
-						COMPUTE_UNIT_BUFFER_FACTOR);
-
 				// Adjust the transaction based on the simulated compute units
-				finalTxParams.computeUnits = Math.ceil(bufferedComputeUnits); // Round the compute units to a whole number
+				finalTxParams.computeUnits = txSimComputeUnitsResult.computeUnits;
 			}
 		}
 

package/src/user.ts

@@ -708,7 +708,15 @@ export class User {
 	/**
 	 * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
 	 */
-	public getMaintenanceMarginRequirement(liquidationBuffer?: BN): BN {
+	public getMaintenanceMarginRequirement(): BN {
+		// if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
+		let liquidationBuffer = undefined;
+		if (this.isBeingLiquidated()) {
+			liquidationBuffer = new BN(
+				this.driftClient.getStateAccount().liquidationMarginBufferRatio
+			);
+		}
+
 		return this.getMarginRequirement('Maintenance', liquidationBuffer);
 	}
 
@@ -1878,15 +1886,7 @@ export class User {
 	} {
 		const totalCollateral = this.getTotalCollateral('Maintenance');
 
-		// if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
-		let liquidationBuffer = undefined;
-		if (this.isBeingLiquidated()) {
-			liquidationBuffer = new BN(
-				this.driftClient.getStateAccount().liquidationMarginBufferRatio
-			);
-		}
-		const marginRequirement =
-			this.getMaintenanceMarginRequirement(liquidationBuffer);
+		const marginRequirement = this.getMaintenanceMarginRequirement();
 		const canBeLiquidated = totalCollateral.lt(marginRequirement);
 
 		return {