@drift-labs/sdk 2.10.0-beta.0 → 2.10.0-beta.2

package/lib/driftClient.js

@@ -54,7 +54,7 @@ const spotPosition_1 = require("./math/spotPosition");
  */
 class DriftClient {
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -88,23 +88,23 @@ class DriftClient {
         let spotMarketIndexes = config.spotMarketIndexes;
         let oracleInfos = config.oracleInfos;
         if (config.env) {
-            const { perpMarketIndexes: envPerpMarketIndexes, spotMarketIndexes: envSpotMarketIndexes, oracleInfos: envOralceInfos, } = (0, config_1.getMarketsAndOraclesForSubscription)(config.env);
+            const { perpMarketIndexes: envPerpMarketIndexes, spotMarketIndexes: envSpotMarketIndexes, oracleInfos: envOracleInfos, } = (0, config_1.getMarketsAndOraclesForSubscription)(config.env);
             perpMarketIndexes = perpMarketIndexes
                 ? perpMarketIndexes
                 : envPerpMarketIndexes;
             spotMarketIndexes = spotMarketIndexes
                 ? spotMarketIndexes
                 : envSpotMarketIndexes;
-            oracleInfos = oracleInfos ? oracleInfos : envOralceInfos;
+            oracleInfos = oracleInfos ? oracleInfos : envOracleInfos;
         }
         if (((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'polling') {
             this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_f = config.perpMarketIndexes) !== null && _f !== void 0 ? _f : [], (_g = config.spotMarketIndexes) !== null && _g !== void 0 ? _g : [], (_h = config.oracleInfos) !== null && _h !== void 0 ? _h : []);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_j = config.txSenderConfig) === null || _j === void 0 ? void 0 : _j.timeout, (_k = config.txSenderConfig) === null || _k === void 0 ? void 0 : _k.retrySleep, (_l = config.txSenderConfig) === null || _l === void 0 ? void 0 : _l.additionalConnections);
+        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_f = config.txSenderConfig) === null || _f === void 0 ? void 0 : _f.timeout, (_g = config.txSenderConfig) === null || _g === void 0 ? void 0 : _g.retrySleep, (_h = config.txSenderConfig) === null || _h === void 0 ? void 0 : _h.additionalConnections);
     }
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -193,9 +193,16 @@ class DriftClient {
      * @param marketIndex
      */
     async forceGetPerpMarketAccount(marketIndex) {
-        var _a;
+        var _a, _b;
         await this.accountSubscriber.fetch();
-        return (_a = this.accountSubscriber.getMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+        let data = (_a = this.accountSubscriber.getMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+        let i = 0;
+        while (data === undefined && i < 10) {
+            await this.accountSubscriber.fetch();
+            data = (_b = this.accountSubscriber.getMarketAccountAndSlot(marketIndex)) === null || _b === void 0 ? void 0 : _b.data;
+            i++;
+        }
+        return data;
     }
     getPerpMarketAccounts() {
         return this.accountSubscriber
@@ -285,7 +292,7 @@ class DriftClient {
             }
         }
         tx.add(initializeUserAccountIx);
-        const { txSig } = await this.txSender.send(tx, [], this.opts);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return [txSig, userAccountPublicKey];
     }
     async getInitializeUserInstructions(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
@@ -342,37 +349,45 @@ class DriftClient {
     async updateUserName(name, subAccountId = 0) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        return await this.program.rpc.updateUserName(subAccountId, nameBuffer, {
+        const tx = await this.program.transaction.updateUserName(subAccountId, nameBuffer, {
             accounts: {
                 user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
             },
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async updateUserCustomMarginRatio(marginRatio, subAccountId = 0) {
-        return await this.program.rpc.updateUserCustomMarginRatio(subAccountId, marginRatio, {
+        const tx = await this.program.transaction.updateUserCustomMarginRatio(subAccountId, marginRatio, {
             accounts: {
                 user: await this.getUserAccountPublicKey(),
                 authority: this.wallet.publicKey,
             },
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
-        return await this.program.rpc.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
+        const tx = await this.program.transaction.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
             accounts: {
                 user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
             },
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async updateUserDelegate(delegate, subAccountId = 0) {
-        return await this.program.rpc.updateUserDelegate(subAccountId, delegate, {
+        const tx = await this.program.transaction.updateUserDelegate(subAccountId, delegate, {
             accounts: {
                 user: await this.getUserAccountPublicKey(),
                 authority: this.wallet.publicKey,
             },
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async getUserAccountsForDelegate(delegate) {
         const programAccounts = await this.program.account.user.all([
@@ -401,7 +416,7 @@ class DriftClient {
     async deleteUser(subAccountId = 0) {
         var _a;
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
-        const txSig = await this.program.rpc.deleteUser({
+        const ix = await this.program.instruction.deleteUser({
             accounts: {
                 user: userAccountPublicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
@@ -409,6 +424,7 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix), [], this.opts);
         await ((_a = this.users.get(subAccountId)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
         this.users.delete(subAccountId);
         return txSig;
@@ -667,7 +683,7 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, collateralAccountPublicKey, authority, authority, []));
         }
-        const { txSig, slot } = await this.txSender.send(tx, additionalSigners, this.opts);
+        const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -678,7 +694,7 @@ class DriftClient {
         let remainingAccounts = [];
         if (userInitialized) {
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [this.getUserAccount()],
+                userAccounts: [await this.forceGetUserAccount()],
                 useMarketLastSlotCache: true,
                 writableSpotMarketIndexes: [marketIndex],
             });
@@ -780,7 +796,7 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccount, authority, authority, []));
         }
-        const { txSig, slot } = await this.txSender.send(tx, additionalSigners, this.opts);
+        const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return [txSig, userAccountPublicKey];
     }
@@ -830,7 +846,7 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccount, authority, authority, []));
         }
-        const { txSig, slot } = await this.txSender.send(tx, additionalSigners, this.opts);
+        const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -859,7 +875,7 @@ class DriftClient {
         });
     }
     async transferDeposit(amount, marketIndex, fromSubAccountId, toSubAccountId) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId)), [], this.opts);
         if (fromSubAccountId === this.activeSubAccountId ||
             toSubAccountId === this.activeSubAccountId) {
             this.spotMarketLastSlotCache.set(marketIndex, slot);
@@ -899,7 +915,7 @@ class DriftClient {
         });
     }
     async updateSpotMarketCumulativeInterest(marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.updateSpotMarketCumulativeInterestIx(marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.updateSpotMarketCumulativeInterestIx(marketIndex)), [], this.opts);
         return txSig;
     }
     async updateSpotMarketCumulativeInterestIx(marketIndex) {
@@ -913,7 +929,7 @@ class DriftClient {
         });
     }
     async settleLP(settleeUserAccountPublicKey, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex)), [], this.opts);
         return txSig;
     }
     async settleLPIx(settleeUserAccountPublicKey, marketIndex) {
@@ -931,11 +947,11 @@ class DriftClient {
         });
     }
     async removePerpLpShares(marketIndex, sharesToBurn) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn)), [], this.opts);
         return txSig;
     }
     async removePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn)), [], this.opts);
         return txSig;
     }
     async getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
