@drift-labs/sdk 2.12.0-beta.2 → 2.12.0-beta.3

package/lib/driftClient.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -80,7 +76,7 @@ class DriftClient {
         if (config.userStats) {
             this.userStats = new userStats_1.UserStats({
                 driftClient: this,
-                userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority),
+                userStatsAccountPublicKey: pda_1.getUserStatsAccountPublicKey(this.program.programId, this.authority),
                 accountSubscription: this.userAccountSubscriptionConfig,
             });
         }
@@ -88,7 +84,7 @@ class DriftClient {
         let spotMarketIndexes = config.spotMarketIndexes;
         let oracleInfos = config.oracleInfos;
         if (config.env) {
-            const { perpMarketIndexes: envPerpMarketIndexes, spotMarketIndexes: envSpotMarketIndexes, oracleInfos: envOracleInfos, } = (0, config_1.getMarketsAndOraclesForSubscription)(config.env);
+            const { perpMarketIndexes: envPerpMarketIndexes, spotMarketIndexes: envSpotMarketIndexes, oracleInfos: envOracleInfos, } = config_1.getMarketsAndOraclesForSubscription(config.env);
             perpMarketIndexes = perpMarketIndexes
                 ? perpMarketIndexes
                 : envPerpMarketIndexes;
@@ -119,7 +115,7 @@ class DriftClient {
         }
     }
     createUser(subAccountId, accountSubscriptionConfig) {
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, subAccountId);
+        const userAccountPublicKey = pda_1.getUserAccountPublicKeySync(this.program.programId, this.authority, subAccountId);
         return new user_1.User({
             driftClient: this,
             userAccountPublicKey,
@@ -164,14 +160,14 @@ class DriftClient {
         if (this.statePublicKey) {
             return this.statePublicKey;
         }
-        this.statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
+        this.statePublicKey = await pda_1.getDriftStateAccountPublicKey(this.program.programId);
         return this.statePublicKey;
     }
     getSignerPublicKey() {
         if (this.signerPublicKey) {
             return this.signerPublicKey;
         }
-        this.signerPublicKey = (0, pda_1.getDriftSignerPublicKey)(this.program.programId);
+        this.signerPublicKey = pda_1.getDriftSignerPublicKey(this.program.programId);
         return this.signerPublicKey;
     }
     getStateAccount() {
@@ -232,7 +228,7 @@ class DriftClient {
         return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey);
     }
     async getSerumV3FulfillmentConfig(serumMarket) {
-        const address = await (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
+        const address = await pda_1.getSerumFulfillmentConfigPublicKey(this.program.programId, serumMarket);
         return (await this.program.account.serumV3FulfillmentConfig.fetch(address));
     }
     /**
@@ -256,7 +252,7 @@ class DriftClient {
                 await this.userStats.unsubscribe();
                 this.userStats = new userStats_1.UserStats({
                     driftClient: this,
-                    userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority),
+                    userStatsAccountPublicKey: pda_1.getUserStatsAccountPublicKey(this.program.programId, this.authority),
                     accountSubscription: this.userAccountSubscriptionConfig,
                 });
             }
@@ -296,7 +292,7 @@ class DriftClient {
         return [txSig, userAccountPublicKey];
     }
     async getInitializeUserInstructions(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
-        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, subAccountId);
+        const userAccountPublicKey = await pda_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey, subAccountId);
         const remainingAccounts = new Array();
         if (referrerInfo !== undefined) {
             remainingAccounts.push({
@@ -319,7 +315,7 @@ class DriftClient {
                 isSigner: false,
             });
         }
-        const nameBuffer = (0, userName_1.encodeName)(name);
+        const nameBuffer = userName_1.encodeName(name);
         const initializeUserAccountIx = await this.program.instruction.initializeUser(subAccountId, nameBuffer, {
             accounts: {
                 user: userAccountPublicKey,
@@ -347,8 +343,8 @@ 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);
+        const userAccountPublicKey = pda_1.getUserAccountPublicKeySync(this.program.programId, this.wallet.publicKey, subAccountId);
+        const nameBuffer = userName_1.encodeName(name);
         const tx = await this.program.transaction.updateUserName(subAccountId, nameBuffer, {
             accounts: {
                 user: userAccountPublicKey,
@@ -369,7 +365,7 @@ class DriftClient {
         return txSig;
     }
     async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        const userAccountPublicKey = pda_1.getUserAccountPublicKeySync(this.program.programId, this.wallet.publicKey, subAccountId);
         const tx = await this.program.transaction.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
             accounts: {
                 user: userAccountPublicKey,
@@ -415,7 +411,7 @@ class DriftClient {
     }
     async deleteUser(subAccountId = 0) {
         var _a;
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        const userAccountPublicKey = pda_1.getUserAccountPublicKeySync(this.program.programId, this.wallet.publicKey, subAccountId);
         const ix = await this.program.instruction.deleteUser({
             accounts: {
                 user: userAccountPublicKey,
@@ -424,7 +420,7 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix), [], this.opts);
+        const { txSig } = await this.sendTransaction(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;
@@ -446,7 +442,7 @@ class DriftClient {
         if (this.userStatsAccountPublicKey) {
             return this.userStatsAccountPublicKey;
         }
-        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
+        this.userStatsAccountPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, this.authority);
         return this.userStatsAccountPublicKey;
     }
     async getUserAccountPublicKey() {
@@ -472,7 +468,7 @@ class DriftClient {
     getQuoteAssetTokenAmount() {
         const spotMarket = this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         const spotPosition = this.getSpotPosition(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
+        return spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
     }
     getTokenAmount(marketIndex) {
         const spotPosition = this.getSpotPosition(marketIndex);
@@ -480,7 +476,7 @@ class DriftClient {
             return numericConstants_1.ZERO;
         }
         const spotMarket = this.getSpotMarketAccount(marketIndex);
-        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
+        return spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
     }
     getRemainingAccounts(params) {
         var _a;
@@ -604,7 +600,7 @@ class DriftClient {
         const perpMarketAccountMap = new Map();
         for (const userAccount of userAccounts) {
             for (const spotPosition of userAccount.spotPositions) {
-                if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
+                if (!spotPosition_1.isSpotPositionAvailable(spotPosition)) {
                     const spotMarket = this.getSpotMarketAccount(spotPosition.marketIndex);
                     spotMarketAccountMap.set(spotPosition.marketIndex, {
                         pubkey: spotMarket.pubkey,
@@ -629,7 +625,7 @@ class DriftClient {
                 }
             }
             for (const position of userAccount.perpPositions) {
-                if (!(0, position_1.positionIsAvailable)(position)) {
+                if (!position_1.positionIsAvailable(position)) {
                     const market = this.getPerpMarketAccount(position.marketIndex);
                     perpMarketAccountMap.set(position.marketIndex, {
                         pubkey: market.pubkey,
@@ -689,7 +685,7 @@ class DriftClient {
     }
     async getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, reduceOnly = false, userInitialized = true) {
         const userAccountPublicKey = subAccountId
-            ? await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId)
+            ? await pda_1.getUserAccountPublicKey(this.program.programId, this.authority, subAccountId)
             : await this.getUserAccountPublicKey();
         let remainingAccounts = [];
         if (userInitialized) {
@@ -875,7 +871,7 @@ class DriftClient {
         });
     }
     async transferDeposit(amount, marketIndex, fromSubAccountId, toSubAccountId) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId)), [], this.opts);
         if (fromSubAccountId === this.activeSubAccountId ||
             toSubAccountId === this.activeSubAccountId) {
             this.spotMarketLastSlotCache.set(marketIndex, slot);
@@ -883,8 +879,8 @@ class DriftClient {
         return txSig;
     }
     async getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId) {
-        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
-        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
+        const fromUser = await pda_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey, fromSubAccountId);
+        const toUser = await pda_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey, toSubAccountId);
         let remainingAccounts;
         if (this.users.has(fromSubAccountId)) {
             remainingAccounts = this.getRemainingAccounts({
@@ -894,7 +890,7 @@ class DriftClient {
             });
         }
         else {
-            const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, fromSubAccountId);
+            const userAccountPublicKey = pda_1.getUserAccountPublicKeySync(this.program.programId, this.authority, fromSubAccountId);
             const fromUserAccount = (await this.program.account.user.fetch(userAccountPublicKey));
             remainingAccounts = this.getRemainingAccounts({
                 userAccounts: [fromUserAccount],
@@ -915,7 +911,7 @@ class DriftClient {
         });
     }
     async updateSpotMarketCumulativeInterest(marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.updateSpotMarketCumulativeInterestIx(marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.updateSpotMarketCumulativeInterestIx(marketIndex)), [], this.opts);
         return txSig;
     }
     async updateSpotMarketCumulativeInterestIx(marketIndex) {
@@ -929,7 +925,7 @@ class DriftClient {
         });
     }
     async settleLP(settleeUserAccountPublicKey, marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex)), [], this.opts);
         return txSig;
     }
     async settleLPIx(settleeUserAccountPublicKey, marketIndex) {
@@ -947,11 +943,11 @@ class DriftClient {
         });
     }
     async removePerpLpShares(marketIndex, sharesToBurn) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn)), [], this.opts);
         return txSig;
     }
     async removePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn)), [], this.opts);
         return txSig;
     }
     async getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
@@ -997,7 +993,7 @@ class DriftClient {
         });
     }
     async addPerpLpShares(amount, marketIndex) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getAddPerpLpSharesIx(amount, marketIndex)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getAddPerpLpSharesIx(amount, marketIndex)), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -1041,8 +1037,8 @@ class DriftClient {
     async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
-        const marketOrderTx = (0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams));
-        const fillTx = (0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
+        const marketOrderTx = utils_1.wrapInTx(await this.getPlacePerpOrderIx(orderParams));
+        const fillTx = utils_1.wrapInTx(await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
             orderId,
             marketIndex,
         }, makerInfo));
@@ -1058,7 +1054,7 @@ class DriftClient {
         return { txSig, signedFillTx };
     }
     async placePerpOrder(orderParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getPlacePerpOrderIx(orderParams)), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1086,7 +1082,7 @@ class DriftClient {
         });
     }
     async updateAMMs(marketIndexes) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateAMMsIx(marketIndexes)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getUpdateAMMsIx(marketIndexes)), [], this.opts);
         return txSig;
     }
     async getUpdateAMMsIx(marketIndexes) {
@@ -1120,7 +1116,7 @@ class DriftClient {
         });
     }
     async settleExpiredMarket(marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getSettleExpiredMarketIx(marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getSettleExpiredMarketIx(marketIndex)), [], this.opts);
         return txSig;
     }
     async getSettleExpiredMarketIx(marketIndex) {
@@ -1155,8 +1151,8 @@ class DriftClient {
         });
     }
     async settleExpiredMarketPoolsToRevenuePool(perpMarketIndex) {
-        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const spotMarketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const spotMarketPublicKey = await pda_1.getSpotMarketPublicKey(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         const ix = await this.program.instruction.settleExpiredMarketPoolsToRevenuePool({
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -1165,11 +1161,11 @@ class DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(ix), [], this.opts);
         return txSig;
     }
     async cancelOrder(orderId) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrderIx(orderId)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getCancelOrderIx(orderId)), [], this.opts);
         return txSig;
     }
     async getCancelOrderIx(orderId) {
@@ -1188,7 +1184,7 @@ class DriftClient {
         });
     }
     async cancelOrderByUserId(userOrderId) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
         return txSig;
     }
     async getCancelOrderByUserIdIx(userOrderId) {
@@ -1210,7 +1206,7 @@ class DriftClient {
         });
     }
     async cancelOrders(marketType, marketIndex, direction) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrdersIx(marketType, marketIndex, direction)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getCancelOrdersIx(marketType, marketIndex, direction)), [], this.opts);
         return txSig;
     }
     async getCancelOrdersIx(marketType, marketIndex, direction) {
@@ -1218,10 +1214,10 @@ class DriftClient {
         let readablePerpMarketIndex = undefined;
         let readableSpotMarketIndexes = undefined;
         if (marketIndex) {
-            if (marketType && (0, types_1.isVariant)(marketType, 'perp')) {
+            if (marketType && types_1.isVariant(marketType, 'perp')) {
                 readablePerpMarketIndex = marketIndex;
             }
-            else if (marketType && (0, types_1.isVariant)(marketType, 'spot')) {
+            else if (marketType && types_1.isVariant(marketType, 'spot')) {
                 readableSpotMarketIndexes = [marketIndex];
             }
         }
@@ -1241,11 +1237,11 @@ class DriftClient {
         });
     }
     async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
         return txSig;
     }
     async getFillPerpOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const fillerPublicKey = await this.getUserAccountPublicKey();
         const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
         const marketIndex = order
@@ -1298,7 +1294,7 @@ class DriftClient {
         });
     }
     async placeSpotOrder(orderParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceSpotOrderIx(orderParams)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(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;
@@ -1324,12 +1320,12 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async fillSpotOrder(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillSpotOrderIx(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
+    async fillSpotOrder(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo, txParams) {
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getFillSpotOrderIx(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         return txSig;
     }
     async getFillSpotOrderIx(userAccountPublicKey, userAccount, order, fulfillmentConfig, makerInfo, referrerInfo) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const fillerPublicKey = await this.getUserAccountPublicKey();
         const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
         const marketIndex = order
@@ -1451,7 +1447,7 @@ class DriftClient {
             isSigner: false,
         });
         remainingAccounts.push({
-            pubkey: (0, pda_1.getSerumSignerPublicKey)(fulfillmentConfig.serumProgramId, fulfillmentConfig.serumMarket, fulfillmentConfig.serumSignerNonce),
+            pubkey: pda_1.getSerumSignerPublicKey(fulfillmentConfig.serumProgramId, fulfillmentConfig.serumMarket, fulfillmentConfig.serumSignerNonce),
             isWritable: false,
             isSigner: false,
         });
@@ -1482,13 +1478,13 @@ class DriftClient {
         });
     }
     async triggerOrder(userAccountPublicKey, user, order) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTriggerOrderIx(userAccountPublicKey, user, order)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getTriggerOrderIx(userAccountPublicKey, user, order)), [], this.opts);
         return txSig;
     }
     async getTriggerOrderIx(userAccountPublicKey, userAccount, order) {
         const fillerPublicKey = await this.getUserAccountPublicKey();
         let remainingAccountsParams;
-        if ((0, types_1.isVariant)(order.marketType, 'perp')) {
+        if (types_1.isVariant(order.marketType, 'perp')) {
             remainingAccountsParams = {
                 userAccounts: [userAccount],
                 writablePerpMarketIndexes: [order.marketIndex],
@@ -1513,7 +1509,7 @@ class DriftClient {
         });
     }
     async forceCancelOrders(userAccountPublicKey, user) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getForceCancelOrdersIx(userAccountPublicKey, user)), [], this.opts);
+        const { txSig } = await this.txSender.send(utils_1.wrapInTx(await this.getForceCancelOrdersIx(userAccountPublicKey, user)), [], this.opts);
         return txSig;
     }
     async getForceCancelOrdersIx(userAccountPublicKey, userAccount) {
@@ -1533,7 +1529,7 @@ class DriftClient {
         });
     }
     async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1587,7 +1583,7 @@ class DriftClient {
         });
     }
     async placeAndMakePerpOrder(orderParams, takerInfo, referrerInfo) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1625,8 +1621,8 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async placeAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
+    async placeAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo, txParams) {
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -1685,7 +1681,7 @@ class DriftClient {
         });
     }
     async placeAndMakeSpotOrder(orderParams, takerInfo, fulfillmentConfig, referrerInfo) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, fulfillmentConfig, referrerInfo)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(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;
@@ -1741,7 +1737,7 @@ class DriftClient {
         return await this.placeAndTakePerpOrder({
             orderType: types_1.OrderType.MARKET,
             marketIndex,
-            direction: (0, position_1.findDirectionToClose)(userPosition),
+            direction: position_1.findDirectionToClose(userPosition),
             baseAssetAmount: userPosition.baseAssetAmount.abs(),
             reduceOnly: true,
             price: limitPrice,
@@ -1809,7 +1805,7 @@ class DriftClient {
         return txSig;
     }
     async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex)), [], this.opts);
         return txSig;
     }
     async settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
@@ -1829,12 +1825,12 @@ class DriftClient {
         });
     }
     async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(utils_1.wrapInTx(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice)), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
     async getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -1855,13 +1851,13 @@ class DriftClient {
         });
     }
     async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(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;
     }
     async getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -1882,13 +1878,13 @@ class DriftClient {
         });
     }
     async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(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;
     }
     async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -1909,13 +1905,13 @@ class DriftClient {
         });
     }
     async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice)), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(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;
     }
     async getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -1936,11 +1932,11 @@ class DriftClient {
         });
     }
     async resolvePerpBankruptcy(userAccountPublicKey, userAccount, marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
         return txSig;
     }
     async getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -1966,11 +1962,11 @@ class DriftClient {
         });
     }
     async resolveSpotBankruptcy(userAccountPublicKey, userAccount, marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
         return txSig;
     }
     async getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const userStatsPublicKey = pda_1.getUserStatsAccountPublicKey(this.program.programId, userAccount.authority);
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const liquidatorStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
@@ -1995,11 +1991,11 @@ class DriftClient {
         });
     }
     async updateFundingRate(perpMarketIndex, oracle) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(perpMarketIndex, oracle)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getUpdateFundingRateIx(perpMarketIndex, oracle)), [], this.opts);
         return txSig;
     }
     async getUpdateFundingRateIx(perpMarketIndex, oracle) {
-        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
+        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
         return await this.program.instruction.updateFundingRate(perpMarketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -2009,14 +2005,14 @@ class DriftClient {
         });
     }
     async settleFundingPayment(userAccountPublicKey) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getSettleFundingPaymentIx(userAccountPublicKey)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getSettleFundingPaymentIx(userAccountPublicKey)), [], this.opts);
         return txSig;
     }
     async getSettleFundingPaymentIx(userAccountPublicKey) {
         const userAccount = (await this.program.account.user.fetch(userAccountPublicKey));
         const writablePerpMarketIndexes = [];
         for (const position of userAccount.perpPositions) {
-            if (!(0, position_1.positionIsAvailable)(position)) {
+            if (!position_1.positionIsAvailable(position)) {
                 writablePerpMarketIndexes.push(position.marketIndex);
             }
         }
@@ -2046,11 +2042,11 @@ class DriftClient {
         return oracleData;
     }
     async initializeInsuranceFundStake(marketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getInitializeInsuranceFundStakeIx(marketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getInitializeInsuranceFundStakeIx(marketIndex)), [], this.opts);
         return txSig;
     }
     async getInitializeInsuranceFundStakeIx(marketIndex) {
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
+        const ifStakeAccountPublicKey = pda_1.getInsuranceFundStakeAccountPublicKey(this.program.programId, this.wallet.publicKey, marketIndex);
         return await this.program.instruction.initializeInsuranceFundStake(marketIndex, {
             accounts: {
                 insuranceFundStake: ifStakeAccountPublicKey,
@@ -2066,7 +2062,7 @@ class DriftClient {
     }
     async addInsuranceFundStake(marketIndex, amount, collateralAccountPublicKey) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
+        const ifStakeAccountPublicKey = pda_1.getInsuranceFundStakeAccountPublicKey(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
@@ -2092,7 +2088,7 @@ class DriftClient {
     }
     async requestRemoveInsuranceFundStake(marketIndex, amount) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
+        const ifStakeAccountPublicKey = pda_1.getInsuranceFundStakeAccountPublicKey(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
@@ -2114,7 +2110,7 @@ class DriftClient {
     }
     async cancelRequestRemoveInsuranceFundStake(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
+        const ifStakeAccountPublicKey = pda_1.getInsuranceFundStakeAccountPublicKey(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
@@ -2136,7 +2132,7 @@ class DriftClient {
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
+        const ifStakeAccountPublicKey = pda_1.getInsuranceFundStakeAccountPublicKey(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
@@ -2181,7 +2177,7 @@ class DriftClient {
         return txSig;
     }
     async resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex)), [], this.opts);
+        const { txSig } = await this.sendTransaction(utils_1.wrapInTx(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex)), [], this.opts);
         return txSig;
     }
     async getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex) {