@drift-labs/sdk 2.110.0-beta.17 → 2.110.0-beta.19

package/VERSION

@@ -1 +1 @@
-2.110.0-beta.17
+2.110.0-beta.19

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

@@ -33,9 +33,9 @@ export type MarketNodeLists = {
         above: NodeList<'trigger'>;
         below: NodeList<'trigger'>;
     };
-    swift: {
-        ask: NodeList<'swift'>;
-        bid: NodeList<'swift'>;
+    signedMsg: {
+        ask: NodeList<'signedMsg'>;
+        bid: NodeList<'signedMsg'>;
     };
 };
 type OrderBookCallback = () => void;
@@ -69,7 +69,7 @@ export declare class DLOB {
      */
     initFromUserMap(userMap: UserMap, slot: number): Promise<boolean>;
     insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
-    insertSwiftOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
+    insertSignedMsgOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
     delete(order: Order, userAccount: PublicKey, slot: number, isUserProtectedMaker: boolean, onDelete?: OrderBookCallback): void;
     getListForOnChainOrder(order: Order, slot: number, isProtectedMaker: boolean): NodeList<any> | undefined;

package/lib/browser/dlob/DLOB.js

@@ -93,7 +93,7 @@ class DLOB {
             onInsert();
         }
     }
-    insertSwiftOrder(order, userAccount, isUserProtectedMaker, onInsert) {
+    insertSignedMsgOrder(order, userAccount, isUserProtectedMaker, onInsert) {
         const marketType = (0, __1.getVariant)(order.marketType);
         const marketIndex = order.marketIndex;
         const bidOrAsk = (0, __1.isVariant)(order.direction, 'long') ? 'bid' : 'ask';
@@ -106,7 +106,7 @@ class DLOB {
         this.orderLists
             .get(marketType)
             .get(marketIndex)
-            .swift[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
+            .signedMsg[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
         if (onInsert) {
             onInsert();
         }
@@ -137,9 +137,9 @@ class DLOB {
                 above: new NodeList_1.NodeList('trigger', 'asc'),
                 below: new NodeList_1.NodeList('trigger', 'desc'),
             },
-            swift: {
-                ask: new NodeList_1.NodeList('swift', 'asc'),
-                bid: new NodeList_1.NodeList('swift', 'asc'),
+            signedMsg: {
+                ask: new NodeList_1.NodeList('signedMsg', 'asc'),
+                bid: new NodeList_1.NodeList('signedMsg', 'asc'),
             },
         });
     }
@@ -450,23 +450,23 @@ class DLOB {
             nodeLists.restingLimit.bid.getGenerator(),
             nodeLists.floatingLimit.bid.getGenerator(),
             nodeLists.market.bid.getGenerator(),
-            nodeLists.swift.bid.getGenerator(),
+            nodeLists.signedMsg.bid.getGenerator(),
         ];
         const askGenerators = [
             nodeLists.takingLimit.ask.getGenerator(),
             nodeLists.restingLimit.ask.getGenerator(),
             nodeLists.floatingLimit.ask.getGenerator(),
             nodeLists.market.ask.getGenerator(),
-            nodeLists.swift.ask.getGenerator(),
+            nodeLists.signedMsg.ask.getGenerator(),
         ];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
-                if (bid.isSwift &&
+                if (bid.isSignedMsg &&
                     slot.gt(bid.order.slot.addn(bid.order.auctionDuration))) {
                     this.orderLists
                         .get(marketTypeStr)
                         .get(marketIndex)
-                        .swift.bid.remove(bid.order, bid.userAccount);
+                        .signedMsg.bid.remove(bid.order, bid.userAccount);
                 }
                 else if ((0, __1.isOrderExpired)(bid.order, ts, true, 25)) {
                     nodesToFill.push({
@@ -498,7 +498,7 @@ class DLOB {
         const generatorList = [
             orderLists.market.bid.getGenerator(),
             orderLists.takingLimit.bid.getGenerator(),
-            orderLists.swift.bid.getGenerator(),
+            orderLists.signedMsg.bid.getGenerator(),
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);
@@ -514,7 +514,7 @@ class DLOB {
         const generatorList = [
             orderLists.market.ask.getGenerator(),
             orderLists.takingLimit.ask.getGenerator(),
-            orderLists.swift.ask.getGenerator(),
+            orderLists.signedMsg.ask.getGenerator(),
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);

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

@@ -9,7 +9,7 @@ export interface DLOBNode {
     userAccount: string | undefined;
     isProtectedMaker: boolean;
     applyProtectedMakerOffset: boolean;
-    isSwift: boolean | undefined;
+    isSignedMsg: boolean | undefined;
 }
 export declare abstract class OrderNode implements DLOBNode {
     order: Order;
@@ -19,8 +19,8 @@ export declare abstract class OrderNode implements DLOBNode {
     haveTrigger: boolean;
     isProtectedMaker: boolean;
     applyProtectedMakerOffset: boolean;
-    isSwift: boolean;
-    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean, isSwift?: boolean);
+    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;
@@ -52,9 +52,9 @@ export declare class TriggerOrderNode extends OrderNode {
     previous?: TriggerOrderNode;
     getSortValue(order: Order): BN;
 }
-export declare class SwiftOrderNode extends OrderNode {
-    next?: SwiftOrderNode;
-    previous?: SwiftOrderNode;
+export declare class SignedMsgOrderNode extends OrderNode {
+    next?: SignedMsgOrderNode;
+    previous?: SignedMsgOrderNode;
     constructor(order: Order, userAccount: string);
     getSortValue(order: Order): BN;
 }
@@ -65,7 +65,7 @@ export type DLOBNodeMap = {
     protectedFloatingLimit: FloatingLimitOrderNode;
     market: MarketOrderNode;
     trigger: TriggerOrderNode;
-    swift: SwiftOrderNode;
+    signedMsg: SignedMsgOrderNode;
 };
-export type DLOBNodeType = 'swift' | 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'protectedFloatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
+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];

package/lib/browser/dlob/DLOBNode.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNode = exports.SwiftOrderNode = exports.TriggerOrderNode = exports.MarketOrderNode = exports.FloatingLimitOrderNode = exports.RestingLimitOrderNode = exports.TakingLimitOrderNode = exports.OrderNode = void 0;
+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, isSwift = false) {
+    constructor(order, userAccount, isProtectedMaker, applyProtectedMakerOffset, isSignedMsg = false) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
@@ -14,7 +14,7 @@ class OrderNode {
         this.sortValue = this.getSortValue(order);
         this.isProtectedMaker = isProtectedMaker;
         this.applyProtectedMakerOffset = applyProtectedMakerOffset;
-        this.isSwift = isSwift;
+        this.isSignedMsg = isSignedMsg;
     }
     getLabel() {
         let msg = `Order ${(0, NodeList_1.getOrderSignature)(this.order.orderId, this.userAccount)}`;
@@ -80,8 +80,8 @@ class TriggerOrderNode extends OrderNode {
     }
 }
 exports.TriggerOrderNode = TriggerOrderNode;
-// We'll use the swift uuid for the order id since it's not yet on-chain
-class SwiftOrderNode extends OrderNode {
+// 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);
     }
@@ -89,7 +89,7 @@ class SwiftOrderNode extends OrderNode {
         return order.slot;
     }
 }
-exports.SwiftOrderNode = SwiftOrderNode;
+exports.SignedMsgOrderNode = SignedMsgOrderNode;
 function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
     switch (nodeType) {
         case 'floatingLimit':
@@ -104,8 +104,8 @@ function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtect
             return new MarketOrderNode(order, userAccount, isProtectedMaker, false);
         case 'trigger':
             return new TriggerOrderNode(order, userAccount, isProtectedMaker, false);
-        case 'swift':
-            return new SwiftOrderNode(order, userAccount);
+        case 'signedMsg':
+            return new SignedMsgOrderNode(order, userAccount);
         default:
             throw Error(`Unknown DLOBNode type ${nodeType}`);
     }

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Commitment, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord, SignedMsgOrderRecord, DeleteUserRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord, SignedMsgOrderRecord, DeleteUserRecord, FuelSweepRecord, FuelSeasonRecord } from '../index';
 import { EventEmitter } from 'events';
 export type EventSubscriptionOptions = {
     address?: PublicKey;
@@ -43,9 +43,11 @@ export type EventMap = {
     SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
     SignedMsgOrderRecord: Event<SignedMsgOrderRecord>;
     DeleteUserRecord: Event<DeleteUserRecord>;
+    FuelSweepRecord: Event<FuelSweepRecord>;
+    FuelSeasonRecord: Event<FuelSeasonRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }

package/lib/browser/events/types.js

@@ -20,6 +20,8 @@ exports.DefaultEventSubscriptionOptions = {
         'SpotMarketVaultDepositRecord',
         'SignedMsgOrderRecord',
         'DeleteUserRecord',
+        'FuelSweepRecord',
+        'FuelSeasonRecord',
     ],
     maxEventsPerType: 4096,
     orderBy: 'blockchain',

package/lib/browser/types.d.ts

@@ -747,6 +747,33 @@ export type DeleteUserRecord = {
     subAccountId: number;
     keeper: PublicKey | null;
 };
+export type FuelSeasonRecord = {
+    ts: BN;
+    authority: PublicKey;
+    fuelInsurance: BN;
+    fuelDeposits: BN;
+    fuelBorrows: BN;
+    fuelPositions: BN;
+    fuelTaker: BN;
+    fuelMaker: BN;
+    fuelTotal: BN;
+};
+export type FuelSweepRecord = {
+    ts: BN;
+    authority: PublicKey;
+    userStatsFuelInsurance: BN;
+    userStatsFuelDeposits: BN;
+    userStatsFuelBorrows: BN;
+    userStatsFuelPositions: BN;
+    userStatsFuelTaker: BN;
+    userStatsFuelMaker: BN;
+    fuelOverflowFuelInsurance: BN;
+    fuelOverflowFuelDeposits: BN;
+    fuelOverflowFuelBorrows: BN;
+    fuelOverflowFuelPositions: BN;
+    fuelOverflowFuelTaker: BN;
+    fuelOverflowFuelMaker: BN;
+};
 export type StateAccount = {
     admin: PublicKey;
     exchangeStatus: number;
@@ -1174,10 +1201,10 @@ export type SignedMsgOrderParamsMessage = {
     subAccountId: number;
     slot: BN;
     uuid: Uint8Array;
-    takeProfitOrderParams: SwiftTriggerOrderParams | null;
-    stopLossOrderParams: SwiftTriggerOrderParams | null;
+    takeProfitOrderParams: SignedMsgTriggerOrderParams | null;
+    stopLossOrderParams: SignedMsgTriggerOrderParams | null;
 };
-export type SwiftTriggerOrderParams = {
+export type SignedMsgTriggerOrderParams = {
     triggerPrice: BN;
     baseAssetAmount: BN;
 };

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

@@ -33,9 +33,9 @@ export type MarketNodeLists = {
         above: NodeList<'trigger'>;
         below: NodeList<'trigger'>;
     };
-    swift: {
-        ask: NodeList<'swift'>;
-        bid: NodeList<'swift'>;
+    signedMsg: {
+        ask: NodeList<'signedMsg'>;
+        bid: NodeList<'signedMsg'>;
     };
 };
 type OrderBookCallback = () => void;
@@ -69,7 +69,7 @@ export declare class DLOB {
      */
     initFromUserMap(userMap: UserMap, slot: number): Promise<boolean>;
     insertOrder(order: Order, userAccount: string, slot: number, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
-    insertSwiftOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
+    insertSignedMsgOrder(order: Order, userAccount: string, isUserProtectedMaker: boolean, onInsert?: OrderBookCallback): void;
     addOrderList(marketType: MarketTypeStr, marketIndex: number): void;
     delete(order: Order, userAccount: PublicKey, slot: number, isUserProtectedMaker: boolean, onDelete?: OrderBookCallback): void;
     getListForOnChainOrder(order: Order, slot: number, isProtectedMaker: boolean): NodeList<any> | undefined;

package/lib/node/dlob/DLOB.js

@@ -93,7 +93,7 @@ class DLOB {
             onInsert();
         }
     }
-    insertSwiftOrder(order, userAccount, isUserProtectedMaker, onInsert) {
+    insertSignedMsgOrder(order, userAccount, isUserProtectedMaker, onInsert) {
         const marketType = (0, __1.getVariant)(order.marketType);
         const marketIndex = order.marketIndex;
         const bidOrAsk = (0, __1.isVariant)(order.direction, 'long') ? 'bid' : 'ask';
@@ -106,7 +106,7 @@ class DLOB {
         this.orderLists
             .get(marketType)
             .get(marketIndex)
-            .swift[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
+            .signedMsg[bidOrAsk].insert(order, marketType, userAccount, isUserProtectedMaker, this.protectedMakerView);
         if (onInsert) {
             onInsert();
         }
@@ -137,9 +137,9 @@ class DLOB {
                 above: new NodeList_1.NodeList('trigger', 'asc'),
                 below: new NodeList_1.NodeList('trigger', 'desc'),
             },
-            swift: {
-                ask: new NodeList_1.NodeList('swift', 'asc'),
-                bid: new NodeList_1.NodeList('swift', 'asc'),
+            signedMsg: {
+                ask: new NodeList_1.NodeList('signedMsg', 'asc'),
+                bid: new NodeList_1.NodeList('signedMsg', 'asc'),
             },
         });
     }
@@ -450,23 +450,23 @@ class DLOB {
             nodeLists.restingLimit.bid.getGenerator(),
             nodeLists.floatingLimit.bid.getGenerator(),
             nodeLists.market.bid.getGenerator(),
-            nodeLists.swift.bid.getGenerator(),
+            nodeLists.signedMsg.bid.getGenerator(),
         ];
         const askGenerators = [
             nodeLists.takingLimit.ask.getGenerator(),
             nodeLists.restingLimit.ask.getGenerator(),
             nodeLists.floatingLimit.ask.getGenerator(),
             nodeLists.market.ask.getGenerator(),
-            nodeLists.swift.ask.getGenerator(),
+            nodeLists.signedMsg.ask.getGenerator(),
         ];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
-                if (bid.isSwift &&
+                if (bid.isSignedMsg &&
                     slot.gt(bid.order.slot.addn(bid.order.auctionDuration))) {
                     this.orderLists
                         .get(marketTypeStr)
                         .get(marketIndex)
-                        .swift.bid.remove(bid.order, bid.userAccount);
+                        .signedMsg.bid.remove(bid.order, bid.userAccount);
                 }
                 else if ((0, __1.isOrderExpired)(bid.order, ts, true, 25)) {
                     nodesToFill.push({
@@ -498,7 +498,7 @@ class DLOB {
         const generatorList = [
             orderLists.market.bid.getGenerator(),
             orderLists.takingLimit.bid.getGenerator(),
-            orderLists.swift.bid.getGenerator(),
+            orderLists.signedMsg.bid.getGenerator(),
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);
@@ -514,7 +514,7 @@ class DLOB {
         const generatorList = [
             orderLists.market.ask.getGenerator(),
             orderLists.takingLimit.ask.getGenerator(),
-            orderLists.swift.ask.getGenerator(),
+            orderLists.signedMsg.ask.getGenerator(),
         ];
         yield* this.getBestNode(generatorList, oraclePriceData, slot, (bestNode, currentNode) => {
             return bestNode.order.slot.lt(currentNode.order.slot);

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

@@ -9,7 +9,7 @@ export interface DLOBNode {
     userAccount: string | undefined;
     isProtectedMaker: boolean;
     applyProtectedMakerOffset: boolean;
-    isSwift: boolean | undefined;
+    isSignedMsg: boolean | undefined;
 }
 export declare abstract class OrderNode implements DLOBNode {
     order: Order;
@@ -19,8 +19,8 @@ export declare abstract class OrderNode implements DLOBNode {
     haveTrigger: boolean;
     isProtectedMaker: boolean;
     applyProtectedMakerOffset: boolean;
-    isSwift: boolean;
-    constructor(order: Order, userAccount: string, isProtectedMaker: boolean, applyProtectedMakerOffset: boolean, isSwift?: boolean);
+    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;
@@ -52,9 +52,9 @@ export declare class TriggerOrderNode extends OrderNode {
     previous?: TriggerOrderNode;
     getSortValue(order: Order): BN;
 }
-export declare class SwiftOrderNode extends OrderNode {
-    next?: SwiftOrderNode;
-    previous?: SwiftOrderNode;
+export declare class SignedMsgOrderNode extends OrderNode {
+    next?: SignedMsgOrderNode;
+    previous?: SignedMsgOrderNode;
     constructor(order: Order, userAccount: string);
     getSortValue(order: Order): BN;
 }
@@ -65,7 +65,7 @@ export type DLOBNodeMap = {
     protectedFloatingLimit: FloatingLimitOrderNode;
     market: MarketOrderNode;
     trigger: TriggerOrderNode;
-    swift: SwiftOrderNode;
+    signedMsg: SignedMsgOrderNode;
 };
-export type DLOBNodeType = 'swift' | 'restingLimit' | 'takingLimit' | 'floatingLimit' | 'protectedFloatingLimit' | 'market' | ('trigger' & keyof DLOBNodeMap);
+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];

package/lib/node/dlob/DLOBNode.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNode = exports.SwiftOrderNode = exports.TriggerOrderNode = exports.MarketOrderNode = exports.FloatingLimitOrderNode = exports.RestingLimitOrderNode = exports.TakingLimitOrderNode = exports.OrderNode = void 0;
+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, isSwift = false) {
+    constructor(order, userAccount, isProtectedMaker, applyProtectedMakerOffset, isSignedMsg = false) {
         this.haveFilled = false;
         this.haveTrigger = false;
         // Copy the order over to the node
@@ -14,7 +14,7 @@ class OrderNode {
         this.sortValue = this.getSortValue(order);
         this.isProtectedMaker = isProtectedMaker;
         this.applyProtectedMakerOffset = applyProtectedMakerOffset;
-        this.isSwift = isSwift;
+        this.isSignedMsg = isSignedMsg;
     }
     getLabel() {
         let msg = `Order ${(0, NodeList_1.getOrderSignature)(this.order.orderId, this.userAccount)}`;
@@ -80,8 +80,8 @@ class TriggerOrderNode extends OrderNode {
     }
 }
 exports.TriggerOrderNode = TriggerOrderNode;
-// We'll use the swift uuid for the order id since it's not yet on-chain
-class SwiftOrderNode extends OrderNode {
+// 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);
     }
@@ -89,7 +89,7 @@ class SwiftOrderNode extends OrderNode {
         return order.slot;
     }
 }
-exports.SwiftOrderNode = SwiftOrderNode;
+exports.SignedMsgOrderNode = SignedMsgOrderNode;
 function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtectedMakerOffset) {
     switch (nodeType) {
         case 'floatingLimit':
@@ -104,8 +104,8 @@ function createNode(nodeType, order, userAccount, isProtectedMaker, applyProtect
             return new MarketOrderNode(order, userAccount, isProtectedMaker, false);
         case 'trigger':
             return new TriggerOrderNode(order, userAccount, isProtectedMaker, false);
-        case 'swift':
-            return new SwiftOrderNode(order, userAccount);
+        case 'signedMsg':
+            return new SignedMsgOrderNode(order, userAccount);
         default:
             throw Error(`Unknown DLOBNode type ${nodeType}`);
     }

package/lib/node/events/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Commitment, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord, SignedMsgOrderRecord, DeleteUserRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord, SignedMsgOrderRecord, DeleteUserRecord, FuelSweepRecord, FuelSeasonRecord } from '../index';
 import { EventEmitter } from 'events';
 export type EventSubscriptionOptions = {
     address?: PublicKey;
@@ -43,9 +43,11 @@ export type EventMap = {
     SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
     SignedMsgOrderRecord: Event<SignedMsgOrderRecord>;
     DeleteUserRecord: Event<DeleteUserRecord>;
+    FuelSweepRecord: Event<FuelSweepRecord>;
+    FuelSeasonRecord: Event<FuelSeasonRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }

package/lib/node/events/types.js

@@ -20,6 +20,8 @@ exports.DefaultEventSubscriptionOptions = {
         'SpotMarketVaultDepositRecord',
         'SignedMsgOrderRecord',
         'DeleteUserRecord',
+        'FuelSweepRecord',
+        'FuelSeasonRecord',
     ],
     maxEventsPerType: 4096,
     orderBy: 'blockchain',

package/lib/node/types.d.ts

@@ -747,6 +747,33 @@ export type DeleteUserRecord = {
     subAccountId: number;
     keeper: PublicKey | null;
 };
+export type FuelSeasonRecord = {
+    ts: BN;
+    authority: PublicKey;
+    fuelInsurance: BN;
+    fuelDeposits: BN;
+    fuelBorrows: BN;
+    fuelPositions: BN;
+    fuelTaker: BN;
+    fuelMaker: BN;
+    fuelTotal: BN;
+};
+export type FuelSweepRecord = {
+    ts: BN;
+    authority: PublicKey;
+    userStatsFuelInsurance: BN;
+    userStatsFuelDeposits: BN;
+    userStatsFuelBorrows: BN;
+    userStatsFuelPositions: BN;
+    userStatsFuelTaker: BN;
+    userStatsFuelMaker: BN;
+    fuelOverflowFuelInsurance: BN;
+    fuelOverflowFuelDeposits: BN;
+    fuelOverflowFuelBorrows: BN;
+    fuelOverflowFuelPositions: BN;
+    fuelOverflowFuelTaker: BN;
+    fuelOverflowFuelMaker: BN;
+};
 export type StateAccount = {
     admin: PublicKey;
     exchangeStatus: number;
@@ -1174,10 +1201,10 @@ export type SignedMsgOrderParamsMessage = {
     subAccountId: number;
     slot: BN;
     uuid: Uint8Array;
-    takeProfitOrderParams: SwiftTriggerOrderParams | null;
-    stopLossOrderParams: SwiftTriggerOrderParams | null;
+    takeProfitOrderParams: SignedMsgTriggerOrderParams | null;
+    stopLossOrderParams: SignedMsgTriggerOrderParams | null;
 };
-export type SwiftTriggerOrderParams = {
+export type SignedMsgTriggerOrderParams = {
     triggerPrice: BN;
     baseAssetAmount: BN;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.110.0-beta.17",
+	"version": "2.110.0-beta.19",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/dlob/DLOB.ts

@@ -73,9 +73,9 @@ export type MarketNodeLists = {
 		above: NodeList<'trigger'>;
 		below: NodeList<'trigger'>;
 	};
-	swift: {
-		ask: NodeList<'swift'>;
-		bid: NodeList<'swift'>;
+	signedMsg: {
+		ask: NodeList<'signedMsg'>;
+		bid: NodeList<'signedMsg'>;
 	};
 };
 
@@ -220,7 +220,7 @@ export class DLOB {
 		}
 	}
 
-	public insertSwiftOrder(
+	public insertSignedMsgOrder(
 		order: Order,
 		userAccount: string,
 		isUserProtectedMaker: boolean,
@@ -238,7 +238,7 @@ export class DLOB {
 		this.orderLists
 			.get(marketType)
 			.get(marketIndex)
-			.swift[bidOrAsk].insert(
+			.signedMsg[bidOrAsk].insert(
 				order,
 				marketType,
 				userAccount,
@@ -276,9 +276,9 @@ export class DLOB {
 				above: new NodeList('trigger', 'asc'),
 				below: new NodeList('trigger', 'desc'),
 			},
-			swift: {
-				ask: new NodeList('swift', 'asc'),
-				bid: new NodeList('swift', 'asc'),
+			signedMsg: {
+				ask: new NodeList('signedMsg', 'asc'),
+				bid: new NodeList('signedMsg', 'asc'),
 			},
 		});
 	}
@@ -903,26 +903,26 @@ export class DLOB {
 			nodeLists.restingLimit.bid.getGenerator(),
 			nodeLists.floatingLimit.bid.getGenerator(),
 			nodeLists.market.bid.getGenerator(),
-			nodeLists.swift.bid.getGenerator(),
+			nodeLists.signedMsg.bid.getGenerator(),
 		];
 		const askGenerators = [
 			nodeLists.takingLimit.ask.getGenerator(),
 			nodeLists.restingLimit.ask.getGenerator(),
 			nodeLists.floatingLimit.ask.getGenerator(),
 			nodeLists.market.ask.getGenerator(),
-			nodeLists.swift.ask.getGenerator(),
+			nodeLists.signedMsg.ask.getGenerator(),
 		];
 
 		for (const bidGenerator of bidGenerators) {
 			for (const bid of bidGenerator) {
 				if (
-					bid.isSwift &&
+					bid.isSignedMsg &&
 					slot.gt(bid.order.slot.addn(bid.order.auctionDuration))
 				) {
 					this.orderLists
 						.get(marketTypeStr)
 						.get(marketIndex)
-						.swift.bid.remove(bid.order, bid.userAccount);
+						.signedMsg.bid.remove(bid.order, bid.userAccount);
 				} else if (isOrderExpired(bid.order, ts, true, 25)) {
 					nodesToFill.push({
 						node: bid,
@@ -964,7 +964,7 @@ export class DLOB {
 		const generatorList = [
 			orderLists.market.bid.getGenerator(),
 			orderLists.takingLimit.bid.getGenerator(),
-			orderLists.swift.bid.getGenerator(),
+			orderLists.signedMsg.bid.getGenerator(),
 		];
 
 		yield* this.getBestNode(
@@ -996,7 +996,7 @@ export class DLOB {
 		const generatorList = [
 			orderLists.market.ask.getGenerator(),
 			orderLists.takingLimit.ask.getGenerator(),
-			orderLists.swift.ask.getGenerator(),
+			orderLists.signedMsg.ask.getGenerator(),
 		];
 
 		yield* this.getBestNode(

package/src/dlob/DLOBNode.ts

@@ -21,7 +21,7 @@ export interface DLOBNode {
 	userAccount: string | undefined;
 	isProtectedMaker: boolean;
 	applyProtectedMakerOffset: boolean;
-	isSwift: boolean | undefined;
+	isSignedMsg: boolean | undefined;
 }
 
 export abstract class OrderNode implements DLOBNode {
@@ -32,14 +32,14 @@ export abstract class OrderNode implements DLOBNode {
 	haveTrigger = false;
 	isProtectedMaker: boolean;
 	applyProtectedMakerOffset: boolean;
-	isSwift: boolean;
+	isSignedMsg: boolean;
 
 	constructor(
 		order: Order,
 		userAccount: string,
 		isProtectedMaker: boolean,
 		applyProtectedMakerOffset: boolean,
-		isSwift = false
+		isSignedMsg = false
 	) {
 		// Copy the order over to the node
 		this.order = { ...order };
@@ -47,7 +47,7 @@ export abstract class OrderNode implements DLOBNode {
 		this.sortValue = this.getSortValue(order);
 		this.isProtectedMaker = isProtectedMaker;
 		this.applyProtectedMakerOffset = applyProtectedMakerOffset;
-		this.isSwift = isSwift;
+		this.isSignedMsg = isSignedMsg;
 	}
 
 	abstract getSortValue(order: Order): BN;
@@ -153,10 +153,10 @@ export class TriggerOrderNode extends OrderNode {
 	}
 }
 
-// We'll use the swift uuid for the order id since it's not yet on-chain
-export class SwiftOrderNode extends OrderNode {
-	next?: SwiftOrderNode;
-	previous?: SwiftOrderNode;
+// We'll use the signedMsg uuid for the order id since it's not yet on-chain
+export class SignedMsgOrderNode extends OrderNode {
+	next?: SignedMsgOrderNode;
+	previous?: SignedMsgOrderNode;
 
 	constructor(order: Order, userAccount: string) {
 		super(order, userAccount, false, false, true);
@@ -174,11 +174,11 @@ export type DLOBNodeMap = {
 	protectedFloatingLimit: FloatingLimitOrderNode;
 	market: MarketOrderNode;
 	trigger: TriggerOrderNode;
-	swift: SwiftOrderNode;
+	signedMsg: SignedMsgOrderNode;
 };
 
 export type DLOBNodeType =
-	| 'swift'
+	| 'signedMsg'
 	| 'restingLimit'
 	| 'takingLimit'
 	| 'floatingLimit'
@@ -226,8 +226,8 @@ export function createNode<T extends DLOBNodeType>(
 			return new MarketOrderNode(order, userAccount, isProtectedMaker, false);
 		case 'trigger':
 			return new TriggerOrderNode(order, userAccount, isProtectedMaker, false);
-		case 'swift':
-			return new SwiftOrderNode(order, userAccount);
+		case 'signedMsg':
+			return new SignedMsgOrderNode(order, userAccount);
 		default:
 			throw Error(`Unknown DLOBNode type ${nodeType}`);
 	}

package/src/events/types.ts

@@ -17,6 +17,8 @@ import {
 	SpotMarketVaultDepositRecord,
 	SignedMsgOrderRecord,
 	DeleteUserRecord,
+	FuelSweepRecord,
+	FuelSeasonRecord,
 } from '../index';
 import { EventEmitter } from 'events';
 
@@ -53,6 +55,8 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'SpotMarketVaultDepositRecord',
 		'SignedMsgOrderRecord',
 		'DeleteUserRecord',
+		'FuelSweepRecord',
+		'FuelSeasonRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -98,6 +102,8 @@ export type EventMap = {
 	SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
 	SignedMsgOrderRecord: Event<SignedMsgOrderRecord>;
 	DeleteUserRecord: Event<DeleteUserRecord>;
+	FuelSweepRecord: Event<FuelSweepRecord>;
+	FuelSeasonRecord: Event<FuelSeasonRecord>;
 };
 
 export type EventType = keyof EventMap;
@@ -119,7 +125,9 @@ export type DriftEvent =
 	| Event<SwapRecord>
 	| Event<SpotMarketVaultDepositRecord>
 	| Event<SignedMsgOrderRecord>
-	| Event<DeleteUserRecord>;
+	| Event<DeleteUserRecord>
+	| Event<FuelSweepRecord>
+	| Event<FuelSeasonRecord>;
 
 export interface EventSubscriberEvents {
 	newEvent: (event: WrappedEvent<EventType>) => void;

package/src/types.ts

@@ -643,6 +643,37 @@ export type DeleteUserRecord = {
 	keeper: PublicKey | null;
 };
 
+export type FuelSeasonRecord = {
+	ts: BN;
+	authority: PublicKey;
+	fuelInsurance: BN;
+	fuelDeposits: BN;
+	fuelBorrows: BN;
+	fuelPositions: BN;
+	fuelTaker: BN;
+	fuelMaker: BN;
+	fuelTotal: BN;
+};
+
+export type FuelSweepRecord = {
+	ts: BN;
+	authority: PublicKey;
+	// fuel values on UserStats before sweep
+	userStatsFuelInsurance: BN;
+	userStatsFuelDeposits: BN;
+	userStatsFuelBorrows: BN;
+	userStatsFuelPositions: BN;
+	userStatsFuelTaker: BN;
+	userStatsFuelMaker: BN;
+	// fuel values on FuelOverflow before sweep
+	fuelOverflowFuelInsurance: BN;
+	fuelOverflowFuelDeposits: BN;
+	fuelOverflowFuelBorrows: BN;
+	fuelOverflowFuelPositions: BN;
+	fuelOverflowFuelTaker: BN;
+	fuelOverflowFuelMaker: BN;
+};
+
 export type StateAccount = {
 	admin: PublicKey;
 	exchangeStatus: number;
@@ -1130,11 +1161,11 @@ export type SignedMsgOrderParamsMessage = {
 	subAccountId: number;
 	slot: BN;
 	uuid: Uint8Array;
-	takeProfitOrderParams: SwiftTriggerOrderParams | null;
-	stopLossOrderParams: SwiftTriggerOrderParams | null;
+	takeProfitOrderParams: SignedMsgTriggerOrderParams | null;
+	stopLossOrderParams: SignedMsgTriggerOrderParams | null;
 };
 
-export type SwiftTriggerOrderParams = {
+export type SignedMsgTriggerOrderParams = {
 	triggerPrice: BN;
 	baseAssetAmount: BN;
 };
@@ -1382,8 +1413,8 @@ export type HighLeverageModeConfig = {
 	reduceOnly: boolean;
 };
 
-/* Represents proof of a swift taker order
- * It can be provided to drift program to fill a swift order
+/* Represents proof of a signed msg taker order
+ * It can be provided to drift program to fill a signed msg order
  */
 export interface SignedMsgOrderParams {
 	/**