@subql/node-stellar 2.12.1 → 2.12.2-0

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":"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","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 { StellarApiConnection } from '../../stellar/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<StellarApiConnection>,\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;AAOA,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  initWorkerServices,\n  IBaseIndexerWorker,\n  createWorkerHost,\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}\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,+DAA0D;AAYnD,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,5 +1,7 @@
-import { NodeConfig, IProjectService, ProcessBlockResponse, ApiService } from '@subql/node-core';
-import { SubqlProjectDs } from '../../configure/SubqueryProject';
+import { SubqlStellarDataSource } from '@subql/common-stellar';
+import { NodeConfig, IProjectService, ProcessBlockResponse, ApiService, BaseWorkerService, IProjectUpgradeService } from '@subql/node-core';
+import { BlockWrapper } from '@subql/types-stellar';
+import { StellarProjectDs } from '../../configure/SubqueryProject';
 import { IndexerManager } from '../indexer.manager';
 export type FetchBlockResponse = {
     parentHash: string;
@@ -10,17 +12,13 @@ export type WorkerStatusResponse = {
     fetchedBlocks: number;
     toFetchBlocks: number;
 };
-export declare class WorkerService {
+export declare class WorkerService extends BaseWorkerService<BlockWrapper, FetchBlockResponse, SubqlStellarDataSource, {}> {
     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<StellarProjectDs>, projectUpgradeService: IProjectUpgradeService, nodeConfig: NodeConfig);
+    protected fetchChainBlock(heights: number, extra: {}): Promise<BlockWrapper>;
+    protected toBlockResponse(block: BlockWrapper): {
+        parentHash: string;
+    };
+    protected processFetchedBlock(block: BlockWrapper, dataSources: SubqlStellarDataSource[]): Promise<ProcessBlockResponse>;
 }

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

@@ -20,71 +20,31 @@ 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.block.prev_hash,
+        };
     }
-    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

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

