@drift-labs/sdk 2.97.0-beta.3 → 2.97.0-beta.30

package/lib/{driftClient.js → browser/driftClient.js}

@@ -67,7 +67,8 @@ const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
-const ed = __importStar(require("@noble/ed25519"));
+const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
+const tweetnacl_1 = __importDefault(require("tweetnacl"));
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -80,7 +81,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -145,18 +146,32 @@ class DriftClient {
                 accountLoader: config.accountSubscription.accountLoader,
             };
         }
+        else if (((_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.type) === 'grpc') {
+            this.userAccountSubscriptionConfig = {
+                type: 'grpc',
+                resubTimeoutMs: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.resubTimeoutMs,
+                logResubMessages: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.logResubMessages,
+                grpcConfigs: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.grpcConfigs,
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'grpc',
+                grpcConfigs: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.grpcConfigs,
+                resubTimeoutMs: (_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.resubTimeoutMs,
+                logResubMessages: (_x = config.accountSubscription) === null || _x === void 0 ? void 0 : _x.logResubMessages,
+            };
+        }
         else {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.resubTimeoutMs,
-                logResubMessages: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.logResubMessages,
-                commitment: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.commitment,
+                resubTimeoutMs: (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.resubTimeoutMs,
+                logResubMessages: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.logResubMessages,
+                commitment: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.resubTimeoutMs,
-                logResubMessages: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.logResubMessages,
-                commitment: (_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.commitment,
+                resubTimeoutMs: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.resubTimeoutMs,
+                logResubMessages: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.logResubMessages,
+                commitment: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.commitment,
             };
         }
         if (config.userStats) {
@@ -174,14 +189,20 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_x = config.accountSubscription) === null || _x === void 0 ? void 0 : _x.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_y = config.perpMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.spotMarketIndexes) !== null && _z !== void 0 ? _z : [], (_0 = config.oracleInfos) !== null && _0 !== void 0 ? _0 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
+        if (((_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_5 = config.perpMarketIndexes) !== null && _5 !== void 0 ? _5 : [], (_6 = config.spotMarketIndexes) !== null && _6 !== void 0 ? _6 : [], (_7 = config.oracleInfos) !== null && _7 !== void 0 ? _7 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
+        }
+        else if (((_8 = config.accountSubscription) === null || _8 === void 0 ? void 0 : _8.type) === 'grpc') {
+            this.accountSubscriber = new grpcDriftClientAccountSubscriber_1.gprcDriftClientAccountSubscriber(config.accountSubscription.grpcConfigs, this.program, (_9 = config.perpMarketIndexes) !== null && _9 !== void 0 ? _9 : [], (_10 = config.spotMarketIndexes) !== null && _10 !== void 0 ? _10 : [], (_11 = config.oracleInfos) !== null && _11 !== void 0 ? _11 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_12 = config.accountSubscription) === null || _12 === void 0 ? void 0 : _12.resubTimeoutMs,
+                logResubMessages: (_13 = config.accountSubscription) === null || _13 === void 0 ? void 0 : _13.logResubMessages,
+            });
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_1 = config.perpMarketIndexes) !== null && _1 !== void 0 ? _1 : [], (_2 = config.spotMarketIndexes) !== null && _2 !== void 0 ? _2 : [], (_3 = config.oracleInfos) !== null && _3 !== void 0 ? _3 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.resubTimeoutMs,
-                logResubMessages: (_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.logResubMessages,
-            }, (_6 = config.accountSubscription) === null || _6 === void 0 ? void 0 : _6.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_14 = config.perpMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.spotMarketIndexes) !== null && _15 !== void 0 ? _15 : [], (_16 = config.oracleInfos) !== null && _16 !== void 0 ? _16 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.resubTimeoutMs,
+                logResubMessages: (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.logResubMessages,
+            }, (_19 = config.accountSubscription) === null || _19 === void 0 ? void 0 : _19.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -189,14 +210,14 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_7 = config.txSender) !== null && _7 !== void 0 ? _7 : new retryTxSender_1.RetryTxSender({
+            (_20 = config.txSender) !== null && _20 !== void 0 ? _20 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
                 txHandler: this.txHandler,
             });
         this.sbOnDemandProgramdId =
