From 891273b3e96bd4f88a366f1b1e77aa2144e8af43 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 21 Nov 2024 09:20:00 -0500 Subject: [PATCH 1/6] removing triton from redis client path --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index e275b8d..ccb4aaf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -63,7 +63,7 @@ setGlobalDispatcher( require('dotenv').config(); // Reading in Redis env vars -const REDIS_CLIENTS = [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; +const REDIS_CLIENTS = [RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; From e1691dd0f879b07d5b4d4e31856c86cfd4c5a5e0 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 21 Nov 2024 09:35:56 -0500 Subject: [PATCH 2/6] replace helius on dlob server --- drift-common | 2 +- src/wsConnectionManager.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drift-common b/drift-common index 3917402..957d258 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 3917402307194fa6d992c1d749513cb89317c889 +Subproject commit 957d258575b002be6173af1341838f76154b9e20 diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts index 194f045..01ba6d7 100644 --- a/src/wsConnectionManager.ts +++ b/src/wsConnectionManager.ts @@ -34,7 +34,7 @@ const WS_PORT = process.env.WS_PORT || '3000'; console.log(`WS LISTENER PORT : ${WS_PORT}`); const MAX_BUFFERED_AMOUNT = 300000; -const CHANNEL_PREFIX = RedisClientPrefix.DLOB; +const CHANNEL_PREFIX = RedisClientPrefix.DLOB_HELIUS; const CHANNEL_PREFIX_HELIUS = RedisClientPrefix.DLOB_HELIUS; const sanitiseChannelForClient = (channel: string | undefined): string => { From bf4f23595c212744f052452cbd13919f32ddc1c8 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 21 Nov 2024 11:05:40 -0500 Subject: [PATCH 3/6] bump drift common --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 957d258..8178bc7 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 957d258575b002be6173af1341838f76154b9e20 +Subproject commit 8178bc7515ef09c51290c1463bf7eba3c28de214 From 17c68e2923edb25d4bfd2db72bc0af41a9da5080 Mon Sep 17 00:00:00 2001 From: Jack Waller Date: Thu, 21 Nov 2024 11:57:45 -0500 Subject: [PATCH 4/6] chore: update helius trades --- src/publishers/tradesPublisher.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts index 28dab5b..a625bd4 100644 --- a/src/publishers/tradesPublisher.ts +++ b/src/publishers/tradesPublisher.ts @@ -36,7 +36,7 @@ setGlobalDispatcher( require('dotenv').config(); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; const commitHash = process.env.COMMIT; -const redisClientPrefix = RedisClientPrefix.DLOB; +const redisClientPrefix = RedisClientPrefix.DLOB_HELIUS; //@ts-ignore const sdkConfig = initialize({ env: process.env.ENV }); From 7ed81ef12845e0e3837e2ba6d6aee38f7a7ac0b9 Mon Sep 17 00:00:00 2001 From: Jack Waller Date: Thu, 21 Nov 2024 12:50:24 -0500 Subject: [PATCH 5/6] chore: add redis env vars to mainnet --- src/index.ts | 10 ++++++++-- src/publishers/tradesPublisher.ts | 4 +++- src/serverLite.ts | 9 ++++++++- src/wsConnectionManager.ts | 4 +++- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index ccb4aaf..a4ebfed 100644 --- a/src/index.ts +++ b/src/index.ts @@ -62,8 +62,14 @@ setGlobalDispatcher( require('dotenv').config(); -// Reading in Redis env vars -const REDIS_CLIENTS = [RedisClientPrefix.DLOB_HELIUS]; +const envClients = []; +const clients = process.env.REDIS_CLIENT.trim() + .replace(/^\[|\]$/g, '') + .split(/\s*,\s*/); + +clients.forEach((client) => envClients.push(RedisClientPrefix[client])); + +const REDIS_CLIENTS = envClients.length ? envClients : [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts index a625bd4..3f75af3 100644 --- a/src/publishers/tradesPublisher.ts +++ b/src/publishers/tradesPublisher.ts @@ -36,7 +36,9 @@ setGlobalDispatcher( require('dotenv').config(); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; const commitHash = process.env.COMMIT; -const redisClientPrefix = RedisClientPrefix.DLOB_HELIUS; +const REDIS_CLIENT = process.env.REDIS_CLIENT || 'DLOB'; +console.log('Redis Clients:', REDIS_CLIENT); +const redisClientPrefix = RedisClientPrefix[REDIS_CLIENT]; //@ts-ignore const sdkConfig = initialize({ env: process.env.ENV }); diff --git a/src/serverLite.ts b/src/serverLite.ts index 7d65dbb..9ab8e30 100644 --- a/src/serverLite.ts +++ b/src/serverLite.ts @@ -38,7 +38,14 @@ setGlobalDispatcher( require('dotenv').config(); // Reading in Redis env vars -const REDIS_CLIENTS = [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; +const envClients = []; +const clients = process.env.REDIS_CLIENT.trim() + .replace(/^\[|\]$/g, '') + .split(/\s*,\s*/); + +clients.forEach((client) => envClients.push(RedisClientPrefix[client])); + +const REDIS_CLIENTS = envClients.length ? envClients : [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS); const driftEnv = (process.env.ENV || 'devnet') as DriftEnv; diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts index 01ba6d7..bc7c3ef 100644 --- a/src/wsConnectionManager.ts +++ b/src/wsConnectionManager.ts @@ -34,7 +34,9 @@ const WS_PORT = process.env.WS_PORT || '3000'; console.log(`WS LISTENER PORT : ${WS_PORT}`); const MAX_BUFFERED_AMOUNT = 300000; -const CHANNEL_PREFIX = RedisClientPrefix.DLOB_HELIUS; +const REDIS_CLIENT = process.env.REDIS_CLIENT || 'DLOB'; +const CHANNEL_PREFIX = RedisClientPrefix[REDIS_CLIENT]; +console.log('Redis Clients:', REDIS_CLIENT); const CHANNEL_PREFIX_HELIUS = RedisClientPrefix.DLOB_HELIUS; const sanitiseChannelForClient = (channel: string | undefined): string => { From bee384f3ce9b53ed8a011ceecd60d9a9c252dd4a Mon Sep 17 00:00:00 2001 From: Jack Waller Date: Thu, 21 Nov 2024 13:04:06 -0500 Subject: [PATCH 6/6] chore: null checks --- src/index.ts | 4 ++-- src/serverLite.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index a4ebfed..4214c4b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -63,11 +63,11 @@ setGlobalDispatcher( require('dotenv').config(); const envClients = []; -const clients = process.env.REDIS_CLIENT.trim() +const clients = process.env.REDIS_CLIENT?.trim() .replace(/^\[|\]$/g, '') .split(/\s*,\s*/); -clients.forEach((client) => envClients.push(RedisClientPrefix[client])); +clients?.forEach((client) => envClients.push(RedisClientPrefix[client])); const REDIS_CLIENTS = envClients.length ? envClients : [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS); diff --git a/src/serverLite.ts b/src/serverLite.ts index 9ab8e30..d2e4024 100644 --- a/src/serverLite.ts +++ b/src/serverLite.ts @@ -39,11 +39,11 @@ require('dotenv').config(); // Reading in Redis env vars const envClients = []; -const clients = process.env.REDIS_CLIENT.trim() +const clients = process.env.REDIS_CLIENT?.trim() .replace(/^\[|\]$/g, '') .split(/\s*,\s*/); -clients.forEach((client) => envClients.push(RedisClientPrefix[client])); +clients?.forEach((client) => envClients.push(RedisClientPrefix[client])); const REDIS_CLIENTS = envClients.length ? envClients : [RedisClientPrefix.DLOB, RedisClientPrefix.DLOB_HELIUS]; console.log('Redis Clients:', REDIS_CLIENTS);