@drift-labs/sdk 0.2.0-master.29 → 0.2.0-master.30

package/lib/clearingHouse.js

@@ -178,7 +178,6 @@ class ClearingHouse {
     }
     getPerpMarketAccount(marketIndex) {
         var _a;
-        marketIndex = marketIndex instanceof anchor_1.BN ? marketIndex : new anchor_1.BN(marketIndex);
         return (_a = this.accountSubscriber.getMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
     }
     getPerpMarketAccounts() {
@@ -187,7 +186,6 @@ class ClearingHouse {
             .map((value) => value.data);
     }
     getSpotMarketAccount(marketIndex) {
-        marketIndex = marketIndex instanceof anchor_1.BN ? marketIndex : new anchor_1.BN(marketIndex);
         return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
     }
     getSpotMarketAccounts() {
@@ -219,6 +217,7 @@ class ClearingHouse {
         this.wallet = newWallet;
         this.provider = newProvider;
         this.program = newProgram;
+        this.authority = newWallet.publicKey;
         if (this.isSubscribed) {
             await Promise.all(this.unsubscribeUsers());
         }
@@ -361,8 +360,7 @@ class ClearingHouse {
         return this.getUser(userId).getUserAccountAndSlot();
     }
     getSpotPosition(marketIndex) {
-        const marketIndexBN = marketIndex instanceof anchor_1.BN ? marketIndex : new anchor_1.BN(marketIndex);
-        return this.getUserAccount().spotPositions.find((spotPosition) => spotPosition.marketIndex.eq(marketIndexBN));
+        return this.getUserAccount().spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
     }
     getQuoteAssetTokenAmount() {
         const spotMarket = this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
@@ -400,9 +398,8 @@ class ClearingHouse {
         }
         for (const position of userAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position)) {
-                const marketIndexNum = position.marketIndex.toNumber();
-                const marketAccount = this.getPerpMarketAccount(marketIndexNum);
-                perpMarketAccountMap.set(marketIndexNum, {
+                const marketAccount = this.getPerpMarketAccount(position.marketIndex);
+                perpMarketAccountMap.set(position.marketIndex, {
                     pubkey: marketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -414,9 +411,9 @@ class ClearingHouse {
                 });
             }
         }
-        if (params.readablePerpMarketIndex) {
-            const marketAccount = this.getPerpMarketAccount(params.readablePerpMarketIndex.toNumber());
-            perpMarketAccountMap.set(params.readablePerpMarketIndex.toNumber(), {
+        if (params.readablePerpMarketIndex !== undefined) {
+            const marketAccount = this.getPerpMarketAccount(params.readablePerpMarketIndex);
+            perpMarketAccountMap.set(params.readablePerpMarketIndex, {
                 pubkey: marketAccount.pubkey,
                 isSigner: false,
                 isWritable: false,
@@ -427,9 +424,9 @@ class ClearingHouse {
                 isWritable: false,
             });
         }
-        if (params.writablePerpMarketIndex) {
-            const marketAccount = this.getPerpMarketAccount(params.writablePerpMarketIndex.toNumber());
-            perpMarketAccountMap.set(params.writablePerpMarketIndex.toNumber(), {
+        if (params.writablePerpMarketIndex !== undefined) {
+            const marketAccount = this.getPerpMarketAccount(params.writablePerpMarketIndex);
+            perpMarketAccountMap.set(params.writablePerpMarketIndex, {
                 pubkey: marketAccount.pubkey,
                 isSigner: false,
                 isWritable: true,
@@ -443,12 +440,12 @@ class ClearingHouse {
         for (const spotPosition of userAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarketAccount = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
                 });
-                if (!spotMarketAccount.marketIndex.eq(numericConstants_1.ZERO)) {
+                if (spotMarketAccount.marketIndex !== 0) {
                     oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
                         pubkey: spotMarketAccount.oracle,
                         isSigner: false,
@@ -457,14 +454,14 @@ class ClearingHouse {
                 }
             }
         }
-        if (params.readableSpotMarketIndex) {
+        if (params.readableSpotMarketIndex !== undefined) {
             const spotMarketAccount = this.getSpotMarketAccount(params.readableSpotMarketIndex);
-            spotMarketAccountMap.set(params.readableSpotMarketIndex.toNumber(), {
+            spotMarketAccountMap.set(params.readableSpotMarketIndex, {
                 pubkey: spotMarketAccount.pubkey,
                 isSigner: false,
                 isWritable: false,
             });
-            if (!spotMarketAccount.marketIndex.eq(numericConstants_1.ZERO)) {
+            if (spotMarketAccount.marketIndex !== 0) {
                 oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
                     pubkey: spotMarketAccount.oracle,
                     isSigner: false,
@@ -472,14 +469,14 @@ class ClearingHouse {
                 });
             }
         }
-        if (params.writableSpotMarketIndex) {
+        if (params.writableSpotMarketIndex !== undefined) {
             const spotMarketAccount = this.getSpotMarketAccount(params.writableSpotMarketIndex);
-            spotMarketAccountMap.set(params.writableSpotMarketIndex.toNumber(), {
+            spotMarketAccountMap.set(params.writableSpotMarketIndex, {
                 pubkey: spotMarketAccount.pubkey,
                 isSigner: false,
                 isWritable: true,
             });
-            if (!spotMarketAccount.marketIndex.eq(numericConstants_1.ZERO)) {
+            if (spotMarketAccount.marketIndex !== 0) {
                 oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
                     pubkey: spotMarketAccount.oracle,
                     isSigner: false,
@@ -510,7 +507,7 @@ class ClearingHouse {
         const authority = this.authority;
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(authority);
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount);
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             collateralAccountPublicKey = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
@@ -576,28 +573,7 @@ class ClearingHouse {
             return false;
         }
     }
-    async getSolWithdrawalIxs(marketIndex, 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, marketIndex, 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) {
+    async getWrappedSolAccountCreationIxs(amount, isDeposit) {
         const wrappedSolAccount = new web3_js_1.Keypair();
         const result = {
             ixs: [],
@@ -605,12 +581,14 @@ class ClearingHouse {
             pubkey: wrappedSolAccount.publicKey,
         };
         const rentSpaceLamports = new anchor_1.BN(web3_js_1.LAMPORTS_PER_SOL / 100);
-        const depositAmountLamports = amount.add(rentSpaceLamports);
+        const lamports = isDeposit
+            ? amount.add(rentSpaceLamports)
+            : rentSpaceLamports;
         const authority = this.wallet.publicKey;
         result.ixs.push(web3_js_1.SystemProgram.createAccount({
             fromPubkey: authority,
             newAccountPubkey: wrappedSolAccount.publicKey,
-            lamports: depositAmountLamports.toNumber(),
+            lamports: lamports.toNumber(),
             space: 165,
             programId: spl_token_1.TOKEN_PROGRAM_ID,
         }));
@@ -632,7 +610,7 @@ class ClearingHouse {
      * @param fromUserId
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = new anchor_1.BN(0), userId = 0, name = userName_1.DEFAULT_USER_NAME, fromUserId, referrerInfo) {
+    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);
         const additionalSigners = [];
         const spotMarket = this.getSpotMarketAccount(marketIndex);
@@ -641,7 +619,7 @@ class ClearingHouse {
         const authority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority);
         if (createWSOLTokenAccount) {
-            const { ixs: startIxs, signers, pubkey, } = await this.getWrappedSolAccountCreationIxs(amount);
+            const { ixs: startIxs, signers, pubkey, } = await this.getWrappedSolAccountCreationIxs(amount, true);
             userTokenAccount = pubkey;
             startIxs.forEach((ix) => {
                 tx.add(ix);
@@ -682,7 +660,7 @@ class ClearingHouse {
         const authority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority);
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount);
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, false);
             userTokenAccount = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
@@ -776,7 +754,7 @@ class ClearingHouse {
                     isWritable: true,
                     isSigner: false,
                 });
-                if (marketIndex.eq(position.marketIndex)) {
+                if (marketIndex === position.marketIndex) {
                     foundMarket = true;
                 }
             }
@@ -803,7 +781,7 @@ class ClearingHouse {
         });
         if (sharesToBurn == undefined) {
             const userAccount = this.getUserAccount();
-            const perpPosition = userAccount.perpPositions.filter((position) => position.marketIndex.eq(marketIndex))[0];
+            const perpPosition = userAccount.perpPositions.filter((position) => position.marketIndex === marketIndex)[0];
             sharesToBurn = perpPosition.lpShares;
             console.log('burning lp shares:', sharesToBurn.toString());
         }
@@ -818,7 +796,7 @@ class ClearingHouse {
     }
     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);
+        this.marketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
     async getAddLiquidityIx(amount, marketIndex) {
@@ -871,12 +849,12 @@ class ClearingHouse {
         fillTx.feePayer = userAccount.authority;
         const [signedMarketOrderTx, signedFillTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx]);
         const { txSig, slot } = await this.txSender.send(signedMarketOrderTx, [], this.opts, true);
-        this.marketLastSlotCache.set(orderParams.marketIndex.toNumber(), slot);
+        this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return { txSig, signedFillTx };
     }
     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);
+        this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
     getOrderParams(optionalOrderParams, marketType) {
@@ -906,12 +884,12 @@ class ClearingHouse {
     }
     async getUpdateAMMsIx(marketIndexes) {
         for (let i = marketIndexes.length; i < 5; i++) {
-            marketIndexes.push(new anchor_1.BN(100));
+            marketIndexes.push(100);
         }
         const marketAccountInfos = [];
         const oracleAccountInfos = [];
         for (const marketIndex of marketIndexes) {
-            if (!marketIndex.eq(new anchor_1.BN(100))) {
+            if (marketIndex !== 100) {
                 const market = this.getPerpMarketAccount(marketIndex);
                 marketAccountInfos.push({
                     pubkey: market.pubkey,
@@ -1022,7 +1000,7 @@ class ClearingHouse {
         for (const spotPosition of userAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarketAccount = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -1038,9 +1016,9 @@ class ClearingHouse {
         }
         for (const position of userAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position) &&
-                !position.marketIndex.eq(order.marketIndex)) {
+                position.marketIndex !== order.marketIndex) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                perpMarketAccountMap.set(position.marketIndex.toNumber(), {
+                perpMarketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1052,7 +1030,7 @@ class ClearingHouse {
                 });
             }
         }
-        perpMarketAccountMap.set(marketIndex.toNumber(), {
+        perpMarketAccountMap.set(marketIndex, {
             pubkey: marketAccount.pubkey,
             isWritable: true,
             isSigner: false,
@@ -1142,7 +1120,7 @@ class ClearingHouse {
         for (const spotPosition of userAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarket = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarket.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -1157,10 +1135,9 @@ class ClearingHouse {
             }
         }
         for (const position of userAccount.perpPositions) {
-            if (!(0, position_1.positionIsAvailable)(position) &&
-                !position.marketIndex.eq(order.marketIndex)) {
+            if (!(0, position_1.positionIsAvailable)(position)) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                perpMarketAccountMap.set(position.marketIndex.toNumber(), {
+                perpMarketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1173,7 +1150,7 @@ class ClearingHouse {
             }
         }
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-        spotMarketAccountMap.set(marketIndex.toNumber(), {
+        spotMarketAccountMap.set(marketIndex, {
             pubkey: spotMarketAccount.pubkey,
             isWritable: true,
             isSigner: false,
@@ -1186,7 +1163,7 @@ class ClearingHouse {
             });
         }
         const quoteMarketAccount = this.getQuoteSpotMarketAccount();
-        spotMarketAccountMap.set(quoteMarketAccount.marketIndex.toNumber(), {
+        spotMarketAccountMap.set(quoteMarketAccount.marketIndex, {
             pubkey: quoteMarketAccount.pubkey,
             isWritable: true,
             isSigner: false,
@@ -1298,6 +1275,11 @@ class ClearingHouse {
                 isWritable: true,
                 isSigner: false,
             });
+            remainingAccounts.push({
+                pubkey: this.getStateAccount().srmVault,
+                isWritable: false,
+                isSigner: false,
+            });
         }
         return await this.program.instruction.fillSpotOrder(orderId, fulfillmentConfig ? fulfillmentConfig.fulfillmentType : null, makerOrderId, {
             accounts: {
@@ -1325,7 +1307,7 @@ class ClearingHouse {
         for (const spotPosition of userAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarketAccount = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -1341,9 +1323,9 @@ class ClearingHouse {
         }
         for (const position of userAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position) &&
-                !position.marketIndex.eq(order.marketIndex)) {
+                position.marketIndex !== order.marketIndex) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                perpMarketAccountMap.set(position.marketIndex.toNumber(), {
+                perpMarketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1355,7 +1337,7 @@ class ClearingHouse {
                 });
             }
         }
-        perpMarketAccountMap.set(marketIndex.toNumber(), {
+        perpMarketAccountMap.set(marketIndex, {
             pubkey: marketAccount.pubkey,
             isWritable: true,
             isSigner: false,
@@ -1395,7 +1377,7 @@ class ClearingHouse {
         for (const spotPosition of userAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarketAccount = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -1411,9 +1393,9 @@ class ClearingHouse {
         }
         for (const position of userAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position) &&
-                !position.marketIndex.eq(order.marketIndex)) {
+                position.marketIndex !== order.marketIndex) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                perpMarketAccountMap.set(position.marketIndex.toNumber(), {
+                perpMarketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1426,12 +1408,12 @@ class ClearingHouse {
             }
         }
         const quoteSpotMarket = this.getQuoteSpotMarketAccount();
-        spotMarketAccountMap.set(quoteSpotMarket.marketIndex.toNumber(), {
+        spotMarketAccountMap.set(quoteSpotMarket.marketIndex, {
             pubkey: quoteSpotMarket.pubkey,
             isWritable: true,
             isSigner: false,
         });
-        spotMarketAccountMap.set(marketIndex.toNumber(), {
+        spotMarketAccountMap.set(marketIndex, {
             pubkey: spotMarketAccount.pubkey,
             isWritable: false,
             isSigner: false,
@@ -1459,7 +1441,7 @@ class ClearingHouse {
     }
     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);
+        this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
     async getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo) {
@@ -1508,7 +1490,7 @@ class ClearingHouse {
     }
     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);
+        this.marketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
     async getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo) {
@@ -1589,7 +1571,7 @@ class ClearingHouse {
         for (const position of settleeUserAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position)) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                perpMarketAccountMap.set(position.marketIndex.toNumber(), {
+                perpMarketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1604,12 +1586,12 @@ class ClearingHouse {
         for (const spotPosition of settleeUserAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarketAccount = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
                 });
-                if (!spotMarketAccount.marketIndex.eq(numericConstants_1.ZERO)) {
+                if (spotMarketAccount.marketIndex !== 0) {
                     oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
                         pubkey: spotMarketAccount.oracle,
                         isSigner: false,
@@ -1618,8 +1600,8 @@ class ClearingHouse {
                 }
             }
         }
-        const marketAccount = this.getPerpMarketAccount(marketIndex.toNumber());
-        perpMarketAccountMap.set(marketIndex.toNumber(), {
+        const marketAccount = this.getPerpMarketAccount(marketIndex);
+        perpMarketAccountMap.set(marketIndex, {
             pubkey: marketAccount.pubkey,
             isSigner: false,
             isWritable: true,
@@ -1629,7 +1611,7 @@ class ClearingHouse {
             isSigner: false,
             isWritable: false,
         });
-        spotMarketAccountMap.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX.toNumber(), {
+        spotMarketAccountMap.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, {
             pubkey: this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).pubkey,
             isSigner: false,
             isWritable: true,
@@ -1659,7 +1641,7 @@ class ClearingHouse {
         for (const position of settleeUserAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position)) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                marketAccountMap.set(position.marketIndex.toNumber(), {
+                marketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1674,12 +1656,12 @@ class ClearingHouse {
         for (const userBankBalance of settleeUserAccount.spotPositions) {
             if (!userBankBalance.balance.eq(numericConstants_1.ZERO)) {
                 const bankAccount = this.getSpotMarketAccount(userBankBalance.marketIndex);
-                spotMarketAccountMap.set(userBankBalance.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(userBankBalance.marketIndex, {
                     pubkey: bankAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
                 });
-                if (!bankAccount.marketIndex.eq(numericConstants_1.ZERO)) {
+                if (bankAccount.marketIndex !== 0) {
                     oracleAccountMap.set(bankAccount.oracle.toString(), {
                         pubkey: bankAccount.oracle,
                         isSigner: false,
@@ -1688,8 +1670,8 @@ class ClearingHouse {
                 }
             }
         }
-        const marketAccount = this.getPerpMarketAccount(marketIndex.toNumber());
-        marketAccountMap.set(marketIndex.toNumber(), {
+        const marketAccount = this.getPerpMarketAccount(marketIndex);
+        marketAccountMap.set(marketIndex, {
             pubkey: marketAccount.pubkey,
             isSigner: false,
             isWritable: true,
@@ -1699,7 +1681,7 @@ class ClearingHouse {
             isSigner: false,
             isWritable: false,
         });
-        spotMarketAccountMap.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX.toNumber(), {
+        spotMarketAccountMap.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, {
             pubkey: this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).pubkey,
             isSigner: false,
             isWritable: true,
@@ -1720,7 +1702,7 @@ class ClearingHouse {
     }
     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.toNumber(), slot);
+        this.marketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
     async getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount) {
@@ -1743,17 +1725,17 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async liquidateBorrow(userAccountPublicKey, userAccount, assetmarketIndex, liabilitymarketIndex, maxLiabilityTransfer) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowIx(userAccountPublicKey, userAccount, assetmarketIndex, liabilitymarketIndex, maxLiabilityTransfer)), [], this.opts);
+    async liquidateBorrow(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer)), [], this.opts);
         return txSig;
     }
-    async getLiquidateBorrowIx(userAccountPublicKey, userAccount, assetmarketIndex, liabilitymarketIndex, maxLiabilityTransfer) {
+    async getLiquidateBorrowIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccountsWithCounterparty({
             counterPartyUserAccount: userAccount,
-            writableSpotMarketIndexes: [liabilitymarketIndex, assetmarketIndex],
+            writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
         });
-        return await this.program.instruction.liquidateBorrow(assetmarketIndex, liabilitymarketIndex, maxLiabilityTransfer, {
+        return await this.program.instruction.liquidateBorrow(assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
@@ -1763,19 +1745,19 @@ class ClearingHouse {
             remainingAccounts: remainingAccounts,
         });
     }
-    async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilitymarketIndex, maxLiabilityTransfer) {
-        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilitymarketIndex, maxLiabilityTransfer)), [], this.opts);
-        this.marketLastSlotCache.set(perpMarketIndex.toNumber(), slot);
+    async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
+        const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer)), [], this.opts);
+        this.marketLastSlotCache.set(perpMarketIndex, slot);
         return txSig;
     }
-    async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilitymarketIndex, maxLiabilityTransfer) {
+    async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer) {
         const liquidatorPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccountsWithCounterparty({
             counterPartyUserAccount: userAccount,
             writablePerpMarketIndex: perpMarketIndex,
-            writableSpotMarketIndexes: [liabilitymarketIndex],
+            writableSpotMarketIndexes: [liabilityMarketIndex],
         });
-        return await this.program.instruction.liquidateBorrowForPerpPnl(perpMarketIndex, liabilitymarketIndex, maxLiabilityTransfer, {
+        return await this.program.instruction.liquidateBorrowForPerpPnl(perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 authority: this.wallet.publicKey,
@@ -1787,7 +1769,7 @@ class ClearingHouse {
     }
     async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer) {
         const { txSig, slot } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer)), [], this.opts);
-        this.marketLastSlotCache.set(perpMarketIndex.toNumber(), slot);
+        this.marketLastSlotCache.set(perpMarketIndex, slot);
         return txSig;
     }
     async getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer) {
@@ -1866,7 +1848,7 @@ class ClearingHouse {
         for (const spotPosition of counterPartyUserAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarket = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarket.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -1883,7 +1865,7 @@ class ClearingHouse {
         for (const position of counterPartyUserAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position)) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                marketAccountMap.set(position.marketIndex.toNumber(), {
+                marketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1923,7 +1905,7 @@ class ClearingHouse {
         for (const spotPosition of userAccount.spotPositions) {
             if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 const spotMarket = this.getSpotMarketAccount(spotPosition.marketIndex);
-                spotMarketAccountMap.set(spotPosition.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotPosition.marketIndex, {
                     pubkey: spotMarket.pubkey,
                     isSigner: false,
                     isWritable: false,
@@ -1940,7 +1922,7 @@ class ClearingHouse {
         for (const position of userAccount.perpPositions) {
             if (!(0, position_1.positionIsAvailable)(position)) {
                 const market = this.getPerpMarketAccount(position.marketIndex);
-                marketAccountMap.set(position.marketIndex.toNumber(), {
+                marketAccountMap.set(position.marketIndex, {
                     pubkey: market.pubkey,
                     isWritable: false,
                     isSigner: false,
@@ -1952,9 +1934,9 @@ class ClearingHouse {
                 });
             }
         }
-        if (params.writablePerpMarketIndex) {
+        if (params.writablePerpMarketIndex !== undefined) {
             const market = this.getPerpMarketAccount(params.writablePerpMarketIndex);
-            marketAccountMap.set(market.marketIndex.toNumber(), {
+            marketAccountMap.set(market.marketIndex, {
                 pubkey: market.pubkey,
                 isSigner: false,
                 isWritable: true,
@@ -1965,10 +1947,10 @@ class ClearingHouse {
                 isWritable: false,
             });
         }
-        if (params.writableSpotMarketIndexes) {
+        if (params.writableSpotMarketIndexes !== undefined) {
             for (const writableSpotMarketIndex of params.writableSpotMarketIndexes) {
                 const spotMarketAccount = this.getSpotMarketAccount(writableSpotMarketIndex);
-                spotMarketAccountMap.set(spotMarketAccount.marketIndex.toNumber(), {
+                spotMarketAccountMap.set(spotMarketAccount.marketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: true,

package/lib/clearingHouseConfig.d.ts

@@ -1,7 +1,5 @@
-/// <reference types="bn.js" />
 import { ConfirmOptions, Connection, PublicKey } from '@solana/web3.js';
 import { IWallet } from './types';
-import { BN } from '@project-serum/anchor';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
@@ -14,8 +12,8 @@ export declare type ClearingHouseConfig = {
     txSenderConfig?: TxSenderConfig;
     userIds?: number[];
     activeUserId?: number;
-    perpMarketIndexes?: BN[];
-    spotMarketIndexes?: BN[];
+    perpMarketIndexes?: number[];
+    spotMarketIndexes?: number[];
     oracleInfos?: OracleInfo[];
     env?: DriftEnv;
     userStats?: boolean;