@drift-labs/sdk 2.82.0-beta.8 → 2.83.0-beta.0

package/lib/driftClient.js

@@ -36,7 +36,6 @@ const drift_json_1 = __importDefault(require("./idl/drift.json"));
 const web3_js_1 = require("@solana/web3.js");
 const events_1 = require("events");
 const pda_1 = require("./addresses/pda");
-const utils_1 = require("./tx/utils");
 const numericConstants_1 = require("./constants/numericConstants");
 const position_1 = require("./math/position");
 const spotBalance_1 = require("./math/spotBalance");
@@ -55,9 +54,10 @@ const spotMarket_1 = require("./math/spotMarket");
 const memcmp_1 = require("./memcmp");
 const marinade_1 = require("./marinade");
 const orderParams_1 = require("./orderParams");
-const utils_2 = require("./math/utils");
+const utils_1 = require("./math/utils");
 const txParamProcessor_1 = require("./tx/txParamProcessor");
 const oracles_1 = require("./math/oracles");
+const txHandler_1 = require("./tx/txHandler");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -70,7 +70,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -96,6 +96,16 @@ class DriftClient {
             computeUnits: (_j = (_h = config.txParams) === null || _h === void 0 ? void 0 : _h.computeUnits) !== null && _j !== void 0 ? _j : 600000,
             computeUnitsPrice: (_l = (_k = config.txParams) === null || _k === void 0 ? void 0 : _k.computeUnitsPrice) !== null && _l !== void 0 ? _l : 0,
         };
+        this.txHandler =
+            (_m = config === null || config === void 0 ? void 0 : config.txHandler) !== null && _m !== void 0 ? _m : new txHandler_1.TxHandler({
+                connection: this.connection,
+                wallet: this.provider.wallet,
+                confirmationOptions: this.opts,
+                opts: {
+                    returnBlockHeightsWithSignedTxCallbackData: config.enableMetricsEvents,
+                    onSignedCb: this.handleSignedTransaction.bind(this),
+                },
+            });
         if (config.includeDelegates && config.subAccountIds) {
             throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
         }
@@ -110,8 +120,8 @@ class DriftClient {
             : config.subAccountIds
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
-        this.includeDelegates = (_m = config.includeDelegates) !== null && _m !== void 0 ? _m : false;
-        if (((_o = config.accountSubscription) === null || _o === void 0 ? void 0 : _o.type) === 'polling') {
+        this.includeDelegates = (_o = config.includeDelegates) !== null && _o !== void 0 ? _o : false;
+        if (((_p = config.accountSubscription) === null || _p === void 0 ? void 0 : _p.type) === 'polling') {
             this.userAccountSubscriptionConfig = {
                 type: 'polling',
                 accountLoader: config.accountSubscription.accountLoader,
@@ -124,15 +134,15 @@ class DriftClient {
         else {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_p = config.accountSubscription) === null || _p === void 0 ? void 0 : _p.resubTimeoutMs,
-                logResubMessages: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.logResubMessages,
-                commitment: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.commitment,
+                resubTimeoutMs: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.resubTimeoutMs,
+                logResubMessages: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.logResubMessages,
+                commitment: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.resubTimeoutMs,
-                logResubMessages: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.logResubMessages,
-                commitment: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.commitment,
+                resubTimeoutMs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.resubTimeoutMs,
+                logResubMessages: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.logResubMessages,
+                commitment: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.commitment,
             };
         }
         if (config.userStats) {
@@ -149,25 +159,26 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_w = config.perpMarketIndexes) !== null && _w !== void 0 ? _w : [], (_x = config.spotMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.oracleInfos) !== null && _y !== void 0 ? _y : [], noMarketsAndOraclesSpecified);
+        if (((_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_x = config.perpMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.spotMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.oracleInfos) !== null && _z !== void 0 ? _z : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_z = config.perpMarketIndexes) !== null && _z !== void 0 ? _z : [], (_0 = config.spotMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.oracleInfos) !== null && _1 !== void 0 ? _1 : [], noMarketsAndOraclesSpecified, {
-                resubTimeoutMs: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.resubTimeoutMs,
-                logResubMessages: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.logResubMessages,
-            }, (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_0 = config.perpMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.spotMarketIndexes) !== null && _1 !== void 0 ? _1 : [], (_2 = config.oracleInfos) !== null && _2 !== void 0 ? _2 : [], noMarketsAndOraclesSpecified, {
+                resubTimeoutMs: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.resubTimeoutMs,
+                logResubMessages: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.logResubMessages,
+            }, (_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
+        this.metricsEventEmitter = new events_1.EventEmitter();
         if (config.enableMetricsEvents) {
             this.enableMetricsEvents = true;
-            this.metricsEventEmitter = new events_1.EventEmitter();
         }
         this.txSender =
-            (_5 = config.txSender) !== null && _5 !== void 0 ? _5 : new retryTxSender_1.RetryTxSender({
+            (_6 = config.txSender) !== null && _6 !== void 0 ? _6 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
+                txHandler: this.txHandler,
             });
     }
     getUserMapKey(subAccountId, authority) {
@@ -324,6 +335,7 @@ class DriftClient {
         // Update provider for txSender with new wallet details
         this.txSender.wallet = newWallet;
         this.wallet = newWallet;
+        this.txHandler.updateWallet(newWallet);
         this.provider = newProvider;
         this.program = newProgram;
         this.authority = newWallet.publicKey;
@@ -448,22 +460,6 @@ class DriftClient {
         }
         return result;
     }
-    async getProcessedTransactionParams(txParams, txParamProcessingParams) {
-        const tx = await txParamProcessor_1.TransactionProcessor.process({
-            txProps: {
-                instructions: txParams.instructions,
-                txParams: txParams.txParams,
-                txVersion: txParams.txVersion,
-                lookupTables: txParams.lookupTables,
-            },
-            txBuilder: (updatedTxParams) => this.buildTransaction(updatedTxParams.instructions, updatedTxParams === null || updatedTxParams === void 0 ? void 0 : updatedTxParams.txParams, updatedTxParams.txVersion, updatedTxParams.lookupTables, true),
-            processConfig: txParamProcessingParams,
-            processParams: {
-                connection: this.connection,
-            },
-        });
-        return tx;
-    }
     async initializeUserAccount(subAccountId = 0, name, referrerInfo, txParams) {
         const initializeIxs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
@@ -867,7 +863,7 @@ class DriftClient {
      */
     convertToPerpPrecision(amount) {
         if (typeof amount === 'number') {
-            return (0, utils_2.numberToSafeBN)(amount, numericConstants_1.BASE_PRECISION);
+            return (0, utils_1.numberToSafeBN)(amount, numericConstants_1.BASE_PRECISION);
         }
         else {
             return amount.mul(numericConstants_1.BASE_PRECISION);
@@ -879,7 +875,7 @@ class DriftClient {
      */
     convertToPricePrecision(amount) {
         if (typeof amount === 'number') {
-            return (0, utils_2.numberToSafeBN)(amount, numericConstants_1.PRICE_PRECISION);
+            return (0, utils_1.numberToSafeBN)(amount, numericConstants_1.PRICE_PRECISION);
         }
         else {
             return amount.mul(numericConstants_1.BASE_PRECISION);
@@ -1509,8 +1505,8 @@ class DriftClient {
             price: limitPrice,
         }, undefined, undefined, undefined, subAccountId);
     }
-    async sendSignedTx(tx) {
-        const { txSig } = await this.sendTransaction(tx, undefined, this.opts, true);
+    async sendSignedTx(tx, opts) {
+        const { txSig } = await this.sendTransaction(tx, undefined, opts !== null && opts !== void 0 ? opts : this.opts, true);
         return txSig;
     }
     /**
@@ -1528,93 +1524,51 @@ class DriftClient {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
         const ordersIx = await this.getPlaceOrdersIx([orderParams, ...bracketOrdersParams], userAccount.subAccountId);
+        const ixsToSign = [];
+        const keys = {
+            signedCancelExistingOrdersTx: 'signedCancelExistingOrdersTx',
+            signedSettlePnlTx: 'signedSettlePnlTx',
+            signedFillTx: 'signedFillTx',
+            signedMarketOrderTx: 'signedMarketOrderTx',
+        };
         /* Cancel open orders in market if requested */
-        let cancelExistingOrdersTx;
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
-            const cancelOrdersIx = await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, userAccount.subAccountId);
-            //@ts-ignore
-            cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion);
+            ixsToSign.push({
+                key: keys.signedCancelExistingOrdersTx,
+                ix: await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, userAccount.subAccountId),
+            });
         }
         /* Settle PnL after fill if requested */
-        let settlePnlTx;
         if (settlePnl && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
-            const settlePnlIx = await this.settlePNLIx(userAccountPublicKey, userAccount, marketIndex);
-            //@ts-ignore
-            settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion);
+            ixsToSign.push({
+                key: keys.signedSettlePnlTx,
+                ix: await this.settlePNLIx(userAccountPublicKey, userAccount, marketIndex),
+            });
         }
         // use versioned transactions if there is a lookup table account and wallet is compatible
         if (this.txVersion === 0) {
-            const versionedMarketOrderTx = await this.buildTransaction(ordersIx, txParams, 0);
-            const fillPerpOrderIx = await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
-                orderId,
-                marketIndex,
-            }, makerInfo, referrerInfo, userAccount.subAccountId);
-            const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
-            const allPossibleTxs = [
-                versionedMarketOrderTx,
-                versionedFillTx,
-                cancelExistingOrdersTx,
-                settlePnlTx,
-            ];
-            const txKeys = [
-                'signedVersionedMarketOrderTx',
-                'signedVersionedFillTx',
-                'signedCancelExistingOrdersTx',
-                'signedSettlePnlTx',
-            ];
-            const { signedVersionedMarketOrderTx, signedVersionedFillTx, signedCancelExistingOrdersTx, signedSettlePnlTx, } = await (0, utils_1.getSignedTransactionMap)(
-            //@ts-ignore
-            this.provider.wallet, allPossibleTxs, txKeys);
-            const { txSig, slot } = await this.sendTransaction(signedVersionedMarketOrderTx, [], this.opts, true);
-            this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-            return {
-                txSig,
-                // @ts-ignore
-                signedFillTx: signedVersionedFillTx,
-                // @ts-ignore
-                signedCancelExistingOrdersTx,
-                // @ts-ignore
-                signedSettlePnlTx,
-            };
-        }
-        else {
-            const marketOrderTx = (0, utils_1.wrapInTx)(ordersIx, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
-            // Apply the latest blockhash to the txs so that we can sign before sending them
-            const currentBlockHash = (await this.connection.getLatestBlockhash('finalized')).blockhash;
-            marketOrderTx.recentBlockhash = currentBlockHash;
-            marketOrderTx.feePayer = userAccount.authority;
-            if (cancelExistingOrdersTx) {
-                cancelExistingOrdersTx.recentBlockhash = currentBlockHash;
-                cancelExistingOrdersTx.feePayer = userAccount.authority;
-            }
-            if (settlePnlTx) {
-                settlePnlTx.recentBlockhash = currentBlockHash;
-                settlePnlTx.feePayer = userAccount.authority;
-            }
-            const allPossibleTxs = [
-                marketOrderTx,
-                cancelExistingOrdersTx,
-                settlePnlTx,
-            ];
-            const txKeys = [
-                'signedMarketOrderTx',
-                'signedCancelExistingOrdersTx',
-                'signedSettlePnlTx',
-            ];
-            const { signedMarketOrderTx, signedCancelExistingOrdersTx, signedSettlePnlTx, } = await (0, utils_1.getSignedTransactionMap)(
-            //@ts-ignore
-            this.provider.wallet, allPossibleTxs, txKeys);
-            const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
-            this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-            return {
-                txSig,
-                signedFillTx: undefined,
-                //@ts-ignore
-                signedCancelExistingOrdersTx,
-                //@ts-ignore
-                signedSettlePnlTx,
-            };
+            ixsToSign.push({
+                key: keys.signedFillTx,
+                ix: await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
+                    orderId,
+                    marketIndex,
+                }, makerInfo, referrerInfo, userAccount.subAccountId),
+            });
         }
+        // Apply the latest blockhash to the txs so that we can sign before sending them
+        ixsToSign.push({
+            key: keys.signedMarketOrderTx,
+            ix: ordersIx,
+        });
+        const signedTransactions = await this.buildAndSignBulkTransactions(ixsToSign.map((ix) => ix.ix), ixsToSign.map((ix) => ix.key), txParams);
+        const { txSig, slot } = await this.sendTransaction(signedTransactions[keys.signedMarketOrderTx], [], this.opts, true);
+        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+        return {
+            txSig,
+            signedFillTx: signedTransactions === null || signedTransactions === void 0 ? void 0 : signedTransactions[keys.signedFillTx],
+            signedCancelExistingOrdersTx: signedTransactions === null || signedTransactions === void 0 ? void 0 : signedTransactions[keys.signedCancelExistingOrdersTx],
+            signedSettlePnlTx: signedTransactions === null || signedTransactions === void 0 ? void 0 : signedTransactions[keys.signedSettlePnlTx],
+        };
     }
     async placePerpOrder(orderParams, txParams, subAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlacePerpOrderIx(orderParams, subAccountId), txParams), [], this.opts);
