@drift-labs/sdk 0.1.22 → 0.1.23-master.3

package/lib/accounts/bulkAccountLoader.js

@@ -23,7 +23,7 @@ class BulkAccountLoader {
     }
     addAccount(publicKey, callback) {
         const existingSize = this.accountsToLoad.size;
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.set(callbackId, callback);
@@ -57,7 +57,7 @@ class BulkAccountLoader {
         }
     }
     addErrorCallbacks(callback) {
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         this.errorCallbacks.set(callbackId, callback);
         return callbackId;
     }

package/lib/accounts/bulkUserSubscription.js

@@ -16,8 +16,46 @@ exports.bulkPollingUserSubscribe = void 0;
  */
 function bulkPollingUserSubscribe(users, accountLoader) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (users.length === 0) {
+            yield accountLoader.load();
+            return;
+        }
+        // Fetch all the accounts first
+        const program = users[0].clearingHouse.program;
+        let userProgramAccounts;
+        let orderProgramAccounts;
+        yield Promise.all([
+            (() => __awaiter(this, void 0, void 0, function* () {
+                userProgramAccounts = yield program.account.user.all();
+            }))(),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                orderProgramAccounts = yield program.account.userOrders.all();
+            }))(),
+        ]);
+        // Create a map of the authority to keys
+        const authorityToKeys = new Map();
+        const userToAuthority = new Map();
+        for (const userProgramAccount of userProgramAccounts) {
+            const userAccountPublicKey = userProgramAccount.publicKey;
+            const userAccount = userProgramAccount.account;
+            authorityToKeys.set(userAccount.authority.toString(), {
+                user: userAccountPublicKey,
+                userPositions: userAccount.positions,
+                userOrders: undefined,
+            });
+            userToAuthority.set(userAccountPublicKey.toString(), userAccount.authority.toString());
+        }
+        for (const orderProgramAccount of orderProgramAccounts) {
+            const userOrderAccountPublicKey = orderProgramAccount.publicKey;
+            const userOrderAccount = orderProgramAccount.account;
+            const authority = userToAuthority.get(userOrderAccount.user.toString());
+            const userPublicKeys = authorityToKeys.get(authority);
+            userPublicKeys.userOrders = userOrderAccountPublicKey;
+        }
         yield Promise.all(users.map((user) => {
-            return user.accountSubscriber.addToAccountLoader();
+            // Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
+            const userPublicKeys = authorityToKeys.get(user.authority.toString());
+            return user.accountSubscriber.addToAccountLoader(userPublicKeys);
         }));
         yield accountLoader.load();
         yield Promise.all(users.map((user) => __awaiter(this, void 0, void 0, function* () {

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -54,7 +54,7 @@ class PollingClearingHouseAccountSubscriber {
             if (this.accountsToPoll.size > 0) {
                 return;
             }
-            const statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             const state = (yield this.program.account.state.fetch(statePublicKey));
             this.accountsToPoll.set(statePublicKey.toString(), {
                 key: 'state',
@@ -127,7 +127,7 @@ class PollingClearingHouseAccountSubscriber {
         return __awaiter(this, void 0, void 0, function* () {
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer) => {
-                    const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                     this[accountToPoll.key] = account;
                     // @ts-ignore
                     this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -145,7 +145,7 @@ class PollingClearingHouseAccountSubscriber {
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 const buffer = this.accountLoader.getAccountData(accountToPoll.publicKey);
                 if (buffer) {
-                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 }
             }
         });

package/lib/accounts/pollingTokenAccountSubscriber.js

@@ -37,7 +37,7 @@ class PollingTokenAccountSubscriber {
             return;
         }
         this.callbackId = this.accountLoader.addAccount(this.publicKey, (buffer) => {
-            const tokenAccount = token_1.parseTokenAccount(buffer);
+            const tokenAccount = (0, token_1.parseTokenAccount)(buffer);
             this.tokenAccount = tokenAccount;
             // @ts-ignore
             this.eventEmitter.emit('tokenAccountUpdate', tokenAccount);
@@ -51,7 +51,7 @@ class PollingTokenAccountSubscriber {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.accountLoader.load();
             const buffer = this.accountLoader.getAccountData(this.publicKey);
-            this.tokenAccount = token_1.parseTokenAccount(buffer);
+            this.tokenAccount = (0, token_1.parseTokenAccount)(buffer);
         });
     }
     unsubscribe() {

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { AccountToPoll, UserAccountEvents, UserAccountSubscriber } from './types';
+import { AccountToPoll, UserAccountEvents, UserAccountSubscriber, UserPublicKeys } from './types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -21,7 +21,7 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     type: ClearingHouseConfigType;
     constructor(program: Program, authority: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(): Promise<boolean>;
-    addToAccountLoader(): Promise<void>;
+    addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -36,35 +36,56 @@ class PollingUserAccountSubscriber {
             return true;
         });
     }
-    addToAccountLoader() {
+    addToAccountLoader(userPublicKeys) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.accountsToPoll.size > 0) {
                 return;
             }
-            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
-            const userAccount = (yield this.program.account.user.fetch(userPublicKey));
-            this.accountsToPoll.set(userPublicKey.toString(), {
-                key: 'user',
-                publicKey: userPublicKey,
-                eventType: 'userAccountData',
-            });
-            this.accountsToPoll.set(userAccount.positions.toString(), {
-                key: 'userPositions',
-                publicKey: userAccount.positions,
-                eventType: 'userPositionsData',
-            });
-            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
-            const userOrdersExist = (yield this.program.provider.connection.getParsedAccountInfo(userOrdersPublicKey)).value !== null;
-            if (userOrdersExist) {
+            if (!userPublicKeys) {
+                const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
+                const userAccount = (yield this.program.account.user.fetch(userPublicKey));
+                this.accountsToPoll.set(userPublicKey.toString(), {
+                    key: 'user',
+                    publicKey: userPublicKey,
+                    eventType: 'userAccountData',
+                });
+                this.accountsToPoll.set(userAccount.positions.toString(), {
+                    key: 'userPositions',
+                    publicKey: userAccount.positions,
+                    eventType: 'userPositionsData',
+                });
+                const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
                 this.accountsToPoll.set(userOrdersPublicKey.toString(), {
                     key: 'userOrders',
                     publicKey: userOrdersPublicKey,
                     eventType: 'userOrdersData',
                 });
             }
+            else {
+                this.accountsToPoll.set(userPublicKeys.user.toString(), {
+                    key: 'user',
+                    publicKey: userPublicKeys.user,
+                    eventType: 'userAccountData',
+                });
+                this.accountsToPoll.set(userPublicKeys.userPositions.toString(), {
+                    key: 'userPositions',
+                    publicKey: userPublicKeys.userPositions,
+                    eventType: 'userPositionsData',
+                });
+                if (userPublicKeys.userOrders) {
+                    this.accountsToPoll.set(userPublicKeys.userOrders.toString(), {
+                        key: 'userOrders',
+                        publicKey: userPublicKeys.userOrders,
+                        eventType: 'userOrdersData',
+                    });
+                }
+            }
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer) => {
-                    const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    if (!buffer) {
+                        return;
+                    }
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                     this[accountToPoll.key] = account;
                     // @ts-ignore
                     this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -96,7 +117,7 @@ class PollingUserAccountSubscriber {
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 const buffer = this.accountLoader.getAccountData(accountToPoll.publicKey);
                 if (buffer) {
-                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 }
             }
         });

package/lib/accounts/types.d.ts

@@ -48,6 +48,11 @@ export interface ClearingHouseAccountSubscriber {
     getOrderHistoryAccount(): OrderHistoryAccount;
     type: ClearingHouseConfigType;
 }
+export declare type UserPublicKeys = {
+    user: PublicKey;
+    userPositions: PublicKey;
+    userOrders: PublicKey | undefined;
+};
 export interface UserAccountEvents {
     userAccountData: (payload: UserAccount) => void;
     userPositionsData: (payload: UserPositionsAccount) => void;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -47,7 +47,7 @@ class WebSocketAccountSubscriber {
                 slot: newSlot,
             };
             if (newBuffer) {
-                this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+                this.data = this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), newBuffer);
                 this.onChange(this.data);
             }
             return;
@@ -61,7 +61,7 @@ class WebSocketAccountSubscriber {
                 buffer: newBuffer,
                 slot: newSlot,
             };
-            this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+            this.data = this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), newBuffer);
             this.onChange(this.data);
         }
     }

package/lib/accounts/webSocketClearingHouseAccountSubscriber.js

@@ -35,7 +35,7 @@ class WebSocketClearingHouseAccountSubscriber {
             this.subscriptionPromise = new Promise((res) => {
                 this.subscriptionPromiseResolver = res;
             });
-            const statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             // create and activate main state account subscription
             this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
             yield this.stateAccountSubscriber.subscribe((data) => {

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -27,7 +27,7 @@ class WebSocketUserAccountSubscriber {
             if (this.isSubscribed) {
                 return true;
             }
-            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+            const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
             this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, userPublicKey);
             yield this.userDataAccountSubscriber.subscribe((data) => {
                 this.eventEmitter.emit('userAccountData', data);
@@ -39,7 +39,7 @@ class WebSocketUserAccountSubscriber {
                 this.eventEmitter.emit('userPositionsData', data);
                 this.eventEmitter.emit('update');
             });
-            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+            const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
             this.userOrdersAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userOrders', this.program, userOrdersPublicKey);
             yield this.userOrdersAccountSubscriber.subscribe((data) => {
                 this.eventEmitter.emit('userOrdersData', data);

package/lib/admin.js

@@ -41,8 +41,8 @@ const amm_1 = require("./math/amm");
 const clearingHouse_2 = require("./factory/clearingHouse");
 class Admin extends clearingHouse_1.ClearingHouse {
     static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
-        const config = clearingHouse_2.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
-        return clearingHouse_2.getAdmin(config);
+        const config = (0, clearingHouse_2.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
+        return (0, clearingHouse_2.getAdmin)(config);
     }
     initialize(usdcMint, adminControlsPrices) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -61,7 +61,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
             const tradeHistory = anchor.web3.Keypair.generate();
             const liquidationHistory = anchor.web3.Keypair.generate();
             const curveHistory = anchor.web3.Keypair.generate();
-            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield addresses_1.getClearingHouseStateAccountPublicKeyAndNonce(this.program.programId);
+            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield (0, addresses_1.getClearingHouseStateAccountPublicKeyAndNonce)(this.program.programId);
             const initializeTx = yield this.program.transaction.initialize(clearingHouseNonce, collateralVaultNonce, insuranceVaultNonce, adminControlsPrices, {
                 accounts: {
                     admin: this.wallet.publicKey,
@@ -118,8 +118,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
     initializeOrderState() {
         return __awaiter(this, void 0, void 0, function* () {
             const orderHistory = anchor.web3.Keypair.generate();
-            const [orderStatePublicKey, orderStateNonce] = yield addresses_1.getOrderStateAccountPublicKeyAndNonce(this.program.programId);
-            const clearingHouseStatePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const [orderStatePublicKey, orderStateNonce] = yield (0, addresses_1.getOrderStateAccountPublicKeyAndNonce)(this.program.programId);
+            const clearingHouseStatePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             const initializeOrderStateTx = yield this.program.transaction.initializeOrderState(orderStateNonce, {
                 accounts: {
                     admin: this.wallet.publicKey,
@@ -202,8 +202,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
     moveAmmToPrice(marketIndex, targetPrice) {
         return __awaiter(this, void 0, void 0, function* () {
             const market = this.getMarket(marketIndex);
-            const [direction, tradeSize, _] = trade_1.calculateTargetPriceTrade(market, targetPrice);
-            const [newQuoteAssetAmount, newBaseAssetAmount] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'quote', tradeSize, amm_1.getSwapDirection('quote', direction));
+            const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(market, targetPrice);
+            const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
             const state = this.getStateAccount();
             return yield this.program.rpc.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, marketIndex, {
                 accounts: {

package/lib/clearingHouse.js

@@ -38,7 +38,6 @@ const anchor = __importStar(require("@project-serum/anchor"));
 const clearing_house_json_1 = __importDefault(require("./idl/clearing_house.json"));
 const web3_js_1 = require("@solana/web3.js");
 const addresses_1 = require("./addresses");
-const defaultTxSender_1 = require("./tx/defaultTxSender");
 const utils_1 = require("./tx/utils");
 const clearingHouse_1 = require("./factory/clearingHouse");
 /**
@@ -74,8 +73,8 @@ class ClearingHouse {
      * @returns
      */
     static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
-        const config = clearingHouse_1.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
-        return clearingHouse_1.getClearingHouse(config);
+        const config = (0, clearingHouse_1.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
+        return (0, clearingHouse_1.getClearingHouse)(config);
     }
     /**
      *
@@ -127,7 +126,7 @@ class ClearingHouse {
             if (this.statePublicKey) {
                 return this.statePublicKey;
             }
-            this.statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            this.statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             return this.statePublicKey;
         });
     }
@@ -169,7 +168,7 @@ class ClearingHouse {
             if (this.orderStatePublicKey) {
                 return this.orderStatePublicKey;
             }
-            this.orderStatePublicKey = yield addresses_1.getOrderStateAccountPublicKey(this.program.programId);
+            this.orderStatePublicKey = yield (0, addresses_1.getOrderStateAccountPublicKey)(this.program.programId);
             return this.orderStatePublicKey;
         });
     }
@@ -183,11 +182,11 @@ class ClearingHouse {
     updateWallet(newWallet) {
         const newProvider = new anchor_1.Provider(this.connection, newWallet, this.opts);
         const newProgram = new anchor_1.Program(clearing_house_json_1.default, this.program.programId, newProvider);
-        const newTxSender = new defaultTxSender_1.DefaultTxSender(newProvider);
+        // Update provider for txSender with new wallet details
+        this.txSender.provider = newProvider;
         this.wallet = newWallet;
         this.provider = newProvider;
         this.program = newProgram;
-        this.txSender = newTxSender;
         this.userAccountPublicKey = undefined;
         this.userAccount = undefined;
     }
@@ -203,7 +202,7 @@ class ClearingHouse {
     }
     getInitializeUserInstructions() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userAccountPublicKey, userAccountNonce] = yield addresses_1.getUserAccountPublicKeyAndNonce(this.program.programId, this.wallet.publicKey);
+            const [userAccountPublicKey, userAccountNonce] = yield (0, addresses_1.getUserAccountPublicKeyAndNonce)(this.program.programId, this.wallet.publicKey);
             const remainingAccounts = [];
             const optionalAccounts = {
                 whitelistToken: false,
@@ -244,7 +243,7 @@ class ClearingHouse {
             if (!userAccountPublicKey) {
                 userAccountPublicKey = yield this.getUserAccountPublicKey();
             }
-            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield addresses_1.getUserOrdersAccountPublicKeyAndNonce(this.program.programId, userAccountPublicKey);
+            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield (0, addresses_1.getUserOrdersAccountPublicKeyAndNonce)(this.program.programId, userAccountPublicKey);
             return yield this.program.instruction.initializeUserOrders(userOrdersAccountNonce, {
                 accounts: {
                     user: userAccountPublicKey,
@@ -266,7 +265,7 @@ class ClearingHouse {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey);
+            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey);
             return this.userAccountPublicKey;
         });
     }
@@ -288,7 +287,7 @@ class ClearingHouse {
             if (this.userOrdersAccountPublicKey) {
                 return this.userOrdersAccountPublicKey;
             }
-            this.userOrdersAccountPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, yield this.getUserAccountPublicKey());
+            this.userOrdersAccountPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, yield this.getUserAccountPublicKey());
             return this.userOrdersAccountPublicKey;
         });
     }
@@ -381,7 +380,7 @@ class ClearingHouse {
     }
     withdrawCollateral(amount, collateralAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
         });
     }
     getWithdrawCollateralIx(amount, collateralAccountPublicKey) {
@@ -410,7 +409,7 @@ class ClearingHouse {
     }
     openPosition(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
         });
     }
     getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
@@ -476,7 +475,7 @@ class ClearingHouse {
     }
     placeOrder(orderParams, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getPlaceOrderIx(orderParams, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getPlaceOrderIx(orderParams, discountToken, referrer)), [], this.opts);
         });
     }
     getPlaceOrderIx(orderParams, discountToken, referrer) {
@@ -528,7 +527,7 @@ class ClearingHouse {
     }
     cancelOrder(orderId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderIx(orderId)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelOrderIx(orderId)), [], this.opts);
         });
     }
     getCancelOrderIx(orderId) {
@@ -555,7 +554,7 @@ class ClearingHouse {
     }
     cancelOrderByUserId(userOrderId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
         });
     }
     getCancelOrderByUserIdIx(userOrderId) {
@@ -582,7 +581,7 @@ class ClearingHouse {
     }
     fillOrder(userAccountPublicKey, userOrdersAccountPublicKey, order) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order)), [], this.opts);
         });
     }
     getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order) {
@@ -640,7 +639,7 @@ class ClearingHouse {
     }
     placeAndFillOrder(orderParams, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer)), [], this.opts);
         });
     }
     getPlaceAndFillOrderIx(orderParams, discountToken, referrer) {
@@ -701,7 +700,7 @@ class ClearingHouse {
      */
     closePosition(marketIndex, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send(utils_1.wrapInTx(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
         });
     }
     getClosePositionIx(marketIndex, discountToken, referrer) {
@@ -749,7 +748,7 @@ class ClearingHouse {
     }
     liquidate(liquidateeUserAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
         });
     }
     getLiquidateIx(liquidateeUserAccountPublicKey) {
@@ -793,7 +792,7 @@ class ClearingHouse {
     }
     updateFundingRate(oracle, marketIndex) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
         });
     }
     getUpdateFundingRateIx(oracle, marketIndex) {
@@ -811,7 +810,7 @@ class ClearingHouse {
     }
     settleFundingPayment(userAccount, userPositionsAccount) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send(utils_1.wrapInTx(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
+            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
         });
     }
     getSettleFundingPaymentIx(userAccount, userPositionsAccount) {