@drift-labs/sdk 2.108.0-beta.9 → 2.109.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.108.0-beta.9
+2.109.0-beta.0

package/lib/browser/constants/spotMarkets.js

@@ -508,7 +508,7 @@ exports.MainnetSpotMarkets = [
         pythLazerId: 9,
     },
     {
-        symbol: 'JLP',
+        symbol: 'JLP-1',
         marketIndex: 33,
         poolId: 1,
         oracle: new web3_js_1.PublicKey('5Mb11e5rt1Sp6A286B145E4TmgMzsM2UX9nCF2vas5bs'),
@@ -520,7 +520,7 @@ exports.MainnetSpotMarkets = [
         launchTs: 1735255852000,
     },
     {
-        symbol: 'USDC',
+        symbol: 'USDC-1',
         marketIndex: 34,
         poolId: 1,
         oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
@@ -568,6 +568,18 @@ exports.MainnetSpotMarkets = [
         pythFeedId: '0x8fef7d52c7f4e3a6258d663f9d27e64a1b6fd95ab5f7d545dbf9a515353d0064',
         launchTs: 1737360280000,
     },
+    {
+        symbol: 'AUSD',
+        marketIndex: 38,
+        poolId: 0,
+        oracle: new web3_js_1.PublicKey('8FZhpiM8n3mpgvENWLcEvHsKB1bBhYBAyL4Ypr4gptLZ'),
+        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        mint: new web3_js_1.PublicKey('AUSD1jCcCyPLybk1YnvPWsHQSrZ46dxwoMniN4N2UEB9'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xd9912df360b5b7f21a122f15bdd5e27f62ce5e72bd316c291f7c86620e07fb2a',
+        launchTs: 1738255943000,
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

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

@@ -17,6 +17,10 @@ export type MarketNodeLists = {
         ask: NodeList<'floatingLimit'>;
         bid: NodeList<'floatingLimit'>;
     };
+    protectedFloatingLimit: {
+        ask: NodeList<'protectedFloatingLimit'>;
+        bid: NodeList<'protectedFloatingLimit'>;
+    };
     takingLimit: {
         ask: NodeList<'takingLimit'>;
         bid: NodeList<'takingLimit'>;
@@ -67,8 +71,8 @@ export declare class DLOB {
     insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
     insertSwiftOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
-    delete(order: Order, userAccount: PublicKey, slot: number, onDelete?: OrderBookCallback): void;
-    getListForOnChainOrder(order: Order, slot: number): NodeList<any> | undefined;
+    delete(order: Order, userAccount: PublicKey, slot: number, isUserProtectedMaker: boolean, onDelete?: OrderBookCallback): void;
+    getListForOnChainOrder(order: Order, slot: number, isProtectedMaker: boolean): NodeList<any> | undefined;
     updateRestingLimitOrders(slot: number): void;
     updateRestingLimitOrdersForMarketType(slot: number, marketTypeStr: MarketTypeStr): void;
     getOrder(orderId: number, userAccount: PublicKey): Order | undefined;

package/lib/browser/dlob/DLOB.js

@@ -88,7 +88,7 @@ class DLOB {
                 .get(marketType)
                 .add((0, NodeList_1.getOrderSignature)(order.orderId, userAccount));
         }
-        (_a = this.getListForOnChainOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker);
+        (_a = this.getListForOnChainOrder(order, slot, isUserProtectedMaker)) === null || _a === void 0 ? void 0 : _a.insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
         if (onInsert) {
             onInsert();
         }
@@ -106,7 +106,7 @@ class DLOB {
         this.orderLists
             .get(marketType)
             .get(marketIndex)
-            .swift[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker);
+            .swift[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
         if (onInsert) {
             onInsert();
         }
@@ -121,6 +121,10 @@ class DLOB {
                 ask: new NodeList_1.NodeList('floatingLimit', 'asc'),
                 bid: new NodeList_1.NodeList('floatingLimit', 'desc'),
             },
+            protectedFloatingLimit: {
+                ask: new NodeList_1.NodeList('protectedFloatingLimit', 'asc'),
+                bid: new NodeList_1.NodeList('protectedFloatingLimit', 'desc'),
+            },
             takingLimit: {
                 ask: new NodeList_1.NodeList('takingLimit', 'asc'),
                 bid: new NodeList_1.NodeList('takingLimit', 'asc'), // always sort ascending for market orders
@@ -139,18 +143,18 @@ class DLOB {
             },
         });
     }
-    delete(order, userAccount, slot, onDelete) {
+    delete(order, userAccount, slot, isUserProtectedMaker, onDelete) {
         var _a;
         if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
         this.updateRestingLimitOrders(slot);
-        (_a = this.getListForOnChainOrder(order, slot)) === null || _a === void 0 ? void 0 : _a.remove(order, userAccount.toString());
+        (_a = this.getListForOnChainOrder(order, slot, isUserProtectedMaker)) === null || _a === void 0 ? void 0 : _a.remove(order, userAccount.toString());
         if (onDelete) {
             onDelete();
         }
     }
-    getListForOnChainOrder(order, slot) {
+    getListForOnChainOrder(order, slot, isProtectedMaker) {
         const isInactiveTriggerOrder = (0, __1.mustBeTriggered)(order) && !(0, __1.isTriggered)(order);
         let type;
         if (isInactiveTriggerOrder) {
@@ -160,7 +164,7 @@ class DLOB {
             type = 'market';
         }
         else if (order.oraclePriceOffset !== 0) {
-            type = 'floatingLimit';
+            type = isProtectedMaker ? 'protectedFloatingLimit' : 'floatingLimit';
         }
         else {
             const isResting = (0, __1.isRestingLimitOrder)(order, slot);
@@ -211,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);
+                nodeLists.restingLimit[side].insert(node.order, marketTypeStr, node.userAccount, node.isProtectedMaker, this.protectedMakerView);
             }
         }
     }
@@ -374,7 +378,7 @@ class DLOB {
                 if (sameUser) {
                     continue;
                 }
-                const makerPrice = makerNode.getPrice(oraclePriceData, slot, this.protectedMakerView);
+                const makerPrice = makerNode.getPrice(oraclePriceData, slot);
                 const takerPrice = takerNode.getPrice(oraclePriceData, slot);
                 const ordersCross = doesCross(takerPrice, makerPrice);
                 if (!ordersCross) {
@@ -394,11 +398,11 @@ class DLOB {
                 const newMakerOrder = { ...makerOrder };
                 newMakerOrder.baseAssetAmountFilled =
                     makerOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOnChainOrder(newMakerOrder, slot).update(newMakerOrder, makerNode.userAccount);
+                this.getListForOnChainOrder(newMakerOrder, slot, makerNode.isProtectedMaker).update(newMakerOrder, makerNode.userAccount);
                 const newTakerOrder = { ...takerOrder };
                 newTakerOrder.baseAssetAmountFilled =
                     takerOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOnChainOrder(newTakerOrder, slot).update(newTakerOrder, takerNode.userAccount);
+                this.getListForOnChainOrder(newTakerOrder, slot, takerNode.isProtectedMaker).update(newTakerOrder, takerNode.userAccount);
                 if (newTakerOrder.baseAssetAmountFilled.eq(takerOrder.baseAssetAmount)) {
                     break;
                 }
@@ -572,8 +576,8 @@ class DLOB {
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             return bestNode
-                .getPrice(oraclePriceData, slot, this.protectedMakerView)
-                .lt(currentNode.getPrice(oraclePriceData, slot, this.protectedMakerView));
+                .getPrice(oraclePriceData, slot)
+                .lt(currentNode.getPrice(oraclePriceData, slot));
         }, filterFcn);
     }
     *getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData, filterFcn) {
@@ -592,8 +596,8 @@ class DLOB {
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             return bestNode
-                .getPrice(oraclePriceData, slot, this.protectedMakerView)
-                .gt(currentNode.getPrice(oraclePriceData, slot, this.protectedMakerView));
+                .getPrice(oraclePriceData, slot)
+                .gt(currentNode.getPrice(oraclePriceData, slot));
         }, filterFcn);
     }
     /**
@@ -615,8 +619,8 @@ class DLOB {
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             var _a, _b;
-            const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot, this.protectedMakerView)) !== null && _a !== void 0 ? _a : __1.ZERO;
-            const currentNodePrice = (_b = currentNode.getPrice(oraclePriceData, slot, this.protectedMakerView)) !== null && _b !== void 0 ? _b : __1.ZERO;
+            const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot)) !== null && _a !== void 0 ? _a : __1.ZERO;
+            const currentNodePrice = (_b = currentNode.getPrice(oraclePriceData, slot)) !== null && _b !== void 0 ? _b : __1.ZERO;
             if (bestNodePrice.eq(currentNodePrice)) {
                 return bestNode.order.slot.lt(currentNode.order.slot);
             }
@@ -642,8 +646,8 @@ class DLOB {
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode, slot, oraclePriceData) => {
             var _a, _b;
-            const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot, this.protectedMakerView)) !== null && _a !== void 0 ? _a : __1.BN_MAX;
-            const currentNodePrice = (_b = currentNode.getPrice(oraclePriceData, slot, this.protectedMakerView)) !== null && _b !== void 0 ? _b : __1.BN_MAX;
+            const bestNodePrice = (_a = bestNode.getPrice(oraclePriceData, slot)) !== null && _a !== void 0 ? _a : __1.BN_MAX;
+            const currentNodePrice = (_b = currentNode.getPrice(oraclePriceData, slot)) !== null && _b !== void 0 ? _b : __1.BN_MAX;
             if (bestNodePrice.eq(currentNodePrice)) {
                 return bestNode.order.slot.lt(currentNode.order.slot);
             }
@@ -655,8 +659,8 @@ class DLOB {
         for (const askNode of this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)) {
             const bidGenerator = this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData);
             for (const bidNode of bidGenerator) {
-                const bidPrice = bidNode.getPrice(oraclePriceData, slot, this.protectedMakerView);
-                const askPrice = askNode.getPrice(oraclePriceData, slot, this.protectedMakerView);
+                const bidPrice = bidNode.getPrice(oraclePriceData, slot);
+                const askPrice = askNode.getPrice(oraclePriceData, slot);
                 // orders don't cross
                 if (bidPrice.lt(askPrice)) {
                     break;
@@ -680,12 +684,12 @@ class DLOB {
                 const newBidOrder = { ...bidOrder };
                 newBidOrder.baseAssetAmountFilled =
                     bidOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOnChainOrder(newBidOrder, slot).update(newBidOrder, bidNode.userAccount);
+                this.getListForOnChainOrder(newBidOrder, slot, bidNode.isProtectedMaker).update(newBidOrder, bidNode.userAccount);
                 // ask completely filled
                 const newAskOrder = { ...askOrder };
                 newAskOrder.baseAssetAmountFilled =
                     askOrder.baseAssetAmountFilled.add(baseFilled);
-                this.getListForOnChainOrder(newAskOrder, slot).update(newAskOrder, askNode.userAccount);
+                this.getListForOnChainOrder(newAskOrder, slot, askNode.isProtectedMaker).update(newAskOrder, askNode.userAccount);
                 nodesToFill.push({
                     node: takerNode,
                     makerNodes: [makerNode],
@@ -731,7 +735,7 @@ class DLOB {
     getBestAsk(marketIndex, slot, marketType, oraclePriceData) {
         const bestAsk = this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData).next().value;
         if (bestAsk) {
-            return bestAsk.getPrice(oraclePriceData, slot, this.protectedMakerView);
+            return bestAsk.getPrice(oraclePriceData, slot);
         }
         return undefined;
     }
@@ -909,6 +913,8 @@ class DLOB {
             yield nodeLists.market.ask;
             yield nodeLists.floatingLimit.bid;
             yield nodeLists.floatingLimit.ask;
+            yield nodeLists.protectedFloatingLimit.bid;
+            yield nodeLists.protectedFloatingLimit.ask;
             yield nodeLists.trigger.above;
             yield nodeLists.trigger.below;
         }
@@ -921,6 +927,8 @@ class DLOB {
             yield nodeLists.market.ask;
             yield nodeLists.floatingLimit.bid;
             yield nodeLists.floatingLimit.ask;
+            yield nodeLists.protectedFloatingLimit.bid;
+            yield nodeLists.protectedFloatingLimit.ask;
             yield nodeLists.trigger.above;
             yield nodeLists.trigger.below;
         }

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

@@ -1,13 +1,14 @@
 /// <reference types="bn.js" />
 import { BN, OraclePriceData, Order } from '..';
 export interface DLOBNode {
-    getPrice(oraclePriceData: OraclePriceData, slot: number, protectedMakerView?: boolean): BN;
+    getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
     isVammNode(): boolean;
     order: Order | undefined;
     isBaseFilled(): boolean;
     haveFilled: boolean;
     userAccount: string | undefined;
-    isUserProtectedMaker: boolean;
+    isProtectedMaker: boolean;
+    applyProtectedMakerOffset: boolean;
     isSwift: boolean | undefined;
 }
 export declare abstract class OrderNode implements DLOBNode {
@@ -16,12 +17,13 @@ export declare abstract class OrderNode implements DLOBNode {
     sortValue: BN;
     haveFilled: boolean;
     haveTrigger: boolean;
-    isUserProtectedMaker: boolean;
+    isProtectedMaker: boolean;
+    applyProtectedMakerOffset: boolean;
     isSwift: boolean;
-    constructor(order: Order, userAccount: string, isUserProtectedMaker: boolean, isSwift?: boolean);
+    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean, isSwift?: boolean);
     abstract getSortValue(order: Order): BN;
     getLabel(): string;
-    getPrice(oraclePriceData: OraclePriceData, slot: number, protectedMakerView?: boolean): BN;
+    getPrice(oraclePriceData: OraclePriceData, slot: number): BN;
     isBaseFilled(): boolean;
     isVammNode(): boolean;
 }
@@ -60,9 +62,10 @@ export type DLOBNodeMap = {
     restingLimit: RestingLimitOrderNode;
     takingLimit: TakingLimitOrderNode;
     floatingLimit: FloatingLimitOrderNode;
+    protectedFloatingLimit: FloatingLimitOrderNode;
     market: MarketOrderNode;
     trigger: TriggerOrderNode;
     swift: SwiftOrderNode;
 };
-export type DLOBNodeType = 'swift' | 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
-export declare function createNode<T extends DLOBNodeType>(nodeType: T, order: Order, userAccount: string, isUserProtectedMaker: boolean): DLOBNodeMap[T];
+export type DLOBNodeType = 'swift' | '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];

package/lib/browser/dlob/DLOBNode.js

@@ -5,14 +5,15 @@ const __1 = require("..");
 // import { PublicKey } from '@solana/web3.js';
 const NodeList_1 = require("./NodeList");
 class OrderNode {
-    constructor(order, userAccount, isUserProtectedMaker, isSwift = false) {
+    constructor(order, userAccount, isProtectedMaker, applyProtectedMakerOffset, isSwift = false) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
         this.order = { ...order };
         this.userAccount = userAccount;
         this.sortValue = this.getSortValue(order);
-        this.isUserProtectedMaker = isUserProtectedMaker;
+        this.isProtectedMaker = isProtectedMaker;
+        this.applyProtectedMakerOffset = applyProtectedMakerOffset;
         this.isSwift = isSwift;
     }
     getLabel() {
@@ -28,8 +29,8 @@ class OrderNode {
         }
         return msg;
     }
-    getPrice(oraclePriceData, slot, protectedMakerView) {
-        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot, undefined, protectedMakerView && this.isUserProtectedMaker);
+    getPrice(oraclePriceData, slot) {
+        return (0, __1.getLimitPrice)(this.order, oraclePriceData, slot, undefined, this.applyProtectedMakerOffset);
     }
     isBaseFilled() {
         return this.order.baseAssetAmountFilled.eq(this.order.baseAssetAmount);
@@ -47,7 +48,17 @@ class TakingLimitOrderNode extends OrderNode {
 exports.TakingLimitOrderNode = TakingLimitOrderNode;
 class RestingLimitOrderNode extends OrderNode {
     getSortValue(order) {
-        return order.price;
+        let sortValue = order.price;
+        if (this.applyProtectedMakerOffset) {
+            const offset = sortValue.divn(1000);
+            if ((0, __1.isVariant)(order.direction, 'long')) {
+                sortValue = sortValue.sub(offset);
+            }
+            else {
+                sortValue = sortValue.add(offset);
+            }
+        }
+        return sortValue;
     }
 }
 exports.RestingLimitOrderNode = RestingLimitOrderNode;
@@ -72,25 +83,27 @@ exports.TriggerOrderNode = TriggerOrderNode;
 // We'll use the swift uuid for the order id since it's not yet on-chain
 class SwiftOrderNode extends OrderNode {
     constructor(order, userAccount) {
-        super(order, userAccount, false, true);
+        super(order, userAccount, false, false, true);
     }
     getSortValue(order) {
         return order.slot;
     }
 }
 exports.SwiftOrderNode = SwiftOrderNode;
-function createNode(nodeType, order, userAccount, isUserProtectedMaker) {
+function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
     switch (nodeType) {
         case 'floatingLimit':
-            return new FloatingLimitOrderNode(order, userAccount, isUserProtectedMaker);
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
+        case 'protectedFloatingLimit':
+            return new FloatingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'restingLimit':
-            return new RestingLimitOrderNode(order, userAccount, isUserProtectedMaker);
+            return new RestingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'takingLimit':
-            return new TakingLimitOrderNode(order, userAccount, isUserProtectedMaker);
+            return new TakingLimitOrderNode(order, userAccount, isProtectedMaker, applyProtectedMakerOffset);
         case 'market':
-            return new MarketOrderNode(order, userAccount, isUserProtectedMaker);
+            return new MarketOrderNode(order, userAccount, isProtectedMaker, false);
         case 'trigger':
-            return new TriggerOrderNode(order, userAccount, isUserProtectedMaker);
+            return new TriggerOrderNode(order, userAccount, isProtectedMaker, false);
         case 'swift':
             return new SwiftOrderNode(order, userAccount);
         default:

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

@@ -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, isUserProtectedMaker: boolean): 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, isUserProtectedMaker) {
+    insert(order, marketType, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
         if ((0, __1.isVariant)(order.status, 'init')) {
             return;
         }
-        const newNode = (0, DLOBNode_1.createNode)(this.nodeType, order, userAccount, isUserProtectedMaker);
+        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/driftClient.d.ts

@@ -190,6 +190,15 @@ export declare class DriftClient {
     getForceDeleteUserIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<anchor.web3.TransactionInstruction>;
     deleteSwiftUserOrders(txParams?: TxParams): Promise<TransactionSignature>;
     getSwiftUserOrdersDeletionIx(authority: PublicKey): Promise<anchor.web3.TransactionInstruction>;
+    /**
+     * Checks if a Swift User Orders account exists for the given authority.
+     * The account pubkey is derived using the program ID and authority as seeds.
+     * Makes an RPC call to check if the account exists on-chain.
+     *
+     * @param authority The authority public key to check for
+     * @returns Promise that resolves to true if the account exists, false otherwise
+     */
+    isSwiftUserOrdersAccountInitialized(authority: PublicKey): Promise<boolean>;
     reclaimRent(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getReclaimRentIx(userAccountPublicKey: PublicKey): Promise<anchor.web3.TransactionInstruction>;
     getUser(subAccountId?: number, authority?: PublicKey): User;

package/lib/browser/driftClient.js

@@ -1011,6 +1011,18 @@ class DriftClient {
         });
         return ix;
     }
+    /**
+     * Checks if a Swift User Orders account exists for the given authority.
+     * The account pubkey is derived using the program ID and authority as seeds.
+     * Makes an RPC call to check if the account exists on-chain.
+     *
+     * @param authority The authority public key to check for
+     * @returns Promise that resolves to true if the account exists, false otherwise
+     */
+    async isSwiftUserOrdersAccountInitialized(authority) {
+        const swiftUserOrdersAccountPublicKey = (0, pda_1.getSwiftUserAccountPublicKey)(this.program.programId, authority);
+        return this.checkIfAccountExists(swiftUserOrdersAccountPublicKey);
+    }
     async reclaimRent(subAccountId = 0, txParams) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         const ix = await this.getReclaimRentIx(userAccountPublicKey);

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.107.0",
+    "version": "2.108.0",
     "name": "drift",
     "instructions": [
         {
@@ -14642,6 +14642,11 @@
             "code": 6308,
             "name": "InvalidLiquidateSpotWithSwap",
             "msg": "InvalidLiquidateSpotWithSwap"
+        },
+        {
+            "code": 6309,
+            "name": "SwiftUserContextUserMismatch",
+            "msg": "User in swift message does not match user in ix context"
         }
     ],
     "metadata": {

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

@@ -1,2 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '../';
 export declare const convertToNumber: (bigNumber: BN, precision?: BN) => number;
+export declare function convertToBN(value: number, precision: BN): BN;

package/lib/browser/math/conversion.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToNumber = void 0;
+exports.convertToBN = exports.convertToNumber = void 0;
+const __1 = require("../");
 const numericConstants_1 = require("../constants/numericConstants");
 const convertToNumber = (bigNumber, precision = numericConstants_1.PRICE_PRECISION) => {
     if (!bigNumber)
@@ -9,3 +10,12 @@ const convertToNumber = (bigNumber, precision = numericConstants_1.PRICE_PRECISI
         bigNumber.mod(precision).toNumber() / precision.toNumber());
 };
 exports.convertToNumber = convertToNumber;
+function convertToBN(value, precision) {
+    // Get the whole part using Math.floor
+    const wholePart = Math.floor(value);
+    // Get decimal part by subtracting whole part and multiplying by precision
+    const decimalPart = Math.round((value - wholePart) * precision.toNumber());
+    // Combine: wholePart * PRECISION + decimalPart
+    return new __1.BN(wholePart).mul(precision).add(new __1.BN(decimalPart));
+}
+exports.convertToBN = convertToBN;

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

@@ -37,3 +37,4 @@ export declare function calculateAvailablePerpLiquidity(market: PerpMarketAccoun
     bids: BN;
     asks: BN;
 };
+export declare function calculatePerpMarketBaseLiquidatorFee(market: PerpMarketAccount, userHighLeverageMode: boolean): number;

package/lib/browser/math/market.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAvailablePerpLiquidity = exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketMaxAvailableInsurance = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateOracleReserveSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateReservePrice = void 0;
+exports.calculatePerpMarketBaseLiquidatorFee = exports.calculateAvailablePerpLiquidity = exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketMaxAvailableInsurance = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateOracleReserveSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateReservePrice = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
@@ -161,3 +161,14 @@ function calculateAvailablePerpLiquidity(market, oraclePriceData, dlob, slot) {
     };
 }
 exports.calculateAvailablePerpLiquidity = calculateAvailablePerpLiquidity;
+function calculatePerpMarketBaseLiquidatorFee(market, userHighLeverageMode) {
+    if (userHighLeverageMode && market.highLeverageMarginRatioMaintenance > 0) {
+        // min(liquidator_fee, .8 * high_leverage_margin_ratio_maintenance)
+        return Math.min(market.liquidatorFee, market.highLeverageMarginRatioMaintenance -
+            Math.floor(market.highLeverageMarginRatioMaintenance / 5));
+    }
+    else {
+        return market.liquidatorFee;
+    }
+}
+exports.calculatePerpMarketBaseLiquidatorFee = calculatePerpMarketBaseLiquidatorFee;

package/lib/browser/user.d.ts

@@ -119,7 +119,7 @@ export declare class User {
     /**
      * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
      */
-    getMaintenanceMarginRequirement(): BN;
+    getMaintenanceMarginRequirement(liquidationBuffer?: BN): BN;
     getActivePerpPositionsForUserAccount(userAccount: UserAccount): PerpPosition[];
     getActivePerpPositions(): PerpPosition[];
     getActivePerpPositionsAndSlot(): DataAndSlot<PerpPosition[]>;
@@ -130,7 +130,7 @@ export declare class User {
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getUnrealizedPNL(withFunding?: boolean, marketIndex?: number, withWeightMarginCategory?: MarginCategory, strict?: boolean): BN;
+    getUnrealizedPNL(withFunding?: boolean, marketIndex?: number, withWeightMarginCategory?: MarginCategory, strict?: boolean, liquidationBuffer?: BN): BN;
     /**
      * calculates unrealized funding payment pnl
      * @returns : Precision QUOTE_PRECISION
@@ -158,7 +158,8 @@ export declare class User {
      * calculates TotalCollateral: collateral + unrealized pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalCollateral(marginCategory?: MarginCategory, strict?: boolean, includeOpenOrders?: boolean): BN;
+    getTotalCollateral(marginCategory?: MarginCategory, strict?: boolean, includeOpenOrders?: boolean, liquidationBuffer?: BN): BN;
+    getLiquidationBuffer(): BN | undefined;
     /**
      * calculates User Health by comparing total collateral and maint. margin requirement
      * @returns : number (value from [0, 100])

package/lib/browser/user.js

@@ -457,12 +457,7 @@ class User {
     /**
      * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
      */
-    getMaintenanceMarginRequirement() {
-        // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
-        let liquidationBuffer = undefined;
-        if (this.isBeingLiquidated()) {
-            liquidationBuffer = new _1.BN(this.driftClient.getStateAccount().liquidationMarginBufferRatio);
-        }
+    getMaintenanceMarginRequirement(liquidationBuffer) {
         return this.getMarginRequirement('Maintenance', liquidationBuffer);
     }
     getActivePerpPositionsForUserAccount(userAccount) {
@@ -502,7 +497,7 @@ class User {
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory, strict = false) {
+    getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory, strict = false, liquidationBuffer) {
         return this.getActivePerpPositions()
             .filter((pos) => marketIndex !== undefined ? pos.marketIndex === marketIndex : true)
             .reduce((unrealizedPnl, perpPosition) => {
@@ -533,6 +528,9 @@ class User {
                         .mul((0, _1.calculateUnrealizedAssetWeight)(market, quoteSpotMarket, positionUnrealizedPnl, withWeightMarginCategory, oraclePriceData))
                         .div(new _1.BN(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION));
                 }
+                if (liquidationBuffer && positionUnrealizedPnl.lt(numericConstants_1.ZERO)) {
+                    positionUnrealizedPnl = positionUnrealizedPnl.add(positionUnrealizedPnl.mul(liquidationBuffer).div(numericConstants_1.MARGIN_PRECISION));
+                }
             }
             return unrealizedPnl.add(positionUnrealizedPnl);
         }, numericConstants_1.ZERO);
@@ -731,8 +729,16 @@ class User {
      * calculates TotalCollateral: collateral + unrealized pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalCollateral(marginCategory = 'Initial', strict = false, includeOpenOrders = true) {
-        return this.getSpotMarketAssetValue(undefined, marginCategory, includeOpenOrders, strict).add(this.getUnrealizedPNL(true, undefined, marginCategory, strict));
+    getTotalCollateral(marginCategory = 'Initial', strict = false, includeOpenOrders = true, liquidationBuffer) {
+        return this.getSpotMarketAssetValue(undefined, marginCategory, includeOpenOrders, strict).add(this.getUnrealizedPNL(true, undefined, marginCategory, strict, liquidationBuffer));
+    }
+    getLiquidationBuffer() {
+        // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
+        let liquidationBuffer = undefined;
+        if (this.isBeingLiquidated()) {
+            liquidationBuffer = new _1.BN(this.driftClient.getStateAccount().liquidationMarginBufferRatio);
+        }
+        return liquidationBuffer;
     }
     /**
      * calculates User Health by comparing total collateral and maint. margin requirement
@@ -1105,8 +1111,9 @@ class User {
         return netAssetValue.mul(numericConstants_1.TEN_THOUSAND).div(totalLiabilityValue);
     }
     canBeLiquidated() {
-        const totalCollateral = this.getTotalCollateral('Maintenance');
-        const marginRequirement = this.getMaintenanceMarginRequirement();
+        const liquidationBuffer = this.getLiquidationBuffer();
+        const totalCollateral = this.getTotalCollateral('Maintenance', undefined, undefined, liquidationBuffer);
+        const marginRequirement = this.getMaintenanceMarginRequirement(liquidationBuffer);
         const canBeLiquidated = totalCollateral.lt(marginRequirement);
         return {
             canBeLiquidated,

package/lib/node/constants/spotMarkets.js

@@ -508,7 +508,7 @@ exports.MainnetSpotMarkets = [
         pythLazerId: 9,
     },
     {
-        symbol: 'JLP',
+        symbol: 'JLP-1',
         marketIndex: 33,
         poolId: 1,
         oracle: new web3_js_1.PublicKey('5Mb11e5rt1Sp6A286B145E4TmgMzsM2UX9nCF2vas5bs'),
@@ -520,7 +520,7 @@ exports.MainnetSpotMarkets = [
         launchTs: 1735255852000,
     },
     {
-        symbol: 'USDC',
+        symbol: 'USDC-1',
         marketIndex: 34,
         poolId: 1,
         oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
@@ -568,6 +568,18 @@ exports.MainnetSpotMarkets = [
         pythFeedId: '0x8fef7d52c7f4e3a6258d663f9d27e64a1b6fd95ab5f7d545dbf9a515353d0064',
         launchTs: 1737360280000,
     },
+    {
+        symbol: 'AUSD',
+        marketIndex: 38,
+        poolId: 0,
+        oracle: new web3_js_1.PublicKey('8FZhpiM8n3mpgvENWLcEvHsKB1bBhYBAyL4Ypr4gptLZ'),
+        oracleSource: __1.OracleSource.PYTH_STABLE_COIN_PULL,
+        mint: new web3_js_1.PublicKey('AUSD1jCcCyPLybk1YnvPWsHQSrZ46dxwoMniN4N2UEB9'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xd9912df360b5b7f21a122f15bdd5e27f62ce5e72bd316c291f7c86620e07fb2a',
+        launchTs: 1738255943000,
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,