@subql/node-ethereum 0.4.1-9 → 0.4.1-storeCache-0.0.4

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

@@ -1,23 +1,16 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ApiService, NodeConfig, Queue } from '@subql/node-core';
+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 { DynamicDsService } from '../dynamic-ds.service';
 import { IndexerManager } from '../indexer.manager';
-import { ProjectService } from '../project.service';
-import { BaseBlockDispatcher } from './base-block-dispatcher';
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
-export declare class BlockDispatcherService extends BaseBlockDispatcher<Queue<number>> implements OnApplicationShutdown {
-    private apiService;
+export declare class BlockDispatcherService extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs> implements OnApplicationShutdown {
     private indexerManager;
-    private processQueue;
-    private fetching;
-    private isShutdown;
-    private fetchBlocksBatches;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: ProjectService);
-    init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;
-    onApplicationShutdown(): void;
-    enqueueBlocks(cleanedBlocks: number[], latestBufferHeight?: number): void;
-    flushQueue(height: number): void;
-    private fetchBlocksFromQueue;
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService);
+    protected getBlockHeight(block: EthereumBlockWrapper): number;
+    protected indexBlock(block: EthereumBlockWrapper): Promise<ProcessBlockResponse>;
 }

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

@@ -10,133 +10,45 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockDispatcherService = 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 lodash_1 = require("lodash");
+const SubqueryProject_1 = require("../../configure/SubqueryProject");
+const dynamic_ds_service_1 = require("../dynamic-ds.service");
 const indexer_manager_1 = require("../indexer.manager");
-const project_service_1 = require("../project.service");
-const base_block_dispatcher_1 = require("./base-block-dispatcher");
-const logger = (0, node_core_1.getLogger)('BlockDispatcherService');
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
-let BlockDispatcherService = class BlockDispatcherService extends base_block_dispatcher_1.BaseBlockDispatcher {
-    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService) {
-        super(nodeConfig, eventEmitter, projectService, new node_core_1.Queue(nodeConfig.batchSize * 3));
-        this.apiService = apiService;
+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.api.fetchBlocks.bind(apiService.api));
         this.indexerManager = indexerManager;
