@subql/node-stellar 2.12.1 → 3.0.0

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

@@ -26,46 +26,28 @@ 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, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocksSevice, connectionPoolState) {
+        super(nodeConfig, eventEmitter, projectService, projectUpgradeService, 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) {
-        //   logger.info(
-        //     `Waiting to fetch block ${height}: ${chalk.red(`${waitTime}ms`)}`,
-        //   );
-        // } else if (waitTime > 200) {
-        //   logger.info(
-        //     `Waiting to fetch block ${height}: ${chalk.yellow(`${waitTime}ms`)}`,
-        //   );
-        // }
     }
 };
 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":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;AAEnC,gDAAwB;AACxB,2CAA2E;AAC3E,yDAAsD;AACtD,gDAiB0B;AAG1B,qEAGyC;AAGzC,8DAAyD;AACzD,4EAAwE;AAIxE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,8BAA8B,CAAC,CAAC;AAMzD,KAAK,UAAU,mBAAmB,CAChC,KAAY,EACZ,gBAAmD,EACnD,wBAAwE,EACxE,mBAAqE,EACrE,IAAY;IAEZ,MAAM,aAAa,GAAG,kBAAM,CAAC,MAAM,CAIjC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,EACjE;QACE,YAAY;QACZ,cAAc;QACd,YAAY;QACZ,kBAAkB;QAClB,mBAAmB;QACnB,WAAW;QACX,eAAe;QACf,wBAAwB;KACzB,kBAEC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAC/B,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAC7C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EACnD,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAC/B,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAC7C,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAC7C,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EACrC,eAAe,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAC7C,gCAAgC,EAC9B,gBAAgB,CAAC,uBAAuB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EACjE,8BAA8B,EAC5B,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAC/D,wBAAwB,EACtB,wBAAwB,CAAC,6BAA6B,CAAC,IAAI,CACzD,wBAAwB,CACzB,IACA,IAAA,4CAAgC,EAAC,mBAAmB,CAAC,GAE1D,IAAI,CACL,CAAC;IAEF,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;IAEjC,OAAO,aAAa,CAAC;AACvB,CAAC;AAGM,IAAM,4BAA4B,GAAlC,MAAM,4BACX,SAAQ,iCAAoD;IAG5D,YACE,UAAsB,EACtB,YAA2B,EACA,cAA+C,EAC1E,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC,EAClC,uBAAiD,EACjD,mBAAqE;QAErE,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,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,CACb,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,CAAC,CAAC;QAChC,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;AAzDY,4BAA4B;IADxC,IAAA,mBAAU,GAAE;IAQR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAKzB,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAPf,sBAAU;QACR,6BAAa,UAER,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;QACT,oDAAwB;QAC5B,sCAA0B;GAftC,4BAA4B,CAyDxC;AAzDY,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  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-stellar';\nimport chalk from 'chalk';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { StellarApiConnection } from '../../stellar/api.connection';\nimport { StellarBlockWrapped } from '../../stellar/block.stellar';\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<StellarBlockWrapped>,\n  connectionPoolState: ConnectionPoolStateManager<StellarApiConnection>,\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<StellarApiConnection>,\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,gDAsB0B;AAE1B,qEAGyC;AAGzC,8DAAyD;AACzD,4EAAwE;AAGxE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,8BAA8B,CAAC,CAAC;AAMzD,KAAK,UAAU,mBAAmB,CAChC,KAAY,EACZ,gBAAqD,EACrD,wBAAwE,EACxE,mBAAqE,EACrE,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,iCAAsD;IAG9D,YACE,UAAsB,EACtB,YAA2B,EAE3B,cAAiD,EAEjD,qBAA6C,EAC7C,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC,EAClC,uBAAiD,EACjD,mBAAqE;QAErE,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,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;IACzB,CAAC;CACF,CAAA;AAnDY,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,CAmDxC;AAnDY,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  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  baseWorkerFunctions,\n  storeHostFunctions,\n  dynamicDsHostFunctions,\n  IProjectUpgradeService,\n  HostUnfinalizedBlocks,\n} from '@subql/node-core';\nimport { Store } from '@subql/types-core';\nimport {\n  StellarProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { StellarApiConnection } from '../../stellar/api.connection';\nimport { StellarBlockWrapped } from '../../stellar/block.stellar';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';\nimport { IIndexerWorker, IInitIndexerWorker } from '../worker/worker';\n\nconst logger = getLogger('WorkerBlockDispatcherService');\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\nasync function createIndexerWorker(\n  store: Store,\n  dynamicDsService: IDynamicDsService<StellarProjectDs>,\n  unfinalizedBlocksService: IUnfinalizedBlocksService<StellarBlockWrapped>,\n  connectionPoolState: ConnectionPoolStateManager<StellarApiConnection>,\n  root: string,\n  startHeight: number,\n): Promise<IndexerWorker> {\n  const indexerWorker = Worker.create<\n    IInitIndexerWorker,\n    HostDynamicDS<StellarProjectDs> & 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<StellarProjectDs, IndexerWorker>\n  implements OnApplicationShutdown\n{\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<StellarProjectDs>,\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    unfinalizedBlocksSevice: UnfinalizedBlocksService,\n    connectionPoolState: ConnectionPoolStateManager<StellarApiConnection>,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgradeService,\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}\n"]}

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

