@drift-labs/sdk 2.97.0-beta.21 → 2.97.0-beta.22

package/VERSION

@@ -1 +1 @@
-2.97.0-beta.21
+2.97.0-beta.22

package/lib/addresses/pda.d.ts

@@ -8,6 +8,7 @@ export declare function getUserAccountPublicKeyAndNonce(programId: PublicKey, au
 export declare function getUserAccountPublicKey(programId: PublicKey, authority: PublicKey, subAccountId?: number): Promise<PublicKey>;
 export declare function getUserAccountPublicKeySync(programId: PublicKey, authority: PublicKey, subAccountId?: number): PublicKey;
 export declare function getUserStatsAccountPublicKey(programId: PublicKey, authority: PublicKey): PublicKey;
+export declare function getRFQUserAccountPublicKey(programId: PublicKey, userAccountPublicKey: PublicKey): PublicKey;
 export declare function getPerpMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getPerpMarketPublicKeySync(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getSpotMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;

package/lib/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_token_1 = require("@solana/spl-token");
@@ -62,6 +62,13 @@ function getUserStatsAccountPublicKey(programId, authority) {
     ], programId)[0];
 }
 exports.getUserStatsAccountPublicKey = getUserStatsAccountPublicKey;
+function getRFQUserAccountPublicKey(programId, userAccountPublicKey) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('RFQ')),
+        userAccountPublicKey.toBuffer(),
+    ], programId)[0];
+}
+exports.getRFQUserAccountPublicKey = getRFQUserAccountPublicKey;
 async function getPerpMarketPublicKey(programId, marketIndex) {
     return (await web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('perp_market')),

package/lib/driftClient.d.ts

@@ -4,7 +4,7 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
-import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, SwiftServerMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
+import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, RFQMakerOrderParams, RFQMatch, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, SwiftServerMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
 import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
@@ -136,8 +136,10 @@ export declare class DriftClient {
      */
     addAndSubscribeToUsers(authority?: PublicKey): Promise<boolean>;
     initializeUserAccount(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
-    getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
+    initializeRFQUser(userAccountPublicKey: PublicKey, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
+    getInitializeRFQUserInstruction(userAccountPublicKey: PublicKey): Promise<[PublicKey, TransactionInstruction]>;
+    getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getNextSubAccountId(): Promise<number>;
     initializeReferrerName(name: string): Promise<TransactionSignature>;
     updateUserName(name: string, subAccountId?: number): Promise<TransactionSignature>;
@@ -513,11 +515,11 @@ export declare class DriftClient {
     getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction>;
     encodeSwiftServerMessage(message: SwiftServerMessage): Buffer;
     decodeSwiftServerMessage(encodedMessage: Buffer): SwiftServerMessage;
-    signSwiftServerMessage(message: SwiftServerMessage): Promise<Buffer>;
-    signSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Promise<Buffer>;
+    signSwiftServerMessage(message: SwiftServerMessage): Buffer;
+    signSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Buffer;
     encodeSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Buffer;
     decodeSwiftOrderParamsMessage(encodedMessage: Buffer): SwiftOrderParamsMessage;
-    signMessage(message: Uint8Array, keypair?: Keypair): Promise<Buffer>;
+    signMessage(message: Uint8Array, keypair?: Keypair): Buffer;
     placeSwiftTakerOrder(swiftServerMessage: Buffer, swiftSignature: Buffer, swiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
@@ -538,6 +540,9 @@ export declare class DriftClient {
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
     }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction[]>;
+    encodeRFQMakerOrderParams(message: RFQMakerOrderParams): Buffer;
+    placeAndMatchRFQOrders(rfqMatches: RFQMatch[], txParams?: TxParams): Promise<TransactionSignature>;
+    getPlaceAndMatchRFQOrdersIxs(rfqMatches: RFQMatch[]): Promise<TransactionInstruction[]>;
     preparePlaceAndTakeSpotOrder(orderParams: OptionalOrderParams, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<{
         placeAndTakeSpotOrderTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;

package/lib/driftClient.js

@@ -67,7 +67,7 @@ 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 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.
@@ -544,6 +544,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 +625,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;
@@ -2962,13 +2984,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);
@@ -2976,8 +2998,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);
@@ -3065,6 +3087,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 {

package/lib/idl/drift.json

@@ -93,6 +93,42 @@
             ],
             "args": []
         },
+        {
+            "name": "initializeRfqUser",
+            "accounts": [
+                {
+                    "name": "rfqUser",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "rent",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "initializeReferrerName",
             "accounts": [
@@ -662,6 +698,51 @@
                 }
             ]
         },
+        {
+            "name": "placeAndMatchRfqOrders",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "ixSysvar",
+                    "isMut": false,
+                    "isSigner": false,
+                    "docs": [
+                        "the supplied Sysvar could be anything else.",
+                        "The Instruction Sysvar has not been implemented",
+                        "in the Anchor framework yet, so this is the safe approach."
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "rfqMatches",
+                    "type": {
+                        "vec": {
+                            "defined": "RFQMatch"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "placeSpotOrder",
             "accounts": [
@@ -6752,6 +6833,29 @@
                 ]
             }
         },
+        {
+            "name": "RFQUser",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "userPubkey",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "rfqOrderData",
+                        "type": {
+                            "array": [
+                                {
+                                    "defined": "RFQOrderId"
+                                },
+                                32
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "SpotMarket",
             "type": {
@@ -8407,6 +8511,109 @@
                 ]
             }
         },
+        {
+            "name": "RFQMakerOrderParams",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "uuid",
+                        "type": {
+                            "array": [
+                                "u8",
+                                8
+                            ]
+                        }
+                    },
+                    {
+                        "name": "authority",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "subAccountId",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "marketIndex",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "marketType",
+                        "type": {
+                            "defined": "MarketType"
+                        }
+                    },
+                    {
+                        "name": "baseAssetAmount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "direction",
+                        "type": {
+                            "defined": "PositionDirection"
+                        }
+                    },
+                    {
+                        "name": "maxTs",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
+        {
+            "name": "RFQMakerMessage",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "orderParams",
+                        "type": {
+                            "defined": "RFQMakerOrderParams"
+                        }
+                    },
+                    {
+                        "name": "signature",
+                        "type": {
+                            "array": [
+                                "u8",
+                                64
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "RFQMatch",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "baseAssetAmount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "makerOrderParams",
+                        "type": {
+                            "defined": "RFQMakerOrderParams"
+                        }
+                    },
+                    {
+                        "name": "makerSignature",
+                        "type": {
+                            "array": [
+                                "u8",
+                                64
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "ModifyOrderParams",
             "type": {
@@ -9226,6 +9433,27 @@
                 ]
             }
         },
+        {
+            "name": "RFQOrderId",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "uuid",
+                        "type": {
+                            "array": [
+                                "u8",
+                                8
+                            ]
+                        }
+                    },
+                    {
+                        "name": "maxTs",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
         {
             "name": "InsuranceFund",
             "type": {
@@ -10326,6 +10554,9 @@
                     },
                     {
                         "name": "Liquidation"
+                    },
+                    {
+                        "name": "RFQ"
                     }
                 ]
             }
@@ -13387,6 +13618,31 @@
             "code": 6290,
             "name": "InvalidHighLeverageModeConfig",
             "msg": "Invalid High Leverage Mode Config"
+        },
+        {
+            "code": 6291,
+            "name": "InvalidRFQUserAccount",
+            "msg": "Invalid RFQ User Account"
+        },
+        {
+            "code": 6292,
+            "name": "RFQUserAccountWrongMutability",
+            "msg": "RFQUserAccount should be mutable"
+        },
+        {
+            "code": 6293,
+            "name": "RFQUserAccountFull",
+            "msg": "RFQUserAccount has too many active RFQs"
+        },
+        {
+            "code": 6294,
+            "name": "RFQOrderNotFilled",
+            "msg": "RFQ order not filled as expected"
+        },
+        {
+            "code": 6295,
+            "name": "InvalidRFQOrder",
+            "msg": "RFQ orders must be jit makers"
         }
     ],
     "metadata": {

package/lib/types.d.ts

@@ -1122,6 +1122,26 @@ export type SwiftTriggerOrderParams = {
     triggerPrice: BN;
     baseAssetAmount: BN;
 };
+export type RFQMakerOrderParams = {
+    uuid: Uint8Array;
+    authority: PublicKey;
+    subAccountId: number;
+    marketIndex: number;
+    marketType: MarketType;
+    baseAssetAmount: BN;
+    price: BN;
+    direction: PositionDirection;
+    maxTs: BN;
+};
+export type RFQMakerMessage = {
+    orderParams: RFQMakerOrderParams;
+    signature: Uint8Array;
+};
+export type RFQMatch = {
+    baseAssetAmount: BN;
+    makerOrderParams: RFQMakerOrderParams;
+    makerSignature: Uint8Array;
+};
 export type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.97.0-beta.21",
+	"version": "2.97.0-beta.22",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -50,6 +50,7 @@
 		"rpc-websockets": "7.5.1",
 		"solana-bankrun": "^0.3.0",
 		"strict-event-emitter-types": "^2.0.0",
+		"tweetnacl": "1.0.3",
 		"uuid": "^8.3.2",
 		"zstddec": "^0.1.0"
 	},

package/src/addresses/pda.ts

@@ -72,6 +72,19 @@ export function getUserStatsAccountPublicKey(
 	)[0];
 }
 
+export function getRFQUserAccountPublicKey(
+	programId: PublicKey,
+	userAccountPublicKey: PublicKey
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('RFQ')),
+			userAccountPublicKey.toBuffer(),
+		],
+		programId
+	)[0];
+}
+
 export async function getPerpMarketPublicKey(
 	programId: PublicKey,
 	marketIndex: number

package/src/driftClient.ts

@@ -40,6 +40,8 @@ import {
 	PositionDirection,
 	ReferrerInfo,
 	ReferrerNameAccount,
+	RFQMakerOrderParams,
+	RFQMatch,
 	SerumV3FulfillmentConfigAccount,
 	SettlePnlMode,
 	SignedTxData,
@@ -90,6 +92,7 @@ import {
 	getPhoenixFulfillmentConfigPublicKey,
 	getPythPullOraclePublicKey,
 	getReferrerNamePublicKeySync,
+	getRFQUserAccountPublicKey,
 	getSerumFulfillmentConfigPublicKey,
 	getSerumSignerPublicKey,
 	getSpotMarketPublicKey,
@@ -164,7 +167,7 @@ import { getFeedIdUint8Array, trimFeedId } from './util/pythPullOracleUtils';
 import { isVersionedTransaction } from './tx/utils';
 import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed } from '@switchboard-xyz/on-demand';
-import * as ed from '@noble/ed25519';
+import nacl from 'tweetnacl';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -940,6 +943,56 @@ export class DriftClient {
 		return [txSig, userAccountPublicKey];
 	}
 
+	async getInitializeUserStatsIx(): Promise<TransactionInstruction> {
+		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(),
+			},
+		});
+	}
+
+	public async initializeRFQUser(
+		userAccountPublicKey: PublicKey,
+		txParams?: TxParams
+	): Promise<[TransactionSignature, PublicKey]> {
+		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: PublicKey
+	): Promise<[PublicKey, TransactionInstruction]> {
+		const rfqUserAccountPublicKey = 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?: string,
@@ -1004,19 +1057,6 @@ export class DriftClient {
 		return [userAccountPublicKey, initializeUserAccountIx];
 	}
 
-	async getInitializeUserStatsIx(): Promise<TransactionInstruction> {
-		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(): Promise<number> {
 		const userStats = this.getUserStats();
 		let userStatsAccount: UserStatsAccount;
@@ -5475,22 +5515,20 @@ export class DriftClient {
 		};
 	}
 
-	public async signSwiftServerMessage(
-		message: SwiftServerMessage
-	): Promise<Buffer> {
+	public signSwiftServerMessage(message: SwiftServerMessage): Buffer {
 		const swiftServerMessage = Uint8Array.from(
 			this.encodeSwiftServerMessage(message)
 		);
-		return await this.signMessage(swiftServerMessage);
+		return this.signMessage(swiftServerMessage);
 	}
 
-	public async signSwiftOrderParamsMessage(
+	public signSwiftOrderParamsMessage(
 		orderParamsMessage: SwiftOrderParamsMessage
-	): Promise<Buffer> {
+	): Buffer {
 		const takerOrderParamsMessage = Uint8Array.from(
 			this.encodeSwiftOrderParamsMessage(orderParamsMessage)
 		);
-		return await this.signMessage(takerOrderParamsMessage);
+		return this.signMessage(takerOrderParamsMessage);
 	}
 
 	public encodeSwiftOrderParamsMessage(
@@ -5511,11 +5549,11 @@ export class DriftClient {
 		);
 	}
 
-	public async signMessage(
+	public signMessage(
 		message: Uint8Array,
 		keypair: Keypair = this.wallet.payer
-	): Promise<Buffer> {
-		return Buffer.from(await ed.sign(message, keypair.secretKey.slice(0, 32)));
+	): Buffer {
+		return Buffer.from(nacl.sign.detached(message, keypair.secretKey));
 	}
 
 	public async placeSwiftTakerOrder(
@@ -5718,6 +5756,91 @@ export class DriftClient {
 		];
 	}
 
+	public encodeRFQMakerOrderParams(message: RFQMakerOrderParams): Buffer {
+		return this.program.coder.types.encode('RFQMakerOrderParams', message);
+	}
+
+	public async placeAndMatchRFQOrders(
+		rfqMatches: RFQMatch[],
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const ixs = await this.getPlaceAndMatchRFQOrdersIxs(rfqMatches);
+		const { txSig } = await this.sendTransaction(
+			await this.buildTransaction(ixs, txParams),
+			[],
+			this.opts
+		);
+		return txSig;
+	}
+
+	public async getPlaceAndMatchRFQOrdersIxs(
+		rfqMatches: RFQMatch[]
+	): Promise<TransactionInstruction[]> {
+		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 = Ed25519Program.createInstructionWithPublicKey({
+				publicKey: match.makerOrderParams.authority.toBytes(),
+				signature: match.makerSignature,
+				message: Uint8Array.from(
+					this.encodeRFQMakerOrderParams(match.makerOrderParams)
+				),
+			});
+			verifyIxs.push(verifyIx);
+
+			const userAccountPubkey = await getUserAccountPublicKey(
+				this.program.programId,
+				match.makerOrderParams.authority,
+				match.makerOrderParams.subAccountId
+			);
+			makerAccountMetas.push({
+				pubkey: userAccountPubkey,
+				isWritable: true,
+				isSigner: false,
+			});
+
+			makerAccountMetas.push({
+				pubkey: getUserStatsAccountPublicKey(
+					this.program.programId,
+					match.makerOrderParams.authority
+				),
+				isWritable: true,
+				isSigner: false,
+			});
+
+			makerAccountMetas.push({
+				pubkey: 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: SYSVAR_INSTRUCTIONS_PUBKEY,
+				},
+				remainingAccounts,
+			});
+		return [...verifyIxs, placeAndMatchRFQOrdersIx];
+	}
+
 	public async preparePlaceAndTakeSpotOrder(
 		orderParams: OptionalOrderParams,
 		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,

package/src/idl/drift.json

@@ -93,6 +93,42 @@
       ],
       "args": []
     },
+    {
+      "name": "initializeRfqUser",
+      "accounts": [
+        {
+          "name": "rfqUser",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "payer",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "rent",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "initializeReferrerName",
       "accounts": [
@@ -662,6 +698,51 @@
         }
       ]
     },
+    {
+      "name": "placeAndMatchRfqOrders",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "ixSysvar",
+          "isMut": false,
+          "isSigner": false,
+          "docs": [
+            "the supplied Sysvar could be anything else.",
+            "The Instruction Sysvar has not been implemented",
+            "in the Anchor framework yet, so this is the safe approach."
+          ]
+        }
+      ],
+      "args": [
+        {
+          "name": "rfqMatches",
+          "type": {
+            "vec": {
+              "defined": "RFQMatch"
+            }
+          }
+        }
+      ]
+    },
     {
       "name": "placeSpotOrder",
       "accounts": [
@@ -6752,6 +6833,29 @@
         ]
       }
     },
+    {
+      "name": "RFQUser",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "userPubkey",
+            "type": "publicKey"
+          },
+          {
+            "name": "rfqOrderData",
+            "type": {
+              "array": [
+                {
+                  "defined": "RFQOrderId"
+                },
+                32
+              ]
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "SpotMarket",
       "type": {
@@ -8407,6 +8511,109 @@
         ]
       }
     },
+    {
+      "name": "RFQMakerOrderParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "uuid",
+            "type": {
+              "array": [
+                "u8",
+                8
+              ]
+            }
+          },
+          {
+            "name": "authority",
+            "type": "publicKey"
+          },
+          {
+            "name": "subAccountId",
+            "type": "u16"
+          },
+          {
+            "name": "marketIndex",
+            "type": "u16"
+          },
+          {
+            "name": "marketType",
+            "type": {
+              "defined": "MarketType"
+            }
+          },
+          {
+            "name": "baseAssetAmount",
+            "type": "u64"
+          },
+          {
+            "name": "price",
+            "type": "u64"
+          },
+          {
+            "name": "direction",
+            "type": {
+              "defined": "PositionDirection"
+            }
+          },
+          {
+            "name": "maxTs",
+            "type": "i64"
+          }
+        ]
+      }
+    },
+    {
+      "name": "RFQMakerMessage",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "orderParams",
+            "type": {
+              "defined": "RFQMakerOrderParams"
+            }
+          },
+          {
+            "name": "signature",
+            "type": {
+              "array": [
+                "u8",
+                64
+              ]
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "RFQMatch",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "baseAssetAmount",
+            "type": "u64"
+          },
+          {
+            "name": "makerOrderParams",
+            "type": {
+              "defined": "RFQMakerOrderParams"
+            }
+          },
+          {
+            "name": "makerSignature",
+            "type": {
+              "array": [
+                "u8",
+                64
+              ]
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "ModifyOrderParams",
       "type": {
@@ -9226,6 +9433,27 @@
         ]
       }
     },
+    {
+      "name": "RFQOrderId",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "uuid",
+            "type": {
+              "array": [
+                "u8",
+                8
+              ]
+            }
+          },
+          {
+            "name": "maxTs",
+            "type": "i64"
+          }
+        ]
+      }
+    },
     {
       "name": "InsuranceFund",
       "type": {
@@ -10326,6 +10554,9 @@
           },
           {
             "name": "Liquidation"
+          },
+          {
+            "name": "RFQ"
           }
         ]
       }
@@ -13387,6 +13618,31 @@
       "code": 6290,
       "name": "InvalidHighLeverageModeConfig",
       "msg": "Invalid High Leverage Mode Config"
+    },
+    {
+      "code": 6291,
+      "name": "InvalidRFQUserAccount",
+      "msg": "Invalid RFQ User Account"
+    },
+    {
+      "code": 6292,
+      "name": "RFQUserAccountWrongMutability",
+      "msg": "RFQUserAccount should be mutable"
+    },
+    {
+      "code": 6293,
+      "name": "RFQUserAccountFull",
+      "msg": "RFQUserAccount has too many active RFQs"
+    },
+    {
+      "code": 6294,
+      "name": "RFQOrderNotFilled",
+      "msg": "RFQ order not filled as expected"
+    },
+    {
+      "code": 6295,
+      "name": "InvalidRFQOrder",
+      "msg": "RFQ orders must be jit makers"
     }
   ],
   "metadata": {

package/src/types.ts

@@ -1083,6 +1083,29 @@ export type SwiftTriggerOrderParams = {
 	baseAssetAmount: BN;
 };
 
+export type RFQMakerOrderParams = {
+	uuid: Uint8Array; // From buffer of standard UUID string
+	authority: PublicKey;
+	subAccountId: number;
+	marketIndex: number;
+	marketType: MarketType;
+	baseAssetAmount: BN;
+	price: BN;
+	direction: PositionDirection;
+	maxTs: BN;
+};
+
+export type RFQMakerMessage = {
+	orderParams: RFQMakerOrderParams;
+	signature: Uint8Array;
+};
+
+export type RFQMatch = {
+	baseAssetAmount: BN;
+	makerOrderParams: RFQMakerOrderParams;
+	makerSignature: Uint8Array;
+};
+
 export type MakerInfo = {
 	maker: PublicKey;
 	makerStats: PublicKey;