@drift-labs/sdk 0.1.24 → 0.1.25-master.0

package/lib/accounts/bulkAccountLoader.d.ts

@@ -16,6 +16,7 @@ export declare class BulkAccountLoader {
     loadPromise?: Promise<void>;
     loadPromiseResolver: () => void;
     loggingEnabled: boolean;
+    lastUpdate: number;
     constructor(connection: Connection, commitment: Commitment, pollingFrequency: number);
     addAccount(publicKey: PublicKey, callback: (buffer: Buffer) => void): string;
     removeAccount(publicKey: PublicKey, callbackId: string): void;

package/lib/accounts/bulkAccountLoader.js

@@ -10,21 +10,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BulkAccountLoader = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const uuid_1 = require("uuid");
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
+const fiveMinutes = 5 * 60 * 1000;
 class BulkAccountLoader {
     constructor(connection, commitment, pollingFrequency) {
         this.accountsToLoad = new Map();
         this.accountData = new Map();
         this.errorCallbacks = new Map();
         this.loggingEnabled = false;
+        this.lastUpdate = Date.now();
         this.connection = connection;
         this.commitment = commitment;
         this.pollingFrequency = pollingFrequency;
     }
     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);
@@ -58,7 +61,7 @@ class BulkAccountLoader {
         }
     }
     addErrorCallbacks(callback) {
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         this.errorCallbacks.set(callbackId, callback);
         return callbackId;
     }
@@ -98,6 +101,15 @@ class BulkAccountLoader {
             finally {
                 this.loadPromiseResolver();
                 this.loadPromise = undefined;
+                const now = Date.now();
+                if (now - this.lastUpdate > fiveMinutes) {
+                    if (this.loggingEnabled) {
+                        console.log("Haven't seen updated account in five minutes. Bulk account loader creating new Connection Object");
+                    }
+                    this.connection = new web3_js_1.Connection(
+                    // @ts-ignore
+                    this.connection._rpcEndpoint, this.connection.commitment);
+                }
             }
         });
     }
@@ -131,6 +143,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
+                    this.lastUpdate = Date.now();
                     continue;
                 }
                 if (newSlot <= oldRPCResponse.slot) {
@@ -143,6 +156,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
+                    this.lastUpdate = Date.now();
                 }
             }
         });

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.js

@@ -42,7 +42,7 @@ class PollingUserAccountSubscriber {
                 return;
             }
             if (!userPublicKeys) {
-                const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+                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',
@@ -54,7 +54,7 @@ class PollingUserAccountSubscriber {
                     publicKey: userAccount.positions,
                     eventType: 'userPositionsData',
                 });
-                const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+                const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
                 this.accountsToPoll.set(userOrdersPublicKey.toString(), {
                     key: 'userOrders',
                     publicKey: userOrdersPublicKey,
@@ -85,7 +85,7 @@ class PollingUserAccountSubscriber {
                     if (!buffer) {
                         return;
                     }
-                    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);
@@ -117,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/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/addresses.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/admin.d.ts

@@ -11,7 +11,7 @@ export declare class Admin extends ClearingHouse {
         TransactionSignature
     ]>;
     initializeOrderState(): Promise<TransactionSignature>;
-    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
+    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateCurveHistory(): Promise<TransactionSignature>;

package/lib/admin.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -30,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Admin = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const types_1 = require("./types");
 const anchor_1 = require("@project-serum/anchor");
 const anchor = __importStar(require("@project-serum/anchor"));
 const addresses_1 = require("./addresses");
@@ -41,8 +46,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 +66,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 +123,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,
@@ -136,12 +141,12 @@ class Admin extends clearingHouse_1.ClearingHouse {
             return yield this.txSender.send(initializeOrderStateTx, [orderHistory], this.opts);
         });
     }
-    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, marginRatioInitial = 2000, marginRatioPartial = 625, marginRatioMaintenance = 500) {
+    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioPartial = 625, marginRatioMaintenance = 500) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.getMarketsAccount().markets[marketIndex.toNumber()].initialized) {
                 throw Error(`MarketIndex ${marketIndex.toNumber()} already initialized`);
             }
