@subql/node-ethereum 2.1.3-0 → 2.1.3-2

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

@@ -1,8 +1,7 @@
 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 { EthereumBlockWrapper, SubqlRuntimeDatasource } from '@subql/types-ethereum';
+import { EthereumTransaction, EthereumLog, EthereumBlockWrapper, EthereumBlock, SubqlRuntimeDatasource, EthereumBlockFilter, EthereumLogFilter, EthereumTransactionFilter } from '@subql/types-ethereum';
 import { SubqlProjectDs } from '../configure/SubqueryProject';
-import { EthereumBlockWrapped } from '../ethereum/block.ethereum';
 import SafeEthProvider from '../ethereum/safe-api';
 import { asSecondLayerHandlerProcessor_1_0_0, DsProcessorService } from './ds-processor.service';
 import { DynamicDsService } from './dynamic-ds.service';
@@ -25,7 +24,6 @@ export declare class IndexerManager extends BaseIndexerManager<ApiService, SafeE
     private indexTransaction;
     private indexEvent;
     protected prepareFilteredData(kind: EthereumHandlerKind, data: any, ds: SubqlRuntimeDatasource): Promise<any>;
-    protected baseCustomHandlerFilter(kind: EthereumHandlerKind, data: any, baseFilter: any): boolean;
 }
 type ProcessorTypeMap = {
     [EthereumHandlerKind.Block]: typeof isBlockHandlerProcessor;
@@ -38,8 +36,8 @@ declare const ProcessorTypeMap: {
     "ethereum/TransactionHandler": typeof isCallHandlerProcessor;
 };
 declare const FilterTypeMap: {
-    "ethereum/BlockHandler": typeof EthereumBlockWrapped.filterBlocksProcessor;
-    "ethereum/LogHandler": typeof EthereumBlockWrapped.filterLogsProcessor;
-    "ethereum/TransactionHandler": typeof EthereumBlockWrapped.filterTransactionsProcessor;
+    "ethereum/BlockHandler": (data: EthereumBlock, filter: EthereumBlockFilter, ds: SubqlEthereumDataSource) => boolean;
+    "ethereum/LogHandler": (data: EthereumLog, filter: EthereumLogFilter, ds: SubqlEthereumDataSource) => boolean;
+    "ethereum/TransactionHandler": (data: EthereumTransaction, filter: EthereumTransactionFilter, ds: SubqlEthereumDataSource) => boolean;
 };
 export {};

package/dist/indexer/indexer.manager.js

@@ -76,21 +76,10 @@ let IndexerManager = class IndexerManager extends node_core_1.BaseIndexerManager
             await this.indexData(common_ethereum_1.EthereumHandlerKind.Event, log, ds, getVM);
         }
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async prepareFilteredData(kind, data, ds) {
         return DataAbiParser[kind](this.apiService.api)(data, ds);
     }
