[IND-500]: Add logic to aggregate trading rewards (#952)

* [IND-500]: Add logic to aggregate trading rewards * nits * nit
dydxprotocol · Jan 10, 2024 · 2bfcb31 · 2bfcb31
1 parent 51cdad7
commit 2bfcb31
Show file tree

Hide file tree

Showing 7 changed files with 605 additions and 77 deletions.
diff --git a/indexer/packages/postgres/__tests__/helpers/conversion-helpers.ts b/indexer/packages/postgres/__tests__/helpers/conversion-helpers.ts
@@ -6,3 +6,7 @@ export const DENOM_COIN_SCALE: number = 18;
 export function denomToHumanReadableConversion(denom: number): string {
   return Big(denom).times(DENOM_TO_COIN_CONVERSION).toFixed(DENOM_COIN_SCALE);
 }
+
+export function convertToDenomScale(num: string): string {
+  return Big(num).toFixed(DENOM_COIN_SCALE);
+}
diff --git a/indexer/packages/postgres/src/stores/trading-reward-aggregation-table.ts b/indexer/packages/postgres/src/stores/trading-reward-aggregation-table.ts
@@ -30,6 +30,7 @@ export function uuid(
 export async function findAll(
   {
     address,
+    addresses,
     startedAtHeight,
     period,
     limit,
@@ -40,6 +41,7 @@ export async function findAll(
   verifyAllRequiredFields(
     {
       address,
+      addresses,
       startedAtHeight,
       period,
       limit,
@@ -57,6 +59,10 @@ export async function findAll(
     baseQuery = baseQuery.where(TradingRewardAggregationColumns.address, address);
   }
 
+  if (addresses) {
+    baseQuery = baseQuery.whereIn(TradingRewardAggregationColumns.address, addresses);
+  }
+
   if (startedAtHeight) {
     baseQuery = baseQuery.where(TradingRewardAggregationColumns.startedAtHeight, startedAtHeight);
   }

diff --git a/indexer/packages/postgres/src/stores/trading-reward-table.ts b/indexer/packages/postgres/src/stores/trading-reward-table.ts
@@ -26,6 +26,8 @@ export async function findAll(
     address,
     blockHeight,
     blockTimeBeforeOrAt,
+    blockTimeAfterOrAt,
+    blockTimeBefore,
     limit,
   }: TradingRewardQueryConfig,
   requiredFields: QueryableField[],
@@ -36,6 +38,8 @@ export async function findAll(
       address,
       blockHeight,
       blockTimeBeforeOrAt,
+      blockTimeAfterOrAt,
+      blockTimeBefore,
       limit,
     } as QueryConfig,
     requiredFields,
@@ -58,6 +62,14 @@ export async function findAll(
     baseQuery = baseQuery.where(TradingRewardColumns.blockTime, '<=', blockTimeBeforeOrAt);
   }
 
+  if (blockTimeAfterOrAt) {
+    baseQuery = baseQuery.where(TradingRewardColumns.blockTime, '>=', blockTimeAfterOrAt);
+  }
+
+  if (blockTimeBefore) {
+    baseQuery = baseQuery.where(TradingRewardColumns.blockTime, '<', blockTimeBefore);
+  }
+
   if (options.orderBy !== undefined) {
     for (const [column, order] of options.orderBy) {
       baseQuery = baseQuery.orderBy(

diff --git a/indexer/packages/postgres/src/types/query-types.ts b/indexer/packages/postgres/src/types/query-types.ts
@@ -76,6 +76,9 @@ export enum QueryableField {
   STARTED_AT_HEIGHT = 'startedAtHeight',
   PERIOD = 'period',
   STARTED_AT_HEIGHT_OR_AFTER = 'startedAtHeightOrAfter',
+  BLOCK_TIME_AFTER_OR_AT = 'blockTimeAfterOrAt',
+  BLOCK_TIME_BEFORE = 'blockTimeBefore',
+  ADDRESSES = 'addresses',
 }
 
 export interface QueryConfig {
@@ -149,7 +152,7 @@ export interface FillQueryConfig extends QueryConfig {
 
 export interface BlockQueryConfig extends QueryConfig {
   [QueryableField.BLOCK_HEIGHT]?: string[];
-  [QueryableField.CREATED_ON_OR_AFTER]?: string[];
+  [QueryableField.CREATED_ON_OR_AFTER]?: string;
 }
 
 export interface TendermintEventQueryConfig extends QueryConfig {
@@ -275,10 +278,13 @@ export interface TradingRewardQueryConfig extends QueryConfig {
   [QueryableField.ADDRESS]?: string;
   [QueryableField.BLOCK_HEIGHT]?: string;
   [QueryableField.BLOCK_TIME_BEFORE_OR_AT]?: IsoString;
+  [QueryableField.BLOCK_TIME_AFTER_OR_AT]?: IsoString;
+  [QueryableField.BLOCK_TIME_BEFORE]?: IsoString;
 }
 
 export interface TradingRewardAggregationQueryConfig extends QueryConfig {
   [QueryableField.ADDRESS]?: string;
+  [QueryableField.ADDRESSES]?: string[];
   [QueryableField.STARTED_AT_HEIGHT]?: string;
   [QueryableField.STARTED_AT_HEIGHT_OR_AFTER]?: string;
   [QueryableField.PERIOD]?: TradingRewardAggregationPeriod;