Merge pull request #97 from drift-labs/master

spot filler fix
drift-labs · Dec 10, 2023 · 41c9719 · 41c9719
2 parents 6a02a0d + 205522a
commit 41c9719
Showing 1 changed file with 38 additions and 17 deletions.
diff --git a/src/bots/spotFiller.ts b/src/bots/spotFiller.ts
@@ -32,6 +32,7 @@ import {
 	TEN,
 	NodeToTrigger,
 	PriorityFeeCalculator,
+	BulkAccountLoader,
 } from '@drift-labs/sdk';
 import { Mutex, tryAcquire, E_ALREADY_LOCKED } from 'async-mutex';
 
@@ -378,29 +379,55 @@ export class SpotFillerBot implements Bot {
 
 		const config = initialize({ env: this.runtimeSpec.driftEnv as DriftEnv });
 		for (const spotMarketConfig of config.SPOT_MARKETS) {
+			let accountSubscription:
+				| {
+						type: 'polling';
+						accountLoader: BulkAccountLoader;
+				  }
+				| {
+						type: 'websocket';
+				  };
+			if (
+				(
+					this.driftClient
+						.accountSubscriber as PollingDriftClientAccountSubscriber
+				).accountLoader
+			) {
+				accountSubscription = {
+					type: 'polling',
+					accountLoader: (
+						this.driftClient
+							.accountSubscriber as PollingDriftClientAccountSubscriber
+					).accountLoader,
+				};
+			} else {
+				accountSubscription = {
+					type: 'websocket',
+				};
+			}
+
 			if (spotMarketConfig.serumMarket) {
 				// set up fulfillment config
 				await this.serumFulfillmentConfigMap.add(
 					spotMarketConfig.marketIndex,
 					spotMarketConfig.serumMarket
 				);
 
-				const serumConfigAccount = this.serumFulfillmentConfigMap.get(
-					spotMarketConfig.marketIndex
-				);
+				// const serumConfigAccount = this.serumFulfillmentConfigMap.get(
+				// 	spotMarketConfig.marketIndex
+				// );
+				const serumConfigAccount =
+					await this.driftClient.getSerumV3FulfillmentConfig(
+						spotMarketConfig.serumMarket
+					);
+
 				if (isVariant(serumConfigAccount.status, 'enabled')) {
 					// set up serum price subscriber
 					const serumSubscriber = new SerumSubscriber({
 						connection: this.driftClient.connection,
 						programId: new PublicKey(config.SERUM_V3),
 						marketAddress: spotMarketConfig.serumMarket,
-						accountSubscription: {
-							type: 'polling',
-							accountLoader: (
-								this.driftClient
-									.accountSubscriber as PollingDriftClientAccountSubscriber
-							).accountLoader,
-						},
+						accountSubscription,
 					});
 					initPromises.push(serumSubscriber.subscribe());
 					this.serumSubscribers.set(
@@ -426,13 +453,7 @@ export class SpotFillerBot implements Bot {
 						connection: this.driftClient.connection,
 						programId: new PublicKey(config.PHOENIX),
 						marketAddress: spotMarketConfig.phoenixMarket,
-						accountSubscription: {
-							type: 'polling',
-							accountLoader: (
-								this.driftClient
-									.accountSubscriber as PollingDriftClientAccountSubscriber
-							).accountLoader,
-						},
+						accountSubscription,
 					});
 					initPromises.push(phoenixSubscriber.subscribe());
 					this.phoenixSubscribers.set(