@drift-labs/sdk 0.2.0-master.31 → 0.2.0-master.33

package/lib/clearingHouse.js

@@ -64,8 +64,8 @@ class ClearingHouse {
         this.provider = new anchor_1.AnchorProvider(config.connection, config.wallet, this.opts);
         this.program = new anchor_1.Program(clearing_house_json_1.default, config.programID, this.provider);
         this.authority = (_a = config.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
-        const userIds = (_b = config.userIds) !== null && _b !== void 0 ? _b : [0];
-        this.activeUserId = (_c = config.activeUserId) !== null && _c !== void 0 ? _c : userIds[0];
+        const subAccountIds = (_b = config.subAccountIds) !== null && _b !== void 0 ? _b : [0];
+        this.activeSubAccountId = (_c = config.activeSubAccountId) !== null && _c !== void 0 ? _c : subAccountIds[0];
         this.userAccountSubscriptionConfig =
             ((_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.type) === 'polling'
                 ? {
@@ -75,7 +75,7 @@ class ClearingHouse {
                 : {
                     type: 'websocket',
                 };
-        this.createUsers(userIds, this.userAccountSubscriptionConfig);
+        this.createUsers(subAccountIds, this.userAccountSubscriptionConfig);
         if (config.userStats) {
             this.userStats = new clearingHouseUserStats_1.ClearingHouseUserStats({
                 clearingHouse: this,
@@ -111,14 +111,14 @@ class ClearingHouse {
     set isSubscribed(val) {
         this._isSubscribed = val;
     }
-    createUsers(userIds, accountSubscriptionConfig) {
-        for (const userId of userIds) {
-            const user = this.createUser(userId, accountSubscriptionConfig);
-            this.users.set(userId, user);
+    createUsers(subAccountIds, accountSubscriptionConfig) {
+        for (const subAccountId of subAccountIds) {
+            const user = this.createUser(subAccountId, accountSubscriptionConfig);
+            this.users.set(subAccountId, user);
         }
     }
-    createUser(userId, accountSubscriptionConfig) {
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, userId);
+    createUser(subAccountId, accountSubscriptionConfig) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, subAccountId);
         return new clearingHouseUser_1.ClearingHouseUser({
             clearingHouse: this,
             userAccountPublicKey,
@@ -206,10 +206,10 @@ class ClearingHouse {
     /**
      * Update the wallet to use for clearing house transactions and linked user account
      * @param newWallet
-     * @param userIds
-     * @param activeUserId
+     * @param subAccountIds
+     * @param activeSubAccountId
      */
-    async updateWallet(newWallet, userIds = [0], activeUserId = 0) {
+    async updateWallet(newWallet, subAccountIds = [0], activeSubAccountId = 0) {
         const newProvider = new anchor_1.AnchorProvider(this.connection, newWallet, this.opts);
         const newProgram = new anchor_1.Program(clearing_house_json_1.default, this.program.programId, newProvider);
         // Update provider for txSender with new wallet details
@@ -222,28 +222,28 @@ class ClearingHouse {
             await Promise.all(this.unsubscribeUsers());
         }
         this.users.clear();
-        this.createUsers(userIds, this.userAccountSubscriptionConfig);
+        this.createUsers(subAccountIds, this.userAccountSubscriptionConfig);
         if (this.isSubscribed) {
             await Promise.all(this.subscribeUsers());
         }
-        this.activeUserId = activeUserId;
+        this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
     }
-    async switchActiveUser(userId) {
-        this.activeUserId = userId;
+    async switchActiveUser(subAccountId) {
+        this.activeSubAccountId = subAccountId;
     }
-    async addUser(userId) {
-        if (this.users.has(userId)) {
+    async addUser(subAccountId) {
+        if (this.users.has(subAccountId)) {
             return;
         }
-        const user = this.createUser(userId, this.userAccountSubscriptionConfig);
+        const user = this.createUser(subAccountId, this.userAccountSubscriptionConfig);
         await user.subscribe();
-        this.users.set(userId, user);
+        this.users.set(subAccountId, user);
     }
-    async initializeUserAccount(userId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
-        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name, referrerInfo);
+    async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const tx = new web3_js_1.Transaction();
-        if (userId === 0) {
+        if (subAccountId === 0) {
             // not the safest assumption, can explicitly check if user stats account exists if it causes problems
             tx.add(await this.getInitializeUserStatsIx());
         }
@@ -251,8 +251,8 @@ class ClearingHouse {
         const { txSig } = await this.txSender.send(tx, [], this.opts);
         return [txSig, userAccountPublicKey];
     }
-    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);
+    async getInitializeUserInstructions(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, subAccountId);
         const remainingAccounts = new Array();
         if (referrerInfo !== undefined) {
             remainingAccounts.push({
@@ -276,7 +276,7 @@ class ClearingHouse {
             });
         }
         const nameBuffer = (0, userName_1.encodeName)(name);
-        const initializeUserAccountIx = await this.program.instruction.initializeUser(userId, nameBuffer, {
+        const initializeUserAccountIx = await this.program.instruction.initializeUser(subAccountId, nameBuffer, {
             accounts: {
                 user: userAccountPublicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
@@ -302,25 +302,26 @@ class ClearingHouse {
             },
         });
     }
-    async updateUserName(name, userId = 0) {
+    async updateUserName(name, subAccountId = 0) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        return await this.program.rpc.updateUserName(userId, nameBuffer, {
+        return await this.program.rpc.updateUserName(subAccountId, nameBuffer, {
             accounts: {
-                user: await this.getUserAccountPublicKey(),
+                user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
             },
         });
     }
-    async updateUserCustomMarginRatio(marginRatio, userId = 0) {
-        return await this.program.rpc.updateUserCustomMarginRatio(userId, marginRatio, {
+    async updateUserCustomMarginRatio(marginRatio, subAccountId = 0) {
+        return await this.program.rpc.updateUserCustomMarginRatio(subAccountId, marginRatio, {
             accounts: {
                 user: await this.getUserAccountPublicKey(),
                 authority: this.wallet.publicKey,
             },
         });
     }
-    async updateUserDelegate(delegate, userId = 0) {
-        return await this.program.rpc.updateUserDelegate(userId, delegate, {
+    async updateUserDelegate(delegate, subAccountId = 0) {
+        return await this.program.rpc.updateUserDelegate(subAccountId, delegate, {
             accounts: {
                 user: await this.getUserAccountPublicKey(),
                 authority: this.wallet.publicKey,
@@ -339,9 +340,9 @@ class ClearingHouse {
         ]);
         return programAccounts.map((programAccount) => programAccount.account);
     }
-    async deleteUser(userId = 0) {
+    async deleteUser(subAccountId = 0) {
         var _a;
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, userId);
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         const txSig = await this.program.rpc.deleteUser({
             accounts: {
                 user: userAccountPublicKey,
@@ -350,16 +351,16 @@ class ClearingHouse {
                 state: await this.getStatePublicKey(),
             },
         });
-        await ((_a = this.users.get(userId)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
-        this.users.delete(userId);
+        await ((_a = this.users.get(subAccountId)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
+        this.users.delete(subAccountId);
         return txSig;
     }
-    getUser(userId) {
-        userId = userId !== null && userId !== void 0 ? userId : this.activeUserId;
-        if (!this.users.has(userId)) {
-            throw new Error(`Clearing House has no user for user id ${userId}`);
+    getUser(subAccountId) {
+        subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
+        if (!this.users.has(subAccountId)) {
+            throw new Error(`Clearing House has no user for user id ${subAccountId}`);
         }
-        return this.users.get(userId);
+        return this.users.get(subAccountId);
     }
     getUsers() {
         return [...this.users.values()];
@@ -377,11 +378,11 @@ class ClearingHouse {
     async getUserAccountPublicKey() {
         return this.getUser().userAccountPublicKey;
     }
-    getUserAccount(userId) {
-        return this.getUser(userId).getUserAccount();
+    getUserAccount(subAccountId) {
+        return this.getUser(subAccountId).getUserAccount();
     }
-    getUserAccountAndSlot(userId) {
-        return this.getUser(userId).getUserAccountAndSlot();
+    getUserAccountAndSlot(subAccountId) {
+        return this.getUser(subAccountId).getUserAccountAndSlot();
     }
     getSpotPosition(marketIndex) {
         return this.getUserAccount().spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
@@ -389,7 +390,15 @@ class ClearingHouse {
     getQuoteAssetTokenAmount() {
         const spotMarket = this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         const spotPosition = this.getSpotPosition(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-        return (0, spotBalance_1.getTokenAmount)(spotPosition.balance, spotMarket, spotPosition.balanceType);
+        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
+    }
+    getTokenAmount(marketIndex) {
+        const spotPosition = this.getSpotPosition(marketIndex);
+        if (spotPosition === undefined) {
+            return numericConstants_1.ZERO;
+        }
+        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
     }
     getRemainingAccounts(params) {
         var _a;
@@ -535,8 +544,12 @@ class ClearingHouse {
         var _a;
         return (_a = this.getUserAccount()) === null || _a === void 0 ? void 0 : _a.orders.find((order) => order.userOrderId === userOrderId);
     }
-    async deposit(amount, marketIndex, collateralAccountPublicKey, userId, reduceOnly = false) {
+    async deposit(amount, marketIndex, collateralAccountPublicKey, subAccountId, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
+        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
+            units: 600000,
+            additionalFee: 0,
+        }));
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -550,7 +563,7 @@ class ClearingHouse {
             });
             signers.forEach((signer) => additionalSigners.push(signer));
         }
-        const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, collateralAccountPublicKey, userId, reduceOnly, true);
+        const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, collateralAccountPublicKey, subAccountId, reduceOnly, true);
         tx.add(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
@@ -559,9 +572,9 @@ class ClearingHouse {
         const { txSig } = await this.txSender.send(tx, additionalSigners, this.opts);
         return txSig;
     }
-    async getDepositInstruction(amount, marketIndex, userTokenAccount, userId, reduceOnly = false, userInitialized = true) {
-        const userAccountPublicKey = userId
-            ? await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, userId)
+    async getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, reduceOnly = false, userInitialized = true) {
+        const userAccountPublicKey = subAccountId
+            ? await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId)
             : await this.getUserAccountPublicKey();
         let remainingAccounts = [];
         if (userInitialized) {
@@ -634,13 +647,13 @@ class ClearingHouse {
      * @param amount
      * @param userTokenAccount
      * @param marketIndex
-     * @param userId
+     * @param subAccountId
      * @param name
-     * @param fromUserId
+     * @param fromSubAccountId
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, userId = 0, name = userName_1.DEFAULT_USER_NAME, fromUserId, referrerInfo) {
-        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(userId, name, referrerInfo);
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo) {
+        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const additionalSigners = [];
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -655,10 +668,10 @@ class ClearingHouse {
             });
             signers.forEach((signer) => additionalSigners.push(signer));
         }
-        const depositCollateralIx = fromUserId != null
-            ? await this.getTransferDepositIx(amount, marketIndex, fromUserId, userId)
-            : await this.getDepositInstruction(amount, marketIndex, userTokenAccount, userId, false, false);
-        if (userId === 0) {
+        const depositCollateralIx = fromSubAccountId != null
+            ? await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, subAccountId)
+            : await this.getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, false, false);
+        if (subAccountId === 0) {
             tx.add(await this.getInitializeUserStatsIx());
         }
         tx.add(initializeUserAccountIx).add(depositCollateralIx);
@@ -669,12 +682,12 @@ class ClearingHouse {
         const { txSig } = await this.txSender.send(tx, additionalSigners, this.opts);
         return [txSig, userAccountPublicKey];
     }
-    async initializeUserAccountForDevnet(userId = 0, name = userName_1.DEFAULT_USER_NAME, marketIndex, tokenFaucet, amount, referrerInfo) {
+    async initializeUserAccountForDevnet(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, marketIndex, 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, marketIndex, associateTokenPublicKey, userId, false, false);
+        const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
+        const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associateTokenPublicKey, subAccountId, false, false);
         const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToIx);
-        if (userId === 0) {
+        if (subAccountId === 0) {
             tx.add(await this.getInitializeUserStatsIx());
         }
         tx.add(initializeUserAccountIx).add(depositCollateralIx);
@@ -683,6 +696,10 @@ class ClearingHouse {
     }
     async withdraw(amount, marketIndex, userTokenAccount, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
+        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
+            units: 600000,
+            additionalFee: 0,
+        }));
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -735,23 +752,23 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async transferDeposit(amount, marketIndex, fromUserId, toUserId) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getTransferDepositIx(amount, marketIndex, fromUserId, toUserId)), [], this.opts);
+    async transferDeposit(amount, marketIndex, fromSubAccountId, toSubAccountId) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId)), [], this.opts);
         return txSig;
     }
-    async getTransferDepositIx(amount, marketIndex, fromUserId, toUserId) {
-        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromUserId);
-        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toUserId);
+    async getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId) {
+        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
+        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
         let remainingAccounts;
-        if (this.users.has(fromUserId)) {
+        if (this.users.has(fromSubAccountId)) {
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [this.users.get(fromUserId).getUserAccount()],
+                userAccounts: [this.users.get(fromSubAccountId).getUserAccount()],
                 useMarketLastSlotCache: true,
                 writableSpotMarketIndexes: [marketIndex],
             });
         }
         else {
-            const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, fromUserId);
+            const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, fromSubAccountId);
             const fromUserAccount = (await this.program.account.user.fetch(userAccountPublicKey));
             remainingAccounts = this.getRemainingAccounts({
                 userAccounts: [fromUserAccount],
@@ -780,6 +797,7 @@ class ClearingHouse {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarket.pubkey,
+                oracle: spotMarket.oracle,
             },
         });
     }
@@ -801,11 +819,35 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async removeLiquidity(marketIndex, sharesToBurn) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getRemoveLiquidityIx(marketIndex, sharesToBurn)), [], this.opts);
+    async removePerpLpShares(marketIndex, sharesToBurn) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn)), [], this.opts);
         return txSig;
     }
-    async getRemoveLiquidityIx(marketIndex, sharesToBurn) {
+    async removePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn)), [], this.opts);
+        return txSig;
+    }
+    async getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
+        const userAccount = (await this.program.account.user.fetch(userAccountPublicKey));
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [userAccount],
+            useMarketLastSlotCache: true,
+            writablePerpMarketIndexes: [marketIndex],
+        });
+        if (sharesToBurn == undefined) {
+            const perpPosition = userAccount.perpPositions.filter((position) => position.marketIndex === marketIndex)[0];
+            sharesToBurn = perpPosition.lpShares;
+            console.log('burning lp shares:', sharesToBurn.toString());
+        }
+        return this.program.instruction.removePerpLpSharesInExpiringMarket(sharesToBurn, marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+            },
+            remainingAccounts: remainingAccounts,
+        });
+    }
+    async getRemovePerpLpSharesIx(marketIndex, sharesToBurn) {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
@@ -818,7 +860,7 @@ class ClearingHouse {
             sharesToBurn = perpPosition.lpShares;
             console.log('burning lp shares:', sharesToBurn.toString());
         }
-        return this.program.instruction.removeLiquidity(sharesToBurn, marketIndex, {
+        return this.program.instruction.removePerpLpShares(sharesToBurn, marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
@@ -827,19 +869,19 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async addLiquidity(amount, marketIndex) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getAddLiquidityIx(amount, marketIndex)), [], this.opts);
+    async addPerpLpShares(amount, marketIndex) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getAddPerpLpSharesIx(amount, marketIndex)), [], this.opts);
         this.marketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
-    async getAddLiquidityIx(amount, marketIndex) {
+    async getAddPerpLpSharesIx(amount, marketIndex) {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
         });
-        return this.program.instruction.addLiquidity(amount, marketIndex, {
+        return this.program.instruction.addPerpLpShares(amount, marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
@@ -984,6 +1026,20 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
+    async settleExpiredMarketPoolsToRevenuePool(perpMarketIndex) {
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
+        const spotMarketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+        const ix = await this.program.instruction.settleExpiredMarketPoolsToRevenuePool({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                admin: this.wallet.publicKey,
+                spotMarket: spotMarketPublicKey,
+                perpMarket: perpMarketPublicKey,
+            },
+        });
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(ix), [], this.opts);
+        return txSig;
+    }
     async cancelOrder(orderId) {
         const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrderIx(orderId)), [], this.opts);
         return txSig;
@@ -1025,6 +1081,25 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
+    async cancelOrders(marketType, marketIndex, direction) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrdersIx(marketType, marketIndex, direction)), [], this.opts);
+        return txSig;
+    }
+    async getCancelOrdersIx(marketType, marketIndex, direction) {
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount()],
+            useMarketLastSlotCache: true,
+        });
+        return await this.program.instruction.cancelOrders(marketType !== null && marketType !== void 0 ? marketType : null, marketIndex !== null && marketIndex !== void 0 ? marketIndex : null, direction !== null && direction !== void 0 ? direction : null, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
     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;
@@ -1150,86 +1225,7 @@ class ClearingHouse {
         const orderId = order.orderId;
         const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
         if (fulfillmentConfig) {
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.pubkey,
-                isWritable: false,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumProgramId,
-                isWritable: false,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumMarket,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumRequestQueue,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumEventQueue,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumBids,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumAsks,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumBaseVault,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumQuoteVault,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: fulfillmentConfig.serumOpenOrders,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: (0, pda_1.getSerumSignerPublicKey)(fulfillmentConfig.serumProgramId, fulfillmentConfig.serumMarket, fulfillmentConfig.serumSignerNonce),
-                isWritable: false,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: this.getSignerPublicKey(),
-                isWritable: false,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: spl_token_1.TOKEN_PROGRAM_ID,
-                isWritable: false,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: this.getSpotMarketAccount(marketIndex).vault,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: this.getQuoteSpotMarketAccount().vault,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: this.getStateAccount().srmVault,
-                isWritable: false,
-                isSigner: false,
-            });
+            this.addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
         }
         return await this.program.instruction.fillSpotOrder(orderId, fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null, makerOrderId, {
             accounts: {
@@ -1243,6 +1239,88 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
+    addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig) {
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.pubkey,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumProgramId,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumMarket,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumRequestQueue,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumEventQueue,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumBids,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumAsks,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumBaseVault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumQuoteVault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.serumOpenOrders,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: (0, pda_1.getSerumSignerPublicKey)(fulfillmentConfig.serumProgramId, fulfillmentConfig.serumMarket, fulfillmentConfig.serumSignerNonce),
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSignerPublicKey(),
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: spl_token_1.TOKEN_PROGRAM_ID,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSpotMarketAccount(marketIndex).vault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getQuoteSpotMarketAccount().vault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getStateAccount().srmVault,
+            isWritable: false,
+            isSigner: false,
+        });
+    }
     async triggerOrder(userAccountPublicKey, user, order) {
         const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getTriggerOrderIx(userAccountPublicKey, user, order)), [], this.opts);
         return txSig;
@@ -1367,6 +1445,106 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
+    async placeAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo)), [], this.opts);
+        return txSig;
+    }
+    async getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo) {
+        orderParams = this.getOrderParams(orderParams, types_1.MarketType.SPOT);
+        const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const userAccounts = [this.getUserAccount()];
+        if (makerInfo !== undefined) {
+            userAccounts.push(makerInfo.makerUserAccount);
+        }
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts,
+            useMarketLastSlotCache: true,
+            writableSpotMarketIndexes: [
+                orderParams.marketIndex,
+                numericConstants_1.QUOTE_SPOT_MARKET_INDEX,
+            ],
+        });
+        let makerOrderId = null;
+        if (makerInfo) {
+            makerOrderId = makerInfo.order.orderId;
+            remainingAccounts.push({
+                pubkey: makerInfo.maker,
+                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,
+            });
+        }
+        if (fulfillmentConfig) {
+            this.addSerumRemainingAccounts(orderParams.marketIndex, remainingAccounts, fulfillmentConfig);
+        }
+        return await this.program.instruction.placeAndTakeSpotOrder(orderParams, fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null, makerOrderId, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
+    async placeAndMakeSpotOrder(orderParams, takerInfo, referrerInfo) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, referrerInfo)), [], this.opts);
+        return txSig;
+    }
+    async getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, referrerInfo) {
+        orderParams = this.getOrderParams(orderParams, types_1.MarketType.SPOT);
+        const userStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount(), takerInfo.takerUserAccount],
+            useMarketLastSlotCache: true,
+            writableSpotMarketIndexes: [
+                orderParams.marketIndex,
+                numericConstants_1.QUOTE_SPOT_MARKET_INDEX,
+            ],
+        });
+        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.placeAndMakeSpotOrder(orderParams, takerOrderId, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: userStatsPublicKey,
+                taker: takerInfo.taker,
+                takerStats: takerInfo.takerStats,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
     /**
      * Close an entire position. If you want to reduce a position, use the {@link openPosition} method in the opposite direction of the current position.
      * @param marketIndex
@@ -1419,25 +1597,6 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async settleExpiredPosition(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getSettleExpiredPositionIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex)), [], this.opts);
-        return txSig;
-    }
-    async getSettleExpiredPositionIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [settleeUserAccount],
-            writablePerpMarketIndexes: [marketIndex],
-            writableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
-        });
-        return await this.program.instruction.settleExpiredPosition(marketIndex, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
-                user: settleeUserAccountPublicKey,
-            },
-            remainingAccounts: remainingAccounts,
-        });
-    }
     async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount) {
         const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount)), [], this.opts);
         this.marketLastSlotCache.set(marketIndex, slot);
@@ -1564,7 +1723,7 @@ class ClearingHouse {
                 liquidator: liquidatorPublicKey,
                 liquidatorStats: liquidatorStatsPublicKey,
                 spotMarketVault: spotMarket.vault,
-                insuranceFundVault: spotMarket.insuranceFundVault,
+                insuranceFundVault: spotMarket.insuranceFund.vault,
                 clearingHouseSigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -1593,22 +1752,23 @@ class ClearingHouse {
                 liquidatorStats: liquidatorStatsPublicKey,
                 liquidator: liquidatorPublicKey,
                 spotMarketVault: spotMarket.vault,
-                insuranceFundVault: spotMarket.insuranceFundVault,
+                insuranceFundVault: spotMarket.insuranceFund.vault,
                 clearingHouseSigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts: remainingAccounts,
         });
     }
-    async updateFundingRate(oracle, marketIndex) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(oracle, marketIndex)), [], this.opts);
+    async updateFundingRate(perpMarketIndex, oracle) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(perpMarketIndex, oracle)), [], this.opts);
         return txSig;
     }
-    async getUpdateFundingRateIx(oracle, marketIndex) {
-        return await this.program.instruction.updateFundingRate(marketIndex, {
+    async getUpdateFundingRateIx(perpMarketIndex, oracle) {
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
+        return await this.program.instruction.updateFundingRate(perpMarketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                market: await (0, pda_1.getMarketPublicKey)(this.program.programId, marketIndex),
+                perpMarket: perpMarketPublicKey,
                 oracle: oracle,
             },
         });
@@ -1640,7 +1800,7 @@ class ClearingHouse {
     triggerEvent(eventName, data) {
         this.eventEmitter.emit(eventName, data);
     }
-    getOracleDataForMarket(marketIndex) {
+    getOracleDataForPerpMarket(marketIndex) {
         const oracleKey = this.getPerpMarketAccount(marketIndex).amm.oracle;
         const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
         return oracleData;
@@ -1685,7 +1845,7 @@ class ClearingHouse {
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
-                insuranceFundVault: spotMarket.insuranceFundVault,
+                insuranceFundVault: spotMarket.insuranceFund.vault,
                 clearingHouseSigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -1708,7 +1868,7 @@ class ClearingHouse {
                 insuranceFundStake: ifStakeAccountPublicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
-                insuranceFundVault: spotMarketAccount.insuranceFundVault,
+                insuranceFundVault: spotMarketAccount.insuranceFund.vault,
             },
             remainingAccounts,
         });
@@ -1728,7 +1888,7 @@ class ClearingHouse {
                 insuranceFundStake: ifStakeAccountPublicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
-                insuranceFundVault: spotMarketAccount.insuranceFundVault,
+                insuranceFundVault: spotMarketAccount.insuranceFund.vault,
             },
             remainingAccounts,
         });
@@ -1748,7 +1908,7 @@ class ClearingHouse {
                 insuranceFundStake: ifStakeAccountPublicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
-                insuranceFundVault: spotMarketAccount.insuranceFundVault,
+                insuranceFundVault: spotMarketAccount.insuranceFund.vault,
                 clearingHouseSigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -1769,7 +1929,7 @@ class ClearingHouse {
                 spotMarket: spotMarketAccount.pubkey,
                 spotMarketVault: spotMarketAccount.vault,
                 clearingHouseSigner: this.getSignerPublicKey(),
-                insuranceFundVault: spotMarketAccount.insuranceFundVault,
+                insuranceFundVault: spotMarketAccount.insuranceFund.vault,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts,
@@ -1792,7 +1952,7 @@ class ClearingHouse {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
-                insuranceFundVault: spotMarket.insuranceFundVault,
+                insuranceFundVault: spotMarket.insuranceFund.vault,
                 clearingHouseSigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },