@subql/node-ethereum 0.4.1-13 → 0.4.1-15

package/dist/ethereum/ethers/json-rpc-batch-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-rpc-batch-provider.js","sourceRoot":"","sources":["../../../src/ethereum/ethers/json-rpc-batch-provider.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable */\nimport { deepCopy } from '@ethersproject/properties';\nimport { fetchJson } from '@ethersproject/web';\n\nimport { JsonRpcProvider } from '@ethersproject/providers';\nimport { Networkish } from '@ethersproject/networks';\nimport { ConnectionInfo } from './web';\n\ninterface RpcResult {\n  jsonrpc: '2.0';\n  id: number;\n  result?: string;\n  error?: {\n    code: number;\n    message: string;\n    data?: any;\n  };\n}\n\n// Experimental\n\nexport class JsonRpcBatchProvider extends JsonRpcProvider {\n  _pendingBatchAggregator: NodeJS.Timer;\n  _pendingBatch: Array<{\n    request: { method: string; params: Array<any>; id: number; jsonrpc: '2.0' };\n    resolve: (result: any) => void;\n    reject: (error: Error) => void;\n  }>;\n\n  constructor(url: string | ConnectionInfo, network?: Networkish) {\n    super(url, network);\n  }\n\n  send(method: string, params: Array<any>): Promise<any> {\n    const request = {\n      method: method,\n      params: params,\n      id: this._nextId++,\n      jsonrpc: '2.0',\n    };\n\n    if (this._pendingBatch == null) {\n      this._pendingBatch = [];\n    }\n\n    const inflightRequest: any = { request, resolve: null, reject: null };\n\n    const promise = new Promise((resolve, reject) => {\n      inflightRequest.resolve = resolve;\n      inflightRequest.reject = reject;\n    });\n\n    this._pendingBatch.push(inflightRequest);\n\n    if (!this._pendingBatchAggregator) {\n      // Schedule batch for next event loop + short duration\n      this._pendingBatchAggregator = setTimeout(() => {\n        this.runRequests();\n      }, 1);\n    }\n\n    if (this._pendingBatch.length > 20) {\n      this.flush();\n    }\n\n    return promise;\n  }\n\n  flush(): void {\n    if (this._pendingBatchAggregator) {\n      clearTimeout(this._pendingBatchAggregator);\n      this.runRequests();\n    }\n  }\n\n  private runRequests() {\n    // Get teh current batch and clear it, so new requests\n    // go into the next batch\n    const batch = this._pendingBatch;\n    this._pendingBatch = null;\n    this._pendingBatchAggregator = null;\n\n    // Get the request as an array of requests\n    const request = batch.map((inflight) => inflight.request);\n\n    this.emit('debug', {\n      action: 'requestBatch',\n      request: deepCopy(request),\n      provider: this,\n    });\n\n    return fetchJson(this.connection, JSON.stringify(request)).then(\n      (result: RpcResult[]) => {\n        this.emit('debug', {\n          action: 'response',\n          request: request,\n          response: result,\n          provider: this,\n        });\n\n        // if (!Array.isArray(result)) {\n        //   result = [result];\n        // }\n\n        // https://github.com/ethers-io/ethers.js/pull/2657\n        const resultMap = result.reduce((resultMap, payload) => {\n          resultMap[payload.id] = payload;\n          return resultMap;\n        }, {} as Record<number, RpcResult>);\n\n        // For each result, feed it to the correct Promise, depending\n        // on whether it was a success or error\n        batch.forEach((inflightRequest) => {\n          const payload = resultMap[inflightRequest.request.id];\n          if (payload.error) {\n            const error = new Error(payload.error.message);\n            (<any>error).code = payload.error.code;\n            (<any>error).data = payload.error.data;\n            inflightRequest.reject(error);\n          } else {\n            inflightRequest.resolve(payload.result);\n          }\n        });\n      } /*).catch(*/,\n      (error) => {\n        this.emit('debug', {\n          action: 'response',\n          error: error,\n          request: request,\n          provider: this,\n        });\n\n        batch.forEach((inflightRequest) => {\n          inflightRequest.reject(error);\n        });\n      },\n    );\n  }\n}\n"]}
+{"version":3,"file":"json-rpc-batch-provider.js","sourceRoot":"","sources":["../../../src/ethereum/ethers/json-rpc-batch-provider.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable */\nimport { deepCopy } from '@ethersproject/properties';\nimport { fetchJson } from '@ethersproject/web';\n\nimport { JsonRpcProvider } from '@ethersproject/providers';\nimport { Networkish } from '@ethersproject/networks';\nimport { ConnectionInfo } from './web';\nimport { getLogger } from '@subql/node-core';\n\nconst logger = getLogger('JsonRpcBatchProvider');\n\ninterface RpcResult {\n  jsonrpc: '2.0';\n  id: number;\n  result?: string;\n  error?: {\n    code: number;\n    message: string;\n    data?: any;\n  };\n}\n\n// Experimental\n\nexport class JsonRpcBatchProvider extends JsonRpcProvider {\n  _pendingBatchAggregator: NodeJS.Timer;\n  _pendingBatch: Array<{\n    request: { method: string; params: Array<any>; id: number; jsonrpc: '2.0' };\n    resolve: (result: any) => void;\n    reject: (error: Error) => void;\n  }>;\n\n  constructor(url: string | ConnectionInfo, network?: Networkish) {\n    super(url, network);\n  }\n\n  send(method: string, params: Array<any>): Promise<any> {\n    const request = {\n      method: method,\n      params: params,\n      id: this._nextId++,\n      jsonrpc: '2.0',\n    };\n\n    if (this._pendingBatch == null) {\n      this._pendingBatch = [];\n    }\n\n    const inflightRequest: any = { request, resolve: null, reject: null };\n\n    const promise = new Promise((resolve, reject) => {\n      inflightRequest.resolve = resolve;\n      inflightRequest.reject = reject;\n    });\n\n    this._pendingBatch.push(inflightRequest);\n\n    if (!this._pendingBatchAggregator) {\n      // Schedule batch for next event loop + short duration\n      this._pendingBatchAggregator = setTimeout(() => {\n        this.runRequests();\n      }, 1);\n    }\n\n    if (this._pendingBatch.length > 10) {\n      this.flush();\n    }\n\n    return promise;\n  }\n\n  flush(): void {\n    if (this._pendingBatchAggregator) {\n      clearTimeout(this._pendingBatchAggregator);\n      this.runRequests();\n    }\n  }\n\n  private runRequests() {\n    // Get teh current batch and clear it, so new requests\n    // go into the next batch\n    const batch = this._pendingBatch;\n    this._pendingBatch = null;\n    this._pendingBatchAggregator = null;\n\n    // Get the request as an array of requests\n    const request = batch.map((inflight) => inflight.request);\n\n    this.emit('debug', {\n      action: 'requestBatch',\n      request: deepCopy(request),\n      provider: this,\n    });\n\n    return fetchJson(this.connection, JSON.stringify(request))\n      .then((result: RpcResult[]) => {\n        this.emit('debug', {\n          action: 'response',\n          request: request,\n          response: result,\n          provider: this,\n        });\n\n        // if (!Array.isArray(result)) {\n        //   result = [result];\n        // }\n\n        // https://github.com/ethers-io/ethers.js/pull/2657\n        const resultMap = result.reduce((resultMap, payload) => {\n          resultMap[payload.id] = payload;\n          return resultMap;\n        }, {} as Record<number, RpcResult>);\n\n        // For each result, feed it to the correct Promise, depending\n        // on whether it was a success or error\n        batch.forEach((inflightRequest) => {\n          const payload = resultMap[inflightRequest.request.id];\n          if (payload.error) {\n            const error = new Error(payload.error.message);\n            (<any>error).code = payload.error.code;\n            (<any>error).data = payload.error.data;\n            inflightRequest.reject(error);\n          } else {\n            inflightRequest.resolve(payload.result);\n          }\n        });\n      })\n      .catch((error) => {\n        this.emit('debug', {\n          action: 'response',\n          error: error,\n          request: request,\n          provider: this,\n        });\n\n        logger.error(error);\n\n        batch.forEach((inflightRequest) => {\n          inflightRequest.reject(error);\n        });\n      });\n  }\n}\n"]}

