@subql/node-ethereum 4.1.0 → 4.1.1

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

@@ -20,7 +20,6 @@ const project_service_1 = require("./project.service");
 const sandbox_service_1 = require("./sandbox.service");
 const unfinalizedBlocks_service_1 = require("./unfinalizedBlocks.service");
 const worker_service_1 = require("./worker/worker.service");
-const worker_unfinalizedBlocks_service_1 = require("./worker/worker.unfinalizedBlocks.service");
 let WorkerFetchModule = class WorkerFetchModule {
 };
 WorkerFetchModule = __decorate([
@@ -58,7 +57,7 @@ WorkerFetchModule = __decorate([
             },
             {
                 provide: unfinalizedBlocks_service_1.UnfinalizedBlocksService,
-                useFactory: () => new worker_unfinalizedBlocks_service_1.WorkerUnfinalizedBlocksService(global.host),
+                useFactory: () => new node_core_1.WorkerUnfinalizedBlocksService(global.host),
             },
             worker_service_1.WorkerService,
             {

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

@@ -1 +1 @@
-{"version":3,"file":"worker-fetch.module.js","sourceRoot":"","sources":["../../src/indexer/worker-fetch.module.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAAwC;AACxC,yDAAsD;AACtD,gDAS0B;AAE1B,0CAAiD;AAEjD,iEAA4D;AAC5D,6DAAwD;AACxD,uDAAmD;AACnD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AACvE,4DAAwD;AACxD,gGAA2F;AAyDpF,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,iBAAiB;IAvD7B,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,gCAAc;YACd;gBACE,OAAO,EAAE,sCAA0B;gBACnC,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,4CAAgC,CAAE,MAAc,CAAC,IAAI,CAAC;aAC7D;YACD,iCAAqB;YACrB;gBACE,OAAO,EAAE,sBAAU;gBACnB,UAAU,EAAE,KAAK,EACf,OAAwB,EACxB,qBAAmE,EACnE,YAA2B,EAC3B,UAAsB,EACtB,EAAE;oBACF,MAAM,UAAU,GAAG,IAAI,6BAAkB,CACvC,OAAO,EACP,qBAAqB,EACrB,YAAY,EACZ,UAAU,CACX,CAAC;oBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;oBACxB,OAAO,UAAU,CAAC;gBACpB,CAAC;gBACD,MAAM,EAAE;oBACN,kBAAkB;oBAClB,iCAAqB;oBACrB,6BAAa;oBACb,sBAAU;iBACX;aACF;YACD,gCAAc;YACd,yCAAkB;YAClB;gBACE,OAAO,EAAE,qCAAgB;gBACzB,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAsB,CAAE,MAAc,CAAC,IAAI,CAAC;aACnE;YACD;gBACE,OAAO,EAAE,iBAAiB;gBAC1B,QAAQ,EAAE,gCAAc;aACzB;YACD;gBACE,OAAO,EAAE,oDAAwB;gBACjC,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,iEAA8B,CAAE,MAAc,CAAC,IAAI,CAAC;aAC3D;YACD,8BAAa;YACb;gBACE,OAAO,EAAE,gCAAoB;gBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,sCAA0B,CAAE,MAAc,CAAC,IAAI,CAAC;aACvE;SACF;KACF,CAAC;GACW,iBAAiB,CAAG;AAApB,8CAAiB","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  WorkerDynamicDsService,\n  WorkerConnectionPoolStateManager,\n  ConnectionPoolStateManager,\n  NodeConfig,\n  InMemoryCacheService,\n  WorkerInMemoryCacheService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from '../ethereum';\nimport { EthereumApiConnection } from '../ethereum/api.connection';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { IndexerManager } from './indexer.manager';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\nimport { WorkerService } from './worker/worker.service';\nimport { WorkerUnfinalizedBlocksService } from './worker/worker.unfinalizedBlocks.service';\n\n@Module({\n  providers: [\n    IndexerManager,\n    {\n      provide: ConnectionPoolStateManager,\n      useFactory: () =>\n        new WorkerConnectionPoolStateManager((global as any).host),\n    },\n    ConnectionPoolService,\n    {\n      provide: ApiService,\n      useFactory: async (\n        project: SubqueryProject,\n        connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n        eventEmitter: EventEmitter2,\n        nodeConfig: NodeConfig,\n      ) => {\n        const apiService = new EthereumApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n          nodeConfig,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        ConnectionPoolService,\n        EventEmitter2,\n        NodeConfig,\n      ],\n    },\n    SandboxService,\n    DsProcessorService,\n    {\n      provide: DynamicDsService,\n      useFactory: () => new WorkerDynamicDsService((global as any).host),\n    },\n    {\n      provide: 'IProjectService',\n      useClass: ProjectService,\n    },\n    {\n      provide: UnfinalizedBlocksService,\n      useFactory: () =>\n        new WorkerUnfinalizedBlocksService((global as any).host),\n    },\n    WorkerService,\n    {\n      provide: InMemoryCacheService,\n      useFactory: () => new WorkerInMemoryCacheService((global as any).host),\n    },\n  ],\n})\nexport class WorkerFetchModule {}\n"]}
+{"version":3,"file":"worker-fetch.module.js","sourceRoot":"","sources":["../../src/indexer/worker-fetch.module.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;AAEnC,2CAAwC;AACxC,yDAAsD;AACtD,gDAU0B;AAE1B,0CAAiD;AAEjD,iEAA4D;AAC5D,6DAAwD;AACxD,uDAAmD;AACnD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AACvE,4DAAwD;AAyDjD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAAG,CAAA;AAApB,iBAAiB;IAvD7B,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,gCAAc;YACd;gBACE,OAAO,EAAE,sCAA0B;gBACnC,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,4CAAgC,CAAE,MAAc,CAAC,IAAI,CAAC;aAC7D;YACD,iCAAqB;YACrB;gBACE,OAAO,EAAE,sBAAU;gBACnB,UAAU,EAAE,KAAK,EACf,OAAwB,EACxB,qBAAmE,EACnE,YAA2B,EAC3B,UAAsB,EACtB,EAAE;oBACF,MAAM,UAAU,GAAG,IAAI,6BAAkB,CACvC,OAAO,EACP,qBAAqB,EACrB,YAAY,EACZ,UAAU,CACX,CAAC;oBACF,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;oBACxB,OAAO,UAAU,CAAC;gBACpB,CAAC;gBACD,MAAM,EAAE;oBACN,kBAAkB;oBAClB,iCAAqB;oBACrB,6BAAa;oBACb,sBAAU;iBACX;aACF;YACD,gCAAc;YACd,yCAAkB;YAClB;gBACE,OAAO,EAAE,qCAAgB;gBACzB,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAsB,CAAE,MAAc,CAAC,IAAI,CAAC;aACnE;YACD;gBACE,OAAO,EAAE,iBAAiB;gBAC1B,QAAQ,EAAE,gCAAc;aACzB;YACD;gBACE,OAAO,EAAE,oDAAwB;gBACjC,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,0CAA8B,CAAE,MAAc,CAAC,IAAI,CAAC;aAC3D;YACD,8BAAa;YACb;gBACE,OAAO,EAAE,gCAAoB;gBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,sCAA0B,CAAE,MAAc,CAAC,IAAI,CAAC;aACvE;SACF;KACF,CAAC;GACW,iBAAiB,CAAG;AAApB,8CAAiB","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  WorkerDynamicDsService,\n  WorkerConnectionPoolStateManager,\n  ConnectionPoolStateManager,\n  NodeConfig,\n  InMemoryCacheService,\n  WorkerInMemoryCacheService,\n  WorkerUnfinalizedBlocksService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from '../ethereum';\nimport { EthereumApiConnection } from '../ethereum/api.connection';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { IndexerManager } from './indexer.manager';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\nimport { WorkerService } from './worker/worker.service';\n\n@Module({\n  providers: [\n    IndexerManager,\n    {\n      provide: ConnectionPoolStateManager,\n      useFactory: () =>\n        new WorkerConnectionPoolStateManager((global as any).host),\n    },\n    ConnectionPoolService,\n    {\n      provide: ApiService,\n      useFactory: async (\n        project: SubqueryProject,\n        connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n        eventEmitter: EventEmitter2,\n        nodeConfig: NodeConfig,\n      ) => {\n        const apiService = new EthereumApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n          nodeConfig,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        ConnectionPoolService,\n        EventEmitter2,\n        NodeConfig,\n      ],\n    },\n    SandboxService,\n    DsProcessorService,\n    {\n      provide: DynamicDsService,\n      useFactory: () => new WorkerDynamicDsService((global as any).host),\n    },\n    {\n      provide: 'IProjectService',\n      useClass: ProjectService,\n    },\n    {\n      provide: UnfinalizedBlocksService,\n      useFactory: () =>\n        new WorkerUnfinalizedBlocksService((global as any).host),\n    },\n    WorkerService,\n    {\n      provide: InMemoryCacheService,\n      useFactory: () => new WorkerInMemoryCacheService((global as any).host),\n    },\n  ],\n})\nexport class WorkerFetchModule {}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subql/node-ethereum",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "",
   "author": "Ian He",
   "license": "GPL-3.0",
@@ -27,7 +27,7 @@
     "@nestjs/schedule": "^3.0.1",
     "@subql/common": "^3.5.0",
     "@subql/common-ethereum": "3.5.0",
-    "@subql/node-core": "^8.0.1",
+    "@subql/node-core": "^9.0.0",
     "@subql/testing": "^2.1.1-0",
     "@subql/types-ethereum": "3.5.0",
     "cacheable-lookup": "6",

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

@@ -1,12 +0,0 @@
-import { Header, HostUnfinalizedBlocks, IBlock, IUnfinalizedBlocksService } from '@subql/node-core';
-import { BlockContent } from '../types';
-export declare class WorkerUnfinalizedBlocksService implements IUnfinalizedBlocksService<BlockContent> {
-    private host;
-    constructor(host: HostUnfinalizedBlocks);
-    processUnfinalizedBlockHeader(header: Header): Promise<number | null>;
-    processUnfinalizedBlocks(block: IBlock<BlockContent>): Promise<number | null>;
-    init(reindex: (targetHeight: number) => Promise<void>): Promise<number>;
-    resetUnfinalizedBlocks(): void;
-    resetLastFinalizedVerifiedHeight(): void;
-    getMetadataUnfinalizedBlocks(): Promise<Header[]>;
-}

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

@@ -1,50 +0,0 @@
-"use strict";
-// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
-// SPDX-License-Identifier: GPL-3.0
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerUnfinalizedBlocksService = void 0;
-const worker_threads_1 = require("worker_threads");
-const common_1 = require("@nestjs/common");
-let WorkerUnfinalizedBlocksService = class WorkerUnfinalizedBlocksService {
-    constructor(host) {
-        this.host = host;
-        if (worker_threads_1.isMainThread) {
-            throw new Error('Expected to be worker thread');
-        }
-    }
-    async processUnfinalizedBlockHeader(header) {
-        return this.host.unfinalizedBlocksProcess(header);
-    }
-    async processUnfinalizedBlocks(block) {
-        return this.host.unfinalizedBlocksProcess(block.getHeader());
-    }
-    // eslint-disable-next-line @typescript-eslint/promise-function-async
-    init(reindex) {
-        throw new Error('This method should not be called from a worker');
-    }
-    resetUnfinalizedBlocks() {
-        throw new Error('This method should not be called from a worker');
-    }
-    resetLastFinalizedVerifiedHeight() {
-        throw new Error('This method should not be called from a worker');
-    }
-    // eslint-disable-next-line @typescript-eslint/promise-function-async
-    getMetadataUnfinalizedBlocks() {
-        throw new Error('This method should not be called from a worker');
-    }
-};
-WorkerUnfinalizedBlocksService = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [Object])
-], WorkerUnfinalizedBlocksService);
-exports.WorkerUnfinalizedBlocksService = WorkerUnfinalizedBlocksService;
-//# sourceMappingURL=worker.unfinalizedBlocks.service.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"worker.unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.unfinalizedBlocks.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;AAEnC,mDAA8C;AAC9C,2CAA4C;AAUrC,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAGzC,YAAoB,IAA2B;QAA3B,SAAI,GAAJ,IAAI,CAAuB;QAC7C,IAAI,6BAAY,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;IACH,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,MAAc;QAChD,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,KAA2B;QAE3B,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,qEAAqE;IACrE,IAAI,CAAC,OAAgD;QACnD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,sBAAsB;QACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,gCAAgC;QAC9B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,qEAAqE;IACrE,4BAA4B;QAC1B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AAjCY,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;;GACA,8BAA8B,CAiC1C;AAjCY,wEAA8B","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { isMainThread } from 'worker_threads';\nimport { Injectable } from '@nestjs/common';\nimport {\n  Header,\n  HostUnfinalizedBlocks,\n  IBlock,\n  IUnfinalizedBlocksService,\n} from '@subql/node-core';\nimport { BlockContent } from '../types';\n\n@Injectable()\nexport class WorkerUnfinalizedBlocksService\n  implements IUnfinalizedBlocksService<BlockContent>\n{\n  constructor(private host: HostUnfinalizedBlocks) {\n    if (isMainThread) {\n      throw new Error('Expected to be worker thread');\n    }\n  }\n\n  async processUnfinalizedBlockHeader(header: Header): Promise<number | null> {\n    return this.host.unfinalizedBlocksProcess(header);\n  }\n\n  async processUnfinalizedBlocks(\n    block: IBlock<BlockContent>,\n  ): Promise<number | null> {\n    return this.host.unfinalizedBlocksProcess(block.getHeader());\n  }\n\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  init(reindex: (targetHeight: number) => Promise<void>): Promise<number> {\n    throw new Error('This method should not be called from a worker');\n  }\n  resetUnfinalizedBlocks(): void {\n    throw new Error('This method should not be called from a worker');\n  }\n  resetLastFinalizedVerifiedHeight(): void {\n    throw new Error('This method should not be called from a worker');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getMetadataUnfinalizedBlocks(): Promise<Header[]> {\n    throw new Error('This method should not be called from a worker');\n  }\n}\n"]}