chore/indexer-olp-schema-update

packages/sdk-ts/package.json

@@ -331,7 +331,7 @@
     "@injectivelabs/indexer-proto-ts-v2": "1.17.6",
     "@injectivelabs/mito-proto-ts-v2": "1.17.3",
     "@injectivelabs/networks": "workspace:*",
-    "@injectivelabs/olp-proto-ts-v2": "1.17.3",
+    "@injectivelabs/olp-proto-ts-v2": "1.17.5",
     "@injectivelabs/ts-types": "workspace:*",
     "@injectivelabs/utils": "workspace:*",
     "@noble/curves": "catalog:",

packages/sdk-ts/src/client/olp/grpc/OLPGrpcApi.ts

@@ -1,14 +1,14 @@
 import { IndexerErrorModule } from '@injectivelabs/exceptions'
-import * as DmmPb from '@injectivelabs/olp-proto-ts-v2/generated/dmm_pb'
-import { InjectiveDmmV2RPCClient } from '@injectivelabs/olp-proto-ts-v2/generated/dmm_pb.client'
+import * as DmmPb from '@injectivelabs/olp-proto-ts-v2/generated/goagen_olp_injective_dmm_v2_pb'
+import { InjectiveDmmV2Client } from '@injectivelabs/olp-proto-ts-v2/generated/goagen_olp_injective_dmm_v2_pb.client'
 import { DmmGrpcTransformer } from './transformers/index.js'
 import BaseIndexerGrpcConsumer from '../../base/BaseIndexerGrpcConsumer.js'
 
 export class OLPGrpcApi extends BaseIndexerGrpcConsumer {
   protected module: string = IndexerErrorModule.OLP
 
   private get client() {
-    return this.initClient(InjectiveDmmV2RPCClient)
+    return this.initClient(InjectiveDmmV2Client)
   }
 
   async fetchEpochs(status?: string) {
@@ -264,7 +264,7 @@ export class OLPGrpcApi extends BaseIndexerGrpcConsumer {
     const response = await this.executeGrpcCall<
       DmmPb.GetMarketRewardsRangeRequest,
       DmmPb.GetMarketRewardsRangeResponse
-    >(request, this.client.getMarketRewardRanges.bind(this.client))
+    >(request, this.client.getMarketRewardsRange.bind(this.client))
 
     return DmmGrpcTransformer.marketRewardsRangeResponseToMarketRewardsRange(
       response,

packages/sdk-ts/src/client/olp/grpc/transformers/index.ts

@@ -1,5 +1,4 @@
-import { protobufTimestampToDate } from '../../../../utils/time.js'
-import type * as DmmPb from '@injectivelabs/olp-proto-ts-v2/generated/dmm_pb'
+import type * as DmmPb from '@injectivelabs/olp-proto-ts-v2/generated/goagen_olp_injective_dmm_v2_pb'
 import type {
   EpochV2,
   TotalScore,
@@ -34,34 +33,40 @@ export class DmmGrpcTransformer {
 
   static grpcEpochToEpoch(epoch: GrpcEpochV2): EpochV2 {
     return {
-      epochId: epoch.epochId,
       status: epoch.status,
-      startHeight: epoch.startHeight?.toString(),
-      endHeight: epoch.endHeight?.toString(),
-      snapshotCount: epoch.snapshotCount,
+      epochId: epoch.epochId,
       resultCount: epoch.resultCount,
+      snapshotCount: epoch.snapshotCount,
+      endHeight: epoch.endHeight?.toString(),
+      startHeight: epoch.startHeight?.toString(),
       config: epoch.config
         ? {
-            startDate: protobufTimestampToDate(epoch.config.startDate),
-            endDate: protobufTimestampToDate(epoch.config.endDate),
+            number: epoch.config.number,
             rewardInj: epoch.config.rewardInj,
-            markets: epoch.config.markets.map((market) => ({
-              marketId: market.marketId,
-              ticker: market.ticker,
-              startDate: protobufTimestampToDate(market.startDate),
-              preAllocatedReward: market.preAllocatedReward,
-            })),
-            liquidityScoreExponent: epoch.config.liquidityScoreExponent,
+            isMiniEpoch: epoch.config.isMiniEpoch,
             uptimeExponent: epoch.config.uptimeExponent,
             volumeExponent: epoch.config.volumeExponent,
+            liquidityScoreExponent: epoch.config.liquidityScoreExponent,
             permanenceVolumeThreshold: epoch.config.permanenceVolumeThreshold,
             qualifyingVolumeThreshold: epoch.config.qualifyingVolumeThreshold,
-            number: epoch.config.number,
-            isMiniEpoch: epoch.config.isMiniEpoch,
+            startDate: epoch.config.startDate
+              ? new Date(epoch.config.startDate)
+              : undefined,
+            endDate: epoch.config.endDate
+              ? new Date(epoch.config.endDate)
+              : undefined,
+            markets: epoch.config.markets.map((market) => ({
+              ticker: market.ticker,
+              marketId: market.marketId,
+              startDate: market.startDate
+                ? new Date(market.startDate)
+                : undefined,
+              preAllocatedReward: market.preAllocatedReward,
+            })),
           }
         : undefined,
-      createdAt: protobufTimestampToDate(epoch.createdAt),
-      updatedAt: protobufTimestampToDate(epoch.updatedAt),
+      createdAt: epoch.createdAt ? new Date(epoch.createdAt) : undefined,
+      updatedAt: epoch.updatedAt ? new Date(epoch.updatedAt) : undefined,
     }
   }
 
@@ -77,18 +82,26 @@ export class DmmGrpcTransformer {
     marketReward: GrpcMarketReward,
   ): MarketReward {
     return {
+      reward: marketReward.reward,
       epochId: marketReward.epochId,
       marketId: marketReward.marketId,
-      height: marketReward.height?.toString(),
-      reward: marketReward.reward,
-      rewardPercentage: marketReward.rewardPercentage,
       liquidity: marketReward.liquidity,
-      startDate: protobufTimestampToDate(marketReward.startDate),
-      endDate: protobufTimestampToDate(marketReward.endDate),
       totalScore: marketReward.totalScore,
-      createdAt: protobufTimestampToDate(marketReward.createdAt),
-      updatedAt: protobufTimestampToDate(marketReward.updatedAt),
+      height: marketReward.height?.toString(),
+      rewardPercentage: marketReward.rewardPercentage,
       miniEpochsReward: marketReward.miniEpochsReward,
+      startDate: marketReward.startDate
+        ? new Date(marketReward.startDate)
+        : undefined,
+      endDate: marketReward.endDate
+        ? new Date(marketReward.endDate)
+        : undefined,
+      createdAt: marketReward.createdAt
+        ? new Date(marketReward.createdAt)
+        : undefined,
+      updatedAt: marketReward.updatedAt
+        ? new Date(marketReward.updatedAt)
+        : undefined,
     }
   }
 
@@ -109,12 +122,16 @@ export class DmmGrpcTransformer {
     eligibleAddress: GrpcEligibleAddress,
   ): EligibleAddress {
     return {
+      source: eligibleAddress.source,
       epochId: eligibleAddress.epochId,
-      accountAddress: eligibleAddress.accountAddress,
       height: eligibleAddress.height?.toString(),
-      source: eligibleAddress.source,
-      createdAt: protobufTimestampToDate(eligibleAddress.createdAt),
-      updatedAt: protobufTimestampToDate(eligibleAddress.updatedAt),
+      accountAddress: eligibleAddress.accountAddress,
+      createdAt: eligibleAddress.createdAt
+        ? new Date(eligibleAddress.createdAt)
+        : undefined,
+      updatedAt: eligibleAddress.updatedAt
+        ? new Date(eligibleAddress.updatedAt)
+        : undefined,
     }
   }
 
@@ -131,28 +148,28 @@ export class DmmGrpcTransformer {
 
   static grpcEpochScoresToEpochScores(score: GrpcEpochScore): EpochScore {
     return {
+      volume: score.volume,
+      reward: score.reward,
       epochId: score.epochId,
-      accountAddress: score.accountAddress,
-      height: score.height?.toString(),
-      blockTime: protobufTimestampToDate(score.blockTime),
-      startHeight: score.startHeight?.toString(),
-      liquidityScore: score.liquidityScore,
-      liquidityScorePonderated: score.liquidityScorePonderated,
+      qualifies: score.qualifies,
+      totalScore: score.totalScore,
       uptimeScore: score.uptimeScore,
-      uptimeScorePonderated: score.uptimeScorePonderated,
-      uptimePercentage: score.uptimePercentage,
       volumeScore: score.volumeScore,
-      volumeScorePonderated: score.volumeScorePonderated,
-      totalScore: score.totalScore,
-      volume: score.volume,
       makerVolume: score.makerVolume,
       takerVolume: score.takerVolume,
-      reward: score.reward,
+      height: score.height?.toString(),
+      accountAddress: score.accountAddress,
+      liquidityScore: score.liquidityScore,
+      uptimePercentage: score.uptimePercentage,
       rewardPercentage: score.rewardPercentage,
-      qualifies: score.qualifies,
       volumePercentage: score.volumePercentage,
-      createdAt: protobufTimestampToDate(score.createdAt),
-      updatedAt: protobufTimestampToDate(score.updatedAt),
+      startHeight: score.startHeight?.toString(),
+      uptimeScorePonderated: score.uptimeScorePonderated,
+      volumeScorePonderated: score.volumeScorePonderated,
+      liquidityScorePonderated: score.liquidityScorePonderated,
+      blockTime: score.blockTime ? new Date(score.blockTime) : undefined,
+      createdAt: score.createdAt ? new Date(score.createdAt) : undefined,
+      updatedAt: score.updatedAt ? new Date(score.updatedAt) : undefined,
     }
   }
 
@@ -180,37 +197,37 @@ export class DmmGrpcTransformer {
 
   static grpcTotalScoresToTotalScores(score: GrpcTotalScore): TotalScore {
     return {
-      epochId: score.epochId,
-      marketId: score.marketId,
-      accountAddress: score.accountAddress,
-      height: score.height?.toString(),
-      startHeight: score.startHeight?.toString(),
-      blockTime: protobufTimestampToDate(score.blockTime),
       bid: score.bid,
       ask: score.ask,
       depth: score.depth,
-      snapshotCount: score.snapshotCount,
-      liquidityScore: score.liquidityScore,
-      liquidityScorePonderated: score.liquidityScorePonderated,
+      volume: score.volume,
+      reward: score.reward,
+      epochId: score.epochId,
+      marketId: score.marketId,
+      totalScore: score.totalScore,
       uptimeScore: score.uptimeScore,
-      uptimeScorePonderated: score.uptimeScorePonderated,
-      uptimePercentage: score.uptimePercentage,
       startVolume: score.startVolume,
-      currentVolume: score.currentVolume,
-      volume: score.volume,
       volumeScore: score.volumeScore,
-      volumeScorePonderated: score.volumeScorePonderated,
-      takerStartVolume: score.takerStartVolume,
-      takerCurrentVolume: score.takerCurrentVolume,
       takerVolume: score.takerVolume,
-      makerStartVolume: score.makerStartVolume,
-      makerCurrentVolume: score.makerCurrentVolume,
       makerVolume: score.makerVolume,
-      totalScore: score.totalScore,
-      reward: score.reward,
+      height: score.height?.toString(),
+      snapshotCount: score.snapshotCount,
+      currentVolume: score.currentVolume,
+      accountAddress: score.accountAddress,
+      liquidityScore: score.liquidityScore,
+      uptimePercentage: score.uptimePercentage,
+      takerStartVolume: score.takerStartVolume,
+      makerStartVolume: score.makerStartVolume,
       rewardPercentage: score.rewardPercentage,
-      createdAt: protobufTimestampToDate(score.createdAt),
-      updatedAt: protobufTimestampToDate(score.updatedAt),
+      startHeight: score.startHeight?.toString(),
+      takerCurrentVolume: score.takerCurrentVolume,
+      makerCurrentVolume: score.makerCurrentVolume,
+      uptimeScorePonderated: score.uptimeScorePonderated,
+      volumeScorePonderated: score.volumeScorePonderated,
+      liquidityScorePonderated: score.liquidityScorePonderated,
+      blockTime: score.blockTime ? new Date(score.blockTime) : undefined,
+      createdAt: score.createdAt ? new Date(score.createdAt) : undefined,
+      updatedAt: score.updatedAt ? new Date(score.updatedAt) : undefined,
     }
   }
 
@@ -242,15 +259,15 @@ export class DmmGrpcTransformer {
     reward: GrpcRewardDistribution,
   ): RewardDistribution {
     return {
+      depth: reward.depth,
+      reward: reward.reward,
       epochId: reward.epochId,
-      accountAddress: reward.accountAddress,
       height: reward.height?.toString(),
+      accountAddress: reward.accountAddress,
       startHeight: reward.startHeight?.toString(),
-      blockTime: protobufTimestampToDate(reward.blockTime),
-      depth: reward.depth,
-      reward: reward.reward,
-      createdAt: protobufTimestampToDate(reward.createdAt),
-      updatedAt: protobufTimestampToDate(reward.updatedAt),
+      blockTime: reward.blockTime ? new Date(reward.blockTime) : undefined,
+      createdAt: reward.createdAt ? new Date(reward.createdAt) : undefined,
+      updatedAt: reward.updatedAt ? new Date(reward.updatedAt) : undefined,
     }
   }
 
@@ -266,27 +283,29 @@ export class DmmGrpcTransformer {
     reward: GrpcAccountVolume,
   ): AccountVolume {
     return {
-      epochId: reward.epochId,
-      accountAddress: reward.accountAddress,
-      height: reward.height?.toString(),
-      blockTime: protobufTimestampToDate(reward.blockTime),
       date: reward.date,
-      dateTimestamp: protobufTimestampToDate(reward.dateTimestamp),
       volume: reward.volume,
+      epochId: reward.epochId,
       takerVolume: reward.takerVolume,
       makerVolume: reward.makerVolume,
-      volumePercentage: reward.volumePercentage,
-      makerVolumePercentage: reward.makerVolumePercentage,
-      takerVolumePercentage: reward.takerVolumePercentage,
       dailyVolume: reward.dailyVolume,
+      height: reward.height?.toString(),
+      accountAddress: reward.accountAddress,
+      dailyQualified: reward.dailyQualified,
+      volumePercentage: reward.volumePercentage,
       dailyMakerVolume: reward.dailyMakerVolume,
       dailyTakerVolume: reward.dailyTakerVolume,
+      makerVolumePercentage: reward.makerVolumePercentage,
+      takerVolumePercentage: reward.takerVolumePercentage,
       dailyVolumePercentage: reward.dailyVolumePercentage,
       dailyMakerVolumePercentage: reward.dailyMakerVolumePercentage,
       dailyTakerVolumePercentage: reward.dailyTakerVolumePercentage,
-      dailyQualified: reward.dailyQualified,
-      createdAt: protobufTimestampToDate(reward.createdAt),
-      updatedAt: protobufTimestampToDate(reward.updatedAt),
+      blockTime: reward.blockTime ? new Date(reward.blockTime) : undefined,
+      createdAt: reward.createdAt ? new Date(reward.createdAt) : undefined,
+      updatedAt: reward.updatedAt ? new Date(reward.updatedAt) : undefined,
+      dateTimestamp: reward.dateTimestamp
+        ? new Date(reward.dateTimestamp)
+        : undefined,
     }
   }
 
@@ -296,16 +315,16 @@ export class DmmGrpcTransformer {
     const volumes = response.volumes
 
     return {
-      volumes: volumes.map(
-        DmmGrpcTransformer.grpcAccountVolumesToAccountVolumes,
-      ),
+      estimatedReward: response.estimatedReward,
+      eligibleForNextEpoch: response.eligibleForNextEpoch,
+      eligibleForCurrentEpoch: response.eligibleForCurrentEpoch,
       currentMakerVolumePercentage: response.currentMakerVolumePercentage,
+      updatedAt: response.updatedAt ? new Date(response.updatedAt) : undefined,
       averageDailyMakerVolumePercentage:
         response.averageDailyMakerVolumePercentage,
-      eligibleForNextEpoch: response.eligibleForNextEpoch,
-      eligibleForCurrentEpoch: response.eligibleForCurrentEpoch,
-      estimatedReward: response.estimatedReward,
-      updatedAt: protobufTimestampToDate(response.updatedAt),
+      volumes: volumes.map(
+        DmmGrpcTransformer.grpcAccountVolumesToAccountVolumes,
+      ),
     }
   }
 

packages/sdk-ts/src/client/olp/grpc/types/index.ts

@@ -1,4 +1,4 @@
-import type * as DmmPb from '@injectivelabs/olp-proto-ts-v2/generated/dmm_pb'
+import type * as DmmPb from '@injectivelabs/olp-proto-ts-v2/generated/goagen_olp_injective_dmm_v2_pb'
 
 export interface DmmPagination {
   from?: number
@@ -52,7 +52,7 @@ export interface AccountVolumes {
 export interface RewardsEligibility {
   volumes: AccountVolume[]
   currentMakerVolumePercentage: string
-  averageDailyMakerVolumePercentage: string
+  averageDailyMakerVolumePercentage?: string
   eligibleForNextEpoch: boolean
   eligibleForCurrentEpoch: boolean
   estimatedReward: string
@@ -86,8 +86,8 @@ export interface EpochConfigV2 {
   liquidityScoreExponent: string
   uptimeExponent: string
   volumeExponent: string
-  permanenceVolumeThreshold: string
-  qualifyingVolumeThreshold: string
+  permanenceVolumeThreshold?: string
+  qualifyingVolumeThreshold?: string
   number: number
   isMiniEpoch: boolean
 }