@@ -1,7 +1,7 @@
-import { OnApplicationShutdown } from '@nestjs/common';
 import { NodeConfig, DictionaryService as CoreDictionaryService } from '@subql/node-core';
+import EventEmitter2 from 'eventemitter2';
 import { SubqueryProject } from '../configure/SubqueryProject';
-export declare class DictionaryService extends CoreDictionaryService implements OnApplicationShutdown {
+export declare class DictionaryService extends CoreDictionaryService {
     protected project: SubqueryProject;
-    constructor(project: SubqueryProject, nodeConfig: NodeConfig);
+    constructor(project: SubqueryProject, eventEmitter: EventEmitter2, nodeConfig: NodeConfig);
 }

package/dist/indexer/dictionary.service.js

@@ -13,14 +13,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DictionaryService = void 0;
 const common_1 = require("@nestjs/common");
 const node_core_1 = require("@subql/node-core");
+const eventemitter2_1 = __importDefault(require("eventemitter2"));
 const SubqueryProject_1 = require("../configure/SubqueryProject");
 let DictionaryService = class DictionaryService extends node_core_1.DictionaryService {
-    constructor(project, nodeConfig) {
-        super(project.network.dictionary, project.network.chainId, nodeConfig);
+    constructor(project, eventEmitter, nodeConfig) {
+        super(project.network.dictionary, project.network.chainId, nodeConfig, eventEmitter);
         this.project = project;
     }
 };
@@ -28,6 +32,7 @@ DictionaryService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [SubqueryProject_1.SubqueryProject,
+        eventemitter2_1.default,
         node_core_1.NodeConfig])
 ], DictionaryService);
 exports.DictionaryService = DictionaryService;

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,kEAA+D;AAGxD,IAAM,iBAAiB,GAAvB,MAAM,iBACX,SAAQ,6BAAqB;IAG7B,YACwC,OAAwB,EAC9D,UAAsB;QAEtB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAHjC,YAAO,GAAP,OAAO,CAAiB;IAIhE,CAAC;CACF,CAAA;AAVY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAAoB,iCAAe;QAClD,sBAAU;GANb,iBAAiB,CAU7B;AAVY,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 { SubqueryProject } from '../configure/SubqueryProject';\n\n@Injectable()\nexport class DictionaryService\n  extends CoreDictionaryService\n  implements OnApplicationShutdown\n{\n  constructor(\n    @Inject('ISubqueryProject') protected project: SubqueryProject,\n    nodeConfig: NodeConfig,\n  ) {\n    super(project.network.dictionary, project.network.chainId, nodeConfig);\n  }\n}\n"]}
+{"version":3,"file":"dictionary.service.js","sourceRoot":"","sources":["../../src/indexer/dictionary.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;AAEnC,2CAA2E;AAC3E,gDAG0B;AAC1B,kEAA0C;AAC1C,kEAA+D;AAGxD,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,6BAAqB;IAC1D,YACwC,OAAwB,EAC9D,YAA2B,EAC3B,UAAsB;QAEtB,KAAK,CACH,OAAO,CAAC,OAAO,CAAC,UAAU,EAC1B,OAAO,CAAC,OAAO,CAAC,OAAO,EACvB,UAAU,EACV,YAAY,CACb,CAAC;QAToC,YAAO,GAAP,OAAO,CAAiB;IAUhE,CAAC;CACF,CAAA;AAbY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAAoB,iCAAe;QAChD,uBAAa;QACf,sBAAU;GAJb,iBAAiB,CAa7B;AAbY,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 EventEmitter2 from 'eventemitter2';\nimport { SubqueryProject } from '../configure/SubqueryProject';\n\n@Injectable()\nexport class DictionaryService extends CoreDictionaryService {\n  constructor(\n    @Inject('ISubqueryProject') protected project: SubqueryProject,\n    eventEmitter: EventEmitter2,\n    nodeConfig: NodeConfig,\n  ) {\n    super(\n      project.network.dictionary,\n      project.network.chainId,\n      nodeConfig,\n      eventEmitter,\n    );\n  }\n}\n"]}

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

