more temp

Author: LukasDeco

sdk/src/accounts/bulkAccountLoader.ts

@@ -121,9 +121,10 @@ export class BulkAccountLoader {
 		this.lastTimeLoadingPromiseCleared = Date.now();
 
 		try {
+			const acctsArray = Array.from(this.accountsToLoad.values());
 			const chunks = this.chunks(
 				this.chunks(
-					Array.from(this.accountsToLoad.values()),
+					acctsArray,
 					GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
 				),
 				10

sdk/src/accounts/customizedCadenceBulkAccountLoader.ts

@@ -55,6 +55,54 @@ export class CustomizedCadenceBulkAccountLoader extends BulkAccountLoader {
 
 	private async handleAccountLoading(): Promise<void> {
 		const accounts = this.getAccountsToLoad();
+		console.log('ORACLEDATA handleAccountLoading', accounts.length);
+
+		const oracleAddresses = [
+			'3m6i4RFWEDw2Ft4tFHPJtYgmpPe21k56M3FHeWYrgGBz', // SOL
+			'35MbvS1Juz2wf7GsyHrkCw8yfKciRLxVpEhfZDZFrB4R', // BTC
+			'93FG52TzNKCnMiasV14Ba34BYcHDb9p4zK4GjZnLwqWR', // ETH
+			'CXZhzKePYajrZgZyrzgvHYFKK3c5tNgDrRobAgySo8Nb', // APT
+			'BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4', // BONK
+			'HDveCibToLf157NtUqShCEWX3GcF4Aq8Ngt2bst1s1cc', // POL
+			'r8eNLQ8jysUyk9rrWXuicwAoKZ7V3YngAB6737zfxmv', // BERA
+			'8M8mjNJ42k2Xi12Q1zRnQRC3xhggu3WGuftiu5VZZmsF', // KAITO
+			'AZVVDFve8ijzLAm9z6W53GFsoWbcycFsdxCL7WUjMz8S', // IP
+			'2sZomfWMDuQLcFak3nuharXorHrZ3hK8iaML6ZGSHtso', // FARTCOIN
+			'55722FS8VeAxRghz5h2ARJvNjkFiHyzkZ9BF7CEQWN6E', // ADA
+		];
+
+		const oracleMatches = accounts.filter(account => 
+			oracleAddresses.some(addr => 
+				account.publicKey.toBase58().includes(addr)
+			)
+		);
+
+		console.log('ORACLEDATA loading oracle accounts:', oracleMatches.length);
+		console.log('ORACLEDATA oracle pubkeys found:', 
+			oracleMatches.map(account => {
+				const pubkey = account.publicKey.toBase58();
+				let marketName = '';
+				if (pubkey.includes('3m6i4RFWEDw2Ft4tFHPJtYgmpPe21k56M3FHeWYrgGBz')) marketName = 'SOL';
+				else if (pubkey.includes('35MbvS1Juz2wf7GsyHrkCw8yfKciRLxVpEhfZDZFrB4R')) marketName = 'BTC';
+				else if (pubkey.includes('93FG52TzNKCnMiasV14Ba34BYcHDb9p4zK4GjZnLwqWR')) marketName = 'ETH';
+				else if (pubkey.includes('CXZhzKePYajrZgZyrzgvHYFKK3c5tNgDrRobAgySo8Nb')) marketName = 'APT';
+				else if (pubkey.includes('BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4')) marketName = 'BONK';
+				else if (pubkey.includes('HDveCibToLf157NtUqShCEWX3GcF4Aq8Ngt2bst1s1cc')) marketName = 'POL';
+				else if (pubkey.includes('r8eNLQ8jysUyk9rrWXuicwAoKZ7V3YngAB6737zfxmv')) marketName = 'BERA';
+				else if (pubkey.includes('8M8mjNJ42k2Xi12Q1zRnQRC3xhggu3WGuftiu5VZZmsF')) marketName = 'KAITO';
+				else if (pubkey.includes('AZVVDFve8ijzLAm9z6W53GFsoWbcycFsdxCL7WUjMz8S')) marketName = 'IP';
+				else if (pubkey.includes('2sZomfWMDuQLcFak3nuharXorHrZ3hK8iaML6ZGSHtso')) marketName = 'FARTCOIN';
+				else if (pubkey.includes('55722FS8VeAxRghz5h2ARJvNjkFiHyzkZ9BF7CEQWN6E')) marketName = 'ADA';
+				return `${marketName} (${pubkey})`;
+			})
+		);
+		const hasBonkOracle = accounts.some((account) =>
+			account.publicKey.toBase58().includes(
+				'BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4'
+			)
+		);
+		// console.log('ORACLEDATA loading accounts hasBonkOracle', hasBonkOracle);
+		console.log('ORACLEDATA loading accounts', accounts.map((account) => account.publicKey.toBase58()));
 
 		if (accounts.length > 0) {
 			const chunks = this.chunks(

sdk/src/accounts/externalOracleDataDriftClientSubscriber.ts

@@ -26,7 +26,6 @@ export class ExternalOracleDataDriftClientSubscriber extends PollingDriftClientA
 
 	/** 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());
@@ -51,24 +50,24 @@ export class ExternalOracleDataDriftClientSubscriber extends PollingDriftClientA
 	}
 
 	private startOraclePollingWatchdog() {
+		// 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;
 				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);
+		}, 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());
+				// console.log('ORACLEDATA remove from account loader', oracleInfo.publicKey.toBase58());
 				for (const [callbackId] of existingAccountToLoad.callbacks) {
 					this.accountLoader.removeAccount(oracleInfo.publicKey, callbackId);
 				}