Address comments

subquery · Nov 19, 2024 · d1ed5d8 · d1ed5d8
1 parent 0038ce5
commit d1ed5d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/packages/node-core/src/indexer/store.service.ts b/packages/node-core/src/indexer/store.service.ts
@@ -308,7 +308,7 @@ export class StoreService {
         throw new Error(`Invalid value for historicalStateEnabled. Received "${value}"`);
       }
 
-      if (value && multiChain) {
+      if ((value === true || value.toString() === 'height') && multiChain) {
         throw new Error(
           'Historical indexing by height is enabled and not compatible with multi-chain, to multi-chain index clear postgres schema and re-index project using --multichain'
         );

diff --git a/packages/node-core/src/indexer/worker/worker.ts b/packages/node-core/src/indexer/worker/worker.ts
@@ -80,9 +80,9 @@ async function getStatus(): Promise<WorkerStatusResponse> {
   };
 }
 
-async function fetchBlock<R extends Header /*FetchBlockResponse*/>(height: number, specVersion: number): Promise<R> {
+async function fetchBlock(height: number, specVersion: number): ReturnType<(typeof workerService)['fetchBlock']> {
   assert(workerService, 'Worker Not initialised');
-  return (workerService as unknown as BaseWorkerService<any, R>).fetchBlock(height, {specVersion});
+  return workerService.fetchBlock(height, {specVersion});
 }
 
 // eslint-disable-next-line @typescript-eslint/require-await

diff --git a/packages/node-core/src/subcommands/reindex.service.ts b/packages/node-core/src/subcommands/reindex.service.ts
@@ -62,9 +62,9 @@ export class ReindexService<P extends ISubqueryProject, DS extends BaseDataSourc
 
     await this.dynamicDsService.init(this.metadataRepo);
 
-    const [height, timestamp] = await Promise.all([
-      this.metadataRepo.find('lastProcessedHeight'),
-      this.metadataRepo.find('lastProcessedBlockTimestamp'),
+    const {lastProcessedBlockTimestamp: timestamp, lastProcessedHeight: height} = await this.metadataRepo.findMany([
+      'lastProcessedHeight',
+      'lastProcessedBlockTimestamp',
     ]);
 
     if (height === undefined) {

diff --git a/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts b/packages/node/src/indexer/blockDispatcher/worker-block-dispatcher.service.ts
@@ -132,7 +132,7 @@ export class WorkerBlockDispatcherService
     }
 
     // const start = new Date();
-    return worker.fetchBlock<FetchBlockResponse>(height, blockSpecVersion);
+    return worker.fetchBlock(height, blockSpecVersion);
     // const end = new Date();
 
     // const waitTime = end.getTime() - start.getTime();