@drift-labs/sdk 2.76.0-beta.6 → 2.76.0-beta.8

package/VERSION

@@ -1 +1 @@
-2.76.0-beta.6
+2.76.0-beta.8

package/lib/adminClient.d.ts

@@ -149,6 +149,8 @@ export declare class AdminClient extends DriftClient {
     getUpdatePerpMarketMaxImbalancesIx(perpMarketIndex: number, unrealizedMaxImbalance: BN, maxRevenueWithdrawPerPeriod: BN, quoteMaxInsurance: BN): Promise<TransactionInstruction>;
     updatePerpMarketMaxOpenInterest(perpMarketIndex: number, maxOpenInterest: BN): Promise<TransactionSignature>;
     getUpdatePerpMarketMaxOpenInterestIx(perpMarketIndex: number, maxOpenInterest: BN): Promise<TransactionInstruction>;
+    updatePerpMarketNumberOfUser(perpMarketIndex: number, numberOfUsers?: number, numberOfUsersWithBase?: number): Promise<TransactionSignature>;
+    getUpdatePerpMarketNumberOfUsersIx(perpMarketIndex: number, numberOfUsers?: number, numberOfUsersWithBase?: number): Promise<TransactionInstruction>;
     updatePerpMarketFeeAdjustment(perpMarketIndex: number, feeAdjustment: number): Promise<TransactionSignature>;
     getUpdatePerpMarketFeeAdjustmentIx(perpMarketIndex: number, feeAdjustment: number): Promise<TransactionInstruction>;
     updateSpotMarketFeeAdjustment(perpMarketIndex: number, feeAdjustment: number): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -1340,6 +1340,23 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updatePerpMarketNumberOfUser(perpMarketIndex, numberOfUsers, numberOfUsersWithBase) {
+        const updatepPerpMarketFeeAdjustmentIx = await this.getUpdatePerpMarketNumberOfUsersIx(perpMarketIndex, numberOfUsers, numberOfUsersWithBase);
+        const tx = await this.buildTransaction(updatepPerpMarketFeeAdjustmentIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdatePerpMarketNumberOfUsersIx(perpMarketIndex, numberOfUsers, numberOfUsersWithBase) {
+        return await this.program.instruction.updatePerpMarketNumberOfUsers(numberOfUsers, numberOfUsersWithBase, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
         const updatepPerpMarketFeeAdjustmentIx = await this.getUpdatePerpMarketFeeAdjustmentIx(perpMarketIndex, feeAdjustment);
         const tx = await this.buildTransaction(updatepPerpMarketFeeAdjustmentIx);

package/lib/idl/drift.json

@@ -4758,6 +4758,40 @@
                 }
             ]
         },
+        {
+            "name": "updatePerpMarketNumberOfUsers",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "numberOfUsers",
+                    "type": {
+                        "option": "u32"
+                    }
+                },
+                {
+                    "name": "numberOfUsersWithBase",
+                    "type": {
+                        "option": "u32"
+                    }
+                }
+            ]
+        },
         {
             "name": "updatePerpMarketFeeAdjustment",
             "accounts": [

package/lib/index.d.ts

@@ -75,6 +75,7 @@ export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';
 export * from './tx/priorityFeeCalculator';
+export * from './tx/forwardOnlyTxSender';
 export * from './tx/types';
 export * from './util/computeUnits';
 export * from './util/tps';

package/lib/index.js

@@ -98,6 +98,7 @@ __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);
 __exportStar(require("./tx/priorityFeeCalculator"), exports);
+__exportStar(require("./tx/forwardOnlyTxSender"), exports);
 __exportStar(require("./tx/types"), exports);
 __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/tps"), exports);

package/lib/tx/forwardOnlyTxSender.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="node" />
+import { ConfirmOptions, Connection } from '@solana/web3.js';
+import { IWallet } from '../types';
+import { BaseTxSender } from './baseTxSender';
+import { ConfirmationStrategy, TxSigAndSlot } from './types';
+type ResolveReference = {
+    resolve?: () => void;
+};
+export declare class ForwardOnlyTxSender extends BaseTxSender {
+    connection: Connection;
+    wallet: IWallet;
+    opts: ConfirmOptions;
+    timeout: number;
+    retrySleep: number;
+    additionalConnections: Connection[];
+    timoutCount: number;
+    constructor({ connection, wallet, opts, timeout, retrySleep, confirmationStrategy, additionalTxSenderCallbacks, }: {
+        connection: Connection;
+        wallet: IWallet;
+        opts?: ConfirmOptions;
+        timeout?: number;
+        retrySleep?: number;
+        confirmationStrategy?: ConfirmationStrategy;
+        additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+    });
+    sleep(reference: ResolveReference): Promise<void>;
+    sendToAdditionalConnections(rawTx: Buffer | Uint8Array, _opts: ConfirmOptions): void;
+    sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
+}
+export {};

package/lib/tx/forwardOnlyTxSender.js

@@ -0,0 +1,84 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ForwardOnlyTxSender = void 0;
+const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
+const baseTxSender_1 = require("./baseTxSender");
+const types_1 = require("./types");
+const DEFAULT_TIMEOUT = 35000;
+const DEFAULT_RETRY = 5000;
+class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
+    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], }) {
+        super({
+            connection,
+            wallet,
+            opts,
+            timeout,
+            additionalConnections: [],
+            confirmationStrategy,
+            additionalTxSenderCallbacks,
+        });
+        this.timoutCount = 0;
+        this.connection = connection;
+        this.wallet = wallet;
+        this.opts = opts;
+        this.timeout = timeout;
+        this.retrySleep = retrySleep;
+        this.additionalConnections = [];
+    }
+    async sleep(reference) {
+        return new Promise((resolve) => {
+            reference.resolve = resolve;
+            setTimeout(resolve, this.retrySleep);
+        });
+    }
+    sendToAdditionalConnections(rawTx, _opts) {
+        var _a;
+        (_a = this.additionalTxSenderCallbacks) === null || _a === void 0 ? void 0 : _a.map((callback) => {
+            callback(bs58_1.default.encode(rawTx));
+        });
+    }
+    async sendRawTransaction(rawTransaction, opts) {
+        const deserializedTx = web3_js_1.VersionedTransaction.deserialize(rawTransaction);
+        const txSig = deserializedTx.signatures[0];
+        const encodedTxSig = bs58_1.default.encode(txSig);
+        const startTime = this.getTimestamp();
+        this.sendToAdditionalConnections(rawTransaction, opts);
+        let done = false;
+        const resolveReference = {
+            resolve: undefined,
+        };
+        const stopWaiting = () => {
+            done = true;
+            if (resolveReference.resolve) {
+                resolveReference.resolve();
+            }
+        };
+        (async () => {
+            while (!done && this.getTimestamp() - startTime < this.timeout) {
+                await this.sleep(resolveReference);
+                if (!done) {
+                    this.sendToAdditionalConnections(rawTransaction, opts);
+                }
+            }
+        })();
+        let slot;
+        try {
+            const result = await this.confirmTransaction(encodedTxSig, opts.commitment);
+            slot = result.context.slot;
+            // eslint-disable-next-line no-useless-catch
+        }
+        catch (e) {
+            throw e;
+        }
+        finally {
+            stopWaiting();
+        }
+        return { txSig: encodedTxSig, slot };
+    }
+}
+exports.ForwardOnlyTxSender = ForwardOnlyTxSender;

