@drift-labs/sdk 2.115.0-beta.0 → 2.115.0-beta.10

package/VERSION

@@ -1 +1 @@
-2.115.0-beta.0
+2.115.0-beta.10

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('GojbSnJuPdKDT1ZuHuAM5t9oz6bxTo1xhUKpTua2F72p'),
+        oracle: new web3_js_1.PublicKey('BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4'),
         launchTs: 1677068931000,
-        oracleSource: __1.OracleSource.PYTH_1M_PULL,
+        oracleSource: __1.OracleSource.PYTH_LAZER_1M,
         pythFeedId: '0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419',
         pythLazerId: 9,
     },

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, SlotSubscriber, SpotMarketAccount, StateAccount, TriggerOrderNode, UserMap } from '..';
+import { BN, DLOBNode, DLOBNodeType, DriftClient, MarketType, MarketTypeStr, OraclePriceData, Order, PerpMarketAccount, PositionDirection, ProtectMakerParamsMap, 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;
-    protectedMakerView: boolean;
-    constructor(protectedMakerView?: boolean);
+    protectedMakerParamsMap: ProtectMakerParamsMap;
+    constructor(protectedMakerParamsMap?: ProtectMakerParamsMap);
     private init;
     clear(): void;
     /**

package/lib/browser/dlob/DLOB.js

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

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

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { BN, OraclePriceData, Order } from '..';
+import { BN, OraclePriceData, Order, ProtectedMakerParams } 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;
-    applyProtectedMakerOffset: boolean;
+    protectedMakerParams?: ProtectedMakerParams;
     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;
-    applyProtectedMakerOffset: boolean;
+    protectedMakerParams?: ProtectedMakerParams;
     isSignedMsg: boolean;
-    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean, isSignedMsg?: boolean);
+    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams, 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, applyProtectedMakerOffset: boolean): DLOBNodeMap[T];
+export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isProtectedMaker: boolean, protectedMakerParams?: ProtectedMakerParams): DLOBNodeMap[T];

package/lib/browser/dlob/DLOBNode.js

@@ -2,10 +2,9 @@
 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, applyProtectedMakerOffset, isSignedMsg = false) {
+    constructor(order, userAccount, isProtectedMaker, protectedMakerParams, isSignedMsg = false) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
@@ -13,7 +12,7 @@ class OrderNode {
         this.userAccount = userAccount;
         this.sortValue = this.getSortValue(order);
         this.isProtectedMaker = isProtectedMaker;
-        this.applyProtectedMakerOffset = applyProtectedMakerOffset;
+        this.protectedMakerParams = protectedMakerParams;
         this.isSignedMsg = isSignedMsg;
     }
     getLabel() {
@@ -30,7 +29,7 @@ class OrderNode {
         return msg;
     }
     getPrice(oraclePriceData, slot) {
-        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot, undefined, this.applyProtectedMakerOffset && this.isProtectedMaker);
+        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot, undefined, this.isProtectedMaker ? this.protectedMakerParams : undefined);
     }
     isBaseFilled() {
         return this.order.baseAssetAmountFilled.eq(this.order.baseAssetAmount);
@@ -49,7 +48,7 @@ exports.TakingLimitOrderNode = TakingLimitOrderNode;
 class RestingLimitOrderNode extends OrderNode {
     getSortValue(order) {
         let sortValue = order.price;
-        if (this.applyProtectedMakerOffset && this.isProtectedMaker) {
+        if (this.protectedMakerParams && this.isProtectedMaker) {
             const offset = sortValue.divn(1000);
             if ((0, __1.isVariant)(order.direction, 'long')) {
                 sortValue = sortValue.sub(offset);
@@ -83,27 +82,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, false, true);
+        super(order, userAccount, false, undefined, true);
     }
     getSortValue(order) {
         return order.slot;
     }
 }
 exports.SignedMsgOrderNode = SignedMsgOrderNode;
-function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
+function createNode(nodeType, order, userAccount, isProtectedMaker, protectedMakerParams) {
     switch (nodeType) {
         case 'floatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
         case 'protectedFloatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
         case 'restingLimit':
-            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
+            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
         case 'takingLimit':
-            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
+            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, protectedMakerParams);
         case 'market':
-            return new MarketOrderNode(order, userAccount, isProtectedMaker, false);
+            return new MarketOrderNode(order, userAccount, isProtectedMaker, undefined);
         case 'trigger':
-            return new TriggerOrderNode(order, userAccount, isProtectedMaker, false);
+            return new TriggerOrderNode(order, userAccount, isProtectedMaker, undefined);
         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, SlotSource } from './types';
+import { DLOBSource, DLOBSubscriberEvents, DLOBSubscriptionConfig, ProtectMakerParamsMap, SlotSource } from './types';
 import { DriftClient } from '../driftClient';
 import { MarketType } from '../types';
 import { L2OrderBook, L2OrderBookGenerator, L3OrderBook } from './orderBookLevels';
@@ -18,6 +18,7 @@ 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,6 +5,7 @@ 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;
@@ -12,7 +13,7 @@ class DLOBSubscriber {
         this.slotSource = config.slotSource;
         this.updateFrequency = config.updateFrequency;
         this.protectedMakerView = config.protectedMakerView || false;
-        this.dlob = new DLOB_1.DLOB(this.protectedMakerView);
+        this.dlob = new DLOB_1.DLOB(this.getProtectedMakerParamsMap());
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
@@ -30,8 +31,13 @@ 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.protectedMakerView);
+        this.dlob = await this.dlobSource.getDLOB(this.slotSource.getSlot(), this.getProtectedMakerParamsMap());
     }
     getDLOB() {
         return this.dlob;

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

@@ -1,4 +1,4 @@
-import { MarketTypeStr, Order } from '..';
+import { MarketTypeStr, Order, ProtectedMakerParams } 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, applyProtectedMakerOffset: boolean): void;
+    insert(order: Order, marketType: MarketTypeStr, userAccount: string, isProtectedMaker: boolean, protectedMakerParamsMap?: ProtectedMakerParams): 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, applyProtectedMakerOffset) {
+    insert(order, marketType, userAccount, isProtectedMaker, protectedMakerParamsMap) {
         if (!(0, __1.isVariant)(order.status, 'open')) {
             return;
         }
-        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
+        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isProtectedMaker, protectedMakerParamsMap);
         const orderSignature = getOrderSignature(order.orderId, userAccount);
         if (this.nodeMap.has(orderSignature)) {
             return;

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

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

package/lib/browser/driftClient.d.ts

@@ -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, txParams?: TxParams): Promise<TransactionSignature>;
-    getResizeSignedMsgUserOrdersInstruction(authority: PublicKey, numOrders: number): Promise<TransactionInstruction>;
+    resizeSignedMsgUserOrders(authority: PublicKey, numOrders: number, userSubaccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getResizeSignedMsgUserOrdersInstruction(authority: PublicKey, numOrders: number, userSubaccountId?: 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): Promise<UserAccount | undefined>;
-    getUserAccountAndSlot(subAccountId?: number): DataAndSlot<UserAccount> | undefined;
+    forceGetUserAccount(subAccountId?: number, authority?: PublicKey): Promise<UserAccount | undefined>;
+    getUserAccountAndSlot(subAccountId?: number, authority?: PublicKey): DataAndSlot<UserAccount> | undefined;
     getSpotPosition(marketIndex: number, subAccountId?: number): SpotPosition | undefined;
     getQuoteAssetTokenAmount(): BN;
     /**

package/lib/browser/driftClient.js

@@ -642,7 +642,7 @@ class DriftClient {
         const initializeUserAccountIx = await this.program.instruction.initializeSignedMsgUserOrders(numOrders, {
             accounts: {
                 signedMsgUserOrders: signedMsgUserAccountPublicKey,
-                authority: this.wallet.publicKey,
+                authority,
                 payer: this.wallet.publicKey,
                 rent: anchor.web3.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
@@ -650,19 +650,21 @@ class DriftClient {
         });
         return [signedMsgUserAccountPublicKey, initializeUserAccountIx];
     }
-    async resizeSignedMsgUserOrders(authority, numOrders, txParams) {
-        const resizeUserAccountIx = await this.getResizeSignedMsgUserOrdersInstruction(authority, numOrders);
+    async resizeSignedMsgUserOrders(authority, numOrders, userSubaccountId, txParams) {
+        const resizeUserAccountIx = await this.getResizeSignedMsgUserOrdersInstruction(authority, numOrders, userSubaccountId);
         const tx = await this.buildTransaction([resizeUserAccountIx], txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getResizeSignedMsgUserOrdersInstruction(authority, numOrders) {
+    async getResizeSignedMsgUserOrdersInstruction(authority, numOrders, userSubaccountId) {
         const signedMsgUserAccountPublicKey = (0, pda_1.getSignedMsgUserAccountPublicKey)(this.program.programId, authority);
         const resizeUserAccountIx = await this.program.instruction.resizeSignedMsgUserOrders(numOrders, {
             accounts: {
                 signedMsgUserOrders: signedMsgUserAccountPublicKey,
-                authority: this.wallet.publicKey,
+                authority,
+                payer: this.wallet.publicKey,
                 systemProgram: anchor.web3.SystemProgram.programId,
+                user: await (0, pda_1.getUserAccountPublicKey)(this.program.programId, authority, userSubaccountId),
             },
         });
         return resizeUserAccountIx;
@@ -1193,12 +1195,12 @@ class DriftClient {
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param subAccountId
      */
-    async forceGetUserAccount(subAccountId) {
-        await this.getUser(subAccountId).fetchAccounts();
-        return this.getUser(subAccountId).getUserAccount();
+    async forceGetUserAccount(subAccountId, authority) {
+        await this.getUser(subAccountId, authority).fetchAccounts();
+        return this.getUser(subAccountId, authority).getUserAccount();
     }
-    getUserAccountAndSlot(subAccountId) {
-        return this.getUser(subAccountId).getUserAccountAndSlot();
+    getUserAccountAndSlot(subAccountId, authority) {
+        return this.getUser(subAccountId, authority).getUserAccountAndSlot();
     }
     getSpotPosition(marketIndex, subAccountId) {
         return this.getUserAccount(subAccountId).spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
@@ -1271,7 +1273,11 @@ class DriftClient {
         var _a;
         const { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap } = this.getRemainingAccountMapsForUsers(params.userAccounts);
         if (params.useMarketLastSlotCache) {
-            const lastUserSlot = (_a = this.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.slot;
+            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;
             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
@@ -1469,7 +1475,7 @@ class DriftClient {
         let remainingAccounts = [];
         if (userInitialized) {
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [await this.forceGetUserAccount()],
+                userAccounts: [await this.forceGetUserAccount(subAccountId)],
                 useMarketLastSlotCache: true,
                 writableSpotMarketIndexes: [marketIndex],
             });
@@ -1854,8 +1860,8 @@ class DriftClient {
         return txSig;
     }
     async getTransferPerpPositionIx(fromSubAccountId, toSubAccountId, marketIndex, amount) {
-        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 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 remainingAccounts = this.getRemainingAccounts({
             userAccounts: [
                 this.getUserAccount(fromSubAccountId),
@@ -3414,7 +3420,7 @@ class DriftClient {
     async getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [takerInfo.takerUserAccount],
-            useMarketLastSlotCache: true,
+            useMarketLastSlotCache: false,
             readablePerpMarketIndex: marketIndex,
         });
         const messageLengthBuffer = Buffer.alloc(2);
@@ -3456,7 +3462,7 @@ class DriftClient {
                 this.getUserAccount(subAccountId),
                 takerInfo.takerUserAccount,
             ],
-            useMarketLastSlotCache: true,
+            useMarketLastSlotCache: false,
             writablePerpMarketIndexes: [orderParams.marketIndex],
         });
         if (referrerInfo) {
@@ -4860,7 +4866,7 @@ class DriftClient {
                 this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
             }
         }
-        const [pullIxs, _responses, success] = await on_demand_1.PullFeed.fetchUpdateManyIx(program, {
+        const [pullIxs, _responses, success] = await on_demand_1.PullFeed.fetchUpdateManyLightIx(program, {
             feeds,
             numSignatures,
             recentSlothashes: recentSlothash

package/lib/browser/idl/drift.json

@@ -104,7 +104,7 @@
                 {
                     "name": "authority",
                     "isMut": false,
-                    "isSigner": true
+                    "isSigner": false
                 },
                 {
                     "name": "payer",
@@ -139,6 +139,16 @@
                 },
                 {
                     "name": "authority",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "payer",
                     "isMut": true,
                     "isSigner": true
                 },
@@ -14986,6 +14996,11 @@
             "code": 6312,
             "name": "InvalidTransferPerpPosition",
             "msg": "Invalid Transfer Perp Position"
+        },
+        {
+            "code": 6313,
+            "name": "InvalidSignedMsgUserOrdersResize",
+            "msg": "Invalid SignedMsgUserOrders resize"
         }
     ],
     "metadata": {

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

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { User } from '../user';
-import { PerpMarketAccount, AMM, Order, PositionDirection } from '../types';
+import { PerpMarketAccount, AMM, Order, PositionDirection, ProtectedMakerParams } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
 export declare function isOrderRiskIncreasing(user: User, order: Order): boolean;
@@ -8,7 +8,8 @@ export declare function isOrderRiskIncreasingInSameDirection(user: User, order:
 export declare function isOrderReduceOnly(user: User, order: Order): boolean;
 export declare function standardizeBaseAssetAmount(baseAssetAmount: BN, stepSize: BN): BN;
 export declare function standardizePrice(price: BN, tickSize: BN, direction: PositionDirection): BN;
-export declare function getLimitPrice(order: Order, oraclePriceData: OraclePriceData, slot: number, fallbackPrice?: BN, protectedMaker?: boolean): BN | undefined;
+export declare function getLimitPrice(order: Order, oraclePriceData: OraclePriceData, slot: number, fallbackPrice?: BN, protectedMakerParams?: ProtectedMakerParams): BN | undefined;
+export declare function applyProtectedMakerParams(limitPrice: BN, direction: PositionDirection, protectedMakerParams: ProtectedMakerParams): BN;
 export declare function hasLimitPrice(order: Order, slot: number): boolean;
 export declare function hasAuctionPrice(order: Order, slot: number): boolean;
 export declare function isFillableByVAMM(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number, ts: number, minAuctionDuration: number): boolean;

package/lib/browser/math/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.applyProtectedMakerParams = 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");
@@ -96,7 +96,7 @@ function standardizePrice(price, tickSize, direction) {
     }
 }
 exports.standardizePrice = standardizePrice;
-function getLimitPrice(order, oraclePriceData, slot, fallbackPrice, protectedMaker) {
+function getLimitPrice(order, oraclePriceData, slot, fallbackPrice, protectedMakerParams) {
     let limitPrice;
     if (hasAuctionPrice(order, slot)) {
         limitPrice = (0, auction_1.getAuctionPrice)(order, slot, oraclePriceData.price);
@@ -110,18 +110,30 @@ function getLimitPrice(order, oraclePriceData, slot, fallbackPrice, protectedMak
     else {
         limitPrice = order.price;
     }
-    if (protectedMaker) {
-        const offset = limitPrice.divn(1000);
-        if ((0, types_1.isVariant)(order.direction, 'long')) {
-            limitPrice = limitPrice.sub(offset);
-        }
-        else {
-            limitPrice = limitPrice.add(offset);
-        }
+    if (protectedMakerParams) {
+        limitPrice = applyProtectedMakerParams(limitPrice, order.direction, protectedMakerParams);
     }
     return limitPrice;
 }
 exports.getLimitPrice = getLimitPrice;
+function applyProtectedMakerParams(limitPrice, direction, protectedMakerParams) {
+    const minOffset = protectedMakerParams.tickSize.muln(8);
+    let limitPriceBpsDivisor;
+    if (protectedMakerParams.limitPriceDivisor > 0) {
+        limitPriceBpsDivisor = 10000 / protectedMakerParams.limitPriceDivisor;
+    }
+    else {
+        limitPriceBpsDivisor = 1000;
+    }
+    const limitPriceOffset = anchor_1.BN.min(anchor_1.BN.max(anchor_1.BN.max(limitPrice.divn(limitPriceBpsDivisor), minOffset), protectedMakerParams.dynamicOffset), limitPrice.divn(20));
+    if ((0, types_1.isVariant)(direction, 'long')) {
+        return anchor_1.BN.max(limitPrice.sub(limitPriceOffset), protectedMakerParams.tickSize);
+    }
+    else {
+        return limitPrice.add(limitPriceOffset);
+    }
+}
+exports.applyProtectedMakerParams = applyProtectedMakerParams;
 function hasLimitPrice(order, slot) {
     return (order.price.gt(numericConstants_1.ZERO) ||
         order.oraclePriceOffset != 0 ||

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

@@ -0,0 +1,4 @@
+import { ProtectMakerParamsMap } from '..';
+import { PerpMarketAccount, ProtectedMakerParams } from '../types';
+export declare function getProtectedMakerParams(perpMarket: PerpMarketAccount): ProtectedMakerParams;
+export declare function getProtectedMakerParamsMap(perpMarkets: PerpMarketAccount[]): ProtectMakerParamsMap;

package/lib/browser/math/protectedMakerParams.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProtectedMakerParamsMap = exports.getProtectedMakerParams = void 0;
+const __1 = require("..");
+function getProtectedMakerParams(perpMarket) {
+    let dynamicOffset;
+    if (perpMarket.protectedMakerDynamicDivisor > 0) {
+        dynamicOffset = __1.BN.max(perpMarket.amm.oracleStd, perpMarket.amm.markStd).divn(perpMarket.protectedMakerDynamicDivisor);
+    }
+    else {
+        dynamicOffset = 0;
+    }
+    return {
+        tickSize: perpMarket.amm.orderTickSize,
+        limitPriceDivisor: perpMarket.protectedMakerLimitPriceDivisor,
+        dynamicOffset: dynamicOffset,
+    };
+}
+exports.getProtectedMakerParams = getProtectedMakerParams;
+function getProtectedMakerParamsMap(perpMarkets) {
+    const map = {
+        perp: new Map(),
+        spot: new Map(),
+    };
+    for (const perpMarket of perpMarkets) {
+        const marketIndex = perpMarket.marketIndex;
+        const protectedMakerParams = getProtectedMakerParams(perpMarket);
+        map.perp.set(marketIndex, protectedMakerParams);
+    }
+    return map;
+}
+exports.getProtectedMakerParamsMap = getProtectedMakerParamsMap;

package/lib/browser/openbook/openbookV2Subscriber.d.ts

@@ -31,6 +31,8 @@ export declare class OpenbookV2Subscriber implements L2OrderBookGenerator {
     getBestAsk(): BN | undefined;
     getL2Bids(): Generator<L2Level>;
     getL2Asks(): Generator<L2Level>;
+    convertSizeInBaseLotsToMarketPrecision(sizeInLots: BN): BN;
+    convertPriceInLotsToPricePrecision(priceInLots: BN): BN;
     getL2Levels(side: 'bids' | 'asks'): Generator<L2Level>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/openbook/openbookV2Subscriber.js

@@ -56,7 +56,7 @@ class OpenbookV2Subscriber {
         if (bestBid === undefined) {
             return undefined;
         }
-        return new anchor_1.BN(Math.floor(bestBid.price * numericConstants_1.PRICE_PRECISION.toNumber()));
+        return this.convertPriceInLotsToPricePrecision(bestBid.priceLots);
     }
     getBestAsk() {
         var _a;
@@ -64,7 +64,7 @@ class OpenbookV2Subscriber {
         if (bestAsk === undefined) {
             return undefined;
         }
-        return new anchor_1.BN(Math.floor(bestAsk.price * numericConstants_1.PRICE_PRECISION.toNumber()));
+        return this.convertPriceInLotsToPricePrecision(bestAsk.priceLots);
     }
     getL2Bids() {
         return this.getL2Levels('bids');
@@ -72,13 +72,23 @@ class OpenbookV2Subscriber {
     getL2Asks() {
         return this.getL2Levels('asks');
     }
+    convertSizeInBaseLotsToMarketPrecision(sizeInLots) {
+        return sizeInLots.mul(this.market.account.baseLotSize);
+    }
+    convertPriceInLotsToPricePrecision(priceInLots) {
+        const adjPrice = priceInLots
+            .mul(numericConstants_1.PRICE_PRECISION)
+            .muln(10 **
+            (this.market.account.baseDecimals - this.market.account.quoteDecimals))
+            .mul(this.market.account.quoteLotSize)
+            .div(this.market.account.baseLotSize);
+        return adjPrice;
+    }
     *getL2Levels(side) {
-        const basePrecision = Math.ceil(1 / this.market.baseNativeFactor.toNumber());
-        const pricePrecision = numericConstants_1.PRICE_PRECISION.toNumber();
         const levels = side === 'bids' ? this.market.bids : this.market.asks;
         for (const order of levels === null || levels === void 0 ? void 0 : levels.items()) {
-            const size = new anchor_1.BN(order.size * basePrecision);
-            const price = new anchor_1.BN(order.price * pricePrecision);
+            const size = this.convertSizeInBaseLotsToMarketPrecision(order.sizeLots);
+            const price = this.convertPriceInLotsToPricePrecision(order.priceLots);
             yield {
                 price,
                 size,