feat: temp

Author: LukasDeco

sdk/src/accounts/externalOracleDataDriftClientSubscriber.ts

@@ -0,0 +1,85 @@
+import {
+	PollingDriftClientAccountSubscriber
+} from './pollingDriftClientAccountSubscriber';
+
+import {
+	OraclePriceData,
+	OracleInfo
+} from '../oracles/types';
+
+import { getOracleId } from '../oracles/oracleId';
+
+export class ExternalOracleDataDriftClientSubscriber extends PollingDriftClientAccountSubscriber {
+	private oracleLastUpdate = new Map<string, number>();
+	private pollingOracles = new Map<string, boolean>();
+	private oraclePollIntervalId: NodeJS.Timeout;
+
+	constructor(...args: ConstructorParameters<typeof PollingDriftClientAccountSubscriber>) {
+		super(...args);
+		
+	}
+
+	/** Override to prevent oracles from being automatically polled later */
+	public override updateOraclesToPoll(): boolean {
+		return true;
+	}
+
+	/** Public method to be called externally with fresh oracle data */
+	public feedOracle(oracleInfo: OracleInfo, priceData: OraclePriceData, slot: number) {
+		console.log('ORACLEDATA feedOracle');
+		const oracleId = getOracleId(oracleInfo.publicKey, oracleInfo.source);
+		this.oracles.set(oracleId, { data: priceData, slot });
+		this.oracleLastUpdate.set(oracleId, Date.now());
+
+		if (this.pollingOracles.has(oracleId)) {
+			const oracleToPoll = this.oraclesToPoll.get(oracleId);
+			if (oracleToPoll) {
+				this.accountLoader.removeAccount(
+					oracleToPoll.publicKey,
+					oracleToPoll.callbackId
+				);
+				this.pollingOracles.delete(oracleId);
+			}
+		}
+	}
+
+	public override async subscribe(): Promise<boolean> {
+		await super.subscribe();
+		this.removeAllOraclesFromAccountLoader();
+		this.startOraclePollingWatchdog();
+		return true;
+	}
+
+	private startOraclePollingWatchdog() {
+		this.oraclePollIntervalId = setInterval(async () => {
+			for (const [oracleId, oracleToPoll] of this.oraclesToPoll.entries()) {
+				const lastUpdate = this.oracleLastUpdate.get(oracleId) || 0;
+				const now = Date.now();
+				if (now - lastUpdate > 70_000 && !this.pollingOracles.has(oracleId)) {
+					console.log('ORACLEDATA polling oracle via RPC', oracleToPoll.publicKey.toBase58());
+					await this.addOracleToAccountLoader(oracleToPoll);
+					this.pollingOracles.set(oracleId, true);
+				}
+			}
+		}, 70_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();
+		this.oracleLastUpdate.clear();
+		this.pollingOracles.clear();
+	}
+}

sdk/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -91,6 +91,7 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	public async subscribe(): Promise<boolean> {
+		console.log('ORACLEDATA subscribe on PollingDriftClientAccountSubscriber');
 		if (this.isSubscribed) {
 			return true;
 		}
@@ -212,8 +213,10 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	updateOraclesToPoll(): boolean {
+		console.log('ORACLEDATA updateOraclesToPoll');
 		for (const oracleInfo of this.oracleInfos) {
 			if (!oracleInfo.publicKey.equals(PublicKey.default)) {
+				console.log('ORACLEDATA updateOraclesToPoll', oracleInfo.publicKey.toBase58());
 				this.addOracleToPoll(oracleInfo);
 			}
 		}
@@ -222,6 +225,7 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	addOracleToPoll(oracleInfo: OracleInfo): boolean {
+		console.log('ORACLEDATA addOracleToPoll', oracleInfo.publicKey.toBase58());
 		this.oraclesToPoll.set(
 			getOracleId(oracleInfo.publicKey, oracleInfo.source),
 			{
@@ -240,6 +244,7 @@ export class PollingDriftClientAccountSubscriber
 
 		const oraclePromises = [];
 		for (const [_, oracleToPoll] of this.oraclesToPoll) {
+			console.log('ORACLEDATA  oraclePromises addOracleToPoll', oracleToPoll.publicKey.toBase58());
 			oraclePromises.push(this.addOracleToAccountLoader(oracleToPoll));
 		}
 
@@ -382,6 +387,7 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	public async unsubscribe(): Promise<void> {
+		console.log('ORACLEDATA unsubscribe');
 		for (const [_, accountToPoll] of this.accountsToPoll) {
 			this.accountLoader.removeAccount(
 				accountToPoll.publicKey,
@@ -546,8 +552,13 @@ export class PollingDriftClientAccountSubscriber
 
 		for (const oracle of oracles) {
 			const oracleId = getOracleId(oracle.publicKey, oracle.source);
-			const callbackId = this.oraclesToPoll.get(oracleId).callbackId;
-			this.accountLoader.removeAccount(oracle.publicKey, callbackId);
+			const oracleToPoll = this.oraclesToPoll.get(oracleId);
+			if (oracleToPoll) {
+				this.accountLoader.removeAccount(
+					oracleToPoll.publicKey,
+					oracleToPoll.callbackId
+				);
+			}
 			if (this.delistedMarketSetting === DelistedMarketSetting.Discard) {
 				this.oracles.delete(oracleId);
 			}

sdk/src/index.ts

@@ -16,6 +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 * from './accounts/pollingDriftClientAccountSubscriber';
 export * from './accounts/pollingOracleAccountSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';