@drift-labs/sdk 0.2.0-master.2 → 0.2.0-master.20

package/lib/clearingHouse.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClearingHouse = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const spl_token_1 = require("@solana/spl-token");
+const types_1 = require("./types");
 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");
@@ -42,8 +43,9 @@ const pollingClearingHouseAccountSubscriber_1 = require("./accounts/pollingClear
 const webSocketClearingHouseAccountSubscriber_1 = require("./accounts/webSocketClearingHouseAccountSubscriber");
 const retryTxSender_1 = require("./tx/retryTxSender");
 const clearingHouseUser_1 = require("./clearingHouseUser");
-const orderParams_1 = require("./orderParams");
 const config_1 = require("./config");
+const banks_1 = require("./constants/banks");
+const clearingHouseUserStats_1 = require("./clearingHouseUserStats");
 /**
  * # ClearingHouse
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -71,6 +73,13 @@ class ClearingHouse {
                     type: 'websocket',
                 };
         this.createUsers(userIds, this.userAccountSubscriptionConfig);
+        if (config.userStats) {
+            this.userStats = new clearingHouseUserStats_1.ClearingHouseUserStats({
+                clearingHouse: this,
+                userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey),
+                accountSubscription: this.userAccountSubscriptionConfig,
+            });
+        }
         let marketIndexes = config.marketIndexes;
         let bankIndexes = config.bankIndexes;
         let oracleInfos = config.oracleInfos;
@@ -111,6 +120,9 @@ class ClearingHouse {
     }
     async subscribe() {
         const subscribePromises = this.subscribeUsers().concat(this.accountSubscriber.subscribe());
+        if (this.userStats !== undefined) {
+            subscribePromises.concat(this.userStats.subscribe());
+        }
         this.isSubscribed = (await Promise.all(subscribePromises)).reduce((success, prevSuccess) => success && prevSuccess);
         return this.isSubscribed;
     }
@@ -127,6 +139,9 @@ class ClearingHouse {
     }
     async unsubscribe() {
         const unsubscribePromises = this.unsubscribeUsers().concat(this.accountSubscriber.unsubscribe());
+        if (this.userStats !== undefined) {
+            unsubscribePromises.concat(this.userStats.unsubscribe());
+        }
         await Promise.all(unsubscribePromises);
         this.isSubscribed = false;
     }
@@ -187,6 +202,7 @@ class ClearingHouse {
             await Promise.all(this.subscribeUsers());
         }
         this.activeUserId = activeUserId;
+        this.userStatsAccountPublicKey = undefined;
     }
     async switchActiveUser(userId) {
         this.activeUserId = userId;
@@ -199,27 +215,59 @@ class ClearingHouse {
         await user.subscribe();
         this.users.set(userId, user);
     }
-    async initializeUserAccount(userId = 0, name = userName_1.DEFAULT_USER_NAME) {
-        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name);
-        const tx = new web3_js_1.Transaction().add(initializeUserAccountIx);
+    async initializeUserAccount(userId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name, referrerInfo);
+        const tx = new web3_js_1.Transaction();
+        if (userId === 0) {
+            // not the safest assumption, can explicitly check if user stats account exists if it causes problems
+            tx.add(await this.getInitializeUserStatsIx());
+        }
+        tx.add(initializeUserAccountIx);
         const { txSig } = await this.txSender.send(tx, [], this.opts);
         return [txSig, userAccountPublicKey];
     }
-    async getInitializeUserInstructions(userId = 0, name = userName_1.DEFAULT_USER_NAME) {
+    async getInitializeUserInstructions(userId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, userId);
+        const remainingAccounts = new Array();
+        if (referrerInfo !== undefined) {
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrer,
+                isWritable: true,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrerStats,
+                isWritable: true,
+                isSigner: false,
+            });
+        }
         const nameBuffer = (0, userName_1.encodeName)(name);
         const initializeUserAccountIx = await this.program.instruction.initializeUser(userId, nameBuffer, {
             accounts: {
                 user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
                 payer: this.wallet.publicKey,
                 rent: anchor.web3.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
                 state: await this.getStatePublicKey(),
             },
+            remainingAccounts,
         });
         return [userAccountPublicKey, initializeUserAccountIx];
     }
+    async getInitializeUserStatsIx() {
+        return await this.program.instruction.initializeUserStats({
+            accounts: {
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                payer: this.wallet.publicKey,
+                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                state: await this.getStatePublicKey(),
+            },
+        });
+    }
     getUser(userId) {
         userId = userId !== null && userId !== void 0 ? userId : this.activeUserId;
         if (!this.users.has(userId)) {
@@ -230,6 +278,16 @@ class ClearingHouse {
     getUsers() {
         return [...this.users.values()];
     }
+    getUserStats() {
+        return this.userStats;
+    }
+    getUserStatsAccountPublicKey() {
+        if (this.userStatsAccountPublicKey) {
+            return this.userStatsAccountPublicKey;
+        }
+        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey);
+        return this.userStatsAccountPublicKey;
+    }
     async getUserAccountPublicKey() {
         return this.getUser().userAccountPublicKey;
     }
@@ -284,8 +342,7 @@ class ClearingHouse {
                 marketAccountMap.set(marketIndexNum, {
                     pubkey: marketAccount.pubkey,
                     isSigner: false,
-                    // isWritable: false, // TODO
-                    isWritable: true,
+                    isWritable: false,
                 });
                 oracleAccountMap.set(marketAccount.pubkey.toString(), {
                     pubkey: marketAccount.amm.oracle,
@@ -294,6 +351,19 @@ class ClearingHouse {
                 });
             }
         }
+        if (params.readableMarketIndex) {
+            const marketAccount = this.getMarketAccount(params.readableMarketIndex.toNumber());
+            marketAccountMap.set(params.readableMarketIndex.toNumber(), {
+                pubkey: marketAccount.pubkey,
+                isSigner: false,
+                isWritable: true,
+            });
+            oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
+                pubkey: marketAccount.amm.oracle,
+                isSigner: false,
+                isWritable: false,
+            });
+        }
         if (params.writableMarketIndex) {
             const marketAccount = this.getMarketAccount(params.writableMarketIndex.toNumber());
             marketAccountMap.set(params.writableMarketIndex.toNumber(), {
@@ -355,9 +425,27 @@ class ClearingHouse {
         return (_a = this.getUserAccount()) === null || _a === void 0 ? void 0 : _a.orders.find((order) => order.userOrderId === userOrderId);
     }
     async deposit(amount, bankIndex, collateralAccountPublicKey, userId, reduceOnly = false) {
+        const tx = new web3_js_1.Transaction();
+        const additionalSigners = [];
+        const bank = this.getBankAccount(bankIndex);
+        const isSolBank = bank.mint.equals(banks_1.WRAPPED_SOL_MINT);
+        const authority = this.wallet.publicKey;
+        const createWSOLTokenAccount = isSolBank && collateralAccountPublicKey.equals(authority);
+        if (createWSOLTokenAccount) {
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount);
+            collateralAccountPublicKey = pubkey;
+            ixs.forEach((ix) => {
+                tx.add(ix);
+            });
+            signers.forEach((signer) => additionalSigners.push(signer));
+        }
         const depositCollateralIx = await this.getDepositInstruction(amount, bankIndex, collateralAccountPublicKey, userId, reduceOnly, true);
-        const tx = new web3_js_1.Transaction().add(depositCollateralIx);
-        const { txSig } = await this.txSender.send(tx);
+        tx.add(depositCollateralIx);
+        // Close the wrapped sol account at the end of the transaction
+        if (createWSOLTokenAccount) {
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, collateralAccountPublicKey, authority, authority, []));
+        }
+        const { txSig } = await this.txSender.send(tx, additionalSigners, this.opts);
         return txSig;
     }
     async getDepositInstruction(amount, bankIndex, userTokenAccount, userId, reduceOnly = false, userInitialized = true) {
@@ -371,13 +459,19 @@ class ClearingHouse {
             });
         }
         else {
-            remainingAccounts = [
-                {
-                    pubkey: this.getBankAccount(bankIndex).pubkey,
+            const bankAccount = this.getBankAccount(bankIndex);
+            if (!bankAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                remainingAccounts.push({
+                    pubkey: bankAccount.oracle,
                     isSigner: false,
-                    isWritable: true,
-                },
-            ];
+                    isWritable: false,
+                });
+            }
+            remainingAccounts.push({
+                pubkey: bankAccount.pubkey,
+                isSigner: false,
+                isWritable: true,
+            });
         }
         const bank = this.getBankAccount(bankIndex);
         return await this.program.instruction.deposit(bankIndex, amount, reduceOnly, {
@@ -386,6 +480,7 @@ class ClearingHouse {
                 bank: bank.pubkey,
                 bankVault: bank.vault,
                 user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
                 authority: this.wallet.publicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -393,40 +488,132 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
+    async checkIfAccountExists(account) {
+        try {
+            const accountInfo = await this.connection.getAccountInfo(account);
+            return accountInfo && true;
+        }
+        catch (e) {
+            // Doesn't already exist
+            return false;
+        }
+    }
+    async getSolWithdrawalIxs(bankIndex, amount) {
+        const result = {
+            ixs: [],
+            signers: [],
+            pubkey: web3_js_1.PublicKey.default,
+        };
+        // Create a temporary wrapped SOL account to store the SOL that we're withdrawing
+        const authority = this.wallet.publicKey;
+        const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount);
+        result.pubkey = pubkey;
+        ixs.forEach((ix) => {
+            result.ixs.push(ix);
+        });
+        signers.forEach((ix) => {
+            result.signers.push(ix);
+        });
+        const withdrawIx = await this.getWithdrawIx(amount, bankIndex, pubkey, true);
+        result.ixs.push(withdrawIx);
+        result.ixs.push(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, pubkey, authority, authority, []));
+        return result;
+    }
+    async getWrappedSolAccountCreationIxs(amount) {
+        const wrappedSolAccount = new web3_js_1.Keypair();
+        const result = {
+            ixs: [],
+            signers: [],
+            pubkey: wrappedSolAccount.publicKey,
+        };
+        const rentSpaceLamports = new anchor_1.BN(web3_js_1.LAMPORTS_PER_SOL / 100);
+        const depositAmountLamports = amount.add(rentSpaceLamports);
+        const authority = this.wallet.publicKey;
+        result.ixs.push(web3_js_1.SystemProgram.createAccount({
+            fromPubkey: authority,
+            newAccountPubkey: wrappedSolAccount.publicKey,
+            lamports: depositAmountLamports.toNumber(),
+            space: 165,
+            programId: spl_token_1.TOKEN_PROGRAM_ID,
+        }));
+        result.ixs.push(spl_token_1.Token.createInitAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, banks_1.WRAPPED_SOL_MINT, wrappedSolAccount.publicKey, authority));
+        result.signers.push(wrappedSolAccount);
+        return result;
+    }
     /**
      * Creates the Clearing House User account for a user, and deposits some initial collateral
-     * @param userId
-     * @param name
      * @param amount
      * @param userTokenAccount
+     * @param bankIndex
+     * @param userId
+     * @param name
      * @param fromUserId
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, bankIndex = new anchor_1.BN(0), userId = 0, name = userName_1.DEFAULT_USER_NAME, fromUserId) {
-        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name);
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, bankIndex = new anchor_1.BN(0), userId = 0, name = userName_1.DEFAULT_USER_NAME, fromUserId, referrerInfo) {
+        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name, referrerInfo);
+        const additionalSigners = [];
+        const bank = this.getBankAccount(bankIndex);
+        const isSolBank = bank.mint.equals(banks_1.WRAPPED_SOL_MINT);
+        const tx = new web3_js_1.Transaction();
+        const authority = this.wallet.publicKey;
+        const createWSOLTokenAccount = isSolBank && userTokenAccount.equals(authority);
+        if (createWSOLTokenAccount) {
+            const { ixs: startIxs, signers, pubkey, } = await this.getWrappedSolAccountCreationIxs(amount);
+            userTokenAccount = pubkey;
+            startIxs.forEach((ix) => {
+                tx.add(ix);
+            });
+            signers.forEach((signer) => additionalSigners.push(signer));
+        }
         const depositCollateralIx = fromUserId != null
             ? await this.getTransferDepositIx(amount, bankIndex, fromUserId, userId)
             : await this.getDepositInstruction(amount, bankIndex, userTokenAccount, userId, false, false);
-        const tx = new web3_js_1.Transaction()
-            .add(initializeUserAccountIx)
-            .add(depositCollateralIx);
-        const { txSig } = await this.txSender.send(tx, []);
+        if (userId === 0) {
+            tx.add(await this.getInitializeUserStatsIx());
+        }
+        tx.add(initializeUserAccountIx).add(depositCollateralIx);
+        // Close the wrapped sol account at the end of the transaction
+        if (createWSOLTokenAccount) {
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccount, authority, authority, []));
+        }
+        const { txSig } = await this.txSender.send(tx, additionalSigners, this.opts);
         return [txSig, userAccountPublicKey];
     }
-    async initializeUserAccountForDevnet(userId = 0, name = userName_1.DEFAULT_USER_NAME, mockUSDCFaucet, amount) {
-        const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] = await mockUSDCFaucet.createAssociatedTokenAccountAndMintToInstructions(this.wallet.publicKey, amount);
-        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name);
-        const depositCollateralIx = await this.getDepositInstruction(amount, new anchor_1.BN(0), associateTokenPublicKey, userId, false, false);
-        const tx = new web3_js_1.Transaction()
-            .add(createAssociatedAccountIx)
-            .add(mintToIx)
-            .add(initializeUserAccountIx)
-            .add(depositCollateralIx);
+    async initializeUserAccountForDevnet(userId = 0, name = userName_1.DEFAULT_USER_NAME, bankIndex, tokenFaucet, amount, referrerInfo) {
+        const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] = await tokenFaucet.createAssociatedTokenAccountAndMintToInstructions(this.wallet.publicKey, amount);
+        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name, referrerInfo);
+        const depositCollateralIx = await this.getDepositInstruction(amount, bankIndex, associateTokenPublicKey, userId, false, false);
+        const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToIx);
+        if (userId === 0) {
+            tx.add(await this.getInitializeUserStatsIx());
+        }
+        tx.add(initializeUserAccountIx).add(depositCollateralIx);
         const txSig = await this.program.provider.sendAndConfirm(tx, []);
         return [txSig, userAccountPublicKey];
     }
     async withdraw(amount, bankIndex, userTokenAccount, reduceOnly = false) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getWithdrawIx(amount, bankIndex, userTokenAccount, reduceOnly)), [], this.opts);
+        const tx = new web3_js_1.Transaction();
+        const additionalSigners = [];
+        const bank = this.getBankAccount(bankIndex);
+        const isSolBank = bank.mint.equals(banks_1.WRAPPED_SOL_MINT);
+        const authority = this.wallet.publicKey;
+        const createWSOLTokenAccount = isSolBank && userTokenAccount.equals(authority);
+        if (createWSOLTokenAccount) {
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount);
+            userTokenAccount = pubkey;
+            ixs.forEach((ix) => {
+                tx.add(ix);
+            });
+            signers.forEach((signer) => additionalSigners.push(signer));
+        }
+        const withdrawCollateral = await this.getWithdrawIx(amount, bank.bankIndex, userTokenAccount, reduceOnly);
+        tx.add(withdrawCollateral);
+        // Close the wrapped sol account at the end of the transaction
+        if (createWSOLTokenAccount) {
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccount, authority, authority, []));
+        }
+        const { txSig } = await this.txSender.send(tx, additionalSigners, this.opts);
         return txSig;
     }
     async getWithdrawIx(amount, bankIndex, userTokenAccount, reduceOnly = false) {
@@ -442,6 +629,7 @@ class ClearingHouse {
                 bankVault: bank.vault,
                 bankVaultAuthority: bank.vaultAuthority,
                 user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
                 authority: this.wallet.publicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -464,6 +652,7 @@ class ClearingHouse {
                 authority: this.wallet.publicKey,
                 fromUser,
                 toUser,
+                userStats: this.getUserStatsAccountPublicKey(),
                 state: await this.getStatePublicKey(),
             },
             remainingAccounts,
@@ -481,44 +670,113 @@ class ClearingHouse {
             },
         });
     }
-    async openPosition(direction, amount, marketIndex, limitPrice) {
-        return await this.placeAndTake((0, orderParams_1.getMarketOrderParams)(marketIndex, direction, numericConstants_1.ZERO, amount, false, limitPrice));
+    async settleLP(settleeUserAccountPublicKey, marketIndex) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex)), [], this.opts);
+        return txSig;
     }
-    async placeOrder(orderParams) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceOrderIx(orderParams)), [], this.opts);
-        this.marketLastSlotCache.set(orderParams.marketIndex.toNumber(), slot);
+    async settleLPIx(settleeUserAccountPublicKey, marketIndex) {
+        const settleeUserAccount = (await this.program.account.user.fetch(settleeUserAccountPublicKey));
+        const userPositions = settleeUserAccount.positions;
+        const remainingAccounts = [];
+        let foundMarket = false;
+        for (const position of userPositions) {
+            if (!(0, position_1.positionIsAvailable)(position)) {
+                const marketPublicKey = await (0, pda_1.getMarketPublicKey)(this.program.programId, position.marketIndex);
+                remainingAccounts.push({
+                    pubkey: marketPublicKey,
+                    isWritable: true,
+                    isSigner: false,
+                });
+                if (marketIndex.eq(position.marketIndex)) {
+                    foundMarket = true;
+                }
+            }
+        }
+        if (!foundMarket) {
+            console.log('Warning: lp is not in the market specified -- tx will likely fail');
+        }
+        return this.program.instruction.settleLp(marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: settleeUserAccountPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async removeLiquidity(marketIndex, sharesToBurn) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getRemoveLiquidityIx(marketIndex, sharesToBurn)), [], this.opts);
         return txSig;
     }
-    async getPlaceOrderIx(orderParams) {
+    async getRemoveLiquidityIx(marketIndex, sharesToBurn) {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const priceOracle = this.getMarketAccount(orderParams.marketIndex).amm
-            .oracle;
         const remainingAccounts = this.getRemainingAccounts({
-            writableMarketIndex: orderParams.marketIndex,
+            writableMarketIndex: marketIndex,
         });
-        return await this.program.instruction.placeOrder(orderParams, {
+        if (sharesToBurn == undefined) {
+            const userAccount = this.getUserAccount();
+            const marketPosition = userAccount.positions.filter((position) => position.marketIndex.eq(marketIndex))[0];
+            sharesToBurn = marketPosition.lpShares;
+            console.log('burning lp shares:', sharesToBurn.toString());
+        }
+        return this.program.instruction.removeLiquidity(sharesToBurn, marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
-                oracle: priceOracle,
             },
-            remainingAccounts,
+            remainingAccounts: remainingAccounts,
         });
     }
-    async expireOrders(userAccountPublicKey) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getExpireOrdersIx(userAccountPublicKey)), [], this.opts);
+    async addLiquidity(amount, marketIndex) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getAddLiquidityIx(amount, marketIndex)), [], this.opts);
+        this.marketLastSlotCache.set(marketIndex.toNumber(), slot);
         return txSig;
     }
-    async getExpireOrdersIx(userAccountPublicKey) {
-        const fillerPublicKey = await this.getUserAccountPublicKey();
-        return await this.program.instruction.expireOrders({
+    async getAddLiquidityIx(amount, marketIndex) {
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            writableMarketIndex: marketIndex,
+        });
+        return this.program.instruction.addLiquidity(amount, marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async openPosition(direction, amount, marketIndex, limitPrice) {
+        return await this.placeAndTake({
+            orderType: types_1.OrderType.MARKET,
+            marketIndex,
+            direction,
+            baseAssetAmount: amount,
+            price: limitPrice,
+        });
+    }
+    async placeOrder(orderParams) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceOrderIx(orderParams)), [], this.opts);
+        this.marketLastSlotCache.set(orderParams.marketIndex.toNumber(), slot);
+        return txSig;
+    }
+    getOrderParams(optionalOrderParams) {
+        return Object.assign({}, types_1.DefaultOrderParams, optionalOrderParams);
+    }
+    async getPlaceOrderIx(orderParams) {
+        orderParams = this.getOrderParams(orderParams);
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            readableMarketIndex: orderParams.marketIndex,
+        });
+        return await this.program.instruction.placeOrder(orderParams, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                filler: fillerPublicKey,
                 user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
             },
+            remainingAccounts,
         });
     }
     async updateAMMs(marketIndexes) {
@@ -590,107 +848,92 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async cancelAllOrders(bestEffort) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelAllOrdersIx(bestEffort)), [], this.opts);
-        return txSig;
-    }
-    async getCancelAllOrdersIx(bestEffort) {
-        const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const remainingAccounts = this.getRemainingAccounts({});
-        for (const order of this.getUserAccount().orders) {
-            const oracle = this.getMarketAccount(order.marketIndex).amm.oracle;
-            remainingAccounts.push({
-                pubkey: oracle,
-                isWritable: false,
-                isSigner: false,
-            });
-        }
-        return await this.program.instruction.cancelAllOrders(bestEffort, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user: userAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
-            remainingAccounts,
-        });
-    }
-    async cancelOrdersByMarketAndSide(bestEffort, marketIndexOnly, directionOnly) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrdersByMarketAndSideIx(bestEffort, marketIndexOnly, directionOnly)), [], this.opts);
-        return txSig;
-    }
-    async getCancelOrdersByMarketAndSideIx(bestEffort, marketIndexOnly, directionOnly) {
-        const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const remainingAccounts = this.getRemainingAccounts({});
-        for (const order of this.getUserAccount().orders) {
-            const oracle = this.getMarketAccount(order.marketIndex).amm.oracle;
-            remainingAccounts.push({
-                pubkey: oracle,
-                isWritable: false,
-                isSigner: false,
-            });
-        }
-        return await this.program.instruction.cancelOrdersByMarketAndSide(bestEffort, marketIndexOnly, directionOnly, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user: userAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
-            remainingAccounts,
-        });
-    }
-    async fillOrder(userAccountPublicKey, user, order, makerInfo) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo)), [], this.opts);
+    async fillOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo)), [], this.opts);
         return txSig;
     }
-    async getFillOrderIx(userAccountPublicKey, userAccount, order, makerInfo) {
+    async getFillOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo) {
+        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         const fillerPublicKey = await this.getUserAccountPublicKey();
-        const marketIndex = order.marketIndex;
+        const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const marketIndex = order
+            ? order.marketIndex
+            : userAccount.orders.find((order) => order.orderId.eq(userAccount.nextOrderId.sub(numericConstants_1.ONE))).marketIndex;
         const marketAccount = this.getMarketAccount(marketIndex);
-        const oracle = marketAccount.amm.oracle;
-        const bankAccountInfos = [
-            {
-                pubkey: this.getQuoteAssetBankAccount().pubkey,
-                isSigner: false,
-                isWritable: true,
-            },
-        ];
-        const marketAccountInfos = [
-            {
-                pubkey: marketAccount.pubkey,
-                isWritable: true,
-                isSigner: false,
-            },
-        ];
-        const oracleAccountInfos = [
-            {
-                pubkey: marketAccount.amm.oracle,
-                isWritable: false,
-                isSigner: false,
-            },
-        ];
+        const oracleAccountMap = new Map();
+        const bankAccountMap = new Map();
+        const marketAccountMap = new Map();
+        for (const bankBalance of userAccount.bankBalances) {
+            if (!bankBalance.balance.eq(numericConstants_1.ZERO)) {
+                const bankAccount = this.getBankAccount(bankBalance.bankIndex);
+                bankAccountMap.set(bankBalance.bankIndex.toNumber(), {
+                    pubkey: bankAccount.pubkey,
+                    isSigner: false,
+                    isWritable: false,
+                });
+                if (!bankAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                    oracleAccountMap.set(bankAccount.oracle.toString(), {
+                        pubkey: bankAccount.oracle,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                }
+            }
+        }
         for (const position of userAccount.positions) {
             if (!(0, position_1.positionIsAvailable)(position) &&
                 !position.marketIndex.eq(order.marketIndex)) {
                 const market = this.getMarketAccount(position.marketIndex);
-                marketAccountInfos.push({
+                marketAccountMap.set(position.marketIndex.toNumber(), {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
                 });
-                oracleAccountInfos.push({
+                oracleAccountMap.set(market.amm.oracle.toString(), {
                     pubkey: market.amm.oracle,
                     isWritable: false,
                     isSigner: false,
                 });
             }
         }
-        const remainingAccounts = oracleAccountInfos.concat(bankAccountInfos.concat(marketAccountInfos));
+        marketAccountMap.set(marketIndex.toNumber(), {
+            pubkey: marketAccount.pubkey,
+            isWritable: true,
+            isSigner: false,
+        });
+        oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
+            pubkey: marketAccount.amm.oracle,
+            isWritable: false,
+            isSigner: false,
+        });
+        const remainingAccounts = [
+            ...oracleAccountMap.values(),
+            ...bankAccountMap.values(),
+            ...marketAccountMap.values(),
+        ];
         if (makerInfo) {
             remainingAccounts.push({
                 pubkey: makerInfo.maker,
                 isWritable: true,
                 isSigner: false,
             });
+            remainingAccounts.push({
+                pubkey: makerInfo.makerStats,
+                isWritable: true,
+                isSigner: false,
+            });
+        }
+        if (referrerInfo) {
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrer,
+                isWritable: true,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrerStats,
+                isWritable: true,
+                isSigner: false,
+            });
         }
         const orderId = order.orderId;
         const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
@@ -698,9 +941,10 @@ class ClearingHouse {
             accounts: {
                 state: await this.getStatePublicKey(),
                 filler: fillerPublicKey,
+                fillerStats: fillerStatsPublicKey,
                 user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
                 authority: this.wallet.publicKey,
-                oracle: oracle,
             },
             remainingAccounts,
         });
@@ -713,44 +957,57 @@ class ClearingHouse {
         const fillerPublicKey = await this.getUserAccountPublicKey();
         const marketIndex = order.marketIndex;
         const marketAccount = this.getMarketAccount(marketIndex);
-        const bankAccountInfos = [
-            {
-                pubkey: this.getQuoteAssetBankAccount().pubkey,
-                isSigner: false,
-                isWritable: true,
-            },
-        ];
-        const marketAccountInfos = [
-            {
-                pubkey: marketAccount.pubkey,
-                isWritable: true,
-                isSigner: false,
-            },
-        ];
-        const oracleAccountInfos = [
-            {
-                pubkey: marketAccount.amm.oracle,
-                isWritable: false,
-                isSigner: false,
-            },
-        ];
+        const oracleAccountMap = new Map();
+        const bankAccountMap = new Map();
+        const marketAccountMap = new Map();
+        for (const bankBalance of userAccount.bankBalances) {
+            if (!bankBalance.balance.eq(numericConstants_1.ZERO)) {
+                const bankAccount = this.getBankAccount(bankBalance.bankIndex);
+                bankAccountMap.set(bankBalance.bankIndex.toNumber(), {
+                    pubkey: bankAccount.pubkey,
+                    isSigner: false,
+                    isWritable: false,
+                });
+                if (!bankAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                    oracleAccountMap.set(bankAccount.oracle.toString(), {
+                        pubkey: bankAccount.oracle,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                }
+            }
+        }
         for (const position of userAccount.positions) {
             if (!(0, position_1.positionIsAvailable)(position) &&
                 !position.marketIndex.eq(order.marketIndex)) {
                 const market = this.getMarketAccount(position.marketIndex);
-                marketAccountInfos.push({
+                marketAccountMap.set(position.marketIndex.toNumber(), {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
                 });
-                oracleAccountInfos.push({
+                oracleAccountMap.set(market.amm.oracle.toString(), {
                     pubkey: market.amm.oracle,
                     isWritable: false,
                     isSigner: false,
                 });
             }
         }
-        const remainingAccounts = oracleAccountInfos.concat(bankAccountInfos.concat(marketAccountInfos));
+        marketAccountMap.set(marketIndex.toNumber(), {
+            pubkey: marketAccount.pubkey,
+            isWritable: true,
+            isSigner: false,
+        });
+        oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
+            pubkey: marketAccount.amm.oracle,
+            isWritable: false,
+            isSigner: false,
+        });
+        const remainingAccounts = [
+            ...oracleAccountMap.values(),
+            ...bankAccountMap.values(),
+            ...marketAccountMap.values(),
+        ];
         const orderId = order.orderId;
         return await this.program.instruction.triggerOrder(orderId, {
             accounts: {
@@ -762,15 +1019,15 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async placeAndTake(orderParams, makerInfo) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakeIx(orderParams, makerInfo)), [], this.opts);
+    async placeAndTake(orderParams, makerInfo, referrerInfo) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo)), [], this.opts);
         this.marketLastSlotCache.set(orderParams.marketIndex.toNumber(), slot);
         return txSig;
     }
-    async getPlaceAndTakeIx(orderParams, makerInfo) {
+    async getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo) {
+        orderParams = this.getOrderParams(orderParams);
+        const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const priceOracle = this.getMarketAccount(orderParams.marketIndex).amm
-            .oracle;
         const remainingAccounts = this.getRemainingAccounts({
             writableMarketIndex: orderParams.marketIndex,
             writableBankIndex: numericConstants_1.QUOTE_ASSET_BANK_INDEX,
@@ -783,13 +1040,67 @@ class ClearingHouse {
                 isSigner: false,
                 isWritable: true,
             });
+            remainingAccounts.push({
+                pubkey: makerInfo.makerStats,
+                isSigner: false,
+                isWritable: true,
+            });
+        }
+        if (referrerInfo) {
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrer,
+                isWritable: true,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrerStats,
+                isWritable: true,
+                isSigner: false,
+            });
         }
         return await this.program.instruction.placeAndTake(orderParams, makerOrderId, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
+    async placeAndMake(orderParams, takerInfo, referrerInfo) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
+        this.marketLastSlotCache.set(orderParams.marketIndex.toNumber(), slot);
+        return txSig;
+    }
+    async getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo) {
+        orderParams = this.getOrderParams(orderParams);
+        const userStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            writableMarketIndex: orderParams.marketIndex,
+        });
+        if (referrerInfo) {
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrer,
+                isWritable: true,
+                isSigner: false,
+            });
+            remainingAccounts.push({
+                pubkey: referrerInfo.referrerStats,
+                isWritable: true,
+                isSigner: false,
+            });
+        }
+        const takerOrderId = takerInfo.order.orderId;
+        return await this.program.instruction.placeAndMake(orderParams, takerOrderId, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                taker: takerInfo.taker,
+                takerStats: takerInfo.takerStats,
                 authority: this.wallet.publicKey,
-                oracle: priceOracle,
             },
             remainingAccounts,
         });
@@ -799,19 +1110,31 @@ class ClearingHouse {
      * @param marketIndex
      * @returns
      */
-    async closePosition(marketIndex) {
+    async closePosition(marketIndex, limitPrice) {
         const userPosition = this.getUser().getUserPosition(marketIndex);
         if (!userPosition) {
             throw Error(`No position in market ${marketIndex.toString()}`);
         }
-        return await this.placeAndTake((0, orderParams_1.getMarketOrderParams)(marketIndex, (0, position_1.findDirectionToClose)(userPosition), numericConstants_1.ZERO, userPosition.baseAssetAmount, true, undefined));
+        return await this.placeAndTake({
+            orderType: types_1.OrderType.MARKET,
+            marketIndex,
+            direction: (0, position_1.findDirectionToClose)(userPosition),
+            baseAssetAmount: userPosition.baseAssetAmount.abs(),
+            reduceOnly: true,
+            price: limitPrice,
+        });
     }
     async settlePNLs(users, marketIndex) {
         const ixs = [];
         for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
             ixs.push(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex));
         }
-        const tx = new web3_js_1.Transaction().add(...ixs);
+        const tx = new web3_js_1.Transaction()
+            .add(web3_js_1.ComputeBudgetProgram.requestUnits({
+            units: 1000000,
+            additionalFee: 0,
+        }))
+            .add(...ixs);
         const { txSig } = await this.txSender.send(tx, [], this.opts);
         return txSig;
     }
