diff --git a/drift-common b/drift-common index c4853c0..ea47fb9 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit c4853c0d944d4b84a6c19948a50e15675d290e2f +Subproject commit ea47fb97e1a4766267f260768421543fc4b82027 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/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/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/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'; 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/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(); 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"