Merge pull request #270 from drift-labs/master

master -> mainnet

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",

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,

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';
 

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 {

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';

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';

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<boolean> => {
 };
 
 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

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';
 

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';

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();

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"]

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"