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

package/src/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,
@@ -686,15 +784,6 @@
         {
           "name": "swiftOrderParamsMessageBytes",
           "type": "bytes"
-        },
-        {
-          "name": "swiftMessageSignature",
-          "type": {
-            "array": [
-              "u8",
-              64
-            ]
-          }
         }
       ]
     },
@@ -7477,6 +7566,29 @@
         ]
       }
     },
+    {
+      "name": "SwiftUserOrders",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "userPubkey",
+            "type": "publicKey"
+          },
+          {
+            "name": "swiftOrderData",
+            "type": {
+              "array": [
+                {
+                  "defined": "SwiftOrderId"
+                },
+                32
+              ]
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "User",
       "type": {
@@ -8441,6 +8553,15 @@
       "type": {
         "kind": "struct",
         "fields": [
+          {
+            "name": "uuid",
+            "type": {
+              "array": [
+                "u8",
+                8
+              ]
+            }
+          },
           {
             "name": "swiftOrderSignature",
             "type": {
@@ -8468,10 +8589,6 @@
               "defined": "OrderParams"
             }
           },
-          {
-            "name": "expectedOrderId",
-            "type": "i32"
-          },
           {
             "name": "subAccountId",
             "type": "u16"
@@ -9651,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": {
@@ -11550,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
         }
       ]
@@ -13680,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/src/index.ts

@@ -11,6 +11,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';
@@ -20,6 +21,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';
@@ -65,6 +67,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';
@@ -105,6 +108,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/src/jupiter/jupiterClient.ts

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

package/src/memcmp.ts

@@ -56,3 +56,30 @@ export function getUserWithName(name: string): MemcmpFilter {
 		},
 	};
 }
+
+export function getUserStatsFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 0,
+			bytes: bs58.encode(BorshAccountsCoder.accountDiscriminator('UserStats')),
+		},
+	};
+}
+
+export function getUserStatsIsReferredFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 188,
+			bytes: bs58.encode(Buffer.from(Uint8Array.from([2]))),
+		},
+	};
+}
+
+export function getUserStatsIsReferredOrReferrerFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 188,
+			bytes: bs58.encode(Buffer.from(Uint8Array.from([3]))),
+		},
+	};
+}

package/src/slot/SlothashSubscriber.ts

@@ -0,0 +1,126 @@
+import {
+	Commitment,
+	Connection,
+	SYSVAR_SLOT_HASHES_PUBKEY,
+} from '@solana/web3.js';
+import { bs58 } from '@coral-xyz/anchor/dist/cjs/utils/bytes';
+import { BN } from '@coral-xyz/anchor';
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+type SlothashSubscriberConfig = {
+	resubTimeoutMs?: number;
+	commitment?: Commitment;
+}; // for future customization
+
+export type Slothash = {
+	slot: number;
+	hash: string;
+};
+
+export class SlothashSubscriber {
+	currentSlothash: Slothash;
+	subscriptionId: number;
+	commitment: Commitment;
+
+	// Reconnection
+	timeoutId?: NodeJS.Timeout;
+	resubTimeoutMs?: number;
+	isUnsubscribing = false;
+	receivingData = false;
+
+	public constructor(
+		private connection: Connection,
+		config?: SlothashSubscriberConfig
+	) {
+		this.resubTimeoutMs = config?.resubTimeoutMs;
+		this.commitment = config?.commitment ?? 'processed';
+		if (this.resubTimeoutMs < 1000) {
+			console.log(
+				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
+			);
+		}
+	}
+
+	public async subscribe(): Promise<void> {
+		if (this.subscriptionId != null) {
+			return;
+		}
+
+		const currentAccountData = await this.connection.getAccountInfo(
+			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(
+			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();
+		}
+	}
+
+	private setTimeout(): void {
+		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);
+	}
+
+	public getSlothash(): Slothash {
+		return this.currentSlothash;
+	}
+
+	public async unsubscribe(onResub = false): Promise<void> {
+		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;
+		}
+	}
+}
+
+function deserializeSlothash(data: Buffer): Slothash {
+	const slotNumber = new BN(data.subarray(8, 16), 10, 'le');
+	const hash = bs58.encode(data.subarray(16, 48));
+	return {
+		slot: slotNumber.toNumber(),
+		hash,
+	};
+}

package/src/types.ts

@@ -546,8 +546,9 @@ export type SwiftOrderRecord = {
 	user: PublicKey;
 	hash: string;
 	matchingOrderParams: OrderParams;
-	swiftOrderSlot: BN;
-	userNextOrderId: number;
+	swiftOrderMaxSlot: BN;
+	swiftOrderUuid: Uint8Array;
+	userOrderId: number;
 };
 
 export type OrderRecord = {
@@ -1077,11 +1078,11 @@ export const DefaultOrderParams: OrderParams = {
 export type SwiftServerMessage = {
 	slot: BN;
 	swiftOrderSignature: Uint8Array;
+	uuid: Uint8Array; // From buffer of standard UUID string
 };
 
 export type SwiftOrderParamsMessage = {
 	swiftOrderParams: OptionalOrderParams;
-	expectedOrderId: number;
 	subAccountId: number;
 	takeProfitOrderParams: SwiftTriggerOrderParams | null;
 	stopLossOrderParams: SwiftTriggerOrderParams | null;

package/src/user.ts

@@ -3475,6 +3475,10 @@ export class User {
 
 		let feeTierIndex = 0;
 		if (isVariant(marketType, 'perp')) {
+			if (this.isHighLeverageMode()) {
+				return state.perpFeeStructure.feeTiers[0];
+			}
+
 			const userStatsAccount: UserStatsAccount = this.driftClient
 				.getUserStats()
 				.getAccount();