@drift-labs/sdk 2.10.0-beta.1 → 2.10.0-beta.3

package/lib/types.d.ts

@@ -317,8 +317,8 @@ export declare enum TradeSide {
     Buy = 1,
     Sell = 2
 }
-export declare type CandleResolution = '1' | '5' | '15' | '60' | '240' | 'D' | 'W' | 'M';
-export declare type NewUserRecord = {
+export type CandleResolution = '1' | '5' | '15' | '60' | '240' | 'D' | 'W' | 'M';
+export type NewUserRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
@@ -326,7 +326,7 @@ export declare type NewUserRecord = {
     name: number[];
     referrer: PublicKey;
 };
-export declare type DepositRecord = {
+export type DepositRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
@@ -347,7 +347,7 @@ export declare type DepositRecord = {
     explanation: DepositExplanation;
     transferUser?: PublicKey;
 };
-export declare type SpotInterestRecord = {
+export type SpotInterestRecord = {
     ts: BN;
     marketIndex: number;
     depositBalance: BN;
@@ -358,7 +358,7 @@ export declare type SpotInterestRecord = {
     optimalBorrowRate: number;
     maxBorrowRate: number;
 };
-export declare type CurveRecord = {
+export type CurveRecord = {
     ts: BN;
     recordId: BN;
     marketIndex: number;
@@ -406,7 +406,7 @@ export declare type InsuranceFundStakeRecord = {
     userIfSharesAfter: BN;
     totalIfSharesAfter: BN;
 };
-export declare type LPRecord = {
+export type LPRecord = {
     ts: BN;
     user: PublicKey;
     action: LPAction;
@@ -427,7 +427,7 @@ export declare class LPAction {
         settleLiquidity: {};
     };
 }
-export declare type FundingRateRecord = {
+export type FundingRateRecord = {
     ts: BN;
     recordId: BN;
     marketIndex: number;
@@ -442,7 +442,7 @@ export declare type FundingRateRecord = {
     baseAssetAmountWithAmm: BN;
     baseAssetAmountWithUnsettledLp: BN;
 };
-export declare type FundingPaymentRecord = {
+export type FundingPaymentRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
@@ -453,7 +453,7 @@ export declare type FundingPaymentRecord = {
     ammCumulativeFundingLong: BN;
     ammCumulativeFundingShort: BN;
 };
-export declare type LiquidationRecord = {
+export type LiquidationRecord = {
     ts: BN;
     user: PublicKey;
     liquidator: PublicKey;
@@ -491,7 +491,7 @@ export declare class LiquidationType {
         liquidateSpot: {};
     };
 }
-export declare type LiquidatePerpRecord = {
+export type LiquidatePerpRecord = {
     marketIndex: number;
     oraclePrice: BN;
     baseAssetAmount: BN;
@@ -503,7 +503,7 @@ export declare type LiquidatePerpRecord = {
     liquidatorFee: BN;
     ifFee: BN;
 };
-export declare type LiquidateSpotRecord = {
+export type LiquidateSpotRecord = {
     assetMarketIndex: number;
     assetPrice: BN;
     assetTransfer: BN;
@@ -512,7 +512,7 @@ export declare type LiquidateSpotRecord = {
     liabilityTransfer: BN;
     ifFee: BN;
 };
-export declare type LiquidateBorrowForPerpPnlRecord = {
+export type LiquidateBorrowForPerpPnlRecord = {
     perpMarketIndex: number;
     marketOraclePrice: BN;
     pnlTransfer: BN;
@@ -520,7 +520,7 @@ export declare type LiquidateBorrowForPerpPnlRecord = {
     liabilityPrice: BN;
     liabilityTransfer: BN;
 };
-export declare type LiquidatePerpPnlForDepositRecord = {
+export type LiquidatePerpPnlForDepositRecord = {
     perpMarketIndex: number;
     marketOraclePrice: BN;
     pnlTransfer: BN;
@@ -528,7 +528,7 @@ export declare type LiquidatePerpPnlForDepositRecord = {
     assetPrice: BN;
     assetTransfer: BN;
 };
-export declare type PerpBankruptcyRecord = {
+export type PerpBankruptcyRecord = {
     marketIndex: number;
     pnl: BN;
     ifPayment: BN;
@@ -536,13 +536,13 @@ export declare type PerpBankruptcyRecord = {
     clawbackUserPayment: BN | null;
     cumulativeFundingRateDelta: BN;
 };
-export declare type SpotBankruptcyRecord = {
+export type SpotBankruptcyRecord = {
     marketIndex: number;
     borrowAmount: BN;
     cumulativeDepositInterestDelta: BN;
     ifPayment: BN;
 };
-export declare type SettlePnlRecord = {
+export type SettlePnlRecord = {
     ts: BN;
     user: PublicKey;
     marketIndex: number;
@@ -553,12 +553,12 @@ export declare type SettlePnlRecord = {
     settlePrice: BN;
     explanation: SettlePnlExplanation;
 };
-export declare type OrderRecord = {
+export type OrderRecord = {
     ts: BN;
     user: PublicKey;
     order: Order;
 };
-export declare type OrderActionRecord = {
+export type OrderActionRecord = {
     ts: BN;
     action: OrderAction;
     actionExplanation: OrderActionExplanation;
@@ -588,7 +588,7 @@ export declare type OrderActionRecord = {
     makerOrderCumulativeQuoteAssetAmountFilled: BN | null;
     oraclePrice: BN;
 };
-export declare type StateAccount = {
+export type StateAccount = {
     admin: PublicKey;
     exchangeStatus: ExchangeStatus;
     whitelistMint: PublicKey;
@@ -612,7 +612,7 @@ export declare type StateAccount = {
     initialPctToLiquidate: number;
     liquidationDuration: number;
 };
-export declare type PerpMarketAccount = {
+export type PerpMarketAccount = {
     status: MarketStatus;
     contractType: ContractType;
     contractTier: ContractTier;
@@ -645,7 +645,7 @@ export declare type PerpMarketAccount = {
         quoteMaxInsurance: BN;
     };
 };
-export declare type HistoricalOracleData = {
+export type HistoricalOracleData = {
     lastOraclePrice: BN;
     lastOracleDelay: BN;
     lastOracleConf: BN;
@@ -653,14 +653,14 @@ export declare type HistoricalOracleData = {
     lastOraclePriceTwap5Min: BN;
     lastOraclePriceTwapTs: BN;
 };
-export declare type HistoricalIndexData = {
+export type HistoricalIndexData = {
     lastIndexBidPrice: BN;
     lastIndexAskPrice: BN;
     lastIndexPriceTwap: BN;
     lastIndexPriceTwap5Min: BN;
     lastIndexPriceTwapTs: BN;
 };
-export declare type SpotMarketAccount = {
+export type SpotMarketAccount = {
     status: MarketStatus;
     assetTier: AssetTier;
     marketIndex: number;
@@ -715,11 +715,11 @@ export declare type SpotMarketAccount = {
     totalSpotFee: BN;
     ordersEnabled: boolean;
 };
-export declare type PoolBalance = {
+export type PoolBalance = {
     scaledBalance: BN;
     marketIndex: number;
 };
-export declare type AMM = {
+export type AMM = {
     baseAssetReserve: BN;
     sqrtK: BN;
     cumulativeFundingRate: BN;
@@ -797,7 +797,7 @@ export declare type AMM = {
     askBaseAssetReserve: BN;
     askQuoteAssetReserve: BN;
 };
-export declare type PerpPosition = {
+export type PerpPosition = {
     baseAssetAmount: BN;
     lastCumulativeFundingRate: BN;
     marketIndex: number;
@@ -813,7 +813,7 @@ export declare type PerpPosition = {
     lastBaseAssetAmountPerLp: BN;
     lastQuoteAssetAmountPerLp: BN;
 };
-export declare type UserStatsAccount = {
+export type UserStatsAccount = {
     numberOfSubAccounts: number;
     numberOfSubAccountsCreated: number;
     makerVolume30D: BN;
@@ -835,7 +835,7 @@ export declare type UserStatsAccount = {
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
 };
-export declare type UserAccount = {
+export type UserAccount = {
     authority: PublicKey;
     delegate: PublicKey;
     name: number[];
@@ -857,7 +857,7 @@ export declare type UserAccount = {
     liquidationStartSlot: BN;
     isMarginTradingEnabled: boolean;
 };
-export declare type SpotPosition = {
+export type SpotPosition = {
     marketIndex: number;
     balanceType: SpotBalanceType;
     scaledBalance: BN;
@@ -866,7 +866,7 @@ export declare type SpotPosition = {
     openAsks: BN;
     cumulativeDeposits: BN;
 };
-export declare type Order = {
+export type Order = {
     status: OrderStatus;
     orderType: OrderType;
     marketType: MarketType;
@@ -892,7 +892,7 @@ export declare type Order = {
     auctionEndPrice: BN;
     maxTs: BN;
 };
-export declare type OrderParams = {
+export type OrderParams = {
     orderType: OrderType;
     marketType: MarketType;
     userOrderId: number;
@@ -912,29 +912,29 @@ export declare type OrderParams = {
     auctionStartPrice: BN | null;
     auctionEndPrice: BN | null;
 };
-export declare type NecessaryOrderParams = {
+export type NecessaryOrderParams = {
     orderType: OrderType;
     marketIndex: number;
     baseAssetAmount: BN;
     direction: PositionDirection;
 };
-export declare type OptionalOrderParams = {
+export type OptionalOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
 export declare const DefaultOrderParams: OrderParams;
-export declare type MakerInfo = {
+export type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;
     makerUserAccount: UserAccount;
     order: Order;
 };
-export declare type TakerInfo = {
+export type TakerInfo = {
     taker: PublicKey;
     takerStats: PublicKey;
     takerUserAccount: UserAccount;
     order: Order;
 };
-export declare type ReferrerInfo = {
+export type ReferrerInfo = {
     referrer: PublicKey;
     referrerStats: PublicKey;
 };
@@ -943,7 +943,7 @@ export interface IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
 }
-export declare type FeeStructure = {
+export type FeeStructure = {
     feeTiers: FeeTier[];
     makerRebateNumerator: BN;
     makerRebateDenominator: BN;
@@ -951,7 +951,7 @@ export declare type FeeStructure = {
     flatFillerFee: BN;
     referrerRewardEpochUpperBound: BN;
 };
-export declare type FeeTier = {
+export type FeeTier = {
     feeNumerator: number;
     feeDenominator: number;
     makerRebateNumerator: number;
@@ -961,12 +961,12 @@ export declare type FeeTier = {
     refereeFeeNumerator: number;
     refereeFeeDenominator: number;
 };
-export declare type OrderFillerRewardStructure = {
+export type OrderFillerRewardStructure = {
     rewardNumerator: BN;
     rewardDenominator: BN;
     timeBasedRewardLowerBound: BN;
 };
-export declare type OracleGuardRails = {
+export type OracleGuardRails = {
     priceDivergence: {
         markOracleDivergenceNumerator: BN;
         markOracleDivergenceDenominator: BN;
@@ -978,8 +978,8 @@ export declare type OracleGuardRails = {
         tooVolatileRatio: BN;
     };
 };
-export declare type MarginCategory = 'Initial' | 'Maintenance';
-export declare type InsuranceFundStake = {
+export type MarginCategory = 'Initial' | 'Maintenance';
+export type InsuranceFundStake = {
     marketIndex: number;
     authority: PublicKey;
     ifShares: BN;
@@ -988,7 +988,7 @@ export declare type InsuranceFundStake = {
     lastWithdrawRequestValue: BN;
     lastWithdrawRequestTs: BN;
 };
-export declare type SerumV3FulfillmentConfigAccount = {
+export type SerumV3FulfillmentConfigAccount = {
     fulfillmentType: SpotFulfillmentType;
     status: SpotFulfillmentStatus;
     pubkey: PublicKey;

package/lib/user.d.ts

@@ -29,6 +29,7 @@ export declare class User {
     fetchAccounts(): Promise<void>;
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
+    forceGetUserAccount(): Promise<UserAccount>;
     getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
     /**
      * Gets the user's current position for a given perp market. If the user has no position returns undefined

package/lib/user.js

@@ -12,6 +12,12 @@ const pollingUserAccountSubscriber_1 = require("./accounts/pollingUserAccountSub
 const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccountSubscriber");
 const spotPosition_1 = require("./math/spotPosition");
 class User {
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
     constructor(config) {
         var _a;
         this._isSubscribed = false;
@@ -25,12 +31,6 @@ class User {
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }
-    get isSubscribed() {
-        return this._isSubscribed && this.accountSubscriber.isSubscribed;
-    }
-    set isSubscribed(val) {
-        this._isSubscribed = val;
-    }
     /**
      * Subscribe to User state accounts
      * @returns SusbcriptionSuccess result
@@ -52,6 +52,10 @@ class User {
     getUserAccount() {
         return this.accountSubscriber.getUserAccountAndSlot().data;
     }
+    async forceGetUserAccount() {
+        await this.fetchAccounts();
+        return this.accountSubscriber.getUserAccountAndSlot().data;
+    }
     getUserAccountAndSlot() {
         return this.accountSubscriber.getUserAccountAndSlot();
     }

package/lib/userConfig.d.ts

@@ -1,12 +1,12 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-export declare type UserConfig = {
+export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
     userAccountPublicKey: PublicKey;
 };
-export declare type UserSubscriptionConfig = {
+export type UserSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

package/lib/userMap/userMap.js

@@ -26,6 +26,9 @@ class UserMap {
         if (this.accountSubscription.type === 'polling') {
             await (0, __1.bulkPollingUserSubscribe)(userArray, this.accountSubscription.accountLoader);
         }
+        else {
+            await Promise.all(userArray.map((user) => user.subscribe()));
+        }
         for (const user of userArray) {
             this.userMap.set(user.getUserAccountPublicKey().toString(), user);
         }

package/lib/userMap/userStatsMap.js

@@ -30,6 +30,9 @@ class UserStatsMap {
         if (this.accountSubscription.type === 'polling') {
             await (0, __1.bulkPollingUserStatsSubscribe)(userStatArray, this.accountSubscription.accountLoader);
         }
+        else {
+            await Promise.all(userStatArray.map((userStat) => userStat.subscribe()));
+        }
         for (const userStat of userStatArray) {
             this.userStatsMap.set(userStat.getAccount().authority.toString(), userStat);
         }

package/lib/userStatsConfig.d.ts

@@ -1,12 +1,12 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-export declare type UserStatsConfig = {
+export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
     driftClient: DriftClient;
     userStatsAccountPublicKey: PublicKey;
 };
-export declare type UserStatsSubscriptionConfig = {
+export type UserStatsSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

package/package.json

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

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -340,21 +340,44 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	async addSpotMarket(marketIndex: number): Promise<boolean> {
+		const marketPublicKey = await getSpotMarketPublicKey(
+			this.program.programId,
+			marketIndex
+		);
+
+		if (this.accountsToPoll.has(marketPublicKey.toString())) {
+			return true;
+		}
+
 		await this.addSpotMarketAccountToPoll(marketIndex);
-		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
+
+		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+
 		await this.addAccountToAccountLoader(accountToPoll);
 		return true;
 	}
 
 	async addPerpMarket(marketIndex: number): Promise<boolean> {
+		const marketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			marketIndex
+		);
+
+		if (this.accountsToPoll.has(marketPublicKey.toString())) {
+			return true;
+		}
+
 		await this.addPerpMarketAccountToPoll(marketIndex);
-		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
+		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
 		await this.addAccountToAccountLoader(accountToPoll);
 		return true;
 	}
 
 	async addOracle(oracleInfo: OracleInfo): Promise<boolean> {
-		if (oracleInfo.publicKey.equals(PublicKey.default)) {
+		if (
+			oracleInfo.publicKey.equals(PublicKey.default) ||
+			this.oraclesToPoll.has(oracleInfo.publicKey.toString())
+		) {
 			return true;
 		}