fix: bugs with external data acct subscriber

Author: LukasDeco

sdk/src/accounts/externalOracleDataDriftClientSubscriber.ts renamed to sdk/src/accounts/externalDataDriftClientSubscriber.ts

@@ -8,8 +8,10 @@ import {
 } from '../oracles/types';
 
 import { getOracleId } from '../oracles/oracleId';
+import { DevnetPerpMarkets, MainnetPerpMarkets, PublicKey } from '@drift-labs/sdk';
 
-export class ExternalOracleDataDriftClientSubscriber extends PollingDriftClientAccountSubscriber {
+// allowing app UI state to mixin and replace with RPC polled data
+export class ExternalDataDriftClientSubscriber extends PollingDriftClientAccountSubscriber {
 	private oracleLastUpdate = new Map<string, number>();
 	private pollingOracles = new Map<string, boolean>();
 	private oraclePollIntervalId: NodeJS.Timeout;
@@ -26,6 +28,9 @@ export class ExternalOracleDataDriftClientSubscriber extends PollingDriftClientA
 
 	/** Public method to be called externally with fresh oracle data */
 	public feedOracle(oracleInfo: OracleInfo, priceData: OraclePriceData, slot: number) {
+		if(oracleInfo.publicKey.equals(new PublicKey("BtUUSUc9rZSzBmmKhQq4no65zHQTzMFeVYss7xcMRD53"))) {
+			console.log("feedOracle Republican popular vote", oracleInfo.publicKey.toBase58(), oracleInfo.source);
+		}
 		const oracleId = getOracleId(oracleInfo.publicKey, oracleInfo.source);
 		this.oracles.set(oracleId, { data: priceData, slot });
 		this.oracleLastUpdate.set(oracleId, Date.now());
@@ -43,37 +48,32 @@ export class ExternalOracleDataDriftClientSubscriber extends PollingDriftClientA
 
 	public override async subscribe(): Promise<boolean> {
 		await super.subscribe();
-		this.removeAllOraclesFromAccountLoader();
 		this.startOraclePollingWatchdog();
 		return true;
 	}
 
 	private startOraclePollingWatchdog() {
+		if(this.oraclePollIntervalId) {
+			clearInterval(this.oraclePollIntervalId);
+		}
 		// how do we handle not polling bet markets every 1s from this change?
 		this.oraclePollIntervalId = setInterval(async () => {
-			for (const [oracleId, oracleToPoll] of this.oraclesToPoll.entries()) {
-				const lastUpdate = this.oracleLastUpdate.get(oracleId) || 0;
+			for (const [oracleId, lastUpdate] of this.oracleLastUpdate.entries()) {
+				const oracleToPoll = this.oraclesToPoll.get(oracleId);
+				if(!oracleToPoll) continue;
 				const now = Date.now();
-				if (now - lastUpdate > 70_000 && !this.pollingOracles.has(oracleId)) {
+				if (now - lastUpdate > 130_000 && !this.pollingOracles.has(oracleId)) {
+					const market = [...DevnetPerpMarkets, ...MainnetPerpMarkets].find(m => m.oracle.equals(oracleToPoll.publicKey));
+					if(oracleToPoll.publicKey.equals(new PublicKey("BtUUSUc9rZSzBmmKhQq4no65zHQTzMFeVYss7xcMRD53"))) {
+						console.log("startOraclePollingWatchdog timeout  fallback Republican popular vote", oracleToPoll.publicKey.toBase58(), market?.symbol);
+					}
 					await this.addOracleToAccountLoader(oracleToPoll);
 					this.pollingOracles.set(oracleId, true);
 				}
 			}
 		}, 60_000);
 	}
 
-	public removeAllOraclesFromAccountLoader() {
-		for (const oracleInfo of this.oracleInfos) {
-			const existingAccountToLoad = this.accountLoader.accountsToLoad.get(oracleInfo.publicKey.toString());
-			if (existingAccountToLoad) {
-				// console.log('ORACLEDATA remove from account loader', oracleInfo.publicKey.toBase58());
-				for (const [callbackId] of existingAccountToLoad.callbacks) {
-					this.accountLoader.removeAccount(oracleInfo.publicKey, callbackId);
-				}
-			}
-		}
-	}
-
 	public override async unsubscribe(): Promise<void> {
 		clearInterval(this.oraclePollIntervalId);
 		await super.unsubscribe();

sdk/src/index.ts

@@ -16,7 +16,7 @@ export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
 export { CustomizedCadenceBulkAccountLoader } from './accounts/customizedCadenceBulkAccountLoader';
-export { ExternalOracleDataDriftClientSubscriber } from './accounts/externalOracleDataDriftClientSubscriber';
+export { ExternalDataDriftClientSubscriber } from './accounts/externalDataDriftClientSubscriber';
 export * from './accounts/pollingDriftClientAccountSubscriber';
 export * from './accounts/pollingOracleAccountSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';