@@ -2277,7 +2231,7 @@ class DriftClient {
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
             outMarketIndex,
             inMarketIndex,
-            amountIn: amount,
+            amountIn: new anchor_1.BN(route.inAmount),
             inTokenAccount: inAssociatedTokenAccount,
             outTokenAccount: outAssociatedTokenAccount,
             reduceOnly,
@@ -2339,7 +2293,7 @@ class DriftClient {
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
             outMarketIndex,
             inMarketIndex,
-            amountIn: amount,
+            amountIn: new anchor_1.BN(quote.inAmount),
             inTokenAccount: inAssociatedTokenAccount,
             outTokenAccount: outAssociatedTokenAccount,
             reduceOnly,
@@ -2546,12 +2500,18 @@ class DriftClient {
         return txSig;
     }
     async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, simulateFirst) {
-        const ixs = [];
+        const placeAndTakeIxs = [];
         const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId);
-        ixs.push(placeAndTakeIx);
+        const txsToSign = [];
+        const keys = {
+            placeAndTakeIx: 'placeAndTakeIx',
+            cancelExistingOrdersTx: 'cancelExistingOrdersTx',
+            settlePnlTx: 'settlePnlTx',
+        };
+        placeAndTakeIxs.push(placeAndTakeIx);
         if (bracketOrdersParams.length > 0) {
             const bracketOrdersIx = await this.getPlaceOrdersIx(bracketOrdersParams, subAccountId);
-            ixs.push(bracketOrdersIx);
+            placeAndTakeIxs.push(bracketOrdersIx);
         }
         const shouldUseSimulationComputeUnits = txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnits;
         const shouldExitIfSimulationFails = simulateFirst;
@@ -2559,57 +2519,51 @@ class DriftClient {
             ...txParams,
             useSimulationComputeUnits: false,
         };
-        let placeAndTakeTx = await this.buildTransaction(ixs, txParamsWithoutImplicitSimulation);
+        // 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) {
-            let versionedPlaceAndTakeTx;
-            if (this.isVersionedTransaction(placeAndTakeTx)) {
-                versionedPlaceAndTakeTx = placeAndTakeTx;
-            }
-            else {
-                versionedPlaceAndTakeTx = (await this.buildTransaction(ixs, txParamsWithoutImplicitSimulation, undefined, undefined, true));
-            }
-            const simulationResult = await txParamProcessor_1.TransactionProcessor.getTxSimComputeUnits(versionedPlaceAndTakeTx, this.connection);
+            const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParamsWithoutImplicitSimulation, undefined, undefined, true, recentBlockHash));
+            const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection);
             if (shouldExitIfSimulationFails && !simulationResult.success) {
                 return;
             }