-    baseCustomHandlerFilter(kind, data, baseFilter) {
-        switch (kind) {
-            case common_ethereum_1.EthereumHandlerKind.Block:
-                return block_ethereum_1.EthereumBlockWrapped.filterBlocksProcessor(data, baseFilter);
-            case common_ethereum_1.EthereumHandlerKind.Call:
-                return block_ethereum_1.EthereumBlockWrapped.filterTransactionsProcessor(data, baseFilter);
-            case common_ethereum_1.EthereumHandlerKind.Event:
-                return block_ethereum_1.EthereumBlockWrapped.filterLogsProcessor(data, baseFilter);
-            default:
-                throw new Error('Unsupported handler kind');
-        }
-    }
 };
 __decorate([
     (0, node_core_1.profiler)(yargs_1.yargsOptions.argv.profiler),
@@ -116,9 +105,15 @@ const ProcessorTypeMap = {
     [common_ethereum_1.EthereumHandlerKind.Call]: common_ethereum_1.isCallHandlerProcessor,
 };
 const FilterTypeMap = {
-    [common_ethereum_1.EthereumHandlerKind.Block]: block_ethereum_1.EthereumBlockWrapped.filterBlocksProcessor,
-    [common_ethereum_1.EthereumHandlerKind.Event]: block_ethereum_1.EthereumBlockWrapped.filterLogsProcessor,
-    [common_ethereum_1.EthereumHandlerKind.Call]: block_ethereum_1.EthereumBlockWrapped.filterTransactionsProcessor,
+    [common_ethereum_1.EthereumHandlerKind.Block]: (data, filter, ds) => {
+        var _a;
+        return block_ethereum_1.EthereumBlockWrapped.filterBlocksProcessor(data, filter, (_a = ds.options) === null || _a === void 0 ? void 0 : _a.address);
+    },
+    [common_ethereum_1.EthereumHandlerKind.Event]: (data, filter, ds) => { var _a; return block_ethereum_1.EthereumBlockWrapped.filterLogsProcessor(data, filter, (_a = ds.options) === null || _a === void 0 ? void 0 : _a.address); },
+    [common_ethereum_1.EthereumHandlerKind.Call]: (data, filter, ds) => {
+        var _a;
+        return block_ethereum_1.EthereumBlockWrapped.filterTransactionsProcessor(data, filter, (_a = ds.options) === null || _a === void 0 ? void 0 : _a.address);
+    },
 };
 const DataAbiParser = {
     [common_ethereum_1.EthereumHandlerKind.Block]: () => (data) => data,

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

@@ -1 +1 @@
-{"version":3,"file":"indexer.manager.js","sourceRoot":"","sources":["../../src/indexer/indexer.manager.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAAoD;AACpD,4DAUgC;AAChC,gDAQ0B;AAU1B,+DAAkE;AAElE,oCAAwC;AACxC,iEAGgC;AAChC,6DAAwD;AACxD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AAEvE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,SAAS,CAAC,CAAC;AAG7B,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,8BASnC;IAKC,YACE,UAAsB,EACtB,UAAsB,EACtB,cAA8B,EAC9B,kBAAsC,EACtC,gBAAkC,EAClC,wBAAkD,EACf,cAA8B;QAEjE,KAAK,CACH,UAAU,EACV,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,CACjB,CAAC;QAXiC,mBAAc,GAAd,cAAc,CAAgB;QAXzD,gBAAW,GAAG,6BAAW,CAAC;QAC1B,eAAU,GAAG,4BAAU,CAAC;QACxB,0BAAqB,GAAG,0DAAmC,CAAC;IAqBtE,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACzC,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CACd,KAA2B,EAC3B,WAAsC;QAEtC,OAAO,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,CACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CACnB,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,KAA2B;QACxC,OAAO,KAAK,CAAC,WAAW,CAAC;IAC3B,CAAC;IAED,YAAY,CAAC,KAA2B;QACtC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,4DAA4D;IACpD,KAAK,CAAC,MAAM,CAAC,KAA2B;QAC9C,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;IAES,KAAK,CAAC,cAAc,CAC5B,EAAE,KAAK,EAAE,YAAY,EAAwB,EAC7C,WAA6B,EAC7B,KAAqD;;QAErD,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAExD,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE;YAC7B,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAEpD,KAAK,MAAM,GAAG,IAAI,MAAA,EAAE,CAAC,IAAI,mCAAI,EAAE,EAAE;gBAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;aAChD;SACF;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,KAAoB,EACpB,WAA6B,EAC7B,KAAqD;QAErD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,qCAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;SACnE;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,EAAuB,EACvB,WAA6B,EAC7B,KAAqD;QAErD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,qCAAmB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;SAC/D;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,GAAgB,EAChB,WAA6B,EAC7B,KAAqD;QAErD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,qCAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;SACjE;IACH,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,IAAyB,EACzB,IAAS,EACT,EAA0B;QAE1B,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAES,uBAAuB,CAC/B,IAAyB,EACzB,IAAS,EACT,UAAe;QAEf,QAAQ,IAAI,EAAE;YACZ,KAAK,qCAAmB,CAAC,KAAK;gBAC5B,OAAO,qCAAoB,CAAC,qBAAqB,CAC/C,IAAqB,EACrB,UAAU,CACX,CAAC;YACJ,KAAK,qCAAmB,CAAC,IAAI;gBAC3B,OAAO,qCAAoB,CAAC,2BAA2B,CACrD,IAA2B,EAC3B,UAAU,CACX,CAAC;YACJ,KAAK,qCAAmB,CAAC,KAAK;gBAC5B,OAAO,qCAAoB,CAAC,mBAAmB,CAC7C,IAAmB,EACnB,UAAU,CACX,CAAC;YACJ;gBACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC/C;IACH,CAAC;CACF,CAAA;AArGO;IADL,IAAA,oBAAQ,EAAC,oBAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;;;;gDAQpC;AAhDU,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAsBR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;qCANd,sBAAU;QACV,sBAAU;QACN,gCAAc;QACV,yCAAkB;QACpB,qCAAgB;QACR,oDAAwB;QACC,gCAAc;GArBxD,cAAc,CA8I1B;AA9IY,wCAAc;AAsJ3B,MAAM,gBAAgB,GAAG;IACvB,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,yCAAuB;IACpD,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,yCAAuB;IACpD,CAAC,qCAAmB,CAAC,IAAI,CAAC,EAAE,wCAAsB;CACnD,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,qCAAoB,CAAC,qBAAqB;IACvE,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,qCAAoB,CAAC,mBAAmB;IACrE,CAAC,qCAAmB,CAAC,IAAI,CAAC,EAAE,qCAAoB,CAAC,2BAA2B;CAC7E,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,IAAmB,EAAE,EAAE,CAAC,IAAI;IAChE,CAAC,qCAAmB,CAAC,KAAK,CAAC,EACzB,CAAC,GAAgB,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAA0B,EAAE,EAAE,CACtE,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;IAC1B,CAAC,qCAAmB,CAAC,IAAI,CAAC,EACxB,CAAC,GAAgB,EAAE,EAAE,CACrB,CAAC,IAAyB,EAAE,EAA0B,EAAE,EAAE,CACxD,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;CACnC,CAAC","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.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  EthereumBlockWrapper,\n  EthereumBlock,\n  SubqlRuntimeDatasource,\n} from '@subql/types-ethereum';\nimport { SubqlProjectDs } from '../configure/SubqueryProject';\nimport { EthereumApi } from '../ethereum';\nimport { EthereumBlockWrapped } from '../ethereum/block.ethereum';\nimport SafeEthProvider from '../ethereum/safe-api';\nimport { yargsOptions } from '../yargs';\nimport {\n  asSecondLayerHandlerProcessor_1_0_0,\n  DsProcessorService,\n} from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\nconst logger = getLogger('indexer');\n\n@Injectable()\nexport class IndexerManager extends BaseIndexerManager<\n  ApiService,\n  SafeEthProvider,\n  EthereumBlockWrapper,\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    @Inject('IProjectService') private projectService: ProjectService,\n  ) {\n    super(\n      apiService,\n      nodeConfig,\n      sandboxService,\n      dsProcessorService,\n      dynamicDsService,\n      unfinalizedBlocksService,\n      FilterTypeMap,\n      ProcessorTypeMap,\n    );\n  }\n\n  async start(): Promise<void> {\n    await this.projectService.init();\n    logger.info('indexer manager started');\n  }\n\n  @profiler(yargsOptions.argv.profiler)\n  async indexBlock(\n    block: EthereumBlockWrapper,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return super.internalIndexBlock(block, dataSources, () =>\n      this.getApi(block),\n    );\n  }\n\n  getBlockHeight(block: EthereumBlockWrapper): number {\n    return block.blockHeight;\n  }\n\n  getBlockHash(block: EthereumBlockWrapper): string {\n    return block.block.hash;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  private async getApi(block: EthereumBlockWrapper): Promise<SafeEthProvider> {\n    return this.apiService.api.getSafeApi(this.getBlockHeight(block));\n  }\n\n  protected async indexBlockData(\n    { block, transactions }: EthereumBlockWrapper,\n    dataSources: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    await this.indexBlockContent(block, dataSources, getVM);\n\n    for (const tx of 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  }\n\n  private async indexBlockContent(\n    block: EthereumBlock,\n    dataSources: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => 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: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => 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,\n    dataSources: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    for (const ds of dataSources) {\n      await this.indexData(EthereumHandlerKind.Event, log, ds, getVM);\n    }\n  }\n\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  protected baseCustomHandlerFilter(\n    kind: EthereumHandlerKind,\n    data: any,\n    baseFilter: any,\n  ): boolean {\n    switch (kind) {\n      case EthereumHandlerKind.Block:\n        return EthereumBlockWrapped.filterBlocksProcessor(\n          data as EthereumBlock,\n          baseFilter,\n        );\n      case EthereumHandlerKind.Call:\n        return EthereumBlockWrapped.filterTransactionsProcessor(\n          data as EthereumTransaction,\n          baseFilter,\n        );\n      case EthereumHandlerKind.Event:\n        return EthereumBlockWrapped.filterLogsProcessor(\n          data as EthereumLog,\n          baseFilter,\n        );\n      default:\n        throw new Error('Unsupported handler kind');\n    }\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]: EthereumBlockWrapped.filterBlocksProcessor,\n  [EthereumHandlerKind.Event]: EthereumBlockWrapped.filterLogsProcessor,\n  [EthereumHandlerKind.Call]: EthereumBlockWrapped.filterTransactionsProcessor,\n};\n\nconst DataAbiParser = {\n  [EthereumHandlerKind.Block]: () => (data: EthereumBlock) => data,\n  [EthereumHandlerKind.Event]:\n    (api: EthereumApi) => (data: EthereumLog, 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":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAAoD;AACpD,4DAUgC;AAChC,gDAQ0B;AAa1B,+DAAkE;AAElE,oCAAwC;AACxC,iEAGgC;AAChC,6DAAwD;AACxD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AAEvE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,SAAS,CAAC,CAAC;AAG7B,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,8BASnC;IAKC,YACE,UAAsB,EACtB,UAAsB,EACtB,cAA8B,EAC9B,kBAAsC,EACtC,gBAAkC,EAClC,wBAAkD,EACf,cAA8B;QAEjE,KAAK,CACH,UAAU,EACV,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,aAAa,EACb,gBAAgB,CACjB,CAAC;QAXiC,mBAAc,GAAd,cAAc,CAAgB;QAXzD,gBAAW,GAAG,6BAAW,CAAC;QAC1B,eAAU,GAAG,4BAAU,CAAC;QACxB,0BAAqB,GAAG,0DAAmC,CAAC;IAqBtE,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACzC,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CACd,KAA2B,EAC3B,WAAsC;QAEtC,OAAO,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,CACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CACnB,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,KAA2B;QACxC,OAAO,KAAK,CAAC,WAAW,CAAC;IAC3B,CAAC;IAED,YAAY,CAAC,KAA2B;QACtC,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,4DAA4D;IACpD,KAAK,CAAC,MAAM,CAAC,KAA2B;QAC9C,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;IAES,KAAK,CAAC,cAAc,CAC5B,EAAE,KAAK,EAAE,YAAY,EAAwB,EAC7C,WAA6B,EAC7B,KAAqD;;QAErD,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAExD,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE;YAC7B,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAEpD,KAAK,MAAM,GAAG,IAAI,MAAA,EAAE,CAAC,IAAI,mCAAI,EAAE,EAAE;gBAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;aAChD;SACF;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,KAAoB,EACpB,WAA6B,EAC7B,KAAqD;QAErD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,qCAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;SACnE;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,EAAuB,EACvB,WAA6B,EAC7B,KAAqD;QAErD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,qCAAmB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;SAC/D;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,GAAgB,EAChB,WAA6B,EAC7B,KAAqD;QAErD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,qCAAmB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;SACjE;IACH,CAAC;IAED,4DAA4D;IAClD,KAAK,CAAC,mBAAmB,CACjC,IAAyB,EACzB,IAAS,EACT,EAA0B;QAE1B,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AA5EO;IADL,IAAA,oBAAQ,EAAC,oBAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;;;;gDAQpC;AAhDU,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAsBR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;qCANd,sBAAU;QACV,sBAAU;QACN,gCAAc;QACV,yCAAkB;QACpB,qCAAgB;QACR,oDAAwB;QACC,gCAAc;GArBxD,cAAc,CAqH1B;AArHY,wCAAc;AA6H3B,MAAM,gBAAgB,GAAG;IACvB,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,yCAAuB;IACpD,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,yCAAuB;IACpD,CAAC,qCAAmB,CAAC,IAAI,CAAC,EAAE,wCAAsB;CACnD,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,CAC3B,IAAmB,EACnB,MAA2B,EAC3B,EAA2B,EAC3B,EAAE;;QACF,OAAA,qCAAoB,CAAC,qBAAqB,CACxC,IAAI,EACJ,MAAM,EACN,MAAA,EAAE,CAAC,OAAO,0CAAE,OAAO,CACpB,CAAA;KAAA;IACH,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,CAC3B,IAAiB,EACjB,MAAyB,EACzB,EAA2B,EAC3B,EAAE,WACF,OAAA,qCAAoB,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAA,EAAE,CAAC,OAAO,0CAAE,OAAO,CAAC,CAAA,EAAA;IAC7E,CAAC,qCAAmB,CAAC,IAAI,CAAC,EAAE,CAC1B,IAAyB,EACzB,MAAiC,EACjC,EAA2B,EAC3B,EAAE;;QACF,OAAA,qCAAoB,CAAC,2BAA2B,CAC9C,IAAI,EACJ,MAAM,EACN,MAAA,EAAE,CAAC,OAAO,0CAAE,OAAO,CACpB,CAAA;KAAA;CACJ,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,CAAC,qCAAmB,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,IAAmB,EAAE,EAAE,CAAC,IAAI;IAChE,CAAC,qCAAmB,CAAC,KAAK,CAAC,EACzB,CAAC,GAAgB,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAA0B,EAAE,EAAE,CACtE,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;IAC1B,CAAC,qCAAmB,CAAC,IAAI,CAAC,EACxB,CAAC,GAAgB,EAAE,EAAE,CACrB,CAAC,IAAyB,EAAE,EAA0B,EAAE,EAAE,CACxD,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC;CACnC,CAAC","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.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  EthereumBlockWrapper,\n  EthereumBlock,\n  SubqlRuntimeDatasource,\n  EthereumBlockFilter,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n} from '@subql/types-ethereum';\nimport { SubqlProjectDs } from '../configure/SubqueryProject';\nimport { EthereumApi } from '../ethereum';\nimport { EthereumBlockWrapped } from '../ethereum/block.ethereum';\nimport SafeEthProvider from '../ethereum/safe-api';\nimport { yargsOptions } from '../yargs';\nimport {\n  asSecondLayerHandlerProcessor_1_0_0,\n  DsProcessorService,\n} from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\nconst logger = getLogger('indexer');\n\n@Injectable()\nexport class IndexerManager extends BaseIndexerManager<\n  ApiService,\n  SafeEthProvider,\n  EthereumBlockWrapper,\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    @Inject('IProjectService') private projectService: ProjectService,\n  ) {\n    super(\n      apiService,\n      nodeConfig,\n      sandboxService,\n      dsProcessorService,\n      dynamicDsService,\n      unfinalizedBlocksService,\n      FilterTypeMap,\n      ProcessorTypeMap,\n    );\n  }\n\n  async start(): Promise<void> {\n    await this.projectService.init();\n    logger.info('indexer manager started');\n  }\n\n  @profiler(yargsOptions.argv.profiler)\n  async indexBlock(\n    block: EthereumBlockWrapper,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return super.internalIndexBlock(block, dataSources, () =>\n      this.getApi(block),\n    );\n  }\n\n  getBlockHeight(block: EthereumBlockWrapper): number {\n    return block.blockHeight;\n  }\n\n  getBlockHash(block: EthereumBlockWrapper): string {\n    return block.block.hash;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  private async getApi(block: EthereumBlockWrapper): Promise<SafeEthProvider> {\n    return this.apiService.api.getSafeApi(this.getBlockHeight(block));\n  }\n\n  protected async indexBlockData(\n    { block, transactions }: EthereumBlockWrapper,\n    dataSources: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => Promise<IndexerSandbox>,\n  ): Promise<void> {\n    await this.indexBlockContent(block, dataSources, getVM);\n\n    for (const tx of 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  }\n\n  private async indexBlockContent(\n    block: EthereumBlock,\n    dataSources: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => 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: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => 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,\n    dataSources: SubqlProjectDs[],\n    getVM: (d: SubqlProjectDs) => 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  ) =>\n    EthereumBlockWrapped.filterBlocksProcessor(\n      data,\n      filter,\n      ds.options?.address,\n    ),\n  [EthereumHandlerKind.Event]: (\n    data: EthereumLog,\n    filter: EthereumLogFilter,\n    ds: SubqlEthereumDataSource,\n  ) =>\n    EthereumBlockWrapped.filterLogsProcessor(data, filter, ds.options?.address),\n  [EthereumHandlerKind.Call]: (\n    data: EthereumTransaction,\n    filter: EthereumTransactionFilter,\n    ds: SubqlEthereumDataSource,\n  ) =>\n    EthereumBlockWrapped.filterTransactionsProcessor(\n      data,\n      filter,\n      ds.options?.address,\n    ),\n};\n\nconst DataAbiParser = {\n  [EthereumHandlerKind.Block]: () => (data: EthereumBlock) => data,\n  [EthereumHandlerKind.Event]:\n    (api: EthereumApi) => (data: EthereumLog, 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subql/node-ethereum",
-  "version": "2.1.3-0",
+  "version": "2.1.3-2",
   "description": "",
   "author": "Ian He",
   "license": "Apache-2.0",
@@ -26,7 +26,7 @@
     "@nestjs/schedule": "^1.0.2",
     "@subql/common": "^2.1.1",
     "@subql/common-ethereum": "2.1.0",
-    "@subql/node-core": "^2.1.3",
+    "@subql/node-core": "^2.1.4-2",
     "@subql/testing": "^2.0.0",
     "@subql/types": "^2.1.2",
     "@subql/types-ethereum": "2.1.1-0",
@@ -67,5 +67,5 @@
     "/dist",
     "/bin"
   ],
-  "stableVersion": "2.1.2"
+  "stableVersion": "2.1.3-1"
 }