From 33b82453c209c9b197009922e227065adac282ec Mon Sep 17 00:00:00 2001
From: Christopher-Li <Christopher-Li@users.noreply.github.com>
Date: Tue, 2 Jan 2024 18:18:00 -0500
Subject: [PATCH] Fix Trading reward event processing (#913) (#916)

---
 .../__tests__/handlers/trading-rewards-handler.test.ts    | 2 +-
 indexer/services/ender/src/lib/block-processor.ts         | 2 +-
 indexer/services/scripts/src/helpers/block-helpers.ts     | 8 ++++++++
 indexer/services/scripts/src/helpers/types.ts             | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/indexer/services/ender/__tests__/handlers/trading-rewards-handler.test.ts b/indexer/services/ender/__tests__/handlers/trading-rewards-handler.test.ts
index 7968f24bd8..f89b305db1 100644
--- a/indexer/services/ender/__tests__/handlers/trading-rewards-handler.test.ts
+++ b/indexer/services/ender/__tests__/handlers/trading-rewards-handler.test.ts
@@ -36,7 +36,7 @@ import { createPostgresFunctions } from '../../src/helpers/postgres/postgres-fun
 import { TradingRewardsHandler } from '../../src/handlers/trading-rewards-handler';
 import { intToSerializedInt } from '../helpers/conversion-helpers';
 
-const defaultTransactionIndex: number = 0;
+const defaultTransactionIndex: number = -2; // end block
 
 describe('tradingRewardHandler', () => {
   beforeAll(async () => {
diff --git a/indexer/services/ender/src/lib/block-processor.ts b/indexer/services/ender/src/lib/block-processor.ts
index 92b4a6269b..655e85d6b2 100644
--- a/indexer/services/ender/src/lib/block-processor.ts
+++ b/indexer/services/ender/src/lib/block-processor.ts
@@ -47,11 +47,11 @@ const TXN_EVENT_SUBTYPE_VERSION_TO_VALIDATOR_MAPPING: Record<string, ValidatorIn
   [serializeSubtypeAndVersion(DydxIndexerSubtypes.UPDATE_PERPETUAL.toString(), 1)]: UpdatePerpetualValidator,
   [serializeSubtypeAndVersion(DydxIndexerSubtypes.UPDATE_CLOB_PAIR.toString(), 1)]: UpdateClobPairValidator,
   [serializeSubtypeAndVersion(DydxIndexerSubtypes.DELEVERAGING.toString(), 1)]: DeleveragingValidator,
-  [serializeSubtypeAndVersion(DydxIndexerSubtypes.TRADING_REWARD.toString(), 1)]: TradingRewardsValidator,
 };
 
 const BLOCK_EVENT_SUBTYPE_VERSION_TO_VALIDATOR_MAPPING: Record<string, ValidatorInitializer> = {
   [serializeSubtypeAndVersion(DydxIndexerSubtypes.FUNDING.toString(), 1)]: FundingValidator,
+  [serializeSubtypeAndVersion(DydxIndexerSubtypes.TRADING_REWARD.toString(), 1)]: TradingRewardsValidator,
 };
 
 function serializeSubtypeAndVersion(
diff --git a/indexer/services/scripts/src/helpers/block-helpers.ts b/indexer/services/scripts/src/helpers/block-helpers.ts
index 97ecbe06d7..7fedad66e9 100644
--- a/indexer/services/scripts/src/helpers/block-helpers.ts
+++ b/indexer/services/scripts/src/helpers/block-helpers.ts
@@ -9,6 +9,7 @@ import {
   PerpetualMarketCreateEventV1,
   StatefulOrderEventV1,
   SubaccountUpdateEventV1,
+  TradingRewardsEventV1,
   TransferEventV1,
   UpdateClobPairEventV1,
   UpdatePerpetualEventV1,
@@ -98,6 +99,13 @@ export function annotateIndexerTendermintEvent(
         data: JSON.stringify(UpdateClobPairEventV1.decode(eventDataBinary)),
       };
     }
+    case (DydxIndexerSubtypes.TRADING_REWARD.toString()): {
+      return {
+        ...event,
+        dataBytes: new Uint8Array(),
+        data: JSON.stringify(TradingRewardsEventV1.decode(eventDataBinary)),
+      };
+    }
     default: {
       const message: string = `Unable to parse event subtype: ${event.subtype}`;
       logger.error({
diff --git a/indexer/services/scripts/src/helpers/types.ts b/indexer/services/scripts/src/helpers/types.ts
index 3bd3ea8659..b5cf814db0 100644
--- a/indexer/services/scripts/src/helpers/types.ts
+++ b/indexer/services/scripts/src/helpers/types.ts
@@ -20,4 +20,5 @@ export enum DydxIndexerSubtypes {
   LIQUIDITY_TIER = 'liquidity_tier',
   UPDATE_PERPETUAL = 'update_perpetual',
   UPDATE_CLOB_PAIR = 'update_clob_pair',
+  TRADING_REWARD = 'trading_reward',
 }