@drift-labs/sdk-browser 2.115.0-beta.16 → 2.115.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.115.0-beta.16
+2.115.0-beta.3

package/lib/browser/constants/perpMarkets.js

@@ -58,9 +58,9 @@ exports.DevnetPerpMarkets = [
         symbol: '1MBONK-PERP',
         baseAssetSymbol: '1MBONK',
         marketIndex: 4,
-        oracle: new web3_js_1.PublicKey('BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4'),
+        oracle: new web3_js_1.PublicKey('GojbSnJuPdKDT1ZuHuAM5t9oz6bxTo1xhUKpTua2F72p'),
         launchTs: 1677068931000,
-        oracleSource: __1.OracleSource.PYTH_LAZER_1M,
+        oracleSource: __1.OracleSource.PYTH_1M_PULL,
         pythFeedId: '0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419',
         pythLazerId: 9,
     },
@@ -708,11 +708,10 @@ exports.MainnetPerpMarkets = [
         symbol: 'DRIFT-PERP',
         baseAssetSymbol: 'DRIFT',
         marketIndex: 30,
-        oracle: new web3_js_1.PublicKey('5VJou4ufN2vE11zyZUaLsKLTXhyzCTgiq6QDsts2YnnD'),
+        oracle: new web3_js_1.PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
         launchTs: 1716595200000,
-        oracleSource: __1.OracleSource.PYTH_LAZER,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x5c1690b27bb02446db17cdda13ccc2c1d609ad6d2ef5bf4983a85ea8b6f19d07',
-        pythLazerId: 249,
     },
     {
         fullName: 'Sanctum',
@@ -1104,11 +1103,10 @@ exports.MainnetPerpMarkets = [
         symbol: 'BERA-PERP',
         baseAssetSymbol: 'BERA',
         marketIndex: 66,
-        oracle: new web3_js_1.PublicKey('r8eNLQ8jysUyk9rrWXuicwAoKZ7V3YngAB6737zfxmv'),
+        oracle: new web3_js_1.PublicKey('53Ae7ArP9yCnjqL2CqxJ1zdv3ba64NoVTqRcwjrCg181'),
         launchTs: 1738850177000,
-        oracleSource: __1.OracleSource.PYTH_LAZER,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x962088abcfdbdb6e30db2e340c8cf887d9efb311b1f2f17b155a63dbb6d40265',
-        pythLazerId: 308,
     },
     {
         fullName: 'NBAFINALS25-OKC',
@@ -1136,11 +1134,10 @@ exports.MainnetPerpMarkets = [
         symbol: 'KAITO-PERP',
         baseAssetSymbol: 'KAITO',
         marketIndex: 69,
-        oracle: new web3_js_1.PublicKey('8M8mjNJ42k2Xi12Q1zRnQRC3xhggu3WGuftiu5VZZmsF'),
+        oracle: new web3_js_1.PublicKey('DRCNnwxET1URxGMvpCPncBkZsWf1Xh26TMxXNSGTrGpU'),
         launchTs: 1739545901000,
-        oracleSource: __1.OracleSource.PYTH_LAZER,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x7302dee641a08507c297a7b0c8b3efa74a48a3baa6c040acab1e5209692b7e59',
-        pythLazerId: 306,
     },
     {
         fullName: 'Story Protocol',
@@ -1148,11 +1145,10 @@ exports.MainnetPerpMarkets = [
         symbol: 'IP-PERP',
         baseAssetSymbol: 'IP',
         marketIndex: 70,
-        oracle: new web3_js_1.PublicKey('AZVVDFve8ijzLAm9z6W53GFsoWbcycFsdxCL7WUjMz8S'),
+        oracle: new web3_js_1.PublicKey('E8A2iky96tzM8YuNNcJateE8S4e5N8FYspg17XHLp2aY'),
         launchTs: 1740150623000,
-        oracleSource: __1.OracleSource.PYTH_LAZER,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0xb620ba83044577029da7e4ded7a2abccf8e6afc2a0d4d26d89ccdd39ec109025',
-        pythLazerId: 309,
     },
 ];
 exports.PerpMarkets = {

package/lib/browser/constants/spotMarkets.js

@@ -300,15 +300,14 @@ exports.MainnetSpotMarkets = [
         symbol: 'DRIFT',
         marketIndex: 15,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('5VJou4ufN2vE11zyZUaLsKLTXhyzCTgiq6QDsts2YnnD'),
-        oracleSource: __1.OracleSource.PYTH_LAZER,
+        oracle: new web3_js_1.PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
         phoenixMarket: new web3_js_1.PublicKey('8BV6rrWsUabnTDA3dE6A69oUDJAj3hMhtBHTJyXB7czp'),
         launchTs: 1715860800000,
         pythFeedId: '0x5c1690b27bb02446db17cdda13ccc2c1d609ad6d2ef5bf4983a85ea8b6f19d07',
-        pythLazerId: 249,
     },
     {
         symbol: 'INF',
@@ -338,14 +337,13 @@ exports.MainnetSpotMarkets = [
         symbol: 'USDY',
         marketIndex: 18,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('9PgHM68FNGDK6nHb29ERDBcFrV6gNMD8LyUqwxbyyeb2'),
-        oracleSource: __1.OracleSource.PYTH_LAZER,
+        oracle: new web3_js_1.PublicKey('BPTQgHV4y2x4jvKPPkkd9aS8jY7L3DGZBwjEZC8Vm27o'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('A1KLoBrKBde8Ty9qtNQUtq3C2ortoC3u7twggz7sEto6'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
         launchTs: 1718811089000,
         pythFeedId: '0xe393449f6aff8a4b6d3e1165a7c9ebec103685f3b41e60db4277b5b6d10e7326',
-        pythLazerId: 276,
     },
     {
         symbol: 'JLP',

package/lib/browser/dlob/DLOB.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { NodeList } from './NodeList';
-import { BN, DLOBNode, DLOBNodeType, DriftClient, MarketType, MarketTypeStr, OraclePriceData, Order, PerpMarketAccount, PositionDirection, ProtectMakerParamsMap, SlotSubscriber, SpotMarketAccount, StateAccount, TriggerOrderNode, UserMap } from '..';
+import { BN, DLOBNode, DLOBNodeType, DriftClient, MarketType, MarketTypeStr, OraclePriceData, Order, PerpMarketAccount, PositionDirection, SlotSubscriber, SpotMarketAccount, StateAccount, TriggerOrderNode, UserMap } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { L2OrderBook, L2OrderBookGenerator, L3OrderBook } from './orderBookLevels';
 export type DLOBOrder = {
@@ -58,8 +58,8 @@ export declare class DLOB {
     orderLists: Map<MarketTypeStr, Map<number, MarketNodeLists>>;
     maxSlotForRestingLimitOrders: number;
     initialized: boolean;
-    protectedMakerParamsMap: ProtectMakerParamsMap;
-    constructor(protectedMakerParamsMap?: ProtectMakerParamsMap);
+    protectedMakerView: boolean;
+    constructor(protectedMakerView?: boolean);
     private init;
     clear(): void;
     /**

package/lib/browser/dlob/DLOB.js

@@ -14,15 +14,12 @@ const SUPPORTED_ORDER_TYPES = [
     'oracle',
 ];
 class DLOB {
-    constructor(protectedMakerParamsMap) {
+    constructor(protectedMakerView) {
         this.openOrders = new Map();
         this.orderLists = new Map();
         this.maxSlotForRestingLimitOrders = 0;
         this.initialized = false;
-        this.protectedMakerParamsMap = protectedMakerParamsMap || {
-            perp: new Map(),
-            spot: new Map(),
-        };
+        this.protectedMakerView = protectedMakerView || false;
         this.init();
     }
     init() {
@@ -91,7 +88,7 @@ class DLOB {
                 .get(marketType)
                 .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         }
-        (_a = this.getListForOnChainOrder(order, slot, isUserProtectedMaker)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerParamsMap[marketType].get(order.marketIndex));
+        (_a = this.getListForOnChainOrder(order, slot, isUserProtectedMaker)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
         if (onInsert) {
             onInsert();
         }
@@ -109,7 +106,7 @@ class DLOB {
         this.orderLists
             .get(marketType)
             .get(marketIndex)
-            .signedMsg[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerParamsMap[marketType].get(order.marketIndex));
+            .signedMsg[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
         if (onInsert) {
             onInsert();
         }
@@ -218,7 +215,7 @@ class DLOB {
             for (const nodeToUpdate of nodesToUpdate) {
                 const { side, node } = nodeToUpdate;
                 nodeLists.takingLimit[side].remove(node.order, node.userAccount);
-                nodeLists.restingLimit[side].insert(node.order, marketTypeStr, node.userAccount, node.isProtectedMaker, this.protectedMakerParamsMap[marketTypeStr].get(node.order.marketIndex));
+                nodeLists.restingLimit[side].insert(node.order, marketTypeStr, node.userAccount, node.isProtectedMaker, this.protectedMakerView);
             }
         }
     }

package/lib/browser/dlob/DLOBNode.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { BN, OraclePriceData, Order, ProtectedMakerParams } from '..';
+import { BN, OraclePriceData, Order } from '..';
 export interface DLOBNode {
     getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
     isVammNode(): boolean;
@@ -8,7 +8,7 @@ export interface DLOBNode {
     haveFilled: boolean;
     userAccount: string | undefined;
     isProtectedMaker: boolean;
-    protectedMakerParams?: ProtectedMakerParams;
+    applyProtectedMakerOffset: boolean;
     isSignedMsg: boolean | undefined;
 }
 export declare abstract class OrderNode implements DLOBNode {
@@ -18,9 +18,9 @@ export declare abstract class OrderNode implements DLOBNode {
     haveFilled: boolean;
     haveTrigger: boolean;
     isProtectedMaker: boolean;
-    protectedMakerParams?: ProtectedMakerParams;
+    applyProtectedMakerOffset: boolean;
     isSignedMsg: boolean;
-    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams, isSignedMsg?: boolean);
+    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean, isSignedMsg?: boolean);
     abstract getSortValue(order: Order): BN;
     getLabel(): string;
     getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
@@ -68,4 +68,4 @@ export type DLOBNodeMap = {
     signedMsg: SignedMsgOrderNode;
 };
 export type DLOBNodeType = 'signedMsg' | 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'protectedFloatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
-export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams): DLOBNodeMap[T];
+export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean): DLOBNodeMap[T];

package/lib/browser/dlob/DLOBNode.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNode = exports.SignedMsgOrderNode = exports.TriggerOrderNode = exports.MarketOrderNode = exports.FloatingLimitOrderNode = exports.RestingLimitOrderNode = exports.TakingLimitOrderNode = exports.OrderNode = void 0;
 const __1 = require("..");
+// import { PublicKey } from '@solana/web3.js';
 const NodeList_1 = require("./NodeList");
 class OrderNode {
-    constructor(order, userAccount, isProtectedMaker, protectedMakerParams, isSignedMsg = false) {
+    constructor(order, userAccount, isProtectedMaker, applyProtectedMakerOffset, isSignedMsg = false) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
@@ -12,7 +13,7 @@ class OrderNode {
         this.userAccount = userAccount;
         this.sortValue = this.getSortValue(order);
         this.isProtectedMaker = isProtectedMaker;
-        this.protectedMakerParams = protectedMakerParams;
+        this.applyProtectedMakerOffset = applyProtectedMakerOffset;
         this.isSignedMsg = isSignedMsg;
     }
     getLabel() {
@@ -29,7 +30,7 @@ class OrderNode {
         return msg;
     }
     getPrice(oraclePriceData, slot) {
-        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot, undefined, this.isProtectedMaker ? this.protectedMakerParams : undefined);
+        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot, undefined, this.applyProtectedMakerOffset && this.isProtectedMaker);
     }
     isBaseFilled() {
         return this.order.baseAssetAmountFilled.eq(this.order.baseAssetAmount);
@@ -48,7 +49,7 @@ exports.TakingLimitOrderNode = TakingLimitOrderNode;
 class RestingLimitOrderNode extends OrderNode {
     getSortValue(order) {
         let sortValue = order.price;
-        if (this.protectedMakerParams && this.isProtectedMaker) {
+        if (this.applyProtectedMakerOffset && this.isProtectedMaker) {
             const offset = sortValue.divn(1000);
             if ((0, __1.isVariant)(order.direction, 'long')) {
                 sortValue = sortValue.sub(offset);
@@ -82,27 +83,27 @@ exports.TriggerOrderNode = TriggerOrderNode;
 // We'll use the signedMsg uuid for the order id since it's not yet on-chain
 class SignedMsgOrderNode extends OrderNode {
     constructor(order, userAccount) {
-        super(order, userAccount, false, undefined, true);
+        super(order, userAccount, false, false, true);
     }
     getSortValue(order) {
         return order.slot;
     }
 }
 exports.SignedMsgOrderNode = SignedMsgOrderNode;
-function createNode(nodeType, order, userAccount, isProtectedMaker, protectedMakerParams) {
+function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
     switch (nodeType) {
         case 'floatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'protectedFloatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'restingLimit':
-            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'takingLimit':
-            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
+            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'market':
-            return new MarketOrderNode(order, userAccount, isProtectedMaker, undefined);
+            return new MarketOrderNode(order, userAccount, isProtectedMaker, false);
         case 'trigger':
-            return new TriggerOrderNode(order, userAccount, isProtectedMaker, undefined);
+            return new TriggerOrderNode(order, userAccount, isProtectedMaker, false);
         case 'signedMsg':
             return new SignedMsgOrderNode(order, userAccount);
         default:

package/lib/browser/dlob/DLOBSubscriber.d.ts

@@ -3,7 +3,7 @@
 import { DLOB } from './DLOB';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
-import { DLOBSource, DLOBSubscriberEvents, DLOBSubscriptionConfig, ProtectMakerParamsMap, SlotSource } from './types';
+import { DLOBSource, DLOBSubscriberEvents, DLOBSubscriptionConfig, SlotSource } from './types';
 import { DriftClient } from '../driftClient';
 import { MarketType } from '../types';
 import { L2OrderBook, L2OrderBookGenerator, L3OrderBook } from './orderBookLevels';
@@ -18,7 +18,6 @@ export declare class DLOBSubscriber {
     protectedMakerView: boolean;
     constructor(config: DLOBSubscriptionConfig);
     subscribe(): Promise<void>;
-    getProtectedMakerParamsMap(): ProtectMakerParamsMap | undefined;
     updateDLOB(): Promise<void>;
     getDLOB(): DLOB;
     /**

package/lib/browser/dlob/DLOBSubscriber.js

@@ -5,7 +5,6 @@ const DLOB_1 = require("./DLOB");
 const events_1 = require("events");
 const types_1 = require("../types");
 const orderBookLevels_1 = require("./orderBookLevels");
-const protectedMakerParams_1 = require("../math/protectedMakerParams");
 class DLOBSubscriber {
     constructor(config) {
         this.driftClient = config.driftClient;
@@ -13,7 +12,7 @@ class DLOBSubscriber {
         this.slotSource = config.slotSource;
         this.updateFrequency = config.updateFrequency;
         this.protectedMakerView = config.protectedMakerView || false;
-        this.dlob = new DLOB_1.DLOB(this.getProtectedMakerParamsMap());
+        this.dlob = new DLOB_1.DLOB(this.protectedMakerView);
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
@@ -31,13 +30,8 @@ class DLOBSubscriber {
             }
         }, this.updateFrequency);
     }
-    getProtectedMakerParamsMap() {
-        return this.protectedMakerView
-            ? (0, protectedMakerParams_1.getProtectedMakerParamsMap)(this.driftClient.getPerpMarketAccounts())
-            : undefined;
-    }
     async updateDLOB() {
-        this.dlob = await this.dlobSource.getDLOB(this.slotSource.getSlot(), this.getProtectedMakerParamsMap());
+        this.dlob = await this.dlobSource.getDLOB(this.slotSource.getSlot(), this.protectedMakerView);
     }
     getDLOB() {
         return this.dlob;

package/lib/browser/dlob/NodeList.d.ts

@@ -1,4 +1,4 @@
-import { MarketTypeStr, Order, ProtectedMakerParams } from '..';
+import { MarketTypeStr, Order } from '..';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';
 export type SortDirection = 'asc' | 'desc';
 export declare function getOrderSignature(orderId: number, userAccount: string): string;
@@ -13,7 +13,7 @@ export declare class NodeList<NodeType extends keyof DLOBNodeMap> implements DLO
     nodeMap: Map<string, DLOBNodeMap[NodeType]>;
     constructor(nodeType: NodeType, sortDirection: SortDirection);
     clear(): void;
-    insert(order: Order, marketType: MarketTypeStr, userAccount: string, isProtectedMaker: boolean, protectedMakerParamsMap?: ProtectedMakerParams): void;
+    insert(order: Order, marketType: MarketTypeStr, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean): void;
     prependNode(currentNode: DLOBNodeMap[NodeType], newNode: DLOBNodeMap[NodeType]): boolean;
     update(order: Order, userAccount: string): void;
     remove(order: Order, userAccount: string): void;

package/lib/browser/dlob/NodeList.js

@@ -19,11 +19,11 @@ class NodeList {
         this.length = 0;
         this.nodeMap.clear();
     }
-    insert(order, marketType, userAccount, isProtectedMaker, protectedMakerParamsMap) {
+    insert(order, marketType, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
         if (!(0, __1.isVariant)(order.status, 'open')) {
             return;
         }
-        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isProtectedMaker, protectedMakerParamsMap);
+        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         const orderSignature = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderSignature)) {
             return;

package/lib/browser/dlob/types.d.ts

@@ -1,7 +1,5 @@
 import { DLOB } from './DLOB';
 import { DriftClient } from '../driftClient';
-import { ProtectedMakerParams } from '../types';
-import { MarketTypeStr } from '../types';
 export type DLOBSubscriptionConfig = {
     driftClient: DriftClient;
     dlobSource: DLOBSource;
@@ -14,11 +12,8 @@ export interface DLOBSubscriberEvents {
     error: (e: Error) => void;
 }
 export interface DLOBSource {
-    getDLOB(slot: number, protectedMakerParamsMap?: ProtectMakerParamsMap): Promise<DLOB>;
+    getDLOB(slot: number, protectedMakerView?: boolean): Promise<DLOB>;
 }
 export interface SlotSource {
     getSlot(): number;
 }
-export type ProtectMakerParamsMap = {
-    [marketType in MarketTypeStr]: Map<number, ProtectedMakerParams>;
-};

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, ProtectedMakerModeConfig, SignedMsgOrderParamsDelegateMessage } 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';
@@ -167,8 +167,8 @@ export declare class DriftClient {
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     initializeSignedMsgUserOrders(authority: PublicKey, numOrders: number, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     getInitializeSignedMsgUserOrdersAccountIx(authority: PublicKey, numOrders: number): Promise<[PublicKey, TransactionInstruction]>;
-    resizeSignedMsgUserOrders(authority: PublicKey, numOrders: number, userSubaccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
-    getResizeSignedMsgUserOrdersInstruction(authority: PublicKey, numOrders: number, userSubaccountId?: number): Promise<TransactionInstruction>;
+    resizeSignedMsgUserOrders(authority: PublicKey, numOrders: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getResizeSignedMsgUserOrdersInstruction(authority: PublicKey, numOrders: number): Promise<TransactionInstruction>;
     initializeSignedMsgWsDelegatesAccount(authority: PublicKey, delegates?: PublicKey[], txParams?: TxParams): Promise<TransactionSignature>;
     getInitializeSignedMsgWsDelegatesAccountIx(authority: PublicKey, delegates?: PublicKey[]): Promise<TransactionInstruction>;
     addSignedMsgWsDelegate(authority: PublicKey, delegate: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
@@ -245,8 +245,8 @@ export declare class DriftClient {
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param subAccountId
      */
-    forceGetUserAccount(subAccountId?: number, authority?: PublicKey): Promise<UserAccount | undefined>;
-    getUserAccountAndSlot(subAccountId?: number, authority?: PublicKey): DataAndSlot<UserAccount> | undefined;
+    forceGetUserAccount(subAccountId?: number): Promise<UserAccount | undefined>;
+    getUserAccountAndSlot(subAccountId?: number): DataAndSlot<UserAccount> | undefined;
     getSpotPosition(marketIndex: number, subAccountId?: number): SpotPosition | undefined;
     getQuoteAssetTokenAmount(): BN;
     /**
@@ -577,8 +577,8 @@ export declare class DriftClient {
     getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, auctionDurationPercentage?: number, subAccountId?: number): Promise<TransactionInstruction>;
     placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction>;
-    signSignedMsgOrderParamsMessage(orderParamsMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, delegateSigner?: boolean): SignedMsgOrderParams;
-    encodeSignedMsgOrderParamsMessage(orderParamsMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, delegateSigner?: boolean): Buffer;
+    signSignedMsgOrderParamsMessage(orderParamsMessage: SignedMsgOrderParamsMessage): SignedMsgOrderParams;
+    encodeSignedMsgOrderParamsMessage(orderParamsMessage: SignedMsgOrderParamsMessage): Buffer;
     decodeSignedMsgOrderParamsMessage(encodedMessage: Buffer): SignedMsgOrderParamsMessage;
     signMessage(message: Uint8Array, keypair?: Keypair): Buffer;
     placeSignedMsgTakerOrder(signedSignedMsgOrderParams: SignedMsgOrderParams, marketIndex: number, takerInfo: {

package/lib/browser/driftClient.js

@@ -642,7 +642,7 @@ class DriftClient {
         const initializeUserAccountIx = await this.program.instruction.initializeSignedMsgUserOrders(numOrders, {
             accounts: {
                 signedMsgUserOrders: signedMsgUserAccountPublicKey,
-                authority,
+                authority: this.wallet.publicKey,
                 payer: this.wallet.publicKey,
                 rent: anchor.web3.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
@@ -650,21 +650,19 @@ class DriftClient {
         });
         return [signedMsgUserAccountPublicKey, initializeUserAccountIx];
     }
-    async resizeSignedMsgUserOrders(authority, numOrders, userSubaccountId, txParams) {
-        const resizeUserAccountIx = await this.getResizeSignedMsgUserOrdersInstruction(authority, numOrders, userSubaccountId);
+    async resizeSignedMsgUserOrders(authority, numOrders, txParams) {
+        const resizeUserAccountIx = await this.getResizeSignedMsgUserOrdersInstruction(authority, numOrders);
         const tx = await this.buildTransaction([resizeUserAccountIx], txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getResizeSignedMsgUserOrdersInstruction(authority, numOrders, userSubaccountId) {
+    async getResizeSignedMsgUserOrdersInstruction(authority, numOrders) {
         const signedMsgUserAccountPublicKey = (0, pda_1.getSignedMsgUserAccountPublicKey)(this.program.programId, authority);
         const resizeUserAccountIx = await this.program.instruction.resizeSignedMsgUserOrders(numOrders, {
             accounts: {
                 signedMsgUserOrders: signedMsgUserAccountPublicKey,
-                authority,
-                payer: this.wallet.publicKey,
+                authority: this.wallet.publicKey,
                 systemProgram: anchor.web3.SystemProgram.programId,
-                user: await (0, pda_1.getUserAccountPublicKey)(this.program.programId, authority, userSubaccountId),
             },
         });
         return resizeUserAccountIx;
@@ -1195,12 +1193,12 @@ class DriftClient {
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param subAccountId
      */
-    async forceGetUserAccount(subAccountId, authority) {
-        await this.getUser(subAccountId, authority).fetchAccounts();
-        return this.getUser(subAccountId, authority).getUserAccount();
+    async forceGetUserAccount(subAccountId) {
+        await this.getUser(subAccountId).fetchAccounts();
+        return this.getUser(subAccountId).getUserAccount();
     }
-    getUserAccountAndSlot(subAccountId, authority) {
-        return this.getUser(subAccountId, authority).getUserAccountAndSlot();
+    getUserAccountAndSlot(subAccountId) {
+        return this.getUser(subAccountId).getUserAccountAndSlot();
     }
     getSpotPosition(marketIndex, subAccountId) {
         return this.getUserAccount(subAccountId).spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
@@ -1275,9 +1273,7 @@ class DriftClient {
         if (params.useMarketLastSlotCache) {
             const lastUserSlot = (_a = this.getUserAccountAndSlot(params.userAccounts.length > 0
                 ? params.userAccounts[0].subAccountId
-                : this.activeSubAccountId, params.userAccounts.length > 0
-                ? params.userAccounts[0].authority
-                : this.authority)) === null || _a === void 0 ? void 0 : _a.slot;
+                : this.activeSubAccountId)) === null || _a === void 0 ? void 0 : _a.slot;
             for (const [marketIndex, slot,] of this.perpMarketLastSlotCache.entries()) {
                 // if cache has more recent slot than user positions account slot, add market to remaining accounts
                 // otherwise remove from slot
@@ -1860,8 +1856,8 @@ class DriftClient {
         return txSig;
     }
     async getTransferPerpPositionIx(fromSubAccountId, toSubAccountId, marketIndex, amount) {
-        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, fromSubAccountId);
-        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, toSubAccountId);
+        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
+        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [
                 this.getUserAccount(fromSubAccountId),
@@ -1926,6 +1922,7 @@ class DriftClient {
         const userAccount = (await this.program.account.user.fetch(userAccountPublicKey));
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [userAccount],
+            useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
         });
         if (sharesToBurn == undefined) {
@@ -3381,8 +3378,8 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    signSignedMsgOrderParamsMessage(orderParamsMessage, delegateSigner) {
-        const borshBuf = this.encodeSignedMsgOrderParamsMessage(orderParamsMessage, delegateSigner);
+    signSignedMsgOrderParamsMessage(orderParamsMessage) {
+        const borshBuf = this.encodeSignedMsgOrderParamsMessage(orderParamsMessage);
         const orderParams = Buffer.from(borshBuf.toString('hex'));
         return {
             orderParams,
@@ -3392,14 +3389,12 @@ class DriftClient {
     /*
      * Borsh encode signedMsg taker order params
      */
-    encodeSignedMsgOrderParamsMessage(orderParamsMessage, delegateSigner) {
+    encodeSignedMsgOrderParamsMessage(orderParamsMessage) {
         const anchorIxName = 'global' + ':' + 'SignedMsgOrderParamsMessage';
         const prefix = Buffer.from((0, sha256_1.sha256)(anchorIxName).slice(0, 8));
         const buf = Buffer.concat([
             prefix,
-            delegateSigner
-                ? this.program.coder.types.encode('SignedMsgOrderParamsDelegateMessage', orderParamsMessage)
-                : this.program.coder.types.encode('SignedMsgOrderParamsMessage', orderParamsMessage),
+            this.program.coder.types.encode('SignedMsgOrderParamsMessage', orderParamsMessage),
         ]);
         return buf;
     }
@@ -3421,7 +3416,7 @@ class DriftClient {
     async getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [takerInfo.takerUserAccount],
-            useMarketLastSlotCache: false,
+            useMarketLastSlotCache: true,
             readablePerpMarketIndex: marketIndex,
         });
         const messageLengthBuffer = Buffer.alloc(2);
@@ -3463,7 +3458,7 @@ class DriftClient {
                 this.getUserAccount(subAccountId),
                 takerInfo.takerUserAccount,
             ],
-            useMarketLastSlotCache: false,
+            useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [orderParams.marketIndex],
         });
         if (referrerInfo) {
@@ -3931,6 +3926,7 @@ class DriftClient {
                 userAccount,
                 ...makerInfos.map((makerInfo) => makerInfo.makerUserAccount),
             ],
+            useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
         });
         for (const makerInfo of makerInfos) {
@@ -4595,6 +4591,7 @@ class DriftClient {
     async getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
+            useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [spotMarketIndex],
         });

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

@@ -0,0 +1,33 @@
+import { DriftClient, DriftEnv, OptionalOrderParams, SignedMsgOrderParamsMessage, UserMap } from '..';
+import { Keypair, TransactionInstruction } from '@solana/web3.js';
+export type FastlaneOrderSubscriberConfig = {
+    driftClient: DriftClient;
+    userMap: UserMap;
+    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 {
+    private config;
+    private heartbeatTimeout;
+    private readonly heartbeatIntervalMs;
+    private ws;
+    private driftClient;
+    userMap: UserMap;
+    onOrder: (orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage) => Promise<void>;
+    subscribed: boolean;
+    constructor(config: FastlaneOrderSubscriberConfig);
+    getSymbolForMarketIndex(marketIndex: number): string;
+    generateChallengeResponse(nonce: string): string;
+    handleAuthMessage(message: any): void;
+    subscribe(onOrder: (orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage) => Promise<void>): Promise<void>;
+    getPlaceAndMakeSignedMsgOrderIxs(orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage, makerOrderParams: OptionalOrderParams): Promise<TransactionInstruction[]>;
+    private startHeartbeatTimer;
+    private reconnect;
+}