-        this.fetching = false;
-        this.isShutdown = false;
-        this.processQueue = new node_core_1.AutoQueue(nodeConfig.batchSize * 3);
-        const fetchBlocks = this.apiService.api.fetchBlocks.bind(this.apiService.api);
-        if (this.nodeConfig.profiler) {
-            this.fetchBlocksBatches = (0, node_core_1.profilerWrap)(fetchBlocks, 'EthereumUtil', 'fetchBlocksBatches');
-        }
-        else {
-            this.fetchBlocksBatches = fetchBlocks;
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/require-await
-    async init(onDynamicDsCreated) {
-        this.onDynamicDsCreated = onDynamicDsCreated;
-        const blockAmount = await this.projectService.getProcessedBlockCount();
-        this.setProcessedBlockCount(blockAmount !== null && blockAmount !== void 0 ? blockAmount : 0);
-    }
-    onApplicationShutdown() {
-        this.isShutdown = true;
-        this.processQueue.abort();
-    }
-    enqueueBlocks(cleanedBlocks, latestBufferHeight) {
-        // // In the case where factors of batchSize is equal to bypassBlock or when cleanedBatchBlocks is []
-        // // to ensure block is bypassed, latestBufferHeight needs to be manually set
-        // If cleanedBlocks = []
-        if (!!latestBufferHeight && !cleanedBlocks.length) {
-            this.latestBufferedHeight = latestBufferHeight;
-            return;
-        }
-        logger.info(`Enqueueing blocks ${cleanedBlocks[0]}...${(0, lodash_1.last)(cleanedBlocks)}, total ${cleanedBlocks.length} blocks`);
-        this.queue.putMany(cleanedBlocks);
-        this.latestBufferedHeight = latestBufferHeight !== null && latestBufferHeight !== void 0 ? latestBufferHeight : (0, lodash_1.last)(cleanedBlocks);
-        void this.fetchBlocksFromQueue().catch((e) => {
-            logger.error(e, 'Failed to fetch blocks from queue');
-            if (!this.isShutdown) {
-                process.exit(1);
-            }
-        });
     }
-    flushQueue(height) {
-        super.flushQueue(height);
-        this.processQueue.flush();
+    getBlockHeight(block) {
+        return block.blockHeight;
     }
-    async fetchBlocksFromQueue() {
-        if (this.fetching || this.isShutdown)
-            return;
-        // Process queue is full, no point in fetching more blocks
-        // if (this.processQueue.freeSpace < this.nodeConfig.batchSize) return;
-        this.fetching = true;
-        try {
-            while (!this.isShutdown) {
-                const blockNums = this.queue.takeMany(Math.min(this.nodeConfig.batchSize, this.processQueue.freeSpace));
-                // Used to compare before and after as a way to check if queue was flushed
-                const bufferedHeight = this._latestBufferedHeight;
-                // Queue is empty
-                if (!blockNums.length) {
-                    // The process queue might be full so no block nums were taken, wait and try again
-                    if (this.queue.size) {
-                        await (0, node_core_1.delay)(1);
-                        continue;
-                    }
-                    break;
-                }
-                logger.info(`fetch block [${blockNums[0]},${blockNums[blockNums.length - 1]}], total ${blockNums.length} blocks`);
-                const blocks = await this.fetchBlocksBatches(blockNums);
-                // Check if the queues have been flushed between queue.takeMany and fetchBlocksBatches resolving
-                // Peeking the queue is because the latestBufferedHeight could have regrown since fetching block
-                if (bufferedHeight > this._latestBufferedHeight ||
-                    this.queue.peek() < Math.min(...blockNums)) {
-                    logger.info(`Queue was reset for new DS, discarding fetched blocks`);
-                    continue;
-                }
-                const blockTasks = blocks.map((block) => async () => {
-                    var _a;
-                    const height = block.blockHeight;
-                    try {
-                        this.preProcessBlock(height);
-                        const processBlockResponse = await this.indexerManager.indexBlock(block);
-                        await this.postProcessBlock(height, processBlockResponse);
-                    }
-                    catch (e) {
-                        if (this.isShutdown) {
-                            return;
-                        }
-                        logger.error(e, `failed to index block at height ${height} ${e.handler ? `${e.handler}(${(_a = e.stack) !== null && _a !== void 0 ? _a : ''})` : ''}`);
-                        throw e;
-                    }
-                });
-                // There can be enough of a delay after fetching blocks that shutdown could now be true
-                if (this.isShutdown)
-                    break;
-                this.processQueue.putMany(blockTasks);
-                this.eventEmitter.emit(node_core_1.IndexerEvent.BlockQueueSize, {
-                    value: this.processQueue.size,
-                });
-            }
-        }
-        finally {
-            this.fetching = false;
-        }
+    async indexBlock(block) {
+        return this.indexerManager.indexBlock(block);
     }
 };
 BlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
+    __param(4, (0, common_1.Inject)('IProjectService')),
+    __param(9, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.NodeConfig,
         indexer_manager_1.IndexerManager,
-        event_emitter_1.EventEmitter2,
-        project_service_1.ProjectService])
+        event_emitter_1.EventEmitter2, Object, node_core_1.SmartBatchService,
+        node_core_1.StoreService,
+        node_core_1.StoreCacheService,
+        node_core_1.PoiService,
+        SubqueryProject_1.SubqueryProject,
+        dynamic_ds_service_1.DynamicDsService])
 ], BlockDispatcherService);
 exports.BlockDispatcherService = BlockDispatcherService;
 //# sourceMappingURL=block-dispatcher.service.js.map

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":"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","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  getLogger,\n  NodeConfig,\n  IndexerEvent,\n  delay,\n  profilerWrap,\n  AutoQueue,\n  Queue,\n} from '@subql/node-core';\nimport { last } from 'lodash';\nimport { EthereumApiService } from '../../ethereum';\nimport { IndexerManager } from '../indexer.manager';\nimport { ProjectService } from '../project.service';\nimport { BaseBlockDispatcher } from './base-block-dispatcher';\n\nconst logger = getLogger('BlockDispatcherService');\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 BaseBlockDispatcher<Queue<number>>\n  implements OnApplicationShutdown\n{\n  private processQueue: AutoQueue<void>;\n\n  private fetching = false;\n  private isShutdown = false;\n  private fetchBlocksBatches: EthereumApiService['api']['fetchBlocks'];\n\n  constructor(\n    private apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    projectService: ProjectService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      new Queue(nodeConfig.batchSize * 3),\n    );\n    this.processQueue = new AutoQueue(nodeConfig.batchSize * 3);\n\n    const fetchBlocks = this.apiService.api.fetchBlocks.bind(\n      this.apiService.api,\n    );\n    if (this.nodeConfig.profiler) {\n      this.fetchBlocksBatches = profilerWrap(\n        fetchBlocks,\n        'EthereumUtil',\n        'fetchBlocksBatches',\n      );\n    } else {\n      this.fetchBlocksBatches = fetchBlocks;\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  async init(\n    onDynamicDsCreated: (height: number) => Promise<void>,\n  ): Promise<void> {\n    this.onDynamicDsCreated = onDynamicDsCreated;\n    const blockAmount = await this.projectService.getProcessedBlockCount();\n    this.setProcessedBlockCount(blockAmount ?? 0);\n  }\n\n  onApplicationShutdown(): void {\n    this.isShutdown = true;\n    this.processQueue.abort();\n  }\n\n  enqueueBlocks(cleanedBlocks: number[], latestBufferHeight?: number): void {\n    // // In the case where factors of batchSize is equal to bypassBlock or when cleanedBatchBlocks is []\n    // // to ensure block is bypassed, latestBufferHeight needs to be manually set\n    // If cleanedBlocks = []\n    if (!!latestBufferHeight && !cleanedBlocks.length) {\n      this.latestBufferedHeight = latestBufferHeight;\n      return;\n    }\n\n    logger.info(\n      `Enqueueing blocks ${cleanedBlocks[0]}...${last(cleanedBlocks)}, total ${\n        cleanedBlocks.length\n      } blocks`,\n    );\n\n    this.queue.putMany(cleanedBlocks);\n\n    this.latestBufferedHeight = latestBufferHeight ?? last(cleanedBlocks);\n    void this.fetchBlocksFromQueue().catch((e) => {\n      logger.error(e, 'Failed to fetch blocks from queue');\n      if (!this.isShutdown) {\n        process.exit(1);\n      }\n    });\n  }\n\n  flushQueue(height: number): void {\n    super.flushQueue(height);\n    this.processQueue.flush();\n  }\n\n  private async fetchBlocksFromQueue(): Promise<void> {\n    if (this.fetching || this.isShutdown) return;\n    // Process queue is full, no point in fetching more blocks\n    // if (this.processQueue.freeSpace < this.nodeConfig.batchSize) return;\n\n    this.fetching = true;\n\n    try {\n      while (!this.isShutdown) {\n        const blockNums = this.queue.takeMany(\n          Math.min(this.nodeConfig.batchSize, this.processQueue.freeSpace),\n        );\n        // Used to compare before and after as a way to check if queue was flushed\n        const bufferedHeight = this._latestBufferedHeight;\n\n        // Queue is empty\n        if (!blockNums.length) {\n          // The process queue might be full so no block nums were taken, wait and try again\n          if (this.queue.size) {\n            await delay(1);\n            continue;\n          }\n          break;\n        }\n\n        logger.info(\n          `fetch block [${blockNums[0]},${\n            blockNums[blockNums.length - 1]\n          }], total ${blockNums.length} blocks`,\n        );\n\n        const blocks = await this.fetchBlocksBatches(blockNums);\n\n        // Check if the queues have been flushed between queue.takeMany and fetchBlocksBatches resolving\n        // Peeking the queue is because the latestBufferedHeight could have regrown since fetching block\n        if (\n          bufferedHeight > this._latestBufferedHeight ||\n          this.queue.peek() < Math.min(...blockNums)\n        ) {\n          logger.info(`Queue was reset for new DS, discarding fetched blocks`);\n          continue;\n        }\n\n        const blockTasks = blocks.map((block) => async () => {\n          const height = block.blockHeight;\n          try {\n            this.preProcessBlock(height);\n\n            const processBlockResponse = await this.indexerManager.indexBlock(\n              block,\n            );\n\n            await this.postProcessBlock(height, processBlockResponse);\n          } catch (e) {\n            if (this.isShutdown) {\n              return;\n            }\n            logger.error(\n              e,\n              `failed to index block at height ${height} ${\n                e.handler ? `${e.handler}(${e.stack ?? ''})` : ''\n              }`,\n            );\n            throw e;\n          }\n        });\n\n        // There can be enough of a delay after fetching blocks that shutdown could now be true\n        if (this.isShutdown) break;\n\n        this.processQueue.putMany(blockTasks);\n\n        this.eventEmitter.emit(IndexerEvent.BlockQueueSize, {\n          value: this.processQueue.size,\n        });\n      }\n    } finally {\n      this.fetching = false;\n    }\n  }\n}\n"]}
+{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,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+B,EAC1D,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,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAChD,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,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AAxCY,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,CAwClC;AAxCY,wDAAsB","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.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,\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.api.fetchBlocks.bind(apiService.api),\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(block);\n  }\n}\n"]}

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

@@ -0,0 +1,4 @@
+import { IBlockDispatcher } from '@subql/node-core';
+export interface IEthereumBlockDispatcher extends IBlockDispatcher {
+    init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;
+}

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

@@ -0,0 +1,5 @@
+"use strict";
+// / Copyright 2020-2021 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ethereum-block-dispatcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ethereum-block-dispatcher.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/ethereum-block-dispatcher.ts"],"names":[],"mappings":";AAAA,kEAAkE;AAClE,sCAAsC","sourcesContent":["// / Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { IBlockDispatcher } from '@subql/node-core';\n\nexport interface IEthereumBlockDispatcher extends IBlockDispatcher {\n  init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;\n}\n"]}

package/dist/indexer/blockDispatcher/index.d.ts

@@ -1,4 +1,4 @@
-import { IBlockDispatcher } from './base-block-dispatcher';
 import { BlockDispatcherService } from './block-dispatcher.service';
+import { IEthereumBlockDispatcher } from './ethereum-block-dispatcher';
 import { WorkerBlockDispatcherService } from './worker-block-dispatcher.service';
-export { IBlockDispatcher, BlockDispatcherService, WorkerBlockDispatcherService, };
+export { BlockDispatcherService, WorkerBlockDispatcherService, IEthereumBlockDispatcher, };

package/dist/indexer/blockDispatcher/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/index.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;AAGtC,yEAAoE;AAKlE,uGALO,iDAAsB,OAKP;AAJxB,uFAAiF;AAK/E,6GALO,8DAA4B,OAKP","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { IBlockDispatcher } from './base-block-dispatcher';\nimport { BlockDispatcherService } from './block-dispatcher.service';\nimport { WorkerBlockDispatcherService } from './worker-block-dispatcher.service';\n\nexport {\n  IBlockDispatcher,\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/index.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;AAEtC,yEAAoE;AAKlE,uGALO,iDAAsB,OAKP;AAHxB,uFAAiF;AAI/E,6GAJO,8DAA4B,OAIP","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { BlockDispatcherService } from './block-dispatcher.service';\nimport { IEthereumBlockDispatcher } from './ethereum-block-dispatcher';\nimport { WorkerBlockDispatcherService } from './worker-block-dispatcher.service';\n\nexport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n  IEthereumBlockDispatcher,\n};\n"]}

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

@@ -1,20 +1,15 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { NodeConfig, AutoQueue } from '@subql/node-core';
-import { ProjectService } from '../project.service';
-import { BaseBlockDispatcher } from './base-block-dispatcher';
-export declare class WorkerBlockDispatcherService extends BaseBlockDispatcher<AutoQueue<void>> implements OnApplicationShutdown {
-    private workers;
-    private numWorkers;
-    private taskCounter;
-    private isShutdown;
-    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: ProjectService);
-    init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;
-    onApplicationShutdown(): Promise<void>;
-    enqueueBlocks(heights: number[], latestBufferHeight?: number): void;
-    private enqueueBlock;
-    sampleWorkerStatus(): Promise<void>;
-    get latestBufferedHeight(): number;
-    set latestBufferedHeight(height: number);
-    private getNextWorkerIndex;
+import { NodeConfig, SmartBatchService, StoreService, PoiService, StoreCacheService, IProjectService, WorkerBlockDispatcher } from '@subql/node-core';
+import { SubqlProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
+import { DynamicDsService } from '../dynamic-ds.service';
+import { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';
+import { IIndexerWorker } from '../worker/worker';
+declare type IndexerWorker = IIndexerWorker & {
+    terminate: () => Promise<number>;
+};
+export declare class WorkerBlockDispatcherService extends WorkerBlockDispatcher<SubqlProjectDs, IndexerWorker> implements OnApplicationShutdown {
+    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService);
+    protected fetchBlock(worker: IndexerWorker, height: number): Promise<void>;
 }
+export {};

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

@@ -10,23 +10,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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.WorkerBlockDispatcherService = void 0;
-const assert_1 = __importDefault(require("assert"));
 const path_1 = __importDefault(require("path"));
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
-const schedule_1 = require("@nestjs/schedule");
 const node_core_1 = require("@subql/node-core");
-const chalk_1 = __importDefault(require("chalk"));
-const lodash_1 = require("lodash");
-const project_service_1 = require("../project.service");
-const base_block_dispatcher_1 = require("./base-block-dispatcher");
+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() {
+async function createIndexerWorker(store, dynamicDsService, unfinalizedBlocksService) {
     const indexerWorker = node_core_1.Worker.create(path_1.default.resolve(__dirname, '../../../dist/indexer/worker/worker.js'), [
         'initWorker',
         'processBlock',
@@ -34,142 +34,56 @@ async function createIndexerWorker() {
         'numFetchedBlocks',
         'numFetchingBlocks',
         'getStatus',
-        'reloadDynamicDs',
-    ]);
+        'getMemoryLeft',
+        'waitForWorkerBatchSize',
+    ], {
+        storeCount: store.count.bind(store),
+        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),
+        dynamicDsCreateDynamicDatasource: dynamicDsService.createDynamicDatasource.bind(dynamicDsService),
+        dynamicDsGetDynamicDatasources: dynamicDsService.getDynamicDatasources.bind(dynamicDsService),
+        unfinalizedBlocksProcess: unfinalizedBlocksService.processUnfinalizedBlocks.bind(unfinalizedBlocksService),
+    });
     await indexerWorker.initWorker();
     return indexerWorker;
 }
-let WorkerBlockDispatcherService = class WorkerBlockDispatcherService extends base_block_dispatcher_1.BaseBlockDispatcher {
-    constructor(nodeConfig, eventEmitter, projectService) {
-        const numWorkers = nodeConfig.workers;
-        super(nodeConfig, eventEmitter, projectService, new node_core_1.AutoQueue(numWorkers * nodeConfig.batchSize * 2));
-        this.taskCounter = 0;
-        this.isShutdown = false;
-        this.numWorkers = numWorkers;
-    }
-    async init(onDynamicDsCreated) {
-        if (this.nodeConfig.unfinalizedBlocks) {
-            throw new Error('Sorry, best block feature is not supported with workers yet.');
-        }
-        this.workers = await Promise.all(new Array(this.numWorkers).fill(0).map(() => createIndexerWorker()));
-        this.onDynamicDsCreated = onDynamicDsCreated;
-        const blockAmount = await this.projectService.getProcessedBlockCount();
-        this.setProcessedBlockCount(blockAmount !== null && blockAmount !== void 0 ? blockAmount : 0);
-    }
-    async onApplicationShutdown() {
-        this.isShutdown = true;
-        // Stop processing blocks
-        this.queue.abort();
-        // Stop all workers
-        if (this.workers) {
-            await Promise.all(this.workers.map((w) => w.terminate()));
-        }
-    }
-    enqueueBlocks(heights, latestBufferHeight) {
-        if (!heights.length)
-            return;
-        logger.info(`Enqueing blocks [${heights[0]}...${(0, lodash_1.last)(heights)}], total ${heights.length} blocks`);
-        // eslint-disable-next-line no-constant-condition
-        if (true) {
-            /*
-             * Load balancing:
-             * worker1: 1,2,3
-             * worker2: 4,5,6
-             */
-            const workerIdx = this.getNextWorkerIndex();
-            heights.map((height) => this.enqueueBlock(height, workerIdx));
-        }
-        else {
-            /*
-             * Load balancing:
-             * worker1: 1,3,5
-             * worker2: 2,4,6
-             */
-            heights.map((height) => this.enqueueBlock(height, this.getNextWorkerIndex()));
-        }
-        this.latestBufferedHeight = latestBufferHeight !== null && latestBufferHeight !== void 0 ? latestBufferHeight : (0, lodash_1.last)(heights);
-    }
-    enqueueBlock(height, workerIdx) {
-        if (this.isShutdown)
-            return;
-        const worker = this.workers[workerIdx];
-        (0, assert_1.default)(worker, `Worker ${workerIdx} not found`);
-        // Used to compare before and after as a way to check if queue was flushed
-        const bufferedHeight = this.latestBufferedHeight;
-        const pendingBlock = worker.fetchBlock(height);
-        const processBlock = async () => {
-            var _a;
-            try {
-                const start = new Date();
-                const result = await pendingBlock;
-                const end = new Date();
-                if (bufferedHeight > this.latestBufferedHeight) {
-                    logger.debug(`Queue was reset for new DS, discarding fetched blocks`);
-                    return;
-                }
-                const waitTime = end.getTime() - start.getTime();
-                if (waitTime > 1000) {
-                    logger.info(`Waiting to fetch block ${height}: ${chalk_1.default.red(`${waitTime}ms`)}`);
-                }
-                else if (waitTime > 200) {
-                    logger.info(`Waiting to fetch block ${height}: ${chalk_1.default.yellow(`${waitTime}ms`)}`);
-                }
-                // logger.info(
-                //   `worker ${workerIdx} processing block ${height}, fetched blocks: ${await worker.numFetchedBlocks()}, fetching blocks: ${await worker.numFetchingBlocks()}`,
-                // );
-                this.preProcessBlock(height);
-                const { dynamicDsCreated, operationHash, reindexBlockHeight } = await worker.processBlock(height);
-                await this.postProcessBlock(height, {
-                    dynamicDsCreated,
-                    operationHash: Buffer.from(operationHash, 'base64'),
-                    reindexBlockHeight,
-                });
-                if (dynamicDsCreated) {
-                    // Ensure all workers are aware of all dynamic ds
-                    await Promise.all(this.workers.map((w) => w.reloadDynamicDs()));
-                }
-            }
-            catch (e) {
-                logger.error(e, `failed to index block at height ${height} ${e.handler ? `${e.handler}(${(_a = e.stack) !== null && _a !== void 0 ? _a : ''})` : ''}`);
-                process.exit(1);
-            }
-        };
-        void this.queue.put(processBlock);
-    }
-    async sampleWorkerStatus() {
-        for (const worker of this.workers) {
-            const status = await worker.getStatus();
-            logger.info(JSON.stringify(status));
-        }
-    }
-    // Getter doesn't seem to cary from abstract class
-    get latestBufferedHeight() {
-        return this._latestBufferedHeight;
-    }
-    set latestBufferedHeight(height) {
-        super.latestBufferedHeight = height;
-        // There is only a single queue with workers so we treat them as the same
-        this.eventEmitter.emit(node_core_1.IndexerEvent.BlockQueueSize, {
-            value: this.queueSize,
-        });
+let WorkerBlockDispatcherService = class WorkerBlockDispatcherService extends node_core_1.WorkerBlockDispatcher {
+    constructor(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocksSevice) {
+        super(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, () => createIndexerWorker(storeService.getStore(), dynamicDsService, unfinalizedBlocksSevice));
     }
-    getNextWorkerIndex() {
-        const index = this.taskCounter % this.numWorkers;
-        this.taskCounter++;
-        return index;
+    async fetchBlock(worker, height) {
+        const start = new Date();
+        await worker.fetchBlock(height);
+        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`)}`,
+        //   );
+        // }
     }
 };
-__decorate([
-    (0, schedule_1.Interval)(15000),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], WorkerBlockDispatcherService.prototype, "sampleWorkerStatus", null);
 WorkerBlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
+    __param(2, (0, common_1.Inject)('IProjectService')),
+    __param(7, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.NodeConfig,
-        event_emitter_1.EventEmitter2,
-        project_service_1.ProjectService])
+        event_emitter_1.EventEmitter2, Object, node_core_1.SmartBatchService,
+        node_core_1.StoreService,
+        node_core_1.StoreCacheService,
+        node_core_1.PoiService,
+        SubqueryProject_1.SubqueryProject,
+        dynamic_ds_service_1.DynamicDsService,
+        unfinalizedBlocks_service_1.UnfinalizedBlocksService])
 ], WorkerBlockDispatcherService);
 exports.WorkerBlockDispatcherService = WorkerBlockDispatcherService;
 //# sourceMappingURL=worker-block-dispatcher.service.js.map

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-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport assert from 'assert';\nimport path from 'path';\nimport { Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { Interval } from '@nestjs/schedule';\nimport {\n  getLogger,\n  NodeConfig,\n  IndexerEvent,\n  Worker,\n  AutoQueue,\n} from '@subql/node-core';\nimport chalk from 'chalk';\nimport { last } from 'lodash';\nimport { ProjectService } from '../project.service';\nimport {\n  FetchBlock,\n  ProcessBlock,\n  InitWorker,\n  NumFetchedBlocks,\n  NumFetchingBlocks,\n  GetWorkerStatus,\n  ReloadDynamicDs,\n} from '../worker/worker';\nimport { BaseBlockDispatcher } from './base-block-dispatcher';\n\nconst logger = getLogger('WorkerBlockDispatcherService');\n\ntype IIndexerWorker = {\n  processBlock: ProcessBlock;\n  fetchBlock: FetchBlock;\n  numFetchedBlocks: NumFetchedBlocks;\n  numFetchingBlocks: NumFetchingBlocks;\n  getStatus: GetWorkerStatus;\n  reloadDynamicDs: ReloadDynamicDs;\n};\n\ntype IInitIndexerWorker = IIndexerWorker & {\n  initWorker: InitWorker;\n};\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\nasync function createIndexerWorker(): Promise<IndexerWorker> {\n  const indexerWorker = Worker.create<IInitIndexerWorker>(\n    path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),\n    [\n      'initWorker',\n      'processBlock',\n      'fetchBlock',\n      'numFetchedBlocks',\n      'numFetchingBlocks',\n      'getStatus',\n      'reloadDynamicDs',\n    ],\n  );\n\n  await indexerWorker.initWorker();\n\n  return indexerWorker;\n}\n\n@Injectable()\nexport class WorkerBlockDispatcherService\n  extends BaseBlockDispatcher<AutoQueue<void>>\n  implements OnApplicationShutdown\n{\n  private workers: IndexerWorker[];\n  private numWorkers: number;\n\n  private taskCounter = 0;\n  private isShutdown = false;\n\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    projectService: ProjectService,\n  ) {\n    const numWorkers = nodeConfig.workers;\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      new AutoQueue(numWorkers * nodeConfig.batchSize * 2),\n    );\n    this.numWorkers = numWorkers;\n  }\n\n  async init(\n    onDynamicDsCreated: (height: number) => Promise<void>,\n  ): Promise<void> {\n    if (this.nodeConfig.unfinalizedBlocks) {\n      throw new Error(\n        'Sorry, best block feature is not supported with workers yet.',\n      );\n    }\n\n    this.workers = await Promise.all(\n      new Array(this.numWorkers).fill(0).map(() => createIndexerWorker()),\n    );\n\n    this.onDynamicDsCreated = onDynamicDsCreated;\n\n    const blockAmount = await this.projectService.getProcessedBlockCount();\n    this.setProcessedBlockCount(blockAmount ?? 0);\n  }\n\n  async onApplicationShutdown(): Promise<void> {\n    this.isShutdown = true;\n    // Stop processing blocks\n    this.queue.abort();\n\n    // Stop all workers\n    if (this.workers) {\n      await Promise.all(this.workers.map((w) => w.terminate()));\n    }\n  }\n\n  enqueueBlocks(heights: number[], latestBufferHeight?: number): void {\n    if (!heights.length) return;\n    logger.info(\n      `Enqueing blocks [${heights[0]}...${last(heights)}], total ${\n        heights.length\n      } blocks`,\n    );\n\n    // eslint-disable-next-line no-constant-condition\n    if (true) {\n      /*\n       * Load balancing:\n       * worker1: 1,2,3\n       * worker2: 4,5,6\n       */\n      const workerIdx = this.getNextWorkerIndex();\n      heights.map((height) => this.enqueueBlock(height, workerIdx));\n    } else {\n      /*\n       * Load balancing:\n       * worker1: 1,3,5\n       * worker2: 2,4,6\n       */\n      heights.map((height) =>\n        this.enqueueBlock(height, this.getNextWorkerIndex()),\n      );\n    }\n\n    this.latestBufferedHeight = latestBufferHeight ?? last(heights);\n  }\n\n  private enqueueBlock(height: number, workerIdx: number) {\n    if (this.isShutdown) return;\n    const worker = this.workers[workerIdx];\n\n    assert(worker, `Worker ${workerIdx} not found`);\n\n    // Used to compare before and after as a way to check if queue was flushed\n    const bufferedHeight = this.latestBufferedHeight;\n\n    const pendingBlock = worker.fetchBlock(height);\n\n    const processBlock = async () => {\n      try {\n        const start = new Date();\n        const result = await pendingBlock;\n        const end = new Date();\n\n        if (bufferedHeight > this.latestBufferedHeight) {\n          logger.debug(`Queue was reset for new DS, discarding fetched blocks`);\n          return;\n        }\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(\n              `${waitTime}ms`,\n            )}`,\n          );\n        }\n\n        // logger.info(\n        //   `worker ${workerIdx} processing block ${height}, fetched blocks: ${await worker.numFetchedBlocks()}, fetching blocks: ${await worker.numFetchingBlocks()}`,\n        // );\n\n        this.preProcessBlock(height);\n\n        const { dynamicDsCreated, operationHash, reindexBlockHeight } =\n          await worker.processBlock(height);\n\n        await this.postProcessBlock(height, {\n          dynamicDsCreated,\n          operationHash: Buffer.from(operationHash, 'base64'),\n          reindexBlockHeight,\n        });\n\n        if (dynamicDsCreated) {\n          // Ensure all workers are aware of all dynamic ds\n          await Promise.all(this.workers.map((w) => w.reloadDynamicDs()));\n        }\n      } catch (e) {\n        logger.error(\n          e,\n          `failed to index block at height ${height} ${\n            e.handler ? `${e.handler}(${e.stack ?? ''})` : ''\n          }`,\n        );\n        process.exit(1);\n      }\n    };\n\n    void this.queue.put(processBlock);\n  }\n\n  @Interval(15000)\n  async sampleWorkerStatus(): Promise<void> {\n    for (const worker of this.workers) {\n      const status = await worker.getStatus();\n      logger.info(JSON.stringify(status));\n    }\n  }\n\n  // Getter doesn't seem to cary from abstract class\n  get latestBufferedHeight(): number {\n    return this._latestBufferedHeight;\n  }\n\n  set latestBufferedHeight(height: number) {\n    super.latestBufferedHeight = height;\n    // There is only a single queue with workers so we treat them as the same\n    this.eventEmitter.emit(IndexerEvent.BlockQueueSize, {\n      value: this.queueSize,\n    });\n  }\n\n  private getNextWorkerIndex(): number {\n    const index = this.taskCounter % this.numWorkers;\n\n    this.taskCounter++;\n\n    return index;\n  }\n}\n"]}
+{"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-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.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} from '@subql/node-core';\nimport { Store } from '@subql/types';\nimport chalk from 'chalk';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport {\n  IUnfinalizedBlocksService,\n  UnfinalizedBlocksService,\n} 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,\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      storeCount: store.count.bind(store),\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      dynamicDsCreateDynamicDatasource:\n        dynamicDsService.createDynamicDatasource.bind(dynamicDsService),\n      dynamicDsGetDynamicDatasources:\n        dynamicDsService.getDynamicDatasources.bind(dynamicDsService),\n      unfinalizedBlocksProcess:\n        unfinalizedBlocksService.processUnfinalizedBlocks.bind(\n          unfinalizedBlocksService,\n        ),\n    },\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,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksSevice: UnfinalizedBlocksService,\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        ),\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"]}

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