package/dist/ethereum/ethers/web/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import http from 'http';
 import https from 'https';
 export declare type ConnectionInfo = {

package/dist/ethereum/ethers/web/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import http from 'http';
 import https from 'https';
 export declare type GetUrlResponse = {

package/dist/ethereum/utils.ethereum.js

@@ -41,8 +41,8 @@ function formatLog(log, block) {
             var _a;
             return (_a = block.transactions) === null || _a === void 0 ? void 0 : _a.find((tx) => tx.hash === log.transactionHash);
         },
-        toJson() {
-            return JSON.stringify((0, lodash_1.omit)(this, ['transaction', 'block']));
+        toJSON() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['transaction', 'block', 'toJSON']));
         } });
 }
 exports.formatLog = formatLog;
@@ -52,13 +52,15 @@ function formatTransaction(tx) {
             : undefined, maxPriorityFeePerGas: tx.maxPriorityFeePerGas
             ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()
             : undefined, receipt: undefined, // Filled in at AvalancheApi.fetchBlocks
-        toJson() {
-            return JSON.stringify((0, lodash_1.omit)(this, ['logs']));
+        toJSON() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['block', 'receipt', 'toJSON']));
         } });
 }
 exports.formatTransaction = formatTransaction;
 function formatReceipt(receipt, block) {
-    return Object.assign(Object.assign({}, receipt), { from: handleAddress(receipt.from), to: handleAddress(receipt.to), blockNumber: handleNumber(receipt.blockNumber).toNumber(), cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(), effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(), gasUsed: handleNumber(receipt.gasUsed).toBigInt(), logs: receipt.logs.map(formatLog), status: Boolean(handleNumber(receipt.status).toNumber()), transactionIndex: handleNumber(receipt.transactionIndex).toNumber() });
+    return Object.assign(Object.assign({}, receipt), { from: handleAddress(receipt.from), to: handleAddress(receipt.to), blockNumber: handleNumber(receipt.blockNumber).toNumber(), cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(), effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(), gasUsed: handleNumber(receipt.gasUsed).toBigInt(), logs: receipt.logs.map(formatLog), status: Boolean(handleNumber(receipt.status).toNumber()), transactionIndex: handleNumber(receipt.transactionIndex).toNumber(), toJSON() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['toJSON']));
+        } });
 }
 exports.formatReceipt = formatReceipt;
 //# sourceMappingURL=utils.ethereum.js.map

