@subql/node-ethereum 2.12.6-1 → 2.12.6-2

package/dist/indexer/blockDispatcher/block-dispatcher.service.d.ts

@@ -1,16 +1,16 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { NodeConfig, SmartBatchService, StoreCacheService, StoreService, IProjectService, PoiService, BlockDispatcher, ProcessBlockResponse, ApiService } from '@subql/node-core';
-import { EthereumBlockWrapper } from '@subql/types-ethereum';
-import { SubqlProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
+import { NodeConfig, SmartBatchService, StoreCacheService, StoreService, IProjectService, PoiService, BlockDispatcher, ProcessBlockResponse, ApiService, IProjectUpgradeService } from '@subql/node-core';
+import { EthereumProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
 import { DynamicDsService } from '../dynamic-ds.service';
 import { IndexerManager } from '../indexer.manager';
+import { BlockContent } from '../types';
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
-export declare class BlockDispatcherService extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs> implements OnApplicationShutdown {
+export declare class BlockDispatcherService extends BlockDispatcher<BlockContent, EthereumProjectDs> implements OnApplicationShutdown {
     private indexerManager;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService<SubqlProjectDs>, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService);
-    protected getBlockHeight(block: EthereumBlockWrapper): number;
-    protected indexBlock(block: EthereumBlockWrapper): Promise<ProcessBlockResponse>;
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService<EthereumProjectDs>, projectUpgradeService: IProjectUpgradeService, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService);
+    protected getBlockHeight(block: BlockContent): number;
+    protected indexBlock(block: BlockContent): Promise<ProcessBlockResponse>;
 }

package/dist/indexer/blockDispatcher/block-dispatcher.service.js

@@ -25,25 +25,26 @@ const indexer_manager_1 = require("../indexer.manager");
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
 let BlockDispatcherService = class BlockDispatcherService extends node_core_1.BlockDispatcher {
-    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService) {
-        super(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, apiService.fetchBlocks.bind(apiService));
+    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService) {
+        super(nodeConfig, eventEmitter, projectService, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, apiService.fetchBlocks.bind(apiService));
         this.indexerManager = indexerManager;
     }
     getBlockHeight(block) {
-        return block.blockHeight;
+        return block.number;
     }
     async indexBlock(block) {
-        return this.indexerManager.indexBlock(block, await this.projectService.getAllDataSources(this.getBlockHeight(block)));
+        return this.indexerManager.indexBlock(block, await this.projectService.getDataSources(this.getBlockHeight(block)));
     }
 };
 BlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
     __param(4, (0, common_1.Inject)('IProjectService')),
-    __param(9, (0, common_1.Inject)('ISubqueryProject')),
+    __param(5, (0, common_1.Inject)('IProjectUpgradeService')),
+    __param(10, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.NodeConfig,
         indexer_manager_1.IndexerManager,
-        event_emitter_1.EventEmitter2, Object, node_core_1.SmartBatchService,
+        event_emitter_1.EventEmitter2, Object, Object, node_core_1.SmartBatchService,
         node_core_1.StoreService,
         node_core_1.StoreCacheService,
         node_core_1.PoiService,

package/dist/indexer/blockDispatcher/block-dispatcher.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAA2E;AAC3E,yDAAsD;AACtD,gDAU0B;AAE1B,qEAGyC;AACzC,8DAAyD;AACzD,wDAAoD;AAEpD;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBACX,SAAQ,2BAAqD;IAG7D,YACE,UAAsB,EACtB,UAAsB,EACd,cAA8B,EACtC,YAA2B,EACA,cAA+C,EAC1E,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC;QAElC,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CACxC,CAAC;QArBM,mBAAc,GAAd,cAAc,CAAgB;IAsBxC,CAAC;IAES,cAAc,CAAC,KAA2B;QAClD,OAAO,KAAK,CAAC,WAAW,CAAC;IAC3B,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,KAA2B;QAE3B,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,KAAK,EACL,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CACxE,CAAC;IACJ,CAAC;CACF,CAAA;AA3CY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAKzB,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCATf,sBAAU;QACV,sBAAU;QACE,gCAAc;QACxB,6BAAa,UAER,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;GAfzB,sBAAsB,CA2ClC;AA3CY,wDAAsB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  SmartBatchService,\n  StoreCacheService,\n  StoreService,\n  IProjectService,\n  PoiService,\n  BlockDispatcher,\n  ProcessBlockResponse,\n  ApiService,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { IndexerManager } from '../indexer.manager';\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs>\n  implements OnApplicationShutdown\n{\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService') projectService: IProjectService<SubqlProjectDs>,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      apiService.fetchBlocks.bind(apiService),\n    );\n  }\n\n  protected getBlockHeight(block: EthereumBlockWrapper): number {\n    return block.blockHeight;\n  }\n\n  protected async indexBlock(\n    block: EthereumBlockWrapper,\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(\n      block,\n      await this.projectService.getAllDataSources(this.getBlockHeight(block)),\n    );\n  }\n}\n"]}
+{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAA2E;AAC3E,yDAAsD;AACtD,gDAW0B;AAC1B,qEAGyC;AACzC,8DAAyD;AACzD,wDAAoD;AAGpD;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBACX,SAAQ,2BAAgD;IAGxD,YACE,UAAsB,EACtB,UAAsB,EACd,cAA8B,EACtC,YAA2B,EAE3B,cAAkD,EAElD,qBAA6C,EAC7C,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC;QAElC,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CACxC,CAAC;QAzBM,mBAAc,GAAd,cAAc,CAAgB;IA0BxC,CAAC;IAES,cAAc,CAAC,KAAmB;QAC1C,OAAO,KAAK,CAAC,MAAM,CAAC;IACtB,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,KAAmB;QAEnB,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,KAAK,EACL,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CACrE,CAAC;IACJ,CAAC;CACF,CAAA;AA/CY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAMhC,YAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAZf,sBAAU;QACV,sBAAU;QACE,gCAAc;QACxB,6BAAa,kBAKR,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;GAlBzB,sBAAsB,CA+ClC;AA/CY,wDAAsB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  SmartBatchService,\n  StoreCacheService,\n  StoreService,\n  IProjectService,\n  PoiService,\n  BlockDispatcher,\n  ProcessBlockResponse,\n  ApiService,\n  IProjectUpgradeService,\n} from '@subql/node-core';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BlockDispatcher<BlockContent, EthereumProjectDs>\n  implements OnApplicationShutdown\n{\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgradeService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      apiService.fetchBlocks.bind(apiService),\n    );\n  }\n\n  protected getBlockHeight(block: BlockContent): number {\n    return block.number;\n  }\n\n  protected async indexBlock(\n    block: BlockContent,\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(\n      block,\n      await this.projectService.getDataSources(this.getBlockHeight(block)),\n    );\n  }\n}\n"]}

package/dist/indexer/blockDispatcher/worker-block-dispatcher.service.d.ts

