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

package/dist/indexer/project.service.js

@@ -15,39 +15,46 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
+const worker_threads_1 = require("worker_threads");
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const node_core_1 = require("@subql/node-core");
 const x_sequelize_1 = require("@subql/x-sequelize");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
+const ethereum_1 = require("../ethereum");
 const ds_processor_service_1 = require("./ds-processor.service");
 const dynamic_ds_service_1 = require("./dynamic-ds.service");
 const unfinalizedBlocks_service_1 = require("./unfinalizedBlocks.service");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version: packageVersion } = require('../../package.json');
 let ProjectService = class ProjectService extends node_core_1.BaseProjectService {
-    constructor(dsProcessorService, apiService, poiService, mmrService, mmrQueryService, sequelize, project, storeService, nodeConfig, dynamicDsService, eventEmitter, unfinalizedBlockService) {
-        super(dsProcessorService, apiService, poiService, mmrService, mmrQueryService, sequelize, project, storeService, nodeConfig, dynamicDsService, eventEmitter, unfinalizedBlockService);
+    constructor(dsProcessorService, apiService, poiService, sequelize, project, projectUpgradeService, storeService, nodeConfig, dynamicDsService, eventEmitter, unfinalizedBlockService) {
+        super(dsProcessorService, apiService, poiService, sequelize, project, projectUpgradeService, storeService, nodeConfig, dynamicDsService, eventEmitter, unfinalizedBlockService);
+        this.projectUpgradeService = projectUpgradeService;
         this.packageVersion = packageVersion;
     }
-    async generateTimestampReferenceForBlockFilters(ds) {
-        return (0, SubqueryProject_1.generateTimestampReferenceForBlockFilters)(ds, this.apiService.api);
+    async getBlockTimestamp(height) {
+        const block = await this.apiService.unsafeApi.api.getBlock(height);
+        return new Date(block.timestamp * 1000); // TODO test and make sure its in MS not S
     }
-    getStartBlockDatasources() {
-        return this.project.dataSources;
+    onProjectChange(project) {
+        // TODO update this when implementing skipBlock feature for Eth
+        this.apiService.updateBlockFetching();
     }
 };
 ProjectService = __decorate([
     (0, common_1.Injectable)(),
-    __param(6, (0, common_1.Inject)('ISubqueryProject')),
+    __param(1, (0, common_1.Inject)(node_core_1.ApiService)),
+    __param(2, (0, common_1.Inject)(worker_threads_1.isMainThread ? node_core_1.PoiService : 'Null')),
+    __param(3, (0, common_1.Inject)(worker_threads_1.isMainThread ? x_sequelize_1.Sequelize : 'Null')),
+    __param(4, (0, common_1.Inject)('ISubqueryProject')),
+    __param(5, (0, common_1.Inject)('IProjectUpgradeService')),
+    __param(6, (0, common_1.Inject)(worker_threads_1.isMainThread ? node_core_1.StoreService : 'Null')),
     __metadata("design:paramtypes", [ds_processor_service_1.DsProcessorService,
-        node_core_1.ApiService,
+        ethereum_1.EthereumApiService,
         node_core_1.PoiService,
-        node_core_1.MmrService,
-        node_core_1.MmrQueryService,
         x_sequelize_1.Sequelize,
-        SubqueryProject_1.SubqueryProject,
-        node_core_1.StoreService,
+        SubqueryProject_1.SubqueryProject, Object, node_core_1.StoreService,
         node_core_1.NodeConfig,
         dynamic_ds_service_1.DynamicDsService,
         event_emitter_1.EventEmitter2,

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

@@ -1 +1 @@
-{"version":3,"file":"project.service.js","sourceRoot":"","sources":["../../src/indexer/project.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,yDAAsD;AACtD,gDAQ0B;AAC1B,oDAA+C;AAC/C,kEAIsC;AACtC,iEAA4D;AAC5D,6DAAwD;AACxD,2EAAuE;AAEvE,8DAA8D;AAC9D,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAG3D,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,8BAGnC;IAGC,YACE,kBAAsC,EACtC,UAAsB,EACtB,UAAsB,EACtB,UAAsB,EACtB,eAAgC,EAChC,SAAoB,EACQ,OAAwB,EACpD,YAA0B,EAC1B,UAAsB,EACtB,gBAAkC,EAClC,YAA2B,EAC3B,uBAAiD;QAEjD,KAAK,CACH,kBAAkB,EAClB,UAAU,EACV,UAAU,EACV,UAAU,EACV,eAAe,EACf,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,CACxB,CAAC;QA7BM,mBAAc,GAAG,cAAc,CAAC;IA8B1C,CAAC;IAES,KAAK,CAAC,yCAAyC,CACvD,EAAoB;QAEpB,OAAO,IAAA,2DAAyC,EAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5E,CAAC;IAES,wBAAwB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAClC,CAAC;CACF,CAAA;AA7CY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAcR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCANP,yCAAkB;QAC1B,sBAAU;QACV,sBAAU;QACV,sBAAU;QACL,2BAAe;QACrB,uBAAS;QACiB,iCAAe;QACtC,wBAAY;QACd,sBAAU;QACJ,qCAAgB;QACpB,6BAAa;QACF,oDAAwB;GAlBxC,cAAc,CA6C1B;AA7CY,wCAAc","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  PoiService,\n  MmrService,\n  BaseProjectService,\n  StoreService,\n  NodeConfig,\n  ApiService,\n  MmrQueryService,\n} from '@subql/node-core';\nimport { Sequelize } from '@subql/x-sequelize';\nimport {\n  generateTimestampReferenceForBlockFilters,\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst { version: packageVersion } = require('../../package.json');\n\n@Injectable()\nexport class ProjectService extends BaseProjectService<\n  ApiService,\n  SubqlProjectDs\n> {\n  protected packageVersion = packageVersion;\n\n  constructor(\n    dsProcessorService: DsProcessorService,\n    apiService: ApiService,\n    poiService: PoiService,\n    mmrService: MmrService,\n    mmrQueryService: MmrQueryService,\n    sequelize: Sequelize,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    storeService: StoreService,\n    nodeConfig: NodeConfig,\n    dynamicDsService: DynamicDsService,\n    eventEmitter: EventEmitter2,\n    unfinalizedBlockService: UnfinalizedBlocksService,\n  ) {\n    super(\n      dsProcessorService,\n      apiService,\n      poiService,\n      mmrService,\n      mmrQueryService,\n      sequelize,\n      project,\n      storeService,\n      nodeConfig,\n      dynamicDsService,\n      eventEmitter,\n      unfinalizedBlockService,\n    );\n  }\n\n  protected async generateTimestampReferenceForBlockFilters(\n    ds: SubqlProjectDs[],\n  ): Promise<SubqlProjectDs[]> {\n    return generateTimestampReferenceForBlockFilters(ds, this.apiService.api);\n  }\n\n  protected getStartBlockDatasources(): SubqlProjectDs[] {\n    return this.project.dataSources;\n  }\n}\n"]}
+{"version":3,"file":"project.service.js","sourceRoot":"","sources":["../../src/indexer/project.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,mDAA8C;AAC9C,2CAAoD;AACpD,yDAAsD;AACtD,gDAO0B;AAC1B,oDAA+C;AAC/C,kEAGsC;AACtC,0CAAiD;AACjD,iEAA4D;AAC5D,6DAAwD;AACxD,2EAAuE;AAEvE,8DAA8D;AAC9D,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAG3D,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,8BAGnC;IAGC,YACE,kBAAsC,EAClB,UAA8B,EACN,UAAsB,EACvB,SAAoB,EACnC,OAAwB,EAEjC,qBAA8D,EACnC,YAA0B,EACxE,UAAsB,EACtB,gBAAkC,EAClC,YAA2B,EAC3B,uBAAiD;QAEjD,KAAK,CACH,kBAAkB,EAClB,UAAU,EACV,UAAU,EACV,SAAS,EACT,OAAO,EACP,qBAAqB,EACrB,YAAY,EACZ,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,uBAAuB,CACxB,CAAC;QAnBiB,0BAAqB,GAArB,qBAAqB,CAAyC;QATzE,mBAAc,GAAG,cAAc,CAAC;IA6B1C,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,MAAc;QAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEnE,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,0CAA0C;IACrF,CAAC;IAES,eAAe,CAAC,OAAwB;QAChD,+DAA+D;QAC/D,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC;IACxC,CAAC;CACF,CAAA;AA7CY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,eAAM,EAAC,sBAAU,CAAC,CAAA;IAClB,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAC,CAAC,sBAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAC1C,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAC,CAAC,uBAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IACzC,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAEhC,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAC,CAAC,wBAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;qCAPzB,yCAAkB;QACN,6BAAkB;QACM,sBAAU;QACZ,uBAAS;QAC1B,iCAAe,UAGQ,wBAAY;QAC5D,sBAAU;QACJ,qCAAgB;QACpB,6BAAa;QACF,oDAAwB;GAlBxC,cAAc,CA6C1B;AA7CY,wCAAc","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { isMainThread } from 'worker_threads';\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  PoiService,\n  BaseProjectService,\n  StoreService,\n  NodeConfig,\n  IProjectUpgradeService,\n  ApiService,\n} from '@subql/node-core';\nimport { Sequelize } from '@subql/x-sequelize';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { EthereumApiService } from '../ethereum';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst { version: packageVersion } = require('../../package.json');\n\n@Injectable()\nexport class ProjectService extends BaseProjectService<\n  EthereumApiService,\n  EthereumProjectDs\n> {\n  protected packageVersion = packageVersion;\n\n  constructor(\n    dsProcessorService: DsProcessorService,\n    @Inject(ApiService) apiService: EthereumApiService,\n    @Inject(isMainThread ? PoiService : 'Null') poiService: PoiService,\n    @Inject(isMainThread ? Sequelize : 'Null') sequelize: Sequelize,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    @Inject('IProjectUpgradeService')\n    protected readonly projectUpgradeService: IProjectUpgradeService<SubqueryProject>,\n    @Inject(isMainThread ? StoreService : 'Null') storeService: StoreService,\n    nodeConfig: NodeConfig,\n    dynamicDsService: DynamicDsService,\n    eventEmitter: EventEmitter2,\n    unfinalizedBlockService: UnfinalizedBlocksService,\n  ) {\n    super(\n      dsProcessorService,\n      apiService,\n      poiService,\n      sequelize,\n      project,\n      projectUpgradeService,\n      storeService,\n      nodeConfig,\n      dynamicDsService,\n      eventEmitter,\n      unfinalizedBlockService,\n    );\n  }\n\n  protected async getBlockTimestamp(height: number): Promise<Date> {\n    const block = await this.apiService.unsafeApi.api.getBlock(height);\n\n    return new Date(block.timestamp * 1000); // TODO test and make sure its in MS not S\n  }\n\n  protected onProjectChange(project: SubqueryProject): void | Promise<void> {\n    // TODO update this when implementing skipBlock feature for Eth\n    this.apiService.updateBlockFetching();\n  }\n}\n"]}

package/dist/indexer/project.service.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/indexer/project.service.test.js

@@ -0,0 +1,26 @@
+"use strict";
+// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors
+// SPDX-License-Identifier: GPL-3.0
+Object.defineProperty(exports, "__esModule", { value: true });
+const event_emitter_1 = require("@nestjs/event-emitter");
+const ethereum_1 = require("../ethereum");
+const project_service_1 = require("./project.service");
+const mockApiService = () => {
+    const ethApi = new ethereum_1.EthereumApi('https://eth.api.onfinality.io/public', 20, new event_emitter_1.EventEmitter2());
+    // await ethApi.init();
+    return {
+        unsafeApi: ethApi,
+    };
+};
+describe('ProjectService', () => {
+    let projectService;
+    beforeEach(() => {
+        const apiService = mockApiService();
+        projectService = new project_service_1.ProjectService(null, apiService, null, null, null, null, null, {}, null, null, null);
+    });
+    it('can get a block timestamps', async () => {
+        const timestamp = await projectService.getBlockTimestamp(4000000);
+        expect(timestamp).toEqual(new Date('2017-07-09T20:52:47.000Z'));
+    });
+});
+//# sourceMappingURL=project.service.test.js.map

package/dist/indexer/project.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project.service.test.js","sourceRoot":"","sources":["../../src/indexer/project.service.test.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,yDAAsD;AACtD,0CAA8D;AAC9D,uDAAmD;AAEnD,MAAM,cAAc,GAAG,GAAuB,EAAE;IAC9C,MAAM,MAAM,GAAG,IAAI,sBAAW,CAC5B,sCAAsC,EACtC,EAAE,EACF,IAAI,6BAAa,EAAE,CACpB,CAAC;IAEF,uBAAuB;IAEvB,OAAO;QACL,SAAS,EAAE,MAAM;KACX,CAAC;AACX,CAAC,CAAC;AAEF,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,cAA8B,CAAC;IAEnC,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;QAEpC,cAAc,GAAG,IAAI,gCAAc,CACjC,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,EAAS,EACT,IAAI,EACJ,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,MAAM,SAAS,GAAG,MAAO,cAAsB,CAAC,iBAAiB,CAC/D,OAAS,CACV,CAAC;QAEF,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { EthereumApi, EthereumApiService } from '../ethereum';\nimport { ProjectService } from './project.service';\n\nconst mockApiService = (): EthereumApiService => {\n  const ethApi = new EthereumApi(\n    'https://eth.api.onfinality.io/public',\n    20,\n    new EventEmitter2(),\n  );\n\n  // await ethApi.init();\n\n  return {\n    unsafeApi: ethApi,\n  } as any;\n};\n\ndescribe('ProjectService', () => {\n  let projectService: ProjectService;\n\n  beforeEach(() => {\n    const apiService = mockApiService();\n\n    projectService = new ProjectService(\n      null,\n      apiService,\n      null,\n      null,\n      null,\n      null,\n      null,\n      {} as any,\n      null,\n      null,\n      null,\n    );\n  });\n\n  it('can get a block timestamps', async () => {\n    const timestamp = await (projectService as any).getBlockTimestamp(\n      4_000_000,\n    );\n\n    expect(timestamp).toEqual(new Date('2017-07-09T20:52:47.000Z'));\n  });\n});\n"]}

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

@@ -1,5 +1,5 @@
-import { BaseDataSource } from '@subql/common';
 import { NodeConfig, StoreService, IndexerSandbox, ISubqueryProject, ApiService } from '@subql/node-core';
+import { BaseDataSource } from '@subql/types-core';
 import SafeEthProvider from '../ethereum/safe-api';
 export declare class SandboxService {
     private readonly apiService;

package/dist/indexer/sandbox.service.js

@@ -55,6 +55,7 @@ let SandboxService = class SandboxService {
 };
 SandboxService = __decorate([
     (0, common_1.Injectable)(),
+    __param(1, (0, common_1.Inject)(worker_threads_1.isMainThread ? node_core_1.StoreService : 'Null')),
     __param(3, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.StoreService,

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

@@ -1 +1 @@
-{"version":3,"file":"sandbox.service.js","sourceRoot":"","sources":["../../src/indexer/sandbox.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,mDAA8C;AAC9C,2CAAoD;AAEpD,gDAO0B;AAI1B,+GAA+G;AAExG,IAAM,cAAc,GAApB,MAAM,cAAc;IAGzB,YACmB,UAAsB,EACtB,YAA0B,EAC1B,UAAsB,EACM,OAAyB;QAHrD,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QACM,YAAO,GAAP,OAAO,CAAkB;QANhE,mBAAc,GAAmC,EAAE,CAAC;IAOzD,CAAC;IAEJ,cAAc,CAAC,EAAkB,EAAE,GAAoB;QACrD,MAAM,KAAK,GAAU,6BAAY;YAC/B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YAC9B,CAAC,CAAC,IAAA,4BAAgB,EAAE,MAAc,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAwB;QAEpE,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,IAAI,0BAAc,CAC5B;gBACE,KAAK;gBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,KAAK;gBACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;aACtC,EACD,IAAI,CAAC,UAAU,CAChB,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;SACxC;QACD,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC1B,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;SACxD;QACD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC1D,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,kBAAkB,CAAC,EAAkB;QAC3C,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzB,CAAC;CACF,CAAA;AAxCY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAQR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAHE,sBAAU;QACR,wBAAY;QACd,sBAAU;GAN9B,cAAc,CAwC1B;AAxCY,wCAAc","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { isMainThread } from 'worker_threads';\nimport { Inject, Injectable } from '@nestjs/common';\nimport { BaseDataSource } from '@subql/common';\nimport {\n  NodeConfig,\n  StoreService,\n  IndexerSandbox,\n  hostStoreToStore,\n  ISubqueryProject,\n  ApiService,\n} from '@subql/node-core';\nimport { Store } from '@subql/types-ethereum';\nimport SafeEthProvider from '../ethereum/safe-api';\n\n/* It would be nice to move this to node core but need to find a way to inject other things into the sandbox */\n@Injectable()\nexport class SandboxService {\n  private processorCache: Record<string, IndexerSandbox> = {};\n\n  constructor(\n    private readonly apiService: ApiService,\n    private readonly storeService: StoreService,\n    private readonly nodeConfig: NodeConfig,\n    @Inject('ISubqueryProject') private readonly project: ISubqueryProject,\n  ) {}\n\n  getDsProcessor(ds: BaseDataSource, api: SafeEthProvider): IndexerSandbox {\n    const store: Store = isMainThread\n      ? this.storeService.getStore()\n      : hostStoreToStore((global as any).host); // Provided in worker.ts\n\n    const entry = this.getDataSourceEntry(ds);\n    let processor = this.processorCache[entry];\n    if (!processor) {\n      processor = new IndexerSandbox(\n        {\n          store,\n          root: this.project.root,\n          entry,\n          chainId: this.project.network.chainId,\n        },\n        this.nodeConfig,\n      );\n      this.processorCache[entry] = processor;\n    }\n    processor.freeze(api, 'api');\n    if (this.nodeConfig.unsafe) {\n      processor.freeze(this.apiService.api.api, 'unsafeApi');\n    }\n    processor.freeze(this.project.network.chainId, 'chainId');\n    return processor;\n  }\n\n  private getDataSourceEntry(ds: BaseDataSource): string {\n    return ds.mapping.file;\n  }\n}\n"]}
+{"version":3,"file":"sandbox.service.js","sourceRoot":"","sources":["../../src/indexer/sandbox.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,mDAA8C;AAC9C,2CAAoD;AACpD,gDAO0B;AAI1B,+GAA+G;AAExG,IAAM,cAAc,GAApB,MAAM,cAAc;IAGzB,YACmB,UAAsB,EAEtB,YAA0B,EAC1B,UAAsB,EACM,OAAyB;QAJrD,eAAU,GAAV,UAAU,CAAY;QAEtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QACM,YAAO,GAAP,OAAO,CAAkB;QAPhE,mBAAc,GAAmC,EAAE,CAAC;IAQzD,CAAC;IAEJ,cAAc,CAAC,EAAkB,EAAE,GAAoB;QACrD,MAAM,KAAK,GAAU,6BAAY;YAC/B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YAC9B,CAAC,CAAC,IAAA,4BAAgB,EAAE,MAAc,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAwB;QAEpE,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,IAAI,0BAAc,CAC5B;gBACE,KAAK;gBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,KAAK;gBACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;aACtC,EACD,IAAI,CAAC,UAAU,CAChB,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;SACxC;QACD,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC1B,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;SACxD;QACD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC1D,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,kBAAkB,CAAC,EAAkB;QAC3C,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzB,CAAC;CACF,CAAA;AAzCY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAC,CAAC,wBAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;IAG5C,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAJE,sBAAU;QAER,wBAAY;QACd,sBAAU;GAP9B,cAAc,CAyC1B;AAzCY,wCAAc","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { isMainThread } from 'worker_threads';\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  NodeConfig,\n  StoreService,\n  IndexerSandbox,\n  hostStoreToStore,\n  ISubqueryProject,\n  ApiService,\n} from '@subql/node-core';\nimport { BaseDataSource, Store } from '@subql/types-core';\nimport SafeEthProvider from '../ethereum/safe-api';\n\n/* It would be nice to move this to node core but need to find a way to inject other things into the sandbox */\n@Injectable()\nexport class SandboxService {\n  private processorCache: Record<string, IndexerSandbox> = {};\n\n  constructor(\n    private readonly apiService: ApiService,\n    @Inject(isMainThread ? StoreService : 'Null')\n    private readonly storeService: StoreService,\n    private readonly nodeConfig: NodeConfig,\n    @Inject('ISubqueryProject') private readonly project: ISubqueryProject,\n  ) {}\n\n  getDsProcessor(ds: BaseDataSource, api: SafeEthProvider): IndexerSandbox {\n    const store: Store = isMainThread\n      ? this.storeService.getStore()\n      : hostStoreToStore((global as any).host); // Provided in worker.ts\n\n    const entry = this.getDataSourceEntry(ds);\n    let processor = this.processorCache[entry];\n    if (!processor) {\n      processor = new IndexerSandbox(\n        {\n          store,\n          root: this.project.root,\n          entry,\n          chainId: this.project.network.chainId,\n        },\n        this.nodeConfig,\n      );\n      this.processorCache[entry] = processor;\n    }\n    processor.freeze(api, 'api');\n    if (this.nodeConfig.unsafe) {\n      processor.freeze(this.apiService.api.api, 'unsafeApi');\n    }\n    processor.freeze(this.project.network.chainId, 'chainId');\n    return processor;\n  }\n\n  private getDataSourceEntry(ds: BaseDataSource): string {\n    return ds.mapping.file;\n  }\n}\n"]}

package/dist/indexer/types.d.ts

@@ -1,11 +1,2 @@
-import { Entity } from '@subql/types-ethereum';
-export declare enum OperationType {
-    Set = "Set",
-    Remove = "Remove"
-}
-export type OperationEntity = {
-    operation: OperationType;
-    entityType: string;
-    data: Entity | string;
-};
-export type BestBlocks = Record<number, string>;
+import { EthereumBlock, LightEthereumBlock } from '@subql/types-ethereum';
+export type BlockContent = EthereumBlock | LightEthereumBlock;

package/dist/indexer/types.js

@@ -2,10 +2,4 @@
 // Copyright 2020-2023 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OperationType = void 0;
-var OperationType;
-(function (OperationType) {
-    OperationType["Set"] = "Set";
-    OperationType["Remove"] = "Remove";
-})(OperationType = exports.OperationType || (exports.OperationType = {}));
 //# sourceMappingURL=types.js.map

package/dist/indexer/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/indexer/types.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAInC,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,4BAAW,CAAA;IACX,kCAAiB,CAAA;AACnB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Entity } from '@subql/types-ethereum';\n\nexport enum OperationType {\n  Set = 'Set',\n  Remove = 'Remove',\n}\n\nexport type OperationEntity = {\n  operation: OperationType;\n  entityType: string;\n  data: Entity | string;\n};\n\nexport type BestBlocks = Record<number, string>;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/indexer/types.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EthereumBlock, LightEthereumBlock } from '@subql/types-ethereum';\n\nexport type BlockContent = EthereumBlock | LightEthereumBlock;\n"]}

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

@@ -1,11 +1,11 @@
 import { Block } from '@ethersproject/abstract-provider';
 import { ApiService, BaseUnfinalizedBlocksService, Header, NodeConfig, StoreCacheService } from '@subql/node-core';
-import { BlockWrapper, EthereumBlock } from '@subql/types-ethereum';
-export declare function blockToHeader(block: EthereumBlock | Block): Header;
-export declare class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockWrapper> {
+import { BlockContent } from './types';
+export declare function blockToHeader(block: BlockContent | Block): Header;
+export declare class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockContent> {
     private readonly apiService;
     constructor(apiService: ApiService, nodeConfig: NodeConfig, storeCache: StoreCacheService);
-    protected blockToHeader(block: BlockWrapper): Header;
+    protected blockToHeader(block: BlockContent): Header;
     protected getFinalizedHead(): Promise<Header>;
     protected getHeaderForHash(hash: string): Promise<Header>;
     protected getHeaderForHeight(height: number): Promise<Header>;

package/dist/indexer/unfinalizedBlocks.service.js

@@ -28,7 +28,7 @@ let UnfinalizedBlocksService = class UnfinalizedBlocksService extends node_core_
         this.apiService = apiService;
     }
     blockToHeader(block) {
-        return blockToHeader(block.block);
+        return blockToHeader(block);
     }
     async getFinalizedHead() {
         const finalizedBlock = await this.apiService.api.getFinalizedBlock();
@@ -43,6 +43,30 @@ let UnfinalizedBlocksService = class UnfinalizedBlocksService extends node_core_
         return blockToHeader(block);
     }
 };
+__decorate([
+    (0, node_core_1.mainThreadOnly)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], UnfinalizedBlocksService.prototype, "blockToHeader", null);
+__decorate([
+    (0, node_core_1.mainThreadOnly)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], UnfinalizedBlocksService.prototype, "getFinalizedHead", null);
+__decorate([
+    (0, node_core_1.mainThreadOnly)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], UnfinalizedBlocksService.prototype, "getHeaderForHash", null);
+__decorate([
+    (0, node_core_1.mainThreadOnly)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Promise)
+], UnfinalizedBlocksService.prototype, "getHeaderForHeight", null);
 UnfinalizedBlocksService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [node_core_1.ApiService,

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

@@ -1 +1 @@
-{"version":3,"file":"unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../src/indexer/unfinalizedBlocks.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;AAGnC,2CAA4C;AAC5C,gDAM0B;AAG1B,SAAgB,aAAa,CAAC,KAA4B;IACxD,OAAO;QACL,WAAW,EAAE,KAAK,CAAC,MAAM;QACzB,SAAS,EAAE,KAAK,CAAC,IAAI;QACrB,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC;AAND,sCAMC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,wCAA0C;IACtF,YACmB,UAAsB,EACvC,UAAsB,EACtB,UAA6B;QAE7B,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAJb,eAAU,GAAV,UAAU,CAAY;IAKzC,CAAC;IAES,aAAa,CAAC,KAAmB;QACzC,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC9B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QACrE,OAAO,aAAa,CAAC,cAAc,CAAC,CAAC;IACvC,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,IAAY;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACrE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAES,KAAK,CAAC,kBAAkB,CAAC,MAAc;QAC/C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACvE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACF,CAAA;AA3BY,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAGoB,sBAAU;QAC3B,sBAAU;QACV,6BAAiB;GAJpB,wBAAwB,CA2BpC;AA3BY,4DAAwB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Block } from '@ethersproject/abstract-provider';\nimport { Injectable } from '@nestjs/common';\nimport {\n  ApiService,\n  BaseUnfinalizedBlocksService,\n  Header,\n  NodeConfig,\n  StoreCacheService,\n} from '@subql/node-core';\nimport { BlockWrapper, EthereumBlock } from '@subql/types-ethereum';\n\nexport function blockToHeader(block: EthereumBlock | Block): Header {\n  return {\n    blockHeight: block.number,\n    blockHash: block.hash,\n    parentHash: block.parentHash,\n  };\n}\n\n@Injectable()\nexport class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockWrapper> {\n  constructor(\n    private readonly apiService: ApiService,\n    nodeConfig: NodeConfig,\n    storeCache: StoreCacheService,\n  ) {\n    super(nodeConfig, storeCache);\n  }\n\n  protected blockToHeader(block: BlockWrapper): Header {\n    return blockToHeader(block.block);\n  }\n\n  protected async getFinalizedHead(): Promise<Header> {\n    const finalizedBlock = await this.apiService.api.getFinalizedBlock();\n    return blockToHeader(finalizedBlock);\n  }\n\n  protected async getHeaderForHash(hash: string): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(hash);\n    return blockToHeader(block);\n  }\n\n  protected async getHeaderForHeight(height: number): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(height);\n    return blockToHeader(block);\n  }\n}\n"]}
+{"version":3,"file":"unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../src/indexer/unfinalizedBlocks.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;AAGnC,2CAA4C;AAC5C,gDAO0B;AAG1B,SAAgB,aAAa,CAAC,KAA2B;IACvD,OAAO;QACL,WAAW,EAAE,KAAK,CAAC,MAAM;QACzB,SAAS,EAAE,KAAK,CAAC,IAAI;QACrB,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC;AAND,sCAMC;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,wCAA0C;IACtF,YACmB,UAAsB,EACvC,UAAsB,EACtB,UAA6B;QAE7B,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAJb,eAAU,GAAV,UAAU,CAAY;IAKzC,CAAC;IAGS,aAAa,CAAC,KAAmB;QACzC,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAGe,AAAN,KAAK,CAAC,gBAAgB;QAC9B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QACrE,OAAO,aAAa,CAAC,cAAc,CAAC,CAAC;IACvC,CAAC;IAGe,AAAN,KAAK,CAAC,gBAAgB,CAAC,IAAY;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACrE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAGe,AAAN,KAAK,CAAC,kBAAkB,CAAC,MAAc;QAC/C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACvE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACF,CAAA;AAtBC;IAAC,IAAA,0BAAc,GAAE;;;;6DAGhB;AAGe;IADf,IAAA,0BAAc,GAAE;;;;gEAIhB;AAGe;IADf,IAAA,0BAAc,GAAE;;;;gEAIhB;AAGe;IADf,IAAA,0BAAc,GAAE;;;;kEAIhB;AA9BU,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAGoB,sBAAU;QAC3B,sBAAU;QACV,6BAAiB;GAJpB,wBAAwB,CA+BpC;AA/BY,4DAAwB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Block } from '@ethersproject/abstract-provider';\nimport { Injectable } from '@nestjs/common';\nimport {\n  ApiService,\n  BaseUnfinalizedBlocksService,\n  Header,\n  mainThreadOnly,\n  NodeConfig,\n  StoreCacheService,\n} from '@subql/node-core';\nimport { BlockContent } from './types';\n\nexport function blockToHeader(block: BlockContent | Block): Header {\n  return {\n    blockHeight: block.number,\n    blockHash: block.hash,\n    parentHash: block.parentHash,\n  };\n}\n\n@Injectable()\nexport class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockContent> {\n  constructor(\n    private readonly apiService: ApiService,\n    nodeConfig: NodeConfig,\n    storeCache: StoreCacheService,\n  ) {\n    super(nodeConfig, storeCache);\n  }\n\n  @mainThreadOnly()\n  protected blockToHeader(block: BlockContent): Header {\n    return blockToHeader(block);\n  }\n\n  @mainThreadOnly()\n  protected async getFinalizedHead(): Promise<Header> {\n    const finalizedBlock = await this.apiService.api.getFinalizedBlock();\n    return blockToHeader(finalizedBlock);\n  }\n\n  @mainThreadOnly()\n  protected async getHeaderForHash(hash: string): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(hash);\n    return blockToHeader(block);\n  }\n\n  @mainThreadOnly()\n  protected async getHeaderForHeight(height: number): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(height);\n    return blockToHeader(block);\n  }\n}\n"]}

package/dist/indexer/worker/worker.d.ts

@@ -1,31 +1,7 @@
-import { ProcessBlockResponse } from '@subql/node-core';
-import { FetchBlockResponse, WorkerStatusResponse } from './worker.service';
-declare function initWorker(): Promise<void>;
-declare function fetchBlock(height: number): Promise<FetchBlockResponse>;
-declare function processBlock(height: number): Promise<ProcessBlockResponse>;
-declare function numFetchedBlocks(): Promise<number>;
-declare function numFetchingBlocks(): Promise<number>;
-declare function getStatus(): Promise<WorkerStatusResponse>;
-declare function getMemoryLeft(): Promise<number>;
-declare function waitForWorkerBatchSize(heapSizeInBytes: number): Promise<void>;
-type InitWorker = typeof initWorker;
-type FetchBlock = typeof fetchBlock;
-type ProcessBlock = typeof processBlock;
-type NumFetchedBlocks = typeof numFetchedBlocks;
-type NumFetchingBlocks = typeof numFetchingBlocks;
-type GetWorkerStatus = typeof getStatus;
-type GetMemoryLeft = typeof getMemoryLeft;
-type WaitForWorkerBatchSize = typeof waitForWorkerBatchSize;
-export type IIndexerWorker = {
-    processBlock: ProcessBlock;
-    fetchBlock: FetchBlock;
-    numFetchedBlocks: NumFetchedBlocks;
-    numFetchingBlocks: NumFetchingBlocks;
-    getStatus: GetWorkerStatus;
-    getMemoryLeft: GetMemoryLeft;
-    waitForWorkerBatchSize: WaitForWorkerBatchSize;
-};
+import { IBaseIndexerWorker } from '@subql/node-core';
+declare function initWorker(startHeight: number): Promise<void>;
+export type IIndexerWorker = IBaseIndexerWorker;
 export type IInitIndexerWorker = IIndexerWorker & {
-    initWorker: InitWorker;
+    initWorker: typeof initWorker;
 };
 export {};

package/dist/indexer/worker/worker.js

@@ -1,9 +1,6 @@
 "use strict";
 // Copyright 2020-2023 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // initlogger and yargs must be imported before all other imports
 // making sure logger is defined before its called
@@ -13,32 +10,23 @@ const logger_1 = require("@subql/node-core/logger");
 const yargs_1 = require("../../yargs");
 const { argv } = yargs_1.yargsOptions;
 (0, logger_1.initLogger)(argv.debug, argv.outputFmt, argv.logLevel);
-const assert_1 = __importDefault(require("assert"));
 const node_worker_threads_1 = require("node:worker_threads");
-const v8_1 = require("v8");
 const core_1 = require("@nestjs/core");
 const node_core_1 = require("@subql/node-core");
-const indexer_manager_1 = require("../indexer.manager");
 const worker_module_1 = require("./worker.module");
 const worker_service_1 = require("./worker.service");
-const worker_unfinalizedBlocks_service_1 = require("./worker.unfinalizedBlocks.service");
-let app;
-let workerService;
 const logger = (0, node_core_1.getLogger)(`worker #${node_worker_threads_1.threadId}`);
-async function initWorker() {
+async function initWorker(startHeight) {
     try {
-        if (app) {
-            logger.warn('Worker already initialised');
-            return;
-        }
-        app = await core_1.NestFactory.create(worker_module_1.WorkerModule, {
-            logger: new node_core_1.NestLogger(), // TIP: If the worker is crashing comment out this line for better logging
+        const app = await core_1.NestFactory.create(worker_module_1.WorkerModule, {
+            logger: new node_core_1.NestLogger(argv.debug), // TIP: If the worker is crashing comment out this line for better logging
         });
         await app.init();
-        const indexerManager = app.get(indexer_manager_1.IndexerManager);
+        const projectService = app.get('IProjectService');
         // Initialise async services, we do this here rather than in factories so we can capture one off events
-        await indexerManager.start();
-        workerService = app.get(worker_service_1.WorkerService);
+        await projectService.init(startHeight);
+        const workerService = app.get(worker_service_1.WorkerService);
+        (0, node_core_1.initWorkerServices)(app, workerService);
     }
     catch (e) {
         console.log('Failed to start worker', e);
@@ -46,58 +34,7 @@ async function initWorker() {
         throw e;
     }
 }
-async function fetchBlock(height) {
-    (0, assert_1.default)(workerService, 'Not initialised');
-    return workerService.fetchBlock(height);
-}
-async function processBlock(height) {
-    (0, assert_1.default)(workerService, 'Not initialised');
-    return workerService.processBlock(height);
-}
-// eslint-disable-next-line @typescript-eslint/require-await
-async function numFetchedBlocks() {
-    return workerService.numFetchedBlocks;
-}
-// eslint-disable-next-line @typescript-eslint/require-await
-async function numFetchingBlocks() {
-    return workerService.numFetchingBlocks;
-}
-// eslint-disable-next-line @typescript-eslint/require-await
-async function getStatus() {
-    return {
-        threadId: node_worker_threads_1.threadId,
-        fetchedBlocks: workerService.numFetchedBlocks,
-        toFetchBlocks: workerService.numFetchingBlocks,
-        isIndexing: workerService.isIndexing,
-    };
-}
-// eslint-disable-next-line @typescript-eslint/require-await
-async function getMemoryLeft() {
-    const totalHeap = (0, v8_1.getHeapStatistics)().heap_size_limit;
-    const heapUsed = process.memoryUsage().heapUsed;
-    return totalHeap - heapUsed;
-}
-async function waitForWorkerBatchSize(heapSizeInBytes) {
-    await (0, node_core_1.waitForBatchSize)(heapSizeInBytes);
-}
-// Register these functions to be exposed to worker host
-global.host = node_core_1.WorkerHost.create([
-    ...node_core_1.hostStoreKeys,
-    ...node_core_1.hostDynamicDsKeys,
-    ...worker_unfinalizedBlocks_service_1.hostUnfinalizedBlocksKeys,
-    ...node_core_1.hostConnectionPoolStateKeys,
-], {
+global.host = (0, node_core_1.createWorkerHost)([], {
     initWorker,
-    fetchBlock,
-    processBlock,
-    numFetchedBlocks,
-    numFetchingBlocks,
-    getStatus,
-    getMemoryLeft,
-    waitForWorkerBatchSize,
-}, logger);
-process.on('uncaughtException', (e) => {
-    logger.error(e, 'Uncaught Exception');
-    throw e;
 });
 //# sourceMappingURL=worker.js.map

package/dist/indexer/worker/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;AAEnC,iEAAiE;AACjE,kDAAkD;AAClD,wCAAwC;AACxC,oDAAqD;AACrD,wCAAwC;AACxC,uCAA2C;AAE3C,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;AAE9B,IAAA,mBAAU,EACR,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,SAA+B,EACpC,IAAI,CAAC,QAA8B,CACpC,CAAC;AAEF,oDAA4B;AAC5B,6DAA+C;AAC/C,2BAAuC;AAEvC,uCAA2C;AAC3C,gDAY0B;AAG1B,wDAAoD;AACpD,mDAA+C;AAC/C,qDAI0B;AAC1B,yFAG4C;AAC5C,IAAI,GAAqB,CAAC;AAC1B,IAAI,aAA4B,CAAC;AAEjC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,WAAW,8BAAQ,EAAE,CAAC,CAAC;AAEhD,KAAK,UAAU,UAAU;IACvB,IAAI;QACF,IAAI,GAAG,EAAE;YACP,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC1C,OAAO;SACR;QAED,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,4BAAY,EAAE;YAC3C,MAAM,EAAE,IAAI,sBAAU,EAAE,EAAE,0EAA0E;SACrG,CAAC,CAAC;QAEH,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC;QAC/C,uGAAuG;QACvG,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;QAE7B,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;KACxC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAC1C,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,MAAc;IACtC,IAAA,gBAAM,EAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;IACzC,OAAO,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,MAAc;IACxC,IAAA,gBAAM,EAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAEzC,OAAO,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,4DAA4D;AAC5D,KAAK,UAAU,gBAAgB;IAC7B,OAAO,aAAa,CAAC,gBAAgB,CAAC;AACxC,CAAC;AAED,4DAA4D;AAC5D,KAAK,UAAU,iBAAiB;IAC9B,OAAO,aAAa,CAAC,iBAAiB,CAAC;AACzC,CAAC;AAED,4DAA4D;AAC5D,KAAK,UAAU,SAAS;IACtB,OAAO;QACL,QAAQ,EAAR,8BAAQ;QACR,aAAa,EAAE,aAAa,CAAC,gBAAgB;QAC7C,aAAa,EAAE,aAAa,CAAC,iBAAiB;QAC9C,UAAU,EAAE,aAAa,CAAC,UAAU;KACrC,CAAC;AACJ,CAAC;AAED,4DAA4D;AAC5D,KAAK,UAAU,aAAa;IAC1B,MAAM,SAAS,GAAG,IAAA,sBAAiB,GAAE,CAAC,eAAe,CAAC;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;IAEhD,OAAO,SAAS,GAAG,QAAQ,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,eAAuB;IAC3D,MAAM,IAAA,4BAAgB,EAAC,eAAe,CAAC,CAAC;AAC1C,CAAC;AAED,wDAAwD;AACvD,MAAc,CAAC,IAAI,GAAG,sBAAU,CAAC,MAAM,CAOtC;IACE,GAAG,yBAAa;IAChB,GAAG,6BAAiB;IACpB,GAAG,4DAAyB;IAC5B,GAAG,uCAA2B;CAC/B,EACD;IACE,UAAU;IACV,UAAU;IACV,YAAY;IACZ,gBAAgB;IAChB,iBAAiB;IACjB,SAAS;IACT,aAAa;IACb,sBAAsB;CACvB,EACD,MAAM,CACP,CAAC;AA0BF,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE;IACpC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACtC,MAAM,CAAC,CAAC;AACV,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\n// initlogger and yargs must be imported before all other imports\n// making sure logger is defined before its called\n// eslint-disable-next-line import/order\nimport { initLogger } from '@subql/node-core/logger';\n// eslint-disable-next-line import/order\nimport { yargsOptions } from '../../yargs';\n\nconst { argv } = yargsOptions;\n\ninitLogger(\n  argv.debug,\n  argv.outputFmt as 'json' | 'colored',\n  argv.logLevel as string | undefined,\n);\n\nimport assert from 'assert';\nimport { threadId } from 'node:worker_threads';\nimport { getHeapStatistics } from 'v8';\nimport { INestApplication } from '@nestjs/common';\nimport { NestFactory } from '@nestjs/core';\nimport {\n  waitForBatchSize,\n  WorkerHost,\n  getLogger,\n  NestLogger,\n  hostStoreKeys,\n  HostStore,\n  hostDynamicDsKeys,\n  HostDynamicDS,\n  ProcessBlockResponse,\n  HostConnectionPoolState,\n  hostConnectionPoolStateKeys,\n} from '@subql/node-core';\nimport { SubqlProjectDs } from '../../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../../ethereum/api.connection';\nimport { IndexerManager } from '../indexer.manager';\nimport { WorkerModule } from './worker.module';\nimport {\n  FetchBlockResponse,\n  WorkerService,\n  WorkerStatusResponse,\n} from './worker.service';\nimport {\n  HostUnfinalizedBlocks,\n  hostUnfinalizedBlocksKeys,\n} from './worker.unfinalizedBlocks.service';\nlet app: INestApplication;\nlet workerService: WorkerService;\n\nconst logger = getLogger(`worker #${threadId}`);\n\nasync function initWorker(): Promise<void> {\n  try {\n    if (app) {\n      logger.warn('Worker already initialised');\n      return;\n    }\n\n    app = await NestFactory.create(WorkerModule, {\n      logger: new NestLogger(), // TIP: If the worker is crashing comment out this line for better logging\n    });\n\n    await app.init();\n\n    const indexerManager = app.get(IndexerManager);\n    // Initialise async services, we do this here rather than in factories so we can capture one off events\n    await indexerManager.start();\n\n    workerService = app.get(WorkerService);\n  } catch (e) {\n    console.log('Failed to start worker', e);\n    logger.error(e, 'Failed to start worker');\n    throw e;\n  }\n}\n\nasync function fetchBlock(height: number): Promise<FetchBlockResponse> {\n  assert(workerService, 'Not initialised');\n  return workerService.fetchBlock(height);\n}\n\nasync function processBlock(height: number): Promise<ProcessBlockResponse> {\n  assert(workerService, 'Not initialised');\n\n  return workerService.processBlock(height);\n}\n\n// eslint-disable-next-line @typescript-eslint/require-await\nasync function numFetchedBlocks(): Promise<number> {\n  return workerService.numFetchedBlocks;\n}\n\n// eslint-disable-next-line @typescript-eslint/require-await\nasync function numFetchingBlocks(): Promise<number> {\n  return workerService.numFetchingBlocks;\n}\n\n// eslint-disable-next-line @typescript-eslint/require-await\nasync function getStatus(): Promise<WorkerStatusResponse> {\n  return {\n    threadId,\n    fetchedBlocks: workerService.numFetchedBlocks,\n    toFetchBlocks: workerService.numFetchingBlocks,\n    isIndexing: workerService.isIndexing,\n  };\n}\n\n// eslint-disable-next-line @typescript-eslint/require-await\nasync function getMemoryLeft(): Promise<number> {\n  const totalHeap = getHeapStatistics().heap_size_limit;\n  const heapUsed = process.memoryUsage().heapUsed;\n\n  return totalHeap - heapUsed;\n}\n\nasync function waitForWorkerBatchSize(heapSizeInBytes: number): Promise<void> {\n  await waitForBatchSize(heapSizeInBytes);\n}\n\n// Register these functions to be exposed to worker host\n(global as any).host = WorkerHost.create<\n  HostStore &\n    HostDynamicDS<SubqlProjectDs> &\n    HostUnfinalizedBlocks &\n    HostConnectionPoolState<EthereumApiConnection>,\n  IInitIndexerWorker\n>(\n  [\n    ...hostStoreKeys,\n    ...hostDynamicDsKeys,\n    ...hostUnfinalizedBlocksKeys,\n    ...hostConnectionPoolStateKeys,\n  ],\n  {\n    initWorker,\n    fetchBlock,\n    processBlock,\n    numFetchedBlocks,\n    numFetchingBlocks,\n    getStatus,\n    getMemoryLeft,\n    waitForWorkerBatchSize,\n  },\n  logger,\n);\n\n// Export types to be used on the parent\ntype InitWorker = typeof initWorker;\ntype FetchBlock = typeof fetchBlock;\ntype ProcessBlock = typeof processBlock;\ntype NumFetchedBlocks = typeof numFetchedBlocks;\ntype NumFetchingBlocks = typeof numFetchingBlocks;\ntype GetWorkerStatus = typeof getStatus;\ntype GetMemoryLeft = typeof getMemoryLeft;\ntype WaitForWorkerBatchSize = typeof waitForWorkerBatchSize;\n\nexport type IIndexerWorker = {\n  processBlock: ProcessBlock;\n  fetchBlock: FetchBlock;\n  numFetchedBlocks: NumFetchedBlocks;\n  numFetchingBlocks: NumFetchingBlocks;\n  getStatus: GetWorkerStatus;\n  getMemoryLeft: GetMemoryLeft;\n  waitForWorkerBatchSize: WaitForWorkerBatchSize;\n};\n\nexport type IInitIndexerWorker = IIndexerWorker & {\n  initWorker: InitWorker;\n};\n\nprocess.on('uncaughtException', (e) => {\n  logger.error(e, 'Uncaught Exception');\n  throw e;\n});\n"]}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,iEAAiE;AACjE,kDAAkD;AAClD,wCAAwC;AACxC,oDAAqD;AACrD,wCAAwC;AACxC,uCAA2C;AAE3C,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;AAE9B,IAAA,mBAAU,EACR,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,SAA+B,EACpC,IAAI,CAAC,QAA8B,CACpC,CAAC;AAEF,6DAA+C;AAC/C,uCAA2C;AAC3C,gDAM0B;AAE1B,mDAA+C;AAC/C,qDAAiD;AAEjD,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,WAAW,8BAAQ,EAAE,CAAC,CAAC;AAEhD,KAAK,UAAU,UAAU,CAAC,WAAmB;IAC3C,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,4BAAY,EAAE;YACjD,MAAM,EAAE,IAAI,sBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,0EAA0E;SAC/G,CAAC,CAAC;QAEH,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,MAAM,cAAc,GAAmB,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClE,uGAAuG;QACvG,MAAM,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEvC,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC;QAE7C,IAAA,8BAAkB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;KACxC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAC1C,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAQA,MAAc,CAAC,IAAI,GAAG,IAAA,4BAAgB,EAAC,EAAE,EAAE;IAC1C,UAAU;CACX,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\n// initlogger and yargs must be imported before all other imports\n// making sure logger is defined before its called\n// eslint-disable-next-line import/order\nimport { initLogger } from '@subql/node-core/logger';\n// eslint-disable-next-line import/order\nimport { yargsOptions } from '../../yargs';\n\nconst { argv } = yargsOptions;\n\ninitLogger(\n  argv.debug,\n  argv.outputFmt as 'json' | 'colored',\n  argv.logLevel as string | undefined,\n);\n\nimport { threadId } from 'node:worker_threads';\nimport { NestFactory } from '@nestjs/core';\nimport {\n  getLogger,\n  NestLogger,\n  createWorkerHost,\n  IBaseIndexerWorker,\n  initWorkerServices,\n} from '@subql/node-core';\nimport { ProjectService } from '../project.service';\nimport { WorkerModule } from './worker.module';\nimport { WorkerService } from './worker.service';\n\nconst logger = getLogger(`worker #${threadId}`);\n\nasync function initWorker(startHeight: number): Promise<void> {\n  try {\n    const app = await NestFactory.create(WorkerModule, {\n      logger: new NestLogger(argv.debug), // TIP: If the worker is crashing comment out this line for better logging\n    });\n\n    await app.init();\n\n    const projectService: ProjectService = app.get('IProjectService');\n    // Initialise async services, we do this here rather than in factories so we can capture one off events\n    await projectService.init(startHeight);\n\n    const workerService = app.get(WorkerService);\n\n    initWorkerServices(app, workerService);\n  } catch (e) {\n    console.log('Failed to start worker', e);\n    logger.error(e, 'Failed to start worker');\n    throw e;\n  }\n}\n\nexport type IIndexerWorker = IBaseIndexerWorker;\n\nexport type IInitIndexerWorker = IIndexerWorker & {\n  initWorker: typeof initWorker;\n};\n\n(global as any).host = createWorkerHost([], {\n  initWorker,\n});\n"]}

package/dist/indexer/worker/worker.module.js

@@ -14,7 +14,7 @@ const event_emitter_1 = require("@nestjs/event-emitter");
 const schedule_1 = require("@nestjs/schedule");
 const node_core_1 = require("@subql/node-core");
 const configure_module_1 = require("../../configure/configure.module");
-const indexer_module_1 = require("../indexer.module");
+const worker_fetch_module_1 = require("../worker-fetch.module");
 let WorkerModule = class WorkerModule {
 };
 WorkerModule = __decorate([
@@ -24,7 +24,7 @@ WorkerModule = __decorate([
             event_emitter_1.EventEmitterModule.forRoot(),
             configure_module_1.ConfigureModule.register(),
             schedule_1.ScheduleModule.forRoot(),
-            indexer_module_1.IndexerModule,
+            worker_fetch_module_1.WorkerFetchModule,
         ],
         controllers: [],
     })

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

@@ -1 +1 @@
-{"version":3,"file":"worker.module.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.module.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAAwC;AACxC,yDAA2D;AAC3D,+CAAkD;AAClD,gDAA4C;AAC5C,uEAAmE;AACnE,sDAAkD;AAY3C,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,YAAY;IAVxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,oBAAQ,CAAC,OAAO,EAAE;YAClB,kCAAkB,CAAC,OAAO,EAAE;YAC5B,kCAAe,CAAC,QAAQ,EAAE;YAC1B,yBAAc,CAAC,OAAO,EAAE;YACxB,8BAAa;SACd;QACD,WAAW,EAAE,EAAE;KAChB,CAAC;GACW,YAAY,CAAG;AAAf,oCAAY","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitterModule } from '@nestjs/event-emitter';\nimport { ScheduleModule } from '@nestjs/schedule';\nimport { DbModule } from '@subql/node-core';\nimport { ConfigureModule } from '../../configure/configure.module';\nimport { IndexerModule } from '../indexer.module';\n\n@Module({\n  imports: [\n    DbModule.forRoot(),\n    EventEmitterModule.forRoot(),\n    ConfigureModule.register(),\n    ScheduleModule.forRoot(),\n    IndexerModule,\n  ],\n  controllers: [],\n})\nexport class WorkerModule {}\n"]}
+{"version":3,"file":"worker.module.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.module.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAAwC;AACxC,yDAA2D;AAC3D,+CAAkD;AAClD,gDAA4C;AAC5C,uEAAmE;AACnE,gEAA2D;AAYpD,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,YAAY;IAVxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,oBAAQ,CAAC,OAAO,EAAE;YAClB,kCAAkB,CAAC,OAAO,EAAE;YAC5B,kCAAe,CAAC,QAAQ,EAAE;YAC1B,yBAAc,CAAC,OAAO,EAAE;YACxB,uCAAiB;SAClB;QACD,WAAW,EAAE,EAAE;KAChB,CAAC;GACW,YAAY,CAAG;AAAf,oCAAY","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitterModule } from '@nestjs/event-emitter';\nimport { ScheduleModule } from '@nestjs/schedule';\nimport { DbModule } from '@subql/node-core';\nimport { ConfigureModule } from '../../configure/configure.module';\nimport { WorkerFetchModule } from '../worker-fetch.module';\n\n@Module({\n  imports: [\n    DbModule.forRoot(),\n    EventEmitterModule.forRoot(),\n    ConfigureModule.register(),\n    ScheduleModule.forRoot(),\n    WorkerFetchModule,\n  ],\n  controllers: [],\n})\nexport class WorkerModule {}\n"]}

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

@@ -1,6 +1,8 @@
-import { NodeConfig, IProjectService, ProcessBlockResponse, ApiService } from '@subql/node-core';
-import { SubqlProjectDs } from '../../configure/SubqueryProject';
+import { SubqlEthereumDataSource } from '@subql/common-ethereum';
+import { NodeConfig, IProjectService, ProcessBlockResponse, ApiService, BaseWorkerService, IProjectUpgradeService } from '@subql/node-core';
+import { EthereumProjectDs } from '../../configure/SubqueryProject';
 import { IndexerManager } from '../indexer.manager';
+import { BlockContent } from '../types';
 export type FetchBlockResponse = {
     parentHash: string;
 } | undefined;
@@ -10,17 +12,13 @@ export type WorkerStatusResponse = {
     fetchedBlocks: number;
     toFetchBlocks: number;
 };
-export declare class WorkerService {
+export declare class WorkerService extends BaseWorkerService<BlockContent, FetchBlockResponse, SubqlEthereumDataSource, {}> {
     private apiService;
     private indexerManager;
-    private projectService;
-    private fetchedBlocks;
-    private _isIndexing;
-    private queue;
-    constructor(apiService: ApiService, indexerManager: IndexerManager, projectService: IProjectService<SubqlProjectDs>, nodeConfig: NodeConfig);
-    fetchBlock(height: number): Promise<FetchBlockResponse>;
-    processBlock(height: number): Promise<ProcessBlockResponse>;
-    get numFetchedBlocks(): number;
-    get numFetchingBlocks(): number;
-    get isIndexing(): boolean;
+    constructor(apiService: ApiService, indexerManager: IndexerManager, projectService: IProjectService<EthereumProjectDs>, projectUpgradeService: IProjectUpgradeService, nodeConfig: NodeConfig);
+    protected fetchChainBlock(heights: number, extra: {}): Promise<BlockContent>;
+    protected toBlockResponse(block: BlockContent): {
+        parentHash: string;
+    };
+    protected processFetchedBlock(block: BlockContent, dataSources: SubqlEthereumDataSource[]): Promise<ProcessBlockResponse>;
 }

package/dist/indexer/worker/worker.service.js

@@ -15,76 +15,34 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerService = void 0;
-const node_worker_threads_1 = require("node:worker_threads");
 const common_1 = require("@nestjs/common");
 const node_core_1 = require("@subql/node-core");
 const indexer_manager_1 = require("../indexer.manager");
-const logger = (0, node_core_1.getLogger)(`Worker Service #${node_worker_threads_1.threadId}`);
-let WorkerService = class WorkerService {
-    constructor(apiService, indexerManager, projectService, nodeConfig) {
+let WorkerService = class WorkerService extends node_core_1.BaseWorkerService {
+    constructor(apiService, indexerManager, projectService, projectUpgradeService, nodeConfig) {
+        super(projectService, projectUpgradeService, nodeConfig);
         this.apiService = apiService;
         this.indexerManager = indexerManager;
-        this.projectService = projectService;
-        this.fetchedBlocks = {};
-        this._isIndexing = false;
-        this.queue = new node_core_1.AutoQueue(undefined, nodeConfig.batchSize);
     }
-    async fetchBlock(height) {
-        try {
-            return await this.queue.put(async () => {
-                // If a dynamic ds is created we might be asked to fetch blocks again, use existing result
-                if (!this.fetchedBlocks[height]) {
-                    if (node_core_1.memoryLock.isLocked()) {
-                        const start = Date.now();
-                        await node_core_1.memoryLock.waitForUnlock();
-                        const end = Date.now();
-                        logger.debug(`memory lock wait time: ${end - start}ms`);
-                    }
-                    const [block] = await this.apiService.fetchBlocks([height]);
-                    this.fetchedBlocks[height] = block;
-                }
-                // Return info to get the runtime version, this lets the worker thread know
-                return undefined;
-            });
-        }
-        catch (e) {
-            logger.error(/*e, */ `Failed to fetch block ${height}`);
-            throw e;
-        }
+    async fetchChainBlock(heights, extra) {
+        const [block] = await this.apiService.fetchBlocks([heights]);
+        return block;
     }
-    async processBlock(height) {
-        try {
-            this._isIndexing = true;
-            const block = this.fetchedBlocks[height];
-            if (!block) {
-                throw new Error(`Block ${height} has not been fetched`);
-            }
-            delete this.fetchedBlocks[height];
-            return await this.indexerManager.indexBlock(block, await this.projectService.getAllDataSources(height));
-        }
-        catch (e) {
-            logger.error(e, `Failed to index block ${height}: ${e.stack}`);
-            throw e;
-        }
-        finally {
-            this._isIndexing = false;
-        }
+    toBlockResponse(block) {
+        return {
+            parentHash: block.parentHash,
+        };
     }
-    get numFetchedBlocks() {
-        return Object.keys(this.fetchedBlocks).length;
-    }
-    get numFetchingBlocks() {
-        return this.queue.size;
-    }
-    get isIndexing() {
-        return this._isIndexing;
+    async processFetchedBlock(block, dataSources) {
+        return this.indexerManager.indexBlock(block, dataSources);
     }
 };
 WorkerService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)('IProjectService')),
+    __param(3, (0, common_1.Inject)('IProjectUpgradeService')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
-        indexer_manager_1.IndexerManager, Object, node_core_1.NodeConfig])
+        indexer_manager_1.IndexerManager, Object, Object, node_core_1.NodeConfig])
 ], WorkerService);
 exports.WorkerService = WorkerService;
 //# sourceMappingURL=worker.service.js.map