@@ -981,7 +997,7 @@ class DriftClient {
         });
     }
     async addPerpLpShares(amount, marketIndex) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getAddPerpLpSharesIx(amount, marketIndex)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getAddPerpLpSharesIx(amount, marketIndex)), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -1011,7 +1027,7 @@ class DriftClient {
         });
     }
     async sendSignedTx(tx) {
-        const { txSig } = await this.txSender.send(tx, undefined, this.opts, true);
+        const { txSig } = await this.sendTransaction(tx, undefined, this.opts, true);
         return txSig;
     }
     /**
@@ -1037,12 +1053,12 @@ class DriftClient {
         marketOrderTx.feePayer = userAccount.authority;
         fillTx.feePayer = userAccount.authority;
         const [signedMarketOrderTx, signedFillTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx]);
-        const { txSig, slot } = await this.txSender.send(signedMarketOrderTx, [], this.opts, true);
+        const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return { txSig, signedFillTx };
     }
     async placePerpOrder(orderParams) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams)), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1070,7 +1086,7 @@ class DriftClient {
         });
     }
     async updateAMMs(marketIndexes) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateAMMsIx(marketIndexes)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateAMMsIx(marketIndexes)), [], this.opts);
         return txSig;
     }
     async getUpdateAMMsIx(marketIndexes) {
@@ -1104,7 +1120,7 @@ class DriftClient {
         });
     }
     async settleExpiredMarket(marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getSettleExpiredMarketIx(marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getSettleExpiredMarketIx(marketIndex)), [], this.opts);
         return txSig;
     }
     async getSettleExpiredMarketIx(marketIndex) {
@@ -1149,11 +1165,11 @@ class DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(ix), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix), [], this.opts);
         return txSig;
     }
     async cancelOrder(orderId) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrderIx(orderId)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrderIx(orderId)), [], this.opts);
         return txSig;
     }
     async getCancelOrderIx(orderId) {
@@ -1172,7 +1188,7 @@ class DriftClient {
         });
     }
     async cancelOrderByUserId(userOrderId) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
         return txSig;
     }
     async getCancelOrderByUserIdIx(userOrderId) {
@@ -1194,13 +1210,25 @@ class DriftClient {
         });
     }
     async cancelOrders(marketType, marketIndex, direction) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrdersIx(marketType, marketIndex, direction)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrdersIx(marketType, marketIndex, direction)), [], this.opts);
         return txSig;
     }
     async getCancelOrdersIx(marketType, marketIndex, direction) {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
+        let readablePerpMarketIndex = undefined;
+        let readableSpotMarketIndexes = undefined;
+        if (marketIndex) {
+            if (marketType && (0, types_1.isVariant)(marketType, 'perp')) {
+                readablePerpMarketIndex = marketIndex;
+            }
+            else if (marketType && (0, types_1.isVariant)(marketType, 'spot')) {
+                readableSpotMarketIndexes = [marketIndex];
+            }
+        }
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
+            readablePerpMarketIndex,
+            readableSpotMarketIndexes,
             useMarketLastSlotCache: true,
         });
         return await this.program.instruction.cancelOrders(marketType !== null && marketType !== void 0 ? marketType : null, marketIndex !== null && marketIndex !== void 0 ? marketIndex : null, direction !== null && direction !== void 0 ? direction : null, {
@@ -1213,7 +1241,7 @@ class DriftClient {
         });
     }
     async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
         return txSig;
     }
     async getFillPerpOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo) {
@@ -1270,7 +1298,7 @@ class DriftClient {
         });
     }
     async placeSpotOrder(orderParams) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceSpotOrderIx(orderParams)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceSpotOrderIx(orderParams)), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -1297,7 +1325,7 @@ class DriftClient {
         });
     }
     async fillSpotOrder(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillSpotOrderIx(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillSpotOrderIx(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
         return txSig;
     }
     async getFillSpotOrderIx(userAccountPublicKey, userAccount, order, fulfillmentConfig, makerInfo, referrerInfo) {
@@ -1454,7 +1482,7 @@ class DriftClient {
         });
     }
     async triggerOrder(userAccountPublicKey, user, order) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getTriggerOrderIx(userAccountPublicKey, user, order)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTriggerOrderIx(userAccountPublicKey, user, order)), [], this.opts);
         return txSig;
     }
     async getTriggerOrderIx(userAccountPublicKey, userAccount, order) {
@@ -1505,7 +1533,7 @@ class DriftClient {
         });
     }
     async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1559,7 +1587,7 @@ class DriftClient {
         });
     }
     async placeAndMakePerpOrder(orderParams, takerInfo, referrerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1598,7 +1626,7 @@ class DriftClient {
         });
     }
     async placeAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -1657,7 +1685,7 @@ class DriftClient {
         });
     }
     async placeAndMakeSpotOrder(orderParams, takerInfo, fulfillmentConfig, referrerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, fulfillmentConfig, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, fulfillmentConfig, referrerInfo)), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -1762,7 +1790,7 @@ class DriftClient {
         }));
         tx.add(cancelOrderIx);
         tx.add(placeOrderIx);
-        const { txSig, slot } = await this.txSender.send(tx, [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
         this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
         return txSig;
     }
@@ -1777,11 +1805,11 @@ class DriftClient {
             additionalFee: 0,
         }))
             .add(...ixs);
-        const { txSig } = await this.txSender.send(tx, [], this.opts);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
     async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex)), [], this.opts);
         return txSig;
     }
     async settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
@@ -1801,7 +1829,7 @@ class DriftClient {
         });
     }
     async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice)), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -1827,7 +1855,7 @@ class DriftClient {
         });
     }
     async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
         this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
         return txSig;
@@ -1854,7 +1882,7 @@ class DriftClient {
         });
     }
     async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
         this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
         return txSig;
@@ -1881,7 +1909,7 @@ class DriftClient {
         });
     }
     async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice)), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
         return txSig;
@@ -1908,7 +1936,7 @@ class DriftClient {
         });
     }
     async resolvePerpBankruptcy(userAccountPublicKey, userAccount, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
         return txSig;
     }
     async getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
@@ -1938,7 +1966,7 @@ class DriftClient {
         });
     }
     async resolveSpotBankruptcy(userAccountPublicKey, userAccount, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
         return txSig;
     }
     async getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
@@ -1967,7 +1995,7 @@ class DriftClient {
         });
     }
     async updateFundingRate(perpMarketIndex, oracle) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(perpMarketIndex, oracle)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(perpMarketIndex, oracle)), [], this.opts);
         return txSig;
     }
     async getUpdateFundingRateIx(perpMarketIndex, oracle) {
@@ -1981,7 +2009,7 @@ class DriftClient {
         });
     }
     async settleFundingPayment(userAccountPublicKey) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getSettleFundingPaymentIx(userAccountPublicKey)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getSettleFundingPaymentIx(userAccountPublicKey)), [], this.opts);
         return txSig;
     }
     async getSettleFundingPaymentIx(userAccountPublicKey) {
@@ -2018,7 +2046,7 @@ class DriftClient {
         return oracleData;
     }
     async initializeInsuranceFundStake(marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getInitializeInsuranceFundStakeIx(marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getInitializeInsuranceFundStakeIx(marketIndex)), [], this.opts);
         return txSig;
     }
     async getInitializeInsuranceFundStakeIx(marketIndex) {
@@ -2044,7 +2072,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        return await this.program.rpc.addInsuranceFundStake(marketIndex, amount, {
+        const tx = await this.program.transaction.addInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarket.pubkey,
@@ -2059,6 +2087,8 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async requestRemoveInsuranceFundStake(marketIndex, amount) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -2068,7 +2098,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        return await this.program.rpc.requestRemoveInsuranceFundStake(marketIndex, amount, {
+        const tx = await this.program.transaction.requestRemoveInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -2079,6 +2109,8 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async cancelRequestRemoveInsuranceFundStake(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -2088,7 +2120,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        return await this.program.rpc.cancelRequestRemoveInsuranceFundStake(marketIndex, {
+        const tx = await this.program.transaction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -2099,6 +2131,8 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -2108,7 +2142,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        return await this.program.rpc.removeInsuranceFundStake(marketIndex, {
+        const tx = await this.program.transaction.removeInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -2122,6 +2156,8 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async settleRevenueToInsuranceFund(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -2130,7 +2166,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        return await this.program.rpc.settleRevenueToInsuranceFund(marketIndex, {
+        const tx = await this.program.transaction.settleRevenueToInsuranceFund(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -2141,9 +2177,11 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
     }
     async resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex)), [], this.opts);
         return txSig;
     }
     async getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex) {
@@ -2166,5 +2204,8 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    sendTransaction(tx, additionalSigners, opts, preSigned) {
+        return this.txSender.send(tx, additionalSigners, opts, preSigned);
+    }
 }
 exports.DriftClient = DriftClient;

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.10.0-beta.0",
+    "version": "2.10.0-beta.2",
     "name": "drift",
     "instructions": [
         {

package/lib/index.d.ts

@@ -20,6 +20,7 @@ export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './adminClient';
+export * from './testClient';
 export * from './user';
 export * from './userConfig';
 export * from './userStats';

package/lib/index.js

@@ -43,6 +43,7 @@ __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
 __exportStar(require("./adminClient"), exports);
+__exportStar(require("./testClient"), exports);
 __exportStar(require("./user"), exports);
 __exportStar(require("./userConfig"), exports);
 __exportStar(require("./userStats"), exports);