@drift-labs/sdk 2.31.0-beta.1 → 2.31.0-beta.4

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -0,0 +1,12 @@
+import { OrderSubscriber } from './OrderSubscriber';
+export declare class WebsocketSubscription {
+    private orderSubscriber;
+    private skipInitialLoad;
+    private websocketId;
+    constructor({ orderSubscriber, skipInitialLoad, }: {
+        orderSubscriber: OrderSubscriber;
+        skipInitialLoad?: boolean;
+    });
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketSubscription = void 0;
+const memcmp_1 = require("../memcmp");
+class WebsocketSubscription {
+    constructor({ orderSubscriber, skipInitialLoad = false, }) {
+        this.orderSubscriber = orderSubscriber;
+        this.skipInitialLoad = skipInitialLoad;
+    }
+    async subscribe() {
+        if (this.websocketId) {
+            return;
+        }
+        this.websocketId =
+            this.orderSubscriber.driftClient.connection.onProgramAccountChange(this.orderSubscriber.driftClient.program.programId, (keyAccountInfo, context) => {
+                const userKey = keyAccountInfo.accountId.toBase58();
+                this.orderSubscriber.tryUpdateUserAccount(userKey, keyAccountInfo.accountInfo.data, context.slot);
+            }, this.orderSubscriber.driftClient.opts.commitment, [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()]);
+        if (!this.skipInitialLoad) {
+            await this.orderSubscriber.fetch();
+        }
+    }
+    async unsubscribe() {
+        if (this.websocketId) {
+            await this.orderSubscriber.driftClient.connection.removeProgramAccountChangeListener(this.websocketId);
+            this.websocketId = undefined;
+        }
+    }
+}
+exports.WebsocketSubscription = WebsocketSubscription;

package/lib/orderSubscriber/index.d.ts

@@ -0,0 +1,2 @@
+export * from './OrderSubscriber';
+export * from './types';

package/lib/orderSubscriber/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./OrderSubscriber"), exports);
+__exportStar(require("./types"), exports);

package/lib/orderSubscriber/types.d.ts

@@ -0,0 +1,11 @@
+import { DriftClient } from '../driftClient';
+export type OrderSubscriberConfig = {
+    driftClient: DriftClient;
+    subscriptionConfig: {
+        type: 'polling';
+        frequency: number;
+    } | {
+        type: 'websocket';
+        skipInitialLoad?: boolean;
+    };
+};

package/lib/orderSubscriber/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/tx/retryTxSender.js

@@ -55,12 +55,15 @@ class RetryTxSender {
         return tx;
     }
     async sendVersionedTransaction(tx, additionalSigners, opts) {
+        additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
+            tx.sign([kp]);
+        });
         // @ts-ignore
-        tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.provider.wallet.payer));
+        const signedTx = await this.provider.wallet.signTransaction(tx);
         if (opts === undefined) {
             opts = this.provider.opts;
         }
