From e66de3fed7f9a9af3cd16e9c3456bb5b430df27a Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Tue, 13 Aug 2024 14:36:43 -0700 Subject: [PATCH 1/3] use paused operation --- src/dlob-subscriber/DLOBSubscriberIO.ts | 9 ++++++--- src/index.ts | 16 ++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/dlob-subscriber/DLOBSubscriberIO.ts b/src/dlob-subscriber/DLOBSubscriberIO.ts index 352a936..d288dd1 100644 --- a/src/dlob-subscriber/DLOBSubscriberIO.ts +++ b/src/dlob-subscriber/DLOBSubscriberIO.ts @@ -4,7 +4,9 @@ import { DriftEnv, L2OrderBookGenerator, MarketType, + PerpOperation, PositionDirection, + isOperationPaused, isVariant, } from '@drift-labs/sdk'; import { RedisClient } from '@drift/common'; @@ -86,9 +88,10 @@ export class DLOBSubscriberIO extends DLOBSubscriber { const perpMarket = this.driftClient.getPerpMarketAccount( market.marketIndex ); - const includeVamm = - !isVariant(perpMarket.status, 'ammPaused') && - !isVariant(perpMarket.status, 'initialized'); + const includeVamm = !isOperationPaused( + perpMarket.pausedOperations, + PerpOperation.AMM_FILL + ); this.marketArgs.push({ marketIndex: market.marketIndex, diff --git a/src/index.ts b/src/index.ts index 31c7586..b72307f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -20,6 +20,8 @@ import { MarketType, PhoenixSubscriber, BulkAccountLoader, + isOperationPaused, + PerpOperation, } from '@drift-labs/sdk'; import { RedisClient, RedisClientPrefix } from '@drift/common'; @@ -777,9 +779,10 @@ const main = async (): Promise => { let validateIncludeVamm = false; if (!isSpot && `${includeVamm}`.toLowerCase() === 'true') { const perpMarket = driftClient.getPerpMarketAccount(normedMarketIndex); - validateIncludeVamm = - !isVariant(perpMarket.status, 'ammPaused') && - !isVariant(perpMarket.status, 'initialized'); + validateIncludeVamm = !isOperationPaused( + perpMarket.pausedOperations, + PerpOperation.AMM_FILL + ); } const l2 = dlobSubscriber.getL2({ marketIndex: normedMarketIndex, @@ -949,9 +952,10 @@ const main = async (): Promise => { if (!isSpot && `${includeVamm}`.toLowerCase() === 'true') { const perpMarket = driftClient.getPerpMarketAccount(normedMarketIndex); - validateIncludeVamm = - !isVariant(perpMarket.status, 'ammPaused') && - !isVariant(perpMarket.status, 'initialized'); + validateIncludeVamm = !isOperationPaused( + perpMarket.pausedOperations, + PerpOperation.AMM_FILL + ); } const l2 = dlobSubscriber.getL2({ marketIndex: normedMarketIndex, From 013fd706b6a9ba94744920d07eb412e5e2c40ef7 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Thu, 15 Aug 2024 10:16:15 -0700 Subject: [PATCH 2/3] bump protocol --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 82dbbf3..23a4d85 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 82dbbf336b2e50f31438c288fd1d1a380b76d9ca +Subproject commit 23a4d854e9964d74f102f5a1e8f65d6bc3cbc0eb From 55af456af5165976079842cfe695f1d93dd329ca Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Sun, 18 Aug 2024 13:03:12 -0700 Subject: [PATCH 3/3] bump common --- drift-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drift-common b/drift-common index 23a4d85..20da140 160000 --- a/drift-common +++ b/drift-common @@ -1 +1 @@ -Subproject commit 23a4d854e9964d74f102f5a1e8f65d6bc3cbc0eb +Subproject commit 20da1405dc11502e6428830414b3c2168e87266c