@subql/node-ethereum 3.11.0 → 3.11.1-0

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

@@ -1,28 +1,19 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { SchedulerRegistry } from '@nestjs/schedule';
-import { SubqlEthereumProcessorOptions } from '@subql/common-ethereum';
 import { NodeConfig, BaseFetchService, ApiService } from '@subql/node-core';
-import { DictionaryQueryEntry } from '@subql/types-core';
-import { SubqlDatasource } from '@subql/types-ethereum';
+import { EthereumBlock, SubqlDatasource } from '@subql/types-ethereum';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { EthereumApi } from '../ethereum';
 import { IEthereumBlockDispatcher } from './blockDispatcher';
-import { DictionaryService } from './dictionary.service';
+import { EthDictionaryService } from './dictionary/ethDictionary.service';
 import { DynamicDsService } from './dynamic-ds.service';
 import { ProjectService } from './project.service';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
-type GroupedEthereumProjectDs = SubqlDatasource & {
-    groupedOptions?: SubqlEthereumProcessorOptions[];
-};
-export declare function buildDictionaryQueryEntries(dataSources: GroupedEthereumProjectDs[]): DictionaryQueryEntry[];
-export declare class FetchService extends BaseFetchService<SubqlDatasource, IEthereumBlockDispatcher, DictionaryService> {
+export declare class FetchService extends BaseFetchService<SubqlDatasource, IEthereumBlockDispatcher, EthereumBlock> {
     private apiService;
     private unfinalizedBlocksService;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, projectService: ProjectService, project: SubqueryProject, blockDispatcher: IEthereumBlockDispatcher, dictionaryService: DictionaryService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, projectService: ProjectService, project: SubqueryProject, blockDispatcher: IEthereumBlockDispatcher, dictionaryService: EthDictionaryService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
     get api(): EthereumApi;
-    protected buildDictionaryQueryEntries(dataSources: (SubqlDatasource & {
-        name?: string;
-    })[]): DictionaryQueryEntry[];
     protected getGenesisHash(): string;
     protected getFinalizedHeight(): Promise<number>;
     protected getBestHeight(): Promise<number>;
@@ -31,4 +22,3 @@ export declare class FetchService extends BaseFetchService<SubqlDatasource, IEth
     protected initBlockDispatcher(): Promise<void>;
     protected preLoopHook(): Promise<void>;
 }
-export {};

package/dist/indexer/fetch.service.js

@@ -14,177 +14,20 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FetchService = exports.buildDictionaryQueryEntries = void 0;
+exports.FetchService = void 0;
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const schedule_1 = require("@nestjs/schedule");
 const common_ethereum_1 = require("@subql/common-ethereum");
 const node_core_1 = require("@subql/node-core");
-const lodash_1 = require("lodash");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
 const utils_ethereum_1 = require("../ethereum/utils.ethereum");
-const string_1 = require("../utils/string");
-const yargs_1 = require("../yargs");
-const dictionary_service_1 = require("./dictionary.service");
+const ethDictionary_service_1 = require("./dictionary/ethDictionary.service");
 const dynamic_ds_service_1 = require("./dynamic-ds.service");
 const project_service_1 = require("./project.service");
 const unfinalizedBlocks_service_1 = require("./unfinalizedBlocks.service");
-const logger = (0, node_core_1.getLogger)('fetch.service');
 const BLOCK_TIME_VARIANCE = 5000;
 const INTERVAL_PERCENT = 0.9;
-function appendDsOptions(dsOptions, conditions) {
-    const queryAddressLimit = yargs_1.yargsOptions.argv['query-address-limit'];
-    if (Array.isArray(dsOptions)) {
-        const addresses = dsOptions.map((option) => option.address).filter(Boolean);
-        if (addresses.length > queryAddressLimit) {
-            logger.debug(`Addresses length: ${addresses.length} is exceeding limit: ${queryAddressLimit}. Consider increasing this value with the flag --query-address-limit  `);
-        }
-        if (addresses.length !== 0 && addresses.length <= queryAddressLimit) {
-            conditions.push({
-                field: 'address',
-                value: addresses,
-                matcher: 'in',
-            });
-        }
-    }
-    else {
-        if (dsOptions === null || dsOptions === void 0 ? void 0 : dsOptions.address) {
-            conditions.push({
-                field: 'address',
-                value: dsOptions.address.toLowerCase(),
-                matcher: 'equalTo',
-            });
-        }
-    }
-}
-function eventFilterToQueryEntry(filter, dsOptions) {
-    const conditions = [];
-    appendDsOptions(dsOptions, conditions);
-    if (filter.topics) {
-        for (let i = 0; i < Math.min(filter.topics.length, 4); i++) {
-            const topic = filter.topics[i];
-            if (!topic) {
-                continue;
-            }
-            const field = `topics${i}`;
-            if (topic === '!null') {
-                conditions.push({
-                    field,
-                    value: false,
-                    matcher: 'isNull',
-                });
-            }
-            else {
-                conditions.push({
-                    field,
-                    value: (0, string_1.eventToTopic)(topic),
-                    matcher: 'equalTo',
-                });
-            }
-        }
-    }
-    return {
-        entity: 'evmLogs',
-        conditions,
-    };
-}
-function callFilterToQueryEntry(filter, dsOptions) {
-    const conditions = [];
-    appendDsOptions(dsOptions, conditions);
-    for (const condition of conditions) {
-        if (condition.field === 'address') {
-            condition.field = 'to';
-        }
-    }
-    if (filter.from) {
-        conditions.push({
-            field: 'from',
-            value: filter.from.toLowerCase(),
-            matcher: 'equalTo',
-        });
-    }
-    const optionsAddresses = conditions.find((c) => c.field === 'to');
-    if (!optionsAddresses) {
-        if (filter.to) {
-            conditions.push({
-                field: 'to',
-                value: filter.to.toLowerCase(),
-                matcher: 'equalTo',
-            });
-        }
-        else if (filter.to === null) {
-            conditions.push({
-                field: 'to',
-                value: true,
-                matcher: 'isNull',
-            });
-        }
-    }
-    else if (optionsAddresses && (filter.to || filter.to === null)) {
-        logger.warn(`TransactionFilter 'to' conflict with 'address' in data source options`);
-    }
-    if (filter.function === null || filter.function === '0x') {
-        conditions.push({
-            field: 'func',
-            value: true,
-            matcher: 'isNull',
-        });
-    }
-    else if (filter.function) {
-        conditions.push({
-            field: 'func',
-            value: (0, string_1.functionToSighash)(filter.function),
-            matcher: 'equalTo',
-        });
-    }
-    return {
-        entity: 'evmTransactions',
-        conditions,
-    };
-}
-function buildDictionaryQueryEntries(dataSources) {
-    var _a;
-    const queryEntries = [];
-    for (const ds of dataSources) {
-        for (const handler of ds.mapping.handlers) {
-            // No filters, cant use dictionary
-            if (!handler.filter)
-                return [];
-            switch (handler.kind) {
-                case common_ethereum_1.EthereumHandlerKind.Block:
-                    return [];
-                case common_ethereum_1.EthereumHandlerKind.Call: {
-                    const filter = handler.filter;
-                    if (filter.from !== undefined ||
-                        filter.to !== undefined ||
-                        filter.function !== undefined) {
-                        queryEntries.push(callFilterToQueryEntry(filter, ds.options));
-                    }
-                    else {
-                        return [];
-                    }
-                    break;
-                }
-                case common_ethereum_1.EthereumHandlerKind.Event: {
-                    const filter = handler.filter;
-                    if (ds.groupedOptions) {
-                        queryEntries.push(eventFilterToQueryEntry(filter, ds.groupedOptions));
-                    }
-                    else if (((_a = ds.options) === null || _a === void 0 ? void 0 : _a.address) || filter.topics) {
-                        queryEntries.push(eventFilterToQueryEntry(filter, ds.options));
-                    }
-                    else {
-                        return [];
-                    }
-                    break;
-                }
-                default:
-            }
-        }
-    }
-    return (0, lodash_1.uniqBy)(queryEntries, (item) => `${item.entity}|${JSON.stringify((0, lodash_1.sortBy)(item.conditions, (c) => c.field))}`);
-}
-exports.buildDictionaryQueryEntries = buildDictionaryQueryEntries;
 let FetchService = class FetchService extends node_core_1.BaseFetchService {
     constructor(apiService, nodeConfig, projectService, project, blockDispatcher, dictionaryService, dynamicDsService, unfinalizedBlocksService, eventEmitter, schedulerRegistry) {
         super(nodeConfig, projectService, project.network, blockDispatcher, dictionaryService, dynamicDsService, eventEmitter, schedulerRegistry);
@@ -194,28 +37,12 @@ let FetchService = class FetchService extends node_core_1.BaseFetchService {
     get api() {
         return this.apiService.unsafeApi;
     }
-    buildDictionaryQueryEntries(
-    // Add name to dataousrces as templates have this set
-    dataSources) {
-        const [normalDataSources, templateDataSources] = (0, lodash_1.partition)(dataSources, (ds) => !ds.name);
-        // Group templ
-        const groupedDataSources = Object.values((0, lodash_1.groupBy)(templateDataSources, (ds) => ds.name)).map((grouped) => {
-            if (grouped.length === 1) {
-                return grouped[0];
-            }
-            const options = grouped.map((ds) => ds.options);
-            const ref = grouped[0];
-            return Object.assign(Object.assign({}, ref), { groupedOptions: options });
-        });
-        const filteredDs = [...normalDataSources, ...groupedDataSources];
-        return buildDictionaryQueryEntries(filteredDs);
-    }
     getGenesisHash() {
         return this.apiService.networkMeta.genesisHash;
     }
     async getFinalizedHeight() {
         const block = await this.api.getFinalizedBlock();
-        const header = (0, unfinalizedBlocks_service_1.blockToHeader)(block);
+        const header = (0, utils_ethereum_1.ethereumBlockToHeader)(block);
         this.unfinalizedBlocksService.registerFinalizedBlock(header);
         return header.blockHeight;
     }
@@ -246,7 +73,7 @@ FetchService = __decorate([
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.NodeConfig,
         project_service_1.ProjectService,
-        SubqueryProject_1.SubqueryProject, Object, dictionary_service_1.DictionaryService,
+        SubqueryProject_1.SubqueryProject, Object, ethDictionary_service_1.EthDictionaryService,
         dynamic_ds_service_1.DynamicDsService,
         unfinalizedBlocks_service_1.UnfinalizedBlocksService,
         event_emitter_1.EventEmitter2,

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.service.js","sourceRoot":"","sources":["../../src/indexer/fetch.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { SchedulerRegistry } from '@nestjs/schedule';\n\nimport {\n  isCustomDs,\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  SubqlEthereumProcessorOptions,\n  EthereumTransactionFilter,\n} from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  BaseFetchService,\n  ApiService,\n  getLogger,\n  getModulos,\n} from '@subql/node-core';\nimport {\n  DictionaryQueryCondition,\n  DictionaryQueryEntry,\n} from '@subql/types-core';\nimport { SubqlDatasource } from '@subql/types-ethereum';\nimport { groupBy, partition, sortBy, uniqBy } from 'lodash';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApi } from '../ethereum';\nimport { calcInterval } from '../ethereum/utils.ethereum';\nimport { eventToTopic, functionToSighash } from '../utils/string';\nimport { yargsOptions } from '../yargs';\nimport { IEthereumBlockDispatcher } from './blockDispatcher';\nimport { DictionaryService } from './dictionary.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { ProjectService } from './project.service';\nimport {\n  blockToHeader,\n  UnfinalizedBlocksService,\n} from './unfinalizedBlocks.service';\n\nconst logger = getLogger('fetch.service');\n\nconst BLOCK_TIME_VARIANCE = 5000;\n\nconst INTERVAL_PERCENT = 0.9;\n\nfunction appendDsOptions(\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n  conditions: DictionaryQueryCondition[],\n): void {\n  const queryAddressLimit = yargsOptions.argv['query-address-limit'];\n  if (Array.isArray(dsOptions)) {\n    const addresses = dsOptions.map((option) => option.address).filter(Boolean);\n\n    if (addresses.length > queryAddressLimit) {\n      logger.debug(\n        `Addresses length: ${addresses.length} is exceeding limit: ${queryAddressLimit}. Consider increasing this value with the flag --query-address-limit  `,\n      );\n    }\n\n    if (addresses.length !== 0 && addresses.length <= queryAddressLimit) {\n      conditions.push({\n        field: 'address',\n        value: addresses,\n        matcher: 'in',\n      });\n    }\n  } else {\n    if (dsOptions?.address) {\n      conditions.push({\n        field: 'address',\n        value: dsOptions.address.toLowerCase(),\n        matcher: 'equalTo',\n      });\n    }\n  }\n}\n\nfunction eventFilterToQueryEntry(\n  filter: EthereumLogFilter,\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): DictionaryQueryEntry {\n  const conditions: DictionaryQueryCondition[] = [];\n  appendDsOptions(dsOptions, conditions);\n  if (filter.topics) {\n    for (let i = 0; i < Math.min(filter.topics.length, 4); i++) {\n      const topic = filter.topics[i];\n      if (!topic) {\n        continue;\n      }\n      const field = `topics${i}`;\n\n      if (topic === '!null') {\n        conditions.push({\n          field,\n          value: false as any, // TODO update types to allow boolean\n          matcher: 'isNull',\n        });\n      } else {\n        conditions.push({\n          field,\n          value: eventToTopic(topic),\n          matcher: 'equalTo',\n        });\n      }\n    }\n  }\n  return {\n    entity: 'evmLogs',\n    conditions,\n  };\n}\n\nfunction callFilterToQueryEntry(\n  filter: EthereumTransactionFilter,\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): DictionaryQueryEntry {\n  const conditions: DictionaryQueryCondition[] = [];\n  appendDsOptions(dsOptions, conditions);\n\n  for (const condition of conditions) {\n    if (condition.field === 'address') {\n      condition.field = 'to';\n    }\n  }\n  if (filter.from) {\n    conditions.push({\n      field: 'from',\n      value: filter.from.toLowerCase(),\n      matcher: 'equalTo',\n    });\n  }\n  const optionsAddresses = conditions.find((c) => c.field === 'to');\n  if (!optionsAddresses) {\n    if (filter.to) {\n      conditions.push({\n        field: 'to',\n        value: filter.to.toLowerCase(),\n        matcher: 'equalTo',\n      });\n    } else if (filter.to === null) {\n      conditions.push({\n        field: 'to',\n        value: true as any, // TODO update types to allow boolean\n        matcher: 'isNull',\n      });\n    }\n  } else if (optionsAddresses && (filter.to || filter.to === null)) {\n    logger.warn(\n      `TransactionFilter 'to' conflict with 'address' in data source options`,\n    );\n  }\n\n  if (filter.function === null || filter.function === '0x') {\n    conditions.push({\n      field: 'func',\n      value: true,\n      matcher: 'isNull',\n    });\n  } else if (filter.function) {\n    conditions.push({\n      field: 'func',\n      value: functionToSighash(filter.function),\n      matcher: 'equalTo',\n    });\n  }\n\n  return {\n    entity: 'evmTransactions',\n    conditions,\n  };\n}\n\ntype GroupedEthereumProjectDs = SubqlDatasource & {\n  groupedOptions?: SubqlEthereumProcessorOptions[];\n};\nexport function buildDictionaryQueryEntries(\n  dataSources: GroupedEthereumProjectDs[],\n): DictionaryQueryEntry[] {\n  const queryEntries: DictionaryQueryEntry[] = [];\n\n  for (const ds of dataSources) {\n    for (const handler of ds.mapping.handlers) {\n      // No filters, cant use dictionary\n      if (!handler.filter) return [];\n\n      switch (handler.kind) {\n        case EthereumHandlerKind.Block:\n          return [];\n        case EthereumHandlerKind.Call: {\n          const filter = handler.filter as EthereumTransactionFilter;\n          if (\n            filter.from !== undefined ||\n            filter.to !== undefined ||\n            filter.function !== undefined\n          ) {\n            queryEntries.push(callFilterToQueryEntry(filter, ds.options));\n          } else {\n            return [];\n          }\n          break;\n        }\n        case EthereumHandlerKind.Event: {\n          const filter = handler.filter as EthereumLogFilter;\n          if (ds.groupedOptions) {\n            queryEntries.push(\n              eventFilterToQueryEntry(filter, ds.groupedOptions),\n            );\n          } else if (ds.options?.address || filter.topics) {\n            queryEntries.push(eventFilterToQueryEntry(filter, ds.options));\n          } else {\n            return [];\n          }\n          break;\n        }\n        default:\n      }\n    }\n  }\n\n  return uniqBy(\n    queryEntries,\n    (item) =>\n      `${item.entity}|${JSON.stringify(\n        sortBy(item.conditions, (c) => c.field),\n      )}`,\n  );\n}\n\n@Injectable()\nexport class FetchService extends BaseFetchService<\n  SubqlDatasource,\n  IEthereumBlockDispatcher,\n  DictionaryService\n> {\n  constructor(\n    private apiService: ApiService,\n    nodeConfig: NodeConfig,\n    @Inject('IProjectService') projectService: ProjectService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    @Inject('IBlockDispatcher')\n    blockDispatcher: IEthereumBlockDispatcher,\n    dictionaryService: DictionaryService,\n    dynamicDsService: DynamicDsService,\n    private unfinalizedBlocksService: UnfinalizedBlocksService,\n    eventEmitter: EventEmitter2,\n    schedulerRegistry: SchedulerRegistry,\n  ) {\n    super(\n      nodeConfig,\n      projectService,\n      project.network,\n      blockDispatcher,\n      dictionaryService,\n      dynamicDsService,\n      eventEmitter,\n      schedulerRegistry,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.apiService.unsafeApi;\n  }\n\n  protected buildDictionaryQueryEntries(\n    // Add name to dataousrces as templates have this set\n    dataSources: (SubqlDatasource & { name?: string })[],\n  ): DictionaryQueryEntry[] {\n    const [normalDataSources, templateDataSources] = partition(\n      dataSources,\n      (ds) => !ds.name,\n    );\n\n    // Group templ\n    const groupedDataSources = Object.values(\n      groupBy(templateDataSources, (ds) => ds.name),\n    ).map((grouped) => {\n      if (grouped.length === 1) {\n        return grouped[0];\n      }\n\n      const options = grouped.map((ds) => ds.options);\n      const ref = grouped[0];\n\n      return {\n        ...ref,\n        groupedOptions: options,\n      };\n    });\n\n    const filteredDs = [...normalDataSources, ...groupedDataSources];\n\n    return buildDictionaryQueryEntries(filteredDs);\n  }\n\n  protected getGenesisHash(): string {\n    return this.apiService.networkMeta.genesisHash;\n  }\n\n  protected async getFinalizedHeight(): Promise<number> {\n    const block = await this.api.getFinalizedBlock();\n\n    const header = blockToHeader(block);\n\n    this.unfinalizedBlocksService.registerFinalizedBlock(header);\n    return header.blockHeight;\n  }\n\n  protected async getBestHeight(): Promise<number> {\n    return this.api.getBestBlockHeight();\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  protected async getChainInterval(): Promise<number> {\n    const CHAIN_INTERVAL = calcInterval(this.api) * INTERVAL_PERCENT;\n\n    return Math.min(BLOCK_TIME_VARIANCE, CHAIN_INTERVAL);\n  }\n\n  protected getModulos(): number[] {\n    return getModulos(\n      this.projectService.getAllDataSources(),\n      isCustomDs,\n      EthereumHandlerKind.Block,\n    );\n  }\n\n  protected async initBlockDispatcher(): Promise<void> {\n    await this.blockDispatcher.init(this.resetForNewDs.bind(this));\n  }\n\n  protected async preLoopHook(): Promise<void> {\n    // Ethereum doesn't need to do anything here\n    return Promise.resolve();\n  }\n}\n"]}
+{"version":3,"file":"fetch.service.js","sourceRoot":"","sources":["../../src/indexer/fetch.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,yDAAsD;AACtD,+CAAqD;AAErD,4DAAyE;AACzE,gDAK0B;AAE1B,kEAA+D;AAE/D,+DAGoC;AAEpC,8EAA0E;AAC1E,6DAAwD;AACxD,uDAAmD;AACnD,2EAAuE;AAEvE,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC,MAAM,gBAAgB,GAAG,GAAG,CAAC;AAGtB,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,4BAIjC;IACC,YACU,UAAsB,EAC9B,UAAsB,EACK,cAA8B,EAC7B,OAAwB,EAEpD,eAAyC,EACzC,iBAAuC,EACvC,gBAAkC,EAC1B,wBAAkD,EAC1D,YAA2B,EAC3B,iBAAoC;QAEpC,KAAK,CACH,UAAU,EACV,cAAc,EACd,OAAO,CAAC,OAAO,EACf,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,CAClB,CAAC;QArBM,eAAU,GAAV,UAAU,CAAY;QAQtB,6BAAwB,GAAxB,wBAAwB,CAA0B;IAc5D,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;IACnC,CAAC;IAES,cAAc;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC;IACjD,CAAC;IAES,KAAK,CAAC,kBAAkB;QAChC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAEjD,MAAM,MAAM,GAAG,IAAA,sCAAqB,EAAC,KAAK,CAAC,CAAC;QAE5C,IAAI,CAAC,wBAAwB,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC7D,OAAO,MAAM,CAAC,WAAW,CAAC;IAC5B,CAAC;IAES,KAAK,CAAC,aAAa;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;IACvC,CAAC;IAED,4DAA4D;IAClD,KAAK,CAAC,gBAAgB;QAC9B,MAAM,cAAc,GAAG,IAAA,6BAAY,EAAC,IAAI,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC;QAEjE,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACvD,CAAC;IAES,UAAU;QAClB,OAAO,IAAA,sBAAU,EACf,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,EACvC,4BAAU,EACV,qCAAmB,CAAC,KAAK,CAC1B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,mBAAmB;QACjC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAES,KAAK,CAAC,WAAW;QACzB,4CAA4C;QAC5C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AA1EY,YAAY;IADxB,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IACzB,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;IAC1B,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAJP,sBAAU;QAClB,sBAAU;QACqB,gCAAc;QACpB,iCAAe,UAGjC,4CAAoB;QACrB,qCAAgB;QACA,oDAAwB;QAC5C,6BAAa;QACR,4BAAiB;GAhB3B,YAAY,CA0ExB;AA1EY,oCAAY","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { SchedulerRegistry } from '@nestjs/schedule';\n\nimport { isCustomDs, EthereumHandlerKind } from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  BaseFetchService,\n  ApiService,\n  getModulos,\n} from '@subql/node-core';\nimport { EthereumBlock, SubqlDatasource } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApi } from '../ethereum';\nimport {\n  calcInterval,\n  ethereumBlockToHeader,\n} from '../ethereum/utils.ethereum';\nimport { IEthereumBlockDispatcher } from './blockDispatcher';\nimport { EthDictionaryService } from './dictionary/ethDictionary.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { ProjectService } from './project.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\nconst BLOCK_TIME_VARIANCE = 5000;\n\nconst INTERVAL_PERCENT = 0.9;\n\n@Injectable()\nexport class FetchService extends BaseFetchService<\n  SubqlDatasource,\n  IEthereumBlockDispatcher,\n  EthereumBlock\n> {\n  constructor(\n    private apiService: ApiService,\n    nodeConfig: NodeConfig,\n    @Inject('IProjectService') projectService: ProjectService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    @Inject('IBlockDispatcher')\n    blockDispatcher: IEthereumBlockDispatcher,\n    dictionaryService: EthDictionaryService,\n    dynamicDsService: DynamicDsService,\n    private unfinalizedBlocksService: UnfinalizedBlocksService,\n    eventEmitter: EventEmitter2,\n    schedulerRegistry: SchedulerRegistry,\n  ) {\n    super(\n      nodeConfig,\n      projectService,\n      project.network,\n      blockDispatcher,\n      dictionaryService,\n      dynamicDsService,\n      eventEmitter,\n      schedulerRegistry,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.apiService.unsafeApi;\n  }\n\n  protected getGenesisHash(): string {\n    return this.apiService.networkMeta.genesisHash;\n  }\n\n  protected async getFinalizedHeight(): Promise<number> {\n    const block = await this.api.getFinalizedBlock();\n\n    const header = ethereumBlockToHeader(block);\n\n    this.unfinalizedBlocksService.registerFinalizedBlock(header);\n    return header.blockHeight;\n  }\n\n  protected async getBestHeight(): Promise<number> {\n    return this.api.getBestBlockHeight();\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  protected async getChainInterval(): Promise<number> {\n    const CHAIN_INTERVAL = calcInterval(this.api) * INTERVAL_PERCENT;\n\n    return Math.min(BLOCK_TIME_VARIANCE, CHAIN_INTERVAL);\n  }\n\n  protected getModulos(): number[] {\n    return getModulos(\n      this.projectService.getAllDataSources(),\n      isCustomDs,\n      EthereumHandlerKind.Block,\n    );\n  }\n\n  protected async initBlockDispatcher(): Promise<void> {\n    await this.blockDispatcher.init(this.resetForNewDs.bind(this));\n  }\n\n  protected async preLoopHook(): Promise<void> {\n    // Ethereum doesn't need to do anything here\n    return Promise.resolve();\n  }\n}\n"]}

package/dist/indexer/indexer.manager.d.ts

@@ -1,20 +1,20 @@
 import { isBlockHandlerProcessor, isCallHandlerProcessor, isEventHandlerProcessor, isCustomDs, isRuntimeDs, SubqlEthereumCustomDataSource, EthereumHandlerKind, EthereumRuntimeHandlerInputMap, SubqlEthereumDataSource } from '@subql/common-ethereum';
-import { NodeConfig, IndexerSandbox, ProcessBlockResponse, BaseIndexerManager, ApiService } from '@subql/node-core';
+import { NodeConfig, IndexerSandbox, ProcessBlockResponse, BaseIndexerManager, IBlock } from '@subql/node-core';
 import { EthereumTransaction, EthereumLog, EthereumBlock, SubqlRuntimeDatasource, EthereumBlockFilter, EthereumLogFilter, EthereumTransactionFilter, LightEthereumLog } from '@subql/types-ethereum';
 import { EthereumProjectDs } from '../configure/SubqueryProject';
-import { EthereumApi } from '../ethereum';
+import { EthereumApi, EthereumApiService } from '../ethereum';
 import SafeEthProvider from '../ethereum/safe-api';
 import { asSecondLayerHandlerProcessor_1_0_0, DsProcessorService } from './ds-processor.service';
 import { DynamicDsService } from './dynamic-ds.service';
 import { SandboxService } from './sandbox.service';
 import { BlockContent } from './types';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
-export declare class IndexerManager extends BaseIndexerManager<SafeEthProvider, EthereumApi, BlockContent, ApiService, SubqlEthereumDataSource, SubqlEthereumCustomDataSource, typeof FilterTypeMap, typeof ProcessorTypeMap, EthereumRuntimeHandlerInputMap> {
+export declare class IndexerManager extends BaseIndexerManager<SafeEthProvider, EthereumApi, BlockContent, EthereumApiService, SubqlEthereumDataSource, SubqlEthereumCustomDataSource, typeof FilterTypeMap, typeof ProcessorTypeMap, EthereumRuntimeHandlerInputMap> {
     protected isRuntimeDs: typeof isRuntimeDs;
     protected isCustomDs: typeof isCustomDs;
     protected updateCustomProcessor: typeof asSecondLayerHandlerProcessor_1_0_0;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, sandboxService: SandboxService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService);
-    indexBlock(block: BlockContent, dataSources: SubqlEthereumDataSource[]): Promise<ProcessBlockResponse>;
+    constructor(apiService: EthereumApiService, nodeConfig: NodeConfig, sandboxService: SandboxService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService);
+    indexBlock(block: IBlock<BlockContent>, dataSources: SubqlEthereumDataSource[]): Promise<ProcessBlockResponse>;
     getBlockHeight(block: BlockContent): number;
     getBlockHash(block: BlockContent): string;
     private getApi;

package/dist/indexer/indexer.manager.js

@@ -15,12 +15,12 @@ exports.IndexerManager = void 0;
 const common_1 = require("@nestjs/common");
 const common_ethereum_1 = require("@subql/common-ethereum");
 const node_core_1 = require("@subql/node-core");
+const ethereum_1 = require("../ethereum");
 const block_ethereum_1 = require("../ethereum/block.ethereum");
 const ds_processor_service_1 = require("./ds-processor.service");
 const dynamic_ds_service_1 = require("./dynamic-ds.service");
 const sandbox_service_1 = require("./sandbox.service");
 const unfinalizedBlocks_service_1 = require("./unfinalizedBlocks.service");
-const logger = (0, node_core_1.getLogger)('indexer');
 let IndexerManager = class IndexerManager extends node_core_1.BaseIndexerManager {
     constructor(apiService, nodeConfig, sandboxService, dsProcessorService, dynamicDsService, unfinalizedBlocksService) {
         super(apiService, nodeConfig, sandboxService, dsProcessorService, dynamicDsService, unfinalizedBlocksService, FilterTypeMap, ProcessorTypeMap);
@@ -29,7 +29,7 @@ let IndexerManager = class IndexerManager extends node_core_1.BaseIndexerManager
         this.updateCustomProcessor = ds_processor_service_1.asSecondLayerHandlerProcessor_1_0_0;
     }
     async indexBlock(block, dataSources) {
-        return super.internalIndexBlock(block, dataSources, () => this.getApi(block));
+        return super.internalIndexBlock(block, dataSources, () => this.getApi(block.block));
     }
     getBlockHeight(block) {
         return block.number;
@@ -86,7 +86,7 @@ __decorate([
 ], IndexerManager.prototype, "indexBlock", null);
 IndexerManager = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [node_core_1.ApiService,
+    __metadata("design:paramtypes", [ethereum_1.EthereumApiService,
         node_core_1.NodeConfig,
         sandbox_service_1.SandboxService,
         ds_processor_service_1.DsProcessorService,

package/dist/indexer/indexer.manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"indexer.manager.js","sourceRoot":"","sources":["../../src/indexer/indexer.manager.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  isBlockHandlerProcessor,\n  isCallHandlerProcessor,\n  isEventHandlerProcessor,\n  isCustomDs,\n  isRuntimeDs,\n  SubqlEthereumCustomDataSource,\n  EthereumHandlerKind,\n  EthereumRuntimeHandlerInputMap,\n  SubqlEthereumDataSource,\n} from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  getLogger,\n  profiler,\n  IndexerSandbox,\n  ProcessBlockResponse,\n  BaseIndexerManager,\n  ApiService,\n} from '@subql/node-core';\nimport {\n  EthereumTransaction,\n  EthereumLog,\n  EthereumBlock,\n  SubqlRuntimeDatasource,\n  EthereumBlockFilter,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n  LightEthereumLog,\n} from '@subql/types-ethereum';\nimport { EthereumProjectDs } from '../configure/SubqueryProject';\nimport { EthereumApi } from '../ethereum';\nimport {\n  filterBlocksProcessor,\n  filterLogsProcessor,\n  filterTransactionsProcessor,\n  isFullBlock,\n} from '../ethereum/block.ethereum';\nimport SafeEthProvider from '../ethereum/safe-api';\nimport {\n  asSecondLayerHandlerProcessor_1_0_0,\n  DsProcessorService,\n} from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { SandboxService } from './sandbox.service';\nimport { BlockContent } from './types';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\nconst logger = getLogger('indexer');\n\n@Injectable()\nexport class IndexerManager extends BaseIndexerManager<\n  SafeEthProvider,\n  EthereumApi,\n  BlockContent,\n  ApiService,\n  SubqlEthereumDataSource,\n  SubqlEthereumCustomDataSource,\n  typeof FilterTypeMap,\n  typeof ProcessorTypeMap,\n  EthereumRuntimeHandlerInputMap\n> {\n  protected isRuntimeDs = isRuntimeDs;\n  protected isCustomDs = isCustomDs;\n  protected updateCustomProcessor = asSecondLayerHandlerProcessor_1_0_0;\n\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    sandboxService: SandboxService,\n    dsProcessorService: DsProcessorService,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksService: UnfinalizedBlocksService,\n  ) {\n    super(\n      apiService,\n      nodeConfig,\n      sandboxService,\n      dsProcessorService,\n      dynamicDsService,\n      unfinalizedBlocksService,\n      FilterTypeMap,\n      ProcessorTypeMap,\n    );\n  }\n\n  @profiler()\n  async indexBlock(\n    block: BlockContent,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return super.internalIndexBlock(block, dataSources, () =>\n      this.getApi(block),\n    );\n  }\n\n  getBlockHeight(block: BlockContent): number {\n    return block.number;\n  }\n\n  getBlockHash(block: BlockContent): string {\n    return block.hash;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  private async getApi(block: BlockContent): Promise<SafeEthProvider> {\n    return this.apiService.safeApi(this.getBlockHeight(block));\n  }\n\n  protected async indexBlockData(\n    block: BlockContent,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    if (isFullBlock(block)) {\n      await this.indexBlockContent(block, dataSources, getVM);\n\n      for (const tx of block.transactions) {\n        await this.indexTransaction(tx, dataSources, getVM);\n\n        for (const log of tx.logs ?? []) {\n          await this.indexEvent(log, dataSources, getVM);\n        }\n      }\n    } else {\n      for (const log of block.logs ?? []) {\n        await this.indexEvent(log, dataSources, getVM);\n      }\n    }\n  }\n\n  private async indexBlockContent(\n    block: EthereumBlock,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Block, block, ds, getVM);\n    }\n  }\n\n  private async indexTransaction(\n    tx: EthereumTransaction,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Call, tx, ds, getVM);\n    }\n  }\n\n  private async indexEvent(\n    log: EthereumLog | LightEthereumLog,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Event, log, ds, getVM);\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  protected async prepareFilteredData(\n    kind: EthereumHandlerKind,\n    data: any,\n    ds: SubqlRuntimeDatasource,\n  ): Promise<any> {\n    return DataAbiParser[kind](this.apiService.api)(data, ds);\n  }\n}\n\ntype ProcessorTypeMap = {\n  [EthereumHandlerKind.Block]: typeof isBlockHandlerProcessor;\n  [EthereumHandlerKind.Event]: typeof isEventHandlerProcessor;\n  [EthereumHandlerKind.Call]: typeof isCallHandlerProcessor;\n};\n\nconst ProcessorTypeMap = {\n  [EthereumHandlerKind.Block]: isBlockHandlerProcessor,\n  [EthereumHandlerKind.Event]: isEventHandlerProcessor,\n  [EthereumHandlerKind.Call]: isCallHandlerProcessor,\n};\n\nconst FilterTypeMap = {\n  [EthereumHandlerKind.Block]: (\n    data: EthereumBlock,\n    filter: EthereumBlockFilter,\n    ds: SubqlEthereumDataSource,\n  ) => filterBlocksProcessor(data, filter, ds.options?.address),\n  [EthereumHandlerKind.Event]: (\n    data: EthereumLog | LightEthereumLog,\n    filter: EthereumLogFilter,\n    ds: SubqlEthereumDataSource,\n  ) => filterLogsProcessor(data, filter, ds.options?.address),\n  [EthereumHandlerKind.Call]: (\n    data: EthereumTransaction,\n    filter: EthereumTransactionFilter,\n    ds: SubqlEthereumDataSource,\n  ) => filterTransactionsProcessor(data, filter, ds.options?.address),\n};\n\nconst DataAbiParser = {\n  [EthereumHandlerKind.Block]: () => (data: EthereumBlock) => data,\n  [EthereumHandlerKind.Event]:\n    (api: EthereumApi) =>\n    (data: EthereumLog | LightEthereumLog, ds: SubqlRuntimeDatasource) =>\n      api.parseLog(data, ds),\n  [EthereumHandlerKind.Call]:\n    (api: EthereumApi) =>\n    (data: EthereumTransaction, ds: SubqlRuntimeDatasource) =>\n      api.parseTransaction(data, ds),\n};\n"]}
+{"version":3,"file":"indexer.manager.js","sourceRoot":"","sources":["../../src/indexer/indexer.manager.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Injectable } from '@nestjs/common';\nimport {\n  isBlockHandlerProcessor,\n  isCallHandlerProcessor,\n  isEventHandlerProcessor,\n  isCustomDs,\n  isRuntimeDs,\n  SubqlEthereumCustomDataSource,\n  EthereumHandlerKind,\n  EthereumRuntimeHandlerInputMap,\n  SubqlEthereumDataSource,\n} from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  getLogger,\n  profiler,\n  IndexerSandbox,\n  ProcessBlockResponse,\n  BaseIndexerManager,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumTransaction,\n  EthereumLog,\n  EthereumBlock,\n  SubqlRuntimeDatasource,\n  EthereumBlockFilter,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n  LightEthereumLog,\n} from '@subql/types-ethereum';\nimport { EthereumProjectDs } from '../configure/SubqueryProject';\nimport { EthereumApi, EthereumApiService } from '../ethereum';\nimport {\n  filterBlocksProcessor,\n  filterLogsProcessor,\n  filterTransactionsProcessor,\n  isFullBlock,\n} from '../ethereum/block.ethereum';\nimport SafeEthProvider from '../ethereum/safe-api';\nimport {\n  asSecondLayerHandlerProcessor_1_0_0,\n  DsProcessorService,\n} from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { SandboxService } from './sandbox.service';\nimport { BlockContent } from './types';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n@Injectable()\nexport class IndexerManager extends BaseIndexerManager<\n  SafeEthProvider,\n  EthereumApi,\n  BlockContent,\n  EthereumApiService,\n  SubqlEthereumDataSource,\n  SubqlEthereumCustomDataSource,\n  typeof FilterTypeMap,\n  typeof ProcessorTypeMap,\n  EthereumRuntimeHandlerInputMap\n> {\n  protected isRuntimeDs = isRuntimeDs;\n  protected isCustomDs = isCustomDs;\n  protected updateCustomProcessor = asSecondLayerHandlerProcessor_1_0_0;\n\n  constructor(\n    apiService: EthereumApiService,\n    nodeConfig: NodeConfig,\n    sandboxService: SandboxService,\n    dsProcessorService: DsProcessorService,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksService: UnfinalizedBlocksService,\n  ) {\n    super(\n      apiService,\n      nodeConfig,\n      sandboxService,\n      dsProcessorService,\n      dynamicDsService,\n      unfinalizedBlocksService,\n      FilterTypeMap,\n      ProcessorTypeMap,\n    );\n  }\n\n  @profiler()\n  async indexBlock(\n    block: IBlock<BlockContent>,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return super.internalIndexBlock(block, dataSources, () =>\n      this.getApi(block.block),\n    );\n  }\n\n  getBlockHeight(block: BlockContent): number {\n    return block.number;\n  }\n\n  getBlockHash(block: BlockContent): string {\n    return block.hash;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  private async getApi(block: BlockContent): Promise<SafeEthProvider> {\n    return this.apiService.safeApi(this.getBlockHeight(block));\n  }\n\n  protected async indexBlockData(\n    block: BlockContent,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    if (isFullBlock(block)) {\n      await this.indexBlockContent(block, dataSources, getVM);\n\n      for (const tx of block.transactions) {\n        await this.indexTransaction(tx, dataSources, getVM);\n\n        for (const log of tx.logs ?? []) {\n          await this.indexEvent(log, dataSources, getVM);\n        }\n      }\n    } else {\n      for (const log of block.logs ?? []) {\n        await this.indexEvent(log, dataSources, getVM);\n      }\n    }\n  }\n\n  private async indexBlockContent(\n    block: EthereumBlock,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Block, block, ds, getVM);\n    }\n  }\n\n  private async indexTransaction(\n    tx: EthereumTransaction,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Call, tx, ds, getVM);\n    }\n  }\n\n  private async indexEvent(\n    log: EthereumLog | LightEthereumLog,\n    dataSources: EthereumProjectDs[],\n    getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Event, log, ds, getVM);\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  protected async prepareFilteredData(\n    kind: EthereumHandlerKind,\n    data: any,\n    ds: SubqlRuntimeDatasource,\n  ): Promise<any> {\n    return DataAbiParser[kind](this.apiService.api)(data, ds);\n  }\n}\n\ntype ProcessorTypeMap = {\n  [EthereumHandlerKind.Block]: typeof isBlockHandlerProcessor;\n  [EthereumHandlerKind.Event]: typeof isEventHandlerProcessor;\n  [EthereumHandlerKind.Call]: typeof isCallHandlerProcessor;\n};\n\nconst ProcessorTypeMap = {\n  [EthereumHandlerKind.Block]: isBlockHandlerProcessor,\n  [EthereumHandlerKind.Event]: isEventHandlerProcessor,\n  [EthereumHandlerKind.Call]: isCallHandlerProcessor,\n};\n\nconst FilterTypeMap = {\n  [EthereumHandlerKind.Block]: (\n    data: EthereumBlock,\n    filter: EthereumBlockFilter,\n    ds: SubqlEthereumDataSource,\n  ) => filterBlocksProcessor(data, filter, ds.options?.address),\n  [EthereumHandlerKind.Event]: (\n    data: EthereumLog | LightEthereumLog,\n    filter: EthereumLogFilter,\n    ds: SubqlEthereumDataSource,\n  ) => filterLogsProcessor(data, filter, ds.options?.address),\n  [EthereumHandlerKind.Call]: (\n    data: EthereumTransaction,\n    filter: EthereumTransactionFilter,\n    ds: SubqlEthereumDataSource,\n  ) => filterTransactionsProcessor(data, filter, ds.options?.address),\n};\n\nconst DataAbiParser = {\n  [EthereumHandlerKind.Block]: () => (data: EthereumBlock) => data,\n  [EthereumHandlerKind.Event]:\n    (api: EthereumApi) =>\n    (data: EthereumLog | LightEthereumLog, ds: SubqlRuntimeDatasource) =>\n      api.parseLog(data, ds),\n  [EthereumHandlerKind.Call]:\n    (api: EthereumApi) =>\n    (data: EthereumTransaction, ds: SubqlRuntimeDatasource) =>\n      api.parseTransaction(data, ds),\n};\n"]}

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

@@ -1,9 +1,6 @@
-import { Block } from '@ethersproject/abstract-provider';
 import { ApiService, BaseUnfinalizedBlocksService, Header, NodeConfig, StoreCacheService } from '@subql/node-core';
-import { EthereumBlock } from '@subql/types-ethereum';
 import { BlockContent } from './types';
-export declare function blockToHeader(block: BlockContent | Block): Header;
-export declare class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<EthereumBlock> {
+export declare class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockContent> {
     private readonly apiService;
     private supportsFinalization?;
     private startupCheck;
@@ -23,7 +20,6 @@ export declare class UnfinalizedBlocksService extends BaseUnfinalizedBlocksServi
      * @return (number | undefined) - The block height to rewind to to remove forked data
      **/
     protected getLastCorrectFinalizedBlock(forkedHeader: Header): Promise<number | undefined>;
-    protected blockToHeader(block: BlockContent): Header;
     protected getFinalizedHead(): Promise<Header>;
     protected getHeaderForHash(hash: string): Promise<Header>;
     protected getHeaderForHeight(height: number): Promise<Header>;

package/dist/indexer/unfinalizedBlocks.service.js

@@ -11,20 +11,13 @@ 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.UnfinalizedBlocksService = exports.blockToHeader = void 0;
+exports.UnfinalizedBlocksService = void 0;
 const common_1 = require("@nestjs/common");
 const node_core_1 = require("@subql/node-core");
 const lodash_1 = require("lodash");
 const NodeConfig_1 = require("../configure/NodeConfig");
+const utils_ethereum_1 = require("../ethereum/utils.ethereum");
 const logger = (0, node_core_1.getLogger)('UnfinalizedBlocksService');
-function blockToHeader(block) {
-    return {
-        blockHeight: block.number,
-        blockHash: block.hash,
-        parentHash: block.parentHash,
-    };
-}
-exports.blockToHeader = blockToHeader;
 let UnfinalizedBlocksService = class UnfinalizedBlocksService extends node_core_1.BaseUnfinalizedBlocksService {
     constructor(apiService, nodeConfig, storeCache) {
         super(new NodeConfig_1.EthereumNodeConfig(nodeConfig), storeCache);
@@ -104,20 +97,17 @@ let UnfinalizedBlocksService = class UnfinalizedBlocksService extends node_core_
             throw e;
         }
     }
-    blockToHeader(block) {
-        return blockToHeader(block);
-    }
     async getFinalizedHead() {
         const finalizedBlock = await this.apiService.api.getFinalizedBlock();
-        return blockToHeader(finalizedBlock);
+        return (0, utils_ethereum_1.ethereumBlockToHeader)(finalizedBlock);
     }
     async getHeaderForHash(hash) {
         const block = await this.apiService.api.getBlockByHeightOrHash(hash);
-        return blockToHeader(block);
+        return (0, utils_ethereum_1.ethereumBlockToHeader)(block);
     }
     async getHeaderForHeight(height) {
         const block = await this.apiService.api.getBlockByHeightOrHash(height);
-        return blockToHeader(block);
+        return (0, utils_ethereum_1.ethereumBlockToHeader)(block);
     }
 };
 __decorate([
@@ -126,12 +116,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], UnfinalizedBlocksService.prototype, "hasForked", null);
-__decorate([
-    (0, node_core_1.mainThreadOnly)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Object)
-], UnfinalizedBlocksService.prototype, "blockToHeader", null);
 __decorate([
     (0, node_core_1.mainThreadOnly)(),
     __metadata("design:type", Function),

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

@@ -1 +1 @@
-{"version":3,"file":"unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../src/indexer/unfinalizedBlocks.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Block } from '@ethersproject/abstract-provider';\nimport { Injectable } from '@nestjs/common';\nimport {\n  ApiService,\n  BaseUnfinalizedBlocksService,\n  Header,\n  mainThreadOnly,\n  NodeConfig,\n  StoreCacheService,\n  getLogger,\n  profiler,\n  POI_NOT_ENABLED_ERROR_MESSAGE,\n} from '@subql/node-core';\nimport { EthereumBlock } from '@subql/types-ethereum';\nimport { last } from 'lodash';\nimport { EthereumNodeConfig } from '../configure/NodeConfig';\nimport { BlockContent } from './types';\n\nconst logger = getLogger('UnfinalizedBlocksService');\n\nexport function blockToHeader(block: BlockContent | Block): Header {\n  return {\n    blockHeight: block.number,\n    blockHash: block.hash,\n    parentHash: block.parentHash,\n  };\n}\n\n@Injectable()\nexport class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<EthereumBlock> {\n  private supportsFinalization?: boolean;\n  private startupCheck = true;\n\n  constructor(\n    private readonly apiService: ApiService,\n    nodeConfig: NodeConfig,\n    storeCache: StoreCacheService,\n  ) {\n    super(new EthereumNodeConfig(nodeConfig), storeCache);\n  }\n\n  /**\n   * @param reindex - the function to reindex back before a fork\n   * @param supportsFinalization - If the chain supports the 'finalized' block tag this should be true.\n   * */\n  async init(\n    reindex: (targetHeight: number) => Promise<void>,\n    supportsFinalisation?: boolean,\n  ): Promise<number | undefined> {\n    this.supportsFinalization = supportsFinalisation;\n    return super.init(reindex);\n  }\n  /**\n   * Checks if a fork has happened, this doesn't find the start of the fork just where it was detected\n   * @returns (Header | undefined) - The header may be the forked header but will most likely be the main header. Either way it should be used just for the block height\n   * */\n  @profiler()\n  protected async hasForked(): Promise<Header | undefined> {\n    if (this.supportsFinalization) {\n      return super.hasForked();\n    }\n\n    // Startup check helps speed up finding a fork by checking the hash of the last unfinalized block\n    if (this.startupCheck) {\n      this.startupCheck = false;\n      const lastUnfinalized = last(this.unfinalizedBlocks);\n      if (lastUnfinalized) {\n        const checkUnfinalized = await this.getHeaderForHeight(\n          lastUnfinalized.blockHeight,\n        );\n\n        if (lastUnfinalized.blockHash !== checkUnfinalized.blockHash) {\n          return checkUnfinalized;\n        }\n      }\n    }\n\n    if (this.unfinalizedBlocks.length <= 2) {\n      return;\n    }\n\n    const i = this.unfinalizedBlocks.length - 1;\n    const current = this.unfinalizedBlocks[i];\n    const parent = this.unfinalizedBlocks[i - 1];\n\n    if (current.parentHash !== parent.blockHash) {\n      // We've found a fork now we need to find where the fork happened\n      logger.warn(\n        `Block fork detected at ${current.blockHeight}. Parent hash ${current.parentHash} doesn't match indexed parent ${parent.blockHash}.`,\n      );\n\n      return current;\n    }\n\n    return;\n  }\n\n  /**\n   * Finds the height before the fork occurred based on the result of hasForked\n   * @return (number | undefined) - The block height to rewind to to remove forked data\n   **/\n  protected async getLastCorrectFinalizedBlock(\n    forkedHeader: Header,\n  ): Promise<number | undefined> {\n    if (this.supportsFinalization) {\n      return super.getLastCorrectFinalizedBlock(forkedHeader);\n    }\n\n    const bestVerifiableBlocks = this.unfinalizedBlocks.filter(\n      ({ blockHeight }) => blockHeight < forkedHeader.blockHeight,\n    );\n\n    let checkingHeader = forkedHeader;\n\n    // Work backwards through the blocks until we find a matching hash\n    for (const { blockHash, blockHeight } of bestVerifiableBlocks.reverse()) {\n      if (\n        blockHash === checkingHeader.blockHash ||\n        blockHash === checkingHeader.parentHash\n      ) {\n        return blockHeight;\n      }\n\n      // Get the new parent\n      checkingHeader = await this.getHeaderForHash(checkingHeader.parentHash);\n    }\n\n    try {\n      const poiHeader = await this.findFinalizedUsingPOI(checkingHeader);\n      return poiHeader.blockHeight;\n    } catch (e) {\n      if (e.message === POI_NOT_ENABLED_ERROR_MESSAGE) {\n        return Math.max(\n          0,\n          forkedHeader.blockHeight -\n            (this.nodeConfig as EthereumNodeConfig).blockForkReindex,\n        );\n      }\n      // TODO rewind back 1000+ blocks\n      logger.info('Failed to use POI to rewind block');\n      throw e;\n    }\n  }\n\n  @mainThreadOnly()\n  protected blockToHeader(block: BlockContent): Header {\n    return blockToHeader(block);\n  }\n\n  @mainThreadOnly()\n  protected async getFinalizedHead(): Promise<Header> {\n    const finalizedBlock = await this.apiService.api.getFinalizedBlock();\n    return blockToHeader(finalizedBlock);\n  }\n\n  @mainThreadOnly()\n  protected async getHeaderForHash(hash: string): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(hash);\n    return blockToHeader(block);\n  }\n\n  @mainThreadOnly()\n  protected async getHeaderForHeight(height: number): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(height);\n    return blockToHeader(block);\n  }\n}\n"]}
+{"version":3,"file":"unfinalizedBlocks.service.js","sourceRoot":"","sources":["../../src/indexer/unfinalizedBlocks.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Injectable } from '@nestjs/common';\nimport {\n  ApiService,\n  BaseUnfinalizedBlocksService,\n  Header,\n  mainThreadOnly,\n  NodeConfig,\n  StoreCacheService,\n  getLogger,\n  profiler,\n  POI_NOT_ENABLED_ERROR_MESSAGE,\n} from '@subql/node-core';\nimport { last } from 'lodash';\nimport { EthereumNodeConfig } from '../configure/NodeConfig';\nimport { ethereumBlockToHeader } from '../ethereum/utils.ethereum';\nimport { BlockContent } from './types';\n\nconst logger = getLogger('UnfinalizedBlocksService');\n\n@Injectable()\nexport class UnfinalizedBlocksService extends BaseUnfinalizedBlocksService<BlockContent> {\n  private supportsFinalization?: boolean;\n  private startupCheck = true;\n\n  constructor(\n    private readonly apiService: ApiService,\n    nodeConfig: NodeConfig,\n    storeCache: StoreCacheService,\n  ) {\n    super(new EthereumNodeConfig(nodeConfig), storeCache);\n  }\n\n  /**\n   * @param reindex - the function to reindex back before a fork\n   * @param supportsFinalization - If the chain supports the 'finalized' block tag this should be true.\n   * */\n  async init(\n    reindex: (targetHeight: number) => Promise<void>,\n    supportsFinalisation?: boolean,\n  ): Promise<number | undefined> {\n    this.supportsFinalization = supportsFinalisation;\n    return super.init(reindex);\n  }\n  /**\n   * Checks if a fork has happened, this doesn't find the start of the fork just where it was detected\n   * @returns (Header | undefined) - The header may be the forked header but will most likely be the main header. Either way it should be used just for the block height\n   * */\n  @profiler()\n  protected async hasForked(): Promise<Header | undefined> {\n    if (this.supportsFinalization) {\n      return super.hasForked();\n    }\n\n    // Startup check helps speed up finding a fork by checking the hash of the last unfinalized block\n    if (this.startupCheck) {\n      this.startupCheck = false;\n      const lastUnfinalized = last(this.unfinalizedBlocks);\n      if (lastUnfinalized) {\n        const checkUnfinalized = await this.getHeaderForHeight(\n          lastUnfinalized.blockHeight,\n        );\n\n        if (lastUnfinalized.blockHash !== checkUnfinalized.blockHash) {\n          return checkUnfinalized;\n        }\n      }\n    }\n\n    if (this.unfinalizedBlocks.length <= 2) {\n      return;\n    }\n\n    const i = this.unfinalizedBlocks.length - 1;\n    const current = this.unfinalizedBlocks[i];\n    const parent = this.unfinalizedBlocks[i - 1];\n\n    if (current.parentHash !== parent.blockHash) {\n      // We've found a fork now we need to find where the fork happened\n      logger.warn(\n        `Block fork detected at ${current.blockHeight}. Parent hash ${current.parentHash} doesn't match indexed parent ${parent.blockHash}.`,\n      );\n\n      return current;\n    }\n\n    return;\n  }\n\n  /**\n   * Finds the height before the fork occurred based on the result of hasForked\n   * @return (number | undefined) - The block height to rewind to to remove forked data\n   **/\n  protected async getLastCorrectFinalizedBlock(\n    forkedHeader: Header,\n  ): Promise<number | undefined> {\n    if (this.supportsFinalization) {\n      return super.getLastCorrectFinalizedBlock(forkedHeader);\n    }\n\n    const bestVerifiableBlocks = this.unfinalizedBlocks.filter(\n      ({ blockHeight }) => blockHeight < forkedHeader.blockHeight,\n    );\n\n    let checkingHeader = forkedHeader;\n\n    // Work backwards through the blocks until we find a matching hash\n    for (const { blockHash, blockHeight } of bestVerifiableBlocks.reverse()) {\n      if (\n        blockHash === checkingHeader.blockHash ||\n        blockHash === checkingHeader.parentHash\n      ) {\n        return blockHeight;\n      }\n\n      // Get the new parent\n      checkingHeader = await this.getHeaderForHash(checkingHeader.parentHash);\n    }\n\n    try {\n      const poiHeader = await this.findFinalizedUsingPOI(checkingHeader);\n      return poiHeader.blockHeight;\n    } catch (e) {\n      if (e.message === POI_NOT_ENABLED_ERROR_MESSAGE) {\n        return Math.max(\n          0,\n          forkedHeader.blockHeight -\n            (this.nodeConfig as EthereumNodeConfig).blockForkReindex,\n        );\n      }\n      // TODO rewind back 1000+ blocks\n      logger.info('Failed to use POI to rewind block');\n      throw e;\n    }\n  }\n\n  @mainThreadOnly()\n  protected async getFinalizedHead(): Promise<Header> {\n    const finalizedBlock = await this.apiService.api.getFinalizedBlock();\n    return ethereumBlockToHeader(finalizedBlock);\n  }\n\n  @mainThreadOnly()\n  protected async getHeaderForHash(hash: string): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(hash);\n    return ethereumBlockToHeader(block);\n  }\n\n  @mainThreadOnly()\n  protected async getHeaderForHeight(height: number): Promise<Header> {\n    const block = await this.apiService.api.getBlockByHeightOrHash(height);\n    return ethereumBlockToHeader(block);\n  }\n}\n"]}

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

@@ -1,5 +1,5 @@
 import { SubqlEthereumDataSource } from '@subql/common-ethereum';
-import { NodeConfig, IProjectService, ProcessBlockResponse, ApiService, BaseWorkerService, IProjectUpgradeService } from '@subql/node-core';
+import { NodeConfig, IProjectService, ProcessBlockResponse, ApiService, BaseWorkerService, IProjectUpgradeService, IBlock } from '@subql/node-core';
 import { EthereumProjectDs } from '../../configure/SubqueryProject';
 import { IndexerManager } from '../indexer.manager';
 import { BlockContent } from '../types';
@@ -15,10 +15,10 @@ export type WorkerStatusResponse = {
 export declare class WorkerService extends BaseWorkerService<BlockContent, FetchBlockResponse, SubqlEthereumDataSource, {}> {
     private apiService;
     private indexerManager;
-    constructor(apiService: ApiService, indexerManager: IndexerManager, projectService: IProjectService<EthereumProjectDs>, projectUpgradeService: IProjectUpgradeService, nodeConfig: NodeConfig);
-    protected fetchChainBlock(heights: number, extra: {}): Promise<BlockContent>;
+    constructor(apiService: ApiService<any, any, IBlock<any>[]>, indexerManager: IndexerManager, projectService: IProjectService<EthereumProjectDs>, projectUpgradeService: IProjectUpgradeService, nodeConfig: NodeConfig);
+    protected fetchChainBlock(heights: number, extra: {}): Promise<IBlock<BlockContent>>;
     protected toBlockResponse(block: BlockContent): {
         parentHash: string;
     };
-    protected processFetchedBlock(block: BlockContent, dataSources: SubqlEthereumDataSource[]): Promise<ProcessBlockResponse>;
+    protected processFetchedBlock(block: IBlock<BlockContent>, dataSources: SubqlEthereumDataSource[]): Promise<ProcessBlockResponse>;
 }

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

@@ -26,7 +26,7 @@ let WorkerService = class WorkerService extends node_core_1.BaseWorkerService {
     }
     async fetchChainBlock(heights, extra) {
         const [block] = await this.apiService.fetchBlocks([heights]);
-        return block;
+        return block.block;
     }
     toBlockResponse(block) {
         return {

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":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AAEpD,gDAO0B;AAE1B,wDAAoD;AAa7C,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,6BAKlC;IACC,YACU,UAAsB,EACtB,cAA8B,EAEtC,cAAkD,EAElD,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;IAES,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,UAAU;SAC7B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,KAAmB,EACnB,WAAsC;QAEtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AAtCY,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,CAsCzB;AAtCY,sCAAa","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { SubqlEthereumDataSource } from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  IProjectService,\n  ProcessBlockResponse,\n  ApiService,\n  BaseWorkerService,\n  IProjectUpgradeService,\n} from '@subql/node-core';\nimport { EthereumProjectDs } from '../../configure/SubqueryProject';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\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\n@Injectable()\nexport class WorkerService extends BaseWorkerService<\n  BlockContent,\n  FetchBlockResponse,\n  SubqlEthereumDataSource,\n  {}\n> {\n  constructor(\n    private apiService: ApiService,\n    private indexerManager: IndexerManager,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    nodeConfig: NodeConfig,\n  ) {\n    super(projectService, projectUpgradeService, nodeConfig);\n  }\n\n  protected async fetchChainBlock(\n    heights: number,\n    extra: {},\n  ): Promise<BlockContent> {\n    const [block] = await this.apiService.fetchBlocks([heights]);\n    return block;\n  }\n\n  protected toBlockResponse(block: BlockContent): { parentHash: string } {\n    return {\n      parentHash: block.parentHash,\n    };\n  }\n\n  protected async processFetchedBlock(\n    block: BlockContent,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(block, dataSources);\n  }\n}\n"]}
+{"version":3,"file":"worker.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AAEpD,gDAQ0B;AAE1B,wDAAoD;AAa7C,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,6BAKlC;IACC,YACU,UAA+C,EAC/C,cAA8B,EAEtC,cAAkD,EAElD,qBAA6C,EAC7C,UAAsB;QAEtB,KAAK,CAAC,cAAc,EAAE,qBAAqB,EAAE,UAAU,CAAC,CAAC;QARjD,eAAU,GAAV,UAAU,CAAqC;QAC/C,mBAAc,GAAd,cAAc,CAAgB;IAQxC,CAAC;IAES,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,KAAK,CAAC;IACrB,CAAC;IAES,eAAe,CAAC,KAAmB;QAC3C,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,KAA2B,EAC3B,WAAsC;QAEtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AAtCY,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,CAsCzB;AAtCY,sCAAa","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { SubqlEthereumDataSource } from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  IProjectService,\n  ProcessBlockResponse,\n  ApiService,\n  BaseWorkerService,\n  IProjectUpgradeService,\n  IBlock,\n} from '@subql/node-core';\nimport { EthereumProjectDs } from '../../configure/SubqueryProject';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\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\n@Injectable()\nexport class WorkerService extends BaseWorkerService<\n  BlockContent,\n  FetchBlockResponse,\n  SubqlEthereumDataSource,\n  {}\n> {\n  constructor(\n    private apiService: ApiService<any, any, IBlock<any>[]>,\n    private indexerManager: IndexerManager,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    nodeConfig: NodeConfig,\n  ) {\n    super(projectService, projectUpgradeService, nodeConfig);\n  }\n\n  protected async fetchChainBlock(\n    heights: number,\n    extra: {},\n  ): Promise<IBlock<BlockContent>> {\n    const [block] = await this.apiService.fetchBlocks([heights]);\n    return block.block;\n  }\n\n  protected toBlockResponse(block: BlockContent): { parentHash: string } {\n    return {\n      parentHash: block.parentHash,\n    };\n  }\n\n  protected async processFetchedBlock(\n    block: IBlock<BlockContent>,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(block, dataSources);\n  }\n}\n"]}

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

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

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

@@ -24,12 +24,8 @@ let WorkerUnfinalizedBlocksService = class WorkerUnfinalizedBlocksService {
     async processUnfinalizedBlockHeader(header) {
         return this.host.unfinalizedBlocksProcess(header);
     }
-    async processUnfinalizedBlocks({ hash, number, parentHash, }) {
-        return this.host.unfinalizedBlocksProcess({
-            blockHash: hash,
-            blockHeight: number,
-            parentHash,
-        });
+    async processUnfinalizedBlocks(block) {
+        return this.host.unfinalizedBlocksProcess(block.getHeader());
     }
     // eslint-disable-next-line @typescript-eslint/promise-function-async
     init(reindex) {