-            if (shouldUseSimulationComputeUnits) {
-                placeAndTakeTx = await this.buildTransaction(ixs, {
+            txsToSign.push({
+                key: keys.placeAndTakeIx,
+                tx: await this.buildTransaction(placeAndTakeIxs, {
                     ...txParamsWithoutImplicitSimulation,
                     computeUnits: simulationResult.computeUnits,
-                });
-            }
+                }, undefined, undefined, undefined, recentBlockHash),
+            });
+        }
+        else {
+            txsToSign.push({
+                key: keys.placeAndTakeIx,
+                tx: await this.buildTransaction(placeAndTakeIxs, txParamsWithoutImplicitSimulation, undefined, undefined, undefined, recentBlockHash),
+            });
         }
-        let cancelExistingOrdersTx;
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
             const cancelOrdersIx = await this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, subAccountId);
-            //@ts-ignore
-            cancelExistingOrdersTx = await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion);
+            txsToSign.push({
+                key: keys.cancelExistingOrdersTx,
+                tx: await this.buildTransaction([cancelOrdersIx], txParams, this.txVersion, undefined, undefined, recentBlockHash),
+            });
         }
-        /* Settle PnL after fill if requested */
-        let settlePnlTx;
         if (settlePnl && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
             const userAccountPublicKey = await this.getUserAccountPublicKey(subAccountId);
             const settlePnlIx = await this.settlePNLIx(userAccountPublicKey, this.getUserAccount(subAccountId), orderParams.marketIndex);
-            //@ts-ignore
-            settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion);
+            txsToSign.push({
+                key: keys.settlePnlTx,
+                tx: await this.buildTransaction([settlePnlIx], txParams, this.txVersion, undefined, undefined, recentBlockHash),
+            });
         }
