@drift-labs/sdk 2.67.0-beta.0 → 2.67.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.67.0-beta.0
+2.67.0-beta.2

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -23,7 +23,9 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     errorCallbackId?: string;
     state?: DataAndSlot<StateAccount>;
     perpMarket: Map<number, DataAndSlot<PerpMarketAccount>>;
+    perpOracleMap: Map<number, PublicKey>;
     spotMarket: Map<number, DataAndSlot<SpotMarketAccount>>;
+    spotOracleMap: Map<number, PublicKey>;
     oracles: Map<string, DataAndSlot<OraclePriceData>>;
     user?: DataAndSlot<UserAccount>;
     private isSubscribing;
@@ -47,6 +49,8 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     addSpotMarket(marketIndex: number): Promise<boolean>;
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+    private setPerpOracleMap;
+    private setSpotOracleMap;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
@@ -54,5 +58,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency(pollingFrequency: number): void;
 }

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -15,7 +15,9 @@ class PollingDriftClientAccountSubscriber {
         this.accountsToPoll = new Map();
         this.oraclesToPoll = new Map();
         this.perpMarket = new Map();
+        this.perpOracleMap = new Map();
         this.spotMarket = new Map();
+        this.spotOracleMap = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -57,6 +59,8 @@ class PollingDriftClientAccountSubscriber {
         if (subscriptionSucceeded) {
             this.eventEmitter.emit('update');
         }
+        this.setPerpOracleMap();
+        this.setSpotOracleMap();
         this.isSubscribing = false;
         this.isSubscribed = subscriptionSucceeded;
         this.subscriptionPromiseResolver(subscriptionSucceeded);
@@ -229,6 +233,7 @@ class PollingDriftClientAccountSubscriber {
         await this.addSpotMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
         await this.addAccountToAccountLoader(accountToPoll);
+        this.setSpotOracleMap();
         return true;
     }
     async addPerpMarket(marketIndex) {
@@ -239,6 +244,7 @@ class PollingDriftClientAccountSubscriber {
         await this.addPerpMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
         await this.addAccountToAccountLoader(accountToPoll);
+        this.setPerpOracleMap();
         return true;
     }
     async addOracle(oracleInfo) {
@@ -251,6 +257,24 @@ class PollingDriftClientAccountSubscriber {
         await this.addOracleToAccountLoader(oracleToPoll);
         return true;
     }
+    setPerpOracleMap() {
+        const perpMarkets = this.getMarketAccountsAndSlots();
+        for (const perpMarket of perpMarkets) {
+            const perpMarketAccount = perpMarket.data;
+            const perpMarketIndex = perpMarketAccount.marketIndex;
+            const oracle = perpMarketAccount.amm.oracle;
+            this.perpOracleMap.set(perpMarketIndex, oracle);
+        }
+    }
+    setSpotOracleMap() {
+        const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        for (const spotMarket of spotMarkets) {
+            const spotMarketAccount = spotMarket.data;
+            const spotMarketIndex = spotMarketAccount.marketIndex;
+            const oracle = spotMarketAccount.oracle;
+            this.spotOracleMap.set(spotMarketIndex, oracle);
+        }
+    }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
@@ -282,6 +306,40 @@ class PollingDriftClientAccountSubscriber {
         }
         return this.oracles.get(oraclePublicKey.toString());
     }
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
+        const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+        const oracle = this.perpOracleMap.get(marketIndex);
+        if (!perpMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: perpMarketAccount.data.amm.oracleSource,
+                publicKey: perpMarketAccount.data.amm.oracle,
+            }).then(() => {
+                this.setPerpOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+        const oracle = this.spotOracleMap.get(marketIndex);
+        if (!spotMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: spotMarketAccount.data.oracleSource,
+                publicKey: spotMarketAccount.data.oracle,
+            }).then(() => {
+                this.setSpotOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
     updateAccountLoaderPollingFrequency(pollingFrequency) {
         this.accountLoader.updatePollingFrequency(pollingFrequency);
     }

package/lib/accounts/types.d.ts

@@ -47,6 +47,8 @@ export interface DriftClientAccountSubscriber {
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;
 }
 export interface UserAccountEvents {

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -21,7 +21,9 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
     perpMarketAccountSubscribers: Map<number, AccountSubscriber<PerpMarketAccount>>;
+    perpOracleMap: Map<number, PublicKey>;
     spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;
+    spotOracleMap: Map<number, PublicKey>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     private isSubscribing;
     private subscriptionPromise;
@@ -42,6 +44,8 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     addSpotMarket(marketIndex: number): Promise<boolean>;
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+    private setPerpOracleMap;
+    private setSpotOracleMap;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
@@ -49,4 +53,6 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -13,7 +13,9 @@ class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
+        this.perpOracleMap = new Map();
         this.spotMarketAccountSubscribers = new Map();
+        this.spotOracleMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -57,6 +59,8 @@ class WebSocketDriftClientAccountSubscriber {
         // subscribe to oracles
         await this.subscribeToOracles();
         this.eventEmitter.emit('update');
+        this.setPerpOracleMap();
+        this.setSpotOracleMap();
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
@@ -152,13 +156,17 @@ class WebSocketDriftClientAccountSubscriber {
         if (this.spotMarketAccountSubscribers.has(marketIndex)) {
             return true;
         }
-        return this.subscribeToSpotMarketAccount(marketIndex);
+        const subscriptionSuccess = this.subscribeToSpotMarketAccount(marketIndex);
+        this.setSpotOracleMap();
+        return subscriptionSuccess;
     }
     async addPerpMarket(marketIndex) {
         if (this.perpMarketAccountSubscribers.has(marketIndex)) {
             return true;
         }
-        return this.subscribeToPerpMarketAccount(marketIndex);
+        const subscriptionSuccess = this.subscribeToPerpMarketAccount(marketIndex);
+        this.setPerpOracleMap();
+        return subscriptionSuccess;
     }
     async addOracle(oracleInfo) {
         if (this.oracleSubscribers.has(oracleInfo.publicKey.toString())) {
@@ -169,6 +177,30 @@ class WebSocketDriftClientAccountSubscriber {
         }
         return this.subscribeToOracle(oracleInfo);
     }
+    setPerpOracleMap() {
+        const perpMarkets = this.getMarketAccountsAndSlots();
+        for (const perpMarket of perpMarkets) {
+            if (!perpMarket) {
+                continue;
+            }
+            const perpMarketAccount = perpMarket.data;
+            const perpMarketIndex = perpMarketAccount.marketIndex;
+            const oracle = perpMarketAccount.amm.oracle;
+            this.perpOracleMap.set(perpMarketIndex, oracle);
+        }
+    }
+    setSpotOracleMap() {
+        const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        for (const spotMarket of spotMarkets) {
+            if (!spotMarket) {
+                continue;
+            }
+            const spotMarketAccount = spotMarket.data;
+            const spotMarketIndex = spotMarketAccount.marketIndex;
+            const oracle = spotMarketAccount.oracle;
+            this.spotOracleMap.set(spotMarketIndex, oracle);
+        }
+    }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
@@ -202,5 +234,39 @@ class WebSocketDriftClientAccountSubscriber {
         }
         return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
     }
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
+        const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+        const oracle = this.perpOracleMap.get(marketIndex);
+        if (!perpMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: perpMarketAccount.data.amm.oracleSource,
+                publicKey: perpMarketAccount.data.amm.oracle,
+            }).then(() => {
+                this.setPerpOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+        const oracle = this.spotOracleMap.get(marketIndex);
+        if (!spotMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: spotMarketAccount.data.oracleSource,
+                publicKey: spotMarketAccount.data.oracle,
+            }).then(() => {
+                this.setSpotOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
 }
 exports.WebSocketDriftClientAccountSubscriber = WebSocketDriftClientAccountSubscriber;

package/lib/driftClient.js

@@ -3169,14 +3169,10 @@ class DriftClient {
         this.eventEmitter.emit(eventName, data);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        const oracleKey = this.getPerpMarketAccount(marketIndex).amm.oracle;
-        const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
-        return oracleData;
+        return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data;
     }
     getOracleDataForSpotMarket(marketIndex) {
-        const oracleKey = this.getSpotMarketAccount(marketIndex).oracle;
-        const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
-        return oracleData;
+        return this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(marketIndex).data;
     }
     async initializeInsuranceFundStake(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getInitializeInsuranceFundStakeIx(marketIndex), txParams), [], this.opts);
@@ -3306,6 +3302,7 @@ class DriftClient {
         return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
+        var _a, _b;
         const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
@@ -3328,9 +3325,11 @@ class DriftClient {
                 removeIfStakeIxs.push(createTokenAccountIx);
             }
         }
+        const userAccountExists = !!((_b = (_a = this.getUser()) === null || _a === void 0 ? void 0 : _a.accountSubscriber) === null || _b === void 0 ? void 0 : _b.isSubscribed) &&
+            (await this.checkIfAccountExists(this.getUser().userAccountPublicKey));
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
-            useMarketLastSlotCache: true,
+            userAccounts: userAccountExists ? [this.getUserAccount()] : [],
+            useMarketLastSlotCache: false,
             writableSpotMarketIndexes: [marketIndex],
         });
         const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {

package/lib/factory/oracleClient.js

@@ -6,6 +6,7 @@ const pythClient_1 = require("../oracles/pythClient");
 // import { SwitchboardClient } from '../oracles/switchboardClient';
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const anchor_1 = require("@coral-xyz/anchor");
+const switchboardClient_1 = require("../oracles/switchboardClient");
 function getOracleClient(oracleSource, connection) {
     if ((0, types_1.isVariant)(oracleSource, 'pyth')) {
         return new pythClient_1.PythClient(connection);
@@ -19,9 +20,9 @@ function getOracleClient(oracleSource, connection) {
     if ((0, types_1.isVariant)(oracleSource, 'pythStableCoin')) {
         return new pythClient_1.PythClient(connection, undefined, true);
     }
-    // if (isVariant(oracleSource, 'switchboard')) {
-    // 	return new SwitchboardClient(connection);
-    // }
+    if ((0, types_1.isVariant)(oracleSource, 'switchboard')) {
+        return new switchboardClient_1.SwitchboardClient(connection);
+    }
     if ((0, types_1.isVariant)(oracleSource, 'quoteAsset')) {
         return new quoteAssetOracleClient_1.QuoteAssetOracleClient();
     }