@subql/node-ethereum 4.1.1 → 4.1.2-1

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

@@ -1,8 +1,7 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { NodeConfig, SmartBatchService, StoreCacheService, StoreService, IProjectService, BlockDispatcher, ProcessBlockResponse, ApiService, IProjectUpgradeService, PoiSyncService, IBlock } from '@subql/node-core';
+import { NodeConfig, StoreCacheService, StoreService, IProjectService, BlockDispatcher, ProcessBlockResponse, ApiService, IProjectUpgradeService, PoiSyncService, IBlock } from '@subql/node-core';
 import { EthereumProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
-import { DynamicDsService } from '../dynamic-ds.service';
 import { IndexerManager } from '../indexer.manager';
 import { BlockContent } from '../types';
 /**
@@ -10,6 +9,6 @@ import { BlockContent } from '../types';
  */
 export declare class BlockDispatcherService extends BlockDispatcher<BlockContent, EthereumProjectDs> implements OnApplicationShutdown {
     private indexerManager;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService<EthereumProjectDs>, projectUpgradeService: IProjectUpgradeService, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiSyncService: PoiSyncService, project: SubqueryProject, dynamicDsService: DynamicDsService);
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService<EthereumProjectDs>, projectUpgradeService: IProjectUpgradeService, storeService: StoreService, storeCacheService: StoreCacheService, poiSyncService: PoiSyncService, project: SubqueryProject);
     protected indexBlock(block: IBlock<BlockContent>): Promise<ProcessBlockResponse>;
 }

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

@@ -19,14 +19,13 @@ const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const node_core_1 = require("@subql/node-core");
 const SubqueryProject_1 = require("../../configure/SubqueryProject");
-const dynamic_ds_service_1 = require("../dynamic-ds.service");
 const indexer_manager_1 = require("../indexer.manager");
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
 let BlockDispatcherService = class BlockDispatcherService extends node_core_1.BlockDispatcher {
-    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiSyncService, project, dynamicDsService) {
-        super(nodeConfig, eventEmitter, projectService, projectUpgradeService, smartBatchService, storeService, storeCacheService, poiSyncService, project, dynamicDsService, apiService.fetchBlocks.bind(apiService));
+    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService, projectUpgradeService, storeService, storeCacheService, poiSyncService, project) {
+        super(nodeConfig, eventEmitter, projectService, projectUpgradeService, storeService, storeCacheService, poiSyncService, project, apiService.fetchBlocks.bind(apiService));
         this.indexerManager = indexerManager;
     }
     async indexBlock(block) {
@@ -37,16 +36,14 @@ BlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
     __param(4, (0, common_1.Inject)('IProjectService')),
     __param(5, (0, common_1.Inject)('IProjectUpgradeService')),
-    __param(10, (0, common_1.Inject)('ISubqueryProject')),
+    __param(9, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.NodeConfig,
         indexer_manager_1.IndexerManager,
-        event_emitter_1.EventEmitter2, Object, Object, node_core_1.SmartBatchService,
-        node_core_1.StoreService,
+        event_emitter_1.EventEmitter2, Object, Object, node_core_1.StoreService,
         node_core_1.StoreCacheService,
         node_core_1.PoiSyncService,
-        SubqueryProject_1.SubqueryProject,
-        dynamic_ds_service_1.DynamicDsService])
+        SubqueryProject_1.SubqueryProject])
 ], BlockDispatcherService);
 exports.BlockDispatcherService = BlockDispatcherService;
 //# sourceMappingURL=block-dispatcher.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAA2E;AAC3E,yDAAsD;AACtD,gDAY0B;AAC1B,qEAGyC;AACzC,8DAAyD;AACzD,wDAAoD;AAGpD;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBACX,SAAQ,2BAAgD;IAGxD,YACE,UAAsB,EACtB,UAAsB,EACd,cAA8B,EACtC,YAA2B,EAE3B,cAAkD,EAElD,qBAA6C,EAC7C,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,cAA8B,EACF,OAAwB,EACpD,gBAAkC;QAElC,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,gBAAgB,EAChB,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CACxC,CAAC;QAzBM,mBAAc,GAAd,cAAc,CAAgB;IA0BxC,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,KAA2B;QAE3B,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,KAAK,EACL,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,CACxE,CAAC;IACJ,CAAC;CACF,CAAA;AA3CY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAMhC,YAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAZf,sBAAU;QACV,sBAAU;QACE,gCAAc;QACxB,6BAAa,kBAKR,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACpB,0BAAc;QACO,iCAAe;QAClC,qCAAgB;GAlBzB,sBAAsB,CA2ClC;AA3CY,wDAAsB","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  SmartBatchService,\n  StoreCacheService,\n  StoreService,\n  IProjectService,\n  BlockDispatcher,\n  ProcessBlockResponse,\n  ApiService,\n  IProjectUpgradeService,\n  PoiSyncService,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BlockDispatcher<BlockContent, EthereumProjectDs>\n  implements OnApplicationShutdown\n{\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiSyncService: PoiSyncService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgradeService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiSyncService,\n      project,\n      dynamicDsService,\n      apiService.fetchBlocks.bind(apiService),\n    );\n  }\n\n  protected async indexBlock(\n    block: IBlock<BlockContent>,\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(\n      block,\n      await this.projectService.getDataSources(block.getHeader().blockHeight),\n    );\n  }\n}\n"]}
+{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAA2E;AAC3E,yDAAsD;AACtD,gDAW0B;AAC1B,qEAGyC;AACzC,wDAAoD;AAGpD;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBACX,SAAQ,2BAAgD;IAGxD,YACE,UAAsB,EACtB,UAAsB,EACd,cAA8B,EACtC,YAA2B,EAE3B,cAAkD,EAElD,qBAA6C,EAC7C,YAA0B,EAC1B,iBAAoC,EACpC,cAA8B,EACF,OAAwB;QAEpD,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,qBAAqB,EACrB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CACxC,CAAC;QArBM,mBAAc,GAAd,cAAc,CAAgB;IAsBxC,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,KAA2B;QAE3B,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,KAAK,EACL,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,CACxE,CAAC;IACJ,CAAC;CACF,CAAA;AAvCY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAKhC,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAXf,sBAAU;QACV,sBAAU;QACE,gCAAc;QACxB,6BAAa,kBAKb,wBAAY;QACP,6BAAiB;QACpB,0BAAc;QACO,iCAAe;GAhB3C,sBAAsB,CAuClC;AAvCY,wDAAsB","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  StoreCacheService,\n  StoreService,\n  IProjectService,\n  BlockDispatcher,\n  ProcessBlockResponse,\n  ApiService,\n  IProjectUpgradeService,\n  PoiSyncService,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BlockDispatcher<BlockContent, EthereumProjectDs>\n  implements OnApplicationShutdown\n{\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiSyncService: PoiSyncService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgradeService,\n      storeService,\n      storeCacheService,\n      poiSyncService,\n      project,\n      apiService.fetchBlocks.bind(apiService),\n    );\n  }\n\n  protected async indexBlock(\n    block: IBlock<BlockContent>,\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(\n      block,\n      await this.projectService.getDataSources(block.getHeader().blockHeight),\n    );\n  }\n}\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"ethereum-block-dispatcher.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/ethereum-block-dispatcher.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { IBlockDispatcher, IBlock } from '@subql/node-core';\nimport { EthereumBlock } from '@subql/types-ethereum';\n\nexport interface IEthereumBlockDispatcher\n  extends IBlockDispatcher<EthereumBlock> {\n  init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;\n}\n"]}
+{"version":3,"file":"ethereum-block-dispatcher.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/ethereum-block-dispatcher.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { IBlockDispatcher } from '@subql/node-core';\nimport { EthereumBlock } from '@subql/types-ethereum';\n\nexport interface IEthereumBlockDispatcher\n  extends IBlockDispatcher<EthereumBlock> {\n  init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;\n}\n"]}

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

@@ -1,6 +1,6 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { NodeConfig, SmartBatchService, StoreService, StoreCacheService, IProjectService, WorkerBlockDispatcher, ConnectionPoolStateManager, IProjectUpgradeService, PoiSyncService, InMemoryCacheService } from '@subql/node-core';
+import { NodeConfig, StoreService, StoreCacheService, IProjectService, WorkerBlockDispatcher, ConnectionPoolStateManager, IProjectUpgradeService, PoiSyncService, InMemoryCacheService } from '@subql/node-core';
 import { EthereumBlock } from '@subql/types-ethereum';
 import { EthereumProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
 import { EthereumApiConnection } from '../../ethereum/api.connection';
@@ -11,7 +11,7 @@ type IndexerWorker = IIndexerWorker & {
     terminate: () => Promise<number>;
 };
 export declare class WorkerBlockDispatcherService extends WorkerBlockDispatcher<EthereumProjectDs, IndexerWorker, EthereumBlock> implements OnApplicationShutdown {
-    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService<EthereumProjectDs>, projectUpgadeService: IProjectUpgradeService, smartBatchService: SmartBatchService, cacheService: InMemoryCacheService, storeService: StoreService, storeCacheService: StoreCacheService, poiSyncService: PoiSyncService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService, connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>);
+    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService<EthereumProjectDs>, projectUpgadeService: IProjectUpgradeService, cacheService: InMemoryCacheService, storeService: StoreService, storeCacheService: StoreCacheService, poiSyncService: PoiSyncService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService, connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>);
     protected fetchBlock(worker: IndexerWorker, height: number): Promise<void>;
 }
 export {};

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