@@ -1,7 +1,7 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { NodeConfig, SmartBatchService, StoreService, PoiService, StoreCacheService, IProjectService, WorkerBlockDispatcher, ConnectionPoolStateManager } from '@subql/node-core';
-import { SubqlProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
+import { NodeConfig, SmartBatchService, StoreService, PoiService, StoreCacheService, IProjectService, WorkerBlockDispatcher, ConnectionPoolStateManager, IProjectUpgradeService } from '@subql/node-core';
+import { EthereumProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
 import { EthereumApiConnection } from '../../ethereum/api.connection';
 import { DynamicDsService } from '../dynamic-ds.service';
 import { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';
@@ -9,8 +9,8 @@ import { IIndexerWorker } from '../worker/worker';
 type IndexerWorker = IIndexerWorker & {
     terminate: () => Promise<number>;
 };
-export declare class WorkerBlockDispatcherService extends WorkerBlockDispatcher<SubqlProjectDs, IndexerWorker> implements OnApplicationShutdown {
-    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService<SubqlProjectDs>, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService, connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>);
+export declare class WorkerBlockDispatcherService extends WorkerBlockDispatcher<EthereumProjectDs, IndexerWorker> implements OnApplicationShutdown {
+    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService<EthereumProjectDs>, projectUpgadeService: IProjectUpgradeService, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService, connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>);
     protected fetchBlock(worker: IndexerWorker, height: number): Promise<void>;
 }
 export {};

package/dist/indexer/blockDispatcher/worker-block-dispatcher.service.js

@@ -25,28 +25,18 @@ const node_core_1 = require("@subql/node-core");
 const SubqueryProject_1 = require("../../configure/SubqueryProject");
 const dynamic_ds_service_1 = require("../dynamic-ds.service");
 const unfinalizedBlocks_service_1 = require("../unfinalizedBlocks.service");
-const logger = (0, node_core_1.getLogger)('WorkerBlockDispatcherService');
-async function createIndexerWorker(store, dynamicDsService, unfinalizedBlocksService, connectionPoolState, root) {
-    const indexerWorker = node_core_1.Worker.create(path_1.default.resolve(__dirname, '../../../dist/indexer/worker/worker.js'), [
-        'initWorker',
-        'processBlock',
-        'fetchBlock',
-        'numFetchedBlocks',
-        'numFetchingBlocks',
-        'getStatus',
-        'getMemoryLeft',
-        'waitForWorkerBatchSize',
-    ], Object.assign({ storeGet: store.get.bind(store), storeGetByField: store.getByField.bind(store), storeGetOneByField: store.getOneByField.bind(store), storeSet: store.set.bind(store), storeBulkCreate: store.bulkCreate.bind(store), storeBulkUpdate: store.bulkUpdate.bind(store), storeRemove: store.remove.bind(store), storeBulkRemove: store.bulkRemove.bind(store), dynamicDsCreateDynamicDatasource: dynamicDsService.createDynamicDatasource.bind(dynamicDsService), dynamicDsGetDynamicDatasources: dynamicDsService.getDynamicDatasources.bind(dynamicDsService), unfinalizedBlocksProcess: unfinalizedBlocksService.processUnfinalizedBlockHeader.bind(unfinalizedBlocksService) }, (0, node_core_1.connectionPoolStateHostFunctions)(connectionPoolState)), root);
-    await indexerWorker.initWorker();
+async function createIndexerWorker(store, dynamicDsService, unfinalizedBlocksService, connectionPoolState, root, startHeight) {
+    const indexerWorker = node_core_1.Worker.create(path_1.default.resolve(__dirname, '../../../dist/indexer/worker/worker.js'), [...node_core_1.baseWorkerFunctions, 'initWorker'], Object.assign(Object.assign(Object.assign(Object.assign({}, (0, node_core_1.storeHostFunctions)(store)), (0, node_core_1.dynamicDsHostFunctions)(dynamicDsService)), { unfinalizedBlocksProcess: unfinalizedBlocksService.processUnfinalizedBlockHeader.bind(unfinalizedBlocksService) }), (0, node_core_1.connectionPoolStateHostFunctions)(connectionPoolState)), root);
+    await indexerWorker.initWorker(startHeight);
     return indexerWorker;
 }
 let WorkerBlockDispatcherService = class WorkerBlockDispatcherService extends node_core_1.WorkerBlockDispatcher {
-    constructor(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocksSevice, connectionPoolState) {
-        super(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, () => createIndexerWorker(storeService.getStore(), dynamicDsService, unfinalizedBlocksSevice, connectionPoolState, project.root));
+    constructor(nodeConfig, eventEmitter, projectService, projectUpgadeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocksSevice, connectionPoolState) {
+        super(nodeConfig, eventEmitter, projectService, projectUpgadeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, () => createIndexerWorker(storeService.getStore(), dynamicDsService, unfinalizedBlocksSevice, connectionPoolState, project.root, projectService.startHeight));
     }
     async fetchBlock(worker, height) {
         const start = new Date();
-        await worker.fetchBlock(height);
+        await worker.fetchBlock(height, null);
         const end = new Date();
         // const waitTime = end.getTime() - start.getTime();
         // if (waitTime > 1000) {
@@ -63,9 +53,10 @@ let WorkerBlockDispatcherService = class WorkerBlockDispatcherService extends no
 WorkerBlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)('IProjectService')),
-    __param(7, (0, common_1.Inject)('ISubqueryProject')),
+    __param(3, (0, common_1.Inject)('IProjectUpgradeService')),
+    __param(8, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.NodeConfig,
-        event_emitter_1.EventEmitter2, Object, node_core_1.SmartBatchService,
+        event_emitter_1.EventEmitter2, Object, Object, node_core_1.SmartBatchService,
         node_core_1.StoreService,
         node_core_1.StoreCacheService,
         node_core_1.PoiService,

package/dist/indexer/blockDispatcher/worker-block-dispatcher.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/worker-block-dispatcher.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport path from 'path';\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  getLogger,\n  NodeConfig,\n  Worker,\n  SmartBatchService,\n  StoreService,\n  PoiService,\n  StoreCacheService,\n  IProjectService,\n  IDynamicDsService,\n  HostStore,\n  HostDynamicDS,\n  WorkerBlockDispatcher,\n  IUnfinalizedBlocksService,\n  HostConnectionPoolState,\n  ConnectionPoolStateManager,\n  connectionPoolStateHostFunctions,\n} from '@subql/node-core';\nimport { Store } from '@subql/types-ethereum';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../../ethereum/api.connection';\n\nimport { EthereumBlockWrapped } from '../../ethereum/block.ethereum';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';\nimport { IIndexerWorker, IInitIndexerWorker } from '../worker/worker';\nimport { HostUnfinalizedBlocks } from '../worker/worker.unfinalizedBlocks.service';\n\nconst logger = getLogger('WorkerBlockDispatcherService');\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\nasync function createIndexerWorker(\n  store: Store,\n  dynamicDsService: IDynamicDsService<SubqlProjectDs>,\n  unfinalizedBlocksService: IUnfinalizedBlocksService<EthereumBlockWrapped>,\n  connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n\n  root: string,\n): Promise<IndexerWorker> {\n  const indexerWorker = Worker.create<\n    IInitIndexerWorker,\n    HostDynamicDS<SubqlProjectDs> & HostStore & HostUnfinalizedBlocks\n  >(\n    path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),\n    [\n      'initWorker',\n      'processBlock',\n      'fetchBlock',\n      'numFetchedBlocks',\n      'numFetchingBlocks',\n      'getStatus',\n      'getMemoryLeft',\n      'waitForWorkerBatchSize',\n    ],\n    {\n      storeGet: store.get.bind(store),\n      storeGetByField: store.getByField.bind(store),\n      storeGetOneByField: store.getOneByField.bind(store),\n      storeSet: store.set.bind(store),\n      storeBulkCreate: store.bulkCreate.bind(store),\n      storeBulkUpdate: store.bulkUpdate.bind(store),\n      storeRemove: store.remove.bind(store),\n      storeBulkRemove: store.bulkRemove.bind(store),\n      dynamicDsCreateDynamicDatasource:\n        dynamicDsService.createDynamicDatasource.bind(dynamicDsService),\n      dynamicDsGetDynamicDatasources:\n        dynamicDsService.getDynamicDatasources.bind(dynamicDsService),\n      unfinalizedBlocksProcess:\n        unfinalizedBlocksService.processUnfinalizedBlockHeader.bind(\n          unfinalizedBlocksService,\n        ),\n      ...connectionPoolStateHostFunctions(connectionPoolState),\n    },\n    root,\n  );\n\n  await indexerWorker.initWorker();\n\n  return indexerWorker;\n}\n\n@Injectable()\nexport class WorkerBlockDispatcherService\n  extends WorkerBlockDispatcher<SubqlProjectDs, IndexerWorker>\n  implements OnApplicationShutdown\n{\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService') projectService: IProjectService<SubqlProjectDs>,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksSevice: UnfinalizedBlocksService,\n    connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      () =>\n        createIndexerWorker(\n          storeService.getStore(),\n          dynamicDsService,\n          unfinalizedBlocksSevice,\n          connectionPoolState,\n          project.root,\n        ),\n    );\n  }\n\n  protected async fetchBlock(\n    worker: IndexerWorker,\n    height: number,\n  ): Promise<void> {\n    const start = new Date();\n    await worker.fetchBlock(height);\n    const end = new Date();\n\n    // const waitTime = end.getTime() - start.getTime();\n    // if (waitTime > 1000) {\n    //   logger.info(\n    //     `Waiting to fetch block ${height}: ${chalk.red(`${waitTime}ms`)}`,\n    //   );\n    // } else if (waitTime > 200) {\n    //   logger.info(\n    //     `Waiting to fetch block ${height}: ${chalk.yellow(`${waitTime}ms`)}`,\n    //   );\n    // }\n  }\n}\n"]}
+{"version":3,"file":"worker-block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/worker-block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;AAEnC,gDAAwB;AACxB,2CAA2E;AAC3E,yDAAsD;AACtD,gDAoB0B;AAE1B,qEAGyC;AAEzC,8DAAyD;AAEzD,4EAAwE;AAOxE,KAAK,UAAU,mBAAmB,CAChC,KAAY,EACZ,gBAAsD,EACtD,wBAAiE,EACjE,mBAAsE,EACtE,IAAY,EACZ,WAAmB;IAEnB,MAAM,aAAa,GAAG,kBAAM,CAAC,MAAM,CAIjC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,EACjE,CAAC,GAAG,+BAAmB,EAAE,YAAY,CAAC,8DAEjC,IAAA,8BAAkB,EAAC,KAAK,CAAC,GACzB,IAAA,kCAAsB,EAAC,gBAAgB,CAAC,KAC3C,wBAAwB,EACtB,wBAAwB,CAAC,6BAA6B,CAAC,IAAI,CACzD,wBAAwB,CACzB,KACA,IAAA,4CAAgC,EAAC,mBAAmB,CAAC,GAE1D,IAAI,CACL,CAAC;IAEF,MAAM,aAAa,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAE5C,OAAO,aAAa,CAAC;AACvB,CAAC;AAGM,IAAM,4BAA4B,GAAlC,MAAM,4BACX,SAAQ,iCAAuD;IAG/D,YACE,UAAsB,EACtB,YAA2B,EAE3B,cAAkD,EAElD,oBAA4C,EAC5C,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC,EAClC,uBAAiD,EACjD,mBAAsE;QAEtE,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,GAAG,EAAE,CACH,mBAAmB,CACjB,YAAY,CAAC,QAAQ,EAAE,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,OAAO,CAAC,IAAI,EACZ,cAAc,CAAC,WAAW,CAC3B,CACJ,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,MAAqB,EACrB,MAAc;QAEd,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,oDAAoD;QACpD,yBAAyB;QACzB,iBAAiB;QACjB,yEAAyE;QACzE,OAAO;QACP,+BAA+B;QAC/B,iBAAiB;QACjB,4EAA4E;QAC5E,OAAO;QACP,IAAI;IACN,CAAC;CACF,CAAA;AA9DY,4BAA4B;IADxC,IAAA,mBAAU,GAAE;IAQR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAMhC,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAVf,sBAAU;QACR,6BAAa,kBAKR,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;QACT,oDAAwB;QAC5B,sCAA0B;GAlBtC,4BAA4B,CA8DxC;AA9DY,oEAA4B","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport path from 'path';\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  Worker,\n  SmartBatchService,\n  StoreService,\n  PoiService,\n  StoreCacheService,\n  IProjectService,\n  IDynamicDsService,\n  HostStore,\n  HostDynamicDS,\n  WorkerBlockDispatcher,\n  IUnfinalizedBlocksService,\n  ConnectionPoolStateManager,\n  connectionPoolStateHostFunctions,\n  baseWorkerFunctions,\n  storeHostFunctions,\n  dynamicDsHostFunctions,\n  IProjectUpgradeService,\n  HostUnfinalizedBlocks,\n} from '@subql/node-core';\nimport { Store } from '@subql/types-core';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../../ethereum/api.connection';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { BlockContent } from '../types';\nimport { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';\nimport { IIndexerWorker, IInitIndexerWorker } from '../worker/worker';\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\nasync function createIndexerWorker(\n  store: Store,\n  dynamicDsService: IDynamicDsService<EthereumProjectDs>,\n  unfinalizedBlocksService: IUnfinalizedBlocksService<BlockContent>,\n  connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n  root: string,\n  startHeight: number,\n): Promise<IndexerWorker> {\n  const indexerWorker = Worker.create<\n    IInitIndexerWorker,\n    HostDynamicDS<EthereumProjectDs> & HostStore & HostUnfinalizedBlocks\n  >(\n    path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),\n    [...baseWorkerFunctions, 'initWorker'],\n    {\n      ...storeHostFunctions(store),\n      ...dynamicDsHostFunctions(dynamicDsService),\n      unfinalizedBlocksProcess:\n        unfinalizedBlocksService.processUnfinalizedBlockHeader.bind(\n          unfinalizedBlocksService,\n        ),\n      ...connectionPoolStateHostFunctions(connectionPoolState),\n    },\n    root,\n  );\n\n  await indexerWorker.initWorker(startHeight);\n\n  return indexerWorker;\n}\n\n@Injectable()\nexport class WorkerBlockDispatcherService\n  extends WorkerBlockDispatcher<EthereumProjectDs, IndexerWorker>\n  implements OnApplicationShutdown\n{\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgadeService: IProjectUpgradeService,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksSevice: UnfinalizedBlocksService,\n    connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgadeService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      () =>\n        createIndexerWorker(\n          storeService.getStore(),\n          dynamicDsService,\n          unfinalizedBlocksSevice,\n          connectionPoolState,\n          project.root,\n          projectService.startHeight,\n        ),\n    );\n  }\n\n  protected async fetchBlock(\n    worker: IndexerWorker,\n    height: number,\n  ): Promise<void> {\n    const start = new Date();\n    await worker.fetchBlock(height, null);\n    const end = new Date();\n\n    // const waitTime = end.getTime() - start.getTime();\n    // if (waitTime > 1000) {\n    //   logger.info(\n    //     `Waiting to fetch block ${height}: ${chalk.red(`${waitTime}ms`)}`,\n    //   );\n    // } else if (waitTime > 200) {\n    //   logger.info(\n    //     `Waiting to fetch block ${height}: ${chalk.yellow(`${waitTime}ms`)}`,\n    //   );\n    // }\n  }\n}\n"]}

package/dist/indexer/dictionary.service.d.ts

@@ -1,9 +1,9 @@
-import { OnApplicationShutdown } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { NodeConfig, DictionaryService as CoreDictionaryService } from '@subql/node-core';
 import { SubqueryProject } from '../configure/SubqueryProject';
-export declare class DictionaryService extends CoreDictionaryService implements OnApplicationShutdown {
+export declare class DictionaryService extends CoreDictionaryService {
     protected project: SubqueryProject;
     private constructor();
-    static create(project: SubqueryProject, nodeConfig: NodeConfig): Promise<DictionaryService>;
+    static create(project: SubqueryProject, nodeConfig: NodeConfig, eventEmitter: EventEmitter2): Promise<DictionaryService>;
     private static getEvmChainId;
 }

package/dist/indexer/dictionary.service.js

@@ -20,24 +20,25 @@ var DictionaryService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DictionaryService = void 0;
 const common_1 = require("@nestjs/common");
+const event_emitter_1 = require("@nestjs/event-emitter");
 const node_core_1 = require("@subql/node-core");
 const json5_1 = __importDefault(require("json5"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const SubqueryProject_1 = require("../configure/SubqueryProject");
 const CHAIN_ALIASES_URL = 'https://raw.githubusercontent.com/subquery/templates/main/chainAliases.json5';
 let DictionaryService = DictionaryService_1 = class DictionaryService extends node_core_1.DictionaryService {
-    constructor(project, nodeConfig, chainId) {
-        super(project.network.dictionary, chainId !== null && chainId !== void 0 ? chainId : project.network.chainId, nodeConfig);
+    constructor(project, nodeConfig, eventEmitter, chainId) {
+        super(project.network.dictionary, chainId !== null && chainId !== void 0 ? chainId : project.network.chainId, nodeConfig, eventEmitter);
         this.project = project;
     }
-    static async create(project, nodeConfig) {
+    static async create(project, nodeConfig, eventEmitter) {
         /*Some dictionarys for EVM are built with other SDKs as they are chains with an EVM runtime
          * we maintain a list of aliases so we can map the evmChainId to the genesis hash of the other SDKs
          * e.g moonbeam is built with Substrate SDK but can be used as an EVM dictionary
          */
         const chainAliases = await this.getEvmChainId();
         const chainAlias = chainAliases[project.network.chainId];
-        return new DictionaryService_1(project, nodeConfig, chainAlias);
+        return new DictionaryService_1(project, nodeConfig, eventEmitter, chainAlias);
     }
     static async getEvmChainId() {
         const response = await (0, node_fetch_1.default)(CHAIN_ALIASES_URL);
@@ -50,7 +51,8 @@ DictionaryService = DictionaryService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [SubqueryProject_1.SubqueryProject,
-        node_core_1.NodeConfig, String])
+        node_core_1.NodeConfig,
+        event_emitter_1.EventEmitter2, String])
 ], DictionaryService);
 exports.DictionaryService = DictionaryService;
 //# sourceMappingURL=dictionary.service.js.map

package/dist/indexer/dictionary.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dictionary.service.js","sourceRoot":"","sources":["../../src/indexer/dictionary.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;;AAEnC,2CAA2E;AAC3E,gDAG0B;AAC1B,kDAA0B;AAC1B,4DAA+B;AAC/B,kEAA+D;AAE/D,MAAM,iBAAiB,GACrB,8EAA8E,CAAC;AAG1E,IAAM,iBAAiB,yBAAvB,MAAM,iBACX,SAAQ,6BAAqB;IAG7B,YACwC,OAAwB,EAC9D,UAAsB,EACtB,OAAgB;QAEhB,KAAK,CACH,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAClC,UAAU,CACX,CAAC;QARoC,YAAO,GAAP,OAAO,CAAiB;IAShE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAwB,EACxB,UAAsB;QAEtB;;;WAGG;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEzD,OAAO,IAAI,mBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IAChE,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,aAAa;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,iBAAiB,CAAC,CAAC;QAEhD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClC,wDAAwD;QACxD,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF,CAAA;AArCY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAAoB,iCAAe;QAClD,sBAAU;GANb,iBAAiB,CAqC7B;AArCY,8CAAiB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport {\n  NodeConfig,\n  DictionaryService as CoreDictionaryService,\n} from '@subql/node-core';\nimport JSON5 from 'json5';\nimport fetch from 'node-fetch';\nimport { SubqueryProject } from '../configure/SubqueryProject';\n\nconst CHAIN_ALIASES_URL =\n  'https://raw.githubusercontent.com/subquery/templates/main/chainAliases.json5';\n\n@Injectable()\nexport class DictionaryService\n  extends CoreDictionaryService\n  implements OnApplicationShutdown\n{\n  private constructor(\n    @Inject('ISubqueryProject') protected project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    chainId?: string,\n  ) {\n    super(\n      project.network.dictionary,\n      chainId ?? project.network.chainId,\n      nodeConfig,\n    );\n  }\n\n  static async create(\n    project: SubqueryProject,\n    nodeConfig: NodeConfig,\n  ): Promise<DictionaryService> {\n    /*Some dictionarys for EVM are built with other SDKs as they are chains with an EVM runtime\n     * we maintain a list of aliases so we can map the evmChainId to the genesis hash of the other SDKs\n     * e.g moonbeam is built with Substrate SDK but can be used as an EVM dictionary\n     */\n    const chainAliases = await this.getEvmChainId();\n    const chainAlias = chainAliases[project.network.chainId];\n\n    return new DictionaryService(project, nodeConfig, chainAlias);\n  }\n\n  private static async getEvmChainId(): Promise<Record<string, string>> {\n    const response = await fetch(CHAIN_ALIASES_URL);\n\n    const raw = await response.text();\n    // We use JSON5 here because the file has comments in it\n    return JSON5.parse(raw);\n  }\n}\n"]}
+{"version":3,"file":"dictionary.service.js","sourceRoot":"","sources":["../../src/indexer/dictionary.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,yDAAsD;AACtD,gDAG0B;AAC1B,kDAA0B;AAC1B,4DAA+B;AAC/B,kEAA+D;AAE/D,MAAM,iBAAiB,GACrB,8EAA8E,CAAC;AAG1E,IAAM,iBAAiB,yBAAvB,MAAM,iBAAkB,SAAQ,6BAAqB;IAC1D,YACwC,OAAwB,EAC9D,UAAsB,EACtB,YAA2B,EAC3B,OAAgB;QAEhB,KAAK,CACH,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAClC,UAAU,EACV,YAAY,CACb,CAAC;QAVoC,YAAO,GAAP,OAAO,CAAiB;IAWhE,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAwB,EACxB,UAAsB,EACtB,YAA2B;QAE3B;;;WAGG;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEzD,OAAO,IAAI,mBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,aAAa;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,iBAAiB,CAAC,CAAC;QAEhD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClC,wDAAwD;QACxD,OAAO,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CACF,CAAA;AArCY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAAoB,iCAAe;QAClD,sBAAU;QACR,6BAAa;GAJlB,iBAAiB,CAqC7B;AArCY,8CAAiB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  DictionaryService as CoreDictionaryService,\n} from '@subql/node-core';\nimport JSON5 from 'json5';\nimport fetch from 'node-fetch';\nimport { SubqueryProject } from '../configure/SubqueryProject';\n\nconst CHAIN_ALIASES_URL =\n  'https://raw.githubusercontent.com/subquery/templates/main/chainAliases.json5';\n\n@Injectable()\nexport class DictionaryService extends CoreDictionaryService {\n  private constructor(\n    @Inject('ISubqueryProject') protected project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    chainId?: string,\n  ) {\n    super(\n      project.network.dictionary,\n      chainId ?? project.network.chainId,\n      nodeConfig,\n      eventEmitter,\n    );\n  }\n\n  static async create(\n    project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n  ): Promise<DictionaryService> {\n    /*Some dictionarys for EVM are built with other SDKs as they are chains with an EVM runtime\n     * we maintain a list of aliases so we can map the evmChainId to the genesis hash of the other SDKs\n     * e.g moonbeam is built with Substrate SDK but can be used as an EVM dictionary\n     */\n    const chainAliases = await this.getEvmChainId();\n    const chainAlias = chainAliases[project.network.chainId];\n\n    return new DictionaryService(project, nodeConfig, eventEmitter, chainAlias);\n  }\n\n  private static async getEvmChainId(): Promise<Record<string, string>> {\n    const response = await fetch(CHAIN_ALIASES_URL);\n\n    const raw = await response.text();\n    // We use JSON5 here because the file has comments in it\n    return JSON5.parse(raw);\n  }\n}\n"]}

package/dist/indexer/dynamic-ds.service.d.ts

@@ -1,9 +1,9 @@
 import { DatasourceParams, DynamicDsService as BaseDynamicDsService } from '@subql/node-core';
-import { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';
+import { EthereumProjectDs, SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
-export declare class DynamicDsService extends BaseDynamicDsService<SubqlProjectDs> {
+export declare class DynamicDsService extends BaseDynamicDsService<EthereumProjectDs> {
     private readonly dsProcessorService;
     private readonly project;
     constructor(dsProcessorService: DsProcessorService, project: SubqueryProject);
-    protected getDatasource(params: DatasourceParams): Promise<SubqlProjectDs>;
+    protected getDatasource(params: DatasourceParams): Promise<EthereumProjectDs>;
 }

package/dist/indexer/dynamic-ds.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,4DAIgC;AAChC,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,mCAAmC;AACnC,kEAA+E;AAC/E,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAoC;IACxE,YACmB,kBAAsC,EACV,OAAwB;QAErE,KAAK,EAAE,CAAC;QAHS,uBAAkB,GAAlB,kBAAkB,CAAoB;QACV,YAAO,GAAP,OAAO,CAAiB;IAGvE,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,MAAwB;;QAExB,MAAM,QAAQ,GAAG,IAAA,kBAAS,EACxB,MAAA,IAAI,CAAC,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,0DAA0D,MAAM,CAAC,YAAY,GAAG,CACjF,CAAC;SACH;QAED,MAAM,KAAK,GAAG,gCACT,QAAQ,KACX,UAAU,EAAE,MAAM,CAAC,UAAU,GACZ,CAAC;QACpB,IAAI;YACF,IAAI,IAAA,4BAAU,EAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,SAAS,CAAC,OAAO,mCAClB,KAAK,CAAC,SAAS,CAAC,OAAO,GACvB,MAAM,CAAC,IAAI,CACf,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,GACb,MAAM,CAAC,IAAI,CACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAA,gCAAY,EAAC,+CAA6B,EAAE,KAAK,CAAC,CAAC;gBAEpE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,QAAQ,EAAE;oBACpC,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,KAAK;iBAC5B,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,MAAM;yBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;yBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;iBACH;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CACF,CAAA;AAzDY,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCADU,yCAAkB;QACD,iCAAe;GAH5D,gBAAgB,CAyD5B;AAzDY,4CAAgB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  EthereumRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-ethereum';\nimport {\n  DatasourceParams,\n  DynamicDsService as BaseDynamicDsService,\n} from '@subql/node-core';\nimport { plainToClass } from 'class-transformer';\nimport { validateSync } from 'class-validator';\nimport { cloneDeep } from 'lodash';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<SubqlProjectDs> {\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    @Inject('ISubqueryProject') private readonly project: SubqueryProject,\n  ) {\n    super();\n  }\n\n  protected async getDatasource(\n    params: DatasourceParams,\n  ): Promise<SubqlProjectDs> {\n    const template = cloneDeep(\n      this.project.templates?.find((t) => t.name === params.templateName),\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as SubqlProjectDs;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        dsObj.options = {\n          ...dsObj.options,\n          ...params.args,\n        };\n\n        const parsedDs = plainToClass(EthereumRuntimeDataSourceImpl, dsObj);\n\n        const errors = validateSync(parsedDs, {\n          whitelist: true,\n          forbidNonWhitelisted: false,\n        });\n        if (errors.length) {\n          throw new Error(\n            `Dynamic ds is invalid\\n${errors\n              .map((e) => e.toString())\n              .join('\\n')}`,\n          );\n        }\n      }\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,4DAIgC;AAChC,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,mCAAmC;AACnC,kEAGsC;AACtC,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAuC;IAC3E,YACmB,kBAAsC,EACV,OAAwB;QAErE,KAAK,EAAE,CAAC;QAHS,uBAAkB,GAAlB,kBAAkB,CAAoB;QACV,YAAO,GAAP,OAAO,CAAiB;IAGvE,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,MAAwB;;QAExB,MAAM,QAAQ,GAAG,IAAA,kBAAS,EACxB,MAAA,IAAI,CAAC,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,0DAA0D,MAAM,CAAC,YAAY,GAAG,CACjF,CAAC;SACH;QAED,MAAM,KAAK,GAAG,gCACT,QAAQ,KACX,UAAU,EAAE,MAAM,CAAC,UAAU,GACT,CAAC;QACvB,IAAI;YACF,IAAI,IAAA,4BAAU,EAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,SAAS,CAAC,OAAO,mCAClB,KAAK,CAAC,SAAS,CAAC,OAAO,GACvB,MAAM,CAAC,IAAI,CACf,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,GACb,MAAM,CAAC,IAAI,CACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAA,gCAAY,EAAC,+CAA6B,EAAE,KAAK,CAAC,CAAC;gBAEpE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,QAAQ,EAAE;oBACpC,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,KAAK;iBAC5B,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,MAAM;yBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;yBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;iBACH;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CACF,CAAA;AAzDY,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCADU,yCAAkB;QACD,iCAAe;GAH5D,gBAAgB,CAyD5B;AAzDY,4CAAgB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  EthereumRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-ethereum';\nimport {\n  DatasourceParams,\n  DynamicDsService as BaseDynamicDsService,\n} from '@subql/node-core';\nimport { plainToClass } from 'class-transformer';\nimport { validateSync } from 'class-validator';\nimport { cloneDeep } from 'lodash';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<EthereumProjectDs> {\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    @Inject('ISubqueryProject') private readonly project: SubqueryProject,\n  ) {\n    super();\n  }\n\n  protected async getDatasource(\n    params: DatasourceParams,\n  ): Promise<EthereumProjectDs> {\n    const template = cloneDeep(\n      this.project.templates?.find((t) => t.name === params.templateName),\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as EthereumProjectDs;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        dsObj.options = {\n          ...dsObj.options,\n          ...params.args,\n        };\n\n        const parsedDs = plainToClass(EthereumRuntimeDataSourceImpl, dsObj);\n\n        const errors = validateSync(parsedDs, {\n          whitelist: true,\n          forbidNonWhitelisted: false,\n        });\n        if (errors.length) {\n          throw new Error(\n            `Dynamic ds is invalid\\n${errors\n              .map((e) => e.toString())\n              .join('\\n')}`,\n          );\n        }\n      }\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}

package/dist/indexer/fetch.module.js

@@ -62,13 +62,14 @@ FetchModule = __decorate([
             },
             {
                 provide: 'IBlockDispatcher',
-                useFactory: (nodeConfig, eventEmitter, projectService, apiService, indexerManager, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocks, connectionPoolState) => nodeConfig.workers !== undefined
-                    ? new blockDispatcher_1.WorkerBlockDispatcherService(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocks, connectionPoolState)
-                    : new blockDispatcher_1.BlockDispatcherService(apiService, nodeConfig, indexerManager, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService),
+                useFactory: (nodeConfig, eventEmitter, projectService, projectUpgradeService, apiService, indexerManager, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocks, connectionPoolState) => nodeConfig.workers !== undefined
+                    ? new blockDispatcher_1.WorkerBlockDispatcherService(nodeConfig, eventEmitter, projectService, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocks, connectionPoolState)
+                    : new blockDispatcher_1.BlockDispatcherService(apiService, nodeConfig, indexerManager, eventEmitter, projectService, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService),
                 inject: [
                     node_core_1.NodeConfig,
                     event_emitter_1.EventEmitter2,
                     'IProjectService',
+                    'IProjectUpgradeService',
                     node_core_1.ApiService,
                     indexer_manager_1.IndexerManager,
                     node_core_1.SmartBatchService,
@@ -87,26 +88,23 @@ FetchModule = __decorate([
             node_core_1.PoiBenchmarkService,
             {
                 provide: dictionary_service_1.DictionaryService,
-                useFactory: async (project, nodeConfig) => {
-                    const dictionaryService = await dictionary_service_1.DictionaryService.create(project, nodeConfig);
+                useFactory: async (project, nodeConfig, eventEmitter) => {
+                    const dictionaryService = await dictionary_service_1.DictionaryService.create(project, nodeConfig, eventEmitter);
                     return dictionaryService;
                 },
-                inject: ['ISubqueryProject', node_core_1.NodeConfig],
+                inject: ['ISubqueryProject', node_core_1.NodeConfig, event_emitter_1.EventEmitter2],
             },
             sandbox_service_1.SandboxService,
             ds_processor_service_1.DsProcessorService,
             dynamic_ds_service_1.DynamicDsService,
             node_core_1.PoiService,
-            node_core_1.MmrService,
-            node_core_1.MmrQueryService,
-            node_core_1.PgMmrCacheService,
             {
                 useClass: project_service_1.ProjectService,
                 provide: 'IProjectService',
             },
             unfinalizedBlocks_service_1.UnfinalizedBlocksService,
         ],
-        exports: [node_core_1.StoreService, node_core_1.MmrService, node_core_1.StoreCacheService, node_core_1.MmrQueryService],
+        exports: [node_core_1.StoreService, node_core_1.StoreCacheService],
     })
 ], FetchModule);
 exports.FetchModule = FetchModule;

package/dist/indexer/fetch.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.module.js","sourceRoot":"","sources":["../../src/indexer/fetch.module.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  PoiBenchmarkService,\n  IndexingBenchmarkService,\n  MmrService,\n  StoreService,\n  PoiService,\n  ApiService,\n  NodeConfig,\n  ConnectionPoolService,\n  ConnectionPoolStateManager,\n  SmartBatchService,\n  StoreCacheService,\n  PgMmrCacheService,\n  MmrQueryService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../ethereum/api.connection';\nimport { EthereumApiService } from '../ethereum/api.service.ethereum';\nimport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n} from './blockDispatcher';\nimport { DictionaryService } from './dictionary.service';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { FetchService } from './fetch.service';\nimport { IndexerManager } from './indexer.manager';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n@Module({\n  providers: [\n    StoreService,\n    StoreCacheService,\n    {\n      provide: ApiService,\n      useFactory: async (\n        project: SubqueryProject,\n        connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n        eventEmitter: EventEmitter2,\n        nodeConfig: NodeConfig,\n      ) => {\n        const apiService = new EthereumApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n          nodeConfig,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        ConnectionPoolService,\n        EventEmitter2,\n        NodeConfig,\n      ],\n    },\n    IndexerManager,\n    ConnectionPoolStateManager,\n    ConnectionPoolService,\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: 'IBlockDispatcher',\n      useFactory: (\n        nodeConfig: NodeConfig,\n        eventEmitter: EventEmitter2,\n        projectService: ProjectService,\n        apiService: EthereumApiService,\n        indexerManager: IndexerManager,\n        smartBatchService: SmartBatchService,\n        storeService: StoreService,\n        storeCacheService: StoreCacheService,\n        poiService: PoiService,\n        project: SubqueryProject,\n        dynamicDsService: DynamicDsService,\n        unfinalizedBlocks: UnfinalizedBlocksService,\n        connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n      ) =>\n        nodeConfig.workers !== undefined\n          ? new WorkerBlockDispatcherService(\n              nodeConfig,\n              eventEmitter,\n              projectService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n              unfinalizedBlocks,\n              connectionPoolState,\n            )\n          : new BlockDispatcherService(\n              apiService,\n              nodeConfig,\n              indexerManager,\n              eventEmitter,\n              projectService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n            ),\n      inject: [\n        NodeConfig,\n        EventEmitter2,\n        'IProjectService',\n        ApiService,\n        IndexerManager,\n        SmartBatchService,\n        StoreService,\n        StoreCacheService,\n        PoiService,\n        'ISubqueryProject',\n        DynamicDsService,\n        UnfinalizedBlocksService,\n        ConnectionPoolStateManager,\n      ],\n    },\n    FetchService,\n    ConnectionPoolService,\n    IndexingBenchmarkService,\n    PoiBenchmarkService,\n    {\n      provide: DictionaryService,\n      useFactory: async (project: SubqueryProject, nodeConfig: NodeConfig) => {\n        const dictionaryService = await DictionaryService.create(\n          project,\n          nodeConfig,\n        );\n        return dictionaryService;\n      },\n      inject: ['ISubqueryProject', NodeConfig],\n    },\n    SandboxService,\n    DsProcessorService,\n    DynamicDsService,\n    PoiService,\n    MmrService,\n    MmrQueryService,\n    PgMmrCacheService,\n    {\n      useClass: ProjectService,\n      provide: 'IProjectService',\n    },\n    UnfinalizedBlocksService,\n  ],\n  exports: [StoreService, MmrService, StoreCacheService, MmrQueryService],\n})\nexport class FetchModule {}\n"]}
+{"version":3,"file":"fetch.module.js","sourceRoot":"","sources":["../../src/indexer/fetch.module.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  PoiBenchmarkService,\n  IndexingBenchmarkService,\n  StoreService,\n  PoiService,\n  ApiService,\n  NodeConfig,\n  ConnectionPoolService,\n  ConnectionPoolStateManager,\n  SmartBatchService,\n  StoreCacheService,\n  IProjectUpgradeService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../ethereum/api.connection';\nimport { EthereumApiService } from '../ethereum/api.service.ethereum';\nimport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n} from './blockDispatcher';\nimport { DictionaryService } from './dictionary.service';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { FetchService } from './fetch.service';\nimport { IndexerManager } from './indexer.manager';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n@Module({\n  providers: [\n    StoreService,\n    StoreCacheService,\n    {\n      provide: ApiService,\n      useFactory: async (\n        project: SubqueryProject,\n        connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n        eventEmitter: EventEmitter2,\n        nodeConfig: NodeConfig,\n      ) => {\n        const apiService = new EthereumApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n          nodeConfig,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        ConnectionPoolService,\n        EventEmitter2,\n        NodeConfig,\n      ],\n    },\n    IndexerManager,\n    ConnectionPoolStateManager,\n    ConnectionPoolService,\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: 'IBlockDispatcher',\n      useFactory: (\n        nodeConfig: NodeConfig,\n        eventEmitter: EventEmitter2,\n        projectService: ProjectService,\n        projectUpgradeService: IProjectUpgradeService,\n        apiService: EthereumApiService,\n        indexerManager: IndexerManager,\n        smartBatchService: SmartBatchService,\n        storeService: StoreService,\n        storeCacheService: StoreCacheService,\n        poiService: PoiService,\n        project: SubqueryProject,\n        dynamicDsService: DynamicDsService,\n        unfinalizedBlocks: UnfinalizedBlocksService,\n        connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n      ) =>\n        nodeConfig.workers !== undefined\n          ? new WorkerBlockDispatcherService(\n              nodeConfig,\n              eventEmitter,\n              projectService,\n              projectUpgradeService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n              unfinalizedBlocks,\n              connectionPoolState,\n            )\n          : new BlockDispatcherService(\n              apiService,\n              nodeConfig,\n              indexerManager,\n              eventEmitter,\n              projectService,\n              projectUpgradeService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n            ),\n      inject: [\n        NodeConfig,\n        EventEmitter2,\n        'IProjectService',\n        'IProjectUpgradeService',\n        ApiService,\n        IndexerManager,\n        SmartBatchService,\n        StoreService,\n        StoreCacheService,\n        PoiService,\n        'ISubqueryProject',\n        DynamicDsService,\n        UnfinalizedBlocksService,\n        ConnectionPoolStateManager,\n      ],\n    },\n    FetchService,\n    ConnectionPoolService,\n    IndexingBenchmarkService,\n    PoiBenchmarkService,\n    {\n      provide: DictionaryService,\n      useFactory: async (\n        project: SubqueryProject,\n        nodeConfig: NodeConfig,\n        eventEmitter: EventEmitter2,\n      ) => {\n        const dictionaryService = await DictionaryService.create(\n          project,\n          nodeConfig,\n          eventEmitter,\n        );\n        return dictionaryService;\n      },\n      inject: ['ISubqueryProject', NodeConfig, EventEmitter2],\n    },\n    SandboxService,\n    DsProcessorService,\n    DynamicDsService,\n    PoiService,\n    {\n      useClass: ProjectService,\n      provide: 'IProjectService',\n    },\n    UnfinalizedBlocksService,\n  ],\n  exports: [StoreService, StoreCacheService],\n})\nexport class FetchModule {}\n"]}

package/dist/indexer/fetch.service.d.ts

@@ -2,32 +2,32 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { SchedulerRegistry } from '@nestjs/schedule';
 import { SubqlEthereumProcessorOptions } from '@subql/common-ethereum';
 import { NodeConfig, BaseFetchService, ApiService } from '@subql/node-core';
-import { DictionaryQueryEntry } from '@subql/types';
+import { DictionaryQueryEntry } from '@subql/types-core';
 import { SubqlDatasource } from '@subql/types-ethereum';
-import { MetaData } from '@subql/utils';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { EthereumApi } from '../ethereum';
 import { IEthereumBlockDispatcher } from './blockDispatcher';
 import { DictionaryService } from './dictionary.service';
-import { DsProcessorService } from './ds-processor.service';
 import { DynamicDsService } from './dynamic-ds.service';
+import { ProjectService } from './project.service';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
-type GroupedSubqlProjectDs = SubqlDatasource & {
+type GroupedEthereumProjectDs = SubqlDatasource & {
     groupedOptions?: SubqlEthereumProcessorOptions[];
 };
-export declare function buildDictionaryQueryEntries(dataSources: GroupedSubqlProjectDs[], startBlock: number): DictionaryQueryEntry[];
-export declare class FetchService extends BaseFetchService<ApiService, SubqlDatasource, IEthereumBlockDispatcher, DictionaryService> {
+export declare function buildDictionaryQueryEntries(dataSources: GroupedEthereumProjectDs[]): DictionaryQueryEntry[];
+export declare class FetchService extends BaseFetchService<SubqlDatasource, IEthereumBlockDispatcher, DictionaryService> {
+    private apiService;
     private unfinalizedBlocksService;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, project: SubqueryProject, blockDispatcher: IEthereumBlockDispatcher, dictionaryService: DictionaryService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, projectService: ProjectService, project: SubqueryProject, blockDispatcher: IEthereumBlockDispatcher, dictionaryService: DictionaryService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
     get api(): EthereumApi;
-    buildDictionaryQueryEntries(startBlock: number): DictionaryQueryEntry[];
+    protected buildDictionaryQueryEntries(dataSources: (SubqlDatasource & {
+        name?: string;
+    })[]): DictionaryQueryEntry[];
     protected getFinalizedHeight(): Promise<number>;
     protected getBestHeight(): Promise<number>;
     protected getChainInterval(): Promise<number>;
-    protected getChainId(): Promise<string>;
     protected getModulos(): number[];
     protected initBlockDispatcher(): Promise<void>;
-    protected validatateDictionaryMeta(metaData: MetaData): Promise<boolean>;
     protected preLoopHook(): Promise<void>;
 }
 export {};

package/dist/indexer/fetch.service.js

@@ -26,8 +26,8 @@ const utils_ethereum_1 = require("../ethereum/utils.ethereum");
 const string_1 = require("../utils/string");
 const yargs_1 = require("../yargs");
 const dictionary_service_1 = require("./dictionary.service");
-const ds_processor_service_1 = require("./ds-processor.service");
 const dynamic_ds_service_1 = require("./dynamic-ds.service");
+const project_service_1 = require("./project.service");
 const unfinalizedBlocks_service_1 = require("./unfinalizedBlocks.service");
 const logger = (0, node_core_1.getLogger)('fetch.service');
 const BLOCK_TIME_VARIANCE = 5000;
@@ -135,15 +135,10 @@ function callFilterToQueryEntry(filter, dsOptions) {
         conditions,
     };
 }
-function buildDictionaryQueryEntries(dataSources, startBlock) {
+function buildDictionaryQueryEntries(dataSources) {
     var _a;
     const queryEntries = [];
-    // Only run the ds that is equal or less than startBlock
-    // sort array from lowest ds.startBlock to highest
-    const filteredDs = dataSources
-        .filter((ds) => ds.startBlock <= startBlock)
-        .sort((a, b) => a.startBlock - b.startBlock);
-    for (const ds of filteredDs) {
+    for (const ds of dataSources) {
         for (const handler of ds.mapping.handlers) {
             // No filters, cant use dictionary
             if (!handler.filter)
@@ -184,23 +179,29 @@ function buildDictionaryQueryEntries(dataSources, startBlock) {
 }
 exports.buildDictionaryQueryEntries = buildDictionaryQueryEntries;
 let FetchService = class FetchService extends node_core_1.BaseFetchService {
-    constructor(apiService, nodeConfig, project, blockDispatcher, dictionaryService, dsProcessorService, dynamicDsService, unfinalizedBlocksService, eventEmitter, schedulerRegistry) {
-        super(apiService, nodeConfig, project, blockDispatcher, dictionaryService, dsProcessorService, dynamicDsService, eventEmitter, schedulerRegistry);
+    constructor(apiService, nodeConfig, projectService, project, blockDispatcher, dictionaryService, dynamicDsService, unfinalizedBlocksService, eventEmitter, schedulerRegistry) {
+        super(nodeConfig, projectService, project.network, blockDispatcher, dictionaryService, dynamicDsService, eventEmitter, schedulerRegistry);
+        this.apiService = apiService;
         this.unfinalizedBlocksService = unfinalizedBlocksService;
     }
     get api() {
         return this.apiService.unsafeApi;
     }
-    buildDictionaryQueryEntries(startBlock) {
-        const groupdDynamicDs = Object.values((0, lodash_1.groupBy)(this.templateDynamicDatasouces, (ds) => ds.name)).map((grouped) => {
+    buildDictionaryQueryEntries(
+    // Add name to dataousrces as templates have this set
+    dataSources) {
+        const [normalDataSources, templateDataSources] = (0, lodash_1.partition)(dataSources, (ds) => !ds.name);
+        // Group templ
+        const groupedDataSources = Object.values((0, lodash_1.groupBy)(templateDataSources, (ds) => ds.name)).map((grouped) => {
+            if (grouped.length === 1) {
+                return grouped[0];
+            }
             const options = grouped.map((ds) => ds.options);
             const ref = grouped[0];
             return Object.assign(Object.assign({}, ref), { groupedOptions: options });
         });
-        // Only run the ds that is equal or less than startBlock
-        // sort array from lowest ds.startBlock to highest
-        const filteredDs = this.project.dataSources.concat(groupdDynamicDs);
-        return buildDictionaryQueryEntries(filteredDs, startBlock);
+        const filteredDs = [...normalDataSources, ...groupedDataSources];
+        return buildDictionaryQueryEntries(filteredDs);
     }
     async getFinalizedHeight() {
         const block = await this.api.getFinalizedBlock();
@@ -216,35 +217,12 @@ let FetchService = class FetchService extends node_core_1.BaseFetchService {
         const CHAIN_INTERVAL = (0, utils_ethereum_1.calcInterval)(this.api) * INTERVAL_PERCENT;
         return Math.min(BLOCK_TIME_VARIANCE, CHAIN_INTERVAL);
     }
-    async getChainId() {
-        return Promise.resolve(this.api.getChainId().toString());
-    }
     getModulos() {
-        const modulos = [];
-        for (const ds of this.project.dataSources) {
-            if ((0, common_ethereum_1.isCustomDs)(ds)) {
-                continue;
-            }
-            for (const handler of ds.mapping.handlers) {
-                if (handler.kind === common_ethereum_1.EthereumHandlerKind.Block &&
-                    handler.filter &&
-                    handler.filter.modulo) {
-                    modulos.push(handler.filter.modulo);
-                }
-            }
-        }
-        return modulos;
+        return (0, node_core_1.getModulos)(this.projectService.getAllDataSources(), common_ethereum_1.isCustomDs, common_ethereum_1.EthereumHandlerKind.Block);
     }
     async initBlockDispatcher() {
         await this.blockDispatcher.init(this.resetForNewDs.bind(this));
     }
-    async validatateDictionaryMeta(metaData) {
-        return Promise.resolve(
-        // When alias is not used
-        metaData.genesisHash !== this.api.getGenesisHash() &&
-            // Case when an alias is used
-            metaData.genesisHash !== this.dictionaryService.chainId);
-    }
     async preLoopHook() {
         // Ethereum doesn't need to do anything here
         return Promise.resolve();
@@ -252,12 +230,13 @@ let FetchService = class FetchService extends node_core_1.BaseFetchService {
 };
 FetchService = __decorate([
     (0, common_1.Injectable)(),
-    __param(2, (0, common_1.Inject)('ISubqueryProject')),
-    __param(3, (0, common_1.Inject)('IBlockDispatcher')),
+    __param(2, (0, common_1.Inject)('IProjectService')),
+    __param(3, (0, common_1.Inject)('ISubqueryProject')),
+    __param(4, (0, common_1.Inject)('IBlockDispatcher')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.NodeConfig,
+        project_service_1.ProjectService,
         SubqueryProject_1.SubqueryProject, Object, dictionary_service_1.DictionaryService,
-        ds_processor_service_1.DsProcessorService,
         dynamic_ds_service_1.DynamicDsService,
         unfinalizedBlocks_service_1.UnfinalizedBlocksService,
         event_emitter_1.EventEmitter2,