@@ -1,28 +1,9 @@
-import { MetadataRepo } from '@subql/node-core';
-import { Transaction } from 'sequelize/types';
+import { DatasourceParams, DynamicDsService as BaseDynamicDsService } from '@subql/node-core';
 import { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
-interface DatasourceParams {
-    templateName: string;
-    args?: Record<string, unknown>;
-    startBlock: number;
-}
-export declare class DynamicDsService {
+export declare class DynamicDsService extends BaseDynamicDsService<SubqlProjectDs> {
     private readonly dsProcessorService;
     private readonly project;
-    private metaDataRepo;
-    private tempDsRecords;
     constructor(dsProcessorService: DsProcessorService, project: SubqueryProject);
-    init(metaDataRepo: MetadataRepo): void;
-    private _datasources;
-    resetDynamicDatasource(targetHeight: number, tx: Transaction): Promise<void>;
-    createDynamicDatasource(params: DatasourceParams, tx: Transaction): Promise<SubqlProjectDs>;
-    getDynamicDatasources(): Promise<SubqlProjectDs[]>;
-    reloadDynamicDatasources(): Promise<void>;
-    private loadDynamicDatasources;
-    deleteTempDsRecords(blockHeight: number): void;
-    private getDynamicDatasourceParams;
-    private saveDynamicDatasourceParams;
-    private getDatasource;
+    protected getDatasource(params: DatasourceParams): Promise<SubqlProjectDs>;
 }
-export {};