From 45848659dc756e5cfc428caece35632ed1f3e4e1 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 20:57:12 +0000 Subject: [PATCH 01/18] Bumping drift-common to ef10738f86faa313005534444c30e4d4c039b61c --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 761577b..ef10738 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 761577b59b489bba1a27062489285ed97c587689 +Subproject commit ef10738f86faa313005534444c30e4d4c039b61c From 8a6d8eb4357108d15b7bcd679a54a64640b88adf Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:53:53 +0000 Subject: [PATCH 02/18] Bumping drift-common to 207d3e1e62eb7d2cfa8b30e50261b865b14ddc83 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index ef10738..207d3e1 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit ef10738f86faa313005534444c30e4d4c039b61c +Subproject commit 207d3e1e62eb7d2cfa8b30e50261b865b14ddc83 From 4299de59074f14d10dbf5095752d42d03cd6a3f1 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 18:38:43 +0000 Subject: [PATCH 03/18] Bumping drift-common to 1d908ba53afc6e14374b37d7b71a71147954564c --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 207d3e1..1d908ba 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 207d3e1e62eb7d2cfa8b30e50261b865b14ddc83 +Subproject commit 1d908ba53afc6e14374b37d7b71a71147954564c From e16725705955f0f69f34a48898efc59a9dffa28d Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:23:15 +0000 Subject: [PATCH 04/18] Bumping drift-common to 994b4f142fcc3922aa9ff34a93c4714ac72effa6 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 1d908ba..994b4f1 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 1d908ba53afc6e14374b37d7b71a71147954564c +Subproject commit 994b4f142fcc3922aa9ff34a93c4714ac72effa6 From 2aaa6a50c6674ad1bd6e9ac3d6e428ffeaba0e10 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 24 Oct 2024 13:43:11 -0700 Subject: [PATCH 05/18] bump to new drift common --- drift-common | 2 +- package.json | 2 +- src/index.ts | 2 +- src/utils/utils.ts | 2 +- tsconfig.json | 5 ++++- yarn.lock | 17 +---------------- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/drift-common b/drift-common index 994b4f1..957d258 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 994b4f142fcc3922aa9ff34a93c4714ac72effa6 +Subproject commit 957d258575b002be6173af1341838f76154b9e20 diff --git a/package.json b/package.json index c2f06c5..a516fc1 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "cors": "^2.8.5", "dotenv": "^10.0.0", "express": "^4.18.2", - "ioredis": "^5.3.2", + "ioredis": "^5.4.1", "morgan": "^1.10.0", "prom-client": "^15.0.0", "redis": "^4.6.10", diff --git a/src/index.ts b/src/index.ts index e3a13e3..e275b8d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -24,7 +24,7 @@ import { PerpOperation, DelistedMarketSetting, } from '@drift-labs/sdk'; -import { RedisClient, RedisClientPrefix } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; import { logger, setLogLevel } from './utils/logger'; diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 9946459..d984f78 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -13,7 +13,7 @@ import { decodeUser, isVariant, } from '@drift-labs/sdk'; -import { RedisClient } from '@drift/common'; +import { RedisClient } from '@drift/common/clients'; import { logger } from './logger'; import { NextFunction, Request, Response } from 'express'; diff --git a/tsconfig.json b/tsconfig.json index 66b35ea..f66b911 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,10 @@ "emitDecoratorMetadata": true, "baseUrl": ".", "rootDir": "src", - "outDir": "./lib" + "outDir": "./lib", + "paths": { + "@drift/common/clients": ["./drift-common/common-ts/lib/clients"], + } }, "include": ["src/**/*"], "exclude": ["node_modules"] diff --git a/yarn.lock b/yarn.lock index 0068cf9..d616eaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -484,7 +484,7 @@ "@drift/common@file:./drift-common/common-ts": version "1.0.0" dependencies: - "@drift-labs/sdk" "file:../../Library/Caches/Yarn/v6/npm-@drift-common-1.0.0-66ae29fc-f764-4f8c-951d-c0993d2ea55f-1728326228912/node_modules/@drift/protocol/sdk" + "@drift-labs/sdk" "file:../../Library/Caches/Yarn/v6/npm-@drift-common-1.0.0-79940387-1595-4bdc-b73c-2bd48440a03a-1729802406625/node_modules/@drift/protocol/sdk" "@jest/globals" "^29.3.1" "@slack/web-api" "^6.4.0" "@solana/spl-token" "^0.3.8" @@ -4373,21 +4373,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ioredis@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.2.tgz#9139f596f62fc9c72d873353ac5395bcf05709f7" - integrity sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA== - dependencies: - "@ioredis/commands" "^1.1.1" - cluster-key-slot "^1.1.0" - debug "^4.3.4" - denque "^2.1.0" - lodash.defaults "^4.2.0" - lodash.isarguments "^3.1.0" - redis-errors "^1.2.0" - redis-parser "^3.0.0" - standard-as-callback "^2.1.0" - ioredis@^5.4.1: version "5.4.1" resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.4.1.tgz#1c56b70b759f01465913887375ed809134296f40" From 61e6854f3061fea08c6dfa18350a80d97ad563fc Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 24 Oct 2024 13:46:47 -0700 Subject: [PATCH 06/18] switch over more redis clients to drift common clients --- src/dlob-subscriber/DLOBSubscriberIO.ts | 2 +- src/publishers/dlobPublisher.ts | 2 +- src/publishers/priorityFeesPublisher.ts | 2 +- src/publishers/tradesPublisher.ts | 2 +- src/scripts/publishUnsettledPnlUsers.ts | 7 ++++--- src/serverLite.ts | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/dlob-subscriber/DLOBSubscriberIO.ts b/src/dlob-subscriber/DLOBSubscriberIO.ts index d288dd1..7d8a4aa 100644 --- a/src/dlob-subscriber/DLOBSubscriberIO.ts +++ b/src/dlob-subscriber/DLOBSubscriberIO.ts @@ -9,7 +9,7 @@ import { isOperationPaused, isVariant, } from '@drift-labs/sdk'; -import { RedisClient } from '@drift/common'; +import { RedisClient } from '@drift/common/clients'; import { logger } from '../utils/logger'; import { SubscriberLookup, diff --git a/src/publishers/dlobPublisher.ts b/src/publishers/dlobPublisher.ts index 7e024b9..b79af54 100644 --- a/src/publishers/dlobPublisher.ts +++ b/src/publishers/dlobPublisher.ts @@ -19,7 +19,7 @@ import { SpotMarketConfig, PhoenixSubscriber, } from '@drift-labs/sdk'; -import { RedisClient, RedisClientPrefix } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; import { logger, setLogLevel } from '../utils/logger'; import { diff --git a/src/publishers/priorityFeesPublisher.ts b/src/publishers/priorityFeesPublisher.ts index 0b142b6..e53bac6 100644 --- a/src/publishers/priorityFeesPublisher.ts +++ b/src/publishers/priorityFeesPublisher.ts @@ -10,7 +10,7 @@ import { BulkAccountLoader, getMarketsAndOraclesForSubscription, } from '@drift-labs/sdk'; -import { RedisClient, RedisClientPrefix } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; import { logger, setLogLevel } from '../utils/logger'; import { sleep } from '../utils/utils'; diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts index a7a9982..28dab5b 100644 --- a/src/publishers/tradesPublisher.ts +++ b/src/publishers/tradesPublisher.ts @@ -20,7 +20,7 @@ import { OrderActionRecord, Event, } from '@drift-labs/sdk'; -import { RedisClient, RedisClientPrefix } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; import { logger, setLogLevel } from '../utils/logger'; import { sleep } from '../utils/utils'; diff --git a/src/scripts/publishUnsettledPnlUsers.ts b/src/scripts/publishUnsettledPnlUsers.ts index d1cac5a..042c829 100644 --- a/src/scripts/publishUnsettledPnlUsers.ts +++ b/src/scripts/publishUnsettledPnlUsers.ts @@ -1,4 +1,5 @@ -import { RedisClient, RedisClientPrefix, sleep } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; +import { sleep } from '@drift/common'; import { BigNum, DriftClient, @@ -156,7 +157,7 @@ const writeToDlobRedis = async (userPnlMap: UserPnlMap): Promise => { }; const createMarketPnlLeaderboards = (allPnlUsers: AllPnlUsers): UserPnlMap => { - let pnlMap = {}; + const pnlMap = {}; Object.keys(allPnlUsers).forEach((perpMarketIndex) => { try { @@ -187,7 +188,7 @@ const buildUserMarketLists = ( redisUsers: { user: User; bufferString: string }[], allPnlUsers: AllPnlUsers ): AllPnlUsers => { - let newPnlUsers = allPnlUsers; + const newPnlUsers = allPnlUsers; const usdcSpotMarket = driftClient.getSpotMarketAccount( QUOTE_SPOT_MARKET_INDEX diff --git a/src/serverLite.ts b/src/serverLite.ts index 5ab19af..7d65dbb 100644 --- a/src/serverLite.ts +++ b/src/serverLite.ts @@ -14,7 +14,7 @@ import { MarketType, getVariant, } from '@drift-labs/sdk'; -import { RedisClient, RedisClientPrefix } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; import { logger, setLogLevel } from './utils/logger'; From 22a863ef6ecd0cbbe9ff5f9cbbbf0f0a3cabda6b Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 24 Oct 2024 13:47:31 -0700 Subject: [PATCH 07/18] more redis --- src/wsConnectionManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wsConnectionManager.ts b/src/wsConnectionManager.ts index b65b29d..194f045 100644 --- a/src/wsConnectionManager.ts +++ b/src/wsConnectionManager.ts @@ -6,7 +6,7 @@ import { WebSocket, WebSocketServer } from 'ws'; import { sleep } from './utils/utils'; import { register, Gauge } from 'prom-client'; import { DriftEnv, PerpMarkets, SpotMarkets } from '@drift-labs/sdk'; -import { RedisClient, RedisClientPrefix } from '@drift/common'; +import { RedisClient, RedisClientPrefix } from '@drift/common/clients'; // Set up env constants require('dotenv').config(); From 04cffa68a98b6b22572f8ab391bfc370f92b979d Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:56:08 +0000 Subject: [PATCH 08/18] Bumping drift-common to 474e14ee276ca5f68d92c709397b39426837ce66 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 957d258..474e14e 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 957d258575b002be6173af1341838f76154b9e20 +Subproject commit 474e14ee276ca5f68d92c709397b39426837ce66 From 668b82b9df2c76a87bc71658301c804de358b38b Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 17:19:47 +0000 Subject: [PATCH 09/18] Bumping drift-common to 1efa5ad5066649ef9d3f55101018d52609338499 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 474e14e..1efa5ad 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 474e14ee276ca5f68d92c709397b39426837ce66 +Subproject commit 1efa5ad5066649ef9d3f55101018d52609338499 From 6c8d897e7dd4458ceed03f9bba82178f760c7f9a Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:08:59 +0000 Subject: [PATCH 10/18] Bumping drift-common to c16571bc95be33b0679c930ff5943f6a41c9f195 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 1efa5ad..c16571b 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 1efa5ad5066649ef9d3f55101018d52609338499 +Subproject commit c16571bc95be33b0679c930ff5943f6a41c9f195 From b9e5473edfa1e5319a60e026da33d97e235a4452 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:36:07 +0000 Subject: [PATCH 11/18] Bumping drift-common to 4297434d5de6190366936a6647f2f777a1b97d2f --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index c16571b..4297434 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit c16571bc95be33b0679c930ff5943f6a41c9f195 +Subproject commit 4297434d5de6190366936a6647f2f777a1b97d2f From b950bd7cb233e2e8dac5d92186e0014b94231615 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 20:09:14 +0000 Subject: [PATCH 12/18] Bumping drift-common to cd7e521984996a0ad81a4d3f6c256ee149e77fe6 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 4297434..cd7e521 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 4297434d5de6190366936a6647f2f777a1b97d2f +Subproject commit cd7e521984996a0ad81a4d3f6c256ee149e77fe6 From 32e30e8defb1283ee261bd1822cf162c20a0b4d4 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:25:50 +0000 Subject: [PATCH 13/18] Bumping drift-common to a1a6d0cfd7c86aae44dd4428bd5a376637206a80 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index cd7e521..a1a6d0c 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit cd7e521984996a0ad81a4d3f6c256ee149e77fe6 +Subproject commit a1a6d0cfd7c86aae44dd4428bd5a376637206a80 From 2384afa1226f0d4ec92a86e9bb8759ddb830a912 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:04:47 +0000 Subject: [PATCH 14/18] Bumping drift-common to e6688194152ed4fb937c4a31f9010ac1e00b3964 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index a1a6d0c..e668819 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit a1a6d0cfd7c86aae44dd4428bd5a376637206a80 +Subproject commit e6688194152ed4fb937c4a31f9010ac1e00b3964 From 2ab2457ebb55437a905b278c640390e4c802ebf5 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:56:38 +0000 Subject: [PATCH 15/18] Bumping drift-common to acfe94f9fd07e6652f97d37740791ec9a2177b72 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index e668819..acfe94f 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit e6688194152ed4fb937c4a31f9010ac1e00b3964 +Subproject commit acfe94f9fd07e6652f97d37740791ec9a2177b72 From b415206ff2efc6147e28508583e9283d7e9354ca Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 23:31:54 +0000 Subject: [PATCH 16/18] Bumping drift-common to 8a254a07dead7a59c6c672305155a6fa1718b38e --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index acfe94f..8a254a0 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit acfe94f9fd07e6652f97d37740791ec9a2177b72 +Subproject commit 8a254a07dead7a59c6c672305155a6fa1718b38e From a505f3e4bac41aa054c13f938d0955c31b81d051 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 19:36:39 +0000 Subject: [PATCH 17/18] Bumping drift-common to 041fdf2b6284d0a9a0b12fd92d99296a97c6c406 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 8a254a0..041fdf2 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 8a254a07dead7a59c6c672305155a6fa1718b38e +Subproject commit 041fdf2b6284d0a9a0b12fd92d99296a97c6c406 From 52ac715b855d354ff6952039e3a2cbe87569c560 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 23:51:03 +0000 Subject: [PATCH 18/18] Bumping drift-common to ea47fb97e1a4766267f260768421543fc4b82027 --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 041fdf2..ea47fb9 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 041fdf2b6284d0a9a0b12fd92d99296a97c6c406 +Subproject commit ea47fb97e1a4766267f260768421543fc4b82027