@drift-labs/sdk 2.83.0-beta.9 → 2.84.0-beta.1

package/lib/userMap/userMap.js

@@ -15,7 +15,7 @@ class UserMap {
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
             if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
@@ -64,6 +64,9 @@ class UserMap {
                 decodeFn,
             });
         }
+        this.syncConfig = (_e = config.syncConfig) !== null && _e !== void 0 ? _e : {
+            type: 'default',
+        };
     }
     async subscribe() {
         if (this.size() > 0) {
@@ -230,6 +233,14 @@ class UserMap {
         return userAuthKeys;
     }
     async sync() {
+        if (this.syncConfig.type === 'default') {
+            return this.defaultSync();
+        }
+        else {
+            return this.paginatedSync();
+        }
+    }
+    async defaultSync() {
         var _a;
         if (this.syncPromise) {
             return this.syncPromise;
@@ -298,6 +309,97 @@ class UserMap {
             this.syncPromise = undefined;
         }
     }
+    async paginatedSync() {
+        var _a, _b;
+        if (this.syncPromise) {
+            return this.syncPromise;
+        }
+        this.syncPromise = new Promise((resolve) => {
+            this.syncPromiseResolver = resolve;
+        });
+        try {
+            const accountsPrefetch = await this.connection.getProgramAccounts(this.driftClient.program.programId, {
+                dataSlice: { offset: 0, length: 0 },
+                filters: [
+                    (0, memcmp_1.getUserFilter)(),
+                    ...(!this.includeIdle ? [(0, memcmp_1.getNonIdleUserFilter)()] : []),
+                ],
+            });
+            const accountPublicKeys = accountsPrefetch.map((account) => account.pubkey);
+            const limitConcurrency = async (tasks, limit) => {
+                const executing = [];
+                const results = [];
+                for (let i = 0; i < tasks.length; i++) {
+                    const executor = Promise.resolve().then(tasks[i]);
+                    results.push(executor);
+                    if (executing.length < limit) {
+                        executing.push(executor);
+                        executor.finally(() => {
+                            const index = executing.indexOf(executor);
+                            if (index > -1) {
+                                executing.splice(index, 1);
+                            }
+                        });
+                    }
+                    else {
+                        await Promise.race(executing);
+                    }
+                }
+                return Promise.all(results);
+            };
+            const programAccountBufferMap = new Map();
+            // @ts-ignore
+            const chunkSize = (_a = this.syncConfig.chunkSize) !== null && _a !== void 0 ? _a : 100;
+            const tasks = [];
+            for (let i = 0; i < accountPublicKeys.length; i += chunkSize) {
+                const chunk = accountPublicKeys.slice(i, i + chunkSize);
+                tasks.push(async () => {
+                    const accountInfos = await this.connection.getMultipleAccountsInfoAndContext(chunk, {
+                        commitment: this.commitment,
+                    });
+                    const accountInfosSlot = accountInfos.context.slot;
+                    for (let j = 0; j < accountInfos.value.length; j += 1) {
+                        const accountInfo = accountInfos.value[j];
+                        if (accountInfo === null)
+                            continue;
+                        const publicKeyString = chunk[j].toString();
+                        const buffer = buffer_1.Buffer.from(accountInfo.data);
+                        programAccountBufferMap.set(publicKeyString, buffer);
+                        const decodedUser = this.decode('User', buffer);
+                        const currAccountWithSlot = this.getWithSlot(publicKeyString);
+                        if (currAccountWithSlot &&
+                            currAccountWithSlot.slot <= accountInfosSlot) {
+                            this.updateUserAccount(publicKeyString, decodedUser, accountInfosSlot);
+                        }
+                        else {
+                            await this.addPubkey(new web3_js_1.PublicKey(publicKeyString), decodedUser, accountInfosSlot);
+                        }
+                    }
+                });
+            }
+            // @ts-ignore
+            const concurrencyLimit = (_b = this.syncConfig.concurrencyLimit) !== null && _b !== void 0 ? _b : 10;
+            await limitConcurrency(tasks, concurrencyLimit);
+            for (const [key] of this.entries()) {
+                if (!programAccountBufferMap.has(key)) {
+                    const user = this.get(key);
+                    if (user) {
+                        await user.unsubscribe();
+                        this.userMap.delete(key);
+                    }
+                }
+            }
+        }
+        catch (err) {
+            console.error(`Error in UserMap.sync():`, err);
+        }
+        finally {
+            if (this.syncPromiseResolver) {
+                this.syncPromiseResolver();
+            }
+            this.syncPromise = undefined;
+        }
+    }
     async unsubscribe() {
         await this.subscription.unsubscribe();
         for (const [key, user] of this.entries()) {

package/lib/userMap/userMapConfig.d.ts

@@ -3,6 +3,13 @@ import { DriftClient } from '../driftClient';
 export type UserAccountFilterCriteria = {
     hasOpenOrders: boolean;
 };
+export type SyncConfig = {
+    type: 'default';
+} | {
+    type: 'paginated';
+    chunkSize?: number;
+    concurrencyLimit?: number;
+};
 export type UserMapConfig = {
     driftClient: DriftClient;
     connection?: Connection;
@@ -20,4 +27,5 @@ export type UserMapConfig = {
     includeIdle?: boolean;
     fastDecode?: boolean;
     disableSyncOnTotalAccountsChange?: boolean;
+    syncConfig?: SyncConfig;
 };

package/package.json

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

package/src/adminClient.ts

@@ -102,9 +102,11 @@ export class AdminClient extends DriftClient {
 		orderTickSize = ONE,
 		orderStepSize = ONE,
 		ifTotalFactor = 0,
-		name = DEFAULT_MARKET_NAME
+		name = DEFAULT_MARKET_NAME,
+		marketIndex?: number
 	): Promise<TransactionSignature> {
-		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
+		const spotMarketIndex =
+			marketIndex ?? this.getStateAccount().numberOfSpotMarkets;
 
 		const initializeIx = await this.getInitializeSpotMarketIx(
 			mint,
@@ -127,15 +129,14 @@ export class AdminClient extends DriftClient {
 			orderTickSize,
 			orderStepSize,
 			ifTotalFactor,
-			name
+			name,
+			marketIndex
 		);
 
 		const tx = await this.buildTransaction(initializeIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
-		// const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
-
 		await this.accountSubscriber.addSpotMarket(spotMarketIndex);
 		await this.accountSubscriber.addOracle({
 			source: oracleSource,
@@ -167,9 +168,11 @@ export class AdminClient extends DriftClient {
 		orderTickSize = ONE,
 		orderStepSize = ONE,
 		ifTotalFactor = 0,
-		name = DEFAULT_MARKET_NAME
+		name = DEFAULT_MARKET_NAME,
+		marketIndex?: number
 	): Promise<TransactionInstruction> {
-		const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
+		const spotMarketIndex =
+			marketIndex ?? this.getStateAccount().numberOfSpotMarkets;
 		const spotMarket = await getSpotMarketPublicKey(
 			this.program.programId,
 			spotMarketIndex
@@ -444,7 +447,7 @@ export class AdminClient extends DriftClient {
 			await this.fetchAccounts();
 		}
 
-		await this.accountSubscriber.addPerpMarket(currentPerpMarketIndex);
+		await this.accountSubscriber.addPerpMarket(marketIndex);
 		await this.accountSubscriber.addOracle({
 			source: oracleSource,
 			publicKey: priceOracle,
@@ -482,10 +485,9 @@ export class AdminClient extends DriftClient {
 		ammJitIntensity = 0,
 		name = DEFAULT_MARKET_NAME
 	): Promise<TransactionInstruction> {
-		const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
-			currentPerpMarketIndex
+			marketIndex
 		);
 
 		const nameBuffer = encodeName(name);

package/src/constants/perpMarkets.ts

@@ -577,6 +577,26 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1716595200000,
 		oracleSource: OracleSource.SWITCHBOARD,
 	},
+	{
+		fullName: 'Sanctum',
+		category: ['LST', 'Solana'],
+		symbol: 'CLOUD-PERP',
+		baseAssetSymbol: 'CLOUD',
+		marketIndex: 31,
+		oracle: new PublicKey('C7UxgCodaEy4yqwTe3a4QXfsG7LnpMGGQdEqaxDae4b8'),
+		launchTs: 1717597648000,
+		oracleSource: OracleSource.Prelaunch,
+	},
+	{
+		fullName: 'IO',
+		category: ['DePIN', 'Solana'],
+		symbol: 'IO-PERP',
+		baseAssetSymbol: 'IO',
+		marketIndex: 32,
+		oracle: new PublicKey('5sAqMGidMtztNFdUukyguz6jMFS8DvTmSUr4p5u5zsSg'),
+		launchTs: 1718021389000,
+		oracleSource: OracleSource.Prelaunch,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/dlob/DLOB.ts

@@ -76,7 +76,7 @@ type OrderBookCallback = () => void;
  *  Receives a DLOBNode and is expected to return true if the node should
  *  be taken into account when generating, or false otherwise.
  *
- * Currently used in getRestingLimitBids and getRestingLimitAsks.
+ * Currently used in functions that rely on getBestNode
  */
 export type DLOBFilterFcn = (node: DLOBNode) => boolean;
 
@@ -1046,7 +1046,8 @@ export class DLOB {
 		marketIndex: number,
 		marketType: MarketType,
 		slot: number,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		const marketTypeStr = getVariant(marketType) as MarketTypeStr;
 		const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
@@ -1067,7 +1068,8 @@ export class DLOB {
 			slot,
 			(bestNode, currentNode) => {
 				return bestNode.order.slot.lt(currentNode.order.slot);
-			}
+			},
+			filterFcn
 		);
 	}
 
@@ -1075,7 +1077,8 @@ export class DLOB {
 		marketIndex: number,
 		marketType: MarketType,
 		slot: number,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		const marketTypeStr = getVariant(marketType) as MarketTypeStr;
 		const orderLists = this.orderLists.get(marketTypeStr).get(marketIndex);
@@ -1096,7 +1099,8 @@ export class DLOB {
 			slot,
 			(bestNode, currentNode) => {
 				return bestNode.order.slot.lt(currentNode.order.slot);
-			}
+			},
+			filterFcn
 		);
 	}
 
@@ -1241,7 +1245,8 @@ export class DLOB {
 		fallbackAsk: BN | undefined,
 		slot: number,
 		marketType: MarketType,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		if (isVariant(marketType, 'spot') && !oraclePriceData) {
 			throw new Error('Must provide OraclePriceData to get spot asks');
@@ -1284,7 +1289,8 @@ export class DLOB {
 				return bestNode
 					.getPrice(oraclePriceData, slot)
 					.lt(currentNode.getPrice(oraclePriceData, slot));
-			}
+			},
+			filterFcn
 		);
 	}
 
@@ -1293,7 +1299,8 @@ export class DLOB {
 		fallbackBid: BN | undefined,
 		slot: number,
 		marketType: MarketType,
-		oraclePriceData: OraclePriceData
+		oraclePriceData: OraclePriceData,
+		filterFcn?: DLOBFilterFcn
 	): Generator<DLOBNode> {
 		if (isVariant(marketType, 'spot') && !oraclePriceData) {
 			throw new Error('Must provide OraclePriceData to get spot bids');
@@ -1336,7 +1343,8 @@ export class DLOB {
 				return bestNode
 					.getPrice(oraclePriceData, slot)
 					.gt(currentNode.getPrice(oraclePriceData, slot));
-			}
+			},
+			filterFcn
 		);
 	}
 

package/src/driftClient.ts

@@ -5385,7 +5385,8 @@ export class DriftClient {
 		marketIndexes: number[],
 		opts?: {
 			filterInvalidMarkets?: boolean;
-		}
+		},
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const filterInvalidMarkets = opts?.filterInvalidMarkets;
 
@@ -5418,9 +5419,12 @@ export class DriftClient {
 		// # Settle filtered market indexes
 		const ixs = await this.getSettlePNLsIxs(users, marketIndexToSettle);
 
-		const tx = await this.buildTransaction(ixs, {
-			computeUnits: 1_400_000,
-		});
+		const tx = await this.buildTransaction(
+			ixs,
+			txParams ?? {
+				computeUnits: 1_400_000,
+			}
+		);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
@@ -6774,7 +6778,7 @@ export class DriftClient {
 		txVersion?: TransactionVersion,
 		lookupTables?: AddressLookupTableAccount[],
 		forceVersionedTransaction?: boolean,
-		recentBlockHash?: BlockhashWithExpiryBlockHeight
+		recentBlockhash?: BlockhashWithExpiryBlockHeight
 	): Promise<Transaction | VersionedTransaction> {
 		return this.txHandler.buildTransaction({
 			instructions,
@@ -6786,7 +6790,7 @@ export class DriftClient {
 				this.fetchMarketLookupTableAccount.bind(this),
 			lookupTables,
 			forceVersionedTransaction,
-			recentBlockHash,
+			recentBlockhash,
 		});
 	}
 

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.82.0",
+  "version": "2.83.0",
   "name": "drift",
   "instructions": [
     {

package/src/math/auction.ts

@@ -88,7 +88,7 @@ export function getAuctionPriceForOracleOffsetAuction(
 	const deltaNumerator = BN.min(slotsElapsed, deltaDenominator);
 
 	if (deltaDenominator.eq(ZERO)) {
-		return oraclePrice.add(order.auctionEndPrice);
+		return BN.max(oraclePrice.add(order.auctionEndPrice), ONE);
 	}
 
 	let priceOffsetDelta;
@@ -111,7 +111,7 @@ export function getAuctionPriceForOracleOffsetAuction(
 		priceOffset = order.auctionStartPrice.sub(priceOffsetDelta);
 	}
 
-	return oraclePrice.add(priceOffset);
+	return BN.max(oraclePrice.add(priceOffset), ONE);
 }
 
 export function deriveOracleAuctionParams({

package/src/math/orders.ts

@@ -7,7 +7,7 @@ import {
 	Order,
 	PositionDirection,
 } from '../types';
-import { ZERO, TWO } from '../constants/numericConstants';
+import { ZERO, TWO, ONE } from '../constants/numericConstants';
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
 import {
@@ -160,7 +160,10 @@ export function getLimitPrice(
 	if (hasAuctionPrice(order, slot)) {
 		limitPrice = getAuctionPrice(order, slot, oraclePriceData.price);
 	} else if (order.oraclePriceOffset !== 0) {
-		limitPrice = oraclePriceData.price.add(new BN(order.oraclePriceOffset));
+		limitPrice = BN.max(
+			oraclePriceData.price.add(new BN(order.oraclePriceOffset)),
+			ONE
+		);
 	} else if (order.price.eq(ZERO)) {
 		limitPrice = fallbackPrice;
 	} else {