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

package/VERSION

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

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -49,6 +49,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     addSpotMarket(marketIndex: number): Promise<boolean>;
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+    private pauseForOracleToBeAdded;
     private setPerpOracleMap;
     private setSpotOracleMap;
     assertIsSubscribed(): void;

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -59,8 +59,8 @@ class PollingDriftClientAccountSubscriber {
         if (subscriptionSucceeded) {
             this.eventEmitter.emit('update');
         }
-        this.setPerpOracleMap();
-        this.setSpotOracleMap();
+        await this.setPerpOracleMap();
+        await this.setSpotOracleMap();
         this.isSubscribing = false;
         this.isSubscribed = subscriptionSucceeded;
         this.subscriptionPromiseResolver(subscriptionSucceeded);
@@ -244,7 +244,7 @@ class PollingDriftClientAccountSubscriber {
         await this.addPerpMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
         await this.addAccountToAccountLoader(accountToPoll);
-        this.setPerpOracleMap();
+        await this.setPerpOracleMap();
         return true;
     }
     async addOracle(oracleInfo) {
@@ -253,25 +253,50 @@ class PollingDriftClientAccountSubscriber {
             return true;
         }
         this.addOracleToPoll(oracleInfo);
-        const oracleToPoll = this.oraclesToPoll.get(oracleInfo.publicKey.toString());
+        const oracleString = oracleInfo.publicKey.toBase58();
+        const oracleToPoll = this.oraclesToPoll.get(oracleString);
         await this.addOracleToAccountLoader(oracleToPoll);
+        await this.pauseForOracleToBeAdded(3, oracleString);
         return true;
     }
-    setPerpOracleMap() {
+    async pauseForOracleToBeAdded(tries, oracle) {
+        let i = 0;
+        while (i < tries) {
+            await new Promise((r) => setTimeout(r, this.accountLoader.pollingFrequency));
+            if (this.accountLoader.bufferAndSlotMap.has(oracle)) {
+                return;
+            }
+            i++;
+        }
+        console.log(`Pausing to find oracle ${oracle} failed`);
+    }
+    async setPerpOracleMap() {
         const perpMarkets = this.getMarketAccountsAndSlots();
         for (const perpMarket of perpMarkets) {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
+            if (!this.oracles.has(oracle.toBase58())) {
+                await this.addOracle({
+                    publicKey: oracle,
+                    source: perpMarketAccount.amm.oracleSource,
+                });
+            }
             this.perpOracleMap.set(perpMarketIndex, oracle);
         }
     }
-    setSpotOracleMap() {
+    async setSpotOracleMap() {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
         for (const spotMarket of spotMarkets) {
             const spotMarketAccount = spotMarket.data;
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
+            if (!this.oracles.has(oracle.toBase58())) {
+                await this.addOracle({
+                    publicKey: oracle,
+                    source: spotMarketAccount.oracleSource,
+                });
+            }
             this.spotOracleMap.set(spotMarketIndex, oracle);
         }
     }
@@ -314,12 +339,7 @@ class PollingDriftClientAccountSubscriber {
         }
         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();
-            });
+            this.setPerpOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracle);
     }
@@ -331,12 +351,7 @@ class PollingDriftClientAccountSubscriber {
         }
         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();
-            });
+            this.setSpotOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracle);
     }

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -59,8 +59,8 @@ class WebSocketDriftClientAccountSubscriber {
         // subscribe to oracles
         await this.subscribeToOracles();
         this.eventEmitter.emit('update');
-        this.setPerpOracleMap();
-        this.setSpotOracleMap();
+        await this.setPerpOracleMap();
+        await this.setSpotOracleMap();
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
@@ -157,7 +157,7 @@ class WebSocketDriftClientAccountSubscriber {
             return true;
         }
         const subscriptionSuccess = this.subscribeToSpotMarketAccount(marketIndex);
-        this.setSpotOracleMap();
+        await this.setSpotOracleMap();
         return subscriptionSuccess;
     }
     async addPerpMarket(marketIndex) {
@@ -165,7 +165,7 @@ class WebSocketDriftClientAccountSubscriber {
             return true;
         }
         const subscriptionSuccess = this.subscribeToPerpMarketAccount(marketIndex);
-        this.setPerpOracleMap();
+        await this.setPerpOracleMap();
         return subscriptionSuccess;
     }
     async addOracle(oracleInfo) {
@@ -177,7 +177,7 @@ class WebSocketDriftClientAccountSubscriber {
         }
         return this.subscribeToOracle(oracleInfo);
     }
-    setPerpOracleMap() {
+    async setPerpOracleMap() {
         const perpMarkets = this.getMarketAccountsAndSlots();
         for (const perpMarket of perpMarkets) {
             if (!perpMarket) {
@@ -186,10 +186,16 @@ class WebSocketDriftClientAccountSubscriber {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
+            if (!this.oracleSubscribers.has(oracle.toBase58())) {
+                await this.addOracle({
+                    publicKey: oracle,
+                    source: perpMarket.data.amm.oracleSource,
+                });
+            }
             this.perpOracleMap.set(perpMarketIndex, oracle);
         }
     }
-    setSpotOracleMap() {
+    async setSpotOracleMap() {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
         for (const spotMarket of spotMarkets) {
             if (!spotMarket) {
@@ -198,6 +204,12 @@ class WebSocketDriftClientAccountSubscriber {
             const spotMarketAccount = spotMarket.data;
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
+            if (!this.oracleSubscribers.has(oracle.toBase58())) {
+                await this.addOracle({
+                    publicKey: oracle,
+                    source: spotMarketAccount.oracleSource,
+                });
+            }
             this.spotOracleMap.set(spotMarketIndex, oracle);
         }
     }
@@ -242,12 +254,7 @@ class WebSocketDriftClientAccountSubscriber {
         }
         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();
-            });
+            this.setPerpOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracle);
     }
@@ -259,12 +266,7 @@ class WebSocketDriftClientAccountSubscriber {
         }
         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();
-            });
+            this.setSpotOracleMap();
         }
         return this.getOraclePriceDataAndSlot(oracle);
     }

