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

package/VERSION

@@ -1 +1 @@
-2.103.0-beta.0
+2.103.0-beta.2

package/lib/browser/driftClient.d.ts

@@ -703,6 +703,7 @@ export declare class DriftClient {
     settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     settleMultiplePNLs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature>;
+    settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature[]>;
     settleMultiplePNLsIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode): Promise<TransactionInstruction>;
     getSetUserStatusToBeingLiquidatedIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
     setUserStatusToBeingLiquidated(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionSignature>;

package/lib/browser/driftClient.js

@@ -3626,6 +3626,37 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode), txParams), [], this.opts);
         return txSig;
     }
+    async settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode, txParams) {
+        // need multiple TXs because settling more than 4 markets won't fit in a single TX
+        const txsToSign = [];
+        const marketIndexesInFourGroups = [];
+        for (let i = 0; i < marketIndexes.length; i += 4) {
+            marketIndexesInFourGroups.push(marketIndexes.slice(i, i + 4));
+        }
+        for (const marketIndexes of marketIndexesInFourGroups) {
+            const ix = await this.settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode);
+            const computeUnits = Math.min(300000 * marketIndexes.length, 1400000);
+            const tx = await this.buildTransaction(ix, {
+                ...txParams,
+                computeUnits,
+            });
+            txsToSign.push(tx);
+        }
+        const txsMap = {};
+        let i = 1;
+        for (const tx of txsToSign) {
+            txsMap[`tx-${i}`] = tx;
+            i++;
+        }
+        const signedTxs = (await this.txHandler.getSignedTransactionMap(txsMap, this.provider.wallet)).signedTxMap;
+        const txSigs = [];
+        for (const key in signedTxs) {
+            const tx = signedTxs[key];
+            const { txSig } = await this.sendTransaction(tx, [], this.opts, true);
+            txSigs.push(txSig);
+        }
+        return txSigs;
+    }
     async settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [settleeUserAccount],

package/lib/browser/userMap/userMap.d.ts

