@drift-labs/sdk 2.20.0 → 2.21.0-beta.1

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -14,8 +14,9 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     accountLoader: BulkAccountLoader;
     accountsToPoll: Map<string, AccountToPoll>;
     errorCallbackId?: string;
+    lazyDecode: boolean;
     user?: DataAndSlot<UserAccount>;
-    constructor(program: Program, userAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader);
+    constructor(program: Program, userAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader, lazyDecode?: boolean);
     subscribe(): Promise<boolean>;
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -5,13 +5,14 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const utils_1 = require("./utils");
 class PollingUserAccountSubscriber {
-    constructor(program, userAccountPublicKey, accountLoader) {
+    constructor(program, userAccountPublicKey, accountLoader, lazyDecode = false) {
         this.accountsToPoll = new Map();
         this.isSubscribed = false;
         this.program = program;
         this.accountLoader = accountLoader;
         this.eventEmitter = new events_1.EventEmitter();
         this.userAccountPublicKey = userAccountPublicKey;
+        this.lazyDecode = lazyDecode;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -40,7 +41,9 @@ class PollingUserAccountSubscriber {
                     return;
                 }
                 const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
-                this[accountToPoll.key] = { data: account, slot };
+                if (!this.lazyDecode) {
+                    this[accountToPoll.key] = { data: account, slot };
+                }
                 // @ts-ignore
                 this.eventEmitter.emit(accountToPoll.eventType, account);
                 this.eventEmitter.emit('update');
@@ -53,7 +56,12 @@ class PollingUserAccountSubscriber {
     async fetchIfUnloaded() {
         let shouldFetch = false;
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            if (this[accountToPoll.key] === undefined) {
+            if (!this.lazyDecode && this[accountToPoll.key] === undefined) {
+                shouldFetch = true;
+                break;
+            }
+            else if (this.lazyDecode &&
+                this.accountLoader.bufferAndSlotMap.has(accountToPoll.publicKey.toString())) {
                 shouldFetch = true;
                 break;
             }
@@ -66,7 +74,7 @@ class PollingUserAccountSubscriber {
         await this.accountLoader.load();
         for (const [_, accountToPoll] of this.accountsToPoll) {
             const { buffer, slot } = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey);
-            if (buffer) {
+            if (buffer && !this.lazyDecode) {
                 const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 this[accountToPoll.key] = { data: account, slot };
             }
@@ -75,7 +83,7 @@ class PollingUserAccountSubscriber {
     doAccountsExist() {
         let success = true;
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            if (!this[accountToPoll.key]) {
+            if (!this.accountLoader.bufferAndSlotMap.has(accountToPoll.publicKey.toString())) {
                 success = false;
                 break;
             }
@@ -101,7 +109,14 @@ class PollingUserAccountSubscriber {
     }
     getUserAccountAndSlot() {
         this.assertIsSubscribed();
-        return this.user;
+        if (!this.lazyDecode) {
+            return this.user;
+        }
+        else {
+            const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.userAccountPublicKey);
+            const account = this.program.account.user.coder.accounts.decode('User', buffer);
+            return { data: account, slot };
+        }
     }
 }
 exports.PollingUserAccountSubscriber = PollingUserAccountSubscriber;

package/lib/driftClient.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
-import { AnchorProvider, BN, Program } from '@project-serum/anchor';
+import { AnchorProvider, BN, Program, ProgramAccount } from '@project-serum/anchor';
 import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo } from './types';
 import * as anchor from '@project-serum/anchor';
 import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount } from '@solana/web3.js';
@@ -101,6 +101,7 @@ export declare class DriftClient {
     updateUserCustomMarginRatio(marginRatio: number, subAccountId?: number): Promise<TransactionSignature>;
     updateUserMarginTradingEnabled(marginTradingEnabled: boolean, subAccountId?: number): Promise<TransactionSignature>;
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
+    fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsForAuthority(authority: PublicKey): Promise<UserAccount[]>;
     deleteUser(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
@@ -190,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>;
@@ -200,6 +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>;
+    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

@@ -79,6 +79,7 @@ class DriftClient {
                 ? {
                     type: 'polling',
                     accountLoader: config.accountSubscription.accountLoader,
+                    lazyDecode: config.accountSubscription.lazyDecode,
                 }
                 : {
                     type: 'websocket',
@@ -424,6 +425,20 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async fetchAllUserAccounts(includeIdle = true) {
+        let filters = undefined;
+        if (!includeIdle) {
+            filters = [
+                {
+                    memcmp: {
+                        offset: 4350,
+                        bytes: bs58_1.default.encode(Uint8Array.from([0])),
+                    },
+                },
+            ];
+        }
+        return (await this.program.account.user.all(filters));
+    }
     async getUserAccountsForDelegate(delegate) {
         const programAccounts = await this.program.account.user.all([
             {
@@ -1343,6 +1358,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);
@@ -1578,6 +1605,25 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    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 getUpdateUserIdleIx(userAccountPublicKey, userAccount) {
+        const fillerPublicKey = await this.getUserAccountPublicKey();
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [userAccount],
+        });
+        return await this.program.instruction.updateUserIdle({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                filler: fillerPublicKey,
+                user: userAccountPublicKey,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
     async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo, txParams) {
         const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);

package/lib/driftClientConfig.d.ts

@@ -25,6 +25,7 @@ export type DriftClientSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
+    lazyDecode?: boolean;
 };
 type TxSenderConfig = {
     type: 'retry';

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.20.0",
+    "version": "2.21.0-beta.1",
     "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": [
@@ -4543,7 +4595,7 @@
                         "type": "u64"
                     },
                     {
-                        "name": "liquidationStartSlot",
+                        "name": "lastActiveSlot",
                         "type": "u64"
                     },
                     {
@@ -4572,12 +4624,16 @@
                         "name": "isMarginTradingEnabled",
                         "type": "bool"
                     },
+                    {
+                        "name": "idle",
+                        "type": "bool"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                26
+                                25
                             ]
                         }
                     }
@@ -8733,6 +8789,16 @@
             "code": 6237,
             "name": "UnableToLoadUserStatsAccount",
             "msg": "UnableToLoadUserStatsAccount"
+        },
+        {
+            "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

@@ -845,8 +845,9 @@ export type UserAccount = {
     totalSocialLoss: BN;
     cumulativePerpFunding: BN;
     liquidationMarginFreed: BN;
-    liquidationStartSlot: BN;
+    lastActiveSlot: BN;
     isMarginTradingEnabled: boolean;
+    idle: boolean;
 };
 export type SpotPosition = {
     marketIndex: number;

package/lib/user.d.ts

@@ -269,6 +269,7 @@ export declare class User {
         depositAmount: BN;
         maxDepositAmount: BN;
     };
+    canMakeIdle(slot: BN, slotsBeforeIdle: BN): boolean;
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore

package/lib/user.js

@@ -25,7 +25,7 @@ class User {
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
-            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader);
+            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader, config.accountSubscription.lazyDecode);
         }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey);
@@ -1212,6 +1212,38 @@ class User {
             depositAmount,
         };
     }
+    canMakeIdle(slot, slotsBeforeIdle) {
+        const userAccount = this.getUserAccount();
+        if (userAccount.idle) {
+            return false;
+        }
+        const userLastActiveSlot = userAccount.lastActiveSlot;
+        if (userLastActiveSlot.lt(slotsBeforeIdle)) {
+            return false;
+        }
+        if (this.isBeingLiquidated()) {
+            return false;
+        }
+        for (const perpPosition of userAccount.perpPositions) {
+            if (!(0, position_1.positionIsAvailable)(perpPosition)) {
+                return false;
+            }
+        }
+        for (const spotPosition of userAccount.spotPositions) {
+            if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
+                return false;
+            }
+            if (spotPosition.openOrders !== 0) {
+                return false;
+            }
+        }
+        for (const order of userAccount.orders) {
+            if (!(0, types_1.isVariant)(order.status, 'init')) {
+                return false;
+            }
+        }
+        return true;
+    }
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore

package/lib/userConfig.d.ts

@@ -11,4 +11,5 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
+    lazyDecode?: boolean;
 };

package/lib/userMap/userMap.d.ts

@@ -15,7 +15,7 @@ export declare class UserMap implements UserMapInterface {
     private driftClient;
     private accountSubscription;
     constructor(driftClient: DriftClient, accountSubscription: UserSubscriptionConfig);
-    fetchAllUsers(): Promise<void>;
+    fetchAllUsers(includeIdle?: boolean): Promise<void>;
     addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
     has(key: string): boolean;
     /**

package/lib/userMap/userMap.js

@@ -9,10 +9,10 @@ class UserMap {
         this.driftClient = driftClient;
         this.accountSubscription = accountSubscription;
     }
-    async fetchAllUsers() {
+    async fetchAllUsers(includeIdle = true) {
         const userArray = [];
         const userAccountArray = [];
-        const programUserAccounts = (await this.driftClient.program.account.user.all());
+        const programUserAccounts = await this.driftClient.fetchAllUserAccounts(includeIdle);
         for (const programUserAccount of programUserAccounts) {
             if (this.userMap.has(programUserAccount.publicKey.toString())) {
                 continue;

package/package.json

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

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -23,18 +23,22 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	accountsToPoll = new Map<string, AccountToPoll>();
 	errorCallbackId?: string;
 
+	lazyDecode: boolean;
+
 	user?: DataAndSlot<UserAccount>;
 
 	public constructor(
 		program: Program,
 		userAccountPublicKey: PublicKey,
-		accountLoader: BulkAccountLoader
+		accountLoader: BulkAccountLoader,
+		lazyDecode = false
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.accountLoader = accountLoader;
 		this.eventEmitter = new EventEmitter();
 		this.userAccountPublicKey = userAccountPublicKey;
+		this.lazyDecode = lazyDecode;
 	}
 
 	async subscribe(): Promise<boolean> {
@@ -75,7 +79,9 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					const account = this.program.account[
 						accountToPoll.key
 					].coder.accounts.decode(capitalize(accountToPoll.key), buffer);
-					this[accountToPoll.key] = { data: account, slot };
+					if (!this.lazyDecode) {
+						this[accountToPoll.key] = { data: account, slot };
+					}
 					// @ts-ignore
 					this.eventEmitter.emit(accountToPoll.eventType, account);
 					this.eventEmitter.emit('update');
@@ -91,7 +97,15 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	async fetchIfUnloaded(): Promise<void> {
 		let shouldFetch = false;
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			if (this[accountToPoll.key] === undefined) {
+			if (!this.lazyDecode && this[accountToPoll.key] === undefined) {
+				shouldFetch = true;
+				break;
+			} else if (
+				this.lazyDecode &&
+				this.accountLoader.bufferAndSlotMap.has(
+					accountToPoll.publicKey.toString()
+				)
+			) {
 				shouldFetch = true;
 				break;
 			}
@@ -108,7 +122,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
 				accountToPoll.publicKey
 			);
-			if (buffer) {
+			if (buffer && !this.lazyDecode) {
 				const account = this.program.account[
 					accountToPoll.key
 				].coder.accounts.decode(capitalize(accountToPoll.key), buffer);
@@ -120,7 +134,11 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	doAccountsExist(): boolean {
 		let success = true;
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			if (!this[accountToPoll.key]) {
+			if (
+				!this.accountLoader.bufferAndSlotMap.has(
+					accountToPoll.publicKey.toString()
+				)
+			) {
 				success = false;
 				break;
 			}
@@ -158,6 +176,17 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 
 	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
 		this.assertIsSubscribed();
-		return this.user;
+		if (!this.lazyDecode) {
+			return this.user;
+		} else {
+			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
+				this.userAccountPublicKey
+			);
+			const account = this.program.account.user.coder.accounts.decode(
+				'User',
+				buffer
+			);
+			return { data: account, slot };
+		}
 	}
 }

package/src/driftClient.ts

@@ -1,4 +1,10 @@
-import { AnchorProvider, BN, Idl, Program } from '@project-serum/anchor';
+import {
+	AnchorProvider,
+	BN,
+	Idl,
+	Program,
+	ProgramAccount,
+} from '@project-serum/anchor';
 import bs58 from 'bs58';
 import {
 	ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -154,6 +160,7 @@ export class DriftClient {
 				? {
 						type: 'polling',
 						accountLoader: config.accountSubscription.accountLoader,
+						lazyDecode: config.accountSubscription.lazyDecode,
 				  }
 				: {
 						type: 'websocket',
@@ -713,6 +720,25 @@ export class DriftClient {
 		return txSig;
 	}
 
+	public async fetchAllUserAccounts(
+		includeIdle = true
+	): Promise<ProgramAccount<UserAccount>[]> {
+		let filters = undefined;
+		if (!includeIdle) {
+			filters = [
+				{
+					memcmp: {
+						offset: 4350,
+						bytes: bs58.encode(Uint8Array.from([0])),
+					},
+				},
+			];
+		}
+		return (await this.program.account.user.all(
+			filters
+		)) as ProgramAccount<UserAccount>[];
+	}
+
 	public async getUserAccountsForDelegate(
 		delegate: PublicKey
 	): Promise<UserAccount[]> {
@@ -2369,6 +2395,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
@@ -2734,6 +2774,44 @@ export class DriftClient {
 		});
 	}
 
+	public async updateUserIdle(
+		userAccountPublicKey: PublicKey,
+		user: UserAccount,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig } = await this.txSender.send(
+			wrapInTx(
+				await this.getUpdateUserIdleIx(userAccountPublicKey, user),
+				txParams?.computeUnits,
+				txParams?.computeUnitsPrice
+			),
+			[],
+			this.opts
+		);
+		return txSig;
+	}
+
+	public async getUpdateUserIdleIx(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount
+	): Promise<TransactionInstruction> {
+		const fillerPublicKey = await this.getUserAccountPublicKey();
+
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [userAccount],
+		});
+
+		return await this.program.instruction.updateUserIdle({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				filler: fillerPublicKey,
+				user: userAccountPublicKey,
+				authority: this.wallet.publicKey,
+			},
+			remainingAccounts,
+		});
+	}
+
 	public async placeAndTakePerpOrder(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo | MakerInfo[],

package/src/driftClientConfig.ts

@@ -29,6 +29,7 @@ export type DriftClientSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
+			lazyDecode?: boolean;
 	  };
 
 type TxSenderConfig = {

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.20.0",
+  "version": "2.21.0-beta.1",
   "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": [
@@ -4543,7 +4595,7 @@
             "type": "u64"
           },
           {
-            "name": "liquidationStartSlot",
+            "name": "lastActiveSlot",
             "type": "u64"
           },
           {
@@ -4572,12 +4624,16 @@
             "name": "isMarginTradingEnabled",
             "type": "bool"
           },
+          {
+            "name": "idle",
+            "type": "bool"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                26
+                25
               ]
             }
           }
@@ -8733,6 +8789,16 @@
       "code": 6237,
       "name": "UnableToLoadUserStatsAccount",
       "msg": "UnableToLoadUserStatsAccount"
+    },
+    {
+      "code": 6238,
+      "name": "UserNotInactive",
+      "msg": "User Not Inactive"
+    },
+    {
+      "code": 6239,
+      "name": "RevertFill",
+      "msg": "RevertFill"
     }
   ]
 }

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

@@ -798,8 +798,9 @@ export type UserAccount = {
 	totalSocialLoss: BN;
 	cumulativePerpFunding: BN;
 	liquidationMarginFreed: BN;
-	liquidationStartSlot: BN;
+	lastActiveSlot: BN;
 	isMarginTradingEnabled: boolean;
+	idle: boolean;
 };
 
 export type SpotPosition = {

package/src/user.ts

@@ -12,7 +12,7 @@ import {
 	isOneOfVariant,
 	PerpMarketAccount,
 } from './types';
-import { calculateEntryPrice } from './math/position';
+import { calculateEntryPrice, positionIsAvailable } from './math/position';
 import {
 	PRICE_PRECISION,
 	AMM_TO_QUOTE_PRECISION_RATIO,
@@ -95,7 +95,8 @@ export class User {
 			this.accountSubscriber = new PollingUserAccountSubscriber(
 				config.driftClient.program,
 				config.userAccountPublicKey,
-				config.accountSubscription.accountLoader
+				config.accountSubscription.accountLoader,
+				config.accountSubscription.lazyDecode
 			);
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
@@ -2171,6 +2172,46 @@ export class User {
 		};
 	}
 
+	public canMakeIdle(slot: BN, slotsBeforeIdle: BN): boolean {
+		const userAccount = this.getUserAccount();
+		if (userAccount.idle) {
+			return false;
+		}
+
+		const userLastActiveSlot = userAccount.lastActiveSlot;
+		if (userLastActiveSlot.lt(slotsBeforeIdle)) {
+			return false;
+		}
+
+		if (this.isBeingLiquidated()) {
+			return false;
+		}
+
+		for (const perpPosition of userAccount.perpPositions) {
+			if (!positionIsAvailable(perpPosition)) {
+				return false;
+			}
+		}
+
+		for (const spotPosition of userAccount.spotPositions) {
+			if (isVariant(spotPosition.balanceType, 'borrow')) {
+				return false;
+			}
+
+			if (spotPosition.openOrders !== 0) {
+				return false;
+			}
+		}
+
+		for (const order of userAccount.orders) {
+			if (!isVariant(order.status, 'init')) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * Get the total position value, excluding any position coming from the given target market
 	 * @param marketToIgnore

package/src/userConfig.ts

@@ -15,4 +15,5 @@ export type UserSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
+			lazyDecode?: boolean;
 	  };

package/src/userMap/userMap.ts

@@ -14,7 +14,6 @@ import {
 	NewUserRecord,
 	LPRecord,
 } from '..';
-import { ProgramAccount } from '@project-serum/anchor';
 
 import { PublicKey } from '@solana/web3.js';
 
@@ -42,12 +41,13 @@ export class UserMap implements UserMapInterface {
 		this.accountSubscription = accountSubscription;
 	}
 
-	public async fetchAllUsers() {
+	public async fetchAllUsers(includeIdle = true) {
 		const userArray: User[] = [];
 		const userAccountArray: UserAccount[] = [];
 
-		const programUserAccounts =
-			(await this.driftClient.program.account.user.all()) as ProgramAccount<UserAccount>[];
+		const programUserAccounts = await this.driftClient.fetchAllUserAccounts(
+			includeIdle
+		);
 		for (const programUserAccount of programUserAccounts) {
 			if (this.userMap.has(programUserAccount.publicKey.toString())) {
 				continue;