@drift-labs/sdk 2.67.0-beta.4 → 2.67.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.67.0-beta.4
+2.67.0-beta.6

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -50,8 +50,8 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     private pauseForOracleToBeAdded;
-    private setPerpOracleMap;
-    private setSpotOracleMap;
+    setPerpOracleMap(): Promise<void>;
+    setSpotOracleMap(): Promise<void>;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -249,13 +249,17 @@ class PollingDriftClientAccountSubscriber {
     }
     async addOracle(oracleInfo) {
         if (oracleInfo.publicKey.equals(web3_js_1.PublicKey.default) ||
-            this.oraclesToPoll.has(oracleInfo.publicKey.toString())) {
+            this.oracles.has(oracleInfo.publicKey.toBase58())) {
             return true;
         }
-        this.addOracleToPoll(oracleInfo);
         const oracleString = oracleInfo.publicKey.toBase58();
-        const oracleToPoll = this.oraclesToPoll.get(oracleString);
-        await this.addOracleToAccountLoader(oracleToPoll);
+        // this func can be called multiple times before the first pauseForOracleToBeAdded finishes
+        // avoid adding to oraclesToPoll multiple time
+        if (!this.oraclesToPoll.has(oracleString)) {
+            this.addOracleToPoll(oracleInfo);
+            const oracleToPoll = this.oraclesToPoll.get(oracleString);
+            await this.addOracleToAccountLoader(oracleToPoll);
+        }
         await this.pauseForOracleToBeAdded(3, oracleString);
         return true;
     }

package/lib/accounts/types.d.ts

@@ -41,6 +41,8 @@ export interface DriftClientAccountSubscriber {
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addSpotMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+    setPerpOracleMap(): Promise<void>;
+    setSpotOracleMap(): Promise<void>;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -44,8 +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;
+    setPerpOracleMap(): Promise<void>;
+    setSpotOracleMap(): Promise<void>;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;

package/lib/adminClient.js

@@ -88,6 +88,7 @@ class AdminClient extends driftClient_1.DriftClient {
             source: oracleSource,
             publicKey: oracle,
         });
+        await this.accountSubscriber.setSpotOracleMap();
         return txSig;
     }
     async initializeSerumFulfillmentConfig(marketIndex, serumMarket, serumProgram) {
@@ -156,6 +157,7 @@ class AdminClient extends driftClient_1.DriftClient {
             source: oracleSource,
             publicKey: priceOracle,
         });
+        await this.accountSubscriber.setPerpOracleMap();
         return txSig;
     }
     async deleteInitializedPerpMarket(marketIndex) {

package/package.json

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

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -396,15 +396,19 @@ export class PollingDriftClientAccountSubscriber
 	async addOracle(oracleInfo: OracleInfo): Promise<boolean> {
 		if (
 			oracleInfo.publicKey.equals(PublicKey.default) ||
-			this.oraclesToPoll.has(oracleInfo.publicKey.toString())
+			this.oracles.has(oracleInfo.publicKey.toBase58())
 		) {
 			return true;
 		}
 
-		this.addOracleToPoll(oracleInfo);
 		const oracleString = oracleInfo.publicKey.toBase58();
-		const oracleToPoll = this.oraclesToPoll.get(oracleString);
-		await this.addOracleToAccountLoader(oracleToPoll);
+		// this func can be called multiple times before the first pauseForOracleToBeAdded finishes
+		// avoid adding to oraclesToPoll multiple time
+		if (!this.oraclesToPoll.has(oracleString)) {
+			this.addOracleToPoll(oracleInfo);
+			const oracleToPoll = this.oraclesToPoll.get(oracleString);
+			await this.addOracleToAccountLoader(oracleToPoll);
+		}
 
 		await this.pauseForOracleToBeAdded(3, oracleString);
 
@@ -428,7 +432,7 @@ export class PollingDriftClientAccountSubscriber
 		console.log(`Pausing to find oracle ${oracle} failed`);
 	}
 
-	private async setPerpOracleMap() {
+	async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
 		for (const perpMarket of perpMarkets) {
 			const perpMarketAccount = perpMarket.data;
@@ -444,7 +448,7 @@ export class PollingDriftClientAccountSubscriber
 		}
 	}
 
-	private async setSpotOracleMap() {
+	async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
 		for (const spotMarket of spotMarkets) {
 			const spotMarketAccount = spotMarket.data;

package/src/accounts/types.ts

@@ -58,6 +58,8 @@ export interface DriftClientAccountSubscriber {
 	addPerpMarket(marketIndex: number): Promise<boolean>;
 	addSpotMarket(marketIndex: number): Promise<boolean>;
 	addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+	setPerpOracleMap(): Promise<void>;
+	setSpotOracleMap(): Promise<void>;
 
 	getStateAccountAndSlot(): DataAndSlot<StateAccount>;
 	getMarketAccountAndSlot(

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -311,7 +311,7 @@ export class WebSocketDriftClientAccountSubscriber
 		return this.subscribeToOracle(oracleInfo);
 	}
 
-	private async setPerpOracleMap() {
+	async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
 		for (const perpMarket of perpMarkets) {
 			if (!perpMarket) {
@@ -330,7 +330,7 @@ export class WebSocketDriftClientAccountSubscriber
 		}
 	}
 
-	private async setSpotOracleMap() {
+	async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
 		for (const spotMarket of spotMarkets) {
 			if (!spotMarket) {

package/src/adminClient.ts

@@ -144,6 +144,7 @@ export class AdminClient extends DriftClient {
 			source: oracleSource,
 			publicKey: oracle,
 		});
+		await this.accountSubscriber.setSpotOracleMap();
 
 		return txSig;
 	}
@@ -283,6 +284,7 @@ export class AdminClient extends DriftClient {
 			source: oracleSource,
 			publicKey: priceOracle,
 		});
+		await this.accountSubscriber.setPerpOracleMap();
 
 		return txSig;
 	}