@drift-labs/sdk 2.21.0-beta.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

@@ -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

@@ -79,6 +79,7 @@ class DriftClient {
                 ? {
                     type: 'polling',
                     accountLoader: config.accountSubscription.accountLoader,
+                    lazyDecode: config.accountSubscription.lazyDecode,
                 }
                 : {
                     type: 'websocket',
@@ -1357,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);
@@ -1592,16 +1605,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/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.21.0-beta.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": [
@@ -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

@@ -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);
@@ -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/userConfig.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.21.0-beta.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/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/driftClient.ts

@@ -160,6 +160,7 @@ export class DriftClient {
 				? {
 						type: 'polling',
 						accountLoader: config.accountSubscription.accountLoader,
+						lazyDecode: config.accountSubscription.lazyDecode,
 				  }
 				: {
 						type: 'websocket',
@@ -2394,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
@@ -2759,14 +2774,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 +2791,7 @@ export class DriftClient {
 		return txSig;
 	}
 
-	public async getUpdateUserInactiveIx(
+	public async getUpdateUserIdleIx(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount
 	): Promise<TransactionInstruction> {
@@ -2786,7 +2801,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/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.21.0-beta.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": [
@@ -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

@@ -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(
@@ -2173,7 +2174,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/userConfig.ts

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

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;