@drift-labs/sdk 2.63.0-beta.3 → 2.63.0-beta.5

package/VERSION

@@ -1 +1 @@
-2.63.0-beta.3
+2.63.0-beta.5

package/lib/userMap/userMap.d.ts

@@ -1,4 +1,4 @@
-import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB } from '..';
+import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB, UserSubscriptionConfig } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from './userMapConfig';
 export interface UserMapInterface {
@@ -31,7 +31,7 @@ export declare class UserMap implements UserMapInterface {
      */
     constructor(config: UserMapConfig);
     subscribe(): Promise<void>;
-    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number, accountSubscription?: UserSubscriptionConfig): Promise<void>;
     has(key: string): boolean;
     /**
      * gets the User for a particular userAccountPublicKey, if no User exists, undefined is returned
@@ -44,7 +44,7 @@ export declare class UserMap implements UserMapInterface {
      * @param key userAccountPublicKey to get User for
      * @returns  User
      */
-    mustGet(key: string): Promise<User>;
+    mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for

package/lib/userMap/userMap.js

@@ -72,11 +72,11 @@ class UserMap {
         }
         await this.subscription.subscribe();
     }
-    async addPubkey(userAccountPublicKey, userAccount, slot) {
+    async addPubkey(userAccountPublicKey, userAccount, slot, accountSubscription) {
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
-            accountSubscription: {
+            accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : {
                 type: 'custom',
                 userAccountSubscriber: new __1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
             },
@@ -100,9 +100,9 @@ class UserMap {
      * @param key userAccountPublicKey to get User for
      * @returns  User
      */
-    async mustGet(key) {
+    async mustGet(key, accountSubscription) {
         if (!this.has(key)) {
-            await this.addPubkey(new web3_js_1.PublicKey(key));
+            await this.addPubkey(new web3_js_1.PublicKey(key), undefined, undefined, accountSubscription);
         }
         const user = this.userMap.get(key);
         return user;

package/package.json

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

package/src/userMap/userMap.ts

@@ -15,6 +15,7 @@ import {
 	DLOB,
 	OneShotUserAccountSubscriber,
 	BN,
+	UserSubscriptionConfig,
 } from '..';
 
 import {
@@ -131,12 +132,13 @@ export class UserMap implements UserMapInterface {
 	public async addPubkey(
 		userAccountPublicKey: PublicKey,
 		userAccount?: UserAccount,
-		slot?: number
+		slot?: number,
+		accountSubscription?: UserSubscriptionConfig
 	) {
 		const user = new User({
 			driftClient: this.driftClient,
 			userAccountPublicKey,
-			accountSubscription: {
+			accountSubscription: accountSubscription ?? {
 				type: 'custom',
 				userAccountSubscriber: new OneShotUserAccountSubscriber(
 					this.driftClient.program,
@@ -169,9 +171,17 @@ export class UserMap implements UserMapInterface {
 	 * @param key userAccountPublicKey to get User for
 	 * @returns  User
 	 */
-	public async mustGet(key: string): Promise<User> {
+	public async mustGet(
+		key: string,
+		accountSubscription?: UserSubscriptionConfig
+	): Promise<User> {
 		if (!this.has(key)) {
-			await this.addPubkey(new PublicKey(key));
+			await this.addPubkey(
+				new PublicKey(key),
+				undefined,
+				undefined,
+				accountSubscription
+			);
 		}
 		const user = this.userMap.get(key);
 		return user;

package/tests/amm/test.ts

@@ -332,8 +332,8 @@ describe('AMM Tests', () => {
 			new BN(928097825691666),
 			new BN(907979542352912),
 			new BN(945977491145601),
-			new BN(161188),
-			new BN(1459632439),
+			new BN(161188), // mark std
+			new BN(145963), // oracle std
 			new BN(12358265776),
 			new BN(72230366233),
 			new BN(432067603632),
@@ -342,9 +342,9 @@ describe('AMM Tests', () => {
 
 		// console.log(terms2);
 		assert(terms2.effectiveLeverageCapped >= 1.0002);
-		assert(terms2.inventorySpreadScale == 1.73492);
-		assert(terms2.longSpread == 4262);
-		assert(terms2.shortSpread == 43238);
+		assert(terms2.inventorySpreadScale == 4.717646);
+		assert(terms2.longSpread == 160);
+		assert(terms2.shortSpread == 4430);
 
 		// add spread offset
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -365,19 +365,19 @@ describe('AMM Tests', () => {
 			new BN(907979542352912),
 			new BN(945977491145601),
 			new BN(161188),
-			new BN(1459632439),
+			new BN(145963), // oracle std
 			new BN(12358265776),
 			new BN(72230366233),
 			new BN(432067603632),
 			true
 		);
 
-		console.log(terms3);
+		// console.log(terms3);
 		assert(terms3.effectiveLeverageCapped >= 1.0002);
-		assert(terms3.inventorySpreadScale == 1.73492);
-		assert(terms3.longSpread == 4262);
-		assert(terms3.shortSpread == 43238);
-		assert(terms3.longSpread + terms3.shortSpread == 47500);
+		assert(terms3.inventorySpreadScale == 4.717646);
+		assert(terms3.longSpread == 160);
+		assert(terms3.shortSpread == 4430);
+		assert(terms3.longSpread + terms3.shortSpread == 4430 + 160);
 
 		// add spread offset
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -398,7 +398,7 @@ describe('AMM Tests', () => {
 			new BN(907979542352912),
 			new BN(945977491145601),
 			new BN(161188),
-			new BN(1459632439),
+			new BN(1459632439), // oracle std (unchanged)
 			new BN(12358265776),
 			new BN(72230366233),
 			new BN(432067603632),
@@ -408,9 +408,9 @@ describe('AMM Tests', () => {
 		console.log(terms4);
 		assert(terms4.effectiveLeverageCapped >= 1.0002);
 		assert(terms4.inventorySpreadScale == 1.73492);
-		assert(terms4.longSpread == 4262);
-		assert(terms4.shortSpread == 43238);
-		assert(terms4.longSpread + terms4.shortSpread == 47500);
+		assert(terms4.longSpread == 89746);
+		assert(terms4.shortSpread == 910254);
+		assert(terms4.longSpread + terms4.shortSpread == 1000000);
 	});
 
 	it('Corner Case Spreads', () => {