@drift-labs/sdk 2.98.0-beta.9 → 2.99.0-beta.0

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.97.0",
+    "version": "2.98.0",
     "name": "drift",
     "instructions": [
         {
@@ -129,6 +129,42 @@
             ],
             "args": []
         },
+        {
+            "name": "initializeSwiftUserOrders",
+            "accounts": [
+                {
+                    "name": "swiftUserOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "payer",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "rent",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "initializeReferrerName",
             "accounts": [
@@ -644,6 +680,63 @@
                 }
             ]
         },
+        {
+            "name": "placeAndMakeSwiftPerpOrder",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "taker",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "takerStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "takerSwiftUserOrders",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "params",
+                    "type": {
+                        "defined": "OrderParams"
+                    }
+                },
+                {
+                    "name": "swiftOrderUuid",
+                    "type": {
+                        "array": [
+                            "u8",
+                            8
+                        ]
+                    }
+                }
+            ]
+        },
         {
             "name": "placeSwiftTakerOrder",
             "accounts": [
@@ -662,6 +755,11 @@
                     "isMut": true,
                     "isSigner": false
                 },
+                {
+                    "name": "swiftUserOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
                 {
                     "name": "authority",
                     "isMut": false,
@@ -7468,6 +7566,29 @@
                 ]
             }
         },
