Runtime fixes

subquery · Apr 20, 2023 · 9a4b575 · 9a4b575
1 parent 1bffbfb
commit 9a4b575
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 45 deletions.
diff --git a/packages/node-core/src/indexer/blockDispatcher/worker-block-dispatcher.ts b/packages/node-core/src/indexer/blockDispatcher/worker-block-dispatcher.ts
@@ -29,7 +29,7 @@ type Worker = {
 };
 
 function initAutoQueue<T>(workers: number | undefined, batchSize: number): AutoQueue<T> {
-  assert(workers && workers < 0, 'Number of workers must be greater than 0');
+  assert(workers && workers > 0, 'Number of workers must be greater than 0');
   return new AutoQueue(workers * batchSize * 2);
 }
 

diff --git a/packages/node-core/src/indexer/dictionary.service.ts b/packages/node-core/src/indexer/dictionary.service.ts
@@ -196,7 +196,7 @@ export class DictionaryService implements OnApplicationShutdown {
     });
   }
 
-  setDictionaryStartHeight(start: number | undefined): void {
+  private setDictionaryStartHeight(start: number | undefined): void {
     // Since not all dictionary has adopt start height, if it is not set, we just consider it is 1.
     if (this._startHeight !== undefined) {
       return;
@@ -312,11 +312,14 @@ export class DictionaryService implements OnApplicationShutdown {
     }
     return buildQuery(vars, nodes);
   }
-  buildDictionaryEntryMap<DS extends {startBlock: number}>(
+  buildDictionaryEntryMap<DS extends {startBlock?: number}>(
     dataSources: Array<DS>,
     buildDictionaryQueryEntries: (startBlock: number) => DictionaryQueryEntry[]
   ): void {
-    for (const ds of dataSources.sort((a, b) => a.startBlock - b.startBlock)) {
+    const dsWithStartBlock = (dataSources.filter((ds) => !!ds.startBlock) as (DS & {startBlock: number})[]).sort(
+      (a, b) => a.startBlock - b.startBlock
+    );
+    for (const ds of dsWithStartBlock) {
       this.mappedDictionaryQueryEntries.set(ds.startBlock, buildDictionaryQueryEntries(ds.startBlock));
     }
   }
@@ -363,6 +366,9 @@ export class DictionaryService implements OnApplicationShutdown {
         this.nodeConfig.dictionaryTimeout
       );
       const _metadata = resp.data._metadata;
+
+      this.setDictionaryStartHeight(_metadata.startHeight);
+
       return {_metadata};
     } catch (err: any) {
       if (JSON.stringify(err).includes(startHeightEscaped)) {

diff --git a/packages/node-core/src/indexer/store.service.ts b/packages/node-core/src/indexer/store.service.ts
@@ -130,7 +130,7 @@ export class StoreService {
     return this._blockHeight;
   }
 
-  private get historical(): boolean {
+  get historical(): boolean {
     assert(!!this._historical, new NoInitError());
     return this._historical;
   }

diff --git a/packages/node/src/configure/SubqueryProject.ts b/packages/node/src/configure/SubqueryProject.ts
@@ -18,7 +18,6 @@ import {
   ProjectManifestV0_2_1Impl,
   ProjectManifestV0_3_0Impl,
   SubstrateDataSource,
-  FileType,
   ProjectManifestV1_0_0Impl,
   SubstrateBlockFilter,
   isRuntimeDs,
@@ -53,11 +52,14 @@ const NOT_SUPPORT = (name: string) => {
   throw new Error(`Manifest specVersion ${name}() is not supported`);
 };
 
+// This is the runtime type after we have mapped genesisHash to chainId and endpoint/dict have been provided when dealing with deployments
+type NetworkConfig = SubstrateProjectNetworkConfig & { chainId: string };
+
 @Injectable()
 export class SubqueryProject {
   id: string;
   root: string;
-  network: SubstrateProjectNetworkConfig;
+  network: NetworkConfig;
   dataSources: SubqlProjectDs[];
   schema: GraphQLSchema;
   templates: SubqlProjectDsTemplate[];
@@ -106,14 +108,7 @@ export class SubqueryProject {
   }
 }
 
-export interface SubqueryProjectNetwork {
-  chainId: string;
-  endpoint?: string[];
-  dictionary?: string;
-  chaintypes?: FileType;
-}
-
-function processChainId(network: any): SubqueryProjectNetwork {
+function processChainId(network: any): NetworkConfig {
   if (network.chainId && network.genesisHash) {
     throw new Error('Please only provide one of chainId and genesisHash');
   } else if (network.genesisHash && !network.chainId) {
@@ -260,7 +255,7 @@ export async function generateTimestampReferenceForBlockFilters(
       if (isRuntimeDs(ds)) {
         const startBlock = ds.startBlock ?? 1;
         let block;
-        let timestampReference;
+        let timestampReference: Date;
 
         ds.mapping.handlers = await Promise.all(
           ds.mapping.handlers.map(async (handler) => {

diff --git a/packages/node/src/indexer/api.service.spec.ts b/packages/node/src/indexer/api.service.spec.ts
@@ -59,7 +59,9 @@ function testSubqueryProject(): SubqueryProject {
   return {
     network: {
       endpoint: testNetwork.endpoint,
-      genesisHash:
+      // genesisHash:
+      //   '0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe',
+      chainId:
         '0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe',
     },
     chainTypes: {

diff --git a/packages/node/src/indexer/api.service.test.ts b/packages/node/src/indexer/api.service.test.ts
@@ -25,6 +25,7 @@ function testSubqueryProject(endpoint: string[]): SubqueryProject {
     network: {
       endpoint,
       dictionary: `https://api.subquery.network/sq/subquery/dictionary-polkadot`,
+      chainId: '',
     },
     dataSources: [],
     id: 'test',

diff --git a/packages/node/src/indexer/blockDispatcher/block-dispatcher.service.ts b/packages/node/src/indexer/blockDispatcher/block-dispatcher.service.ts
@@ -46,21 +46,6 @@ export class BlockDispatcherService
     @Inject('ISubqueryProject') project: SubqueryProject,
     dynamicDsService: DynamicDsService,
   ) {
-    const fetchBlockBatchesWrapped = async (
-      blockNums: number[],
-    ): Promise<BlockContent[]> => {
-      const specChanged = await this.runtimeService.specChanged(
-        blockNums[blockNums.length - 1],
-      );
-
-      // If specVersion not changed, a known overallSpecVer will be pass in
-      // Otherwise use api to fetch runtimes
-      return this.apiService.fetchBlocks(
-        blockNums,
-        specChanged ? undefined : this.runtimeService.parentSpecVersion,
-      );
-    };
-
     super(
       nodeConfig,
       eventEmitter,
@@ -71,7 +56,18 @@ export class BlockDispatcherService
       poiService,
       project,
       dynamicDsService,
-      fetchBlockBatchesWrapped,
+      async (blockNums: number[]): Promise<BlockContent[]> => {
+        const specChanged = await this.runtimeService.specChanged(
+          blockNums[blockNums.length - 1],
+        );
+
+        // If specVersion not changed, a known overallSpecVer will be pass in
+        // Otherwise use api to fetch runtimes
+        return this.apiService.fetchBlocks(
+          blockNums,
+          specChanged ? undefined : this.runtimeService.parentSpecVersion,
+        );
+      },
     );
   }
 

diff --git a/packages/node/src/indexer/dictionary.service.test.ts b/packages/node/src/indexer/dictionary.service.test.ts
@@ -9,7 +9,9 @@ import { DictionaryService } from './dictionary.service';
 function testSubqueryProject(): SubqueryProject {
   return {
     network: {
+      endpoint: '',
       dictionary: `https://api.subquery.network/sq/subquery/polkadot-dictionary`,
+      chainId: '',
     },
     dataSources: [],
     id: 'test',

diff --git a/packages/node/src/indexer/ds-processor.service.spec.ts b/packages/node/src/indexer/ds-processor.service.spec.ts
@@ -14,7 +14,7 @@ function getTestProject(
 ): SubqueryProject {
   return {
     network: {
-      genesisHash: '0x',
+      chainId: '0x',
       endpoint: ['wss://polkadot.api.onfinality.io/public-ws'],
     },
     dataSources: [

diff --git a/packages/node/src/indexer/fetch.module.ts b/packages/node/src/indexer/fetch.module.ts
@@ -13,9 +13,7 @@ import {
   SmartBatchService,
   StoreCacheService,
 } from '@subql/node-core';
-import { Sequelize } from 'sequelize';
-
-import { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';
+import { SubqueryProject } from '../configure/SubqueryProject';
 import { ApiService } from './api.service';
 import {
   BlockDispatcherService,

diff --git a/packages/node/src/indexer/fetch.service.spec.ts b/packages/node/src/indexer/fetch.service.spec.ts
@@ -287,6 +287,7 @@ function mockDictionaryService3(): DictionaryService {
 function testSubqueryProject(): SubqueryProject {
   return {
     network: {
+      chainId: '0x',
       endpoint: ['wss://polkadot.api.onfinality.io/public-ws'],
     },
     chainTypes: {
@@ -305,7 +306,8 @@ function testSubqueryProject(): SubqueryProject {
 function testSubqueryProjectV0_2_0(): SubqueryProject {
   return {
     network: {
-      genesisHash: '0x',
+      chainId: '0x',
+      endpoint: [],
       dictionary: `https://api.subquery.network/sq/subquery/dictionary-polkadot`,
     },
     dataSources: [

diff --git a/packages/node/src/indexer/fetch.service.test.ts b/packages/node/src/indexer/fetch.service.test.ts
@@ -43,6 +43,7 @@ const HTTP_ENDPOINT = 'https://polkadot.api.onfinality.io/public';
 function testSubqueryProject(): SubqueryProject {
   return {
     network: {
+      chainId: '0x',
       endpoint: [WS_ENDPOINT],
     },
     chainTypes: {

diff --git a/packages/node/src/indexer/fetch.service.ts b/packages/node/src/indexer/fetch.service.ts
@@ -278,9 +278,6 @@ export class FetchService implements OnApplicationShutdown {
     );
 
     if (dictionaryValid) {
-      this.dictionaryService.setDictionaryStartHeight(
-        metadata?._metadata?.startHeight,
-      );
       const rawSpecVersions = await this.dictionaryService.getSpecVersionsRaw();
       this.runtimeService.setSpecVersionMap(rawSpecVersions);
     } else {
@@ -420,7 +417,10 @@ export class FetchService implements OnApplicationShutdown {
         : initBlockHeight;
     };
 
-    if (this.dictionaryService.startHeight > getStartBlockHeight()) {
+    if (
+      this.useDictionary &&
+      this.dictionaryService.startHeight > getStartBlockHeight()
+    ) {
       logger.warn(
         `Dictionary start height ${
           this.dictionaryService.startHeight

diff --git a/packages/node/src/indexer/indexer.manager.spec.ts b/packages/node/src/indexer/indexer.manager.spec.ts
@@ -63,6 +63,7 @@ const nodeConfig = new NodeConfig({
 function testSubqueryProject_1(): SubqueryProject {
   return {
     network: {
+      chainId: '0x',
       endpoint: ['wss://polkadot.api.onfinality.io/public-ws'],
     },
     dataSources: [
@@ -103,7 +104,7 @@ function testSubqueryProject_2(): SubqueryProject {
     network: {
       endpoint: ['wss://polkadot.api.onfinality.io/public-ws'],
       dictionary: `https://api.subquery.network/sq/subquery/dictionary-polkadot`,
-      genesisHash:
+      chainId:
         '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3',
     },
     dataSources: [

diff --git a/packages/node/src/indexer/worker/worker.ts b/packages/node/src/indexer/worker/worker.ts
@@ -58,7 +58,7 @@ async function initWorker(): Promise<void> {
     }
 
     app = await NestFactory.create(WorkerModule, {
-      logger: new NestLogger(), // TIP: If the worker is crashing comment out this line for better logging
+      // logger: new NestLogger(), // TIP: If the worker is crashing comment out this line for better logging
     });
 
     await app.init();

diff --git a/packages/types/src/project.ts b/packages/types/src/project.ts
@@ -100,7 +100,7 @@ export interface SubstrateNetworkFilter {
   specName?: string;
 }
 
-export type SubstrateDatasource = SubstrateRuntimeDatasource | SubstrateCustomDatasource; // | SubstrateBuiltinDataSource;
+export type SubstrateDatasource = SubstrateRuntimeDatasource | SubstrateCustomDatasource;
 
 export interface FileReference {
   file: string;