@@ -26,8 +26,8 @@ const SubqueryProject_1 = require("../../configure/SubqueryProject");
 const dynamic_ds_service_1 = require("../dynamic-ds.service");
 const unfinalizedBlocks_service_1 = require("../unfinalizedBlocks.service");
 let WorkerBlockDispatcherService = class WorkerBlockDispatcherService extends node_core_1.WorkerBlockDispatcher {
-    constructor(nodeConfig, eventEmitter, projectService, projectUpgadeService, smartBatchService, cacheService, storeService, storeCacheService, poiSyncService, project, dynamicDsService, unfinalizedBlocksSevice, connectionPoolState) {
-        super(nodeConfig, eventEmitter, projectService, projectUpgadeService, smartBatchService, storeService, storeCacheService, poiSyncService, project, dynamicDsService, () => (0, node_core_1.createIndexerWorker)(path_1.default.resolve(__dirname, '../../../dist/indexer/worker/worker.js'), [], storeService.getStore(), cacheService.getCache(), dynamicDsService, unfinalizedBlocksSevice, connectionPoolState, project.root, projectService.startHeight));
+    constructor(nodeConfig, eventEmitter, projectService, projectUpgadeService, cacheService, storeService, storeCacheService, poiSyncService, project, dynamicDsService, unfinalizedBlocksSevice, connectionPoolState) {
+        super(nodeConfig, eventEmitter, projectService, projectUpgadeService, storeService, storeCacheService, poiSyncService, project, () => (0, node_core_1.createIndexerWorker)(path_1.default.resolve(__dirname, '../../../dist/indexer/worker/worker.js'), [], storeService.getStore(), cacheService.getCache(), dynamicDsService, unfinalizedBlocksSevice, connectionPoolState, project.root, projectService.startHeight));
     }
     async fetchBlock(worker, height) {
         await worker.fetchBlock(height, null);
@@ -37,10 +37,9 @@ WorkerBlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)('IProjectService')),
     __param(3, (0, common_1.Inject)('IProjectUpgradeService')),
-    __param(9, (0, common_1.Inject)('ISubqueryProject')),
+    __param(8, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.NodeConfig,
-        event_emitter_1.EventEmitter2, Object, Object, node_core_1.SmartBatchService,
-        node_core_1.InMemoryCacheService,
+        event_emitter_1.EventEmitter2, Object, Object, node_core_1.InMemoryCacheService,
         node_core_1.StoreService,
         node_core_1.StoreCacheService,
         node_core_1.PoiSyncService,

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

@@ -1 +1 @@
-{"version":3,"file":"worker-block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/worker-block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;AAEnC,gDAAwB;AACxB,2CAA2E;AAC3E,yDAAsD;AACtD,gDAY0B;AAE1B,qEAGyC;AAEzC,8DAAyD;AAEzD,4EAAwE;AAQjE,IAAM,4BAA4B,GAAlC,MAAM,4BACX,SAAQ,iCAAsE;IAG9E,YACE,UAAsB,EACtB,YAA2B,EAE3B,cAAkD,EAElD,oBAA4C,EAC5C,iBAAoC,EACpC,YAAkC,EAClC,YAA0B,EAC1B,iBAAoC,EACpC,cAA8B,EACF,OAAwB,EACpD,gBAAkC,EAClC,uBAAiD,EACjD,mBAAsE;QAEtE,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,gBAAgB,EAChB,GAAG,EAAE,CACH,IAAA,+BAAmB,EAMjB,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,EACjE,EAAE,EACF,YAAY,CAAC,QAAQ,EAAE,EACvB,YAAY,CAAC,QAAQ,EAAE,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,OAAO,CAAC,IAAI,EACZ,cAAc,CAAC,WAAW,CAC3B,CACJ,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,MAAqB,EACrB,MAAc;QAEd,MAAM,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AA1DY,4BAA4B;IADxC,IAAA,mBAAU,GAAE;IAQR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAOhC,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAXf,sBAAU;QACR,6BAAa,kBAKR,6BAAiB;QACtB,gCAAoB;QACpB,wBAAY;QACP,6BAAiB;QACpB,0BAAc;QACO,iCAAe;QAClC,qCAAgB;QACT,oDAAwB;QAC5B,sCAA0B;GAnBtC,4BAA4B,CA0DxC;AA1DY,oEAA4B","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport path from 'path';\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  SmartBatchService,\n  StoreService,\n  StoreCacheService,\n  IProjectService,\n  WorkerBlockDispatcher,\n  ConnectionPoolStateManager,\n  IProjectUpgradeService,\n  PoiSyncService,\n  InMemoryCacheService,\n  createIndexerWorker,\n} from '@subql/node-core';\nimport { EthereumBlock } from '@subql/types-ethereum';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../../ethereum/api.connection';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { BlockContent } from '../types';\nimport { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';\nimport { IIndexerWorker } from '../worker/worker';\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\n@Injectable()\nexport class WorkerBlockDispatcherService\n  extends WorkerBlockDispatcher<EthereumProjectDs, IndexerWorker, EthereumBlock>\n  implements OnApplicationShutdown\n{\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgadeService: IProjectUpgradeService,\n    smartBatchService: SmartBatchService,\n    cacheService: InMemoryCacheService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiSyncService: PoiSyncService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksSevice: UnfinalizedBlocksService,\n    connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgadeService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiSyncService,\n      project,\n      dynamicDsService,\n      () =>\n        createIndexerWorker<\n          IIndexerWorker,\n          EthereumApiConnection,\n          BlockContent,\n          EthereumProjectDs\n        >(\n          path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),\n          [],\n          storeService.getStore(),\n          cacheService.getCache(),\n          dynamicDsService,\n          unfinalizedBlocksSevice,\n          connectionPoolState,\n          project.root,\n          projectService.startHeight,\n        ),\n    );\n  }\n\n  protected async fetchBlock(\n    worker: IndexerWorker,\n    height: number,\n  ): Promise<void> {\n    await worker.fetchBlock(height, null);\n  }\n}\n"]}
+{"version":3,"file":"worker-block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/worker-block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;;;;AAEnC,gDAAwB;AACxB,2CAA2E;AAC3E,yDAAsD;AACtD,gDAW0B;AAE1B,qEAGyC;AAEzC,8DAAyD;AAEzD,4EAAwE;AAQjE,IAAM,4BAA4B,GAAlC,MAAM,4BACX,SAAQ,iCAAsE;IAG9E,YACE,UAAsB,EACtB,YAA2B,EAE3B,cAAkD,EAElD,oBAA4C,EAC5C,YAAkC,EAClC,YAA0B,EAC1B,iBAAoC,EACpC,cAA8B,EACF,OAAwB,EACpD,gBAAkC,EAClC,uBAAiD,EACjD,mBAAsE;QAEtE,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,GAAG,EAAE,CACH,IAAA,+BAAmB,EAMjB,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wCAAwC,CAAC,EACjE,EAAE,EACF,YAAY,CAAC,QAAQ,EAAE,EACvB,YAAY,CAAC,QAAQ,EAAE,EACvB,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,EACnB,OAAO,CAAC,IAAI,EACZ,cAAc,CAAC,WAAW,CAC3B,CACJ,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,MAAqB,EACrB,MAAc;QAEd,MAAM,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAvDY,4BAA4B;IADxC,IAAA,mBAAU,GAAE;IAQR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;IAMhC,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCAVf,sBAAU;QACR,6BAAa,kBAKb,gCAAoB;QACpB,wBAAY;QACP,6BAAiB;QACpB,0BAAc;QACO,iCAAe;QAClC,qCAAgB;QACT,oDAAwB;QAC5B,sCAA0B;GAlBtC,4BAA4B,CAuDxC;AAvDY,oEAA4B","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport path from 'path';\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  StoreService,\n  StoreCacheService,\n  IProjectService,\n  WorkerBlockDispatcher,\n  ConnectionPoolStateManager,\n  IProjectUpgradeService,\n  PoiSyncService,\n  InMemoryCacheService,\n  createIndexerWorker,\n} from '@subql/node-core';\nimport { EthereumBlock } from '@subql/types-ethereum';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../../ethereum/api.connection';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { BlockContent } from '../types';\nimport { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';\nimport { IIndexerWorker } from '../worker/worker';\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\n@Injectable()\nexport class WorkerBlockDispatcherService\n  extends WorkerBlockDispatcher<EthereumProjectDs, IndexerWorker, EthereumBlock>\n  implements OnApplicationShutdown\n{\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgadeService: IProjectUpgradeService,\n    cacheService: InMemoryCacheService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiSyncService: PoiSyncService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksSevice: UnfinalizedBlocksService,\n    connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      projectUpgadeService,\n      storeService,\n      storeCacheService,\n      poiSyncService,\n      project,\n      () =>\n        createIndexerWorker<\n          IIndexerWorker,\n          EthereumApiConnection,\n          BlockContent,\n          EthereumProjectDs\n        >(\n          path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),\n          [],\n          storeService.getStore(),\n          cacheService.getCache(),\n          dynamicDsService,\n          unfinalizedBlocksSevice,\n          connectionPoolState,\n          project.root,\n          projectService.startHeight,\n        ),\n    );\n  }\n\n  protected async fetchBlock(\n    worker: IndexerWorker,\n    height: number,\n  ): Promise<void> {\n    await worker.fetchBlock(height, null);\n  }\n}\n"]}

package/dist/indexer/dictionary/ethDictionary.service.js

@@ -23,7 +23,7 @@ const SubqueryProject_1 = require("../../configure/SubqueryProject");
 const ethereum_1 = require("../../ethereum");
 const v1_1 = require("./v1");
 const v2_1 = require("./v2");
-const logger = (0, node_core_1.getLogger)('eth-dictionary');
+const logger = (0, node_core_1.getLogger)('dictionary');
 let EthDictionaryService = class EthDictionaryService extends node_core_1.DictionaryService {
     constructor(project, nodeConfig, eventEmitter, apiService) {
         super(project.network.chainId, nodeConfig, eventEmitter);
@@ -52,6 +52,7 @@ let EthDictionaryService = class EthDictionaryService extends node_core_1.Dictio
                 }
             }
         }
+        logger.debug(`Dictionary versions, v1: ${dictionariesV1.length}, v2: ${dictionariesV2.length}`);
         // v2 should be prioritised
         this.init([...dictionariesV2, ...dictionariesV1]);
     }

package/dist/indexer/dictionary/ethDictionary.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ethDictionary.service.js","sourceRoot":"","sources":["../../../src/indexer/dictionary/ethDictionary.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,yDAAsD;AACtD,0CAA+C;AAC/C,gDAK0B;AAE1B,qEAAkE;AAClE,6CAAoD;AACpD,6BAAuC;AACvC,6BAAuC;AAEvC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,gBAAgB,CAAC,CAAC;AAGpC,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,6BAGzC;IACC,YACwC,OAAwB,EAC9D,UAAsB,EACtB,YAA2B,EACC,UAA8B;QAE1D,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QALnB,YAAO,GAAP,OAAO,CAAiB;QAGlC,eAAU,GAAV,UAAU,CAAoB;IAG5D,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,cAAc,GAAsB,EAAE,CAAC;QAC7C,MAAM,cAAc,GAAsB,EAAE,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QAED,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC3D,uBAAc,CAAC,QAAQ,EACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CACrB,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE;YAC1C,IAAI;gBACF,MAAM,YAAY,GAAG,MAAM,oBAAe,CAAC,MAAM,CAC/C,QAAQ,EACR,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,CAAC,GAAG,CACpB,CAAC;gBACF,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI;oBACF,MAAM,YAAY,GAAG,MAAM,oBAAe,CAAC,MAAM,CAC/C,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,QAAQ,CACT,CAAC;oBACF,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBACnC;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,IAAI,CACT,wBAAwB,QAAQ,6BAA6B,CAC9D,CAAC;iBACH;aACF;SACF;QACD,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC;IACpD,CAAC;CACF,CAAA;AArDY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;IAG1B,WAAA,IAAA,eAAM,EAAC,sBAAU,CAAC,CAAA;qCAH4B,iCAAe;QAClD,sBAAU;QACR,6BAAa;QACa,6BAAkB;GARjD,oBAAoB,CAqDhC;AArDY,oDAAoB","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 { NETWORK_FAMILY } from '@subql/common';\nimport {\n  NodeConfig,\n  DictionaryService,\n  ApiService,\n  getLogger,\n} from '@subql/node-core';\nimport { EthereumBlock, SubqlDatasource } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../../configure/SubqueryProject';\nimport { EthereumApiService } from '../../ethereum';\nimport { EthDictionaryV1 } from './v1';\nimport { EthDictionaryV2 } from './v2';\n\nconst logger = getLogger('eth-dictionary');\n\n@Injectable()\nexport class EthDictionaryService extends DictionaryService<\n  SubqlDatasource,\n  EthereumBlock\n> {\n  constructor(\n    @Inject('ISubqueryProject') protected project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject(ApiService) private apiService: EthereumApiService,\n  ) {\n    super(project.network.chainId, nodeConfig, eventEmitter);\n  }\n\n  async initDictionaries(): Promise<void> {\n    const dictionariesV1: EthDictionaryV1[] = [];\n    const dictionariesV2: EthDictionaryV2[] = [];\n\n    if (!this.project) {\n      throw new Error(`Project in Dictionary service not initialized `);\n    }\n\n    const dictionaryEndpoints = await this.getDictionaryEndpoints(\n      NETWORK_FAMILY.ethereum,\n      this.project.network,\n    );\n\n    for (const endpoint of dictionaryEndpoints) {\n      try {\n        const dictionaryV2 = await EthDictionaryV2.create(\n          endpoint,\n          this.nodeConfig,\n          this.project,\n          this.apiService.api,\n        );\n        dictionariesV2.push(dictionaryV2);\n      } catch (e) {\n        try {\n          const dictionaryV1 = await EthDictionaryV1.create(\n            this.project,\n            this.nodeConfig,\n            endpoint,\n          );\n          dictionariesV1.push(dictionaryV1);\n        } catch (e) {\n          logger.warn(\n            `Dictionary endpoint \"${endpoint}\" is not a valid dictionary`,\n          );\n        }\n      }\n    }\n    // v2 should be prioritised\n    this.init([...dictionariesV2, ...dictionariesV1]);\n  }\n}\n"]}
+{"version":3,"file":"ethDictionary.service.js","sourceRoot":"","sources":["../../../src/indexer/dictionary/ethDictionary.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,yDAAsD;AACtD,0CAA+C;AAC/C,gDAK0B;AAE1B,qEAAkE;AAClE,6CAAoD;AACpD,6BAAuC;AACvC,6BAAuC;AAEvC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,YAAY,CAAC,CAAC;AAGhC,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,6BAGzC;IACC,YACwC,OAAwB,EAC9D,UAAsB,EACtB,YAA2B,EACC,UAA8B;QAE1D,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QALnB,YAAO,GAAP,OAAO,CAAiB;QAGlC,eAAU,GAAV,UAAU,CAAoB;IAG5D,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,cAAc,GAAsB,EAAE,CAAC;QAC7C,MAAM,cAAc,GAAsB,EAAE,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;SACnE;QAED,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAC3D,uBAAc,CAAC,QAAQ,EACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CACrB,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,mBAAmB,EAAE;YAC1C,IAAI;gBACF,MAAM,YAAY,GAAG,MAAM,oBAAe,CAAC,MAAM,CAC/C,QAAQ,EACR,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,CAAC,GAAG,CACpB,CAAC;gBACF,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI;oBACF,MAAM,YAAY,GAAG,MAAM,oBAAe,CAAC,MAAM,CAC/C,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,UAAU,EACf,QAAQ,CACT,CAAC;oBACF,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBACnC;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,IAAI,CACT,wBAAwB,QAAQ,6BAA6B,CAC9D,CAAC;iBACH;aACF;SACF;QACD,MAAM,CAAC,KAAK,CACV,4BAA4B,cAAc,CAAC,MAAM,SAAS,cAAc,CAAC,MAAM,EAAE,CAClF,CAAC;QACF,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,cAAc,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC;IACpD,CAAC;CACF,CAAA;AAxDY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;IAG1B,WAAA,IAAA,eAAM,EAAC,sBAAU,CAAC,CAAA;qCAH4B,iCAAe;QAClD,sBAAU;QACR,6BAAa;QACa,6BAAkB;GARjD,oBAAoB,CAwDhC;AAxDY,oDAAoB","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 { NETWORK_FAMILY } from '@subql/common';\nimport {\n  NodeConfig,\n  DictionaryService,\n  ApiService,\n  getLogger,\n} from '@subql/node-core';\nimport { EthereumBlock, SubqlDatasource } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../../configure/SubqueryProject';\nimport { EthereumApiService } from '../../ethereum';\nimport { EthDictionaryV1 } from './v1';\nimport { EthDictionaryV2 } from './v2';\n\nconst logger = getLogger('dictionary');\n\n@Injectable()\nexport class EthDictionaryService extends DictionaryService<\n  SubqlDatasource,\n  EthereumBlock\n> {\n  constructor(\n    @Inject('ISubqueryProject') protected project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject(ApiService) private apiService: EthereumApiService,\n  ) {\n    super(project.network.chainId, nodeConfig, eventEmitter);\n  }\n\n  async initDictionaries(): Promise<void> {\n    const dictionariesV1: EthDictionaryV1[] = [];\n    const dictionariesV2: EthDictionaryV2[] = [];\n\n    if (!this.project) {\n      throw new Error(`Project in Dictionary service not initialized `);\n    }\n\n    const dictionaryEndpoints = await this.getDictionaryEndpoints(\n      NETWORK_FAMILY.ethereum,\n      this.project.network,\n    );\n\n    for (const endpoint of dictionaryEndpoints) {\n      try {\n        const dictionaryV2 = await EthDictionaryV2.create(\n          endpoint,\n          this.nodeConfig,\n          this.project,\n          this.apiService.api,\n        );\n        dictionariesV2.push(dictionaryV2);\n      } catch (e) {\n        try {\n          const dictionaryV1 = await EthDictionaryV1.create(\n            this.project,\n            this.nodeConfig,\n            endpoint,\n          );\n          dictionariesV1.push(dictionaryV1);\n        } catch (e) {\n          logger.warn(\n            `Dictionary endpoint \"${endpoint}\" is not a valid dictionary`,\n          );\n        }\n      }\n    }\n    logger.debug(\n      `Dictionary versions, v1: ${dictionariesV1.length}, v2: ${dictionariesV2.length}`,\n    );\n    // v2 should be prioritised\n    this.init([...dictionariesV2, ...dictionariesV1]);\n  }\n}\n"]}