@@ -1 +1 @@
-{"version":3,"file":"worker.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { threadId } from 'node:worker_threads';\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  NodeConfig,\n  getLogger,\n  AutoQueue,\n  memoryLock,\n  IProjectService,\n  ProcessBlockResponse,\n  ApiService,\n} from '@subql/node-core';\nimport { BlockWrapper, StellarBlockWrapper } from '@subql/types-stellar';\nimport { SubqlProjectDs } from '../../configure/SubqueryProject';\nimport { IndexerManager } from '../indexer.manager';\n\nexport type FetchBlockResponse = { parentHash: string } | undefined;\n\nexport type WorkerStatusResponse = {\n  threadId: number;\n  isIndexing: boolean;\n  fetchedBlocks: number;\n  toFetchBlocks: number;\n};\n\nconst logger = getLogger(`Worker Service #${threadId}`);\n\n@Injectable()\nexport class WorkerService {\n  private fetchedBlocks: Record<string, BlockWrapper> = {};\n  private _isIndexing = false;\n\n  private queue: AutoQueue<FetchBlockResponse>;\n\n  constructor(\n    private apiService: ApiService,\n    private indexerManager: IndexerManager,\n    @Inject('IProjectService')\n    private projectService: IProjectService<SubqlProjectDs>,\n    nodeConfig: NodeConfig,\n  ) {\n    this.queue = new AutoQueue(undefined, nodeConfig.batchSize);\n  }\n\n  async fetchBlock(height: number): Promise<FetchBlockResponse> {\n    try {\n      return await this.queue.put(async () => {\n        // If a dynamic ds is created we might be asked to fetch blocks again, use existing result\n        if (!this.fetchedBlocks[height]) {\n          if (memoryLock.isLocked()) {\n            const start = Date.now();\n            await memoryLock.waitForUnlock();\n            const end = Date.now();\n            logger.debug(`memory lock wait time: ${end - start}ms`);\n          }\n\n          const [block] = await this.apiService.fetchBlocks([height]);\n          this.fetchedBlocks[height] = block;\n        }\n\n        // Return info to get the runtime version, this lets the worker thread know\n        return undefined;\n      });\n    } catch (e) {\n      logger.error(/*e, */ `Failed to fetch block ${height}`);\n      throw e;\n    }\n  }\n\n  async processBlock(height: number): Promise<ProcessBlockResponse> {\n    try {\n      this._isIndexing = true;\n      const block = this.fetchedBlocks[height] as StellarBlockWrapper;\n\n      if (!block) {\n        throw new Error(`Block ${height} has not been fetched`);\n      }\n\n      delete this.fetchedBlocks[height];\n\n      return await this.indexerManager.indexBlock(\n        block,\n        await this.projectService.getAllDataSources(height),\n      );\n    } catch (e) {\n      logger.error(e, `Failed to index block ${height}: ${e.stack}`);\n      throw e;\n    } finally {\n      this._isIndexing = false;\n    }\n  }\n\n  get numFetchedBlocks(): number {\n    return Object.keys(this.fetchedBlocks).length;\n  }\n\n  get numFetchingBlocks(): number {\n    return this.queue.size;\n  }\n\n  get isIndexing(): boolean {\n    return this._isIndexing;\n  }\n}\n"]}
+{"version":3,"file":"worker.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,6DAA+C;AAC/C,2CAAoD;AAEpD,gDAQ0B;AAG1B,wDAAoD;AAWpD,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,mBAAmB,8BAAQ,EAAE,CAAC,CAAC;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,6BAKlC;IACC,YACU,UAAsB,EACtB,cAA8B,EAEtC,cAAiD,EAEjD,qBAA6C,EAC7C,UAAsB;QAEtB,KAAK,CAAC,cAAc,EAAE,qBAAqB,EAAE,UAAU,CAAC,CAAC;QARjD,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAgB;IAQxC,CAAC;IACS,KAAK,CAAC,eAAe,CAC7B,OAAe,EACf,KAAS;QAET,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IAES,eAAe,CAAC,KAAmB;QAC3C,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;SAClC,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,KAAmB,EACnB,WAAqC;QAErC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AArCY,aAAa;IADzB,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;qCAJb,sBAAU;QACN,gCAAc,kBAK1B,sBAAU;GAbb,aAAa,CAqCzB;AArCY,sCAAa","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { threadId } from 'node:worker_threads';\nimport { Inject, Injectable } from '@nestjs/common';\nimport { SubqlStellarDataSource } from '@subql/common-stellar';\nimport {\n  NodeConfig,\n  getLogger,\n  IProjectService,\n  ProcessBlockResponse,\n  ApiService,\n  BaseWorkerService,\n  IProjectUpgradeService,\n} from '@subql/node-core';\nimport { BlockWrapper } from '@subql/types-stellar';\nimport { StellarProjectDs } from '../../configure/SubqueryProject';\nimport { IndexerManager } from '../indexer.manager';\n\nexport type FetchBlockResponse = { parentHash: string } | undefined;\n\nexport type WorkerStatusResponse = {\n  threadId: number;\n  isIndexing: boolean;\n  fetchedBlocks: number;\n  toFetchBlocks: number;\n};\n\nconst logger = getLogger(`Worker Service #${threadId}`);\n\n@Injectable()\nexport class WorkerService extends BaseWorkerService<\n  BlockWrapper,\n  FetchBlockResponse,\n  SubqlStellarDataSource,\n  {}\n> {\n  constructor(\n    private apiService: ApiService,\n    private indexerManager: IndexerManager,\n    @Inject('IProjectService')\n    projectService: IProjectService<StellarProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    nodeConfig: NodeConfig,\n  ) {\n    super(projectService, projectUpgradeService, nodeConfig);\n  }\n  protected async fetchChainBlock(\n    heights: number,\n    extra: {},\n  ): Promise<BlockWrapper> {\n    const [block] = await this.apiService.fetchBlocks([heights]);\n    return block;\n  }\n\n  protected toBlockResponse(block: BlockWrapper): { parentHash: string } {\n    return {\n      parentHash: block.block.prev_hash,\n    };\n  }\n\n  protected async processFetchedBlock(\n    block: BlockWrapper,\n    dataSources: SubqlStellarDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(block, dataSources);\n  }\n}\n"]}

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

@@ -1,9 +1,5 @@
-import { Header, IUnfinalizedBlocksService } from '@subql/node-core';
+import { Header, HostUnfinalizedBlocks, IUnfinalizedBlocksService } from '@subql/node-core';
 import { BlockWrapper } from '@subql/types-stellar';