package/dist/ethereum/utils.ethereum.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/utils.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { getAddress } from '@ethersproject/address';\nimport { BigNumber } from '@ethersproject/bignumber';\nimport { Zero } from '@ethersproject/constants';\nimport {\n  ApiWrapper,\n  EthereumBlock,\n  EthereumLog,\n  EthereumReceipt,\n  EthereumResult,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\nimport { omit } from 'lodash';\n\nexport function calcInterval(api: ApiWrapper): number {\n  // TODO find a way to get this from the blockchain\n  return 6000;\n}\n\nfunction handleAddress(value: string): string | null {\n  if (!value || value === '0x') {\n    return null;\n  }\n  return getAddress(value);\n}\n\nfunction handleNumber(value: string | number): BigNumber {\n  if (value === undefined) {\n    return Zero;\n  }\n  if (value === '0x') {\n    return Zero;\n  }\n  return BigNumber.from(value);\n}\n\nexport function formatBlock(block: Record<string, any>): EthereumBlock {\n  return {\n    ...block,\n    difficulty: handleNumber(block.difficulty).toBigInt(),\n    gasLimit: handleNumber(block.gasLimit).toBigInt(),\n    gasUsed: handleNumber(block.gasUsed).toBigInt(),\n    number: handleNumber(block.number).toNumber(),\n    size: handleNumber(block.size).toBigInt(),\n    timestamp: handleNumber(block.timestamp).toBigInt(),\n    totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n    baseFeePerGas: block.baseFeePerGas\n      ? handleNumber(block.baseFeePerGas).toBigInt()\n      : undefined,\n    blockGasCost: block.blockGasCost\n      ? handleNumber(block.blockGasCost).toBigInt()\n      : undefined,\n    logs: [], // Filled in at AvalancheBlockWrapped constructor\n  } as EthereumBlock;\n}\nexport function formatLog(\n  log: Omit<\n    EthereumLog<EthereumResult> | EthereumLog,\n    'blockTimestamp' | 'block' | 'transaction'\n  >,\n  block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n  return {\n    ...log,\n    address: handleAddress(log.address),\n    blockNumber: handleNumber(log.blockNumber).toNumber(),\n    transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n    logIndex: handleNumber(log.logIndex).toNumber(),\n    block,\n    get transaction() {\n      return block.transactions?.find((tx) => tx.hash === log.transactionHash);\n    },\n\n    toJson() {\n      return JSON.stringify(omit(this, ['transaction', 'block']));\n    },\n  } as EthereumLog<EthereumResult>;\n}\n\nexport function formatTransaction(\n  tx: Record<string, any>,\n): EthereumTransaction {\n  return {\n    ...(tx as Partial<EthereumTransaction>),\n    from: handleAddress(tx.from),\n    to: handleAddress(tx.to),\n    blockNumber: handleNumber(tx.blockNumber).toNumber(),\n    gas: handleNumber(tx.gas).toBigInt(),\n    gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n    nonce: handleNumber(tx.nonce).toBigInt(),\n    transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n    value: handleNumber(tx.value).toBigInt(),\n    v: handleNumber(tx.v).toBigInt(),\n    maxFeePerGas: tx.maxFeePerGas\n      ? handleNumber(tx.maxFeePerGas).toBigInt()\n      : undefined,\n    maxPriorityFeePerGas: tx.maxPriorityFeePerGas\n      ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()\n      : undefined,\n    receipt: undefined, // Filled in at AvalancheApi.fetchBlocks\n    toJson() {\n      return JSON.stringify(omit(this, ['logs']));\n    },\n  } as EthereumTransaction;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n  block: EthereumBlock,\n): EthereumReceipt {\n  return {\n    ...receipt,\n    from: handleAddress(receipt.from),\n    to: handleAddress(receipt.to),\n    blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n    cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n    effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n    gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n    logs: receipt.logs.map(formatLog),\n    status: Boolean(handleNumber(receipt.status).toNumber()),\n    transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n  } as EthereumReceipt;\n}\n"]}
+{"version":3,"file":"utils.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/utils.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { getAddress } from '@ethersproject/address';\nimport { BigNumber } from '@ethersproject/bignumber';\nimport { Zero } from '@ethersproject/constants';\nimport {\n  ApiWrapper,\n  EthereumBlock,\n  EthereumLog,\n  EthereumReceipt,\n  EthereumResult,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\nimport { omit } from 'lodash';\n\nexport function calcInterval(api: ApiWrapper): number {\n  // TODO find a way to get this from the blockchain\n  return 6000;\n}\n\nfunction handleAddress(value: string): string | null {\n  if (!value || value === '0x') {\n    return null;\n  }\n  return getAddress(value);\n}\n\nfunction handleNumber(value: string | number): BigNumber {\n  if (value === undefined) {\n    return Zero;\n  }\n  if (value === '0x') {\n    return Zero;\n  }\n  return BigNumber.from(value);\n}\n\nexport function formatBlock(block: Record<string, any>): EthereumBlock {\n  return {\n    ...block,\n    difficulty: handleNumber(block.difficulty).toBigInt(),\n    gasLimit: handleNumber(block.gasLimit).toBigInt(),\n    gasUsed: handleNumber(block.gasUsed).toBigInt(),\n    number: handleNumber(block.number).toNumber(),\n    size: handleNumber(block.size).toBigInt(),\n    timestamp: handleNumber(block.timestamp).toBigInt(),\n    totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n    baseFeePerGas: block.baseFeePerGas\n      ? handleNumber(block.baseFeePerGas).toBigInt()\n      : undefined,\n    blockGasCost: block.blockGasCost\n      ? handleNumber(block.blockGasCost).toBigInt()\n      : undefined,\n    logs: [], // Filled in at AvalancheBlockWrapped constructor\n  } as EthereumBlock;\n}\nexport function formatLog(\n  log: Omit<\n    EthereumLog<EthereumResult> | EthereumLog,\n    'blockTimestamp' | 'block' | 'transaction'\n  >,\n  block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n  return {\n    ...log,\n    address: handleAddress(log.address),\n    blockNumber: handleNumber(log.blockNumber).toNumber(),\n    transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n    logIndex: handleNumber(log.logIndex).toNumber(),\n    block,\n    get transaction() {\n      return block.transactions?.find((tx) => tx.hash === log.transactionHash);\n    },\n\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['transaction', 'block', 'toJSON']));\n    },\n  } as EthereumLog<EthereumResult>;\n}\n\nexport function formatTransaction(\n  tx: Record<string, any>,\n): EthereumTransaction {\n  return {\n    ...(tx as Partial<EthereumTransaction>),\n    from: handleAddress(tx.from),\n    to: handleAddress(tx.to),\n    blockNumber: handleNumber(tx.blockNumber).toNumber(),\n    gas: handleNumber(tx.gas).toBigInt(),\n    gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n    nonce: handleNumber(tx.nonce).toBigInt(),\n    transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n    value: handleNumber(tx.value).toBigInt(),\n    v: handleNumber(tx.v).toBigInt(),\n    maxFeePerGas: tx.maxFeePerGas\n      ? handleNumber(tx.maxFeePerGas).toBigInt()\n      : undefined,\n    maxPriorityFeePerGas: tx.maxPriorityFeePerGas\n      ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()\n      : undefined,\n    receipt: undefined, // Filled in at AvalancheApi.fetchBlocks\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['block', 'receipt', 'toJSON']));\n    },\n  } as EthereumTransaction;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n  block: EthereumBlock,\n): EthereumReceipt {\n  return {\n    ...receipt,\n    from: handleAddress(receipt.from),\n    to: handleAddress(receipt.to),\n    blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n    cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n    effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n    gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n    logs: receipt.logs.map(formatLog),\n    status: Boolean(handleNumber(receipt.status).toNumber()),\n    transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['toJSON']));\n    },\n  } as unknown as EthereumReceipt;\n}\n"]}

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  getLogger,\n  NodeConfig,\n  IndexerEvent,\n  delay,\n  profilerWrap,\n  AutoQueue,\n  Queue,\n} from '@subql/node-core';\nimport { last } from 'lodash';\nimport { EthereumApiService } from '../../ethereum';\nimport { IndexerManager } from '../indexer.manager';\nimport { ProjectService } from '../project.service';\nimport { BaseBlockDispatcher } from './base-block-dispatcher';\n\nconst logger = getLogger('BlockDispatcherService');\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BaseBlockDispatcher<Queue<number>>\n  implements OnApplicationShutdown\n{\n  private processQueue: AutoQueue<void>;\n\n  private fetching = false;\n  private isShutdown = false;\n  private fetchBlocksBatches: EthereumApiService['api']['fetchBlocks'];\n\n  constructor(\n    private apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    projectService: ProjectService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      new Queue(nodeConfig.batchSize * 3),\n    );\n    this.processQueue = new AutoQueue(nodeConfig.batchSize * 3);\n\n    const fetchBlocks = this.apiService.api.fetchBlocks.bind(\n      this.apiService.api,\n    );\n    if (this.nodeConfig.profiler) {\n      this.fetchBlocksBatches = profilerWrap(\n        fetchBlocks,\n        'EthereumUtil',\n        'fetchBlocksBatches',\n      );\n    } else {\n      this.fetchBlocksBatches = fetchBlocks;\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  async init(\n    onDynamicDsCreated: (height: number) => Promise<void>,\n  ): Promise<void> {\n    this.onDynamicDsCreated = onDynamicDsCreated;\n    const blockAmount = await this.projectService.getProcessedBlockCount();\n    this.setProcessedBlockCount(blockAmount ?? 0);\n  }\n\n  onApplicationShutdown(): void {\n    this.isShutdown = true;\n    this.processQueue.abort();\n  }\n\n  enqueueBlocks(cleanedBlocks: number[], latestBufferHeight?: number): void {\n    this.eventEmitter.emit('enqueueBlocks', cleanedBlocks.length);\n    if (cleanedBlocks.length) {\n      this.eventEmitter.emit(\n        'filteringBlocks',\n        cleanedBlocks[cleanedBlocks.length - 1],\n      );\n    }\n    // // In the case where factors of batchSize is equal to bypassBlock or when cleanedBatchBlocks is []\n    // // to ensure block is bypassed, latestBufferHeight needs to be manually set\n    // If cleanedBlocks = []\n    if (!!latestBufferHeight && !cleanedBlocks.length) {\n      this.latestBufferedHeight = latestBufferHeight;\n      return;\n    }\n\n    logger.info(\n      `Enqueueing blocks ${cleanedBlocks[0]}...${last(cleanedBlocks)}, total ${\n        cleanedBlocks.length\n      } blocks`,\n    );\n\n    this.queue.putMany(cleanedBlocks);\n\n    this.latestBufferedHeight = latestBufferHeight ?? last(cleanedBlocks);\n    void this.fetchBlocksFromQueue().catch((e) => {\n      logger.error(e, 'Failed to fetch blocks from queue');\n      if (!this.isShutdown) {\n        process.exit(1);\n      }\n    });\n  }\n\n  flushQueue(height: number): void {\n    super.flushQueue(height);\n    this.processQueue.flush();\n  }\n\n  private async fetchBlocksFromQueue(): Promise<void> {\n    if (this.fetching || this.isShutdown) return;\n    // Process queue is full, no point in fetching more blocks\n    // if (this.processQueue.freeSpace < this.nodeConfig.batchSize) return;\n\n    this.fetching = true;\n\n    try {\n      while (!this.isShutdown) {\n        const blockNums = this.queue.takeMany(\n          Math.min(this.nodeConfig.batchSize, this.processQueue.freeSpace),\n        );\n        // Used to compare before and after as a way to check if queue was flushed\n        const bufferedHeight = this._latestBufferedHeight;\n\n        // Queue is empty\n        if (!blockNums.length) {\n          // The process queue might be full so no block nums were taken, wait and try again\n          if (this.queue.size) {\n            await delay(1);\n            continue;\n          }\n          break;\n        }\n\n        logger.info(\n          `fetch block [${blockNums[0]},${\n            blockNums[blockNums.length - 1]\n          }], total ${blockNums.length} blocks`,\n        );\n\n        const blocks = await this.fetchBlocksBatches(blockNums);\n\n        // Check if the queues have been flushed between queue.takeMany and fetchBlocksBatches resolving\n        // Peeking the queue is because the latestBufferedHeight could have regrown since fetching block\n        if (\n          bufferedHeight > this._latestBufferedHeight ||\n          this.queue.peek() < Math.min(...blockNums)\n        ) {\n          logger.info(`Queue was reset for new DS, discarding fetched blocks`);\n          continue;\n        }\n\n        const blockTasks = blocks.map((block) => async () => {\n          const height = block.blockHeight;\n          try {\n            this.preProcessBlock(height);\n\n            const processBlockResponse = await this.indexerManager.indexBlock(\n              block,\n            );\n\n            await this.postProcessBlock(height, processBlockResponse);\n          } catch (e) {\n            if (this.isShutdown) {\n              return;\n            }\n            logger.error(\n              e,\n              `failed to index block at height ${height} ${\n                e.handler ? `${e.handler}(${e.stack ?? ''})` : ''\n              }`,\n            );\n            throw e;\n          }\n        });\n\n        // There can be enough of a delay after fetching blocks that shutdown could now be true\n        if (this.isShutdown) break;\n\n        this.processQueue.putMany(blockTasks);\n\n        this.eventEmitter.emit(IndexerEvent.BlockQueueSize, {\n          value: this.processQueue.size,\n        });\n      }\n    } finally {\n      this.fetching = false;\n    }\n  }\n}\n"]}
+{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAA2E;AAC3E,yDAAsD;AACtD,gDAU0B;AAE1B,qEAGyC;AACzC,8DAAyD;AACzD,wDAAoD;AAEpD;;GAEG;AAEH,IAAa,sBAAsB,GAAnC,MAAa,sBACX,SAAQ,2BAAqD;IAG7D,YACE,UAAsB,EACtB,UAAsB,EACd,cAA8B,EACtC,YAA2B,EACA,cAA+B,EAC1D,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC;QAElC,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAChD,CAAC;QArBM,mBAAc,GAAd,cAAc,CAAgB;IAsBxC,CAAC;IAES,cAAc,CAAC,KAA2B;QAClD,OAAO,KAAK,CAAC,WAAW,CAAC;IAC3B,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,KAA2B;QAE3B,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AAxCY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAKzB,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCATf,sBAAU;QACV,sBAAU;QACE,gCAAc;QACxB,6BAAa,UAER,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;GAfzB,sBAAsB,CAwClC;AAxCY,wDAAsB","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  SmartBatchService,\n  StoreCacheService,\n  StoreService,\n  IProjectService,\n  PoiService,\n  BlockDispatcher,\n  ProcessBlockResponse,\n  ApiService,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { IndexerManager } from '../indexer.manager';\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs>\n  implements OnApplicationShutdown\n{\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService') projectService: IProjectService,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      apiService.api.fetchBlocks.bind(apiService.api),\n    );\n  }\n\n  protected getBlockHeight(block: EthereumBlockWrapper): number {\n    return block.blockHeight;\n  }\n\n  protected async indexBlock(\n    block: EthereumBlockWrapper,\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(block);\n  }\n}\n"]}

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

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

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

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

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

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

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

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

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

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

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

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