From 2aaa6a50c6674ad1bd6e9ac3d6e428ffeaba0e10 Mon Sep 17 00:00:00 2001
From: Nour Alharithi <nour.alharithi@gmail.com>
Date: Thu, 24 Oct 2024 13:43:11 -0700
Subject: [PATCH] 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"