package/dist/indexer/dictionary/v1/ethDictionaryV1.js

@@ -15,7 +15,7 @@ const string_1 = require("../../../utils/string");
 const yargs_1 = require("../../../yargs");
 const utils_1 = require("../utils");
 const CHAIN_ALIASES_URL = 'https://raw.githubusercontent.com/subquery/templates/main/chainAliases.json5';
-const logger = (0, node_core_1.getLogger)('eth-dictionary v1');
+const logger = (0, node_core_1.getLogger)('dictionary-v1');
 function appendDsOptions(dsOptions, conditions) {
     const queryAddressLimit = yargs_1.yargsOptions.argv['query-address-limit'];
     if (Array.isArray(dsOptions)) {

package/dist/indexer/dictionary/v1/ethDictionaryV1.js.map

@@ -1 +1 @@
-{"version":3,"file":"ethDictionaryV1.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v1/ethDictionaryV1.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 { NodeConfig, DictionaryV1, getLogger } from '@subql/node-core';\nimport {\n  DictionaryQueryCondition,\n  DictionaryQueryEntry as DictionaryV1QueryEntry,\n} from '@subql/types-core';\nimport {\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n  SubqlDatasource,\n  SubqlEthereumProcessorOptions,\n} from '@subql/types-ethereum';\nimport JSON5 from 'json5';\nimport { sortBy, uniqBy } from 'lodash';\nimport fetch from 'node-fetch';\nimport {\n  EthereumProjectDs,\n  EthereumProjectDsTemplate,\n  SubqueryProject,\n} from '../../../configure/SubqueryProject';\nimport { eventToTopic, functionToSighash } from '../../../utils/string';\nimport { yargsOptions } from '../../../yargs';\nimport { ethFilterDs } from '../utils';\n\nconst CHAIN_ALIASES_URL =\n  'https://raw.githubusercontent.com/subquery/templates/main/chainAliases.json5';\n\nconst logger = getLogger('eth-dictionary v1');\n\nexport function 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): DictionaryV1QueryEntry {\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): DictionaryV1QueryEntry {\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  return {\n    entity: 'evmTransactions',\n    conditions,\n  };\n}\n\nexport type GroupedEthereumProjectDs = SubqlDatasource & {\n  groupedOptions?: SubqlEthereumProcessorOptions[];\n};\n\nexport function buildDictionaryV1QueryEntries(\n  dataSources: GroupedEthereumProjectDs[],\n): DictionaryV1QueryEntry[] {\n  const queryEntries: DictionaryV1QueryEntry[] = [];\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\nexport class EthDictionaryV1 extends DictionaryV1<GroupedEthereumProjectDs> {\n  private constructor(\n    project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    dictionaryUrl: string,\n    chainId?: string,\n  ) {\n    super(dictionaryUrl, chainId ?? project.network.chainId, nodeConfig);\n  }\n\n  static async create(\n    project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    dictionaryUrl?: string,\n  ): Promise<EthDictionaryV1> {\n    /*Some dictionarys for EVM are built with other SDKs as they are chains with an EVM runtime\n     * we maintain a list of aliases so we can map the evmChainId to the genesis hash of the other SDKs\n     * e.g moonbeam is built with Substrate SDK but can be used as an EVM dictionary\n     */\n    const chainAliases = await this.getEvmChainId();\n    const chainAlias = chainAliases[project.network.chainId];\n\n    const dictionary = new EthDictionaryV1(\n      project,\n      nodeConfig,\n      dictionaryUrl,\n      chainAlias,\n    );\n    await dictionary.init();\n    return dictionary;\n  }\n\n  private static async getEvmChainId(): Promise<Record<string, string>> {\n    const response = await fetch(CHAIN_ALIASES_URL);\n\n    const raw = await response.text();\n    // We use JSON5 here because the file has comments in it\n    return JSON5.parse(raw);\n  }\n\n  buildDictionaryQueryEntries(\n    // Add name to datasource as templates have this set\n    dataSources: (EthereumProjectDs | EthereumProjectDsTemplate)[],\n  ): DictionaryV1QueryEntry[] {\n    const filteredDs = ethFilterDs(dataSources);\n    return buildDictionaryV1QueryEntries(filteredDs);\n  }\n}\n"]}
+{"version":3,"file":"ethDictionaryV1.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v1/ethDictionaryV1.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 { NodeConfig, DictionaryV1, getLogger } from '@subql/node-core';\nimport {\n  DictionaryQueryCondition,\n  DictionaryQueryEntry as DictionaryV1QueryEntry,\n} from '@subql/types-core';\nimport {\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n  SubqlDatasource,\n  SubqlEthereumProcessorOptions,\n} from '@subql/types-ethereum';\nimport JSON5 from 'json5';\nimport { sortBy, uniqBy } from 'lodash';\nimport fetch from 'node-fetch';\nimport {\n  EthereumProjectDs,\n  EthereumProjectDsTemplate,\n  SubqueryProject,\n} from '../../../configure/SubqueryProject';\nimport { eventToTopic, functionToSighash } from '../../../utils/string';\nimport { yargsOptions } from '../../../yargs';\nimport { ethFilterDs } from '../utils';\n\nconst CHAIN_ALIASES_URL =\n  'https://raw.githubusercontent.com/subquery/templates/main/chainAliases.json5';\n\nconst logger = getLogger('dictionary-v1');\n\nexport function 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): DictionaryV1QueryEntry {\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): DictionaryV1QueryEntry {\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  return {\n    entity: 'evmTransactions',\n    conditions,\n  };\n}\n\nexport type GroupedEthereumProjectDs = SubqlDatasource & {\n  groupedOptions?: SubqlEthereumProcessorOptions[];\n};\n\nexport function buildDictionaryV1QueryEntries(\n  dataSources: GroupedEthereumProjectDs[],\n): DictionaryV1QueryEntry[] {\n  const queryEntries: DictionaryV1QueryEntry[] = [];\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\nexport class EthDictionaryV1 extends DictionaryV1<GroupedEthereumProjectDs> {\n  private constructor(\n    project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    dictionaryUrl: string,\n    chainId?: string,\n  ) {\n    super(dictionaryUrl, chainId ?? project.network.chainId, nodeConfig);\n  }\n\n  static async create(\n    project: SubqueryProject,\n    nodeConfig: NodeConfig,\n    dictionaryUrl?: string,\n  ): Promise<EthDictionaryV1> {\n    /*Some dictionarys for EVM are built with other SDKs as they are chains with an EVM runtime\n     * we maintain a list of aliases so we can map the evmChainId to the genesis hash of the other SDKs\n     * e.g moonbeam is built with Substrate SDK but can be used as an EVM dictionary\n     */\n    const chainAliases = await this.getEvmChainId();\n    const chainAlias = chainAliases[project.network.chainId];\n\n    const dictionary = new EthDictionaryV1(\n      project,\n      nodeConfig,\n      dictionaryUrl,\n      chainAlias,\n    );\n    await dictionary.init();\n    return dictionary;\n  }\n\n  private static async getEvmChainId(): Promise<Record<string, string>> {\n    const response = await fetch(CHAIN_ALIASES_URL);\n\n    const raw = await response.text();\n    // We use JSON5 here because the file has comments in it\n    return JSON5.parse(raw);\n  }\n\n  buildDictionaryQueryEntries(\n    // Add name to datasource as templates have this set\n    dataSources: (EthereumProjectDs | EthereumProjectDsTemplate)[],\n  ): DictionaryV1QueryEntry[] {\n    const filteredDs = ethFilterDs(dataSources);\n    return buildDictionaryV1QueryEntries(filteredDs);\n  }\n}\n"]}

package/dist/indexer/dictionary/v2/ethDictionaryV2.js

@@ -24,7 +24,7 @@ const yargs_1 = require("../../../yargs");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
 const MIN_FETCH_LIMIT = 200;
