@drift-labs/sdk 2.31.0-beta.6 → 2.31.0

package/lib/constants/perpMarkets.js

@@ -114,6 +114,16 @@ exports.DevnetPerpMarkets = [
         launchTs: 1683125906000,
         oracleSource: __1.OracleSource.PYTH_1M,
     },
+    {
+        fullName: 'OP',
+        category: ['L2', 'Infra'],
+        symbol: 'OP-PERP',
+        baseAssetSymbol: 'OP',
+        marketIndex: 11,
+        oracle: new web3_js_1.PublicKey('8ctSiDhA7eJoii4TkKV8Rx4KFdz3ycsA1FXy9wq56quG'),
+        launchTs: 1683125906000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.MainnetPerpMarkets = [
     {
@@ -226,6 +236,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1683125906000,
         oracleSource: __1.OracleSource.PYTH_1M,
     },
+    {
+        fullName: 'OP',
+        category: ['L2', 'Infra'],
+        symbol: 'OP-PERP',
+        baseAssetSymbol: 'OP',
+        marketIndex: 11,
+        oracle: new web3_js_1.PublicKey('4o4CUwzFwLqCvmA5x1G4VzoZkAhAcbiuiYyjWX1CVbY2'),
+        launchTs: 1683125906000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/driftClient.js

@@ -1389,14 +1389,13 @@ class DriftClient {
             orderId,
             marketIndex,
         }, makerInfo, referrerInfo);
-        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
         const walletSupportsVersionedTxns = 
         //@ts-ignore
         (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
         // use versioned transactions if there is a lookup table account and wallet is compatible
-        if (walletSupportsVersionedTxns && lookupTableAccount && useVersionedTx) {
-            const versionedMarketOrderTx = await this.txSender.getVersionedTransaction([placePerpOrderIx].concat(bracketOrderIxs), [lookupTableAccount], [], this.opts);
-            const versionedFillTx = await this.txSender.getVersionedTransaction([fillPerpOrderIx], [lookupTableAccount], [], this.opts);
+        if (walletSupportsVersionedTxns && useVersionedTx) {
+            const versionedMarketOrderTx = await this.buildTransaction([placePerpOrderIx].concat(bracketOrderIxs), txParams, 0);
+            const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
             const [signedVersionedMarketOrderTx, signedVersionedFillTx] = await this.provider.wallet.signAllTransactions([
                 //@ts-ignore
                 versionedMarketOrderTx,
@@ -3040,7 +3039,7 @@ class DriftClient {
             return this.txSender.send(tx, additionalSigners, opts, preSigned);
         }
         else {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts);
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables) {

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.0-beta.6",
+    "version": "2.31.0",
     "name": "drift",
     "instructions": [
         {

package/lib/tx/retryTxSender.d.ts

@@ -14,7 +14,7 @@ export declare class RetryTxSender implements TxSender {
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;

package/lib/tx/retryTxSender.js

@@ -54,10 +54,13 @@ class RetryTxSender {
         const tx = new web3_js_1.VersionedTransaction(message);
         return tx;
     }
-    async sendVersionedTransaction(tx, additionalSigners, opts) {
+    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
         let signedTx;
-        // @ts-ignore
-        if (this.provider.wallet.payer) {
+        if (preSigned) {
+            signedTx = tx;
+            // @ts-ignore
+        }
+        else if (this.provider.wallet.payer) {
             // @ts-ignore
             tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.provider.wallet.payer));
             signedTx = tx;

package/lib/tx/types.d.ts

@@ -8,7 +8,7 @@ export type TxSigAndSlot = {
 export interface TxSender {
     provider: Provider;
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/package.json

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

package/src/constants/perpMarkets.ts

@@ -124,6 +124,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH_1M,
 	},
+	{
+		fullName: 'OP',
+		category: ['L2', 'Infra'],
+		symbol: 'OP-PERP',
+		baseAssetSymbol: 'OP',
+		marketIndex: 11,
+		oracle: new PublicKey('8ctSiDhA7eJoii4TkKV8Rx4KFdz3ycsA1FXy9wq56quG'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -237,6 +247,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH_1M,
 	},
+	{
+		fullName: 'OP',
+		category: ['L2', 'Infra'],
+		symbol: 'OP-PERP',
+		baseAssetSymbol: 'OP',
+		marketIndex: 11,
+		oracle: new PublicKey('4o4CUwzFwLqCvmA5x1G4VzoZkAhAcbiuiYyjWX1CVbY2'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/driftClient.ts

@@ -2369,26 +2369,21 @@ export class DriftClient {
 			referrerInfo
 		);
 
-		const lookupTableAccount = await this.fetchMarketLookupTableAccount();
-
 		const walletSupportsVersionedTxns =
 			//@ts-ignore
 			this.wallet.supportedTransactionVersions?.size ?? 0 > 1;
 
 		// use versioned transactions if there is a lookup table account and wallet is compatible
-		if (walletSupportsVersionedTxns && lookupTableAccount && useVersionedTx) {
-			const versionedMarketOrderTx =
-				await this.txSender.getVersionedTransaction(
-					[placePerpOrderIx].concat(bracketOrderIxs),
-					[lookupTableAccount],
-					[],
-					this.opts
-				);
-			const versionedFillTx = await this.txSender.getVersionedTransaction(
+		if (walletSupportsVersionedTxns && useVersionedTx) {
+			const versionedMarketOrderTx = await this.buildTransaction(
+				[placePerpOrderIx].concat(bracketOrderIxs),
+				txParams,
+				0
+			);
+			const versionedFillTx = await this.buildTransaction(
 				[fillPerpOrderIx],
-				[lookupTableAccount],
-				[],
-				this.opts
+				txParams,
+				0
 			);
 			const [signedVersionedMarketOrderTx, signedVersionedFillTx] =
 				await this.provider.wallet.signAllTransactions([
@@ -5347,7 +5342,8 @@ export class DriftClient {
 			return this.txSender.sendVersionedTransaction(
 				tx as VersionedTransaction,
 				additionalSigners,
-				opts
+				opts,
+				preSigned
 			);
 		}
 	}

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.0-beta.6",
+  "version": "2.31.0",
   "name": "drift",
   "instructions": [
     {

package/src/tx/retryTxSender.ts

@@ -117,11 +117,14 @@ export class RetryTxSender implements TxSender {
 	async sendVersionedTransaction(
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
-		opts?: ConfirmOptions
+		opts?: ConfirmOptions,
+		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
 		let signedTx;
-		// @ts-ignore
-		if (this.provider.wallet.payer) {
+		if (preSigned) {
+			signedTx = tx;
+			// @ts-ignore
+		} else if (this.provider.wallet.payer) {
 			// @ts-ignore
 			tx.sign((additionalSigners ?? []).concat(this.provider.wallet.payer));
 			signedTx = tx;

package/src/tx/types.ts

@@ -27,7 +27,8 @@ export interface TxSender {
 	sendVersionedTransaction(
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
-		opts?: ConfirmOptions
+		opts?: ConfirmOptions,
+		preSigned?: boolean
 	): Promise<TxSigAndSlot>;
 
 	getVersionedTransaction(