@drift-labs/sdk 0.1.23-master.2 → 0.1.24

package/lib/accounts/bulkAccountLoader.d.ts

@@ -15,6 +15,7 @@ export declare class BulkAccountLoader {
     intervalId?: NodeJS.Timer;
     loadPromise?: Promise<void>;
     loadPromiseResolver: () => void;
+    loggingEnabled: boolean;
     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

@@ -17,13 +17,14 @@ class BulkAccountLoader {
         this.accountsToLoad = new Map();
         this.accountData = new Map();
         this.errorCallbacks = new Map();
+        this.loggingEnabled = false;
         this.connection = connection;
         this.commitment = commitment;
         this.pollingFrequency = pollingFrequency;
     }
     addAccount(publicKey, callback) {
         const existingSize = this.accountsToLoad.size;
-        const callbackId = (0, uuid_1.v4)();
+        const callbackId = uuid_1.v4();
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.set(callbackId, callback);
@@ -57,7 +58,7 @@ class BulkAccountLoader {
         }
     }
     addErrorCallbacks(callback) {
-        const callbackId = (0, uuid_1.v4)();
+        const callbackId = uuid_1.v4();
         this.errorCallbacks.set(callbackId, callback);
         return callbackId;
     }
@@ -78,6 +79,9 @@ class BulkAccountLoader {
             this.loadPromise = new Promise((resolver) => {
                 this.loadPromiseResolver = resolver;
             });
+            if (this.loggingEnabled) {
+                console.log('Loading accounts');
+            }
             try {
                 const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
                 yield Promise.all(chunks.map((chunk) => {
@@ -108,17 +112,8 @@ class BulkAccountLoader {
                 }),
                 { commitment: this.commitment },
             ];
-            let rpcResponse;
-            try {
-                // @ts-ignore
-                rpcResponse = yield this.connection._rpcRequest('getMultipleAccounts', args);
-            }
-            catch (e) {
-                for (const [_, callback] of this.errorCallbacks) {
-                    callback(e);
-                }
-                return;
-            }
+            // @ts-ignore
+            const rpcResponse = yield this.connection._rpcRequest('getMultipleAccounts', args);
             const newSlot = rpcResponse.result.context.slot;
             for (const i in accountsToLoad) {
                 const accountToLoad = accountsToLoad[i];
@@ -165,12 +160,18 @@ class BulkAccountLoader {
         if (this.intervalId) {
             return;
         }
+        if (this.loggingEnabled) {
+            console.log(`startPolling`);
+        }
         this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
     }
     stopPolling() {
         if (this.intervalId) {
             clearInterval(this.intervalId);
             this.intervalId = undefined;
+            if (this.loggingEnabled) {
+                console.log(`stopPolling`);
+            }
         }
     }
 }

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -54,7 +54,7 @@ class PollingClearingHouseAccountSubscriber {
             if (this.accountsToPoll.size > 0) {
                 return;
             }
-            const statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+            const statePublicKey = yield 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((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode(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((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(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 = (0, token_1.parseTokenAccount)(buffer);
+            const tokenAccount = 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 = (0, token_1.parseTokenAccount)(buffer);
+            this.tokenAccount = token_1.parseTokenAccount(buffer);
         });
     }
     unsubscribe() {

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -42,7 +42,7 @@ class PollingUserAccountSubscriber {
                 return;
             }
             if (!userPublicKeys) {
-                const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
+                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',
@@ -54,7 +54,7 @@ class PollingUserAccountSubscriber {
                     publicKey: userAccount.positions,
                     eventType: 'userPositionsData',
                 });
-                const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
+                const userOrdersPublicKey = yield 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((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode(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((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(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((0, utils_1.capitalize)(this.accountName), newBuffer);
+                this.data = this.program.account[this.accountName].coder.accounts.decode(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((0, utils_1.capitalize)(this.accountName), newBuffer);
+            this.data = this.program.account[this.accountName].coder.accounts.decode(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 (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+            const statePublicKey = yield 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 (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
+            const userPublicKey = yield 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 (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
+            const userOrdersPublicKey = yield 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.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): Promise<TransactionSignature>;
+    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, 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>;
@@ -23,7 +23,7 @@ export declare class Admin extends ClearingHouse {
     withdrawFees(marketIndex: BN, amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFromInsuranceVaultToMarket(marketIndex: BN, amount: BN): Promise<TransactionSignature>;
     updateAdmin(admin: PublicKey): Promise<TransactionSignature>;
-    updateMarginRatio(marginRatioInitial: BN, marginRatioPartial: BN, marginRatioMaintenance: BN): Promise<TransactionSignature>;
+    updateMarginRatio(marketIndex: BN, marginRatioInitial: number, marginRatioPartial: number, marginRatioMaintenance: number): Promise<TransactionSignature>;
     updatePartialLiquidationClosePercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updatePartialLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updateFullLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;

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 = (0, clearingHouse_2.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
-        return (0, clearingHouse_2.getAdmin)(config);
+        const config = clearingHouse_2.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
+        return 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 (0, addresses_1.getClearingHouseStateAccountPublicKeyAndNonce)(this.program.programId);
+            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield 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 (0, addresses_1.getOrderStateAccountPublicKeyAndNonce)(this.program.programId);
-            const clearingHouseStatePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+            const [orderStatePublicKey, orderStateNonce] = yield addresses_1.getOrderStateAccountPublicKeyAndNonce(this.program.programId);
+            const clearingHouseStatePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
             const initializeOrderStateTx = yield this.program.transaction.initializeOrderState(orderStateNonce, {
                 accounts: {
                     admin: this.wallet.publicKey,
@@ -136,12 +136,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) {
+    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, 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, {
+            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     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, _] = (0, trade_1.calculateTargetPriceTrade)(market, targetPrice);
-            const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
+            const [direction, tradeSize, _] = trade_1.calculateTargetPriceTrade(market, targetPrice);
+            const [newQuoteAssetAmount, newBaseAssetAmount] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'quote', tradeSize, amm_1.getSwapDirection('quote', direction));
             const state = this.getStateAccount();
             return yield this.program.rpc.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, marketIndex, {
                 accounts: {
@@ -322,12 +322,13 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
-    updateMarginRatio(marginRatioInitial, marginRatioPartial, marginRatioMaintenance) {
+    updateMarginRatio(marketIndex, marginRatioInitial, marginRatioPartial, marginRatioMaintenance) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.program.rpc.updateMarginRatio(marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
+            return yield this.program.rpc.updateMarginRatio(marketIndex, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
                 accounts: {
                     admin: this.wallet.publicKey,
                     state: yield this.getStatePublicKey(),
+                    markets: this.getStateAccount().markets,
                 },
             });
         });

package/lib/clearingHouse.js

@@ -73,8 +73,8 @@ class ClearingHouse {
      * @returns
      */
     static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
-        const config = (0, clearingHouse_1.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
-        return (0, clearingHouse_1.getClearingHouse)(config);
+        const config = clearingHouse_1.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
+        return clearingHouse_1.getClearingHouse(config);
     }
     /**
      *
@@ -126,7 +126,7 @@ class ClearingHouse {
             if (this.statePublicKey) {
                 return this.statePublicKey;
             }
-            this.statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
+            this.statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
             return this.statePublicKey;
         });
     }
@@ -168,7 +168,7 @@ class ClearingHouse {
             if (this.orderStatePublicKey) {
                 return this.orderStatePublicKey;
             }
-            this.orderStatePublicKey = yield (0, addresses_1.getOrderStateAccountPublicKey)(this.program.programId);
+            this.orderStatePublicKey = yield addresses_1.getOrderStateAccountPublicKey(this.program.programId);
             return this.orderStatePublicKey;
         });
     }
@@ -202,7 +202,7 @@ class ClearingHouse {
     }
     getInitializeUserInstructions() {
         return __awaiter(this, void 0, void 0, function* () {
-            const [userAccountPublicKey, userAccountNonce] = yield (0, addresses_1.getUserAccountPublicKeyAndNonce)(this.program.programId, this.wallet.publicKey);
+            const [userAccountPublicKey, userAccountNonce] = yield addresses_1.getUserAccountPublicKeyAndNonce(this.program.programId, this.wallet.publicKey);
             const remainingAccounts = [];
             const optionalAccounts = {
                 whitelistToken: false,
@@ -243,7 +243,7 @@ class ClearingHouse {
             if (!userAccountPublicKey) {
                 userAccountPublicKey = yield this.getUserAccountPublicKey();
             }
-            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield (0, addresses_1.getUserOrdersAccountPublicKeyAndNonce)(this.program.programId, userAccountPublicKey);
+            const [userOrdersAccountPublicKey, userOrdersAccountNonce] = yield addresses_1.getUserOrdersAccountPublicKeyAndNonce(this.program.programId, userAccountPublicKey);
             return yield this.program.instruction.initializeUserOrders(userOrdersAccountNonce, {
                 accounts: {
                     user: userAccountPublicKey,
@@ -265,7 +265,7 @@ class ClearingHouse {
             if (this.userAccountPublicKey) {
                 return this.userAccountPublicKey;
             }
-            this.userAccountPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey);
+            this.userAccountPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.wallet.publicKey);
             return this.userAccountPublicKey;
         });
     }
@@ -287,7 +287,7 @@ class ClearingHouse {
             if (this.userOrdersAccountPublicKey) {
                 return this.userOrdersAccountPublicKey;
             }
-            this.userOrdersAccountPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, yield this.getUserAccountPublicKey());
+            this.userOrdersAccountPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, yield this.getUserAccountPublicKey());
             return this.userOrdersAccountPublicKey;
         });
     }
@@ -380,7 +380,7 @@ class ClearingHouse {
     }
     withdrawCollateral(amount, collateralAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getWithdrawCollateralIx(amount, collateralAccountPublicKey)), [], this.opts);
         });
     }
     getWithdrawCollateralIx(amount, collateralAccountPublicKey) {
@@ -409,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((0, utils_1.wrapInTx)(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer)), [], this.opts);
         });
     }
     getOpenPositionIx(direction, amount, marketIndex, limitPrice, discountToken, referrer) {
@@ -475,7 +475,7 @@ class ClearingHouse {
     }
     placeOrder(orderParams, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getPlaceOrderIx(orderParams, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getPlaceOrderIx(orderParams, discountToken, referrer)), [], this.opts);
         });
     }
     getPlaceOrderIx(orderParams, discountToken, referrer) {
@@ -527,7 +527,7 @@ class ClearingHouse {
     }
     cancelOrder(orderId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelOrderIx(orderId)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderIx(orderId)), [], this.opts);
         });
     }
     getCancelOrderIx(orderId) {
@@ -554,7 +554,7 @@ class ClearingHouse {
     }
     cancelOrderByUserId(userOrderId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getCancelOrderByUserIdIx(userOrderId)), [], this.opts);
         });
     }
     getCancelOrderByUserIdIx(userOrderId) {
@@ -581,7 +581,7 @@ class ClearingHouse {
     }
     fillOrder(userAccountPublicKey, userOrdersAccountPublicKey, order) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order)), [], this.opts);
         });
     }
     getFillOrderIx(userAccountPublicKey, userOrdersAccountPublicKey, order) {
@@ -639,7 +639,7 @@ class ClearingHouse {
     }
     placeAndFillOrder(orderParams, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getPlaceAndFillOrderIx(orderParams, discountToken, referrer)), [], this.opts);
         });
     }
     getPlaceAndFillOrderIx(orderParams, discountToken, referrer) {
@@ -700,7 +700,7 @@ class ClearingHouse {
      */
     closePosition(marketIndex, discountToken, referrer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.txSender.send((0, utils_1.wrapInTx)(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
+            return yield this.txSender.send(utils_1.wrapInTx(yield this.getClosePositionIx(marketIndex, discountToken, referrer)), [], this.opts);
         });
     }
     getClosePositionIx(marketIndex, discountToken, referrer) {
@@ -748,7 +748,7 @@ class ClearingHouse {
     }
     liquidate(liquidateeUserAccountPublicKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
         });
     }
     getLiquidateIx(liquidateeUserAccountPublicKey) {
@@ -792,7 +792,7 @@ class ClearingHouse {
     }
     updateFundingRate(oracle, marketIndex) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
         });
     }
     getUpdateFundingRateIx(oracle, marketIndex) {
@@ -810,7 +810,7 @@ class ClearingHouse {
     }
     settleFundingPayment(userAccount, userPositionsAccount) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.txSender.send((0, utils_1.wrapInTx)(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
+            return this.txSender.send(utils_1.wrapInTx(yield this.getSettleFundingPaymentIx(userAccount, userPositionsAccount)), [], this.opts);
         });
     }
     getSettleFundingPaymentIx(userAccount, userPositionsAccount) {

package/lib/clearingHouseUser.d.ts

@@ -4,7 +4,7 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { ClearingHouse } from './clearingHouse';
-import { Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
+import { MarginCategory, Order, UserAccount, UserOrdersAccount, UserPosition, UserPositionsAccount } from './types';
 import { UserAccountSubscriber, UserAccountEvents } from './accounts/types';
 import { PositionDirection, BN } from '.';
 export declare class ClearingHouseUser {
@@ -62,12 +62,17 @@ export declare class ClearingHouseUser {
      * calculates Buying Power = FC * MAX_LEVERAGE
      * @returns : Precision QUOTE_PRECISION
      */
-    getBuyingPower(): BN;
+    getBuyingPower(marketIndex: BN | number): BN;
     /**
-     * calculates Free Collateral = (TC - TPV) * MAX_LEVERAGE
+     * calculates Free Collateral = Total collateral - initial margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
     getFreeCollateral(): BN;
+    getInitialMarginRequirement(): BN;
+    /**
+     * @returns The partial margin requirement in USDC. : QUOTE_PRECISION
+     */
+    getPartialMarginRequirement(): BN;
     /**
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
@@ -109,7 +114,7 @@ export declare class ClearingHouseUser {
      * @params category {Initial, Partial, Maintenance}
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverage(category?: 'Initial' | 'Partial' | 'Maintenance'): BN;
+    getMaxLeverage(marketIndex: BN | number, category?: MarginCategory): BN;
     /**
      * calculates margin ratio: total collateral / |total position value|
      * @returns : Precision TEN_THOUSAND
@@ -123,20 +128,12 @@ export declare class ClearingHouseUser {
     needsToSettleFundingPayment(): boolean;
     /**
      * Calculate the liquidation price of a position, with optional parameter to calculate the liquidation price after a trade
-     * @param targetMarket
-     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
-     * @param partial
-     * @returns Precision : MARK_PRICE_PRECISION
-     */
-    liquidationPriceOld(targetMarket: Pick<UserPosition, 'marketIndex'>, positionBaseSizeChange?: BN, partial?: boolean): BN;
-    /**
-     * Calculate the liquidation price of a position, with optional parameter to calculate the liquidation price after a trade
-     * @param targetMarket
+     * @param marketPosition
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
      * @param partial
      * @returns Precision : MARK_PRICE_PRECISION
      */
-    liquidationPrice(targetMarket: Pick<UserPosition, 'marketIndex'>, positionBaseSizeChange?: BN, partial?: boolean): BN;
+    liquidationPrice(marketPosition: Pick<UserPosition, 'marketIndex'>, positionBaseSizeChange?: BN, partial?: boolean): BN;
     /**
      * Calculates the estimated liquidation price for a position after closing a quote amount of the position.
      * @param positionMarketIndex
@@ -163,10 +160,9 @@ export declare class ClearingHouseUser {
      *
      * @param targetMarketIndex
      * @param tradeSide
-     * @param userMaxLeverageSetting - leverage : Precision TEN_THOUSAND
      * @returns tradeSizeAllowed : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDC(targetMarketIndex: BN, tradeSide: PositionDirection, userMaxLeverageSetting: BN): BN;
+    getMaxTradeSizeUSDC(targetMarketIndex: BN, tradeSide: PositionDirection): BN;
     /**
      * Returns the leverage ratio for the account after adding (or subtracting) the given quote size to the given position
      * @param targetMarketIndex
@@ -187,5 +183,4 @@ export declare class ClearingHouseUser {
      * @returns positionValue : Precision QUOTE_PRECISION
      */
     private getTotalPositionValueExcludingMarket;
-    canFillOrder(order: Order): boolean;
 }