@drift-labs/sdk 2.112.0-beta.1 → 2.112.0-beta.11

package/VERSION

@@ -1 +1 @@
-2.112.0-beta.1
+2.112.0-beta.11

package/lib/browser/decode/user.js

@@ -230,7 +230,9 @@ function decodeUser(buffer) {
         offset += 1;
         const postedSlotTail = buffer.readUint8(offset);
         offset += 1;
-        offset += 2; // padding
+        const bitFlags = buffer.readUint8(offset);
+        offset += 1;
+        offset += 1; // padding
         orders.push({
             slot,
             price,
@@ -256,6 +258,7 @@ function decodeUser(buffer) {
             immediateOrCancel,
             triggerCondition,
             auctionDuration,
+            bitFlags,
             postedSlotTail,
         });
     }

package/lib/browser/dlob/DLOB.js

@@ -402,7 +402,16 @@ class DLOB {
                 const newTakerOrder = { ...takerOrder };
                 newTakerOrder.baseAssetAmountFilled =
                     takerOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOnChainOrder(newTakerOrder, slot, takerNode.isProtectedMaker).update(newTakerOrder, takerNode.userAccount);
+                if (takerNode.isSignedMsg) {
+                    const marketTypeStr = (0, __1.getVariant)(marketType);
+                    const orderList = (0, __1.isVariant)(takerOrder.direction, 'long')
+                        ? this.orderLists.get(marketTypeStr).get(marketIndex).signedMsg.bid
+                        : this.orderLists.get(marketTypeStr).get(marketIndex).signedMsg.ask;
+                    orderList.update(newTakerOrder, takerNode.userAccount);
+                }
+                else {
+                    this.getListForOnChainOrder(newTakerOrder, slot, takerNode.isProtectedMaker).update(newTakerOrder, takerNode.userAccount);
+                }
                 if (newTakerOrder.baseAssetAmountFilled.eq(takerOrder.baseAssetAmount)) {
                     break;
                 }
@@ -478,7 +487,14 @@ class DLOB {
         }
         for (const askGenerator of askGenerators) {
             for (const ask of askGenerator) {
-                if ((0, __1.isOrderExpired)(ask.order, ts, true, 25)) {
+                if (ask.isSignedMsg &&
+                    slot.gt(ask.order.slot.addn(ask.order.auctionDuration))) {
+                    this.orderLists
+                        .get(marketTypeStr)
+                        .get(marketIndex)
+                        .signedMsg.ask.remove(ask.order, ask.userAccount);
+                }
+                else if ((0, __1.isOrderExpired)(ask.order, ts, true, 25)) {
                     nodesToFill.push({
                         node: ask,
                         makerNodes: [],

package/lib/browser/driftClient.d.ts

@@ -5,7 +5,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, OracleSource, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SignedMsgOrderParamsMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
+import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, OracleSource, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SignedMsgOrderParamsMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount, ProtectedMakerModeConfig } 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';
@@ -125,6 +125,7 @@ export declare class DriftClient {
     /** @deprecated use fetchAllLookupTableAccounts() */
     fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount>;
     fetchAllLookupTableAccounts(): Promise<AddressLookupTableAccount[]>;
+    private getTxVersionForNewWallet;
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
@@ -915,6 +916,7 @@ export declare class DriftClient {
     disableUserHighLeverageMode(user: PublicKey, userAccount?: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
     getDisableHighLeverageModeIx(user: PublicKey, userAccount?: UserAccount): Promise<TransactionInstruction>;
     fetchHighLeverageModeConfig(): Promise<HighLeverageModeConfig>;
+    fetchProtectedMakerModeConfig(): Promise<ProtectedMakerModeConfig>;
     updateUserProtectedMakerOrders(subAccountId: number, protectedOrders: boolean, authority?: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
     getUpdateUserProtectedMakerOrdersIx(subAccountId: number, protectedOrders: boolean, authority?: PublicKey): Promise<TransactionInstruction>;
     getPauseSpotMarketDepositWithdrawIx(spotMarketIndex: number): Promise<TransactionInstruction>;

package/lib/browser/driftClient.js

@@ -110,7 +110,8 @@ class DriftClient {
         this.authority = (_e = config.authority) !== null && _e !== void 0 ? _e : this.wallet.publicKey;
         this.activeSubAccountId = (_f = config.activeSubAccountId) !== null && _f !== void 0 ? _f : 0;
         this.skipLoadUsers = (_g = config.skipLoadUsers) !== null && _g !== void 0 ? _g : false;
-        this.txVersion = (_h = config.txVersion) !== null && _h !== void 0 ? _h : 0;
+        this.txVersion =
+            (_h = config.txVersion) !== null && _h !== void 0 ? _h : this.getTxVersionForNewWallet(config.wallet);
         this.txParams = {
             computeUnits: (_k = (_j = config.txParams) === null || _j === void 0 ? void 0 : _j.computeUnits) !== null && _k !== void 0 ? _k : 600000,
             computeUnitsPrice: (_m = (_l = config.txParams) === null || _l === void 0 ? void 0 : _l.computeUnitsPrice) !== null && _m !== void 0 ? _m : 0,
@@ -395,6 +396,14 @@ class DriftClient {
         this.lookupTableAccounts = lookupTableAccounts;
         return lookupTableAccounts;
     }
+    getTxVersionForNewWallet(newWallet) {
+        var _a, _b, _c;
+        if (!(newWallet === null || newWallet === void 0 ? void 0 : newWallet.supportedTransactionVersions))
+            return 0; // Assume versioned txs supported if wallet doesn't have a supportedTransactionVersions property
+        const walletSupportsVersionedTxns = ((_a = newWallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.has(0)) ||
+            ((_c = (_b = newWallet.supportedTransactionVersions) === null || _b === void 0 ? void 0 : _b.size) !== null && _c !== void 0 ? _c : 0) > 1;
+        return walletSupportsVersionedTxns ? 0 : 'legacy';
+    }
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
@@ -403,7 +412,7 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
-        var _a, _b, _c;
+        var _a;
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
@@ -419,10 +428,7 @@ class DriftClient {
         this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = includeDelegates !== null && includeDelegates !== void 0 ? includeDelegates : false;
-        const walletSupportsVersionedTxns = 
-        //@ts-ignore
-        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
-        this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
+        this.txVersion = this.getTxVersionForNewWallet(this.wallet);
         if (includeDelegates && subAccountIds) {
             throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
         }
@@ -438,7 +444,7 @@ class DriftClient {
                 ? new Map([[this.authority.toString(), subAccountIds]])
                 : new Map();
         /* Reset user stats account */
-        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+        if ((_a = this.userStats) === null || _a === void 0 ? void 0 : _a.isSubscribed) {
             await this.userStats.unsubscribe();
         }
         this.userStats = undefined;
@@ -467,19 +473,16 @@ class DriftClient {
      * @param emulateAuthority
      */
     async emulateAccount(emulateAuthority) {
-        var _a, _b, _c;
+        var _a;
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
         this.authority = emulateAuthority;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = true;
-        const walletSupportsVersionedTxns = 
-        //@ts-ignore
-        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
-        this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
+        this.txVersion = this.getTxVersionForNewWallet(this.wallet);
         this.authoritySubAccountMap = new Map();
         /* Reset user stats account */
-        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+        if ((_a = this.userStats) === null || _a === void 0 ? void 0 : _a.isSubscribed) {
             await this.userStats.unsubscribe();
         }
         this.userStats = undefined;
@@ -4898,6 +4901,10 @@ class DriftClient {
         const config = await this.program.account.highLeverageModeConfig.fetch((0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId));
         return config;
     }
+    async fetchProtectedMakerModeConfig() {
+        const config = await this.program.account.protectedMakerModeConfig.fetch((0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId));
+        return config;
+    }
     async updateUserProtectedMakerOrders(subAccountId, protectedOrders, authority, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateUserProtectedMakerOrdersIx(subAccountId, protectedOrders, authority), txParams), [], this.opts);
         return txSig;

package/lib/browser/fastlane/fastlaneOrderSubscriber.d.ts

@@ -6,6 +6,11 @@ export type FastlaneOrderSubscriberConfig = {
     driftEnv: DriftEnv;
     endpoint?: string;
     marketIndexes: number[];
+    /**
+        In the future, this will be used for verifying $DRIFT stake as we add
+        authentication for delegate signers
+        For now, pass a new keypair or a keypair to an empty wallet
+    */
     keypair: Keypair;
 };
 export declare class FastlaneOrderSubscriber {

package/lib/browser/fastlane/grpcSignedMsgUserAccountSubscriber.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { Commitment } from '@solana/web3.js';
+import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
+import { GrpcConfigs, ResubOpts } from '../accounts/types';
+import { SignedMsgUserOrdersAccount } from '../types';
+import { SignedMsgUserOrdersAccountSubscriber } from './signedMsgUserAccountSubscriber';
+import { DriftClient } from '../driftClient';
+export declare class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrdersAccountSubscriber {
+    private grpcConfigs;
+    subscriber: grpcProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+    constructor({ grpcConfigs, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: {
+        grpcConfigs: GrpcConfigs;
+        driftClient: DriftClient;
+        commitment: Commitment;
+        resubOpts?: ResubOpts;
+        decodeFn: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
+        resyncIntervalMs?: number;
+    });
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/browser/fastlane/grpcSignedMsgUserAccountSubscriber.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.grpcSignedMsgUserOrdersAccountSubscriber = void 0;
+const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
+const memcmp_1 = require("../memcmp");
+const signedMsgUserAccountSubscriber_1 = require("./signedMsgUserAccountSubscriber");
+class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubscriber_1.SignedMsgUserOrdersAccountSubscriber {
+    constructor({ grpcConfigs, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
+        super({
+            driftClient,
+            commitment,
+            resubOpts,
+            decodeFn,
+            resyncIntervalMs,
+        });
+        this.grpcConfigs = grpcConfigs;
+    }
+    async subscribe() {
+        if (!this.subscriber) {
+            this.subscriber =
+                await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'User', this.driftClient.program, this.decodeFn, {
+                    filters: [(0, memcmp_1.getSignedMsgUserOrdersFilter)()],
+                }, this.resubOpts);
+        }
+        await this.subscriber.subscribe((_accountId, account, context) => {
+            this.tryUpdateSignedMsgUserOrdersAccount(account, 'decoded', context.slot);
+        });
+        if (this.resyncIntervalMs) {
+            const recursiveResync = () => {
+                this.resyncTimeoutId = setTimeout(() => {
+                    this.fetch()
+                        .catch((e) => {
+                        console.error('Failed to resync in OrderSubscriber');
+                        console.log(e);
+                    })
+                        .finally(() => {
+                        if (!this.resyncTimeoutId)
+                            return;
+                        recursiveResync();
+                    });
+                }, this.resyncIntervalMs);
+            };
+            recursiveResync();
+        }
+    }
+    async unsubscribe() {
+        if (!this.subscriber)
+            return;
+        await this.subscriber.unsubscribe();
+        this.subscriber = undefined;
+        if (this.resyncTimeoutId !== undefined) {
+            clearTimeout(this.resyncTimeoutId);
+            this.resyncTimeoutId = undefined;
+        }
+    }
+}
+exports.grpcSignedMsgUserOrdersAccountSubscriber = grpcSignedMsgUserOrdersAccountSubscriber;

package/lib/browser/fastlane/index.d.ts

@@ -0,0 +1,3 @@
+export * from './fastlaneOrderSubscriber';
+export * from './signedMsgUserAccountSubscriber';
+export * from './grpcSignedMsgUserAccountSubscriber';

package/lib/browser/fastlane/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./fastlaneOrderSubscriber"), exports);
+__exportStar(require("./signedMsgUserAccountSubscriber"), exports);
+__exportStar(require("./grpcSignedMsgUserAccountSubscriber"), exports);

package/lib/browser/fastlane/signedMsgUserAccountSubscriber.d.ts

@@ -0,0 +1,43 @@
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
+import { SignedMsgOrderId, SignedMsgUserOrdersAccount } from '../types';
+import { Commitment, PublicKey } from '@solana/web3.js';
+import { ResubOpts } from '../accounts/types';
+import { DriftClient } from '../driftClient';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+export interface SignedMsgUserOrdersAccountSubscriberEvents {
+    onAccountUpdate: (activeSignedMsgOrderIds: SignedMsgOrderId[], authorityPubkey: PublicKey, slot: number) => void;
+    newSignedMsgOrderIds: (newSignedMsgOrderIds: SignedMsgOrderId[], authorityPubkey: PublicKey, slot: number) => void;
+}
+export declare class SignedMsgUserOrdersAccountSubscriber {
+    protected driftClient: DriftClient;
+    protected commitment: Commitment;
+    protected resubOpts?: ResubOpts;
+    protected resyncTimeoutId?: NodeJS.Timeout;
+    protected resyncIntervalMs?: number;
+    protected decodeFn: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
+    protected signedMsgUserOrderAccounts: Map<string, {
+        slot: number;
+        signedMsgUserOrdersAccount: SignedMsgUserOrdersAccount;
+    }>;
+    mostRecentSlot: number;
+    fetchPromise?: Promise<void>;
+    fetchPromiseResolver: () => void;
+    protected subscriber: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+    eventEmitter: StrictEventEmitter<EventEmitter, SignedMsgUserOrdersAccountSubscriberEvents>;
+    constructor({ driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: {
+        driftClient: DriftClient;
+        commitment: Commitment;
+        resubOpts?: ResubOpts;
+        decodeFn: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
+        resyncIntervalMs?: number;
+    });
+    subscribe(): Promise<void>;
+    fetch(): Promise<void>;
+    tryUpdateSignedMsgUserOrdersAccount(data: Buffer | SignedMsgUserOrdersAccount, dataType: 'buffer' | 'decoded', slot: number, skipEventEmitting?: boolean): void;
+    unsubscribe(): Promise<void>;
+}

package/lib/browser/fastlane/signedMsgUserAccountSubscriber.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SignedMsgUserOrdersAccountSubscriber = void 0;
+const memcmp_1 = require("../memcmp");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
+const events_1 = require("events");
+class SignedMsgUserOrdersAccountSubscriber {
+    constructor({ driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
+        this.signedMsgUserOrderAccounts = new Map();
+        this.commitment = commitment;
+        this.resubOpts = resubOpts;
+        this.decodeFn = decodeFn;
+        this.driftClient = driftClient;
+        this.resyncIntervalMs = resyncIntervalMs;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.resubOpts = resubOpts;
+    }
+    async subscribe() {
+        if (!this.subscriber) {
+            const filters = [(0, memcmp_1.getSignedMsgUserOrdersFilter)()];
+            this.subscriber =
+                new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('SingedMsgUserOrdersAccountMap', 'SignedMsgUserOrders', this.driftClient.program, this.decodeFn, {
+                    filters,
+                    commitment: this.commitment,
+                }, this.resubOpts);
+        }
+        await this.subscriber.subscribe((_accountId, account, context) => {
+            this.tryUpdateSignedMsgUserOrdersAccount(account, 'decoded', context.slot);
+        });
+        await this.fetch();
+        if (this.resyncIntervalMs) {
+            const recursiveResync = () => {
+                this.resyncTimeoutId = setTimeout(() => {
+                    this.fetch()
+                        .catch((e) => {
+                        console.error('Failed to resync in OrderSubscriber');
+                        console.log(e);
+                    })
+                        .finally(() => {
+                        if (!this.resyncTimeoutId)
+                            return;
+                        recursiveResync();
+                    });
+                }, this.resyncIntervalMs);
+            };
+            recursiveResync();
+        }
+    }
+    async fetch() {
+        if (this.fetchPromise) {
+            return this.fetchPromise;
+        }
+        this.fetchPromise = new Promise((resolver) => {
+            this.fetchPromiseResolver = resolver;
+        });
+        const skipEventEmitting = this.signedMsgUserOrderAccounts.size === 0;
+        try {
+            const rpcResponseAndContext = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+                commitment: this.commitment,
+                filters: [(0, memcmp_1.getSignedMsgUserOrdersFilter)()],
+                encoding: 'base64',
+                withContext: true,
+            });
+            const slot = rpcResponseAndContext.context.slot;
+            for (const programAccount of rpcResponseAndContext.value) {
+                this.tryUpdateSignedMsgUserOrdersAccount(programAccount.account.data, 'buffer', slot, skipEventEmitting);
+                await new Promise((resolve) => setTimeout(resolve, 0));
+            }
+        }
+        catch (e) {
+            console.error(e);
+        }
+        finally {
+            this.fetchPromiseResolver();
+            this.fetchPromise = undefined;
+        }
+    }
+    tryUpdateSignedMsgUserOrdersAccount(data, dataType, slot, skipEventEmitting = false) {
+        var _a;
+        if (!this.mostRecentSlot || slot > this.mostRecentSlot) {
+            this.mostRecentSlot = slot;
+        }
+        const signedMsgUserOrdersAccount = dataType === 'buffer'
+            ? this.decodeFn('SignedMsgUserOrders', data)
+            : data;
+        const key = signedMsgUserOrdersAccount.authorityPubkey.toBase58();
+        const slotAndSignedMsgUserOrdersAccount = this.signedMsgUserOrderAccounts.get(key);
+        if (!slotAndSignedMsgUserOrdersAccount ||
+            slotAndSignedMsgUserOrdersAccount.slot <= slot) {
+            if (!skipEventEmitting) {
+                this.eventEmitter.emit('onAccountUpdate', signedMsgUserOrdersAccount.signedMsgOrderData.filter((signedMsgOrderId) => signedMsgOrderId.orderId !== 0), signedMsgUserOrdersAccount.authorityPubkey, slot);
+            }
+            const existingSignedMsgOrderIds = (_a = slotAndSignedMsgUserOrdersAccount === null || slotAndSignedMsgUserOrdersAccount === void 0 ? void 0 : slotAndSignedMsgUserOrdersAccount.signedMsgUserOrdersAccount.signedMsgOrderData.map((signedMsgOrderId) => signedMsgOrderId.orderId)) !== null && _a !== void 0 ? _a : [];
+            const newSignedMsgOrderIds = signedMsgUserOrdersAccount.signedMsgOrderData.filter((signedMsgOrderId) => !existingSignedMsgOrderIds.includes(signedMsgOrderId.orderId) &&
+                signedMsgOrderId.orderId !== 0);
+            if (newSignedMsgOrderIds.length > 0 && !skipEventEmitting) {
+                this.eventEmitter.emit('newSignedMsgOrderIds', newSignedMsgOrderIds, signedMsgUserOrdersAccount.authorityPubkey, slot);
+            }
+            this.signedMsgUserOrderAccounts.set(key, {
+                slot,
+                signedMsgUserOrdersAccount,
+            });
+        }
+    }
+    async unsubscribe() {
+        if (!this.subscriber)
+            return;
+        await this.subscriber.unsubscribe();
+        this.subscriber = undefined;
+        if (this.resyncTimeoutId !== undefined) {
+            clearTimeout(this.resyncTimeoutId);
+            this.resyncTimeoutId = undefined;
+        }
+    }
+}
+exports.SignedMsgUserOrdersAccountSubscriber = SignedMsgUserOrdersAccountSubscriber;

package/lib/browser/idl/drift.json

@@ -10912,12 +10912,20 @@
                         ],
                         "type": "u8"
                     },
+                    {
+                        "name": "bitFlags",
+                        "docs": [
+                            "Bitflags for further classification",
+                            "0: is_signed_message"
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                2
+                                1
                             ]
                         }
                     }

package/lib/browser/index.d.ts

@@ -88,6 +88,7 @@ export * from './oracles/pythLazerClient';
 export * from './oracles/switchboardOnDemandClient';
 export * from './oracles/oracleId';
 export * from './fastlane/fastlaneOrderSubscriber';
+export * from './fastlane/signedMsgUserAccountSubscriber';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';
 export * from './tx/whileValidTxSender';

package/lib/browser/index.js

@@ -111,6 +111,7 @@ __exportStar(require("./oracles/pythLazerClient"), exports);
 __exportStar(require("./oracles/switchboardOnDemandClient"), exports);
 __exportStar(require("./oracles/oracleId"), exports);
 __exportStar(require("./fastlane/fastlaneOrderSubscriber"), exports);
+__exportStar(require("./fastlane/signedMsgUserAccountSubscriber"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./tx/whileValidTxSender"), exports);

package/lib/browser/math/orders.d.ts

@@ -21,3 +21,4 @@ export declare function mustBeTriggered(order: Order): boolean;
 export declare function isTriggered(order: Order): boolean;
 export declare function isRestingLimitOrder(order: Order, slot: number): boolean;
 export declare function isTakingOrder(order: Order, slot: number): boolean;
+export declare function isSignedMsgOrder(order: Order): boolean;

package/lib/browser/math/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTakingOrder = exports.isRestingLimitOrder = exports.isTriggered = exports.mustBeTriggered = exports.isLimitOrder = exports.isMarketOrder = exports.isOrderExpired = exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isFillableByVAMM = exports.hasAuctionPrice = exports.hasLimitPrice = exports.getLimitPrice = exports.standardizePrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
+exports.isSignedMsgOrder = exports.isTakingOrder = exports.isRestingLimitOrder = exports.isTriggered = exports.mustBeTriggered = exports.isLimitOrder = exports.isMarketOrder = exports.isOrderExpired = exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isFillableByVAMM = exports.hasAuctionPrice = exports.hasLimitPrice = exports.getLimitPrice = exports.standardizePrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
@@ -223,3 +223,8 @@ function isTakingOrder(order, slot) {
     return isMarketOrder(order) || !isRestingLimitOrder(order, slot);
 }
 exports.isTakingOrder = isTakingOrder;
+const FLAG_IS_SIGNED_MSG = 0x01;
+function isSignedMsgOrder(order) {
+    return (order.bitFlags & FLAG_IS_SIGNED_MSG) !== 0;
+}
+exports.isSignedMsgOrder = isSignedMsgOrder;

package/lib/browser/memcmp.d.ts

@@ -9,3 +9,4 @@ export declare function getUserWithName(name: string): MemcmpFilter;
 export declare function getUserStatsFilter(): MemcmpFilter;
 export declare function getUserStatsIsReferredFilter(): MemcmpFilter;
 export declare function getUserStatsIsReferredOrReferrerFilter(): MemcmpFilter;
+export declare function getSignedMsgUserOrdersFilter(): MemcmpFilter;

package/lib/browser/memcmp.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getSignedMsgUserOrdersFilter = exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithoutOrderFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
 const userName_1 = require("./userName");
@@ -97,3 +97,12 @@ function getUserStatsIsReferredOrReferrerFilter() {
     };
 }
 exports.getUserStatsIsReferredOrReferrerFilter = getUserStatsIsReferredOrReferrerFilter;
+function getSignedMsgUserOrdersFilter() {
+    return {
+        memcmp: {
+            offset: 0,
+            bytes: bs58_1.default.encode(anchor_1.BorshAccountsCoder.accountDiscriminator('SignedMsgUserOrders')),
+        },
+    };
+}
+exports.getSignedMsgUserOrdersFilter = getSignedMsgUserOrdersFilter;

package/lib/browser/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { Keypair, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { Keypair, PublicKey, Transaction, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export type MappedRecord<A extends Record<string, unknown>, B> = {
     [K in keyof A]: B;
@@ -1142,6 +1142,7 @@ export type Order = {
     auctionStartPrice: BN;
     auctionEndPrice: BN;
     maxTs: BN;
+    bitFlags: number;
     postedSlotTail: number;
 };
 export type OrderParams = {
@@ -1261,6 +1262,7 @@ export interface IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
     payer?: Keypair;
+    supportedTransactionVersions?: ReadonlySet<TransactionVersion> | null | undefined;
 }
 export interface IVersionedWallet {
     signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;
@@ -1417,6 +1419,11 @@ export type HighLeverageModeConfig = {
     currentUsers: number;
     reduceOnly: boolean;
 };
+export type ProtectedMakerModeConfig = {
+    maxUsers: number;
+    currentUsers: number;
+    reduceOnly: boolean;
+};
 export interface SignedMsgOrderParams {
     /**
      * The encoded order params that were signed (borsh encoded then hexified).
@@ -1427,4 +1434,13 @@ export interface SignedMsgOrderParams {
      */
     signature: Buffer;
 }
+export type SignedMsgOrderId = {
+    maxSlot: BN;
+    uuid: Uint8Array;
+    orderId: number;
+};
+export type SignedMsgUserOrdersAccount = {
+    authorityPubkey: PublicKey;
+    signedMsgOrderData: SignedMsgOrderId[];
+};
 export {};

package/lib/node/decode/user.js

@@ -230,7 +230,9 @@ function decodeUser(buffer) {
         offset += 1;
         const postedSlotTail = buffer.readUint8(offset);
         offset += 1;
-        offset += 2; // padding
+        const bitFlags = buffer.readUint8(offset);
+        offset += 1;
+        offset += 1; // padding
         orders.push({
             slot,
             price,
@@ -256,6 +258,7 @@ function decodeUser(buffer) {
             immediateOrCancel,
             triggerCondition,
             auctionDuration,
+            bitFlags,
             postedSlotTail,
         });
     }