@drift-labs/sdk 2.65.0-beta.7 → 2.65.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.65.0-beta.7
+2.65.0-beta.9

package/lib/constants/spotMarkets.js

@@ -108,6 +108,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         serumMarket: new web3_js_1.PublicKey('DkbVbMhFxswS32xnn1K2UY4aoBugXooBTxdzkWWDWRkH'),
+        phoenixMarket: new web3_js_1.PublicKey('5LQLfGtqcC5rm2WuGxJf4tjqYmDjsQAbKo2AMLQ8KB7p'),
     },
     {
         symbol: 'PYTH',

package/lib/userMap/userMap.js

@@ -73,16 +73,20 @@ class UserMap {
         await this.subscription.subscribe();
     }
     async addPubkey(userAccountPublicKey, userAccount, slot, accountSubscription) {
-        var _a, _b;
+        var _a;
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
-            accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : this.driftClient.userAccountSubscriptionConfig,
+            accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : {
+                type: 'custom',
+                // OneShotUserAccountSubscriber used here so we don't load up the RPC with AccountSubscribes
+                userAccountSubscriber: new __1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
+            },
         });
         await user.subscribe(userAccount);
         this.userMap.set(userAccountPublicKey.toString(), {
             data: user,
-            slot: (_b = (_a = user.getUserAccountAndSlot().slot) !== null && _a !== void 0 ? _a : slot) !== null && _b !== void 0 ? _b : -1,
+            slot: slot !== null && slot !== void 0 ? slot : (_a = user.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.slot,
         });
     }
     has(key) {

package/package.json

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

package/src/constants/spotMarkets.ts

@@ -137,6 +137,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
 		serumMarket: new PublicKey('DkbVbMhFxswS32xnn1K2UY4aoBugXooBTxdzkWWDWRkH'),
+		phoenixMarket: new PublicKey(
+			'5LQLfGtqcC5rm2WuGxJf4tjqYmDjsQAbKo2AMLQ8KB7p'
+		),
 	},
 	{
 		symbol: 'PYTH',

package/src/userMap/userMap.ts

@@ -16,6 +16,7 @@ import {
 	BN,
 	UserSubscriptionConfig,
 	DataAndSlot,
+	OneShotUserAccountSubscriber,
 } from '..';
 
 import {
@@ -154,13 +155,22 @@ export class UserMap implements UserMapInterface {
 		const user = new User({
 			driftClient: this.driftClient,
 			userAccountPublicKey,
-			accountSubscription:
-				accountSubscription ?? this.driftClient.userAccountSubscriptionConfig,
+			accountSubscription: accountSubscription ?? {
+				type: 'custom',
+				// OneShotUserAccountSubscriber used here so we don't load up the RPC with AccountSubscribes
+				userAccountSubscriber: new OneShotUserAccountSubscriber(
+					this.driftClient.program,
+					userAccountPublicKey,
+					userAccount,
+					slot,
+					this.commitment
+				),
+			},
 		});
 		await user.subscribe(userAccount);
 		this.userMap.set(userAccountPublicKey.toString(), {
 			data: user,
-			slot: user.getUserAccountAndSlot().slot ?? slot ?? -1,
+			slot: slot ?? user.getUserAccountAndSlot()?.slot,
 		});
 	}