@drift-labs/sdk 2.21.0-beta.0 → 2.21.0-beta.2

package/lib/dlob/DLOB.js

@@ -633,8 +633,10 @@ class DLOB {
      * @returns
      */
     *getMakerLimitAsks(marketIndex, slot, marketType, oraclePriceData, fallbackBid) {
+        const isPerpMarket = (0, __1.isVariant)(marketType, 'perp');
         for (const node of this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)) {
-            if (fallbackBid &&
+            if (isPerpMarket &&
+                fallbackBid &&
                 node.getPrice(oraclePriceData, slot).lte(fallbackBid)) {
                 continue;
             }
@@ -668,8 +670,10 @@ class DLOB {
      * @returns
      */
     *getMakerLimitBids(marketIndex, slot, marketType, oraclePriceData, fallbackAsk) {
+        const isPerpMarket = (0, __1.isVariant)(marketType, 'perp');
         for (const node of this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)) {
-            if (fallbackAsk &&
+            if (isPerpMarket &&
+                fallbackAsk &&
                 node.getPrice(oraclePriceData, slot).gte(fallbackAsk)) {
                 continue;
             }

package/lib/driftClient.d.ts

@@ -145,7 +145,7 @@ export declare class DriftClient {
      * @param fromSubAccountId
      * @returns
      */
-    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
+    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     initializeUserAccountForDevnet(subAccountId: number, name: string, marketIndex: number, tokenFaucet: TokenFaucet, amount: BN, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
     withdraw(amount: BN, marketIndex: number, userTokenAccount: PublicKey, reduceOnly?: boolean): Promise<TransactionSignature>;
     getWithdrawIx(amount: BN, marketIndex: number, userTokenAccount: PublicKey, reduceOnly?: boolean): Promise<TransactionInstruction>;
@@ -191,6 +191,7 @@ export declare class DriftClient {
     getCancelOrdersIx(marketType: MarketType | null, marketIndex: number | null, direction: PositionDirection | null): Promise<TransactionInstruction>;
     fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
     getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    getRevertFillIx(): Promise<TransactionInstruction>;
     placeSpotOrder(orderParams: OptionalOrderParams, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
     fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
@@ -201,8 +202,8 @@ export declare class DriftClient {
     getTriggerOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Order): Promise<TransactionInstruction>;
     forceCancelOrders(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
     getForceCancelOrdersIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
-    updateUserInactive(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
-    getUpdateUserInactiveIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
+    updateUserIdle(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
+    getUpdateUserIdleIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
     placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
     placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -820,12 +820,21 @@ class DriftClient {
      * @param fromSubAccountId
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo) {
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo, txParams) {
+        var _a;
         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);
         const tx = new web3_js_1.Transaction();
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+            units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
+        }));
+        if (txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) {
+            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: txParams.computeUnitsPrice,
+            }));
+        }
         const authority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority);
         if (createWSOLTokenAccount) {
@@ -1357,6 +1366,18 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    async getRevertFillIx() {
+        const fillerPublicKey = await this.getUserAccountPublicKey();
+        const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
+        return this.program.instruction.revertFill({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                filler: fillerPublicKey,
+                fillerStats: fillerStatsPublicKey,
+                authority: this.wallet.publicKey,
+            },
+        });
+    }
     async placeSpotOrder(orderParams, txParams) {
         const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceSpotOrderIx(orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
@@ -1592,16 +1613,16 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async updateUserInactive(userAccountPublicKey, user, txParams) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateUserInactiveIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+    async updateUserIdle(userAccountPublicKey, user, txParams) {
+        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateUserIdleIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         return txSig;
     }
-    async getUpdateUserInactiveIx(userAccountPublicKey, userAccount) {
+    async getUpdateUserIdleIx(userAccountPublicKey, userAccount) {
         const fillerPublicKey = await this.getUserAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [userAccount],
         });
-        return await this.program.instruction.updateUserInactive({
+        return await this.program.instruction.updateUserIdle({
             accounts: {
                 state: await this.getStatePublicKey(),
                 filler: fillerPublicKey,

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.21.0-beta.0",
+    "version": "2.21.0-beta.2",
     "name": "drift",
     "instructions": [
         {
@@ -909,6 +909,32 @@
                 }
             ]
         },
+        {
+            "name": "revertFill",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "filler",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "fillerStats",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "fillSpotOrder",
             "accounts": [
@@ -1023,6 +1049,32 @@
             ],
             "args": []
         },
+        {
+            "name": "updateUserIdle",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "filler",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "settlePnl",
             "accounts": [
@@ -8742,6 +8794,11 @@
             "code": 6238,
             "name": "UserNotInactive",
             "msg": "User Not Inactive"
+        },
+        {
+            "code": 6239,
+            "name": "RevertFill",
+            "msg": "RevertFill"
         }
     ]
 }

package/lib/tx/retryTxSender.js

@@ -31,12 +31,12 @@ class RetryTxSender {
     async prepareTx(tx, additionalSigners, opts) {
         tx.feePayer = this.provider.wallet.publicKey;
         tx.recentBlockhash = (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
-        const signedTx = await this.provider.wallet.signTransaction(tx);
         additionalSigners
             .filter((s) => s !== undefined)
             .forEach((kp) => {
-            signedTx.partialSign(kp);
+            tx.partialSign(kp);
         });
+        const signedTx = await this.provider.wallet.signTransaction(tx);
         return signedTx;
     }
     async sendVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {

package/lib/types.d.ts

@@ -847,7 +847,7 @@ export type UserAccount = {
     liquidationMarginFreed: BN;
     lastActiveSlot: BN;
     isMarginTradingEnabled: boolean;
-    inactive: boolean;
+    idle: boolean;
 };
 export type SpotPosition = {
     marketIndex: number;

package/lib/user.js

@@ -1214,7 +1214,7 @@ class User {
     }
     canMakeIdle(slot, slotsBeforeIdle) {
         const userAccount = this.getUserAccount();
-        if (userAccount.inactive) {
+        if (userAccount.idle) {
             return false;
         }
         const userLastActiveSlot = userAccount.lastActiveSlot;

package/lib/userMap/userMap.d.ts

@@ -40,4 +40,5 @@ export declare class UserMap implements UserMapInterface {
     updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
     size(): number;
+    sync(includeIdle?: boolean): Promise<void>;
 }

package/lib/userMap/userMap.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMap = void 0;
 const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
 class UserMap {
     constructor(driftClient, accountSubscription) {
         this.userMap = new Map();
@@ -131,5 +135,42 @@ class UserMap {
     size() {
         return this.userMap.size;
     }
+    async sync(includeIdle = true) {
+        let filters = undefined;
+        if (!includeIdle) {
+            filters = [
+                {
+                    memcmp: {
+                        offset: 4350,
+                        bytes: bs58_1.default.encode(Uint8Array.from([0])),
+                    },
+                },
+            ];
+        }
+        const programAccounts = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+            commitment: this.driftClient.connection.commitment,
+            filters: [
+                {
+                    memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
+                },
+                ...(Array.isArray(filters) ? filters : []),
+            ],
+        });
+        const programAccountMap = new Map();
+        for (const programAccount of programAccounts) {
+            programAccountMap.set(programAccount.pubkey.toString(), programAccount.account);
+        }
+        for (const key of programAccountMap.keys()) {
+            if (!this.has(key)) {
+                await this.addPubkey(new web3_js_1.PublicKey(key));
+            }
+        }
+        for (const [key, user] of this.userMap.entries()) {
+            if (!programAccountMap.has(key)) {
+                await user.unsubscribe();
+                this.userMap.delete(key);
+            }
+        }
+    }
 }
 exports.UserMap = UserMap;

package/lib/userMap/userStatsMap.d.ts

@@ -18,4 +18,5 @@ export declare class UserStatsMap {
     mustGet(authorityPublicKey: string): Promise<UserStats>;
     values(): IterableIterator<UserStats>;
     size(): number;
+    sync(): Promise<void>;
 }

package/lib/userMap/userStatsMap.js

@@ -137,5 +137,24 @@ class UserStatsMap {
     size() {
         return this.userStatsMap.size;
     }
+    async sync() {
+        const programAccounts = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+            commitment: this.driftClient.connection.commitment,
+            filters: [
+                {
+                    memcmp: this.driftClient.program.coder.accounts.memcmp('UserStats'),
+                },
+            ],
+        });
+        const programAccountMap = new Map();
+        for (const programAccount of programAccounts) {
+            programAccountMap.set(new web3_js_1.PublicKey(programAccount.account.data.slice(8, 40)).toString(), programAccount.account);
+        }
+        for (const key of programAccountMap.keys()) {
+            if (!this.has(key)) {
+                await this.addUserStat(new web3_js_1.PublicKey(key));
+            }
+        }
+    }
 }
 exports.UserStatsMap = UserStatsMap;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.21.0-beta.0",
+	"version": "2.21.0-beta.2",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/assert/assert.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+function assert(condition, error) {
+    if (!condition) {
+        throw new Error(error || 'Unspecified AssertionError');
+    }
+}
+exports.assert = assert;

package/src/dlob/DLOB.ts

@@ -1148,6 +1148,7 @@ export class DLOB {
 		oraclePriceData: OraclePriceData,
 		fallbackBid?: BN
 	): Generator<DLOBNode> {
+		const isPerpMarket = isVariant(marketType, 'perp');
 		for (const node of this.getRestingLimitAsks(
 			marketIndex,
 			slot,
@@ -1155,6 +1156,7 @@ export class DLOB {
 			oraclePriceData
 		)) {
 			if (
+				isPerpMarket &&
 				fallbackBid &&
 				node.getPrice(oraclePriceData, slot).lte(fallbackBid)
 			) {
@@ -1213,6 +1215,7 @@ export class DLOB {
 		oraclePriceData: OraclePriceData,
 		fallbackAsk?: BN
 	): Generator<DLOBNode> {
+		const isPerpMarket = isVariant(marketType, 'perp');
 		for (const node of this.getRestingLimitBids(
 			marketIndex,
 			slot,
@@ -1220,6 +1223,7 @@ export class DLOB {
 			oraclePriceData
 		)) {
 			if (
+				isPerpMarket &&
 				fallbackAsk &&
 				node.getPrice(oraclePriceData, slot).gte(fallbackAsk)
 			) {

package/src/driftClient.ts

@@ -1329,7 +1329,8 @@ export class DriftClient {
 		subAccountId = 0,
 		name = DEFAULT_USER_NAME,
 		fromSubAccountId?: number,
-		referrerInfo?: ReferrerInfo
+		referrerInfo?: ReferrerInfo,
+		txParams?: TxParams
 	): Promise<[TransactionSignature, PublicKey]> {
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
@@ -1346,6 +1347,20 @@ export class DriftClient {
 
 		const tx = new Transaction();
 
+		tx.add(
+			ComputeBudgetProgram.setComputeUnitLimit({
+				units: txParams?.computeUnits ?? 600_000,
+			})
+		);
+
+		if (txParams?.computeUnitsPrice) {
+			tx.add(
+				ComputeBudgetProgram.setComputeUnitPrice({
+					microLamports: txParams.computeUnitsPrice,
+				})
+			);
+		}
+
 		const authority = this.wallet.publicKey;
 
 		const createWSOLTokenAccount =
@@ -2394,6 +2409,20 @@ export class DriftClient {
 		});
 	}
 
+	public async getRevertFillIx(): Promise<TransactionInstruction> {
+		const fillerPublicKey = await this.getUserAccountPublicKey();
+		const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
+
+		return this.program.instruction.revertFill({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				filler: fillerPublicKey,
+				fillerStats: fillerStatsPublicKey,
+				authority: this.wallet.publicKey,
+			},
+		});
+	}
+
 	public async placeSpotOrder(
 		orderParams: OptionalOrderParams,
 		txParams?: TxParams
@@ -2759,14 +2788,14 @@ export class DriftClient {
 		});
 	}
 
-	public async updateUserInactive(
+	public async updateUserIdle(
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
 			wrapInTx(
-				await this.getUpdateUserInactiveIx(userAccountPublicKey, user),
+				await this.getUpdateUserIdleIx(userAccountPublicKey, user),
 				txParams?.computeUnits,
 				txParams?.computeUnitsPrice
 			),
@@ -2776,7 +2805,7 @@ export class DriftClient {
 		return txSig;
 	}
 
-	public async getUpdateUserInactiveIx(
+	public async getUpdateUserIdleIx(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount
 	): Promise<TransactionInstruction> {
@@ -2786,7 +2815,7 @@ export class DriftClient {
 			userAccounts: [userAccount],
 		});
 
-		return await this.program.instruction.updateUserInactive({
+		return await this.program.instruction.updateUserIdle({
 			accounts: {
 				state: await this.getStatePublicKey(),
 				filler: fillerPublicKey,

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.21.0-beta.0",
+  "version": "2.21.0-beta.2",
   "name": "drift",
   "instructions": [
     {
@@ -909,6 +909,32 @@
         }
       ]
     },
+    {
+      "name": "revertFill",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "fillerStats",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "fillSpotOrder",
       "accounts": [
@@ -1023,6 +1049,32 @@
       ],
       "args": []
     },
+    {
+      "name": "updateUserIdle",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "settlePnl",
       "accounts": [
@@ -8742,6 +8794,11 @@
       "code": 6238,
       "name": "UserNotInactive",
       "msg": "User Not Inactive"
+    },
+    {
+      "code": 6239,
+      "name": "RevertFill",
+      "msg": "RevertFill"
     }
   ]
 }

package/src/token/index.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTokenAccount = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+function parseTokenAccount(data) {
+    const accountInfo = spl_token_1.AccountLayout.decode(data);
+    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
+    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
+    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
+    if (accountInfo.delegateOption === 0) {
+        accountInfo.delegate = null;
+        // eslint-disable-next-line new-cap
+        accountInfo.delegatedAmount = new spl_token_1.u64(0);
+    }
+    else {
+        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
+        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
+    }
+    accountInfo.isInitialized = accountInfo.state !== 0;
+    accountInfo.isFrozen = accountInfo.state === 2;
+    if (accountInfo.isNativeOption === 1) {
+        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
+        accountInfo.isNative = true;
+    }
+    else {
+        accountInfo.rentExemptReserve = null;
+        accountInfo.isNative = false;
+    }
+    if (accountInfo.closeAuthorityOption === 0) {
+        accountInfo.closeAuthority = null;
+    }
+    else {
+        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
+    }
+    return accountInfo;
+}
+exports.parseTokenAccount = parseTokenAccount;

package/src/tx/retryTxSender.ts

@@ -75,13 +75,14 @@ export class RetryTxSender implements TxSender {
 			)
 		).blockhash;
 
-		const signedTx = await this.provider.wallet.signTransaction(tx);
 		additionalSigners
 			.filter((s): s is Signer => s !== undefined)
 			.forEach((kp) => {
-				signedTx.partialSign(kp);
+				tx.partialSign(kp);
 			});
 
+		const signedTx = await this.provider.wallet.signTransaction(tx);
+
 		return signedTx;
 	}
 

package/src/types.ts

@@ -800,7 +800,7 @@ export type UserAccount = {
 	liquidationMarginFreed: BN;
 	lastActiveSlot: BN;
 	isMarginTradingEnabled: boolean;
-	inactive: boolean;
+	idle: boolean;
 };
 
 export type SpotPosition = {

package/src/user.ts

@@ -2173,7 +2173,7 @@ export class User {
 
 	public canMakeIdle(slot: BN, slotsBeforeIdle: BN): boolean {
 		const userAccount = this.getUserAccount();
-		if (userAccount.inactive) {
+		if (userAccount.idle) {
 			return false;
 		}
 

package/src/userMap/userMap.ts

@@ -15,7 +15,9 @@ import {
 	LPRecord,
 } from '..';
 
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
+import { Buffer } from 'buffer';
+import bs58 from 'bs58';
 
 export interface UserMapInterface {
 	fetchAllUsers(): Promise<void>;
@@ -177,4 +179,53 @@ export class UserMap implements UserMapInterface {
 	public size(): number {
 		return this.userMap.size;
 	}
+
+	public async sync(includeIdle = true) {
+		let filters = undefined;
+		if (!includeIdle) {
+			filters = [
+				{
+					memcmp: {
+						offset: 4350,
+						bytes: bs58.encode(Uint8Array.from([0])),
+					},
+				},
+			];
+		}
+
+		const programAccounts =
+			await this.driftClient.connection.getProgramAccounts(
+				this.driftClient.program.programId,
+				{
+					commitment: this.driftClient.connection.commitment,
+					filters: [
+						{
+							memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
+						},
+						...(Array.isArray(filters) ? filters : []),
+					],
+				}
+			);
+
+		const programAccountMap = new Map<string, AccountInfo<Buffer>>();
+		for (const programAccount of programAccounts) {
+			programAccountMap.set(
+				programAccount.pubkey.toString(),
+				programAccount.account
+			);
+		}
+
+		for (const key of programAccountMap.keys()) {
+			if (!this.has(key)) {
+				await this.addPubkey(new PublicKey(key));
+			}
+		}
+
+		for (const [key, user] of this.userMap.entries()) {
+			if (!programAccountMap.has(key)) {
+				await user.unsubscribe();
+				this.userMap.delete(key);
+			}
+		}
+	}
 }

package/src/userMap/userStatsMap.ts

@@ -17,9 +17,10 @@ import {
 	InsuranceFundStakeRecord,
 } from '..';
 import { ProgramAccount } from '@project-serum/anchor';
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
 
 import { UserMap } from './userMap';
+import { Buffer } from 'buffer';
 
 export class UserStatsMap {
 	/**
@@ -190,4 +191,34 @@ export class UserStatsMap {
 	public size(): number {
 		return this.userStatsMap.size;
 	}
+
+	public async sync() {
+		const programAccounts =
+			await this.driftClient.connection.getProgramAccounts(
+				this.driftClient.program.programId,
+				{
+					commitment: this.driftClient.connection.commitment,
+					filters: [
+						{
+							memcmp:
+								this.driftClient.program.coder.accounts.memcmp('UserStats'),
+						},
+					],
+				}
+			);
+
+		const programAccountMap = new Map<string, AccountInfo<Buffer>>();
+		for (const programAccount of programAccounts) {
+			programAccountMap.set(
+				new PublicKey(programAccount.account.data.slice(8, 40)).toString(),
+				programAccount.account
+			);
+		}
+
+		for (const key of programAccountMap.keys()) {
+			if (!this.has(key)) {
+				await this.addUserStat(new PublicKey(key));
+			}
+		}
+	}
 }

package/src/util/computeUnits.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findComputeUnitConsumption = void 0;
+function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tx = yield connection.getTransaction(txSignature, { commitment });
+        const computeUnits = [];
+        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
+        tx.meta.logMessages.forEach((logMessage) => {
+            const match = logMessage.match(regex);
+            if (match && match[1]) {
+                computeUnits.push(match[1]);
+            }
+        });
+        return computeUnits;
+    });
+}
+exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/getTokenAddress.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenAddress = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const getTokenAddress = (mintAddress, userPubKey) => {
+    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
+};
+exports.getTokenAddress = getTokenAddress;

package/src/util/promiseTimeout.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseTimeout = void 0;
+function promiseTimeout(promise, timeoutMs) {
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve) => {
+        timeoutId = setTimeout(() => resolve(null), timeoutMs);
+    });
+    return Promise.race([promise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutId);
+        return result;
+    });
+}
+exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.estimateTps = void 0;
+function estimateTps(programId, connection, failed) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
+        if (failed) {
+            signatures = signatures.filter((signature) => signature.err);
+        }
+        const numberOfSignatures = signatures.length;
+        if (numberOfSignatures === 0) {
+            return 0;
+        }
+        return (numberOfSignatures /
+            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
+    });
+}
+exports.estimateTps = estimateTps;