+        {
+            "name": "SwiftUserOrders",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "userPubkey",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "swiftOrderData",
+                        "type": {
+                            "array": [
+                                {
+                                    "defined": "SwiftOrderId"
+                                },
+                                32
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "User",
             "type": {
@@ -8432,6 +8553,15 @@
             "type": {
                 "kind": "struct",
                 "fields": [
+                    {
+                        "name": "uuid",
+                        "type": {
+                            "array": [
+                                "u8",
+                                8
+                            ]
+                        }
+                    },
                     {
                         "name": "swiftOrderSignature",
                         "type": {
@@ -8459,10 +8589,6 @@
                             "defined": "OrderParams"
                         }
                     },
-                    {
-                        "name": "expectedOrderId",
-                        "type": "i32"
-                    },
                     {
                         "name": "subAccountId",
                         "type": "u16"
@@ -9642,6 +9768,31 @@
                 ]
             }
         },
+        {
+            "name": "SwiftOrderId",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "uuid",
+                        "type": {
+                            "array": [
+                                "u8",
+                                8
+                            ]
+                        }
+                    },
+                    {
+                        "name": "maxSlot",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "orderId",
+                        "type": "u32"
+                    }
+                ]
+            }
+        },
         {
             "name": "UserFees",
             "type": {
@@ -11541,13 +11692,28 @@
                     "index": false
                 },
                 {
-                    "name": "swiftOrderSlot",
+                    "name": "userOrderId",
+                    "type": "u32",
+                    "index": false
+                },
+                {
+                    "name": "swiftOrderMaxSlot",
                     "type": "u64",
                     "index": false
                 },
                 {
-                    "name": "userNextOrderId",
-                    "type": "u32",
+                    "name": "swiftOrderUuid",
+                    "type": {
+                        "array": [
+                            "u8",
+                            8
+                        ]
+                    },
+                    "index": false
+                },
+                {
+                    "name": "ts",
+                    "type": "i64",
                     "index": false
                 }
             ]
@@ -13671,6 +13837,31 @@
             "code": 6296,
             "name": "InvalidRFQMatch",
             "msg": "RFQ matches must be valid"
+        },
+        {
+            "code": 6297,
+            "name": "InvalidSwiftUserAccount",
+            "msg": "Invalid swift user account"
+        },
+        {
+            "code": 6298,
+            "name": "SwiftUserAccountWrongMutability",
+            "msg": "Swift account wrong mutability"
+        },
+        {
+            "code": 6299,
+            "name": "SwiftUserOrdersAccountFull",
+            "msg": "SwiftUserAccount has too many active orders"
+        },
+        {
+            "code": 6300,
+            "name": "SwiftOrderDoesNotExist",
+            "msg": "Order with swift uuid does not exist"
+        },
+        {
+            "code": 6301,
+            "name": "InvalidSwiftOrderId",
+            "msg": "Swift order id cannot be 0s"
         }
     ],
     "metadata": {

package/lib/browser/index.d.ts

@@ -10,6 +10,7 @@ export * from './constants/perpMarkets';
 export * from './accounts/fetch';
 export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
+export * from './accounts/webSocketHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
@@ -19,6 +20,7 @@ export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
+export * from './accounts/pollingHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/basicUserAccountSubscriber';
 export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';
@@ -64,6 +66,7 @@ export * from './math/tiers';
 export * from './marinade';
 export * from './orderParams';
 export * from './slot/SlotSubscriber';
+export * from './slot/SlothashSubscriber';
 export * from './wallet';
 export * from './keypair';
 export * from './types';
@@ -104,6 +107,7 @@ export * from './dlob/DLOBApiClient';
 export * from './dlob/types';
 export * from './dlob/orderBookLevels';
 export * from './userMap/userMap';
+export * from './userMap/referrerMap';
 export * from './userMap/userStatsMap';
 export * from './userMap/userMapConfig';
 export * from './math/bankruptcy';

package/lib/browser/index.js

@@ -33,6 +33,7 @@ __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
 __exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
 __exportStar(require("./accounts/webSocketInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketHighLeverageModeConfigAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
@@ -42,6 +43,7 @@ __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingHighLeverageModeConfigAccountSubscriber"), exports);
 __exportStar(require("./accounts/basicUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/oneShotUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
@@ -87,6 +89,7 @@ __exportStar(require("./math/tiers"), exports);
 __exportStar(require("./marinade"), exports);
 __exportStar(require("./orderParams"), exports);
 __exportStar(require("./slot/SlotSubscriber"), exports);
+__exportStar(require("./slot/SlothashSubscriber"), exports);
 __exportStar(require("./wallet"), exports);
 __exportStar(require("./keypair"), exports);
 __exportStar(require("./types"), exports);
@@ -127,6 +130,7 @@ __exportStar(require("./dlob/DLOBApiClient"), exports);
 __exportStar(require("./dlob/types"), exports);
 __exportStar(require("./dlob/orderBookLevels"), exports);
 __exportStar(require("./userMap/userMap"), exports);
+__exportStar(require("./userMap/referrerMap"), exports);
 __exportStar(require("./userMap/userStatsMap"), exports);
 __exportStar(require("./userMap/userMapConfig"), exports);
 __exportStar(require("./math/bankruptcy"), exports);

package/lib/browser/jupiter/jupiterClient.d.ts

@@ -201,6 +201,12 @@ export interface QuoteResponse {
      * @memberof QuoteResponse
      */
     error?: string;
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    errorCode?: string;
 }
 export declare class JupiterClient {
     url: string;

package/lib/browser/memcmp.d.ts

@@ -5,3 +5,6 @@ export declare function getUserWithOrderFilter(): MemcmpFilter;
 export declare function getUserWithAuctionFilter(): MemcmpFilter;
 export declare function getUserThatHasBeenLP(): MemcmpFilter;
 export declare function getUserWithName(name: string): MemcmpFilter;
+export declare function getUserStatsFilter(): MemcmpFilter;
+export declare function getUserStatsIsReferredFilter(): MemcmpFilter;
+export declare function getUserStatsIsReferredOrReferrerFilter(): MemcmpFilter;

package/lib/browser/memcmp.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
+exports.getUserStatsIsReferredOrReferrerFilter = exports.getUserStatsIsReferredFilter = exports.getUserStatsFilter = exports.getUserWithName = exports.getUserThatHasBeenLP = exports.getUserWithAuctionFilter = exports.getUserWithOrderFilter = exports.getNonIdleUserFilter = exports.getUserFilter = void 0;
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("@coral-xyz/anchor");
 const userName_1 = require("./userName");
@@ -61,3 +61,30 @@ function getUserWithName(name) {
     };
 }
 exports.getUserWithName = getUserWithName;
+function getUserStatsFilter() {
+    return {
+        memcmp: {
+            offset: 0,
+            bytes: bs58_1.default.encode(anchor_1.BorshAccountsCoder.accountDiscriminator('UserStats')),
+        },
+    };
+}
+exports.getUserStatsFilter = getUserStatsFilter;
+function getUserStatsIsReferredFilter() {
+    return {
+        memcmp: {
+            offset: 188,
+            bytes: bs58_1.default.encode(Buffer.from(Uint8Array.from([2]))),
+        },
+    };
+}
+exports.getUserStatsIsReferredFilter = getUserStatsIsReferredFilter;
+function getUserStatsIsReferredOrReferrerFilter() {
+    return {
+        memcmp: {
+            offset: 188,
+            bytes: bs58_1.default.encode(Buffer.from(Uint8Array.from([3]))),
+        },
+    };
+}
+exports.getUserStatsIsReferredOrReferrerFilter = getUserStatsIsReferredOrReferrerFilter;

package/lib/browser/slot/SlothashSubscriber.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+import { Commitment, Connection } from '@solana/web3.js';
+type SlothashSubscriberConfig = {
+    resubTimeoutMs?: number;
+    commitment?: Commitment;
+};
+export type Slothash = {
+    slot: number;
+    hash: string;
+};
+export declare class SlothashSubscriber {
+    private connection;
+    currentSlothash: Slothash;
+    subscriptionId: number;
+    commitment: Commitment;
+    timeoutId?: NodeJS.Timeout;
+    resubTimeoutMs?: number;
+    isUnsubscribing: boolean;
+    receivingData: boolean;
+    constructor(connection: Connection, config?: SlothashSubscriberConfig);
+    subscribe(): Promise<void>;
+    private setTimeout;
+    getSlothash(): Slothash;
+    unsubscribe(onResub?: boolean): Promise<void>;
+}
+export {};

package/lib/browser/slot/SlothashSubscriber.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SlothashSubscriber = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
+const anchor_1 = require("@coral-xyz/anchor");
+class SlothashSubscriber {
+    constructor(connection, config) {
+        var _a;
+        this.connection = connection;
+        this.isUnsubscribing = false;
+        this.receivingData = false;
+        this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
+        this.commitment = (_a = config === null || config === void 0 ? void 0 : config.commitment) !== null && _a !== void 0 ? _a : 'processed';
+        if (this.resubTimeoutMs < 1000) {
+            console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
+        }
+    }
+    async subscribe() {
+        if (this.subscriptionId != null) {
+            return;
+        }
+        const currentAccountData = await this.connection.getAccountInfo(web3_js_1.SYSVAR_SLOT_HASHES_PUBKEY, this.commitment);
+        if (currentAccountData == null) {
+            throw new Error('Failed to retrieve current slot hash');
+        }
+        this.currentSlothash = deserializeSlothash(currentAccountData.data);
+        this.subscriptionId = this.connection.onAccountChange(web3_js_1.SYSVAR_SLOT_HASHES_PUBKEY, (slothashInfo, context) => {
+            if (!this.currentSlothash || this.currentSlothash.slot < context.slot) {
+                if (this.resubTimeoutMs && !this.isUnsubscribing) {
+                    this.receivingData = true;
+                    clearTimeout(this.timeoutId);
+                    this.setTimeout();
+                }
+                this.currentSlothash = deserializeSlothash(slothashInfo.data);
+            }
+        }, this.commitment);
+        if (this.resubTimeoutMs) {
+            this.receivingData = true;
+            this.setTimeout();
+        }
+    }
+    setTimeout() {
+        this.timeoutId = setTimeout(async () => {
+            if (this.isUnsubscribing) {
+                // If we are in the process of unsubscribing, do not attempt to resubscribe
+                return;
+            }
+            if (this.receivingData) {
+                console.log(`No new slot in ${this.resubTimeoutMs}ms, slot subscriber resubscribing`);
+                await this.unsubscribe(true);
+                this.receivingData = false;
+                await this.subscribe();
+            }
+        }, this.resubTimeoutMs);
+    }
+    getSlothash() {
+        return this.currentSlothash;
+    }
+    async unsubscribe(onResub = false) {
+        if (!onResub) {
+            this.resubTimeoutMs = undefined;
+        }
+        this.isUnsubscribing = true;
+        clearTimeout(this.timeoutId);
+        this.timeoutId = undefined;
+        if (this.subscriptionId != null) {
+            await this.connection.removeSlotChangeListener(this.subscriptionId);
+            this.subscriptionId = undefined;
+            this.isUnsubscribing = false;
+        }
+        else {
+            this.isUnsubscribing = false;
+        }
+    }
+}
+exports.SlothashSubscriber = SlothashSubscriber;
+function deserializeSlothash(data) {
+    const slotNumber = new anchor_1.BN(data.subarray(8, 16), 10, 'le');
+    const hash = bytes_1.bs58.encode(data.subarray(16, 48));
+    return {
+        slot: slotNumber.toNumber(),
+        hash,
+    };
+}

package/lib/browser/types.d.ts

@@ -647,8 +647,9 @@ export type SwiftOrderRecord = {
     user: PublicKey;
     hash: string;
     matchingOrderParams: OrderParams;
-    swiftOrderSlot: BN;
-    userNextOrderId: number;
+    swiftOrderMaxSlot: BN;
+    swiftOrderUuid: Uint8Array;
+    userOrderId: number;
 };
 export type OrderRecord = {
     ts: BN;
@@ -1118,10 +1119,10 @@ export declare const DefaultOrderParams: OrderParams;
 export type SwiftServerMessage = {
     slot: BN;
     swiftOrderSignature: Uint8Array;
+    uuid: Uint8Array;
 };
 export type SwiftOrderParamsMessage = {
     swiftOrderParams: OptionalOrderParams;
-    expectedOrderId: number;
     subAccountId: number;
     takeProfitOrderParams: SwiftTriggerOrderParams | null;
     stopLossOrderParams: SwiftTriggerOrderParams | null;

package/lib/browser/user.js

@@ -1811,6 +1811,9 @@ class User {
         const state = this.driftClient.getStateAccount();
         let feeTierIndex = 0;
         if ((0, types_1.isVariant)(marketType, 'perp')) {
+            if (this.isHighLeverageMode()) {
+                return state.perpFeeStructure.feeTiers[0];
+            }
             const userStatsAccount = this.driftClient
                 .getUserStats()
                 .getAccount();

package/lib/browser/userMap/referrerMap.d.ts

@@ -0,0 +1,45 @@
+import { MemcmpFilter } from '@solana/web3.js';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
+import { DriftClient } from '../driftClient';
+import { ReferrerInfo } from '../types';
+export declare class ReferrerMap {
+    /**
+     * map from authority pubkey to ReferrerInfo.
+     * - if a user has not been entered into the map, the value is undefined
+     * - if a user has no referrer, the value is null
+     * - if a user has a referrer, the value is a ReferrerInfo object
+     */
+    private referrerMap;
+    private driftClient;
+    private bulkAccountLoader;
+    private parallelSync;
+    private fetchPromise?;
+    private fetchPromiseResolver;
+    /**
+     * Creates a new UserStatsMap instance.
+     *
+     * @param {DriftClient} driftClient - The DriftClient instance.
+     * @param {BulkAccountLoader} [bulkAccountLoader] - If not provided, a new BulkAccountLoader with polling disabled will be created.
+     */
+    constructor(driftClient: DriftClient, bulkAccountLoader?: BulkAccountLoader, parallelSync?: boolean);
+    /**
+     * Subscribe to all UserStats accounts.
+     */
+    subscribe(): Promise<void>;
+    has(authorityPublicKey: string): boolean;
+    get(authorityPublicKey: string): ReferrerInfo | undefined;
+    addReferrerInfo(authority: string, referrerInfo?: ReferrerInfo | null): Promise<void>;
+    /**
+     * Enforce that a UserStats will exist for the given authorityPublicKey,
+     * reading one from the blockchain if necessary.
+     * @param authorityPublicKey
+     * @returns
+     */
+    mustGet(authorityPublicKey: string): Promise<ReferrerInfo | undefined>;
+    values(): IterableIterator<ReferrerInfo | null>;
+    size(): number;
+    sync(): Promise<void>;
+    syncAll(): Promise<void>;
+    syncReferrer(referrerFilter: MemcmpFilter): Promise<void>;
+    unsubscribe(): Promise<void>;
+}