package/lib/tx/retryTxSender.js

@@ -5,7 +5,7 @@ const types_1 = require("./types");
 const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
-const DEFAULT_RETRY = 3000;
+const DEFAULT_RETRY = 2000;
 class RetryTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], }) {
         super({

package/lib/tx/whileValidTxSender.js

@@ -8,7 +8,7 @@ const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const bs58_1 = __importDefault(require("bs58"));
-const DEFAULT_RETRY = 3000;
+const DEFAULT_RETRY = 2000;
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], }) {
         super({
@@ -44,7 +44,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             signedTx = await this.wallet.signTransaction(tx);
         }
         // handle subclass-specific side effects
-        const txSig = bs58_1.default.encode(((_a = tx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature) || tx.signatures[0]);
+        const txSig = bs58_1.default.encode(((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature) || signedTx.signatures[0]);
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }

package/package.json

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

package/src/adminClient.ts

@@ -2905,6 +2905,48 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async updatePerpMarketNumberOfUser(
+		perpMarketIndex: number,
+		numberOfUsers?: number,
+		numberOfUsersWithBase?: number
+	): Promise<TransactionSignature> {
+		const updatepPerpMarketFeeAdjustmentIx =
+			await this.getUpdatePerpMarketNumberOfUsersIx(
+				perpMarketIndex,
+				numberOfUsers,
+				numberOfUsersWithBase
+			);
+
+		const tx = await this.buildTransaction(updatepPerpMarketFeeAdjustmentIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdatePerpMarketNumberOfUsersIx(
+		perpMarketIndex: number,
+		numberOfUsers?: number,
+		numberOfUsersWithBase?: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketNumberOfUsers(
+			numberOfUsers,
+			numberOfUsersWithBase,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketFeeAdjustment(
 		perpMarketIndex: number,
 		feeAdjustment: number

package/src/idl/drift.json

@@ -4758,6 +4758,40 @@
         }
       ]
     },
+    {
+      "name": "updatePerpMarketNumberOfUsers",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "numberOfUsers",
+          "type": {
+            "option": "u32"
+          }
+        },
+        {
+          "name": "numberOfUsersWithBase",
+          "type": {
+            "option": "u32"
+          }
+        }
+      ]
+    },
     {
       "name": "updatePerpMarketFeeAdjustment",
       "accounts": [

package/src/index.ts

@@ -76,6 +76,7 @@ export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';
 export * from './tx/priorityFeeCalculator';
+export * from './tx/forwardOnlyTxSender';
 export * from './tx/types';
 export * from './util/computeUnits';
 export * from './util/tps';

package/src/tx/forwardOnlyTxSender.ts

@@ -0,0 +1,127 @@
+import { AnchorProvider } from '@coral-xyz/anchor';
+import {
+	ConfirmOptions,
+	Connection,
+	VersionedTransaction,
+} from '@solana/web3.js';
+import bs58 from 'bs58';
+import { IWallet } from '../types';
+import { BaseTxSender } from './baseTxSender';
+import { ConfirmationStrategy, TxSigAndSlot } from './types';
+
+const DEFAULT_TIMEOUT = 35000;
+const DEFAULT_RETRY = 5000;
+
+type ResolveReference = {
+	resolve?: () => void;
+};
+
+export class ForwardOnlyTxSender extends BaseTxSender {
+	connection: Connection;
+	wallet: IWallet;
+	opts: ConfirmOptions;
+	timeout: number;
+	retrySleep: number;
+	additionalConnections: Connection[];
+	timoutCount = 0;
+
+	public constructor({
+		connection,
+		wallet,
+		opts = { ...AnchorProvider.defaultOptions(), maxRetries: 0 },
+		timeout = DEFAULT_TIMEOUT,
+		retrySleep = DEFAULT_RETRY,
+		confirmationStrategy = ConfirmationStrategy.Combo,
+		additionalTxSenderCallbacks = [],
+	}: {
+		connection: Connection;
+		wallet: IWallet;
+		opts?: ConfirmOptions;
+		timeout?: number;
+		retrySleep?: number;
+		confirmationStrategy?: ConfirmationStrategy;
+		additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+	}) {
+		super({
+			connection,
+			wallet,
+			opts,
+			timeout,
+			additionalConnections: [],
+			confirmationStrategy,
+			additionalTxSenderCallbacks,
+		});
+		this.connection = connection;
+		this.wallet = wallet;
+		this.opts = opts;
+		this.timeout = timeout;
+		this.retrySleep = retrySleep;
+		this.additionalConnections = [];
+	}
+
+	async sleep(reference: ResolveReference): Promise<void> {
+		return new Promise((resolve) => {
+			reference.resolve = resolve;
+			setTimeout(resolve, this.retrySleep);
+		});
+	}
+
+	sendToAdditionalConnections(
+		rawTx: Buffer | Uint8Array,
+		_opts: ConfirmOptions
+	): void {
+		this.additionalTxSenderCallbacks?.map((callback) => {
+			callback(bs58.encode(rawTx));
+		});
+	}
+
+	async sendRawTransaction(
+		rawTransaction: Buffer | Uint8Array,
+		opts: ConfirmOptions
+	): Promise<TxSigAndSlot> {
+		const deserializedTx = VersionedTransaction.deserialize(rawTransaction);
+
+		const txSig = deserializedTx.signatures[0];
+		const encodedTxSig = bs58.encode(txSig);
+
+		const startTime = this.getTimestamp();
+
+		this.sendToAdditionalConnections(rawTransaction, opts);
+
+		let done = false;
+		const resolveReference: ResolveReference = {
+			resolve: undefined,
+		};
+		const stopWaiting = () => {
+			done = true;
+			if (resolveReference.resolve) {
+				resolveReference.resolve();
+			}
+		};
+
+		(async () => {
+			while (!done && this.getTimestamp() - startTime < this.timeout) {
+				await this.sleep(resolveReference);
+				if (!done) {
+					this.sendToAdditionalConnections(rawTransaction, opts);
+				}
+			}
+		})();
+
+		let slot: number;
+		try {
+			const result = await this.confirmTransaction(
+				encodedTxSig,
+				opts.commitment
+			);
+			slot = result.context.slot;
+			// eslint-disable-next-line no-useless-catch
+		} catch (e) {
+			throw e;
+		} finally {
+			stopWaiting();
+		}
+
+		return { txSig: encodedTxSig, slot };
+	}
+}

package/src/tx/retryTxSender.ts

@@ -5,7 +5,7 @@ import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 
 const DEFAULT_TIMEOUT = 35000;
-const DEFAULT_RETRY = 3000;
+const DEFAULT_RETRY = 2000;
 
 type ResolveReference = {
 	resolve?: () => void;

package/src/tx/whileValidTxSender.ts

@@ -14,7 +14,7 @@ import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 import bs58 from 'bs58';
 
-const DEFAULT_RETRY = 3000;
+const DEFAULT_RETRY = 2000;
 
 type ResolveReference = {
 	resolve?: () => void;
@@ -91,7 +91,9 @@ export class WhileValidTxSender extends BaseTxSender {
 		}
 
 		// handle subclass-specific side effects
-		const txSig = bs58.encode(tx.signatures[0]?.signature || tx.signatures[0]);
+		const txSig = bs58.encode(
+			signedTx.signatures[0]?.signature || signedTx.signatures[0]
+		);
 		this.untilValid.set(txSig, latestBlockhash);
 
 		return signedTx;