@@ -1,9 +1,9 @@
 import { StellarHandlerKind, isCustomDs, SubqlStellarCustomDataSource, SubqlStellarDataSource, SubqlDatasourceProcessor } from '@subql/common-stellar';
 import { BaseDsProcessorService } from '@subql/node-core';
 import { SecondLayerHandlerProcessor_0_0_0, SecondLayerHandlerProcessor_1_0_0, SubqlCustomDatasource } from '@subql/types-stellar';
-export declare function isSecondLayerHandlerProcessor_0_0_0<K extends StellarHandlerKind, F, E, DS extends SubqlCustomDatasource = SubqlStellarCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): processor is SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>;
-export declare function isSecondLayerHandlerProcessor_1_0_0<K extends StellarHandlerKind, F, E, DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): processor is SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>;
-export declare function asSecondLayerHandlerProcessor_1_0_0<K extends StellarHandlerKind, F, E, DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>;
-export declare class DsProcessorService extends BaseDsProcessorService<SubqlStellarDataSource, SubqlStellarCustomDataSource<string>, SubqlDatasourceProcessor<string, unknown>> {
+export declare function isSecondLayerHandlerProcessor_0_0_0<K extends StellarHandlerKind, F extends Record<string, unknown>, E, DS extends SubqlCustomDatasource = SubqlStellarCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): processor is SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>;
+export declare function isSecondLayerHandlerProcessor_1_0_0<K extends StellarHandlerKind, F extends Record<string, unknown>, E, DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): processor is SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>;
+export declare function asSecondLayerHandlerProcessor_1_0_0<K extends StellarHandlerKind, F extends Record<string, unknown>, E, DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>;
+export declare class DsProcessorService extends BaseDsProcessorService<SubqlStellarDataSource, SubqlStellarCustomDataSource<string>, SubqlDatasourceProcessor<string, Record<string, unknown>>> {
     protected isCustomDs: typeof isCustomDs;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ds-processor.service.js","sourceRoot":"","sources":["../../src/indexer/ds-processor.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAA4C;AAC5C,0DAM+B;AAC/B,gDAA0D;AAO1D,SAAgB,mCAAmC,CAMjD,SAEkD;IAElD,4GAA4G;IAC5G,OAAO,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC;AAC7C,CAAC;AAZD,kFAYC;AAED,SAAgB,mCAAmC,CAMjD,SAEkD;IAElD,OAAO,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC;AAC3C,CAAC;AAXD,kFAWC;AAED,SAAgB,mCAAmC,CAMjD,SAEkD;IAElD,IAAI,mCAAmC,CAAC,SAAS,CAAC,EAAE;QAClD,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mCAAmC,CAAC,SAAS,CAAC,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,uCACK,SAAS,KACZ,WAAW,EAAE,OAAO,EACpB,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAC1B,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EACnE,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CACtB,SAAS;aACN,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC;aAC/D,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IACzB;AACJ,CAAC;AA5BD,kFA4BC;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,kCAIvC;IAJM;;QAKK,eAAU,GAAG,2BAAU,CAAC;IACpC,CAAC;CAAA,CAAA;AANY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CAM9B;AANY,gDAAkB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Injectable } from '@nestjs/common';\nimport {\n  StellarHandlerKind,\n  isCustomDs,\n  SubqlStellarCustomDataSource,\n  SubqlStellarDataSource,\n  SubqlDatasourceProcessor,\n} from '@subql/common-stellar';\nimport { BaseDsProcessorService } from '@subql/node-core';\nimport {\n  SecondLayerHandlerProcessor_0_0_0,\n  SecondLayerHandlerProcessor_1_0_0,\n  SubqlCustomDatasource,\n} from '@subql/types-stellar';\n\nexport function isSecondLayerHandlerProcessor_0_0_0<\n  K extends StellarHandlerKind,\n  F,\n  E,\n  DS extends SubqlCustomDatasource = SubqlStellarCustomDataSource,\n>(\n  processor:\n    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>\n    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,\n): processor is SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> {\n  // Exisiting datasource processors had no concept of specVersion, therefore undefined is equivalent to 0.0.0\n  return processor.specVersion === undefined;\n}\n\nexport function isSecondLayerHandlerProcessor_1_0_0<\n  K extends StellarHandlerKind,\n  F,\n  E,\n  DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource,\n>(\n  processor:\n    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>\n    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,\n): processor is SecondLayerHandlerProcessor_1_0_0<K, F, E, DS> {\n  return processor.specVersion === '1.0.0';\n}\n\nexport function asSecondLayerHandlerProcessor_1_0_0<\n  K extends StellarHandlerKind,\n  F,\n  E,\n  DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource,\n>(\n  processor:\n    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>\n    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,\n): SecondLayerHandlerProcessor_1_0_0<K, F, E, DS> {\n  if (isSecondLayerHandlerProcessor_1_0_0(processor)) {\n    return processor;\n  }\n\n  if (!isSecondLayerHandlerProcessor_0_0_0(processor)) {\n    throw new Error('Unsupported ds processor version');\n  }\n\n  return {\n    ...processor,\n    specVersion: '1.0.0',\n    filterProcessor: (params) =>\n      processor.filterProcessor(params.filter, params.input, params.ds),\n    transformer: (params) =>\n      processor\n        .transformer(params.input, params.ds, params.api, params.assets)\n        .then((res) => [res]),\n  };\n}\n\n@Injectable()\nexport class DsProcessorService extends BaseDsProcessorService<\n  SubqlStellarDataSource,\n  SubqlStellarCustomDataSource<string>,\n  SubqlDatasourceProcessor<string, unknown>\n> {\n  protected isCustomDs = isCustomDs;\n}\n"]}
+{"version":3,"file":"ds-processor.service.js","sourceRoot":"","sources":["../../src/indexer/ds-processor.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAA4C;AAC5C,0DAM+B;AAC/B,gDAA0D;AAO1D,SAAgB,mCAAmC,CAMjD,SAEkD;IAElD,4GAA4G;IAC5G,OAAO,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC;AAC7C,CAAC;AAZD,kFAYC;AAED,SAAgB,mCAAmC,CAMjD,SAEkD;IAElD,OAAO,SAAS,CAAC,WAAW,KAAK,OAAO,CAAC;AAC3C,CAAC;AAXD,kFAWC;AAED,SAAgB,mCAAmC,CAMjD,SAEkD;IAElD,IAAI,mCAAmC,CAAC,SAAS,CAAC,EAAE;QAClD,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,mCAAmC,CAAC,SAAS,CAAC,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,uCACK,SAAS,KACZ,WAAW,EAAE,OAAO,EACpB,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAC1B,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EACnE,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CACtB,SAAS;aACN,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC;aAC/D,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IACzB;AACJ,CAAC;AA5BD,kFA4BC;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,kCAIvC;IAJM;;QAKK,eAAU,GAAG,2BAAU,CAAC;IACpC,CAAC;CAAA,CAAA;AANY,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CAM9B;AANY,gDAAkB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Injectable } from '@nestjs/common';\nimport {\n  StellarHandlerKind,\n  isCustomDs,\n  SubqlStellarCustomDataSource,\n  SubqlStellarDataSource,\n  SubqlDatasourceProcessor,\n} from '@subql/common-stellar';\nimport { BaseDsProcessorService } from '@subql/node-core';\nimport {\n  SecondLayerHandlerProcessor_0_0_0,\n  SecondLayerHandlerProcessor_1_0_0,\n  SubqlCustomDatasource,\n} from '@subql/types-stellar';\n\nexport function isSecondLayerHandlerProcessor_0_0_0<\n  K extends StellarHandlerKind,\n  F extends Record<string, unknown>,\n  E,\n  DS extends SubqlCustomDatasource = SubqlStellarCustomDataSource,\n>(\n  processor:\n    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>\n    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,\n): processor is SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> {\n  // Exisiting datasource processors had no concept of specVersion, therefore undefined is equivalent to 0.0.0\n  return processor.specVersion === undefined;\n}\n\nexport function isSecondLayerHandlerProcessor_1_0_0<\n  K extends StellarHandlerKind,\n  F extends Record<string, unknown>,\n  E,\n  DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource,\n>(\n  processor:\n    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>\n    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,\n): processor is SecondLayerHandlerProcessor_1_0_0<K, F, E, DS> {\n  return processor.specVersion === '1.0.0';\n}\n\nexport function asSecondLayerHandlerProcessor_1_0_0<\n  K extends StellarHandlerKind,\n  F extends Record<string, unknown>,\n  E,\n  DS extends SubqlStellarCustomDataSource = SubqlStellarCustomDataSource,\n>(\n  processor:\n    | SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>\n    | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>,\n): SecondLayerHandlerProcessor_1_0_0<K, F, E, DS> {\n  if (isSecondLayerHandlerProcessor_1_0_0(processor)) {\n    return processor;\n  }\n\n  if (!isSecondLayerHandlerProcessor_0_0_0(processor)) {\n    throw new Error('Unsupported ds processor version');\n  }\n\n  return {\n    ...processor,\n    specVersion: '1.0.0',\n    filterProcessor: (params) =>\n      processor.filterProcessor(params.filter, params.input, params.ds),\n    transformer: (params) =>\n      processor\n        .transformer(params.input, params.ds, params.api, params.assets)\n        .then((res) => [res]),\n  };\n}\n\n@Injectable()\nexport class DsProcessorService extends BaseDsProcessorService<\n  SubqlStellarDataSource,\n  SubqlStellarCustomDataSource<string>,\n  SubqlDatasourceProcessor<string, Record<string, unknown>>\n> {\n  protected isCustomDs = isCustomDs;\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 { StellarProjectDs, SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
-export declare class DynamicDsService extends BaseDynamicDsService<SubqlProjectDs> {
+export declare class DynamicDsService extends BaseDynamicDsService<StellarProjectDs> {
     private readonly dsProcessorService;
     private readonly project;
     constructor(dsProcessorService: DsProcessorService, project: SubqueryProject);
-    protected getDatasource(params: DatasourceParams): Promise<SubqlProjectDs>;
+    protected getDatasource(params: DatasourceParams): Promise<StellarProjectDs>;
 }

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

@@ -13,6 +13,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicDsService = void 0;
 const common_1 = require("@nestjs/common");
@@ -30,8 +41,7 @@ let DynamicDsService = class DynamicDsService extends node_core_1.DynamicDsServi
         this.project = project;
     }
     async getDatasource(params) {
-        var _a;
-        const template = (0, lodash_1.cloneDeep)((_a = this.project.templates) === null || _a === void 0 ? void 0 : _a.find((t) => t.name === params.templateName));
+        const _a = (0, lodash_1.cloneDeep)(this.project.templates.find((t) => t.name === params.templateName)), { name } = _a, template = __rest(_a, ["name"]);
         if (!template) {
             throw new Error(`Unable to find matching template in project for name: "${params.templateName}"`);
         }

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,0DAI+B;AAC/B,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,2BAAU,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,4BAAW,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,6CAA4B,EAAE,KAAK,CAAC,CAAC;gBAEnE,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  StellarRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-stellar';\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(StellarRuntimeDataSourceImpl, 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,0DAI+B;AAC/B,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,mCAAmC;AACnC,kEAGsC;AACtC,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAsC;IAC1E,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,KAAwB,IAAA,kBAAS,EACrC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,CACnE,EAFK,EAAE,IAAI,OAEX,EAFgB,QAAQ,cAAnB,QAAqB,CAE1B,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,GACV,CAAC;QACtB,IAAI;YACF,IAAI,IAAA,2BAAU,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,4BAAW,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,6CAA4B,EAAE,KAAK,CAAC,CAAC;gBAEnE,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  StellarRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-stellar';\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  StellarProjectDs,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<StellarProjectDs> {\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<StellarProjectDs> {\n    const { name, ...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 StellarProjectDs;\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(StellarRuntimeDataSourceImpl, 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

@@ -31,12 +31,17 @@ FetchModule = __decorate([
             node_core_1.StoreCacheService,
             {
                 provide: node_core_1.ApiService,
-                useFactory: async (project, connectionPoolService, eventEmitter) => {
-                    const apiService = new api_service_stellar_1.StellarApiService(project, connectionPoolService, eventEmitter);
+                useFactory: async (project, projectUpgradeService, connectionPoolService, eventEmitter) => {
+                    const apiService = new api_service_stellar_1.StellarApiService(project, projectUpgradeService, connectionPoolService, eventEmitter);
                     await apiService.init();
                     return apiService;
                 },
-                inject: ['ISubqueryProject', node_core_1.ConnectionPoolService, event_emitter_1.EventEmitter2],
+                inject: [
+                    'ISubqueryProject',
+                    'IProjectUpgradeService',
+                    node_core_1.ConnectionPoolService,
+                    event_emitter_1.EventEmitter2,
+                ],
             },
             indexer_manager_1.IndexerManager,
             node_core_1.ConnectionPoolService,
@@ -50,13 +55,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,
@@ -77,16 +83,13 @@ FetchModule = __decorate([
             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":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAAwC;AACxC,yDAAsD;AACtD,gDAc0B;AAG1B,wEAAmE;AACnE,uDAG2B;AAC3B,6DAAyD;AACzD,iEAA4D;AAC5D,6DAAwD;AACxD,mDAA+C;AAC/C,uDAAmD;AACnD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AAgHhE,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IA9GvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,wBAAY;YACZ,6BAAiB;YACjB;gBACE,OAAO,EAAE,sBAAU;gBACnB,UAAU,EAAE,KAAK,EACf,OAAwB,EACxB,qBAAkE,EAClE,YAA2B,EAC3B,EAAE;oBACF,MAAM,UAAU,GAAG,IAAI,uCAAiB,CACtC,OAAO,EACP,qBAAqB,EACrB,YAAY,CACb,CAAC;oBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;oBACxB,OAAO,UAAU,CAAC;gBACpB,CAAC;gBACD,MAAM,EAAE,CAAC,kBAAkB,EAAE,iCAAqB,EAAE,6BAAa,CAAC;aACnE;YACD,gCAAc;YACd,iCAAqB;YACrB,sCAA0B;YAC1B;gBACE,OAAO,EAAE,6BAAiB;gBAC1B,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,IAAI,6BAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAU,CAAC;aACrB;YACD;gBACE,OAAO,EAAE,kBAAkB;gBAC3B,UAAU,EAAE,CACV,UAAsB,EACtB,YAA2B,EAC3B,cAA8B,EAC9B,UAA6B,EAC7B,cAA8B,EAC9B,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACtB,OAAwB,EACxB,gBAAkC,EAClC,iBAA2C,EAC3C,mBAAqE,EACrE,EAAE,CACF,UAAU,CAAC,OAAO,KAAK,SAAS;oBAC9B,CAAC,CAAC,IAAI,8CAA4B,CAC9B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,CACpB;oBACH,CAAC,CAAC,IAAI,wCAAsB,CACxB,UAAU,EACV,UAAU,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB;gBACP,MAAM,EAAE;oBACN,sBAAU;oBACV,6BAAa;oBACb,iBAAiB;oBACjB,sBAAU;oBACV,gCAAc;oBACd,6BAAiB;oBACjB,wBAAY;oBACZ,6BAAiB;oBACjB,sBAAU;oBACV,kBAAkB;oBAClB,qCAAgB;oBAChB,oDAAwB;oBACxB,sCAA0B;iBAC3B;aACF;YACD,4BAAY;YACZ,oCAAwB;YACxB,+BAAmB;YACnB,sCAAiB;YACjB,gCAAc;YACd,yCAAkB;YAClB,qCAAgB;YAChB,sBAAU;YACV,sBAAU;YACV,2BAAe;YACf,6BAAiB;YACjB;gBACE,QAAQ,EAAE,gCAAc;gBACxB,OAAO,EAAE,iBAAiB;aAC3B;YACD,oDAAwB;SACzB;QACD,OAAO,EAAE,CAAC,wBAAY,EAAE,sBAAU,EAAE,6BAAiB,EAAE,2BAAe,CAAC;KACxE,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW","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  ConnectionPoolService,\n  SmartBatchService,\n  StoreCacheService,\n  PgMmrCacheService,\n  MmrQueryService,\n  ConnectionPoolStateManager,\n  NodeConfig,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { StellarApiConnection } from '../stellar/api.connection';\nimport { StellarApiService } from '../stellar/api.service.stellar';\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<StellarApiConnection>,\n        eventEmitter: EventEmitter2,\n      ) => {\n        const apiService = new StellarApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: ['ISubqueryProject', ConnectionPoolService, EventEmitter2],\n    },\n    IndexerManager,\n    ConnectionPoolService,\n    ConnectionPoolStateManager,\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: StellarApiService,\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<StellarApiConnection>,\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    IndexingBenchmarkService,\n    PoiBenchmarkService,\n    DictionaryService,\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":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAAwC;AACxC,yDAAsD;AACtD,gDAa0B;AAG1B,wEAAmE;AACnE,uDAG2B;AAC3B,6DAAyD;AACzD,iEAA4D;AAC5D,6DAAwD;AACxD,mDAA+C;AAC/C,uDAAmD;AACnD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AAwHhE,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAtHvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,wBAAY;YACZ,6BAAiB;YACjB;gBACE,OAAO,EAAE,sBAAU;gBACnB,UAAU,EAAE,KAAK,EACf,OAAwB,EACxB,qBAA2C,EAC3C,qBAAkE,EAClE,YAA2B,EAC3B,EAAE;oBACF,MAAM,UAAU,GAAG,IAAI,uCAAiB,CACtC,OAAO,EACP,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,CACb,CAAC;oBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;oBACxB,OAAO,UAAU,CAAC;gBACpB,CAAC;gBACD,MAAM,EAAE;oBACN,kBAAkB;oBAClB,wBAAwB;oBACxB,iCAAqB;oBACrB,6BAAa;iBACd;aACF;YACD,gCAAc;YACd,iCAAqB;YACrB,sCAA0B;YAC1B;gBACE,OAAO,EAAE,6BAAiB;gBAC1B,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,IAAI,6BAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAU,CAAC;aACrB;YACD;gBACE,OAAO,EAAE,kBAAkB;gBAC3B,UAAU,EAAE,CACV,UAAsB,EACtB,YAA2B,EAC3B,cAA8B,EAC9B,qBAA6C,EAC7C,UAAsB,EACtB,cAA8B,EAC9B,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACtB,OAAwB,EACxB,gBAAkC,EAClC,iBAA2C,EAC3C,mBAAqE,EACrE,EAAE,CACF,UAAU,CAAC,OAAO,KAAK,SAAS;oBAC9B,CAAC,CAAC,IAAI,8CAA4B,CAC9B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,CACpB;oBACH,CAAC,CAAC,IAAI,wCAAsB,CACxB,UAAU,EACV,UAAU,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB;gBACP,MAAM,EAAE;oBACN,sBAAU;oBACV,6BAAa;oBACb,iBAAiB;oBACjB,wBAAwB;oBACxB,sBAAU;oBACV,gCAAc;oBACd,6BAAiB;oBACjB,wBAAY;oBACZ,6BAAiB;oBACjB,sBAAU;oBACV,kBAAkB;oBAClB,qCAAgB;oBAChB,oDAAwB;oBACxB,sCAA0B;iBAC3B;aACF;YACD,4BAAY;YACZ,oCAAwB;YACxB,+BAAmB;YACnB,sCAAiB;YACjB,gCAAc;YACd,yCAAkB;YAClB,qCAAgB;YAChB,sBAAU;YACV;gBACE,QAAQ,EAAE,gCAAc;gBACxB,OAAO,EAAE,iBAAiB;aAC3B;YACD,oDAAwB;SACzB;QACD,OAAO,EAAE,CAAC,wBAAY,EAAE,6BAAiB,CAAC;KAC3C,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW","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  ConnectionPoolService,\n  SmartBatchService,\n  StoreCacheService,\n  ConnectionPoolStateManager,\n  NodeConfig,\n  IProjectUpgradeService,\n  ProjectUpgradeSevice,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { StellarApiConnection } from '../stellar/api.connection';\nimport { StellarApiService } from '../stellar/api.service.stellar';\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        projectUpgradeService: ProjectUpgradeSevice,\n        connectionPoolService: ConnectionPoolService<StellarApiConnection>,\n        eventEmitter: EventEmitter2,\n      ) => {\n        const apiService = new StellarApiService(\n          project,\n          projectUpgradeService,\n          connectionPoolService,\n          eventEmitter,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        'IProjectUpgradeService',\n        ConnectionPoolService,\n        EventEmitter2,\n      ],\n    },\n    IndexerManager,\n    ConnectionPoolService,\n    ConnectionPoolStateManager,\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: ApiService,\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<StellarApiConnection>,\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    IndexingBenchmarkService,\n    PoiBenchmarkService,\n    DictionaryService,\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,36 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { SchedulerRegistry } from '@nestjs/schedule';
 import { SubqlStellarProcessorOptions } from '@subql/common-stellar';
 import { NodeConfig, BaseFetchService, ApiService } from '@subql/node-core';
-import { DictionaryQueryEntry } from '@subql/types';
+import { DictionaryQueryEntry } from '@subql/types-core';
 import { SubqlDatasource } from '@subql/types-stellar';
-import { MetaData } from '@subql/utils';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { StellarApi } from '../stellar';
 import { IStellarBlockDispatcher } 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 & {
     groupedOptions?: SubqlStellarProcessorOptions[];
 };
-export declare function buildDictionaryQueryEntries(dataSources: GroupedSubqlProjectDs[], startBlock: number): DictionaryQueryEntry[];
-export declare class FetchService extends BaseFetchService<ApiService, SubqlDatasource, IStellarBlockDispatcher, DictionaryService> {
+export declare function buildDictionaryQueryEntries(dataSources: GroupedSubqlProjectDs[]): DictionaryQueryEntry[];
+export declare class FetchService extends BaseFetchService<SubqlDatasource, IStellarBlockDispatcher, DictionaryService> {
+    private apiService;
+    private dsProcessorService;
     private unfinalizedBlocksService;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, project: SubqueryProject, blockDispatcher: IStellarBlockDispatcher, dictionaryService: DictionaryService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, projectService: ProjectService, project: SubqueryProject, blockDispatcher: IStellarBlockDispatcher, dictionaryService: DictionaryService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
     get api(): StellarApi;
-    buildDictionaryQueryEntries(startBlock: number): DictionaryQueryEntry[];
+    protected getGenesisHash(): string;
+    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>;
-    protected getModulos(): number[];
 }
 export {};

package/dist/indexer/fetch.service.js

@@ -27,6 +27,7 @@ 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;
@@ -131,15 +132,10 @@ function eventFilterToQueryEntry(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)
@@ -207,23 +203,31 @@ 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, dsProcessorService, dynamicDsService, unfinalizedBlocksService, eventEmitter, schedulerRegistry) {
+        super(nodeConfig, projectService, project.network, blockDispatcher, dictionaryService, dynamicDsService, eventEmitter, schedulerRegistry);
+        this.apiService = apiService;
+        this.dsProcessorService = dsProcessorService;
         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) => {
+    getGenesisHash() {
+        return this.apiService.networkMeta.genesisHash;
+    }
+    buildDictionaryQueryEntries(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 sequence = await this.api.getFinalizedBlockHeight();
@@ -242,51 +246,25 @@ let FetchService = class FetchService extends node_core_1.BaseFetchService {
     async getChainId() {
         return Promise.resolve(this.api.getChainId().toString());
     }
-    /*
-    protected getModulos(): number[] {
-      const modulos: number[] = [];
-      for (const ds of this.project.dataSources) {
-        if (isCustomDs(ds)) {
-          continue;
-        }
-        for (const handler of ds.mapping.handlers) {
-          if (
-            handler.kind === StellarHandlerKind.Block &&
-            handler.filter &&
-            handler.filter.modulo
-          ) {
-            modulos.push(handler.filter.modulo);
-          }
-        }
-      }
-      return modulos;
+    getModulos() {
+        return (0, node_core_1.getModulos)(this.projectService.getAllDataSources(), common_stellar_1.isCustomDs, common_stellar_1.StellarHandlerKind.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() {
         // Stellar doesn't need to do anything here
         return Promise.resolve();
     }
-    getModulos() {
-        //block handler not implemented yet
-        return [];
-    }
 };
 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,