-        return this.sendRawTransaction(tx.serialize(), opts);
+        return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {
         const startTime = this.getTimestamp();

package/lib/types.d.ts

@@ -222,7 +222,7 @@ export declare class OrderActionExplanation {
         orderFilledWithAmmJitLpSplit: {};
     };
     static readonly ORDER_FILLED_WITH_LP_JIT: {
-        orderFilledWithAmmJitLpSplit: {};
+        orderFilledWithLpJit: {};
     };
     static readonly ORDER_FILLED_WITH_MATCH: {
         orderFilledWithMatch: {};
@@ -877,6 +877,10 @@ export type UserAccount = {
     lastActiveSlot: BN;
     isMarginTradingEnabled: boolean;
     idle: boolean;
+    openOrders: number;
+    hasOpenOrder: boolean;
+    openAuctions: number;
+    hasOpenAuction: boolean;
 };
 export type SpotPosition = {
     marketIndex: number;

package/lib/types.js

@@ -138,7 +138,7 @@ OrderActionExplanation.ORDER_FILLED_WITH_AMM_JIT_LP_SPLIT = {
     orderFilledWithAmmJitLpSplit: {},
 };
 OrderActionExplanation.ORDER_FILLED_WITH_LP_JIT = {
-    orderFilledWithAmmJitLpSplit: {},
+    orderFilledWithLpJit: {},
 };
 OrderActionExplanation.ORDER_FILLED_WITH_MATCH = {
     orderFilledWithMatch: {},

package/lib/userMap/userMap.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMap = void 0;
 const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
 const buffer_1 = require("buffer");
-const bs58_1 = __importDefault(require("bs58"));
+const memcmp_1 = require("../memcmp");
 class UserMap {
     /**
      *
@@ -143,27 +140,15 @@ class UserMap {
         return this.userMap.size;
     }
     async sync() {
-        let filters = undefined;
+        const filters = [(0, memcmp_1.getUserFilter)()];
         if (!this.includeIdle) {
-            filters = [
-                {
-                    memcmp: {
-                        offset: 4350,
-                        bytes: bs58_1.default.encode(Uint8Array.from([0])),
-                    },
-                },
-            ];
+            filters.push((0, memcmp_1.getNonIdleUserFilter)());
         }
         const rpcRequestArgs = [
             this.driftClient.program.programId.toBase58(),
             {
                 commitment: this.driftClient.connection.commitment,
-                filters: [
-                    {
-                        memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
-                    },
-                    ...(Array.isArray(filters) ? filters : []),
-                ],
+                filters,
                 encoding: 'base64',
                 withContext: true,
             },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.31.0-beta.1",
+	"version": "2.31.0-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -174,6 +174,11 @@ export class BulkAccountLoader {
 
 		for (const i in rpcResponses) {
 			const rpcResponse = rpcResponses[i];
+			if (!rpcResponse.result) {
+				console.error('rpc response missing result:');
+				console.log(JSON.stringify(rpcResponse));
+				continue;
+			}
 			const newSlot = rpcResponse.result.context.slot;
 
 			if (newSlot > this.mostRecentSlot) {

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -0,0 +1,50 @@
+import { AuctionSubscriberConfig, AuctionSubscriberEvents } from './types';
+import { DriftClient } from '../driftClient';
+import { getUserFilter, getUserWithAuctionFilter } from '../memcmp';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { UserAccount } from '../types';
+import { ConfirmOptions } from '@solana/web3.js';
+
+export class AuctionSubscriber {
+	private driftClient: DriftClient;
+	private opts: ConfirmOptions;
+
+	eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
+
+	private websocketId: number;
+
+	constructor({ driftClient, opts }: AuctionSubscriberConfig) {
+		this.driftClient = driftClient;
+		this.opts = opts || this.driftClient.opts;
+	}
+
+	public async subscribe() {
+		this.websocketId = this.driftClient.connection.onProgramAccountChange(
+			this.driftClient.program.programId,
+			(keyAccountInfo, context) => {
+				const userAccount =
+					this.driftClient.program.account.user.coder.accounts.decode(
+						'User',
+						keyAccountInfo.accountInfo.data
+					) as UserAccount;
+				this.eventEmitter.emit(
+					'onAccountUpdate',
+					userAccount,
+					keyAccountInfo.accountId,
+					context.slot
+				);
+			},
+			this.driftClient.opts.commitment,
+			[getUserFilter(), getUserWithAuctionFilter()]
+		);
+	}
+
+	public async unsubscribe() {
+		if (this.websocketId) {
+			await this.driftClient.connection.removeProgramAccountChangeListener(
+				this.websocketId
+			);
+		}
+	}
+}

package/src/auctionSubscriber/index.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './auctionSubscriber';

package/src/auctionSubscriber/types.ts

@@ -0,0 +1,16 @@
+import { DriftClient } from '../driftClient';
+import { UserAccount } from '../types';
+import { ConfirmOptions, PublicKey } from '@solana/web3.js';
+
+export type AuctionSubscriberConfig = {
+	driftClient: DriftClient;
+	opts?: ConfirmOptions;
+};
+
+export interface AuctionSubscriberEvents {
+	onAccountUpdate: (
+		account: UserAccount,
+		pubkey: PublicKey,
+		slot: number
+	) => void;
+}

package/src/driftClient.ts

@@ -114,6 +114,7 @@ import { calculateMarketMaxAvailableInsurance } from './math/market';
 import { fetchUserStatsAccount } from './accounts/fetch';
 import { castNumberToSpotPrecision } from './math/spotMarket';
 import { JupiterClient, Route, SwapMode } from './jupiter/jupiterClient';
+import { getNonIdleUserFilter } from './memcmp';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -897,14 +898,7 @@ export class DriftClient {
 	): Promise<ProgramAccount<UserAccount>[]> {
 		let filters = undefined;
 		if (!includeIdle) {
-			filters = [
-				{
-					memcmp: {
-						offset: 4350,
-						bytes: bs58.encode(Uint8Array.from([0])),
-					},
-				},
-			];
+			filters = [getNonIdleUserFilter()];
 		}
 		return (await this.program.account.user.all(
 			filters
@@ -3395,12 +3389,12 @@ export class DriftClient {
 			endSwapIx,
 		];
 
-		const tx = await this.buildTransaction(
+		const tx = (await this.buildTransaction(
 			instructions,
 			txParams,
 			0,
 			lookupTables
-		);
+		)) as VersionedTransaction;
 
 		const { txSig, slot } = await this.sendTransaction(tx);
 		this.spotMarketLastSlotCache.set(outMarketIndex, slot);
@@ -3625,6 +3619,43 @@ export class DriftClient {
 		});
 	}
 
+	public async updateUserOpenOrdersCount(
+		userAccountPublicKey: PublicKey,
+		user: UserAccount,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getUpdateUserOpenOrdersCountIx(userAccountPublicKey, user),
+				txParams
+			),
+			[],
+			this.opts
+		);
+		return txSig;
+	}
+
+	public async getUpdateUserOpenOrdersCountIx(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount
+	): Promise<TransactionInstruction> {
+		const fillerPublicKey = await this.getUserAccountPublicKey();
+
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [userAccount],
+		});
+
+		return await this.program.instruction.updateUserOpenOrdersCount({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				filler: fillerPublicKey,
+				user: userAccountPublicKey,
+				authority: this.wallet.publicKey,
+			},
+			remainingAccounts,
+		});
+	}
+
 	public async placeAndTakePerpOrder(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo | MakerInfo[],

package/src/events/eventSubscriber.ts

@@ -1,4 +1,4 @@
-import { Connection, TransactionSignature } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import {
 	DefaultEventSubscriptionOptions,
@@ -19,6 +19,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { getSortFn } from './sort';
 
 export class EventSubscriber {
+	private address: PublicKey;
 	private eventListMap: Map<EventType, EventList<EventType>>;
 	private txEventCache: TxEventCache;
 	private awaitTxPromises = new Map<string, Promise<void>>();
@@ -35,6 +36,7 @@ export class EventSubscriber {
 		private options: EventSubscriptionOptions = DefaultEventSubscriptionOptions
 	) {
 		this.options = Object.assign({}, DefaultEventSubscriptionOptions, options);
+		this.address = this.options.address ?? program.programId;
 		this.txEventCache = new TxEventCache(this.options.maxTx);
 		this.eventListMap = new Map<EventType, EventList<EventType>>();
 		for (const eventType of this.options.eventTypes) {
@@ -52,13 +54,13 @@ export class EventSubscriber {
 		if (this.options.logProviderConfig.type === 'websocket') {
 			this.logProvider = new WebSocketLogProvider(
 				this.connection,
-				this.program.programId,
+				this.address,
 				this.options.commitment
 			);
 		} else {
 			this.logProvider = new PollingLogProvider(
 				this.connection,
-				this.program.programId,
+				this.address,
 				options.commitment,
 				this.options.logProviderConfig.frequency
 			);
@@ -134,7 +136,7 @@ export class EventSubscriber {
 		while (txFetched < this.options.maxTx) {
 			const response = await fetchLogs(
 				this.connection,
-				this.program.programId,
+				this.address,
 				this.options.commitment === 'finalized' ? 'finalized' : 'confirmed',
 				beforeTx,
 				untilTx

package/src/events/fetchLogs.ts

@@ -31,14 +31,14 @@ function mapTransactionResponseToLog(
 
 export async function fetchLogs(
 	connection: Connection,
-	programId: PublicKey,
+	address: PublicKey,
 	finality: Finality,
 	beforeTx?: TransactionSignature,
 	untilTx?: TransactionSignature,
 	limit?: number
 ): Promise<FetchLogsResponse> {
 	const signatures = await connection.getSignaturesForAddress(
-		programId,
+		address,
 		{
 			before: beforeTx,
 			until: untilTx,

package/src/events/pollingLogProvider.ts

@@ -17,7 +17,7 @@ export class PollingLogProvider implements LogProvider {
 
 	public constructor(
 		private connection: Connection,
-		private programId: PublicKey,
+		private address: PublicKey,
 		commitment: Commitment,
 		private frequency = 15 * 1000
 	) {
@@ -41,7 +41,7 @@ export class PollingLogProvider implements LogProvider {
 			try {
 				const response = await fetchLogs(
 					this.connection,
-					this.programId,
+					this.address,
 					this.finality,
 					undefined,
 					this.mostRecentSeenTx,

package/src/events/types.ts

@@ -1,4 +1,4 @@
-import { Commitment, TransactionSignature } from '@solana/web3.js';
+import { Commitment, PublicKey, TransactionSignature } from '@solana/web3.js';
 import {
 	DepositRecord,
 	FundingPaymentRecord,
@@ -17,6 +17,7 @@ import {
 } from '../index';
 
 export type EventSubscriptionOptions = {
+	address?: PublicKey;
 	eventTypes?: EventType[];
 	maxEventsPerType?: number;
 	orderBy?: EventSubscriptionOrderBy;

package/src/events/webSocketLogProvider.ts

@@ -5,7 +5,7 @@ export class WebSocketLogProvider implements LogProvider {
 	private subscriptionId: number;
 	public constructor(
 		private connection: Connection,
-		private programId: PublicKey,
+		private address: PublicKey,
 		private commitment: Commitment
 	) {}
 
@@ -15,7 +15,7 @@ export class WebSocketLogProvider implements LogProvider {
 		}
 
 		this.subscriptionId = this.connection.onLogs(
-			this.programId,
+			this.address,
 			(logs, ctx) => {
 				callback(logs.signature, ctx.slot, logs.logs, undefined);
 			},

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.0-beta.1",
+  "version": "2.31.0-beta.4",
   "name": "drift",
   "instructions": [
     {
@@ -1305,6 +1305,32 @@
       ],
       "args": []
     },
+    {
+      "name": "updateUserOpenOrdersCount",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "settlePnl",
       "accounts": [
@@ -5438,12 +5464,40 @@
             ],
             "type": "bool"
           },
+          {
+            "name": "openOrders",
+            "docs": [
+              "number of open orders"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "hasOpenOrder",
+            "docs": [
+              "Whether or not user has open order"
+            ],
+            "type": "bool"
+          },
+          {
+            "name": "openAuctions",
+            "docs": [
+              "number of open orders with auction"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "hasOpenAuction",
+            "docs": [
+              "Whether or not user has open order with auction"
+            ],
+            "type": "bool"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                25
+                21
               ]
             }
           }
@@ -10433,6 +10487,11 @@
       "code": 6250,
       "name": "SpotMarketReduceOnly",
       "msg": "SpotMarketReduceOnly"
+    },
+    {
+      "code": 6251,
+      "name": "FundingWasNotUpdated",
+      "msg": "FundingWasNotUpdated"
     }
   ]
 }

package/src/index.ts

@@ -76,5 +76,6 @@ export * from './dlob/orderBookLevels';
 export * from './userMap/userMap';
 export * from './userMap/userStatsMap';
 export * from './math/bankruptcy';
+export * from './orderSubscriber';
 
 export { BN, PublicKey, pyth };

package/src/math/spotBalance.ts

@@ -282,9 +282,7 @@ export function calculateInterestRate(bank: SpotMarketAccount): BN {
 	} else {
 		const borrowRateSlope = new BN(bank.optimalBorrowRate)
 			.mul(SPOT_MARKET_UTILIZATION_PRECISION)
-			.div(
-				SPOT_MARKET_UTILIZATION_PRECISION.sub(new BN(bank.optimalUtilization))
-			);
+			.div(new BN(bank.optimalUtilization));
 
 		interestRate = utilization
 			.mul(borrowRateSlope)

package/src/memcmp.ts

@@ -0,0 +1,39 @@
+import { MemcmpFilter } from '@solana/web3.js';
+import bs58 from 'bs58';
+import { BorshAccountsCoder } from '@coral-xyz/anchor';
+
+export function getUserFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 0,
+			bytes: bs58.encode(BorshAccountsCoder.accountDiscriminator('User')),
+		},
+	};
+}
+
+export function getNonIdleUserFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 4350,
+			bytes: bs58.encode(Uint8Array.from([0])),
+		},
+	};
+}
+
+export function getUserWithOrderFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 4352,
+			bytes: bs58.encode(Uint8Array.from([1])),
+		},
+	};
+}
+
+export function getUserWithAuctionFilter(): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 4354,
+			bytes: bs58.encode(Uint8Array.from([1])),
+		},
+	};
+}