From 655985bbfbecd5c43317f1ca85327a5303839787 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:40:53 +0000 Subject: [PATCH 01/11] Bumping sdk dependency to 2.49.0-beta.3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ab6338f..aef4880 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.2", + "@drift-labs/sdk": "2.49.0-beta.3", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index e1ec0cd..a4d3ec2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.2": - version "2.49.0-beta.2" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.2.tgz#aa5182789699dd70e53890989c4f73be9accb8cc" - integrity sha512-Wszb3Q8DQghKJgcF3t2naR8SFhMldSJ1KkCL/knPo6OJbMS26Qo3VOJTDTPHPm6aBWOJjbPUxywgKP7IOLwneQ== +"@drift-labs/sdk@2.49.0-beta.3": + version "2.49.0-beta.3" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.3.tgz#d4c92b1d380692b3f9c9136dddf84ae3703dd3b4" + integrity sha512-/XnO+9ytOXc396tNVLh7SF5nBTJz722sjwGqx+O9Ws95eh9QfWfR1Ma7Ggp8DcPMaM0FZrSgGwHmbwWXoqo0QA== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 9d62c2043d23aeddc647133026c557398c122b2c Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 22:39:33 +0000 Subject: [PATCH 02/11] Bumping sdk dependency to 2.49.0-beta.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aef4880..9e551f1 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.3", + "@drift-labs/sdk": "2.49.0-beta.4", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index a4d3ec2..c5d53d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.3": - version "2.49.0-beta.3" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.3.tgz#d4c92b1d380692b3f9c9136dddf84ae3703dd3b4" - integrity sha512-/XnO+9ytOXc396tNVLh7SF5nBTJz722sjwGqx+O9Ws95eh9QfWfR1Ma7Ggp8DcPMaM0FZrSgGwHmbwWXoqo0QA== +"@drift-labs/sdk@2.49.0-beta.4": + version "2.49.0-beta.4" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.4.tgz#a2a1e4bda0155bfd93ec7bf35819767029fcf74e" + integrity sha512-GOv6JZn6cy1eIODcbGANp7/tZod2+s4a09MvsgACvRG9pYjjJhvXZkN6iz5lH674Zbl0Cu8EXhCJq4k7ifwBIQ== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From e65f60b7fd6fd11821d1b8ab67fb2a3beb339d90 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:32:59 +0000 Subject: [PATCH 03/11] Bumping sdk dependency to 2.49.0-beta.5 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9e551f1..bbab5fc 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.4", + "@drift-labs/sdk": "2.49.0-beta.5", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index c5d53d3..f9413f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.4": - version "2.49.0-beta.4" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.4.tgz#a2a1e4bda0155bfd93ec7bf35819767029fcf74e" - integrity sha512-GOv6JZn6cy1eIODcbGANp7/tZod2+s4a09MvsgACvRG9pYjjJhvXZkN6iz5lH674Zbl0Cu8EXhCJq4k7ifwBIQ== +"@drift-labs/sdk@2.49.0-beta.5": + version "2.49.0-beta.5" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.5.tgz#14abe8b5aa8f0985c5f0171587b4115f7cfc949a" + integrity sha512-RftiM2nUMukcPLJm3ItHdlxA6i8sf67eK6CfuwlHnOj82415b2to9Vb/Z7NqJx6nwk8p2odGRAiEtCVmfbKyWw== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From c4059d3ca06a458ce14a4ed570237a6c21b498ec Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Mon, 4 Dec 2023 21:35:16 -0800 Subject: [PATCH 04/11] catch gpa fail --- src/index.ts | 16 +++++++++++----- src/publishers/dlobPublisher.ts | 21 +++++++++++++++++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/index.ts b/src/index.ts index 896462f..6205ddc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -289,11 +289,17 @@ const main = async () => { const recursiveFetch = (delay = WS_FALLBACK_FETCH_INTERVAL) => { setTimeout(() => { const startFetch = Date.now(); - dlobProvider.fetch().then(() => { - gpaFetchDurationHistogram.record(Date.now() - startFetch); - // eslint-disable-next-line @typescript-eslint/no-unused-vars - recursiveFetch(); - }); + dlobProvider + .fetch() + .then(() => { + gpaFetchDurationHistogram.record(Date.now() - startFetch); + // eslint-disable-next-line @typescript-eslint/no-unused-vars + recursiveFetch(); + }) + .catch(() => { + logger.error('Failed to fetch GPA'); + recursiveFetch(); + }); }, delay); }; recursiveFetch(); diff --git a/src/publishers/dlobPublisher.ts b/src/publishers/dlobPublisher.ts index 03fc706..9f7d311 100644 --- a/src/publishers/dlobPublisher.ts +++ b/src/publishers/dlobPublisher.ts @@ -30,6 +30,7 @@ import { getDLOBProviderFromOrderSubscriber, getDLOBProviderFromUserMap, } from '../dlobProvider'; +import FEATURE_FLAGS from '../utils/featureFlags'; require('dotenv').config(); const stateCommitment: Commitment = 'processed'; @@ -229,10 +230,22 @@ const main = async () => { spotMarketSubscribers: MARKET_SUBSCRIBERS, }); await dlobSubscriber.subscribe(); - if (useWebsocket) { - setInterval(async () => { - await dlobProvider.fetch(); - }, WS_FALLBACK_FETCH_INTERVAL); + if (useWebsocket && !FEATURE_FLAGS.DISABLE_GPA_REFRESH) { + const recursiveFetch = (delay = WS_FALLBACK_FETCH_INTERVAL) => { + setTimeout(() => { + dlobProvider + .fetch() + .then(() => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + recursiveFetch(); + }) + .catch(() => { + logger.error('Failed to fetch GPA'); + recursiveFetch(); + }); + }, delay); + }; + recursiveFetch(); } console.log('DLOBSubscriber Publishing Messages'); From 05a1a92598498779f04a6ea60b2db4553cf52e47 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Mon, 4 Dec 2023 21:40:49 -0800 Subject: [PATCH 05/11] use finally --- src/index.ts | 5 +++-- src/publishers/dlobPublisher.ts | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/index.ts b/src/index.ts index 6205ddc..4a1127b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -293,11 +293,12 @@ const main = async () => { .fetch() .then(() => { gpaFetchDurationHistogram.record(Date.now() - startFetch); - // eslint-disable-next-line @typescript-eslint/no-unused-vars - recursiveFetch(); }) .catch(() => { logger.error('Failed to fetch GPA'); + }) + .finally(() => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars recursiveFetch(); }); }, delay); diff --git a/src/publishers/dlobPublisher.ts b/src/publishers/dlobPublisher.ts index 9f7d311..1a3e317 100644 --- a/src/publishers/dlobPublisher.ts +++ b/src/publishers/dlobPublisher.ts @@ -235,12 +235,11 @@ const main = async () => { setTimeout(() => { dlobProvider .fetch() - .then(() => { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - recursiveFetch(); - }) .catch(() => { logger.error('Failed to fetch GPA'); + }) + .finally(() => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars recursiveFetch(); }); }, delay); From 0760f4dbf541a44f83e0c4671e9802d4fa2d1898 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 15:33:29 +0000 Subject: [PATCH 06/11] Bumping sdk dependency to 2.49.0-beta.6 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index bbab5fc..266e407 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.5", + "@drift-labs/sdk": "2.49.0-beta.6", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index f9413f5..2fcb9aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.5": - version "2.49.0-beta.5" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.5.tgz#14abe8b5aa8f0985c5f0171587b4115f7cfc949a" - integrity sha512-RftiM2nUMukcPLJm3ItHdlxA6i8sf67eK6CfuwlHnOj82415b2to9Vb/Z7NqJx6nwk8p2odGRAiEtCVmfbKyWw== +"@drift-labs/sdk@2.49.0-beta.6": + version "2.49.0-beta.6" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.6.tgz#dd55ff30d9d087d6b8cfed2381b27d078b198b5d" + integrity sha512-jtBiJwbiogVPTy199UpcBPea2B6z+07+kzHCIuhqEBi4PZZmMnBaGSq+nMNsvefyyHZdOx1Xhjo3q5taqZcWRQ== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 793938bfc1fe993b9ccc3a8d447543807b16d91c Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:23:03 +0000 Subject: [PATCH 07/11] Bumping sdk dependency to 2.49.0-beta.7 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 266e407..b1af60a 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.6", + "@drift-labs/sdk": "2.49.0-beta.7", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index 2fcb9aa..08ada7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.6": - version "2.49.0-beta.6" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.6.tgz#dd55ff30d9d087d6b8cfed2381b27d078b198b5d" - integrity sha512-jtBiJwbiogVPTy199UpcBPea2B6z+07+kzHCIuhqEBi4PZZmMnBaGSq+nMNsvefyyHZdOx1Xhjo3q5taqZcWRQ== +"@drift-labs/sdk@2.49.0-beta.7": + version "2.49.0-beta.7" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.7.tgz#a914721f05dfdaea214cf367788e63141715c2c0" + integrity sha512-Pd/AnoOxVq/nNgtOXJU3pEIKvDkRA+pJfajMWYzKBBIwsfZZrNGuKSXlWe458GeCDM8hWmKBe7EJJCB1bRRJbg== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From ff8f2f2f13a86adb4a1b06f73af4c606236eb04c Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Tue, 5 Dec 2023 09:23:04 -0800 Subject: [PATCH 08/11] add conosle log --- src/index.ts | 3 ++- src/publishers/dlobPublisher.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 4a1127b..83a0197 100644 --- a/src/index.ts +++ b/src/index.ts @@ -294,8 +294,9 @@ const main = async () => { .then(() => { gpaFetchDurationHistogram.record(Date.now() - startFetch); }) - .catch(() => { + .catch((e) => { logger.error('Failed to fetch GPA'); + console.log(e); }) .finally(() => { // eslint-disable-next-line @typescript-eslint/no-unused-vars diff --git a/src/publishers/dlobPublisher.ts b/src/publishers/dlobPublisher.ts index 1a3e317..3a86e1e 100644 --- a/src/publishers/dlobPublisher.ts +++ b/src/publishers/dlobPublisher.ts @@ -235,8 +235,9 @@ const main = async () => { setTimeout(() => { dlobProvider .fetch() - .catch(() => { + .catch((e) => { logger.error('Failed to fetch GPA'); + console.log(e); }) .finally(() => { // eslint-disable-next-line @typescript-eslint/no-unused-vars From 22dc4133012f352096406152083e0474dad490c8 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 19:25:29 +0000 Subject: [PATCH 09/11] Bumping sdk dependency to 2.49.0-beta.8 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b1af60a..77b7315 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.7", + "@drift-labs/sdk": "2.49.0-beta.8", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index 08ada7d..81cb119 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.7": - version "2.49.0-beta.7" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.7.tgz#a914721f05dfdaea214cf367788e63141715c2c0" - integrity sha512-Pd/AnoOxVq/nNgtOXJU3pEIKvDkRA+pJfajMWYzKBBIwsfZZrNGuKSXlWe458GeCDM8hWmKBe7EJJCB1bRRJbg== +"@drift-labs/sdk@2.49.0-beta.8": + version "2.49.0-beta.8" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.8.tgz#81dea2a89e33a177037b687ed0c7a600a6a45210" + integrity sha512-m9GomybQzPavOYssxNdlxYqqWVcgfPftWjq+kEfGmFUawLwi4AJGnWLt/oFjDfv5KowKE2mVitmLj7ig/jBT2A== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 9ea5505f27d638d63937e4ffec7207410734014e Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 20:34:49 +0000 Subject: [PATCH 10/11] Bumping sdk dependency to 2.49.0-beta.9 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 77b7315..2617079 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.8", + "@drift-labs/sdk": "2.49.0-beta.9", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/yarn.lock b/yarn.lock index 81cb119..e9597b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.8": - version "2.49.0-beta.8" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.8.tgz#81dea2a89e33a177037b687ed0c7a600a6a45210" - integrity sha512-m9GomybQzPavOYssxNdlxYqqWVcgfPftWjq+kEfGmFUawLwi4AJGnWLt/oFjDfv5KowKE2mVitmLj7ig/jBT2A== +"@drift-labs/sdk@2.49.0-beta.9": + version "2.49.0-beta.9" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.9.tgz#9e46d2c28c7bc3bf7c0da6279fd04f5cd4788080" + integrity sha512-0OyJm17KV5BPwHSiTnQ2pzf+q/UzPAjIdJjdateAbzqxYTLzkasfFpesSfZBPLGvA3CWF1/jaFYXo7y5BEsQTQ== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2" From 6e90a1d79648a66cac0f2b0a8e4aea09f592c938 Mon Sep 17 00:00:00 2001 From: wphan Date: Wed, 6 Dec 2023 07:11:57 -0800 Subject: [PATCH 11/11] bump sdk --- package.json | 2 +- src/index.ts | 13 +++++++++---- src/publishers/dlobPublisher.ts | 13 +++++++++---- src/publishers/tradesPublisher.ts | 13 +++++++++---- yarn.lock | 8 ++++---- 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 2617079..5092920 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "license": "Apache-2.0", "dependencies": { - "@drift-labs/sdk": "2.49.0-beta.9", + "@drift-labs/sdk": "2.49.0-beta.10", "@opentelemetry/api": "^1.1.0", "@opentelemetry/auto-instrumentations-node": "^0.31.1", "@opentelemetry/exporter-prometheus": "^0.31.0", diff --git a/src/index.ts b/src/index.ts index 83a0197..44c2c72 100644 --- a/src/index.ts +++ b/src/index.ts @@ -260,11 +260,16 @@ const main = async () => { getSlot: () => orderSubscriber.getSlot(), }; } else { - const userMap = new UserMap( + const userMap = new UserMap({ driftClient, - driftClient.userAccountSubscriptionConfig, - false - ); + subscriptionConfig: { + type: 'websocket', + resubTimeoutMs: 30_000, + commitment: stateCommitment, + }, + skipInitialLoad: false, + includeIdle: false, + }); dlobProvider = getDLOBProviderFromUserMap(userMap); } diff --git a/src/publishers/dlobPublisher.ts b/src/publishers/dlobPublisher.ts index 3a86e1e..d174921 100644 --- a/src/publishers/dlobPublisher.ts +++ b/src/publishers/dlobPublisher.ts @@ -207,11 +207,16 @@ const main = async () => { getSlot: () => orderSubscriber.getSlot(), }; } else { - const userMap = new UserMap( + const userMap = new UserMap({ driftClient, - driftClient.userAccountSubscriptionConfig, - false - ); + subscriptionConfig: { + type: 'websocket', + resubTimeoutMs: 30_000, + commitment: stateCommitment, + }, + skipInitialLoad: false, + includeIdle: false, + }); dlobProvider = getDLOBProviderFromUserMap(userMap); } diff --git a/src/publishers/tradesPublisher.ts b/src/publishers/tradesPublisher.ts index 16d9542..5279e16 100644 --- a/src/publishers/tradesPublisher.ts +++ b/src/publishers/tradesPublisher.ts @@ -94,11 +94,16 @@ const main = async () => { await slotSubscriber.subscribe(); - const userMap = new UserMap( + const userMap = new UserMap({ driftClient, - driftClient.userAccountSubscriptionConfig, - false - ); + subscriptionConfig: { + type: 'websocket', + resubTimeoutMs: 30_000, + commitment: stateCommitment, + }, + skipInitialLoad: false, + includeIdle: false, + }); await userMap.subscribe(); const redisClient = new RedisClient(REDIS_HOST, REDIS_PORT, REDIS_PASSWORD); diff --git a/yarn.lock b/yarn.lock index e9597b2..b15edc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -87,10 +87,10 @@ enabled "2.0.x" kuler "^2.0.0" -"@drift-labs/sdk@2.49.0-beta.9": - version "2.49.0-beta.9" - resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.9.tgz#9e46d2c28c7bc3bf7c0da6279fd04f5cd4788080" - integrity sha512-0OyJm17KV5BPwHSiTnQ2pzf+q/UzPAjIdJjdateAbzqxYTLzkasfFpesSfZBPLGvA3CWF1/jaFYXo7y5BEsQTQ== +"@drift-labs/sdk@2.49.0-beta.10": + version "2.49.0-beta.10" + resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.49.0-beta.10.tgz#0d2021daf10174c6d19a07a6e36e6271ea465ecf" + integrity sha512-jSSqinLAajbqG2DxRGblKPrflp7w3/oqQ+di5YXVRRexsKs43XBkoApTtsoRy5KpNB3pkG3em88iwdk99a7hJg== dependencies: "@coral-xyz/anchor" "0.28.1-beta.2" "@ellipsis-labs/phoenix-sdk" "^1.4.2"