package/package.json

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

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -116,8 +116,8 @@ export class PollingDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		}
 
-		this.setPerpOracleMap();
-		this.setSpotOracleMap();
+		await this.setPerpOracleMap();
+		await this.setSpotOracleMap();
 
 		this.isSubscribing = false;
 		this.isSubscribed = subscriptionSucceeded;
@@ -389,7 +389,7 @@ export class PollingDriftClientAccountSubscriber
 		await this.addPerpMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
 		await this.addAccountToAccountLoader(accountToPoll);
-		this.setPerpOracleMap();
+		await this.setPerpOracleMap();
 		return true;
 	}
 
@@ -402,29 +402,60 @@ export class PollingDriftClientAccountSubscriber
 		}
 
 		this.addOracleToPoll(oracleInfo);
-		const oracleToPoll = this.oraclesToPoll.get(
-			oracleInfo.publicKey.toString()
-		);
+		const oracleString = oracleInfo.publicKey.toBase58();
+		const oracleToPoll = this.oraclesToPoll.get(oracleString);
 		await this.addOracleToAccountLoader(oracleToPoll);
+
+		await this.pauseForOracleToBeAdded(3, oracleString);
+
 		return true;
 	}
 
-	private setPerpOracleMap() {
+	private async pauseForOracleToBeAdded(
+		tries: number,
+		oracle: string
+	): Promise<void> {
+		let i = 0;
+		while (i < tries) {
+			await new Promise((r) =>
+				setTimeout(r, this.accountLoader.pollingFrequency)
+			);
+			if (this.accountLoader.bufferAndSlotMap.has(oracle)) {
+				return;
+			}
+			i++;
+		}
+		console.log(`Pausing to find oracle ${oracle} failed`);
+	}
+
+	private async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
 		for (const perpMarket of perpMarkets) {
 			const perpMarketAccount = perpMarket.data;
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
+			if (!this.oracles.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: perpMarketAccount.amm.oracleSource,
+				});
+			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
 	}
 
-	private setSpotOracleMap() {
+	private async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
 		for (const spotMarket of spotMarkets) {
 			const spotMarketAccount = spotMarket.data;
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
+			if (!this.oracles.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: spotMarketAccount.oracleSource,
+				});
+			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
 	}
@@ -481,18 +512,14 @@ export class PollingDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		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();
-			});
+			this.setPerpOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);
@@ -506,14 +533,10 @@ export class PollingDriftClientAccountSubscriber
 		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();
-			});
+			this.setSpotOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -125,8 +125,8 @@ export class WebSocketDriftClientAccountSubscriber
 
 		this.eventEmitter.emit('update');
 
-		this.setPerpOracleMap();
-		this.setSpotOracleMap();
+		await this.setPerpOracleMap();
+		await this.setSpotOracleMap();
 
 		this.isSubscribing = false;
 		this.isSubscribed = true;
@@ -286,7 +286,7 @@ export class WebSocketDriftClientAccountSubscriber
 			return true;
 		}
 		const subscriptionSuccess = this.subscribeToSpotMarketAccount(marketIndex);
-		this.setSpotOracleMap();
+		await this.setSpotOracleMap();
 		return subscriptionSuccess;
 	}
 
@@ -295,7 +295,7 @@ export class WebSocketDriftClientAccountSubscriber
 			return true;
 		}
 		const subscriptionSuccess = this.subscribeToPerpMarketAccount(marketIndex);
-		this.setPerpOracleMap();
+		await this.setPerpOracleMap();
 		return subscriptionSuccess;
 	}
 
@@ -311,7 +311,7 @@ export class WebSocketDriftClientAccountSubscriber
 		return this.subscribeToOracle(oracleInfo);
 	}
 
-	private setPerpOracleMap() {
+	private async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
 		for (const perpMarket of perpMarkets) {
 			if (!perpMarket) {
@@ -320,11 +320,17 @@ export class WebSocketDriftClientAccountSubscriber
 			const perpMarketAccount = perpMarket.data;
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
+			if (!this.oracleSubscribers.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: perpMarket.data.amm.oracleSource,
+				});
+			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
 	}
 
-	private setSpotOracleMap() {
+	private async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
 		for (const spotMarket of spotMarkets) {
 			if (!spotMarket) {
@@ -333,6 +339,12 @@ export class WebSocketDriftClientAccountSubscriber
 			const spotMarketAccount = spotMarket.data;
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
+			if (!this.oracleSubscribers.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: spotMarketAccount.oracleSource,
+				});
+			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
 	}
@@ -400,12 +412,7 @@ export class WebSocketDriftClientAccountSubscriber
 
 		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();
-			});
+			this.setPerpOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);
@@ -422,12 +429,7 @@ export class WebSocketDriftClientAccountSubscriber
 
 		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();
-			});
+			this.setSpotOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);