-            config_1.configs[(_8 = config.env) !== null && _8 !== void 0 ? _8 : 'mainnet-beta'].SB_ON_DEMAND_PID;
+            config_1.configs[(_21 = config.env) !== null && _21 !== void 0 ? _21 : 'mainnet-beta'].SB_ON_DEMAND_PID;
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -544,6 +565,40 @@ class DriftClient {
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
+    async getInitializeUserStatsIx() {
+        return await this.program.instruction.initializeUserStats({
+            accounts: {
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                payer: this.wallet.publicKey,
+                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                state: await this.getStatePublicKey(),
+            },
+        });
+    }
+    async initializeRFQUser(userAccountPublicKey, txParams) {
+        const initializeIxs = [];
+        const [rfqUserAccountPublicKey, initializeUserAccountIx] = await this.getInitializeRFQUserInstruction(userAccountPublicKey);
+        initializeIxs.push(initializeUserAccountIx);
+        const tx = await this.buildTransaction(initializeIxs, txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return [txSig, rfqUserAccountPublicKey];
+    }
+    async getInitializeRFQUserInstruction(userAccountPublicKey) {
+        const rfqUserAccountPublicKey = (0, pda_1.getRFQUserAccountPublicKey)(this.program.programId, userAccountPublicKey);
+        const initializeUserAccountIx = await this.program.instruction.initializeRfqUser({
+            accounts: {
+                rfqUser: rfqUserAccountPublicKey,
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                payer: this.wallet.publicKey,
+                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+            },
+        });
+        return [rfqUserAccountPublicKey, initializeUserAccountIx];
+    }
     async getInitializeUserInstructions(subAccountId = 0, name, referrerInfo) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, subAccountId);
         const remainingAccounts = new Array();
@@ -591,18 +646,6 @@ class DriftClient {
         });
         return [userAccountPublicKey, initializeUserAccountIx];
     }
-    async getInitializeUserStatsIx() {
-        return await this.program.instruction.initializeUserStats({
-            accounts: {
-                userStats: this.getUserStatsAccountPublicKey(),
-                authority: this.wallet.publicKey,
-                payer: this.wallet.publicKey,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
-                state: await this.getStatePublicKey(),
-            },
-        });
-    }
     async getNextSubAccountId() {
         const userStats = this.getUserStats();
         let userStatsAccount;
@@ -2731,6 +2774,19 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    async updateUserStatsReferrerInfo(userStatsAccountPublicKey, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateUserStatsReferrerInfoIx(userStatsAccountPublicKey), txParams), [], this.opts);
+        return txSig;
+    }
+    async getUpdateUserStatsReferrerInfoIx(userStatsAccountPublicKey) {
+        return await this.program.instruction.updateUserStatsReferrerInfo({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                userStats: userStatsAccountPublicKey,
+                authority: this.wallet.publicKey,
+            },
+        });
+    }
     async updateUserOpenOrdersCount(userAccountPublicKey, user, txParams, fillerPublicKey) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateUserOpenOrdersCountIx(userAccountPublicKey, user, fillerPublicKey), txParams), [], this.opts);
         return txSig;
@@ -2949,13 +3005,13 @@ class DriftClient {
             swiftOrderSignature: decodedSwiftMessage.swiftSignature,
         };
     }
-    async signSwiftServerMessage(message) {
+    signSwiftServerMessage(message) {
         const swiftServerMessage = Uint8Array.from(this.encodeSwiftServerMessage(message));
-        return await this.signMessage(swiftServerMessage);
+        return this.signMessage(swiftServerMessage);
     }
-    async signSwiftOrderParamsMessage(orderParamsMessage) {
+    signSwiftOrderParamsMessage(orderParamsMessage) {
         const takerOrderParamsMessage = Uint8Array.from(this.encodeSwiftOrderParamsMessage(orderParamsMessage));
-        return await this.signMessage(takerOrderParamsMessage);
+        return this.signMessage(takerOrderParamsMessage);
     }
     encodeSwiftOrderParamsMessage(orderParamsMessage) {
         return this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage);
@@ -2963,8 +3019,8 @@ class DriftClient {
     decodeSwiftOrderParamsMessage(encodedMessage) {
         return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage);
     }
-    async signMessage(message, keypair = this.wallet.payer) {
-        return Buffer.from(await ed.sign(message, keypair.secretKey.slice(0, 32)));
+    signMessage(message, keypair = this.wallet.payer) {
+        return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));
     }
     async placeSwiftTakerOrder(swiftServerMessage, swiftSignature, swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, txParams) {
         const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftServerMessage, swiftSignature, swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo);
@@ -3052,6 +3108,61 @@ class DriftClient {
             placeAndMakeIx,
         ];
     }