-const logger = (0, node_core_1.getLogger)('eth-dictionary-v2');
+const logger = (0, node_core_1.getLogger)('dictionary-v2');
 function extractOptionAddresses(dsOptions) {
     const queryAddressLimit = yargs_1.yargsOptions.argv['query-address-limit'];
     const addressArray = [];
@@ -52,17 +52,23 @@ function callFilterToDictionaryCondition(filter, dsOptions) {
     if (filter.from) {
         fromArray.push(filter.from.toLowerCase());
     }
-    const optionsAddresses = extractOptionAddresses(dsOptions);
-    if (!optionsAddresses.length) {
-        if (filter.to) {
-            toArray.push(filter.to.toLowerCase());
+    const assignTo = (value) => {
+        if (value === null) {
+            toArray.push(null);
         }
-        else if (filter.to === null) {
-            toArray.push(null); //TODO, is this correct?
+        else if (value !== undefined) {
+            toArray.push(value.toLowerCase());
         }
+    };
+    const optionsAddresses = extractOptionAddresses(dsOptions);
+    if (!optionsAddresses.length) {
+        assignTo(filter.to);
     }
-    else if (!!optionsAddresses.length && (filter.to || filter.to === null)) {
-        logger.warn(`TransactionFilter 'to' conflict with 'address' in data source options`);
+    else {
+        if (filter.to || filter.to === null) {
+            logger.warn(`TransactionFilter 'to' conflicts with 'address' in data source options, using data source option`);
+        }
+        optionsAddresses.forEach(assignTo);
     }
     if (filter.function) {
         funcArray.push((0, string_1.functionToSighash)(filter.function));

package/dist/indexer/dictionary/v2/ethDictionaryV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"ethDictionaryV2.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v2/ethDictionaryV2.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 {\n  NodeConfig,\n  DictionaryV2,\n  RawDictionaryResponseData,\n  DictionaryResponse,\n  getLogger,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumBlock,\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n  SubqlDatasource,\n  SubqlEthereumProcessorOptions,\n} from '@subql/types-ethereum';\nimport { uniqBy } from 'lodash';\nimport { EthereumNodeConfig } from '../../../configure/NodeConfig';\nimport {\n  EthereumProjectDs,\n  EthereumProjectDsTemplate,\n  SubqueryProject,\n} from '../../../configure/SubqueryProject';\nimport { EthereumApi } from '../../../ethereum';\nimport { eventToTopic, functionToSighash } from '../../../utils/string';\nimport { yargsOptions } from '../../../yargs';\nimport { ethFilterDs } from '../utils';\nimport { GroupedEthereumProjectDs } from '../v1';\nimport {\n  RawEthBlock,\n  EthDictionaryV2QueryEntry,\n  EthDictionaryTxConditions,\n  EthDictionaryLogConditions,\n} from './types';\nimport { rawBlockToEthBlock } from './utils';\n\nconst MIN_FETCH_LIMIT = 200;\n\nconst logger = getLogger('eth-dictionary-v2');\n\nfunction extractOptionAddresses(\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): string[] {\n  const queryAddressLimit = yargsOptions.argv['query-address-limit'];\n  const addressArray: string[] = [];\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    if (addresses.length !== 0 && addresses.length <= queryAddressLimit) {\n      addressArray.push(...addresses);\n    }\n  } else {\n    if (dsOptions?.address) {\n      addressArray.push(dsOptions.address.toLowerCase());\n    }\n  }\n  return addressArray;\n}\n\nfunction callFilterToDictionaryCondition(\n  filter: EthereumTransactionFilter,\n  dsOptions: SubqlEthereumProcessorOptions,\n): EthDictionaryTxConditions {\n  const txConditions: EthDictionaryTxConditions = {};\n  const toArray = [];\n  const fromArray = [];\n  const funcArray = [];\n\n  if (filter.from) {\n    fromArray.push(filter.from.toLowerCase());\n  }\n  const optionsAddresses = extractOptionAddresses(dsOptions);\n  if (!optionsAddresses.length) {\n    if (filter.to) {\n      toArray.push(filter.to.toLowerCase());\n    } else if (filter.to === null) {\n      toArray.push(null); //TODO, is this correct?\n    }\n  } else if (!!optionsAddresses.length && (filter.to || filter.to === null)) {\n    logger.warn(\n      `TransactionFilter 'to' conflict with 'address' in data source options`,\n    );\n  }\n  if (filter.function) {\n    funcArray.push(functionToSighash(filter.function));\n  }\n\n  if (toArray.length !== 0) {\n    txConditions.to = toArray;\n  }\n  if (fromArray.length !== 0) {\n    txConditions.from = fromArray;\n  }\n\n  if (funcArray.length !== 0) {\n    txConditions.data = funcArray;\n  }\n\n  return txConditions;\n}\n\nfunction eventFilterToDictionaryCondition(\n  filter: EthereumLogFilter,\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): EthDictionaryLogConditions {\n  const logConditions: EthDictionaryLogConditions = {};\n  logConditions.address = extractOptionAddresses(dsOptions);\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      // Initialized\n      if (!logConditions[field]) {\n        logConditions[field] = [];\n      }\n      if (topic === '!null') {\n        logConditions[field] = []; // TODO, check if !null\n      } else {\n        logConditions[field].push(eventToTopic(topic));\n      }\n    }\n  }\n  return logConditions;\n}\n\nexport function buildDictionaryV2QueryEntry(\n  dataSources: GroupedEthereumProjectDs[],\n): EthDictionaryV2QueryEntry {\n  const dictionaryConditions: EthDictionaryV2QueryEntry = {\n    logs: [],\n    transactions: [],\n  };\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 dictionaryConditions;\n\n      switch (handler.kind) {\n        case EthereumHandlerKind.Block:\n          return dictionaryConditions;\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            dictionaryConditions.transactions.push(\n              callFilterToDictionaryCondition(filter, ds.options),\n            );\n          } else {\n            // do nothing;\n          }\n          break;\n        }\n        case EthereumHandlerKind.Event: {\n          const filter = handler.filter as EthereumLogFilter;\n          if (ds.groupedOptions) {\n            dictionaryConditions.logs.push(\n              eventFilterToDictionaryCondition(filter, ds.groupedOptions),\n            );\n          } else if (ds.options?.address || filter.topics) {\n            dictionaryConditions.logs.push(\n              eventFilterToDictionaryCondition(filter, ds.options),\n            );\n          } else {\n            // do nothing;\n          }\n          break;\n        }\n        default:\n      }\n    }\n  }\n\n  if (!dictionaryConditions.logs.length) {\n    delete dictionaryConditions.logs;\n  } else {\n    dictionaryConditions.logs = uniqBy(dictionaryConditions.logs, (log) =>\n      JSON.stringify(log),\n    );\n  }\n\n  if (!dictionaryConditions.transactions.length) {\n    delete dictionaryConditions.transactions;\n  } else {\n    dictionaryConditions.transactions = uniqBy(\n      dictionaryConditions.transactions,\n      (tx) => JSON.stringify(tx),\n    );\n  }\n  return dictionaryConditions;\n}\n\nexport class EthDictionaryV2 extends DictionaryV2<\n  EthereumBlock,\n  SubqlDatasource,\n  EthDictionaryV2QueryEntry\n> {\n  #skipTransactions: boolean;\n\n  constructor(\n    endpoint: string,\n    nodeConfig: NodeConfig,\n    project: SubqueryProject,\n    private api: EthereumApi,\n  ) {\n    super(endpoint, project.network.chainId, nodeConfig);\n    this.#skipTransactions = !!new EthereumNodeConfig(nodeConfig)\n      .skipTransactions;\n  }\n\n  static async create(\n    endpoint: string,\n    nodeConfig: NodeConfig,\n    project: SubqueryProject,\n    api: EthereumApi,\n  ): Promise<EthDictionaryV2> {\n    const dictionary = new EthDictionaryV2(endpoint, nodeConfig, project, api);\n    await dictionary.init();\n    return dictionary;\n  }\n\n  buildDictionaryQueryEntries(\n    dataSources: (EthereumProjectDs | EthereumProjectDsTemplate)[],\n  ): EthDictionaryV2QueryEntry {\n    const filteredDs = ethFilterDs(dataSources);\n    return buildDictionaryV2QueryEntry(filteredDs);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  async getData(\n    startBlock: number,\n    endBlock: number,\n    limit: number = MIN_FETCH_LIMIT,\n  ): Promise<DictionaryResponse<IBlock<EthereumBlock> | number> | undefined> {\n    return super.getData(startBlock, endBlock, limit, {\n      blockHeader: true,\n      logs: { transaction: !this.#skipTransactions },\n      transactions: { log: true },\n    });\n  }\n\n  convertResponseBlocks<RFB = RawEthBlock>(\n    data: RawDictionaryResponseData<RFB>,\n  ): DictionaryResponse<IBlock<EthereumBlock>> | undefined {\n    try {\n      const blocks: IBlock<EthereumBlock>[] = (\n        (data.blocks as RawEthBlock[]) || []\n      ).map((b) => rawBlockToEthBlock(b, this.api));\n      return {\n        batchBlocks: blocks,\n        lastBufferedHeight: blocks.length\n          ? blocks[blocks.length - 1].block.number\n          : undefined,\n      };\n    } catch (e) {\n      logger.error(e, `Failed to handle block response}`);\n      throw e;\n    }\n  }\n}\n"]}
+{"version":3,"file":"ethDictionaryV2.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v2/ethDictionaryV2.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 {\n  NodeConfig,\n  DictionaryV2,\n  RawDictionaryResponseData,\n  DictionaryResponse,\n  getLogger,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumBlock,\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  EthereumTransactionFilter,\n  SubqlDatasource,\n  SubqlEthereumProcessorOptions,\n} from '@subql/types-ethereum';\nimport { uniqBy } from 'lodash';\nimport { EthereumNodeConfig } from '../../../configure/NodeConfig';\nimport {\n  EthereumProjectDs,\n  EthereumProjectDsTemplate,\n  SubqueryProject,\n} from '../../../configure/SubqueryProject';\nimport { EthereumApi } from '../../../ethereum';\nimport { eventToTopic, functionToSighash } from '../../../utils/string';\nimport { yargsOptions } from '../../../yargs';\nimport { ethFilterDs } from '../utils';\nimport { GroupedEthereumProjectDs } from '../v1';\nimport {\n  RawEthBlock,\n  EthDictionaryV2QueryEntry,\n  EthDictionaryTxConditions,\n  EthDictionaryLogConditions,\n} from './types';\nimport { rawBlockToEthBlock } from './utils';\n\nconst MIN_FETCH_LIMIT = 200;\n\nconst logger = getLogger('dictionary-v2');\n\nfunction extractOptionAddresses(\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): string[] {\n  const queryAddressLimit = yargsOptions.argv['query-address-limit'];\n  const addressArray: string[] = [];\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    if (addresses.length !== 0 && addresses.length <= queryAddressLimit) {\n      addressArray.push(...addresses);\n    }\n  } else {\n    if (dsOptions?.address) {\n      addressArray.push(dsOptions.address.toLowerCase());\n    }\n  }\n  return addressArray;\n}\n\nfunction callFilterToDictionaryCondition(\n  filter: EthereumTransactionFilter,\n  dsOptions: SubqlEthereumProcessorOptions,\n): EthDictionaryTxConditions {\n  const txConditions: EthDictionaryTxConditions = {};\n  const toArray = [];\n  const fromArray = [];\n  const funcArray = [];\n\n  if (filter.from) {\n    fromArray.push(filter.from.toLowerCase());\n  }\n\n  const assignTo = (value: string | null | undefined) => {\n    if (value === null) {\n      toArray.push(null);\n    } else if (value !== undefined) {\n      toArray.push(value.toLowerCase());\n    }\n  };\n\n  const optionsAddresses = extractOptionAddresses(dsOptions);\n  if (!optionsAddresses.length) {\n    assignTo(filter.to);\n  } else {\n    if (filter.to || filter.to === null) {\n      logger.warn(\n        `TransactionFilter 'to' conflicts with 'address' in data source options, using data source option`,\n      );\n    }\n    optionsAddresses.forEach(assignTo);\n  }\n\n  if (filter.function) {\n    funcArray.push(functionToSighash(filter.function));\n  }\n\n  if (toArray.length !== 0) {\n    txConditions.to = toArray;\n  }\n  if (fromArray.length !== 0) {\n    txConditions.from = fromArray;\n  }\n\n  if (funcArray.length !== 0) {\n    txConditions.data = funcArray;\n  }\n\n  return txConditions;\n}\n\nfunction eventFilterToDictionaryCondition(\n  filter: EthereumLogFilter,\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): EthDictionaryLogConditions {\n  const logConditions: EthDictionaryLogConditions = {};\n  logConditions.address = extractOptionAddresses(dsOptions);\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      // Initialized\n      if (!logConditions[field]) {\n        logConditions[field] = [];\n      }\n      if (topic === '!null') {\n        logConditions[field] = []; // TODO, check if !null\n      } else {\n        logConditions[field].push(eventToTopic(topic));\n      }\n    }\n  }\n  return logConditions;\n}\n\nexport function buildDictionaryV2QueryEntry(\n  dataSources: GroupedEthereumProjectDs[],\n): EthDictionaryV2QueryEntry {\n  const dictionaryConditions: EthDictionaryV2QueryEntry = {\n    logs: [],\n    transactions: [],\n  };\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 dictionaryConditions;\n\n      switch (handler.kind) {\n        case EthereumHandlerKind.Block:\n          return dictionaryConditions;\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            dictionaryConditions.transactions.push(\n              callFilterToDictionaryCondition(filter, ds.options),\n            );\n          } else {\n            // do nothing;\n          }\n          break;\n        }\n        case EthereumHandlerKind.Event: {\n          const filter = handler.filter as EthereumLogFilter;\n          if (ds.groupedOptions) {\n            dictionaryConditions.logs.push(\n              eventFilterToDictionaryCondition(filter, ds.groupedOptions),\n            );\n          } else if (ds.options?.address || filter.topics) {\n            dictionaryConditions.logs.push(\n              eventFilterToDictionaryCondition(filter, ds.options),\n            );\n          } else {\n            // do nothing;\n          }\n          break;\n        }\n        default:\n      }\n    }\n  }\n\n  if (!dictionaryConditions.logs.length) {\n    delete dictionaryConditions.logs;\n  } else {\n    dictionaryConditions.logs = uniqBy(dictionaryConditions.logs, (log) =>\n      JSON.stringify(log),\n    );\n  }\n\n  if (!dictionaryConditions.transactions.length) {\n    delete dictionaryConditions.transactions;\n  } else {\n    dictionaryConditions.transactions = uniqBy(\n      dictionaryConditions.transactions,\n      (tx) => JSON.stringify(tx),\n    );\n  }\n  return dictionaryConditions;\n}\n\nexport class EthDictionaryV2 extends DictionaryV2<\n  EthereumBlock,\n  SubqlDatasource,\n  EthDictionaryV2QueryEntry\n> {\n  #skipTransactions: boolean;\n\n  constructor(\n    endpoint: string,\n    nodeConfig: NodeConfig,\n    project: SubqueryProject,\n    private api: EthereumApi,\n  ) {\n    super(endpoint, project.network.chainId, nodeConfig);\n    this.#skipTransactions = !!new EthereumNodeConfig(nodeConfig)\n      .skipTransactions;\n  }\n\n  static async create(\n    endpoint: string,\n    nodeConfig: NodeConfig,\n    project: SubqueryProject,\n    api: EthereumApi,\n  ): Promise<EthDictionaryV2> {\n    const dictionary = new EthDictionaryV2(endpoint, nodeConfig, project, api);\n    await dictionary.init();\n    return dictionary;\n  }\n\n  buildDictionaryQueryEntries(\n    dataSources: (EthereumProjectDs | EthereumProjectDsTemplate)[],\n  ): EthDictionaryV2QueryEntry {\n    const filteredDs = ethFilterDs(dataSources);\n    return buildDictionaryV2QueryEntry(filteredDs);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  async getData(\n    startBlock: number,\n    endBlock: number,\n    limit: number = MIN_FETCH_LIMIT,\n  ): Promise<DictionaryResponse<IBlock<EthereumBlock> | number> | undefined> {\n    return super.getData(startBlock, endBlock, limit, {\n      blockHeader: true,\n      logs: { transaction: !this.#skipTransactions },\n      transactions: { log: true },\n    });\n  }\n\n  convertResponseBlocks<RFB = RawEthBlock>(\n    data: RawDictionaryResponseData<RFB>,\n  ): DictionaryResponse<IBlock<EthereumBlock>> | undefined {\n    try {\n      const blocks: IBlock<EthereumBlock>[] = (\n        (data.blocks as RawEthBlock[]) || []\n      ).map((b) => rawBlockToEthBlock(b, this.api));\n      return {\n        batchBlocks: blocks,\n        lastBufferedHeight: blocks.length\n          ? blocks[blocks.length - 1].block.number\n          : undefined,\n      };\n    } catch (e) {\n      logger.error(e, `Failed to handle block response}`);\n      throw e;\n    }\n  }\n}\n"]}

package/dist/indexer/dictionary/v2/ethDictionaryV2.spec.js

@@ -236,6 +236,38 @@ describe('buildDictionaryV2QueryEntry', () => {
             ],
         });
     });
+    it('Build filter tx filter', () => {
+        const ds = {
+            kind: types_ethereum_1.EthereumDatasourceKind.Runtime,
+            assets: new Map(),
+            options: {
+                abi: 'erc20',
+                address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',
+            },
+            startBlock: 1,
+            mapping: {
+                file: '',
+                handlers: [
+                    {
+                        handler: 'handleTx',
+                        kind: types_ethereum_1.EthereumHandlerKind.Call,
+                        filter: {
+                            function: 'setminimumStakingAmount(uint256 amount)',
+                        },
+                    },
+                ],
+            },
+        };
+        const result = (0, ethDictionaryV2_1.buildDictionaryV2QueryEntry)([ds]);
+        expect(result).toEqual({
+            transactions: [
+                {
+                    to: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],
+                    data: ['0x7ef9ea98'],
+                },
+            ],
+        });
+    });
     it('build query entries for multiple ds', () => {
         const ds = [
             {
@@ -378,6 +410,7 @@ describe('buildDictionaryV2QueryEntry', () => {
             transactions: [
                 {
                     from: ['mockaddress'],
+                    to: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],
                     data: ['0x7ef9ea98'],
                 },
             ],

package/dist/indexer/dictionary/v2/ethDictionaryV2.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ethDictionaryV2.spec.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v2/ethDictionaryV2.spec.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 {\n  BlockHeightMap,\n  DictionaryResponse,\n  IBlock,\n  NodeConfig,\n} from '@subql/node-core';\nimport {\n  EthereumBlock,\n  EthereumDatasourceKind,\n  EthereumHandlerKind,\n  SubqlDatasource,\n  SubqlRuntimeDatasource,\n} from '@subql/types-ethereum';\nimport EventEmitter2 from 'eventemitter2';\nimport {\n  EthereumProjectDs,\n  EthereumProjectDsTemplate,\n  SubqueryProject,\n} from '../../../configure/SubqueryProject';\nimport { EthereumApi } from '../../../ethereum';\nimport { ethFilterDs } from '../utils';\nimport {\n  buildDictionaryV2QueryEntry,\n  EthDictionaryV2,\n} from './ethDictionaryV2';\n\nconst DEFAULT_DICTIONARY = 'https://ethereum.node.subquery.network/public';\nconst HTTP_ENDPOINT = 'https://eth.llamarpc.com';\nconst mockDs: EthereumProjectDs[] = [\n  {\n    kind: EthereumDatasourceKind.Runtime,\n    assets: new Map(),\n    startBlock: 19217803,\n    mapping: {\n      file: './dist/index.js',\n      handlers: [\n        {\n          handler: 'handleTransaction',\n          kind: EthereumHandlerKind.Call,\n          filter: {\n            function: 'approve(address spender, uint256 rawAmount)',\n          },\n        },\n        {\n          handler: 'handleLog',\n          kind: EthereumHandlerKind.Event,\n          filter: {\n            topics: [\n              'Transfer(address indexed from, address indexed to, uint256 amount)',\n            ],\n          },\n        },\n      ],\n    },\n  },\n];\n\nconst templateTs: EthereumProjectDsTemplate = {\n  name: 'template',\n  kind: EthereumDatasourceKind.Runtime,\n  assets: new Map(),\n  options: {\n    abi: 'erc20',\n    // address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n  },\n  // startBlock: 1,\n  mapping: {\n    file: '',\n    handlers: [\n      {\n        handler: 'handleLog',\n        kind: EthereumHandlerKind.Event,\n        filter: {\n          topics: ['Transfer(address, address, uint256)'],\n        },\n      },\n    ],\n  },\n};\n\n// tx to is null\nconst mockDs2: EthereumProjectDs[] = [\n  {\n    kind: EthereumDatasourceKind.Runtime,\n    assets: new Map(),\n    startBlock: 19217803,\n    mapping: {\n      file: './dist/index.js',\n      handlers: [\n        {\n          handler: 'handleTransaction',\n          kind: EthereumHandlerKind.Call,\n          filter: {\n            to: null,\n          },\n        },\n      ],\n    },\n  },\n];\n\nconst nodeConfig = new NodeConfig({\n  subquery: 'eth-starter',\n  subqueryName: 'eth-starter',\n  dictionaryTimeout: 10,\n  networkEndpoint: [HTTP_ENDPOINT],\n  networkDictionary: [DEFAULT_DICTIONARY],\n});\n\nfunction makeBlockHeightMap(mockDs: SubqlDatasource[]): BlockHeightMap<any> {\n  const m = new Map<number, any>();\n  mockDs.forEach((ds, index, dataSources) => {\n    m.set(ds.startBlock, dataSources.slice(0, index + 1));\n  });\n  return new BlockHeightMap(m);\n}\n\n// enable this once dictionary v2 is online\ndescribe('eth dictionary v2', () => {\n  let ethDictionaryV2: EthDictionaryV2;\n\n  const dsMap = makeBlockHeightMap(mockDs);\n\n  beforeAll(async () => {\n    ethDictionaryV2 = await EthDictionaryV2.create(\n      DEFAULT_DICTIONARY,\n      nodeConfig,\n      { network: { chainId: '1' } } as SubqueryProject,\n      new EthereumApi(HTTP_ENDPOINT, 1, new EventEmitter2()),\n    );\n  }, 10000);\n\n  beforeEach(() => {\n    ethDictionaryV2.updateQueriesMap(dsMap);\n  });\n\n  it('converts ds to v2 dictionary queries', () => {\n    const query = (ethDictionaryV2 as any).queriesMap.get(19217803);\n    expect(query.logs.length).toBe(1);\n    expect(query.transactions.length).toBe(1);\n  });\n\n  it('query response match with entries', async () => {\n    const ethBlocks = (await ethDictionaryV2.getData(\n      19217803,\n      (ethDictionaryV2 as any)._metadata.end,\n      2,\n    )) as DictionaryResponse<IBlock<EthereumBlock>>;\n\n    expect(ethBlocks.batchBlocks.map((b) => b.block.number)).toStrictEqual([\n      19217803, 19217804,\n    ]);\n\n    const ethBlock19217803 = ethBlocks.batchBlocks[0].block;\n    const ethBlock19217804 = ethBlocks.batchBlocks[1].block;\n\n    expect(ethBlock19217803.number).toBe(19217803);\n    expect(ethBlock19217804.number).toBe(19217804);\n\n    // Sighash of approval tx\n    expect(\n      ethBlock19217803.transactions.filter(\n        (tx) => tx.input.indexOf('0x095ea7b3') === 0,\n      ).length,\n    ).toBe(4);\n\n    expect(ethBlock19217804.logs.length).toBe(233);\n\n    // This matches with dictionaryQueryEntries[0].topics\n    expect(ethBlock19217804.logs[0].topics).toContain(\n      '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n    );\n  }, 10000);\n\n  // Geth currently throwing errors with this request\n  it.skip('is able to get transaction with field to is null', async () => {\n    const dsMap = makeBlockHeightMap(mockDs2);\n    ethDictionaryV2.updateQueriesMap(dsMap);\n\n    const { conditions } = (ethDictionaryV2 as any).getQueryConditions(\n      19217803,\n      (ethDictionaryV2 as any)._metadata.end,\n    );\n\n    expect(conditions).toEqual({ transactions: [{ to: [null] }] });\n\n    const ethBlocks = (await ethDictionaryV2.getData(\n      19217803,\n      (ethDictionaryV2 as any)._metadata.end,\n      1,\n    )) as DictionaryResponse<IBlock<EthereumBlock>>;\n\n    const { hash, transactions } = ethBlocks.batchBlocks[0].block;\n\n    expect(hash).toBe(\n      '0xa9ba70126240a8418739a103527860948a2be32de2eb9a8f590591faa174c08b',\n    );\n\n    // https://etherscan.io/tx/0x57e8cd9483cb5d308151372b0cf33fdc615999283c80ee3c28e94f074dda61f1\n    expect(\n      transactions.find(\n        (tx) =>\n          tx.hash ===\n          '0x57e8cd9483cb5d308151372b0cf33fdc615999283c80ee3c28e94f074dda61f1',\n      ),\n    ).toBeDefined();\n  });\n\n  it('is able to query with not null topics', async () => {\n    /**\n     * Dictionary v1 supported filtering logs where a topic was null or not null.\n     * V2 doesn't yet support this but we should still be able to make a dictionary query that gets relevant logs.\n     * It will just include events that will be filtered out later.\n     * */\n\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n      },\n      startBlock: 19476187,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleLog',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: [\n                'Transfer(address, address, uint256)',\n                undefined,\n                undefined,\n                '!null',\n              ],\n            },\n          },\n        ],\n      },\n    };\n\n    const dsMap = makeBlockHeightMap([ds]);\n    ethDictionaryV2.updateQueriesMap(dsMap);\n\n    const { conditions } = (ethDictionaryV2 as any).getQueryConditions(\n      19476187,\n      (ethDictionaryV2 as any)._metadata.end,\n    );\n\n    expect(conditions).toEqual({\n      logs: [\n        {\n          address: [],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n          topics3: [],\n        },\n      ],\n    });\n\n    const ethBlocks = (await ethDictionaryV2.getData(\n      19476187,\n      (ethDictionaryV2 as any)._metadata.end,\n      2,\n    )) as DictionaryResponse<IBlock<EthereumBlock>>;\n\n    const { hash, logs } = ethBlocks.batchBlocks[0].block;\n\n    expect(hash).toEqual(\n      '0xa798861151ed58ad67d80d1cf61dc30e65d003bc958e99a7969a05a67e69e0b2',\n    );\n\n    const log = logs.find((l) => l.logIndex === 184);\n    expect(log).toBeDefined();\n    expect(log.transactionHash).toEqual(\n      '0x5491f3f4b7ca6cc81f992a17e19bc9bafff408518c643c5a254de44b5a7b6d72',\n    );\n\n    // Uncomment this when not null filter supported\n    // expect(logs.filter(l => !l.topics[3]).length).toEqual(6) // There are 6 events with no topic3\n  }, 100000);\n});\n\ndescribe('buildDictionaryV2QueryEntry', () => {\n  it('Build filter for !null', () => {\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n        address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n      },\n      startBlock: 1,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleLog',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: [\n                'Transfer(address, address, uint256)',\n                undefined,\n                undefined,\n                '!null',\n              ],\n            },\n          },\n        ],\n      },\n    };\n    const result = buildDictionaryV2QueryEntry([ds]);\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n          topics3: [],\n        },\n      ],\n    });\n  });\n\n  it('build query entries for multiple ds', () => {\n    const ds: SubqlRuntimeDatasource[] = [\n      {\n        kind: EthereumDatasourceKind.Runtime,\n        startBlock: 3327417,\n        options: {\n          abi: 'EnsRegistry',\n          address: '0x314159265dd8dbb310642f98f50c066173c1259b',\n        },\n        assets: new Map(),\n        mapping: {\n          file: './dist/index.js',\n          handlers: [\n            // one duplicate one\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleTransferOldRegistry',\n              filter: {\n                topics: ['Transfer(bytes32,address)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleTransferOldRegistry',\n              filter: {\n                topics: ['Transfer(bytes32,address)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleNewOwnerOldRegistry',\n              filter: {\n                topics: ['NewOwner(bytes32,bytes32,address)'],\n              },\n            },\n          ],\n        },\n      },\n      {\n        kind: EthereumDatasourceKind.Runtime,\n        startBlock: 3327417,\n        options: {\n          abi: 'Resolver',\n        },\n        assets: new Map(),\n        mapping: {\n          file: './dist/index.js',\n          handlers: [\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleABIChanged',\n              filter: {\n                topics: ['ABIChanged(bytes32,uint256)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleAddrChanged',\n              filter: {\n                topics: ['AddrChanged(bytes32,address)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleMulticoinAddrChanged',\n              filter: {\n                topics: ['AddressChanged(bytes32,uint256,bytes)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleAuthorisationChanged',\n              filter: {\n                topics: ['AuthorisationChanged(bytes32,address,address,bool)'],\n              },\n            },\n          ],\n        },\n      },\n    ];\n\n    const queryEntry = buildDictionaryV2QueryEntry(ds);\n    // Total 7 handlers were given, 1 is duplicate\n    expect(queryEntry.logs.length).toBe(6);\n  });\n\n  it('should unique QueryEntry for duplicate dataSources', () => {\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n        address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n      },\n      startBlock: 1,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleLog',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: ['Transfer(address, address, uint256)'],\n            },\n          },\n          {\n            handler: 'handleLogSame',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: ['Transfer(address, address, uint256)'],\n            },\n          },\n          {\n            handler: 'handleTx',\n            kind: EthereumHandlerKind.Call,\n            filter: {\n              function: 'setminimumStakingAmount(uint256 amount)',\n              from: 'mockAddress',\n            },\n          },\n          {\n            handler: 'handleTxSame',\n            kind: EthereumHandlerKind.Call,\n            filter: {\n              function: 'setminimumStakingAmount(uint256 amount)',\n              from: 'mockAddress',\n            },\n          },\n        ],\n      },\n    };\n    const result = buildDictionaryV2QueryEntry([ds]);\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n        },\n      ],\n      transactions: [\n        {\n          from: ['mockaddress'],\n          data: ['0x7ef9ea98'],\n        },\n      ],\n    });\n  });\n\n  it('should group a small number of dynamic ds', () => {\n    const ds: SubqlRuntimeDatasource[] = [];\n\n    for (let i = 0; i < 10; i++) {\n      // Bad nodejs types\n      const tmp = (global as any).structuredClone(templateTs);\n      (tmp.options.address = `0x${i}`), ds.push(tmp);\n    }\n\n    const result = buildDictionaryV2QueryEntry(ethFilterDs(ds));\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: [\n            '0x0',\n            '0x1',\n            '0x2',\n            '0x3',\n            '0x4',\n            '0x5',\n            '0x6',\n            '0x7',\n            '0x8',\n            '0x9',\n          ],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n        },\n      ],\n    });\n  });\n\n  it('should remove address filter with large number of dynamic ds', () => {\n    const ds: SubqlRuntimeDatasource[] = [];\n\n    for (let i = 0; i < 200; i++) {\n      // Bad nodejs types\n      const tmp = (global as any).structuredClone(templateTs);\n      (tmp.options.address = `0x${i}`), ds.push(tmp);\n    }\n\n    const result = buildDictionaryV2QueryEntry(ethFilterDs(ds));\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: [],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n        },\n      ],\n    });\n  });\n});\n"]}
+{"version":3,"file":"ethDictionaryV2.spec.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v2/ethDictionaryV2.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;AAEnC,gDAK0B;AAC1B,0DAM+B;AAC/B,kEAA0C;AAM1C,gDAAgD;AAChD,oCAAuC;AACvC,uDAG2B;AAE3B,MAAM,kBAAkB,GAAG,+CAA+C,CAAC;AAC3E,MAAM,aAAa,GAAG,0BAA0B,CAAC;AACjD,MAAM,MAAM,GAAwB;IAClC;QACE,IAAI,EAAE,uCAAsB,CAAC,OAAO;QACpC,MAAM,EAAE,IAAI,GAAG,EAAE;QACjB,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE;YACP,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE;gBACR;oBACE,OAAO,EAAE,mBAAmB;oBAC5B,IAAI,EAAE,oCAAmB,CAAC,IAAI;oBAC9B,MAAM,EAAE;wBACN,QAAQ,EAAE,6CAA6C;qBACxD;iBACF;gBACD;oBACE,OAAO,EAAE,WAAW;oBACpB,IAAI,EAAE,oCAAmB,CAAC,KAAK;oBAC/B,MAAM,EAAE;wBACN,MAAM,EAAE;4BACN,oEAAoE;yBACrE;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC;AAEF,MAAM,UAAU,GAA8B;IAC5C,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,uCAAsB,CAAC,OAAO;IACpC,MAAM,EAAE,IAAI,GAAG,EAAE;IACjB,OAAO,EAAE;QACP,GAAG,EAAE,OAAO;QACZ,yDAAyD;KAC1D;IACD,iBAAiB;IACjB,OAAO,EAAE;QACP,IAAI,EAAE,EAAE;QACR,QAAQ,EAAE;YACR;gBACE,OAAO,EAAE,WAAW;gBACpB,IAAI,EAAE,oCAAmB,CAAC,KAAK;gBAC/B,MAAM,EAAE;oBACN,MAAM,EAAE,CAAC,qCAAqC,CAAC;iBAChD;aACF;SACF;KACF;CACF,CAAC;AAEF,gBAAgB;AAChB,MAAM,OAAO,GAAwB;IACnC;QACE,IAAI,EAAE,uCAAsB,CAAC,OAAO;QACpC,MAAM,EAAE,IAAI,GAAG,EAAE;QACjB,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE;YACP,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE;gBACR;oBACE,OAAO,EAAE,mBAAmB;oBAC5B,IAAI,EAAE,oCAAmB,CAAC,IAAI;oBAC9B,MAAM,EAAE;wBACN,EAAE,EAAE,IAAI;qBACT;iBACF;aACF;SACF;KACF;CACF,CAAC;AAEF,MAAM,UAAU,GAAG,IAAI,sBAAU,CAAC;IAChC,QAAQ,EAAE,aAAa;IACvB,YAAY,EAAE,aAAa;IAC3B,iBAAiB,EAAE,EAAE;IACrB,eAAe,EAAE,CAAC,aAAa,CAAC;IAChC,iBAAiB,EAAE,CAAC,kBAAkB,CAAC;CACxC,CAAC,CAAC;AAEH,SAAS,kBAAkB,CAAC,MAAyB;IACnD,MAAM,CAAC,GAAG,IAAI,GAAG,EAAe,CAAC;IACjC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;QACxC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,0BAAc,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC;AAED,2CAA2C;AAC3C,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,eAAgC,CAAC;IAErC,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAEzC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,eAAe,GAAG,MAAM,iCAAe,CAAC,MAAM,CAC5C,kBAAkB,EAClB,UAAU,EACV,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAqB,EAChD,IAAI,sBAAW,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,uBAAa,EAAE,CAAC,CACvD,CAAC;IACJ,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,UAAU,CAAC,GAAG,EAAE;QACd,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,KAAK,GAAI,eAAuB,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,SAAS,GAAG,CAAC,MAAM,eAAe,CAAC,OAAO,CAC9C,QAAQ,EACP,eAAuB,CAAC,SAAS,CAAC,GAAG,EACtC,CAAC,CACF,CAA8C,CAAC;QAEhD,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;YACrE,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACxD,MAAM,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAExD,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE/C,yBAAyB;QACzB,MAAM,CACJ,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAClC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAC7C,CAAC,MAAM,CACT,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEV,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/C,qDAAqD;QACrD,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAC/C,oEAAoE,CACrE,CAAC;IACJ,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,mDAAmD;IACnD,EAAE,CAAC,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC1C,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAExC,MAAM,EAAE,UAAU,EAAE,GAAI,eAAuB,CAAC,kBAAkB,CAChE,QAAQ,EACP,eAAuB,CAAC,SAAS,CAAC,GAAG,CACvC,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAE/D,MAAM,SAAS,GAAG,CAAC,MAAM,eAAe,CAAC,OAAO,CAC9C,QAAQ,EACP,eAAuB,CAAC,SAAS,CAAC,GAAG,EACtC,CAAC,CACF,CAA8C,CAAC;QAEhD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAE9D,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CACf,oEAAoE,CACrE,CAAC;QAEF,6FAA6F;QAC7F,MAAM,CACJ,YAAY,CAAC,IAAI,CACf,CAAC,EAAE,EAAE,EAAE,CACL,EAAE,CAAC,IAAI;YACP,oEAAoE,CACvE,CACF,CAAC,WAAW,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD;;;;aAIK;QAEL,MAAM,EAAE,GAA2B;YACjC,IAAI,EAAE,uCAAsB,CAAC,OAAO;YACpC,MAAM,EAAE,IAAI,GAAG,EAAE;YACjB,OAAO,EAAE;gBACP,GAAG,EAAE,OAAO;aACb;YACD,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE;gBACP,IAAI,EAAE,EAAE;gBACR,QAAQ,EAAE;oBACR;wBACE,OAAO,EAAE,WAAW;wBACpB,IAAI,EAAE,oCAAmB,CAAC,KAAK;wBAC/B,MAAM,EAAE;4BACN,MAAM,EAAE;gCACN,qCAAqC;gCACrC,SAAS;gCACT,SAAS;gCACT,OAAO;6BACR;yBACF;qBACF;iBACF;aACF;SACF,CAAC;QAEF,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,eAAe,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAExC,MAAM,EAAE,UAAU,EAAE,GAAI,eAAuB,CAAC,kBAAkB,CAChE,QAAQ,EACP,eAAuB,CAAC,SAAS,CAAC,GAAG,CACvC,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACzB,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE,EAAE;oBACX,OAAO,EAAE;wBACP,oEAAoE;qBACrE;oBACD,OAAO,EAAE,EAAE;iBACZ;aACF;SACF,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,CAAC,MAAM,eAAe,CAAC,OAAO,CAC9C,QAAQ,EACP,eAAuB,CAAC,SAAS,CAAC,GAAG,EACtC,CAAC,CACF,CAA8C,CAAC;QAEhD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEtD,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAClB,oEAAoE,CACrE,CAAC;QAEF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,GAAG,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,OAAO,CACjC,oEAAoE,CACrE,CAAC;QAEF,gDAAgD;QAChD,gGAAgG;IAClG,CAAC,EAAE,MAAM,CAAC,CAAC;AACb,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,EAAE,GAA2B;YACjC,IAAI,EAAE,uCAAsB,CAAC,OAAO;YACpC,MAAM,EAAE,IAAI,GAAG,EAAE;YACjB,OAAO,EAAE;gBACP,GAAG,EAAE,OAAO;gBACZ,OAAO,EAAE,4CAA4C;aACtD;YACD,UAAU,EAAE,CAAC;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,EAAE;gBACR,QAAQ,EAAE;oBACR;wBACE,OAAO,EAAE,WAAW;wBACpB,IAAI,EAAE,oCAAmB,CAAC,KAAK;wBAC/B,MAAM,EAAE;4BACN,MAAM,EAAE;gCACN,qCAAqC;gCACrC,SAAS;gCACT,SAAS;gCACT,OAAO;6BACR;yBACF;qBACF;iBACF;aACF;SACF,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,6CAA2B,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE,CAAC,4CAA4C,CAAC;oBACvD,OAAO,EAAE;wBACP,oEAAoE;qBACrE;oBACD,OAAO,EAAE,EAAE;iBACZ;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,EAAE,GAA2B;YACjC,IAAI,EAAE,uCAAsB,CAAC,OAAO;YACpC,MAAM,EAAE,IAAI,GAAG,EAAE;YACjB,OAAO,EAAE;gBACP,GAAG,EAAE,OAAO;gBACZ,OAAO,EAAE,4CAA4C;aACtD;YACD,UAAU,EAAE,CAAC;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,EAAE;gBACR,QAAQ,EAAE;oBACR;wBACE,OAAO,EAAE,UAAU;wBACnB,IAAI,EAAE,oCAAmB,CAAC,IAAI;wBAC9B,MAAM,EAAE;4BACN,QAAQ,EAAE,yCAAyC;yBACpD;qBACF;iBACF;aACF;SACF,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,6CAA2B,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,YAAY,EAAE;gBACZ;oBACE,EAAE,EAAE,CAAC,4CAA4C,CAAC;oBAClD,IAAI,EAAE,CAAC,YAAY,CAAC;iBACrB;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,EAAE,GAA6B;YACnC;gBACE,IAAI,EAAE,uCAAsB,CAAC,OAAO;gBACpC,UAAU,EAAE,OAAO;gBACnB,OAAO,EAAE;oBACP,GAAG,EAAE,aAAa;oBAClB,OAAO,EAAE,4CAA4C;iBACtD;gBACD,MAAM,EAAE,IAAI,GAAG,EAAE;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;oBACvB,QAAQ,EAAE;wBACR,oBAAoB;wBACpB;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,2BAA2B;4BACpC,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,2BAA2B,CAAC;6BACtC;yBACF;wBACD;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,2BAA2B;4BACpC,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,2BAA2B,CAAC;6BACtC;yBACF;wBACD;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,2BAA2B;4BACpC,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,mCAAmC,CAAC;6BAC9C;yBACF;qBACF;iBACF;aACF;YACD;gBACE,IAAI,EAAE,uCAAsB,CAAC,OAAO;gBACpC,UAAU,EAAE,OAAO;gBACnB,OAAO,EAAE;oBACP,GAAG,EAAE,UAAU;iBAChB;gBACD,MAAM,EAAE,IAAI,GAAG,EAAE;gBACjB,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;oBACvB,QAAQ,EAAE;wBACR;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,kBAAkB;4BAC3B,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,6BAA6B,CAAC;6BACxC;yBACF;wBACD;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,mBAAmB;4BAC5B,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,8BAA8B,CAAC;6BACzC;yBACF;wBACD;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,4BAA4B;4BACrC,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,uCAAuC,CAAC;6BAClD;yBACF;wBACD;4BACE,IAAI,EAAE,oCAAmB,CAAC,KAAK;4BAC/B,OAAO,EAAE,4BAA4B;4BACrC,MAAM,EAAE;gCACN,MAAM,EAAE,CAAC,oDAAoD,CAAC;6BAC/D;yBACF;qBACF;iBACF;aACF;SACF,CAAC;QAEF,MAAM,UAAU,GAAG,IAAA,6CAA2B,EAAC,EAAE,CAAC,CAAC;QACnD,8CAA8C;QAC9C,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,EAAE,GAA2B;YACjC,IAAI,EAAE,uCAAsB,CAAC,OAAO;YACpC,MAAM,EAAE,IAAI,GAAG,EAAE;YACjB,OAAO,EAAE;gBACP,GAAG,EAAE,OAAO;gBACZ,OAAO,EAAE,4CAA4C;aACtD;YACD,UAAU,EAAE,CAAC;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,EAAE;gBACR,QAAQ,EAAE;oBACR;wBACE,OAAO,EAAE,WAAW;wBACpB,IAAI,EAAE,oCAAmB,CAAC,KAAK;wBAC/B,MAAM,EAAE;4BACN,MAAM,EAAE,CAAC,qCAAqC,CAAC;yBAChD;qBACF;oBACD;wBACE,OAAO,EAAE,eAAe;wBACxB,IAAI,EAAE,oCAAmB,CAAC,KAAK;wBAC/B,MAAM,EAAE;4BACN,MAAM,EAAE,CAAC,qCAAqC,CAAC;yBAChD;qBACF;oBACD;wBACE,OAAO,EAAE,UAAU;wBACnB,IAAI,EAAE,oCAAmB,CAAC,IAAI;wBAC9B,MAAM,EAAE;4BACN,QAAQ,EAAE,yCAAyC;4BACnD,IAAI,EAAE,aAAa;yBACpB;qBACF;oBACD;wBACE,OAAO,EAAE,cAAc;wBACvB,IAAI,EAAE,oCAAmB,CAAC,IAAI;wBAC9B,MAAM,EAAE;4BACN,QAAQ,EAAE,yCAAyC;4BACnD,IAAI,EAAE,aAAa;yBACpB;qBACF;iBACF;aACF;SACF,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,6CAA2B,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE,CAAC,4CAA4C,CAAC;oBACvD,OAAO,EAAE;wBACP,oEAAoE;qBACrE;iBACF;aACF;YACD,YAAY,EAAE;gBACZ;oBACE,IAAI,EAAE,CAAC,aAAa,CAAC;oBACrB,EAAE,EAAE,CAAC,4CAA4C,CAAC;oBAClD,IAAI,EAAE,CAAC,YAAY,CAAC;iBACrB;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,EAAE,GAA6B,EAAE,CAAC;QAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;YAC3B,mBAAmB;YACnB,MAAM,GAAG,GAAI,MAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChD;QAED,MAAM,MAAM,GAAG,IAAA,6CAA2B,EAAC,IAAA,mBAAW,EAAC,EAAE,CAAC,CAAC,CAAC;QAE5D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE;wBACP,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;wBACL,KAAK;qBACN;oBACD,OAAO,EAAE;wBACP,oEAAoE;qBACrE;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,EAAE,GAA6B,EAAE,CAAC;QAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC5B,mBAAmB;YACnB,MAAM,GAAG,GAAI,MAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACxD,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChD;QAED,MAAM,MAAM,GAAG,IAAA,6CAA2B,EAAC,IAAA,mBAAW,EAAC,EAAE,CAAC,CAAC,CAAC;QAE5D,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE,EAAE;oBACX,OAAO,EAAE;wBACP,oEAAoE;qBACrE;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport {\n  BlockHeightMap,\n  DictionaryResponse,\n  IBlock,\n  NodeConfig,\n} from '@subql/node-core';\nimport {\n  EthereumBlock,\n  EthereumDatasourceKind,\n  EthereumHandlerKind,\n  SubqlDatasource,\n  SubqlRuntimeDatasource,\n} from '@subql/types-ethereum';\nimport EventEmitter2 from 'eventemitter2';\nimport {\n  EthereumProjectDs,\n  EthereumProjectDsTemplate,\n  SubqueryProject,\n} from '../../../configure/SubqueryProject';\nimport { EthereumApi } from '../../../ethereum';\nimport { ethFilterDs } from '../utils';\nimport {\n  buildDictionaryV2QueryEntry,\n  EthDictionaryV2,\n} from './ethDictionaryV2';\n\nconst DEFAULT_DICTIONARY = 'https://ethereum.node.subquery.network/public';\nconst HTTP_ENDPOINT = 'https://eth.llamarpc.com';\nconst mockDs: EthereumProjectDs[] = [\n  {\n    kind: EthereumDatasourceKind.Runtime,\n    assets: new Map(),\n    startBlock: 19217803,\n    mapping: {\n      file: './dist/index.js',\n      handlers: [\n        {\n          handler: 'handleTransaction',\n          kind: EthereumHandlerKind.Call,\n          filter: {\n            function: 'approve(address spender, uint256 rawAmount)',\n          },\n        },\n        {\n          handler: 'handleLog',\n          kind: EthereumHandlerKind.Event,\n          filter: {\n            topics: [\n              'Transfer(address indexed from, address indexed to, uint256 amount)',\n            ],\n          },\n        },\n      ],\n    },\n  },\n];\n\nconst templateTs: EthereumProjectDsTemplate = {\n  name: 'template',\n  kind: EthereumDatasourceKind.Runtime,\n  assets: new Map(),\n  options: {\n    abi: 'erc20',\n    // address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n  },\n  // startBlock: 1,\n  mapping: {\n    file: '',\n    handlers: [\n      {\n        handler: 'handleLog',\n        kind: EthereumHandlerKind.Event,\n        filter: {\n          topics: ['Transfer(address, address, uint256)'],\n        },\n      },\n    ],\n  },\n};\n\n// tx to is null\nconst mockDs2: EthereumProjectDs[] = [\n  {\n    kind: EthereumDatasourceKind.Runtime,\n    assets: new Map(),\n    startBlock: 19217803,\n    mapping: {\n      file: './dist/index.js',\n      handlers: [\n        {\n          handler: 'handleTransaction',\n          kind: EthereumHandlerKind.Call,\n          filter: {\n            to: null,\n          },\n        },\n      ],\n    },\n  },\n];\n\nconst nodeConfig = new NodeConfig({\n  subquery: 'eth-starter',\n  subqueryName: 'eth-starter',\n  dictionaryTimeout: 10,\n  networkEndpoint: [HTTP_ENDPOINT],\n  networkDictionary: [DEFAULT_DICTIONARY],\n});\n\nfunction makeBlockHeightMap(mockDs: SubqlDatasource[]): BlockHeightMap<any> {\n  const m = new Map<number, any>();\n  mockDs.forEach((ds, index, dataSources) => {\n    m.set(ds.startBlock, dataSources.slice(0, index + 1));\n  });\n  return new BlockHeightMap(m);\n}\n\n// enable this once dictionary v2 is online\ndescribe('eth dictionary v2', () => {\n  let ethDictionaryV2: EthDictionaryV2;\n\n  const dsMap = makeBlockHeightMap(mockDs);\n\n  beforeAll(async () => {\n    ethDictionaryV2 = await EthDictionaryV2.create(\n      DEFAULT_DICTIONARY,\n      nodeConfig,\n      { network: { chainId: '1' } } as SubqueryProject,\n      new EthereumApi(HTTP_ENDPOINT, 1, new EventEmitter2()),\n    );\n  }, 10000);\n\n  beforeEach(() => {\n    ethDictionaryV2.updateQueriesMap(dsMap);\n  });\n\n  it('converts ds to v2 dictionary queries', () => {\n    const query = (ethDictionaryV2 as any).queriesMap.get(19217803);\n    expect(query.logs.length).toBe(1);\n    expect(query.transactions.length).toBe(1);\n  });\n\n  it('query response match with entries', async () => {\n    const ethBlocks = (await ethDictionaryV2.getData(\n      19217803,\n      (ethDictionaryV2 as any)._metadata.end,\n      2,\n    )) as DictionaryResponse<IBlock<EthereumBlock>>;\n\n    expect(ethBlocks.batchBlocks.map((b) => b.block.number)).toStrictEqual([\n      19217803, 19217804,\n    ]);\n\n    const ethBlock19217803 = ethBlocks.batchBlocks[0].block;\n    const ethBlock19217804 = ethBlocks.batchBlocks[1].block;\n\n    expect(ethBlock19217803.number).toBe(19217803);\n    expect(ethBlock19217804.number).toBe(19217804);\n\n    // Sighash of approval tx\n    expect(\n      ethBlock19217803.transactions.filter(\n        (tx) => tx.input.indexOf('0x095ea7b3') === 0,\n      ).length,\n    ).toBe(4);\n\n    expect(ethBlock19217804.logs.length).toBe(233);\n\n    // This matches with dictionaryQueryEntries[0].topics\n    expect(ethBlock19217804.logs[0].topics).toContain(\n      '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n    );\n  }, 10000);\n\n  // Geth currently throwing errors with this request\n  it.skip('is able to get transaction with field to is null', async () => {\n    const dsMap = makeBlockHeightMap(mockDs2);\n    ethDictionaryV2.updateQueriesMap(dsMap);\n\n    const { conditions } = (ethDictionaryV2 as any).getQueryConditions(\n      19217803,\n      (ethDictionaryV2 as any)._metadata.end,\n    );\n\n    expect(conditions).toEqual({ transactions: [{ to: [null] }] });\n\n    const ethBlocks = (await ethDictionaryV2.getData(\n      19217803,\n      (ethDictionaryV2 as any)._metadata.end,\n      1,\n    )) as DictionaryResponse<IBlock<EthereumBlock>>;\n\n    const { hash, transactions } = ethBlocks.batchBlocks[0].block;\n\n    expect(hash).toBe(\n      '0xa9ba70126240a8418739a103527860948a2be32de2eb9a8f590591faa174c08b',\n    );\n\n    // https://etherscan.io/tx/0x57e8cd9483cb5d308151372b0cf33fdc615999283c80ee3c28e94f074dda61f1\n    expect(\n      transactions.find(\n        (tx) =>\n          tx.hash ===\n          '0x57e8cd9483cb5d308151372b0cf33fdc615999283c80ee3c28e94f074dda61f1',\n      ),\n    ).toBeDefined();\n  });\n\n  it('is able to query with not null topics', async () => {\n    /**\n     * Dictionary v1 supported filtering logs where a topic was null or not null.\n     * V2 doesn't yet support this but we should still be able to make a dictionary query that gets relevant logs.\n     * It will just include events that will be filtered out later.\n     * */\n\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n      },\n      startBlock: 19476187,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleLog',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: [\n                'Transfer(address, address, uint256)',\n                undefined,\n                undefined,\n                '!null',\n              ],\n            },\n          },\n        ],\n      },\n    };\n\n    const dsMap = makeBlockHeightMap([ds]);\n    ethDictionaryV2.updateQueriesMap(dsMap);\n\n    const { conditions } = (ethDictionaryV2 as any).getQueryConditions(\n      19476187,\n      (ethDictionaryV2 as any)._metadata.end,\n    );\n\n    expect(conditions).toEqual({\n      logs: [\n        {\n          address: [],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n          topics3: [],\n        },\n      ],\n    });\n\n    const ethBlocks = (await ethDictionaryV2.getData(\n      19476187,\n      (ethDictionaryV2 as any)._metadata.end,\n      2,\n    )) as DictionaryResponse<IBlock<EthereumBlock>>;\n\n    const { hash, logs } = ethBlocks.batchBlocks[0].block;\n\n    expect(hash).toEqual(\n      '0xa798861151ed58ad67d80d1cf61dc30e65d003bc958e99a7969a05a67e69e0b2',\n    );\n\n    const log = logs.find((l) => l.logIndex === 184);\n    expect(log).toBeDefined();\n    expect(log.transactionHash).toEqual(\n      '0x5491f3f4b7ca6cc81f992a17e19bc9bafff408518c643c5a254de44b5a7b6d72',\n    );\n\n    // Uncomment this when not null filter supported\n    // expect(logs.filter(l => !l.topics[3]).length).toEqual(6) // There are 6 events with no topic3\n  }, 100000);\n});\n\ndescribe('buildDictionaryV2QueryEntry', () => {\n  it('Build filter for !null', () => {\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n        address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n      },\n      startBlock: 1,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleLog',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: [\n                'Transfer(address, address, uint256)',\n                undefined,\n                undefined,\n                '!null',\n              ],\n            },\n          },\n        ],\n      },\n    };\n    const result = buildDictionaryV2QueryEntry([ds]);\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n          topics3: [],\n        },\n      ],\n    });\n  });\n\n  it('Build filter tx filter', () => {\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n        address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n      },\n      startBlock: 1,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleTx',\n            kind: EthereumHandlerKind.Call,\n            filter: {\n              function: 'setminimumStakingAmount(uint256 amount)',\n            },\n          },\n        ],\n      },\n    };\n    const result = buildDictionaryV2QueryEntry([ds]);\n\n    expect(result).toEqual({\n      transactions: [\n        {\n          to: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],\n          data: ['0x7ef9ea98'],\n        },\n      ],\n    });\n  });\n\n  it('build query entries for multiple ds', () => {\n    const ds: SubqlRuntimeDatasource[] = [\n      {\n        kind: EthereumDatasourceKind.Runtime,\n        startBlock: 3327417,\n        options: {\n          abi: 'EnsRegistry',\n          address: '0x314159265dd8dbb310642f98f50c066173c1259b',\n        },\n        assets: new Map(),\n        mapping: {\n          file: './dist/index.js',\n          handlers: [\n            // one duplicate one\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleTransferOldRegistry',\n              filter: {\n                topics: ['Transfer(bytes32,address)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleTransferOldRegistry',\n              filter: {\n                topics: ['Transfer(bytes32,address)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleNewOwnerOldRegistry',\n              filter: {\n                topics: ['NewOwner(bytes32,bytes32,address)'],\n              },\n            },\n          ],\n        },\n      },\n      {\n        kind: EthereumDatasourceKind.Runtime,\n        startBlock: 3327417,\n        options: {\n          abi: 'Resolver',\n        },\n        assets: new Map(),\n        mapping: {\n          file: './dist/index.js',\n          handlers: [\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleABIChanged',\n              filter: {\n                topics: ['ABIChanged(bytes32,uint256)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleAddrChanged',\n              filter: {\n                topics: ['AddrChanged(bytes32,address)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleMulticoinAddrChanged',\n              filter: {\n                topics: ['AddressChanged(bytes32,uint256,bytes)'],\n              },\n            },\n            {\n              kind: EthereumHandlerKind.Event,\n              handler: 'handleAuthorisationChanged',\n              filter: {\n                topics: ['AuthorisationChanged(bytes32,address,address,bool)'],\n              },\n            },\n          ],\n        },\n      },\n    ];\n\n    const queryEntry = buildDictionaryV2QueryEntry(ds);\n    // Total 7 handlers were given, 1 is duplicate\n    expect(queryEntry.logs.length).toBe(6);\n  });\n\n  it('should unique QueryEntry for duplicate dataSources', () => {\n    const ds: SubqlRuntimeDatasource = {\n      kind: EthereumDatasourceKind.Runtime,\n      assets: new Map(),\n      options: {\n        abi: 'erc20',\n        address: '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619',\n      },\n      startBlock: 1,\n      mapping: {\n        file: '',\n        handlers: [\n          {\n            handler: 'handleLog',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: ['Transfer(address, address, uint256)'],\n            },\n          },\n          {\n            handler: 'handleLogSame',\n            kind: EthereumHandlerKind.Event,\n            filter: {\n              topics: ['Transfer(address, address, uint256)'],\n            },\n          },\n          {\n            handler: 'handleTx',\n            kind: EthereumHandlerKind.Call,\n            filter: {\n              function: 'setminimumStakingAmount(uint256 amount)',\n              from: 'mockAddress',\n            },\n          },\n          {\n            handler: 'handleTxSame',\n            kind: EthereumHandlerKind.Call,\n            filter: {\n              function: 'setminimumStakingAmount(uint256 amount)',\n              from: 'mockAddress',\n            },\n          },\n        ],\n      },\n    };\n    const result = buildDictionaryV2QueryEntry([ds]);\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n        },\n      ],\n      transactions: [\n        {\n          from: ['mockaddress'],\n          to: ['0x7ceb23fd6bc0add59e62ac25578270cff1b9f619'],\n          data: ['0x7ef9ea98'],\n        },\n      ],\n    });\n  });\n\n  it('should group a small number of dynamic ds', () => {\n    const ds: SubqlRuntimeDatasource[] = [];\n\n    for (let i = 0; i < 10; i++) {\n      // Bad nodejs types\n      const tmp = (global as any).structuredClone(templateTs);\n      (tmp.options.address = `0x${i}`), ds.push(tmp);\n    }\n\n    const result = buildDictionaryV2QueryEntry(ethFilterDs(ds));\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: [\n            '0x0',\n            '0x1',\n            '0x2',\n            '0x3',\n            '0x4',\n            '0x5',\n            '0x6',\n            '0x7',\n            '0x8',\n            '0x9',\n          ],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n        },\n      ],\n    });\n  });\n\n  it('should remove address filter with large number of dynamic ds', () => {\n    const ds: SubqlRuntimeDatasource[] = [];\n\n    for (let i = 0; i < 200; i++) {\n      // Bad nodejs types\n      const tmp = (global as any).structuredClone(templateTs);\n      (tmp.options.address = `0x${i}`), ds.push(tmp);\n    }\n\n    const result = buildDictionaryV2QueryEntry(ethFilterDs(ds));\n\n    expect(result).toEqual({\n      logs: [\n        {\n          address: [],\n          topics0: [\n            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n          ],\n        },\n      ],\n    });\n  });\n});\n"]}

package/dist/indexer/ds-processor.service.d.ts

@@ -1,9 +1,5 @@
-import { EthereumHandlerKind, isCustomDs, SubqlEthereumCustomDataSource, SubqlEthereumDataSource, SubqlDatasourceProcessor } from '@subql/common-ethereum';
+import { isCustomDs, SubqlEthereumCustomDataSource, SubqlEthereumDataSource, SubqlDatasourceProcessor } from '@subql/common-ethereum';
 import { BaseDsProcessorService } from '@subql/node-core';
-import { SecondLayerHandlerProcessor_0_0_0, SecondLayerHandlerProcessor_1_0_0, SubqlCustomDatasource } from '@subql/types-ethereum';
-export declare function isSecondLayerHandlerProcessor_0_0_0<K extends EthereumHandlerKind, F, E, DS extends SubqlCustomDatasource = SubqlEthereumCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): processor is SecondLayerHandlerProcessor_0_0_0<K, F, E, DS>;
-export declare function isSecondLayerHandlerProcessor_1_0_0<K extends EthereumHandlerKind, F, E, DS extends SubqlEthereumCustomDataSource = SubqlEthereumCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): processor is SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>;
-export declare function asSecondLayerHandlerProcessor_1_0_0<K extends EthereumHandlerKind, F, E, DS extends SubqlEthereumCustomDataSource = SubqlEthereumCustomDataSource>(processor: SecondLayerHandlerProcessor_0_0_0<K, F, E, DS> | SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>): SecondLayerHandlerProcessor_1_0_0<K, F, E, DS>;
-export declare class DsProcessorService extends BaseDsProcessorService<SubqlEthereumDataSource, SubqlEthereumCustomDataSource<string>, SubqlDatasourceProcessor<string, unknown>> {
+export declare class DsProcessorService extends BaseDsProcessorService<SubqlEthereumDataSource, SubqlEthereumCustomDataSource<string>, SubqlDatasourceProcessor<string, Record<string, unknown>>> {
     protected isCustomDs: typeof isCustomDs;
 }