must use order subscriber

src/index.ts

@@ -18,7 +18,6 @@ import {
 	DriftClient,
 	DriftClientSubscriptionConfig,
 	DriftEnv,
-	SlotSource,
 	SlotSubscriber,
 	Wallet,
 	getUserStatsAccountPublicKey,
@@ -52,10 +51,7 @@ import {
 	validateDlobQuery,
 } from './utils/utils';
 import FEATURE_FLAGS from './utils/featureFlags';
-import {
+import { getDLOBProviderFromOrderSubscriber } from './dlobProvider';
-	DLOBProvider,
-	getDLOBProviderFromOrderSubscriber,
-} from './dlobProvider';
 import { RedisClient } from './utils/redisClient';
 
 require('dotenv').config();
@@ -74,8 +70,6 @@ const serverPort = process.env.PORT || 6969;
 export const ORDERBOOK_UPDATE_INTERVAL = 1000;
 const WS_FALLBACK_FETCH_INTERVAL = ORDERBOOK_UPDATE_INTERVAL * 10;
 const useWebsocket = process.env.USE_WEBSOCKET?.toLowerCase() === 'true';
-const useOrderSubscriber =
-	process.env.USE_ORDER_SUBSCRIBER?.toLowerCase() === 'true';
 const rateLimitCallsPerSecond = process.env.RATE_LIMIT_CALLS_PER_SECOND
 	? parseInt(process.env.RATE_LIMIT_CALLS_PER_SECOND)
 	: 1;
@@ -152,7 +146,6 @@ const wsEndpoint = process.env.WS_ENDPOINT;
 logger.info(`RPC endpoint:       ${endpoint}`);
 logger.info(`WS endpoint:        ${wsEndpoint}`);
 logger.info(`useWebsocket:       ${useWebsocket}`);
-logger.info(`useOrderSubscriber: ${useOrderSubscriber}`);
 logger.info(`DriftEnv:           ${driftEnv}`);
 logger.info(`Commit:             ${commitHash}`);
 
@@ -233,7 +226,6 @@ const main = async () => {
 	let slotSubscriber: SlotSubscriber | undefined;
 
 	let accountSubscription: DriftClientSubscriptionConfig;
-	let slotSource: SlotSource;
 
 	if (!useWebsocket) {
 		bulkAccountLoader = new BulkAccountLoader(
@@ -246,7 +238,6 @@ const main = async () => {
 			type: 'polling',
 			accountLoader: bulkAccountLoader,
 		};
-		slotSource = bulkAccountLoader;
 	} else {
 		accountSubscription = {
 			type: 'websocket',
@@ -264,8 +255,6 @@ const main = async () => {
 		env: driftEnv,
 	});
 
-	let dlobProvider: DLOBProvider;
-	if (useOrderSubscriber) {
 	let subscriptionConfig;
 	if (useWebsocket) {
 		subscriptionConfig = {
@@ -296,9 +285,7 @@ const main = async () => {
 		}
 	);
 
-		dlobProvider = getDLOBProviderFromOrderSubscriber(orderSubscriber);
+	const dlobProvider = getDLOBProviderFromOrderSubscriber(orderSubscriber);
-		slotSource = dlobProvider;
-	}
 
 	const dlobCoder = DLOBOrdersCoder.create();
 
@@ -325,7 +312,7 @@ const main = async () => {
 	const dlobSubscriber = new DLOBSubscriber({
 		driftClient,
 		dlobSource: dlobProvider,
-		slotSource,
+		slotSource: dlobProvider,
 		updateFrequency: ORDERBOOK_UPDATE_INTERVAL,
 	});
 	await dlobSubscriber.subscribe();
@@ -361,10 +348,10 @@ const main = async () => {
 
 	app.get(
 		'/health',
-		handleHealthCheck(2 * WS_FALLBACK_FETCH_INTERVAL, slotSource)
+		handleHealthCheck(2 * WS_FALLBACK_FETCH_INTERVAL, dlobProvider)
 	);
 	app.get('/startup', handleStartup);
-	app.get('/', handleHealthCheck(2 * WS_FALLBACK_FETCH_INTERVAL, slotSource));
+	app.get('/', handleHealthCheck(2 * WS_FALLBACK_FETCH_INTERVAL, dlobProvider));
 
 	if (FEATURE_FLAGS.ENABLE_ORDERS_ENDPOINTS) {
 		app.get('/orders/json/raw', async (_req, res, next) => {
@@ -372,7 +359,7 @@ const main = async () => {
 				// object with userAccount key and orders object serialized
 				const orders: Array<any> = [];
 				const oracles: Array<any> = [];
-				const slot = slotSource.getSlot();
+				const slot = dlobProvider.getSlot();
 
 				for (const market of driftClient.getPerpMarketAccounts()) {
 					const oracle = driftClient.getOracleDataForPerpMarket(
@@ -417,7 +404,7 @@ const main = async () => {
 		app.get('/orders/json', async (_req, res, next) => {
 			try {
 				// object with userAccount key and orders object serialized
-				const slot = slotSource.getSlot();
+				const slot = dlobProvider.getSlot();
 				const orders: Array<any> = [];
 				const oracles: Array<any> = [];
 				for (const market of driftClient.getPerpMarketAccounts()) {
@@ -587,7 +574,7 @@ const main = async () => {
 
 				res.end(
 					JSON.stringify({
-						slot: slotSource.getSlot(),
+						slot: dlobProvider.getSlot(),
 						data: dlobCoder.encode(dlobOrders).toString('base64'),
 					})
 				);
@@ -678,7 +665,7 @@ const main = async () => {
 						.getDLOB()
 						.getRestingLimitBids(
 							normedMarketIndex,
-							slotSource.getSlot(),
+							dlobProvider.getSlot(),
 							normedMarketType,
 							oracle
 						)
@@ -689,7 +676,7 @@ const main = async () => {
 						.getDLOB()
 						.getRestingLimitAsks(
 							normedMarketIndex,
-							slotSource.getSlot(),
+							dlobProvider.getSlot(),
 							normedMarketType,
 							oracle
 						)
@@ -763,7 +750,7 @@ const main = async () => {
 					}
 					if (
 						redisL2 &&
-						slotSource.getSlot() - parseInt(JSON.parse(redisL2).slot) < 10
+						dlobProvider.getSlot() - parseInt(JSON.parse(redisL2).slot) < 10
 					)
 						l2Formatted = redisL2;
 				} else if (
@@ -789,7 +776,7 @@ const main = async () => {
 					}
 					if (
 						redisL2 &&
-						slotSource.getSlot() - parseInt(JSON.parse(redisL2).slot) < 10
+						dlobProvider.getSlot() - parseInt(JSON.parse(redisL2).slot) < 10
 					)
 						l2Formatted = redisL2;
 				}
@@ -945,7 +932,7 @@ const main = async () => {
 							}
 							if (redisL2) {
 								const parsedRedisL2 = JSON.parse(redisL2);
-								if (slotSource.getSlot() - parseInt(parsedRedisL2.slot) < 10)
+								if (dlobProvider.getSlot() - parseInt(parsedRedisL2.slot) < 10)
 									l2Formatted = parsedRedisL2;
 							}
 						} else if (
@@ -970,7 +957,7 @@ const main = async () => {
 							}
 							if (redisL2) {
 								const parsedRedisL2 = JSON.parse(redisL2);
-								if (slotSource.getSlot() - parseInt(parsedRedisL2.slot) < 10)
+								if (dlobProvider.getSlot() - parseInt(parsedRedisL2.slot) < 10)
 									l2Formatted = parsedRedisL2;
 							}
 						}