-        const allPossibleTxs = [
-            placeAndTakeTx,
-            cancelExistingOrdersTx,
-            settlePnlTx,
-        ];
-        const txKeys = [
-            'signedPlaceAndTakeTx',
-            'signedCancelExistingOrdersTx',
-            'signedSettlePnlTx',
-        ];
-        const { signedPlaceAndTakeTx, signedCancelExistingOrdersTx, signedSettlePnlTx, } = await (0, utils_1.getSignedTransactionMap)(
-        //@ts-ignore
-        this.provider.wallet, allPossibleTxs, txKeys);
-        const { txSig, slot } = await this.sendTransaction(signedPlaceAndTakeTx, [], this.opts, true);
+        const signedTxs = await this.txHandler.getSignedTransactionMap(txsToSign.map((tx) => tx.tx), txsToSign.map((tx) => tx.key), this.provider.wallet);
+        const { txSig, slot } = await this.sendTransaction(signedTxs[keys.placeAndTakeIx], [], this.opts, true);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-        //@ts-ignore
-        return { txSig, signedCancelExistingOrdersTx, signedSettlePnlTx };
+        return {
+            txSig,
+            signedCancelExistingOrdersTx: signedTxs[keys.cancelExistingOrdersTx],
+            signedSettlePnlTx: signedTxs[keys.settlePnlTx],
+        };
     }
     async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, subAccountId) {
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
@@ -3614,8 +3568,10 @@ class DriftClient {
         }
         return undefined;
     }
