From 1620c8fa001b4235b06685089119c6827afb00ee Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Thu, 24 Oct 2024 17:46:26 -0400 Subject: [PATCH 1/6] Add missing fields to perpetual markets kafka update Signed-off-by: Shrenuj Bansal --- .../postgres/src/types/websocket-message-types.ts | 4 ++++ indexer/services/ender/src/helpers/kafka-helper.ts | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/indexer/packages/postgres/src/types/websocket-message-types.ts b/indexer/packages/postgres/src/types/websocket-message-types.ts index 1d1cd6d607..4f5f812250 100644 --- a/indexer/packages/postgres/src/types/websocket-message-types.ts +++ b/indexer/packages/postgres/src/types/websocket-message-types.ts @@ -223,6 +223,10 @@ export interface TradingPerpetualMarketMessage { volume24H?: string, trades24H?: number, nextFundingRate?: string, + + // Derived fields + tickSize?: string, + stepSize?: string, } export type OraclePriceMarketMessageContentsMapping = { diff --git a/indexer/services/ender/src/helpers/kafka-helper.ts b/indexer/services/ender/src/helpers/kafka-helper.ts index 2fd50a1c4a..637af3d30f 100644 --- a/indexer/services/ender/src/helpers/kafka-helper.ts +++ b/indexer/services/ender/src/helpers/kafka-helper.ts @@ -20,7 +20,7 @@ import { PerpetualMarketsMap, PerpetualPositionFromDatabase, PerpetualPositionSubaccountMessageContents, - PositionSide, + PositionSide, protocolTranslations, SubaccountMessageContents, SubaccountTable, TradingMarketMessageContents, @@ -328,6 +328,7 @@ export function generatePerpetualMarketMessage( atomicResolution: perpetualMarket.atomicResolution, subticksPerTick: perpetualMarket.subticksPerTick, stepBaseQuantums: perpetualMarket.stepBaseQuantums, + marketType: perpetualMarket.marketType, initialMarginFraction: helpers.ppmToString(Number(liquidityTier.initialMarginPpm)), maintenanceMarginFraction: helpers.ppmToString( helpers.getMaintenanceMarginPpm( @@ -337,6 +338,14 @@ export function generatePerpetualMarketMessage( ), openInterestLowerCap: liquidityTier.openInterestLowerCap, openInterestUpperCap: liquidityTier.openInterestUpperCap, + tickSize: protocolTranslations.getTickSize(perpetualMarket), + stepSize: protocolTranslations.getStepSize(perpetualMarket), + priceChange24H: perpetualMarket.priceChange24H, + volume24H: perpetualMarket.volume24H, + trades24H: perpetualMarket.trades24H, + nextFundingRate: perpetualMarket.nextFundingRate, + openInterest: perpetualMarket.openInterest, + baseOpenInterest: perpetualMarket.baseOpenInterest, }; }) .value(); From cdb0043341fa3f5d71536c6cd8583dd5c402d702 Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Thu, 24 Oct 2024 18:36:40 -0400 Subject: [PATCH 2/6] gh wflow --- .github/workflows/indexer-build-and-push-dev-staging.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/indexer-build-and-push-dev-staging.yml b/.github/workflows/indexer-build-and-push-dev-staging.yml index 5a98b72552..f9f4628ee0 100644 --- a/.github/workflows/indexer-build-and-push-dev-staging.yml +++ b/.github/workflows/indexer-build-and-push-dev-staging.yml @@ -3,6 +3,7 @@ name: Indexer Build & Push Images to AWS ECR for Dev / Staging branches on: # yamllint disable-line rule:truthy push: branches: + - 'sbansal*' - main - 'release/indexer/v[0-9]+.[0-9]+.x' # e.g. release/indexer/v0.1.x - 'release/indexer/v[0-9]+.x' # e.g. release/indexer/v1.x From 535679412527fbdf2062b52e44e5dd901c64c011 Mon Sep 17 00:00:00 2001 From: Vincent Chau <99756290+vincentwschau@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:04:15 -0400 Subject: [PATCH 3/6] gh workflow. --- .github/workflows/indexer-build-and-push-dev-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/indexer-build-and-push-dev-staging.yml b/.github/workflows/indexer-build-and-push-dev-staging.yml index f9f4628ee0..fb4e893774 100644 --- a/.github/workflows/indexer-build-and-push-dev-staging.yml +++ b/.github/workflows/indexer-build-and-push-dev-staging.yml @@ -3,7 +3,7 @@ name: Indexer Build & Push Images to AWS ECR for Dev / Staging branches on: # yamllint disable-line rule:truthy push: branches: - - 'sbansal*' + - 'sbansal.*' - main - 'release/indexer/v[0-9]+.[0-9]+.x' # e.g. release/indexer/v0.1.x - 'release/indexer/v[0-9]+.x' # e.g. release/indexer/v1.x From 68b8a3b8063250917f5ad7aa361c6395e3e2db04 Mon Sep 17 00:00:00 2001 From: Vincent Chau <99756290+vincentwschau@users.noreply.github.com> Date: Thu, 24 Oct 2024 22:06:14 -0400 Subject: [PATCH 4/6] exact branch name. --- .github/workflows/indexer-build-and-push-dev-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/indexer-build-and-push-dev-staging.yml b/.github/workflows/indexer-build-and-push-dev-staging.yml index fb4e893774..33c58aa105 100644 --- a/.github/workflows/indexer-build-and-push-dev-staging.yml +++ b/.github/workflows/indexer-build-and-push-dev-staging.yml @@ -3,7 +3,7 @@ name: Indexer Build & Push Images to AWS ECR for Dev / Staging branches on: # yamllint disable-line rule:truthy push: branches: - - 'sbansal.*' + - 'sbansal/perp-fields' - main - 'release/indexer/v[0-9]+.[0-9]+.x' # e.g. release/indexer/v0.1.x - 'release/indexer/v[0-9]+.x' # e.g. release/indexer/v1.x From fff06714af44a8836aa151fd44b44916c6097c42 Mon Sep 17 00:00:00 2001 From: Shrenuj Bansal Date: Fri, 25 Oct 2024 15:51:25 -0400 Subject: [PATCH 5/6] remove gh wflow Signed-off-by: Shrenuj Bansal --- .github/workflows/indexer-build-and-push-dev-staging.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/indexer-build-and-push-dev-staging.yml b/.github/workflows/indexer-build-and-push-dev-staging.yml index 33c58aa105..5a98b72552 100644 --- a/.github/workflows/indexer-build-and-push-dev-staging.yml +++ b/.github/workflows/indexer-build-and-push-dev-staging.yml @@ -3,7 +3,6 @@ name: Indexer Build & Push Images to AWS ECR for Dev / Staging branches on: # yamllint disable-line rule:truthy push: branches: - - 'sbansal/perp-fields' - main - 'release/indexer/v[0-9]+.[0-9]+.x' # e.g. release/indexer/v0.1.x - 'release/indexer/v[0-9]+.x' # e.g. release/indexer/v1.x From bdcf6acc11d8612cadb4763aca31e0b0ea4c07be Mon Sep 17 00:00:00 2001 From: shrenujb <98204323+shrenujb@users.noreply.github.com> Date: Fri, 25 Oct 2024 18:25:11 -0400 Subject: [PATCH 6/6] Update indexer/services/ender/src/helpers/kafka-helper.ts Co-authored-by: vincentwschau <99756290+vincentwschau@users.noreply.github.com> --- indexer/services/ender/src/helpers/kafka-helper.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indexer/services/ender/src/helpers/kafka-helper.ts b/indexer/services/ender/src/helpers/kafka-helper.ts index 637af3d30f..db88bdac28 100644 --- a/indexer/services/ender/src/helpers/kafka-helper.ts +++ b/indexer/services/ender/src/helpers/kafka-helper.ts @@ -20,7 +20,8 @@ import { PerpetualMarketsMap, PerpetualPositionFromDatabase, PerpetualPositionSubaccountMessageContents, - PositionSide, protocolTranslations, + PositionSide, + protocolTranslations, SubaccountMessageContents, SubaccountTable, TradingMarketMessageContents,