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

package/lib/phoenix/phoenixSubscriber.js

@@ -5,8 +5,10 @@ const web3_js_1 = require("@solana/web3.js");
 const phoenix_sdk_1 = require("@ellipsis-labs/phoenix-sdk");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
+const phoenix_1 = require("../decode/phoenix");
 class PhoenixSubscriber {
     constructor(config) {
+        var _a;
         this.connection = config.connection;
         this.programId = config.programId;
         this.marketAddress = config.marketAddress;
@@ -19,6 +21,7 @@ class PhoenixSubscriber {
         }
         this.lastSlot = 0;
         this.lastUnixTimestamp = 0;
+        this.fastDecode = (_a = config.fastDecode) !== null && _a !== void 0 ? _a : true;
     }
     async subscribe() {
         if (this.subscribed) {
@@ -34,7 +37,12 @@ class PhoenixSubscriber {
         if (this.subscriptionType === 'websocket') {
             this.marketCallbackId = this.connection.onAccountChange(this.marketAddress, (accountInfo, _ctx) => {
                 try {
-                    this.market = this.market.reload(accountInfo.data);
+                    if (this.fastDecode) {
+                        this.market.data = (0, phoenix_1.fastDecode)(accountInfo.data);
+                    }
+                    else {
+                        this.market = this.market.reload(accountInfo.data);
+                    }
                 }
                 catch {
                     console.error('Failed to reload Phoenix market data');
@@ -56,7 +64,12 @@ class PhoenixSubscriber {
                 try {
                     this.lastSlot = slot;
                     if (buffer) {
-                        this.market = this.market.reload(buffer);
+                        if (this.fastDecode) {
+                            this.market.data = (0, phoenix_1.fastDecode)(buffer);
+                        }
+                        else {
+                            this.market = this.market.reload(buffer);
+                        }
                     }
                 }
                 catch {

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -63,8 +63,8 @@ class PriorityFeeSubscriber {
         if (this.intervalId) {
             return;
         }
+        this.intervalId = setInterval(this.load.bind(this), this.frequencyMs); // we set the intervalId first, preventing a side effect of unsubscribing failing during the race condition where unsubscribes happens before subscribe is finished
         await this.load();
-        this.intervalId = setInterval(this.load.bind(this), this.frequencyMs);
     }
     async loadForSolana() {
         const samples = await (0, solanaPriorityFeeMethod_1.fetchSolanaPriorityFee)(this.connection, this.lookbackDistance, this.addresses);

package/lib/tx/baseTxSender.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ConfirmationStrategy, TxSender, TxSigAndSlot } from './types';
-import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction } from '@solana/web3.js';
+import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
 import { TxHandler } from './txHandler';
 import { IWallet } from '../types';
 export declare abstract class BaseTxSender implements TxSender {
@@ -21,10 +21,11 @@ export declare abstract class BaseTxSender implements TxSender {
         additionalConnections?: any;
         confirmationStrategy?: ConfirmationStrategy;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
-        txHandler: TxHandler;
+        txHandler?: TxHandler;
     });
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions, preSigned?: boolean): Promise<Transaction>;
+    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], _additionalSigners?: Array<Signer>, opts?: ConfirmOptions, blockhash?: BlockhashWithExpiryBlockHeight): Promise<VersionedTransaction>;
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
@@ -36,4 +37,6 @@ export declare abstract class BaseTxSender implements TxSender {
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, opts: ConfirmOptions): void;
     addAdditionalConnection(newConnection: Connection): void;
     getTimeoutCount(): number;
+    checkConfirmationResultForError(txSig: string, result: RpcResponseAndContext<SignatureResult>): Promise<void>;
+    reportTransactionError(txSig: string): Promise<any>;
 }

package/lib/tx/baseTxSender.js

@@ -5,9 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTxSender = void 0;
 const types_1 = require("./types");
+const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = __importDefault(require("assert"));
 const bs58_1 = __importDefault(require("bs58"));
+const txHandler_1 = require("./txHandler");
 const DEFAULT_TIMEOUT = 35000;
 const NOT_CONFIRMED_ERROR_CODE = -1001;
 class BaseTxSender {
@@ -20,7 +22,12 @@ class BaseTxSender {
         this.additionalConnections = additionalConnections;
         this.confirmationStrategy = confirmationStrategy;
         this.additionalTxSenderCallbacks = additionalTxSenderCallbacks;
-        this.txHandler = txHandler;
+        this.txHandler =
+            txHandler !== null && txHandler !== void 0 ? txHandler : new txHandler_1.TxHandler({
+                connection: this.connection,
+                wallet: this.wallet,
+                confirmationOptions: this.opts,
+            });
     }
     async send(tx, additionalSigners, opts, preSigned) {
         if (additionalSigners === undefined) {
@@ -35,6 +42,9 @@ class BaseTxSender {
     async prepareTx(tx, additionalSigners, opts, preSigned) {
         return this.txHandler.prepareTx(tx, additionalSigners, undefined, opts, preSigned);
     }
+    async getVersionedTransaction(ixs, lookupTableAccounts, _additionalSigners, opts, blockhash) {
+        return this.txHandler.generateVersionedTransaction(blockhash, ixs, lookupTableAccounts, this.wallet);
+    }
     async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
         let signedTx;
         if (preSigned) {
@@ -211,5 +221,24 @@ class BaseTxSender {
     getTimeoutCount() {
         return this.timeoutCount;
     }
+    async checkConfirmationResultForError(txSig, result) {
+        if (result.value.err) {
+            await this.reportTransactionError(txSig);
+        }
+        return;
+    }
+    async reportTransactionError(txSig) {
+        var _a, _b;
+        const transactionResult = await this.connection.getTransaction(txSig, {
+            maxSupportedTransactionVersion: 0,
+        });
+        if (!((_a = transactionResult === null || transactionResult === void 0 ? void 0 : transactionResult.meta) === null || _a === void 0 ? void 0 : _a.err)) {
+            return undefined;
+        }
+        const logs = transactionResult.meta.logMessages;
+        const lastLog = logs[logs.length - 1];
+        const friendlyMessage = (_b = lastLog === null || lastLog === void 0 ? void 0 : lastLog.match(/(failed:) (.+)/)) === null || _b === void 0 ? void 0 : _b[2];
+        throw new web3_js_1.SendTransactionError(`Transaction Failed${friendlyMessage ? `: ${friendlyMessage}` : ''}`, transactionResult.meta.logMessages);
+    }
 }
 exports.BaseTxSender = BaseTxSender;

package/lib/tx/fastSingleTxSender.d.ts

@@ -27,7 +27,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
         skipConfirmation?: boolean;
         blockhashCommitment?: Commitment;
         confirmationStrategy?: ConfirmationStrategy;
-        txHandler: TxHandler;
+        txHandler?: TxHandler;
     });
     startBlockhashRefreshLoop(): void;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;

package/lib/tx/fastSingleTxSender.js

@@ -54,6 +54,7 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
         if (!this.skipConfirmation) {
             try {
                 const result = await this.confirmTransaction(txid, opts.commitment);
+                await this.checkConfirmationResultForError(txid, result);
                 slot = result.context.slot;
             }
             catch (e) {

package/lib/tx/forwardOnlyTxSender.d.ts

@@ -23,7 +23,7 @@ export declare class ForwardOnlyTxSender extends BaseTxSender {
         retrySleep?: number;
         confirmationStrategy?: ConfirmationStrategy;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
-        txHandler: TxHandler;
+        txHandler?: TxHandler;
     });
     sleep(reference: ResolveReference): Promise<void>;
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, _opts: ConfirmOptions): void;

package/lib/tx/retryTxSender.d.ts

@@ -24,7 +24,7 @@ export declare class RetryTxSender extends BaseTxSender {
         additionalConnections?: any;
         confirmationStrategy?: ConfirmationStrategy;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
-        txHandler: TxHandler;
+        txHandler?: TxHandler;
     });
     sleep(reference: ResolveReference): Promise<void>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;

package/lib/tx/retryTxSender.js

@@ -63,6 +63,7 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
         let slot;
         try {
             const result = await this.confirmTransaction(txid, opts.commitment);
+            await this.checkConfirmationResultForError(txid, result);
             slot = result.context.slot;
             // eslint-disable-next-line no-useless-catch
         }

package/lib/tx/txHandler.d.ts

@@ -22,6 +22,7 @@ export declare class TxHandler {
     private connection;
     private wallet;
     private confirmationOptions;
+    private preSignedCb?;
     private onSignedCb?;
     constructor(props: {
         connection: Connection;
@@ -30,6 +31,7 @@ export declare class TxHandler {
         opts?: {
             returnBlockHeightsWithSignedTxCallbackData?: boolean;
             onSignedCb?: (txSigs: DriftClientMetricsEvents['txSigned']) => void;
+            preSignedCb?: () => void;
         };
     });
     private addHashAndExpiryToLookup;

package/lib/tx/txHandler.js

@@ -7,13 +7,14 @@ exports.TxHandler = exports.COMPUTE_UNITS_DEFAULT = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const txParamProcessor_1 = require("./txParamProcessor");
 const bs58_1 = __importDefault(require("bs58"));
+const computeUnits_1 = require("../util/computeUnits");
 exports.COMPUTE_UNITS_DEFAULT = 200000;
 /**
  * This class is responsible for creating and signing transactions.
  */
 class TxHandler {
     constructor(props) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.blockHashToLastValidBlockHeightLookup = {};
         this.returnBlockHeightsWithSignedTxCallbackData = false;
         this.getProps = (wallet, confirmationOpts) => [wallet !== null && wallet !== void 0 ? wallet : this.wallet, confirmationOpts !== null && confirmationOpts !== void 0 ? confirmationOpts : this.confirmationOptions];
@@ -24,6 +25,7 @@ class TxHandler {
         this.returnBlockHeightsWithSignedTxCallbackData =
             (_b = (_a = props.opts) === null || _a === void 0 ? void 0 : _a.returnBlockHeightsWithSignedTxCallbackData) !== null && _b !== void 0 ? _b : false;
         this.onSignedCb = (_c = props.opts) === null || _c === void 0 ? void 0 : _c.onSignedCb;
+        this.preSignedCb = (_d = props.opts) === null || _d === void 0 ? void 0 : _d.preSignedCb;
     }
     addHashAndExpiryToLookup(hashAndExpiry) {
         if (!this.returnBlockHeightsWithSignedTxCallbackData)
@@ -88,12 +90,14 @@ class TxHandler {
         }
     }
     async signTx(tx, additionalSigners, wallet) {
+        var _a;
         [wallet] = this.getProps(wallet);
         additionalSigners
             .filter((s) => s !== undefined)
             .forEach((kp) => {
             tx.partialSign(kp);
         });
+        (_a = this.preSignedCb) === null || _a === void 0 ? void 0 : _a.call(this);
         const signedTx = await wallet.signTransaction(tx);
         // Turn txSig Buffer into base58 string
         const txSig = this.getTxSigFromSignedTx(signedTx);
@@ -107,6 +111,7 @@ class TxHandler {
         return signedTx;
     }
     async signVersionedTx(tx, additionalSigners, recentBlockHash, wallet) {
+        var _a;
         [wallet] = this.getProps(wallet);
         if (recentBlockHash) {
             tx.message.recentBlockhash = recentBlockHash.blockhash;
@@ -115,6 +120,7 @@ class TxHandler {
         additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
             tx.sign([kp]);
         });
+        (_a = this.preSignedCb) === null || _a === void 0 ? void 0 : _a.call(this);
         //@ts-ignore
         const signedTx = (await wallet.signTransaction(tx));
         // Turn txSig Buffer into base58 string
@@ -248,26 +254,25 @@ class TxHandler {
                 ...processedTxParams,
             };
         }
+        const instructionsArray = Array.isArray(instructions)
+            ? instructions
+            : [instructions];
+        const { hasSetComputeUnitLimitIx, hasSetComputeUnitPriceIx } = (0, computeUnits_1.containsComputeUnitIxs)(instructionsArray);
         // # Create Tx Instructions
         const allIx = [];
         const computeUnits = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnits;
-        if (computeUnits !== 200000) {
+        if (computeUnits > 0 && !hasSetComputeUnitLimitIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: computeUnits,
             }));
         }
         const computeUnitsPrice = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnitsPrice;
-        if (computeUnitsPrice !== 0) {
+        if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: computeUnitsPrice,
             }));
         }
-        if (Array.isArray(instructions)) {
-            allIx.push(...instructions);
-        }
-        else {
-            allIx.push(instructions);
-        }
+        allIx.push(...instructionsArray);
         const recentBlockHash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockHash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
         // # Create and return Transaction
         if (txVersion === 'legacy') {
@@ -352,6 +357,7 @@ class TxHandler {
      * @returns
      */
     async getSignedTransactionMap(txsToSign, keys, wallet) {
+        var _a;
         [wallet] = this.getProps(wallet);
         const signedTxMap = {};
         const keysWithTx = [];
@@ -363,6 +369,7 @@ class TxHandler {
                 keysWithTx.push(keys[index]);
             }
         });
+        (_a = this.preSignedCb) === null || _a === void 0 ? void 0 : _a.call(this);
         const signedTxs = await wallet.signAllTransactions(txsToSign
             .map((tx) => {
             return tx;

package/lib/tx/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ConfirmOptions, Signer, Transaction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
 import { IWallet } from '../types';
 export declare enum ConfirmationStrategy {
     WebSocket = "websocket",
@@ -14,6 +14,7 @@ export interface TxSender {
     wallet: IWallet;
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
+    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions, blockhash?: BlockhashWithExpiryBlockHeight): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
     getTimeoutCount(): number;

package/lib/tx/whileValidTxSender.d.ts

@@ -28,7 +28,7 @@ export declare class WhileValidTxSender extends BaseTxSender {
         additionalConnections?: any;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
         blockhashCommitment?: Commitment;
-        txHandler: TxHandler;
+        txHandler?: TxHandler;
     });
     sleep(reference: ResolveReference): Promise<void>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions, preSigned?: boolean): Promise<Transaction>;

package/lib/tx/whileValidTxSender.js

@@ -105,6 +105,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
                 lastValidBlockHeight,
                 blockhash,
             }, opts.commitment);
+            await this.checkConfirmationResultForError(txid, result);
             slot = result.context.slot;
             // eslint-disable-next-line no-useless-catch
         }

package/lib/types.d.ts

@@ -354,6 +354,14 @@ export declare class StakeAction {
         stakeTransfer: {};
     };
 }
+export declare class SettlePnlMode {
+    static readonly TRY_SETTLE: {
+        trySettle: {};
+    };
+    static readonly MUST_SETTLE: {
+        mustSettle: {};
+    };
+}
 export declare function isVariant(object: unknown, type: string): boolean;
 export declare function isOneOfVariant(object: unknown, types: string[]): boolean;
 export declare function getVariant(object: unknown): string;
@@ -1201,6 +1209,7 @@ export type HealthComponent = {
 };
 export interface DriftClientMetricsEvents {
     txSigned: SignedTxData[];
+    preTxSigned: void;
 }
 export type SignedTxData = {
     txSig: string;

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapReduceOnly = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.SwapReduceOnly = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -233,6 +233,11 @@ StakeAction.UNSTAKE_CANCEL_REQUEST = { unstakeCancelRequest: {} };
 StakeAction.UNSTAKE = { unstake: {} };
 StakeAction.UNSTAKE_TRANSFER = { unstakeTransfer: {} };
 StakeAction.STAKE_TRANSFER = { stakeTransfer: {} };
+class SettlePnlMode {
+}
+exports.SettlePnlMode = SettlePnlMode;
+SettlePnlMode.TRY_SETTLE = { trySettle: {} };
+SettlePnlMode.MUST_SETTLE = { mustSettle: {} };
 function isVariant(object, type) {
     return object.hasOwnProperty(type);
 }

package/lib/util/computeUnits.d.ts

@@ -1,2 +1,8 @@
-import { Connection, Finality, PublicKey } from '@solana/web3.js';
+import { Connection, Finality, PublicKey, TransactionInstruction } from '@solana/web3.js';
 export declare function findComputeUnitConsumption(programId: PublicKey, connection: Connection, txSignature: string, commitment?: Finality): Promise<number[]>;
+export declare function isSetComputeUnitsIx(ix: TransactionInstruction): boolean;
+export declare function isSetComputeUnitPriceIx(ix: TransactionInstruction): boolean;
+export declare function containsComputeUnitIxs(ixs: TransactionInstruction[]): {
+    hasSetComputeUnitLimitIx: boolean;
+    hasSetComputeUnitPriceIx: boolean;
+};

package/lib/util/computeUnits.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComputeUnitConsumption = void 0;
+exports.containsComputeUnitIxs = exports.isSetComputeUnitPriceIx = exports.isSetComputeUnitsIx = exports.findComputeUnitConsumption = void 0;
+const web3_js_1 = require("@solana/web3.js");
 async function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
     const tx = await connection.getTransaction(txSignature, { commitment });
     const computeUnits = [];
@@ -14,3 +15,32 @@ async function findComputeUnitConsumption(programId, connection, txSignature, co
     return computeUnits;
 }
 exports.findComputeUnitConsumption = findComputeUnitConsumption;
+function isSetComputeUnitsIx(ix) {
+    // Compute budget program discriminator is first byte
+    // 2: set compute unit limit
+    // 3: set compute unit price
+    if (ix.programId.equals(web3_js_1.ComputeBudgetProgram.programId) &&
+        ix.data.at(0) === 2) {
+        return true;
+    }
+    return false;
+}
+exports.isSetComputeUnitsIx = isSetComputeUnitsIx;
+function isSetComputeUnitPriceIx(ix) {
+    // Compute budget program discriminator is first byte
+    // 2: set compute unit limit
+    // 3: set compute unit price
+    if (ix.programId.equals(web3_js_1.ComputeBudgetProgram.programId) &&
+        ix.data.at(0) === 3) {
+        return true;
+    }
+    return false;
+}
+exports.isSetComputeUnitPriceIx = isSetComputeUnitPriceIx;
+function containsComputeUnitIxs(ixs) {
+    return {
+        hasSetComputeUnitLimitIx: ixs.some(isSetComputeUnitsIx),
+        hasSetComputeUnitPriceIx: ixs.some(isSetComputeUnitPriceIx),
+    };
+}
+exports.containsComputeUnitIxs = containsComputeUnitIxs;

package/package.json

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

package/src/adminClient.ts

@@ -102,9 +102,11 @@ export class AdminClient extends DriftClient {
 		orderTickSize = ONE,
 		orderStepSize = ONE,
 		ifTotalFactor = 0,
-		name = DEFAULT_MARKET_NAME
+		name = DEFAULT_MARKET_NAME,
+		marketIndex?: number
 	): Promise<TransactionSignature> {
-		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
+		const spotMarketIndex =
+			marketIndex ?? this.getStateAccount().numberOfSpotMarkets;
 
 		const initializeIx = await this.getInitializeSpotMarketIx(
 			mint,
@@ -127,15 +129,14 @@ export class AdminClient extends DriftClient {
 			orderTickSize,
 			orderStepSize,
 			ifTotalFactor,
-			name
+			name,
+			marketIndex
 		);
 
 		const tx = await this.buildTransaction(initializeIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
-		// const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
-
 		await this.accountSubscriber.addSpotMarket(spotMarketIndex);
 		await this.accountSubscriber.addOracle({
 			source: oracleSource,
@@ -167,9 +168,11 @@ export class AdminClient extends DriftClient {
 		orderTickSize = ONE,
 		orderStepSize = ONE,
 		ifTotalFactor = 0,
-		name = DEFAULT_MARKET_NAME
+		name = DEFAULT_MARKET_NAME,
+		marketIndex?: number
 	): Promise<TransactionInstruction> {
-		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
+		const spotMarketIndex =
+			marketIndex ?? this.getStateAccount().numberOfSpotMarkets;
 		const spotMarket = await getSpotMarketPublicKey(
 			this.program.programId,
 			spotMarketIndex
@@ -444,7 +447,7 @@ export class AdminClient extends DriftClient {
 			await this.fetchAccounts();
 		}
 
-		await this.accountSubscriber.addPerpMarket(currentPerpMarketIndex);
+		await this.accountSubscriber.addPerpMarket(marketIndex);
 		await this.accountSubscriber.addOracle({
 			source: oracleSource,
 			publicKey: priceOracle,
@@ -482,10 +485,9 @@ export class AdminClient extends DriftClient {
 		ammJitIntensity = 0,
 		name = DEFAULT_MARKET_NAME
 	): Promise<TransactionInstruction> {
-		const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
-			currentPerpMarketIndex
+			marketIndex
 		);
 
 		const nameBuffer = encodeName(name);

package/src/clock/clockSubscriber.ts

@@ -14,12 +14,20 @@ export interface ClockSubscriberEvent {
 }
 
 export class ClockSubscriber {
-	private latestSlot: number;
-	currentTs: number;
+	private _latestSlot: number;
+	private _currentTs: number;
 	private subscriptionId: number;
 	commitment: Commitment;
 	eventEmitter: StrictEventEmitter<EventEmitter, ClockSubscriberEvent>;
 
+	public get latestSlot(): number {
+		return this._latestSlot;
+	}
+
+	public get currentTs(): number {
+		return this._currentTs;
+	}
+
 	// Reconnection
 	private timeoutId?: NodeJS.Timeout;
 	private resubTimeoutMs?: number;
@@ -54,8 +62,8 @@ export class ClockSubscriber {
 						clearTimeout(this.timeoutId);
 						this.setTimeout();
 					}
-					this.latestSlot = context.slot;
-					this.currentTs = new BN(
+					this._latestSlot = context.slot;
+					this._currentTs = new BN(
 						acctInfo.data.subarray(32, 39),
 						undefined,
 						'le'