-    handleSignedTransaction() {
-        this.metricsEventEmitter.emit('txSigned');
+    handleSignedTransaction(signedTxs) {
+        if (this.enableMetricsEvents && this.metricsEventEmitter) {
+            this.metricsEventEmitter.emit('txSigned', signedTxs);
+        }
     }
     isVersionedTransaction(tx) {
         const version = tx === null || tx === void 0 ? void 0 : tx.version;
@@ -3623,110 +3579,51 @@ class DriftClient {
         return isVersionedTx;
     }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
-        const extraConfirmationOptions = this
-            .enableMetricsEvents
-            ? {
-                onSignedCb: this.handleSignedTransaction.bind(this),
-            }
-            : undefined;
         const isVersionedTx = this.isVersionedTransaction(tx);
         if (isVersionedTx) {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned, extraConfirmationOptions);
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
         }
         else {
-            return this.txSender.send(tx, additionalSigners, opts, preSigned, extraConfirmationOptions);
-        }
-    }
-    /**
-     *
-     * @param instructions
-     * @param txParams
-     * @param txVersion
-     * @param lookupTables
-     * @param forceVersionedTransaction Return a VersionedTransaction instance even if the version of the transaction is Legacy
-     * @returns
-     */
-    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction) {
-        var _a, _b;
-        txVersion = txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion;
-        // # Collect and process Tx Params
-        let baseTxParams = {
-            computeUnits: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : this.txParams.computeUnits,
-            computeUnitsPrice: (_b = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) !== null && _b !== void 0 ? _b : this.txParams.computeUnitsPrice,
-        };
-        if (txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnits) {
-            const splitTxParams = {
-                baseTxParams: {
-                    computeUnits: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits,
-                    computeUnitsPrice: txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice,
-                },
-                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({
-                instructions,
-                txParams: splitTxParams.baseTxParams,
-                txVersion,
-                lookupTables,
-            }, splitTxParams.txParamProcessingParams);
-            baseTxParams = {
-                ...baseTxParams,
-                ...processedTxParams,
-            };
-        }
-        // # Create Tx Instructions
-        const allIx = [];
-        const computeUnits = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnits;
-        if (computeUnits !== 200000) {
-            allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-                units: computeUnits,
-            }));
-        }
-        const computeUnitsPrice = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnitsPrice;
-        if (computeUnitsPrice !== 0) {
-            allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: computeUnitsPrice,
-            }));
-        }
-        if (Array.isArray(instructions)) {
-            allIx.push(...instructions);
-        }
-        else {
-            allIx.push(instructions);
-        }
-        const latestBlockHashAndContext = await this.connection.getLatestBlockhashAndContext({
-            commitment: this.opts.preflightCommitment,
-        });
-        // # Create and return Transaction
-        if (txVersion === 'legacy') {
-            if (forceVersionedTransaction) {
-                const message = new web3_js_1.TransactionMessage({
-                    payerKey: this.provider.wallet.publicKey,
-                    recentBlockhash: latestBlockHashAndContext.value.blockhash,
-                    instructions: allIx,
-                }).compileToLegacyMessage();
-                return new web3_js_1.VersionedTransaction(message);
-            }
-            else {
-                return new web3_js_1.Transaction().add(...allIx);
-            }
-        }
-        else {
-            const marketLookupTable = await this.fetchMarketLookupTableAccount();
-            lookupTables = lookupTables
-                ? [...lookupTables, marketLookupTable]
-                : [marketLookupTable];
-            const message = new web3_js_1.TransactionMessage({
-                payerKey: this.provider.wallet.publicKey,
-                recentBlockhash: latestBlockHashAndContext.value.blockhash,
-                instructions: allIx,
-            }).compileToV0Message(lookupTables);
-            return new web3_js_1.VersionedTransaction(message);
-        }
+            return this.txSender.send(tx, additionalSigners, opts, preSigned);
+        }
+    }
+    async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockHash) {
+        return this.txHandler.buildTransaction({
+            instructions,
+            txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
+            txParams,
+            connection: this.connection,
+            preFlightCommitment: this.opts.preflightCommitment,
+            fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),
+            lookupTables,
+            forceVersionedTransaction,
+            recentBlockHash,
+        });
+    }
+    async buildBulkTransactions(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction) {
+        return this.txHandler.buildBulkTransactions({
+            instructions,
+            txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
+            txParams,
+            connection: this.connection,
+            preFlightCommitment: this.opts.preflightCommitment,
+            fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),
+            lookupTables,
+            forceVersionedTransaction,
+        });
+    }
+    async buildAndSignBulkTransactions(instructions, keys, txParams, txVersion, lookupTables, forceVersionedTransaction) {
+        return this.txHandler.buildAndSignTransactionMap({
+            instructions,
+            txVersion: txVersion !== null && txVersion !== void 0 ? txVersion : this.txVersion,
+            txParams,
+            connection: this.connection,
+            preFlightCommitment: this.opts.preflightCommitment,
+            fetchMarketLookupTableAccount: this.fetchMarketLookupTableAccount.bind(this),
+            lookupTables,
+            forceVersionedTransaction,
+            keys,
+        });
     }
 }
 exports.DriftClient = DriftClient;

package/lib/driftClientConfig.d.ts

@@ -4,6 +4,7 @@ import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
+import { TxHandler } from './tx/txHandler';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -12,6 +13,7 @@ export type DriftClientConfig = {
     accountSubscription?: DriftClientSubscriptionConfig;
     opts?: ConfirmOptions;
     txSender?: TxSender;
+    txHandler?: TxHandler;
     subAccountIds?: number[];
     activeSubAccountId?: number;
     perpMarketIndexes?: number[];

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.81.0",
+    "version": "2.82.0",
     "name": "drift",
     "instructions": [
         {

package/lib/index.d.ts

@@ -101,4 +101,6 @@ export * from './auctionSubscriber/types';
 export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
+export * from './util/chainClock';
+export * from './clock/clockSubscriber';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -124,3 +124,5 @@ __exportStar(require("./auctionSubscriber/types"), exports);
 __exportStar(require("./memcmp"), exports);
 __exportStar(require("./decode/user"), exports);
 __exportStar(require("./blockhashSubscriber"), exports);
+__exportStar(require("./util/chainClock"), exports);
+__exportStar(require("./clock/clockSubscriber"), exports);

package/lib/jupiter/jupiterClient.d.ts

@@ -206,8 +206,9 @@ export declare class JupiterClient {
     url: string;
     connection: Connection;
     lookupTableCahce: Map<string, AddressLookupTableAccount>;
-    constructor({ connection }: {
+    constructor({ connection, url }: {
         connection: Connection;
+        url?: string;
     });
     /**
      * ** @deprecated - use getQuote