-            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
+            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     admin: this.wallet.publicKey,
@@ -202,8 +207,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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -73,8 +77,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);
     }
     /**
      *
@@ -126,7 +130,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;
         });
     }
@@ -168,7 +172,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;
         });
     }
@@ -189,6 +193,8 @@ class ClearingHouse {
         this.program = newProgram;
         this.userAccountPublicKey = undefined;
         this.userAccount = undefined;
+        this.userOrdersAccountPublicKey = undefined;
+        this.userOrdersExist = undefined;
     }
     initializeUserAccount() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -202,7 +208,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,
@@ -243,7 +249,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,
@@ -265,7 +271,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;
         });
     }
@@ -287,7 +293,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;
         });
     }
@@ -380,7 +386,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) {
@@ -409,7 +415,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) {
@@ -475,7 +481,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) {
@@ -527,7 +533,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) {
@@ -554,7 +560,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) {
@@ -581,7 +587,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) {
@@ -639,7 +645,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) {
@@ -700,7 +706,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) {
@@ -748,7 +754,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) {
@@ -792,7 +798,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) {
@@ -810,7 +816,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) {

package/lib/clearingHouseUser.js

@@ -39,8 +39,8 @@ class ClearingHouseUser {
     static from(clearingHouse, authority) {
         if (clearingHouse.accountSubscriber.type !== 'websocket')
             throw 'This method only works for clearing houses with a websocket account listener. Try using the getClearingHouseUser factory method to initialize a ClearingHouseUser instead';
-        const config = clearingHouseUser_1.getWebSocketClearingHouseUserConfig(clearingHouse, authority);
-        return clearingHouseUser_1.getClearingHouseUser(config);
+        const config = (0, clearingHouseUser_1.getWebSocketClearingHouseUserConfig)(clearingHouse, authority);
+        return (0, clearingHouseUser_1.getClearingHouseUser)(config);
     }
     /**
      * Subscribe to ClearingHouseUser state accounts
@@ -113,7 +113,7 @@ class ClearingHouseUser {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.clearingHouse.program.programId, this.authority);
+            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.clearingHouse.program.programId, this.authority);
             return this.userAccountPublicKey;
         });
     }
@@ -122,7 +122,7 @@ class ClearingHouseUser {
             if (this.userOrdersAccountPublicKey) {
                 return this.userOrdersAccountPublicKey;
             }
-            this.userOrdersAccountPublicKey = yield _1.getUserOrdersAccountPublicKey(this.clearingHouse.program.programId, yield this.getUserAccountPublicKey());
+            this.userOrdersAccountPublicKey = yield (0, _1.getUserOrdersAccountPublicKey)(this.clearingHouse.program.programId, yield this.getUserAccountPublicKey());
             return this.userOrdersAccountPublicKey;
         });
     }
@@ -155,7 +155,7 @@ class ClearingHouseUser {
     getInitialMarginRequirement() {
         return this.getUserPositionsAccount().positions.reduce((marginRequirement, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return marginRequirement.add(_1.calculateBaseAssetValue(market, marketPosition)
+            return marginRequirement.add((0, _1.calculateBaseAssetValue)(market, marketPosition)
                 .mul(new _1.BN(market.marginRatioInitial))
                 .div(numericConstants_1.MARGIN_PRECISION));
         }, numericConstants_1.ZERO);
@@ -166,7 +166,7 @@ class ClearingHouseUser {
     getPartialMarginRequirement() {
         return this.getUserPositionsAccount().positions.reduce((marginRequirement, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return marginRequirement.add(_1.calculateBaseAssetValue(market, marketPosition)
+            return marginRequirement.add((0, _1.calculateBaseAssetValue)(market, marketPosition)
                 .mul(new _1.BN(market.marginRatioPartial))
                 .div(numericConstants_1.MARGIN_PRECISION));
         }, numericConstants_1.ZERO);
@@ -180,7 +180,7 @@ class ClearingHouseUser {
             .positions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return pnl.add(_1.calculatePositionPNL(market, marketPosition, withFunding));
+            return pnl.add((0, _1.calculatePositionPNL)(market, marketPosition, withFunding));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -192,7 +192,7 @@ class ClearingHouseUser {
             .positions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return pnl.add(_1.calculatePositionFundingPNL(market, marketPosition));
+            return pnl.add((0, _1.calculatePositionFundingPNL)(market, marketPosition));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -210,7 +210,7 @@ class ClearingHouseUser {
     getTotalPositionValue() {
         return this.getUserPositionsAccount().positions.reduce((positionValue, marketPosition) => {
             const market = this.clearingHouse.getMarket(marketPosition.marketIndex);
-            return positionValue.add(_1.calculateBaseAssetValue(market, marketPosition));
+            return positionValue.add((0, _1.calculateBaseAssetValue)(market, marketPosition));
         }, numericConstants_1.ZERO);
     }
     /**
@@ -220,7 +220,7 @@ class ClearingHouseUser {
     getPositionValue(marketIndex) {
         const userPosition = this.getUserPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.clearingHouse.getMarket(userPosition.marketIndex);
-        return _1.calculateBaseAssetValue(market, userPosition);
+        return (0, _1.calculateBaseAssetValue)(market, userPosition);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -239,10 +239,10 @@ class ClearingHouseUser {
      */
     getPositionEstimatedExitPriceAndPnl(position, amountToClose) {
         const market = this.clearingHouse.getMarket(position.marketIndex);
-        const entryPrice = position_1.calculateEntryPrice(position);
+        const entryPrice = (0, position_1.calculateEntryPrice)(position);
         if (amountToClose) {
             if (amountToClose.eq(numericConstants_1.ZERO)) {
-                return [_1.calculateMarkPrice(market), numericConstants_1.ZERO];
+                return [(0, _1.calculateMarkPrice)(market), numericConstants_1.ZERO];
             }
             position = {
                 baseAssetAmount: amountToClose,
@@ -251,7 +251,7 @@ class ClearingHouseUser {
                 quoteAssetAmount: position.quoteAssetAmount,
             };
         }
-        const baseAssetValue = _1.calculateBaseAssetValue(market, position);
+        const baseAssetValue = (0, _1.calculateBaseAssetValue)(market, position);
         if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
@@ -376,13 +376,13 @@ class ClearingHouseUser {
         if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO))
             return new _1.BN(-1);
         const market = this.clearingHouse.getMarket(proposedMarketPosition.marketIndex);
-        const proposedMarketPositionValue = _1.calculateBaseAssetValue(market, proposedMarketPosition);
+        const proposedMarketPositionValue = (0, _1.calculateBaseAssetValue)(market, proposedMarketPosition);
         // total position value after trade
         const totalPositionValueAfterTrade = totalPositionValueExcludingTargetMarket.add(proposedMarketPositionValue);
         const marginRequirementExcludingTargetMarket = this.getUserPositionsAccount().positions.reduce((totalMarginRequirement, position) => {
             if (!position.marketIndex.eq(marketPosition.marketIndex)) {
                 const market = this.clearingHouse.getMarket(position.marketIndex);
-                const positionValue = _1.calculateBaseAssetValue(market, position);
+                const positionValue = (0, _1.calculateBaseAssetValue)(market, position);
                 const marketMarginRequirement = positionValue
                     .mul(partial
                     ? new _1.BN(market.marginRatioPartial)
@@ -426,13 +426,13 @@ class ClearingHouseUser {
         }
         let markPriceAfterTrade;
         if (positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
-            markPriceAfterTrade = _1.calculateMarkPrice(this.clearingHouse.getMarket(marketPosition.marketIndex));
+            markPriceAfterTrade = (0, _1.calculateMarkPrice)(this.clearingHouse.getMarket(marketPosition.marketIndex));
         }
         else {
             const direction = positionBaseSizeChange.gt(numericConstants_1.ZERO)
                 ? _1.PositionDirection.LONG
                 : _1.PositionDirection.SHORT;
-            markPriceAfterTrade = _1.calculateTradeSlippage(direction, positionBaseSizeChange.abs(), this.clearingHouse.getMarket(marketPosition.marketIndex), 'base')[3]; // newPrice after swap
+            markPriceAfterTrade = (0, _1.calculateTradeSlippage)(direction, positionBaseSizeChange.abs(), this.clearingHouse.getMarket(marketPosition.marketIndex), 'base')[3]; // newPrice after swap
         }
         if (priceDelta.gt(markPriceAfterTrade)) {
             return new _1.BN(-1);
@@ -483,7 +483,7 @@ class ClearingHouseUser {
     getMaxTradeSizeUSDC(targetMarketIndex, tradeSide) {
         const currentPosition = this.getUserPosition(targetMarketIndex) ||
             this.getEmptyPosition(targetMarketIndex);
-        const targetSide = types_1.isVariant(tradeSide, 'short') ? 'short' : 'long';
+        const targetSide = (0, types_1.isVariant)(tradeSide, 'short') ? 'short' : 'long';
         const currentPositionSide = (currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())
             ? 'short'
             : 'long';