Correcting types and event parsing for Cosmos SDK 0.50 (#271)

* WIP correcting types and event parsing

* Tidy up

* Further improvement to wrappingEvents

* Minor change

package.json

@@ -31,7 +31,7 @@
     "ts-loader": "^9.2.6",
     "ts-node": "^10.4.0",
     "tsconfig-paths": "^3.12.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.5.3"
   },
   "resolutions": {
     "node-fetch": "2.6.7"

packages/node/src/indexer/api.service.test.ts

@@ -107,6 +107,7 @@ describe('ApiService', () => {
 
       expect(rpcFetchSpy).toHaveBeenCalledTimes(1);
     });
+
     it.skip('query block info', async () => {
       await prepareApiService(ENDPOINT, CHAINID, tmpPath);
 

packages/node/src/indexer/api.service.ts

@@ -7,11 +7,6 @@ import { Uint53 } from '@cosmjs/math';
 import { GeneratedType, Registry } from '@cosmjs/proto-signing';
 import { Block, defaultRegistryTypes, SearchTxQuery } from '@cosmjs/stargate';
 import { CometClient, toRfc3339WithNanoseconds } from '@cosmjs/tendermint-rpc';
-import {
-  BlockResponse,
-  BlockResultsResponse,
-  Validator,
-} from '@cosmjs/tendermint-rpc/build/tendermint37/responses';
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CosmosProjectNetConfig } from '@subql/common-cosmos';
@@ -36,7 +31,7 @@ import { SubqueryProject } from '../configure/SubqueryProject';
 import * as CosmosUtil from '../utils/cosmos';
 import { KyveApi } from '../utils/kyve/kyve';
 import { CosmosClientConnection } from './cosmosClient.connection';
-import { BlockContent } from './types';
+import { BlockContent, BlockResponse, BlockResultsResponse } from './types';
 
 const logger = getLogger('api');
 
@@ -257,7 +252,9 @@ export class CosmosSafeClient
     };
   }
 
-  async validators(): Promise<readonly Validator[]> {
+  async validators(): Promise<
+    Awaited<ReturnType<CometClient['validators']>>['validators']
+  > {
     return (
       await this.forceGetCometClient().validators({
         height: this.height,

packages/node/src/indexer/cosmosClient.connection.ts

@@ -30,7 +30,7 @@ const logger = getLogger('CosmosClientConnection');
 /**
  * Auto-detects the version of the backend and uses a suitable client.
  */
-export async function connectComet(
+async function connectComet(
   client: WebsocketClient | HttpClient,
 ): Promise<CometClient> {
   // Tendermint/CometBFT 0.34/0.37/0.38 auto-detection. Starting with 0.37 we seem to get reliable versions again 🎉

packages/node/src/indexer/types.ts

@@ -1,20 +1,34 @@
 // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 
+import type {
+  tendermint34,
+  tendermint37,
+  comet38,
+} from '@cosmjs/tendermint-rpc';
 import {
   CosmosBlock,
   CosmosEvent,
   CosmosTransaction,
   CosmosMessage,
 } from '@subql/types-cosmos';
 
+export type BlockResponse =
+  | tendermint34.BlockResponse
+  | tendermint37.BlockResponse
+  | comet38.BlockResponse;
+export type BlockResultsResponse =
+  | tendermint34.BlockResultsResponse
+  | tendermint37.BlockResultsResponse
+  | comet38.BlockResultsResponse;
+
 export interface BlockContent {
   block: CosmosBlock;
   transactions: CosmosTransaction[];
   messages: CosmosMessage[];
   events: CosmosEvent[];
-  beginBlockEvents: CosmosEvent[];
-  endBlockEvents: CosmosEvent[];
+  beginBlockEvents?: CosmosEvent[];
+  endBlockEvents?: CosmosEvent[];
 }
 
 export type BestBlocks = Record<number, string>;