@@ -32,6 +32,7 @@ export declare class UserMap implements UserMapInterface {
     private syncConfig;
     private syncPromise?;
     private syncPromiseResolver;
+    private throwOnFailedSync;
     /**
      * Constructs a new UserMap instance.
      */

package/lib/browser/userMap/userMap.js

@@ -16,7 +16,7 @@ class UserMap {
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
             if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
@@ -83,6 +83,8 @@ class UserMap {
         this.syncConfig = (_e = config.syncConfig) !== null && _e !== void 0 ? _e : {
             type: 'default',
         };
+        // Whether to throw an error if the userMap fails to sync. Defaults to false.
+        this.throwOnFailedSync = (_f = config.throwOnFailedSync) !== null && _f !== void 0 ? _f : false;
     }
     async subscribe() {
         if (this.size() > 0) {
@@ -319,6 +321,9 @@ class UserMap {
         catch (err) {
             const e = err;
             console.error(`Error in UserMap.sync(): ${e.message} ${(_a = e.stack) !== null && _a !== void 0 ? _a : ''}`);
+            if (this.throwOnFailedSync) {
+                throw e;
+            }
         }
         finally {
             this.syncPromiseResolver();
@@ -408,6 +413,9 @@ class UserMap {
         }
         catch (err) {
             console.error(`Error in UserMap.sync():`, err);
+            if (this.throwOnFailedSync) {
+                throw err;
+            }
         }
         finally {
             if (this.syncPromiseResolver) {

package/lib/browser/userMap/userMapConfig.d.ts

@@ -34,4 +34,5 @@ export type UserMapConfig = {
     fastDecode?: boolean;
     disableSyncOnTotalAccountsChange?: boolean;
     syncConfig?: SyncConfig;
+    throwOnFailedSync?: boolean;
 };

package/lib/node/driftClient.d.ts

@@ -703,6 +703,7 @@ export declare class DriftClient {
     settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     settleMultiplePNLs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature>;
+    settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature[]>;
     settleMultiplePNLsIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode): Promise<TransactionInstruction>;
     getSetUserStatusToBeingLiquidatedIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
     setUserStatusToBeingLiquidated(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionSignature>;

package/lib/node/driftClient.js

@@ -3626,6 +3626,37 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode), txParams), [], this.opts);
         return txSig;
     }
+    async settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode, txParams) {
+        // need multiple TXs because settling more than 4 markets won't fit in a single TX
+        const txsToSign = [];
+        const marketIndexesInFourGroups = [];
+        for (let i = 0; i < marketIndexes.length; i += 4) {
+            marketIndexesInFourGroups.push(marketIndexes.slice(i, i + 4));
+        }
+        for (const marketIndexes of marketIndexesInFourGroups) {
+            const ix = await this.settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode);
+            const computeUnits = Math.min(300000 * marketIndexes.length, 1400000);
+            const tx = await this.buildTransaction(ix, {
+                ...txParams,
+                computeUnits,
+            });
+            txsToSign.push(tx);
+        }
+        const txsMap = {};
+        let i = 1;
+        for (const tx of txsToSign) {
+            txsMap[`tx-${i}`] = tx;
+            i++;
+        }
+        const signedTxs = (await this.txHandler.getSignedTransactionMap(txsMap, this.provider.wallet)).signedTxMap;
+        const txSigs = [];
+        for (const key in signedTxs) {
+            const tx = signedTxs[key];
+            const { txSig } = await this.sendTransaction(tx, [], this.opts, true);
+            txSigs.push(txSig);
+        }
+        return txSigs;
+    }
     async settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [settleeUserAccount],

package/lib/node/userMap/userMap.d.ts

@@ -32,6 +32,7 @@ export declare class UserMap implements UserMapInterface {
     private syncConfig;
     private syncPromise?;
     private syncPromiseResolver;
+    private throwOnFailedSync;
     /**
      * Constructs a new UserMap instance.
      */

package/lib/node/userMap/userMap.js

@@ -16,7 +16,7 @@ class UserMap {
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
             if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
@@ -83,6 +83,8 @@ class UserMap {
         this.syncConfig = (_e = config.syncConfig) !== null && _e !== void 0 ? _e : {
             type: 'default',
         };
+        // Whether to throw an error if the userMap fails to sync. Defaults to false.
+        this.throwOnFailedSync = (_f = config.throwOnFailedSync) !== null && _f !== void 0 ? _f : false;
     }
     async subscribe() {
         if (this.size() > 0) {
@@ -319,6 +321,9 @@ class UserMap {
         catch (err) {
             const e = err;
             console.error(`Error in UserMap.sync(): ${e.message} ${(_a = e.stack) !== null && _a !== void 0 ? _a : ''}`);
+            if (this.throwOnFailedSync) {
+                throw e;
+            }
         }
         finally {
             this.syncPromiseResolver();
@@ -408,6 +413,9 @@ class UserMap {
         }
         catch (err) {
             console.error(`Error in UserMap.sync():`, err);
+            if (this.throwOnFailedSync) {
+                throw err;
+            }
         }
         finally {
             if (this.syncPromiseResolver) {

package/lib/node/userMap/userMapConfig.d.ts

@@ -34,4 +34,5 @@ export type UserMapConfig = {
     fastDecode?: boolean;
     disableSyncOnTotalAccountsChange?: boolean;
     syncConfig?: SyncConfig;
+    throwOnFailedSync?: boolean;
 };

package/package.json

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

package/src/driftClient.ts

@@ -6792,6 +6792,55 @@ export class DriftClient {
 		return txSig;
 	}
 
+	public async settleMultiplePNLsMultipleTxs(
+		settleeUserAccountPublicKey: PublicKey,
+		settleeUserAccount: UserAccount,
+		marketIndexes: number[],
+		mode: SettlePnlMode,
+		txParams?: TxParams
+	): Promise<TransactionSignature[]> {
+		// need multiple TXs because settling more than 4 markets won't fit in a single TX
+		const txsToSign: (Transaction | VersionedTransaction)[] = [];
+		const marketIndexesInFourGroups: number[][] = [];
+		for (let i = 0; i < marketIndexes.length; i += 4) {
+			marketIndexesInFourGroups.push(marketIndexes.slice(i, i + 4));
+		}
+
+		for (const marketIndexes of marketIndexesInFourGroups) {
+			const ix = await this.settleMultiplePNLsIx(
+				settleeUserAccountPublicKey,
+				settleeUserAccount,
+				marketIndexes,
+				mode
+			);
+			const computeUnits = Math.min(300_000 * marketIndexes.length, 1_400_000);
+			const tx = await this.buildTransaction(ix, {
+				...txParams,
+				computeUnits,
+			});
+			txsToSign.push(tx);
+		}
+
+		const txsMap: Record<string, Transaction | VersionedTransaction> = {};
+		let i = 1;
+		for (const tx of txsToSign) {
+			txsMap[`tx-${i}`] = tx;
+			i++;
+		}
+		const signedTxs = (
+			await this.txHandler.getSignedTransactionMap(txsMap, this.provider.wallet)
+		).signedTxMap;
+
+		const txSigs: TransactionSignature[] = [];
+		for (const key in signedTxs) {
+			const tx = signedTxs[key];
+			const { txSig } = await this.sendTransaction(tx, [], this.opts, true);
+			txSigs.push(txSig);
+		}
+
+		return txSigs;
+	}
+
 	public async settleMultiplePNLsIx(
 		settleeUserAccountPublicKey: PublicKey,
 		settleeUserAccount: UserAccount,

package/src/userMap/userMap.ts

@@ -93,6 +93,8 @@ export class UserMap implements UserMapInterface {
 	private syncPromise?: Promise<void>;
 	private syncPromiseResolver: () => void;
 
+	private throwOnFailedSync: boolean;
+
 	/**
 	 * Constructs a new UserMap instance.
 	 */
@@ -157,6 +159,9 @@ export class UserMap implements UserMapInterface {
 		this.syncConfig = config.syncConfig ?? {
 			type: 'default',
 		};
+
+		// Whether to throw an error if the userMap fails to sync. Defaults to false.
+		this.throwOnFailedSync = config.throwOnFailedSync ?? false;
 	}
 
 	public async subscribe() {
@@ -465,6 +470,9 @@ export class UserMap implements UserMapInterface {
 		} catch (err) {
 			const e = err as Error;
 			console.error(`Error in UserMap.sync(): ${e.message} ${e.stack ?? ''}`);
+			if (this.throwOnFailedSync) {
+				throw e;
+			}
 		} finally {
 			this.syncPromiseResolver();
 			this.syncPromise = undefined;
@@ -580,6 +588,9 @@ export class UserMap implements UserMapInterface {
 			}
 		} catch (err) {
 			console.error(`Error in UserMap.sync():`, err);
+			if (this.throwOnFailedSync) {
+				throw err;
+			}
 		} finally {
 			if (this.syncPromiseResolver) {
 				this.syncPromiseResolver();

package/src/userMap/userMapConfig.ts

@@ -55,4 +55,7 @@ export type UserMapConfig = {
 	disableSyncOnTotalAccountsChange?: boolean;
 
 	syncConfig?: SyncConfig;
+
+	// Whether to throw an error if the userMap fails to sync. Defaults to true.
+	throwOnFailedSync?: boolean;
 };