+    encodeRFQMakerOrderParams(message) {
+        return this.program.coder.types.encode('RFQMakerOrderParams', message);
+    }
+    async placeAndMatchRFQOrders(rfqMatches, txParams) {
+        const ixs = await this.getPlaceAndMatchRFQOrdersIxs(rfqMatches);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
+        return txSig;
+    }
+    async getPlaceAndMatchRFQOrdersIxs(rfqMatches) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount()],
+            useMarketLastSlotCache: true,
+            writablePerpMarketIndexes: [rfqMatches[0].makerOrderParams.marketIndex],
+        });
+        const makerAccountMetas = [];
+        const verifyIxs = [];
+        for (const match of rfqMatches) {
+            const verifyIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+                publicKey: match.makerOrderParams.authority.toBytes(),
+                signature: match.makerSignature,
+                message: Uint8Array.from(this.encodeRFQMakerOrderParams(match.makerOrderParams)),
+            });
+            verifyIxs.push(verifyIx);
+            const userAccountPubkey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, match.makerOrderParams.authority, match.makerOrderParams.subAccountId);
+            makerAccountMetas.push({
+                pubkey: userAccountPubkey,
+                isWritable: true,
+                isSigner: false,
+            });
+            makerAccountMetas.push({
+                pubkey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, match.makerOrderParams.authority),
+                isWritable: true,
+                isSigner: false,
+            });
+            makerAccountMetas.push({
+                pubkey: (0, pda_1.getRFQUserAccountPublicKey)(this.program.programId, userAccountPubkey),
+                isWritable: true,
+                isSigner: false,
+            });
+        }
+        remainingAccounts.push(...makerAccountMetas);
+        const userStatsPublicKey = this.getUserStatsAccountPublicKey();
+        const user = await this.getUserAccountPublicKey();
+        const placeAndMatchRFQOrdersIx = await this.program.instruction.placeAndMatchRfqOrders(rfqMatches, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user,
+                userStats: userStatsPublicKey,
+                authority: this.wallet.publicKey,
+                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            remainingAccounts,
+        });
+        return [...verifyIxs, placeAndMatchRFQOrdersIx];
+    }
     async preparePlaceAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo, txParams, subAccountId) {
         const tx = await this.buildTransaction(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo, subAccountId), txParams);
         return {
@@ -3451,7 +3562,10 @@ class DriftClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                userAccount,
+                ...makerInfos.map((makerInfo) => makerInfo.makerUserAccount),
+            ],
             useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
         });
@@ -4254,6 +4368,50 @@ class DriftClient {
             .instruction());
         return [postIxs, encodedVaaKeypair];
     }
+    async enableUserHighLeverageMode(subAccountId, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getEnableHighLeverageModeIx(subAccountId), txParams), [], this.opts);
+        return txSig;
+    }
+    async getEnableHighLeverageModeIx(subAccountId) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount(subAccountId)],
+        });
+        const ix = await this.program.instruction.enableUserHighLeverageMode(subAccountId, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId),
+                authority: this.wallet.publicKey,
+                highLeverageModeConfig: (0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId),
+            },
+            remainingAccounts,
+        });
+        return ix;
+    }
+    async disableUserHighLeverageMode(user, userAccount, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getDisableHighLeverageModeIx(user, userAccount), txParams), [], this.opts);
+        return txSig;
+    }
+    async getDisableHighLeverageModeIx(user, userAccount) {
+        const remainingAccounts = userAccount
+            ? this.getRemainingAccounts({
+                userAccounts: [userAccount],
+            })
+            : undefined;
+        const ix = await this.program.instruction.disableUserHighLeverageMode({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user,
+                authority: this.wallet.publicKey,
+                highLeverageModeConfig: (0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId),
+            },
+            remainingAccounts,
+        });
+        return ix;
+    }
+    async fetchHighLeverageModeConfig() {
+        const config = await this.program.account.highLeverageModeConfig.fetch((0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId));
+        return config;
+    }
     handleSignedTransaction(signedTxs) {
         if (this.enableMetricsEvents && this.metricsEventEmitter) {
             this.metricsEventEmitter.emit('txSigned', signedTxs);
@@ -4267,13 +4425,22 @@ class DriftClient {
     isVersionedTransaction(tx) {
         return (0, utils_2.isVersionedTransaction)(tx);
     }
+    /**
+     * Send a transaction.
+     *
+     * @param tx
+     * @param additionalSigners
+     * @param opts :: Will fallback to DriftClient's opts if not provided
+     * @param preSigned
+     * @returns
+     */
     sendTransaction(tx, additionalSigners, opts, preSigned) {
         const isVersionedTx = this.isVersionedTransaction(tx);
         if (isVersionedTx) {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts !== null && opts !== void 0 ? opts : this.opts, preSigned);
         }
         else {
-            return this.txSender.send(tx, additionalSigners, opts, preSigned);
+            return this.txSender.send(tx, additionalSigners, opts !== null && opts !== void 0 ? opts : this.opts, preSigned);
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables, forceVersionedTransaction, recentBlockhash) {

package/lib/{driftClientConfig.d.ts → browser/driftClientConfig.d.ts}

@@ -5,7 +5,7 @@ import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
-import { DelistedMarketSetting } from './accounts/types';
+import { DelistedMarketSetting, GrpcConfigs } from './accounts/types';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -34,6 +34,11 @@ export type DriftClientConfig = {
     delistedMarketSetting?: DelistedMarketSetting;
 };
 export type DriftClientSubscriptionConfig = {
+    type: 'grpc';
+    grpcConfigs: GrpcConfigs;
+    resubTimeoutMs?: number;
+    logResubMessages?: boolean;
+} | {
     type: 'websocket';
     resubTimeoutMs?: number;
     logResubMessages?: boolean;