@@ -828,7 +1151,7 @@ class ClearingHouse {
                 const market = this.getMarketAccount(position.marketIndex);
                 marketAccountMap.set(position.marketIndex.toNumber(), {
                     pubkey: market.pubkey,
-                    isWritable: true,
+                    isWritable: false,
                     isSigner: false,
                 });
                 oracleAccountMap.set(market.amm.oracle.toString(), {
@@ -885,54 +1208,261 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async liquidate(liquidateeUserAccountPublicKey) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateIx(liquidateeUserAccountPublicKey)), [], this.opts);
+    async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount)), [], this.opts);
         return txSig;
     }
-    async getLiquidateIx(liquidateeUserAccountPublicKey) {
-        const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const liquidateeUserAccount = (await this.program.account.user.fetch(liquidateeUserAccountPublicKey));
-        const bankAccountInfos = [
-            {
-                pubkey: this.getQuoteAssetBankAccount().pubkey,
-                isSigner: false,
-                isWritable: true,
+    async getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount) {
+        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
+        const liquidatorPublicKey = await this.getUserAccountPublicKey();
+        const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccountsForLiquidation({
+            writableMarketIndex: marketIndex,
+            userAccount,
+        });
+        return await this.program.instruction.liquidatePerp(marketIndex, maxBaseAssetAmount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                liquidator: liquidatorPublicKey,
+                liquidatorStats: liquidatorStatsPublicKey,
             },
-        ];
-        const marketAccountInfos = [];
-        const oracleAccountInfos = [];
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async liquidateBorrow(userAccountPublicKey, userAccount, assetBankIndex, liabilityBankIndex, maxLiabilityTransfer) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowIx(userAccountPublicKey, userAccount, assetBankIndex, liabilityBankIndex, maxLiabilityTransfer)), [], this.opts);
+        return txSig;
+    }
+    async getLiquidateBorrowIx(userAccountPublicKey, userAccount, assetBankIndex, liabilityBankIndex, maxLiabilityTransfer) {
+        const liquidatorPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccountsForLiquidation({
+            userAccount,
+            writableBankIndexes: [liabilityBankIndex, assetBankIndex],
+        });
+        return await this.program.instruction.liquidateBorrow(assetBankIndex, liabilityBankIndex, maxLiabilityTransfer, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                liquidator: liquidatorPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityBankIndex, maxLiabilityTransfer) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityBankIndex, maxLiabilityTransfer)), [], this.opts);
+        return txSig;
+    }
+    async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityBankIndex, maxLiabilityTransfer) {
+        const liquidatorPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccountsForLiquidation({
+            userAccount,
+            writableMarketIndex: perpMarketIndex,
+            writableBankIndexes: [liabilityBankIndex],
+        });
+        return await this.program.instruction.liquidateBorrowForPerpPnl(perpMarketIndex, liabilityBankIndex, maxLiabilityTransfer, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                liquidator: liquidatorPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetBankIndex, maxPnlTransfer) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetBankIndex, maxPnlTransfer)), [], this.opts);
+        return txSig;
+    }
+    async getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetBankIndex, maxPnlTransfer) {
+        const liquidatorPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccountsForLiquidation({
+            userAccount,
+            writableMarketIndex: perpMarketIndex,
+            writableBankIndexes: [assetBankIndex],
+        });
+        return await this.program.instruction.liquidatePerpPnlForDeposit(perpMarketIndex, assetBankIndex, maxPnlTransfer, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                liquidator: liquidatorPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async resolvePerpBankruptcy(userAccountPublicKey, userAccount, marketIndex) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex)), [], this.opts);
+        return txSig;
+    }
+    async getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
+        const liquidatorPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccountsForLiquidation({
+            writableMarketIndex: marketIndex,
+            userAccount,
+        });
+        return await this.program.instruction.resolvePerpBankruptcy(marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                liquidator: liquidatorPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async resolveBorrowBankruptcy(userAccountPublicKey, userAccount, bankIndex) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getResolveBorrowBankruptcyIx(userAccountPublicKey, userAccount, bankIndex)), [], this.opts);
+        return txSig;
+    }
+    async getResolveBorrowBankruptcyIx(userAccountPublicKey, userAccount, bankIndex) {
+        const liquidatorPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccountsForLiquidation({
+            writableBankIndexes: [bankIndex],
+            userAccount,
+        });
+        return await this.program.instruction.resolveBorrowBankruptcy(bankIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                liquidator: liquidatorPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    getRemainingAccountsForLiquidation(params) {
+        const liquidateeUserAccount = params.userAccount;
+        const oracleAccountMap = new Map();
+        const bankAccountMap = new Map();
+        const marketAccountMap = new Map();
+        for (const bankBalance of liquidateeUserAccount.bankBalances) {
+            if (!bankBalance.balance.eq(numericConstants_1.ZERO)) {
+                const bankAccount = this.getBankAccount(bankBalance.bankIndex);
+                bankAccountMap.set(bankBalance.bankIndex.toNumber(), {
+                    pubkey: bankAccount.pubkey,
+                    isSigner: false,
+                    isWritable: false,
+                });
+                if (!bankAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                    oracleAccountMap.set(bankAccount.oracle.toString(), {
+                        pubkey: bankAccount.oracle,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                }
+            }
+        }
         for (const position of liquidateeUserAccount.positions) {
             if (!(0, position_1.positionIsAvailable)(position)) {
                 const market = this.getMarketAccount(position.marketIndex);
-                const marketPublicKey = await (0, pda_1.getMarketPublicKey)(this.program.programId, position.marketIndex);
-                marketAccountInfos.push({
-                    pubkey: marketPublicKey,
-                    isWritable: true,
+                marketAccountMap.set(position.marketIndex.toNumber(), {
+                    pubkey: market.pubkey,
+                    isWritable: false,
                     isSigner: false,
                 });
-                oracleAccountInfos.push({
+                oracleAccountMap.set(market.amm.oracle.toString(), {
                     pubkey: market.amm.oracle,
                     isWritable: false,
                     isSigner: false,
                 });
             }
         }
-        const remainingAccounts = oracleAccountInfos.concat(bankAccountInfos.concat(marketAccountInfos));
-        const state = this.getStateAccount();
-        const quoteAssetBankAccount = this.getQuoteAssetBankAccount();
-        return await this.program.instruction.liquidate({
-            accounts: {
-                state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
-                user: liquidateeUserAccountPublicKey,
-                liquidator: userAccountPublicKey,
-                bankVault: quoteAssetBankAccount.vault,
-                bankVaultAuthority: quoteAssetBankAccount.vaultAuthority,
-                insuranceVault: state.insuranceVault,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-            remainingAccounts: remainingAccounts,
-        });
+        const userAccountAndSlot = this.getUserAccountAndSlot();
+        if (!userAccountAndSlot) {
+            throw Error('No user account found. Most likely user account does not exist or failed to fetch account');
+        }
+        const { data: userAccount, slot: lastUserPositionsSlot } = userAccountAndSlot;
+        for (const [marketIndexNum, slot] of this.marketLastSlotCache.entries()) {
+            // if cache has more recent slot than user positions account slot, add market to remaining accounts
+            // otherwise remove from slot
+            if (slot > lastUserPositionsSlot) {
+                const marketAccount = this.getMarketAccount(marketIndexNum);
+                marketAccountMap.set(marketIndexNum, {
+                    pubkey: marketAccount.pubkey,
+                    isSigner: false,
+                    isWritable: false,
+                });
+                oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
+                    pubkey: marketAccount.amm.oracle,
+                    isSigner: false,
+                    isWritable: false,
+                });
+            }
+            else {
+                this.marketLastSlotCache.delete(marketIndexNum);
+            }
+        }
+        for (const bankBalance of userAccount.bankBalances) {
+            if (!bankBalance.balance.eq(numericConstants_1.ZERO)) {
+                const bankAccount = this.getBankAccount(bankBalance.bankIndex);
+                bankAccountMap.set(bankBalance.bankIndex.toNumber(), {
+                    pubkey: bankAccount.pubkey,
+                    isSigner: false,
+                    isWritable: false,
+                });
+                if (!bankAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                    oracleAccountMap.set(bankAccount.oracle.toString(), {
+                        pubkey: bankAccount.oracle,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                }
+            }
+        }
+        for (const position of userAccount.positions) {
+            if (!(0, position_1.positionIsAvailable)(position)) {
+                const market = this.getMarketAccount(position.marketIndex);
+                marketAccountMap.set(position.marketIndex.toNumber(), {
+                    pubkey: market.pubkey,
+                    isWritable: false,
+                    isSigner: false,
+                });
+                oracleAccountMap.set(market.amm.oracle.toString(), {
+                    pubkey: market.amm.oracle,
+                    isWritable: false,
+                    isSigner: false,
+                });
+            }
+        }
+        if (params.writableMarketIndex) {
+            const market = this.getMarketAccount(params.writableMarketIndex);
+            marketAccountMap.set(market.marketIndex.toNumber(), {
+                pubkey: market.pubkey,
+                isSigner: false,
+                isWritable: true,
+            });
+            oracleAccountMap.set(market.amm.oracle.toString(), {
+                pubkey: market.amm.oracle,
+                isSigner: false,
+                isWritable: false,
+            });
+        }
+        if (params.writableBankIndexes) {
+            for (const writableBankIndex of params.writableBankIndexes) {
+                const bank = this.getBankAccount(writableBankIndex);
+                bankAccountMap.set(bank.bankIndex.toNumber(), {
+                    pubkey: bank.pubkey,
+                    isSigner: false,
+                    isWritable: true,
+                });
+                if (!bank.oracle.equals(web3_js_1.PublicKey.default)) {
+                    oracleAccountMap.set(bank.oracle.toString(), {
+                        pubkey: bank.oracle,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                }
+            }
+        }
+        return [
+            ...oracleAccountMap.values(),
+            ...bankAccountMap.values(),
+            ...marketAccountMap.values(),
+        ];
     }
     async updateFundingRate(oracle, marketIndex) {
         const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);