-export type HostUnfinalizedBlocks = {
-    unfinalizedBlocksProcess: (header: Header) => Promise<number | null>;
-};
-export declare const hostUnfinalizedBlocksKeys: (keyof HostUnfinalizedBlocks)[];
 export declare class WorkerUnfinalizedBlocksService implements IUnfinalizedBlocksService<BlockWrapper> {
     private host;
     constructor(host: HostUnfinalizedBlocks);

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

@@ -11,12 +11,9 @@ 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 = exports.hostUnfinalizedBlocksKeys = void 0;
+exports.WorkerUnfinalizedBlocksService = void 0;
 const common_1 = require("@nestjs/common");
 const unfinalizedBlocks_service_1 = require("../unfinalizedBlocks.service");
-exports.hostUnfinalizedBlocksKeys = [
-    'unfinalizedBlocksProcess',
-];
 let WorkerUnfinalizedBlocksService = class WorkerUnfinalizedBlocksService {
     constructor(host) {
         this.host = host;

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

@@ -1 +1 @@
-{"version":3,"file":"worker.unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.unfinalizedBlocks.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;AAEnC,2CAA4C;AAG5C,4EAA6D;AAMhD,QAAA,yBAAyB,GAAoC;IACxE,0BAA0B;CAC3B,CAAC;AAGK,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAGzC,YAAoB,IAA2B;QAA3B,SAAI,GAAJ,IAAI,CAAuB;IAAG,CAAC;IAEnD,KAAK,CAAC,6BAA6B,CAAC,MAAc;QAChD,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,EAC7B,KAAK,GACQ;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAA,yCAAa,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E,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;AA7BY,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;;GACA,8BAA8B,CA6B1C;AA7BY,wEAA8B","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Injectable } from '@nestjs/common';\nimport { Header, IUnfinalizedBlocksService } from '@subql/node-core';\nimport { BlockWrapper } from '@subql/types-stellar';\nimport { blockToHeader } from '../unfinalizedBlocks.service';\n\nexport type HostUnfinalizedBlocks = {\n  unfinalizedBlocksProcess: (header: Header) => Promise<number | null>;\n};\n\nexport const hostUnfinalizedBlocksKeys: (keyof HostUnfinalizedBlocks)[] = [\n  'unfinalizedBlocksProcess',\n];\n\n@Injectable()\nexport class WorkerUnfinalizedBlocksService\n  implements IUnfinalizedBlocksService<BlockWrapper>\n{\n  constructor(private host: HostUnfinalizedBlocks) {}\n\n  async processUnfinalizedBlockHeader(header: Header): Promise<number | null> {\n    return this.host.unfinalizedBlocksProcess(header);\n  }\n\n  async processUnfinalizedBlocks({\n    block,\n  }: BlockWrapper): Promise<number | null> {\n    return this.host.unfinalizedBlocksProcess(blockToHeader(block.sequence));\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"]}
+{"version":3,"file":"worker.unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.unfinalizedBlocks.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;AAEnC,2CAA4C;AAO5C,4EAA6D;AAGtD,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAGzC,YAAoB,IAA2B;QAA3B,SAAI,GAAJ,IAAI,CAAuB;IAAG,CAAC;IAEnD,KAAK,CAAC,6BAA6B,CAAC,MAAc;QAChD,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,EAC7B,KAAK,GACQ;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAA,yCAAa,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E,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;AA7BY,8BAA8B;IAD1C,IAAA,mBAAU,GAAE;;GACA,8BAA8B,CA6B1C;AA7BY,wEAA8B","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Injectable } from '@nestjs/common';\nimport {\n  Header,\n  HostUnfinalizedBlocks,\n  IUnfinalizedBlocksService,\n} from '@subql/node-core';\nimport { BlockWrapper } from '@subql/types-stellar';\nimport { blockToHeader } from '../unfinalizedBlocks.service';\n\n@Injectable()\nexport class WorkerUnfinalizedBlocksService\n  implements IUnfinalizedBlocksService<BlockWrapper>\n{\n  constructor(private host: HostUnfinalizedBlocks) {}\n\n  async processUnfinalizedBlockHeader(header: Header): Promise<number | null> {\n    return this.host.unfinalizedBlocksProcess(header);\n  }\n\n  async processUnfinalizedBlocks({\n    block,\n  }: BlockWrapper): Promise<number | null> {\n    return this.host.unfinalizedBlocksProcess(blockToHeader(block.sequence));\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"]}

package/dist/init.js

@@ -13,6 +13,7 @@ const pjson = require('../package.json');
 const { argv } = yargs_1.yargsOptions;
 const DEFAULT_PORT = 3000;
 const logger = (0, node_core_1.getLogger)('subql-node');
+(0, common_1.notifyUpdates)(pjson, logger);
 async function bootstrap() {
     var _a;
     logger.info(`Current ${pjson.name} version is ${pjson.version}`);
@@ -31,7 +32,7 @@ async function bootstrap() {
     }
     try {
         const app = await core_1.NestFactory.create(app_module_1.AppModule, {
-            logger: debug ? new node_core_1.NestLogger() : false,
+            logger: new node_core_1.NestLogger(debug),
         });
         await app.init();
         const projectService = app.get('IProjectService');

package/dist/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAEnC,uCAA2C;AAC3C,0CAAkD;AAClD,gDAAyD;AACzD,6CAAyC;AACzC,2DAAuD;AAEvD,mCAAuC;AACvC,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEzC,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;AAE9B,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,YAAY,CAAC,CAAC;AAEhC,KAAK,UAAU,SAAS;;IAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,IAAI,eAAe,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAEzB,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,CAAC,MAAM,IAAA,0BAAiB,EAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,CAAC,KAAK,CACV,wDAAwD,IAAI,KAC1D,IAAI,GAAG,EACT,iEAAiE,CAClE,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,MAAM,CAAC,IAAI,CACT,mHAAmH,CACpH,CAAC;KACH;IAED,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,EAAE;YAC9C,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,sBAAU,EAAE,CAAC,CAAC,CAAC,KAAK;SACzC,CAAC,CAAC;QACH,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,MAAM,cAAc,GAAmB,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC;QAE3C,yGAAyG;QACzG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEpD,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAE1B,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEvB,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AA/CD,8BA+CC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { NestFactory } from '@nestjs/core';\nimport { findAvailablePort } from '@subql/common';\nimport { getLogger, NestLogger } from '@subql/node-core';\nimport { AppModule } from './app.module';\nimport { FetchService } from './indexer/fetch.service';\nimport { ProjectService } from './indexer/project.service';\nimport { yargsOptions } from './yargs';\nconst pjson = require('../package.json');\n\nconst { argv } = yargsOptions;\n\nconst DEFAULT_PORT = 3000;\nconst logger = getLogger('subql-node');\n\nexport async function bootstrap(): Promise<void> {\n  logger.info(`Current ${pjson.name} version is ${pjson.version}`);\n  const debug = argv.debug;\n\n  const validate = (x: any) => {\n    const p = parseInt(x);\n    return isNaN(p) ? null : p;\n  };\n\n  const port = validate(argv.port) ?? (await findAvailablePort(DEFAULT_PORT));\n  if (!port) {\n    logger.error(\n      `Unable to find available port (tried ports in range (${port}..${\n        port + 10\n      })). Try setting a free port manually by setting the --port flag`,\n    );\n    process.exit(1);\n  }\n\n  if (argv.unsafe) {\n    logger.warn(\n      'UNSAFE MODE IS ENABLED. This is not recommended for most projects and will not be supported by our hosted service',\n    );\n  }\n\n  try {\n    const app = await NestFactory.create(AppModule, {\n      logger: debug ? new NestLogger() : false,\n    });\n    await app.init();\n\n    const projectService: ProjectService = app.get('IProjectService');\n    const fetchService = app.get(FetchService);\n\n    // Initialise async services, we do this here rather than in factories, so we can capture one off eventss\n    await projectService.init();\n    await fetchService.init(projectService.startHeight);\n\n    app.enableShutdownHooks();\n\n    await app.listen(port);\n\n    logger.info(`Node started on port: ${port}`);\n  } catch (e) {\n    logger.error(e, 'Node failed to start');\n    process.exit(1);\n  }\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAEnC,uCAA2C;AAC3C,0CAAiE;AACjE,gDAAyD;AACzD,6CAAyC;AACzC,2DAAuD;AAEvD,mCAAuC;AACvC,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEzC,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;AAE9B,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,YAAY,CAAC,CAAC;AAEvC,IAAA,sBAAa,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEtB,KAAK,UAAU,SAAS;;IAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,IAAI,eAAe,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAEzB,MAAM,QAAQ,GAAG,CAAC,CAAM,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,CAAC,MAAM,IAAA,0BAAiB,EAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,CAAC,KAAK,CACV,wDAAwD,IAAI,KAC1D,IAAI,GAAG,EACT,iEAAiE,CAClE,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,MAAM,CAAC,IAAI,CACT,mHAAmH,CACpH,CAAC;KACH;IAED,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,EAAE;YAC9C,MAAM,EAAE,IAAI,sBAAU,CAAC,KAAK,CAAC;SAC9B,CAAC,CAAC;QAEH,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,MAAM,cAAc,GAAmB,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC;QAE3C,yGAAyG;QACzG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEpD,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAE1B,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEvB,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAhDD,8BAgDC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { NestFactory } from '@nestjs/core';\nimport { findAvailablePort, notifyUpdates } from '@subql/common';\nimport { getLogger, NestLogger } from '@subql/node-core';\nimport { AppModule } from './app.module';\nimport { FetchService } from './indexer/fetch.service';\nimport { ProjectService } from './indexer/project.service';\nimport { yargsOptions } from './yargs';\nconst pjson = require('../package.json');\n\nconst { argv } = yargsOptions;\n\nconst DEFAULT_PORT = 3000;\nconst logger = getLogger('subql-node');\n\nnotifyUpdates(pjson, logger);\n\nexport async function bootstrap(): Promise<void> {\n  logger.info(`Current ${pjson.name} version is ${pjson.version}`);\n  const debug = argv.debug;\n\n  const validate = (x: any) => {\n    const p = parseInt(x);\n    return isNaN(p) ? null : p;\n  };\n\n  const port = validate(argv.port) ?? (await findAvailablePort(DEFAULT_PORT));\n  if (!port) {\n    logger.error(\n      `Unable to find available port (tried ports in range (${port}..${\n        port + 10\n      })). Try setting a free port manually by setting the --port flag`,\n    );\n    process.exit(1);\n  }\n\n  if (argv.unsafe) {\n    logger.warn(\n      'UNSAFE MODE IS ENABLED. This is not recommended for most projects and will not be supported by our hosted service',\n    );\n  }\n\n  try {\n    const app = await NestFactory.create(AppModule, {\n      logger: new NestLogger(debug),\n    });\n\n    await app.init();\n\n    const projectService: ProjectService = app.get('IProjectService');\n    const fetchService = app.get(FetchService);\n\n    // Initialise async services, we do this here rather than in factories, so we can capture one off eventss\n    await projectService.init();\n    await fetchService.init(projectService.startHeight);\n\n    app.enableShutdownHooks();\n\n    await app.listen(port);\n\n    logger.info(`Node started on port: ${port}`);\n  } catch (e) {\n    logger.error(e, 'Node failed to start');\n    process.exit(1);\n  }\n}\n"]}

package/dist/main.js

@@ -10,13 +10,10 @@ BigInt.prototype.toJSON = function () {
 };
 // initLogger is imported from true path, to make sure getLogger (or other logger values that relies on logger) isn't initialised
 (0, logger_1.initLogger)(argv.debug, argv.outputFmt, argv.logLevel);
-// Lazy import, to allow logger to be initialised before bootstrap()
-// As bootstrap runs services that requires logger
-const { bootstrap } = require('./init');
-if (!(argv._[0] === 'test' ||
-    argv._[0] === 'mmr-migrate' ||
-    argv._[0] === 'mmr-regen' ||
-    argv._[0] === 'force-clean')) {
+if (!argv._[0]) {
+    // Lazy import, to allow logger to be initialised before bootstrap()
+    // As bootstrap runs services that requires logger
+    const { bootstrap } = require('./init');
     void bootstrap();
 }
 //# sourceMappingURL=main.js.map

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,oDAAqD;AACrD,mCAAuC;AAEvC,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;AAE7B,MAAM,CAAC,SAAiB,CAAC,MAAM,GAAG;IACjC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC,CAAC;AAEF,iIAAiI;AACjI,IAAA,mBAAU,EACR,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,SAA+B,EACpC,IAAI,CAAC,QAA8B,CACpC,CAAC;AAEF,oEAAoE;AACpE,kDAAkD;AAClD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACxC,IACE,CAAC,CACC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM;IACpB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa;IAC3B,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW;IACzB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,CAC5B,EACD;IACA,KAAK,SAAS,EAAE,CAAC;CAClB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { initLogger } from '@subql/node-core/logger';\nimport { yargsOptions } from './yargs';\n\nconst { argv } = yargsOptions;\n\n(BigInt.prototype as any).toJSON = function () {\n  return this.toString();\n};\n\n// initLogger is imported from true path, to make sure getLogger (or other logger values that relies on logger) isn't initialised\ninitLogger(\n  argv.debug,\n  argv.outputFmt as 'json' | 'colored',\n  argv.logLevel as string | undefined,\n);\n\n// Lazy import, to allow logger to be initialised before bootstrap()\n// As bootstrap runs services that requires logger\nconst { bootstrap } = require('./init');\nif (\n  !(\n    argv._[0] === 'test' ||\n    argv._[0] === 'mmr-migrate' ||\n    argv._[0] === 'mmr-regen' ||\n    argv._[0] === 'force-clean'\n  )\n) {\n  void bootstrap();\n}\n"]}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,oDAAqD;AACrD,mCAAuC;AAEvC,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;AAE7B,MAAM,CAAC,SAAiB,CAAC,MAAM,GAAG;IACjC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC,CAAC;AAEF,iIAAiI;AACjI,IAAA,mBAAU,EACR,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,SAA+B,EACpC,IAAI,CAAC,QAA8B,CACpC,CAAC;AAEF,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;IACd,oEAAoE;IACpE,kDAAkD;IAClD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,KAAK,SAAS,EAAE,CAAC;CAClB","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { initLogger } from '@subql/node-core/logger';\nimport { yargsOptions } from './yargs';\n\nconst { argv } = yargsOptions;\n\n(BigInt.prototype as any).toJSON = function () {\n  return this.toString();\n};\n\n// initLogger is imported from true path, to make sure getLogger (or other logger values that relies on logger) isn't initialised\ninitLogger(\n  argv.debug,\n  argv.outputFmt as 'json' | 'colored',\n  argv.logLevel as string | undefined,\n);\n\nif (!argv._[0]) {\n  // Lazy import, to allow logger to be initialised before bootstrap()\n  // As bootstrap runs services that requires logger\n  const { bootstrap } = require('./init');\n  void bootstrap();\n}\n"]}

package/dist/stellar/api.connection.d.ts

@@ -5,7 +5,7 @@ import { StellarApi } from './api.stellar';
 import SafeStellarProvider from './safe-api';
 import { SorobanServer } from './soroban.server';
 type FetchFunc = (api: StellarApi, batch: number[]) => Promise<StellarBlockWrapper[]>;
-export declare class StellarApiConnection implements IApiConnectionSpecific<StellarApi, SafeStellarProvider, StellarBlockWrapper> {
+export declare class StellarApiConnection implements IApiConnectionSpecific<StellarApi, SafeStellarProvider, StellarBlockWrapper[]> {
     unsafeApi: StellarApi;
     private fetchBlocksBatches;
     readonly networkMeta: NetworkMetadataPayload;

package/dist/stellar/api.connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.connection.js","sourceRoot":"","sources":["../../src/stellar/api.connection.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;AAGnC,gDAS0B;AAE1B,+CAA2C;AAC3C,0DAA6C;AAQ7C,MAAa,oBAAoB;IAU/B,YACS,SAAqB,EACpB,kBAA6B;QAD9B,cAAS,GAAT,SAAS,CAAY;QACpB,uBAAkB,GAAlB,kBAAkB,CAAW;QAwCvC,gBAAW,GAAG,oBAAoB,CAAC,WAAW,CAAC;QAtC7C,IAAI,CAAC,WAAW,GAAG;YACjB,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE;YAC7B,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE;YACjC,WAAW,EAAE,SAAS,CAAC,cAAc,EAAE;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAgB,EAChB,iBAA4B,EAC5B,YAA2B,EAC3B,OAAuB;QAEvB,MAAM,GAAG,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,0BAA0B;QAC1B,OAAO,IAAI,kBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC;IAChB,CAAC;IAID,MAAM,CAAC,WAAW,CAAC,CAAQ;QACzB,IAAI,eAAmC,CAAC;QACxC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACjC,eAAe,GAAG,IAAI,wBAAY,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YACrD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM,IACL,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACzC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EACvC;YACA,eAAe,GAAG,IAAI,0BAAc,CAAC,CAAC,CAAC,CAAC;SACzC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;YACtD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM;YACL,eAAe,GAAG,IAAI,8BAAkB,CACtC,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,OAAO,CACrB,CAAC;SACH;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;CACF;AA5ED,oDA4EC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiConnectionError,\n  ApiErrorType,\n  IApiConnectionSpecific,\n  NetworkMetadataPayload,\n  TimeoutError,\n  RateLimitError,\n  DisconnectionError,\n  LargeResponseError,\n} from '@subql/node-core';\nimport { StellarBlockWrapper } from '@subql/types-stellar';\nimport { StellarApi } from './api.stellar';\nimport SafeStellarProvider from './safe-api';\nimport { SorobanServer } from './soroban.server';\n\ntype FetchFunc = (\n  api: StellarApi,\n  batch: number[],\n) => Promise<StellarBlockWrapper[]>;\n\nexport class StellarApiConnection\n  implements\n    IApiConnectionSpecific<\n      StellarApi,\n      SafeStellarProvider,\n      StellarBlockWrapper\n    >\n{\n  readonly networkMeta: NetworkMetadataPayload;\n\n  constructor(\n    public unsafeApi: StellarApi,\n    private fetchBlocksBatches: FetchFunc,\n  ) {\n    this.networkMeta = {\n      chain: unsafeApi.getChainId(),\n      specName: unsafeApi.getSpecName(),\n      genesisHash: unsafeApi.getGenesisHash(),\n    };\n  }\n\n  static async create(\n    endpoint: string,\n    fetchBlockBatches: FetchFunc,\n    eventEmitter: EventEmitter2,\n    soroban?: SorobanServer,\n  ): Promise<StellarApiConnection> {\n    const api = new StellarApi(endpoint, eventEmitter, soroban);\n\n    await api.init();\n\n    return new StellarApiConnection(api, fetchBlockBatches);\n  }\n\n  safeApi(height: number): SafeStellarProvider {\n    //safe api not implemented\n    return new SafeStellarProvider(null, height);\n  }\n\n  async apiConnect(): Promise<void> {\n    await this.unsafeApi.connect();\n  }\n\n  async apiDisconnect(): Promise<void> {\n    await this.unsafeApi.disconnect();\n  }\n\n  async fetchBlocks(heights: number[]): Promise<StellarBlockWrapper[]> {\n    const blocks = await this.fetchBlocksBatches(this.unsafeApi, heights);\n    return blocks;\n  }\n\n  handleError = StellarApiConnection.handleError;\n\n  static handleError(e: Error): ApiConnectionError {\n    let formatted_error: ApiConnectionError;\n    if (e.message.includes(`Timeout`)) {\n      formatted_error = new TimeoutError(e);\n    } else if (e.message.startsWith(`disconnected from `)) {\n      formatted_error = new DisconnectionError(e);\n    } else if (\n      e.message.includes(`Rate Limit Exceeded`) ||\n      e.message.includes('Too Many Requests')\n    ) {\n      formatted_error = new RateLimitError(e);\n    } else if (e.message.includes(`limit must not exceed`)) {\n      formatted_error = new LargeResponseError(e);\n    } else {\n      formatted_error = new ApiConnectionError(\n        e.name,\n        e.message,\n        ApiErrorType.Default,\n      );\n    }\n    return formatted_error;\n  }\n}\n"]}
+{"version":3,"file":"api.connection.js","sourceRoot":"","sources":["../../src/stellar/api.connection.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;AAGnC,gDAS0B;AAE1B,+CAA2C;AAC3C,0DAA6C;AAQ7C,MAAa,oBAAoB;IAU/B,YACS,SAAqB,EACpB,kBAA6B;QAD9B,cAAS,GAAT,SAAS,CAAY;QACpB,uBAAkB,GAAlB,kBAAkB,CAAW;QAwCvC,gBAAW,GAAG,oBAAoB,CAAC,WAAW,CAAC;QAtC7C,IAAI,CAAC,WAAW,GAAG;YACjB,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE;YAC7B,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE;YACjC,WAAW,EAAE,SAAS,CAAC,cAAc,EAAE;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAgB,EAChB,iBAA4B,EAC5B,YAA2B,EAC3B,OAAuB;QAEvB,MAAM,GAAG,GAAG,IAAI,wBAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,0BAA0B;QAC1B,OAAO,IAAI,kBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAiB;QACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC;IAChB,CAAC;IAID,MAAM,CAAC,WAAW,CAAC,CAAQ;QACzB,IAAI,eAAmC,CAAC;QACxC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACjC,eAAe,GAAG,IAAI,wBAAY,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YACrD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM,IACL,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YACzC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EACvC;YACA,eAAe,GAAG,IAAI,0BAAc,CAAC,CAAC,CAAC,CAAC;SACzC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;YACtD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM;YACL,eAAe,GAAG,IAAI,8BAAkB,CACtC,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,OAAO,CACrB,CAAC;SACH;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;CACF;AA5ED,oDA4EC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiConnectionError,\n  ApiErrorType,\n  IApiConnectionSpecific,\n  NetworkMetadataPayload,\n  TimeoutError,\n  RateLimitError,\n  DisconnectionError,\n  LargeResponseError,\n} from '@subql/node-core';\nimport { StellarBlockWrapper } from '@subql/types-stellar';\nimport { StellarApi } from './api.stellar';\nimport SafeStellarProvider from './safe-api';\nimport { SorobanServer } from './soroban.server';\n\ntype FetchFunc = (\n  api: StellarApi,\n  batch: number[],\n) => Promise<StellarBlockWrapper[]>;\n\nexport class StellarApiConnection\n  implements\n    IApiConnectionSpecific<\n      StellarApi,\n      SafeStellarProvider,\n      StellarBlockWrapper[]\n    >\n{\n  readonly networkMeta: NetworkMetadataPayload;\n\n  constructor(\n    public unsafeApi: StellarApi,\n    private fetchBlocksBatches: FetchFunc,\n  ) {\n    this.networkMeta = {\n      chain: unsafeApi.getChainId(),\n      specName: unsafeApi.getSpecName(),\n      genesisHash: unsafeApi.getGenesisHash(),\n    };\n  }\n\n  static async create(\n    endpoint: string,\n    fetchBlockBatches: FetchFunc,\n    eventEmitter: EventEmitter2,\n    soroban?: SorobanServer,\n  ): Promise<StellarApiConnection> {\n    const api = new StellarApi(endpoint, eventEmitter, soroban);\n\n    await api.init();\n\n    return new StellarApiConnection(api, fetchBlockBatches);\n  }\n\n  safeApi(height: number): SafeStellarProvider {\n    //safe api not implemented\n    return new SafeStellarProvider(null, height);\n  }\n\n  async apiConnect(): Promise<void> {\n    await this.unsafeApi.connect();\n  }\n\n  async apiDisconnect(): Promise<void> {\n    await this.unsafeApi.disconnect();\n  }\n\n  async fetchBlocks(heights: number[]): Promise<StellarBlockWrapper[]> {\n    const blocks = await this.fetchBlocksBatches(this.unsafeApi, heights);\n    return blocks;\n  }\n\n  handleError = StellarApiConnection.handleError;\n\n  static handleError(e: Error): ApiConnectionError {\n    let formatted_error: ApiConnectionError;\n    if (e.message.includes(`Timeout`)) {\n      formatted_error = new TimeoutError(e);\n    } else if (e.message.startsWith(`disconnected from `)) {\n      formatted_error = new DisconnectionError(e);\n    } else if (\n      e.message.includes(`Rate Limit Exceeded`) ||\n      e.message.includes('Too Many Requests')\n    ) {\n      formatted_error = new RateLimitError(e);\n    } else if (e.message.includes(`limit must not exceed`)) {\n      formatted_error = new LargeResponseError(e);\n    } else {\n      formatted_error = new ApiConnectionError(\n        e.name,\n        e.message,\n        ApiErrorType.Default,\n      );\n    }\n    return formatted_error;\n  }\n}\n"]}

package/dist/stellar/api.service.stellar.d.ts

@@ -1,17 +1,15 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ApiService, ConnectionPoolService, NetworkMetadataPayload } from '@subql/node-core';
+import { ApiService, ConnectionPoolService, ProjectUpgradeSevice } from '@subql/node-core';
 import { StellarBlockWrapper } from '@subql/types-stellar';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { StellarApiConnection } from './api.connection';
 import { StellarApi } from './api.stellar';
 import SafeStellarProvider from './safe-api';
-export declare class StellarApiService extends ApiService<StellarApi, SafeStellarProvider, StellarBlockWrapper> {
+export declare class StellarApiService extends ApiService<StellarApi, SafeStellarProvider, StellarBlockWrapper[]> {
     private project;
-    private eventEmitter;
-    constructor(project: SubqueryProject, connectionPoolService: ConnectionPoolService<StellarApiConnection>, eventEmitter: EventEmitter2);
-    networkMeta: NetworkMetadataPayload;
+    private projectUpgradeService;
+    constructor(project: SubqueryProject, projectUpgradeService: ProjectUpgradeSevice, connectionPoolService: ConnectionPoolService<StellarApiConnection>, eventEmitter: EventEmitter2);
     init(): Promise<StellarApiService>;
-    private metadataMismatchError;
     get api(): StellarApi;
     safeApi(height: number): SafeStellarProvider;
     private fetchBlockBatches;