@subql/node-ethereum 4.1.0 → 4.1.1

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

@@ -9,7 +9,7 @@ export declare class EthereumApiConnection implements IApiConnectionSpecific<Eth
     unsafeApi: EthereumApi;
     private fetchBlocksBatches;
     readonly networkMeta: NetworkMetadataPayload;
-    constructor(unsafeApi: EthereumApi, fetchBlocksBatches: GetFetchFunc);
+    private constructor();
     static create(endpoint: string, blockConfirmations: number, fetchBlocksBatches: GetFetchFunc, eventEmitter: EventEmitter2, unfinalizedBlocks: boolean): Promise<EthereumApiConnection>;
     safeApi(height: number): SafeEthProvider;
     apiConnect(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"api.connection.js","sourceRoot":"","sources":["../../src/ethereum/api.connection.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAGnC,gDAU0B;AAE1B,iDAA6C;AAa7C,MAAa,qBAAqB;IAUhC,YACS,SAAsB,EACrB,kBAAgC;QADjC,cAAS,GAAT,SAAS,CAAa;QACrB,uBAAkB,GAAlB,kBAAkB,CAAc;QA+C1C,gBAAW,GAAG,qBAAqB,CAAC,WAAW,CAAC;QA7C9C,IAAI,CAAC,WAAW,GAAG;YACjB,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE;YACxC,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE;YACjC,WAAW,EAAE,SAAS,CAAC,cAAc,EAAE;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAgB,EAChB,kBAA0B,EAC1B,kBAAgC,EAChC,YAA2B,EAC3B,iBAA0B;QAE1B,MAAM,GAAG,GAAG,IAAI,0BAAW,CACzB,QAAQ,EACR,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,CAClB,CAAC;QAEF,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,OAAO,IAAI,qBAAqB,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAAiB;QAEjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC;IAChB,CAAC;IAID,MAAM,CAAC,WAAW,CAAC,CAAQ;QACzB,IAAI,eAAmC,CAAC;QACxC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,2CAA2C,CAAC,EAAE;YACrE,eAAe,GAAG,IAAI,wBAAY,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YACrD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE;YAC3D,eAAe,GAAG,IAAI,0BAAc,CAAC,CAAC,CAAC,CAAC;SACzC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;YACtD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM;YACL,eAAe,GAAG,IAAI,8BAAkB,CACtC,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,OAAO,CACrB,CAAC;SACH;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;CACF;AAhFD,sDAgFC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiConnectionError,\n  ApiErrorType,\n  DisconnectionError,\n  LargeResponseError,\n  NetworkMetadataPayload,\n  RateLimitError,\n  TimeoutError,\n  IApiConnectionSpecific,\n  IBlock,\n} from '@subql/node-core';\nimport { EthereumBlock, LightEthereumBlock } from '@subql/types-ethereum';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nexport type FetchFunc =\n  | ((api: EthereumApi, batch: number[]) => Promise<IBlock<EthereumBlock>[]>)\n  | ((\n      api: EthereumApi,\n      batch: number[],\n    ) => Promise<IBlock<LightEthereumBlock>[]>);\n\n// We use a function to get the fetch function because it can change depending on the skipBlocks feature\nexport type GetFetchFunc = () => FetchFunc;\n\nexport class EthereumApiConnection\n  implements\n    IApiConnectionSpecific<\n      EthereumApi,\n      SafeEthProvider,\n      IBlock<EthereumBlock>[] | IBlock<LightEthereumBlock>[]\n    >\n{\n  readonly networkMeta: NetworkMetadataPayload;\n\n  constructor(\n    public unsafeApi: EthereumApi,\n    private fetchBlocksBatches: GetFetchFunc,\n  ) {\n    this.networkMeta = {\n      chain: unsafeApi.getChainId().toString(),\n      specName: unsafeApi.getSpecName(),\n      genesisHash: unsafeApi.getGenesisHash(),\n    };\n  }\n\n  static async create(\n    endpoint: string,\n    blockConfirmations: number,\n    fetchBlocksBatches: GetFetchFunc,\n    eventEmitter: EventEmitter2,\n    unfinalizedBlocks: boolean,\n  ): Promise<EthereumApiConnection> {\n    const api = new EthereumApi(\n      endpoint,\n      blockConfirmations,\n      eventEmitter,\n      unfinalizedBlocks,\n    );\n\n    await api.init();\n\n    return new EthereumApiConnection(api, fetchBlocksBatches);\n  }\n\n  safeApi(height: number): SafeEthProvider {\n    throw new Error(`Not Implemented`);\n  }\n\n  async apiConnect(): Promise<void> {\n    await this.unsafeApi.connect();\n  }\n\n  async apiDisconnect(): Promise<void> {\n    await this.unsafeApi.disconnect();\n  }\n\n  async fetchBlocks(\n    heights: number[],\n  ): Promise<IBlock<EthereumBlock>[] | IBlock<LightEthereumBlock>[]> {\n    const blocks = await this.fetchBlocksBatches()(this.unsafeApi, heights);\n    return blocks;\n  }\n\n  handleError = EthereumApiConnection.handleError;\n\n  static handleError(e: Error): ApiConnectionError {\n    let formatted_error: ApiConnectionError;\n    if (e.message.startsWith(`No response received from RPC endpoint in`)) {\n      formatted_error = new TimeoutError(e);\n    } else if (e.message.startsWith(`disconnected from `)) {\n      formatted_error = new DisconnectionError(e);\n    } else if (e.message.startsWith(`Rate Limited at endpoint`)) {\n      formatted_error = new RateLimitError(e);\n    } else if (e.message.includes(`Exceeded max limit of`)) {\n      formatted_error = new LargeResponseError(e);\n    } else {\n      formatted_error = new ApiConnectionError(\n        e.name,\n        e.message,\n        ApiErrorType.Default,\n      );\n    }\n    return formatted_error;\n  }\n}\n"]}
+{"version":3,"file":"api.connection.js","sourceRoot":"","sources":["../../src/ethereum/api.connection.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAGnC,gDAU0B;AAE1B,iDAA6C;AAa7C,MAAa,qBAAqB;IAUhC,YACS,SAAsB,EACrB,kBAAgC;QADjC,cAAS,GAAT,SAAS,CAAa;QACrB,uBAAkB,GAAlB,kBAAkB,CAAc;QA+C1C,gBAAW,GAAG,qBAAqB,CAAC,WAAW,CAAC;QA7C9C,IAAI,CAAC,WAAW,GAAG;YACjB,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE;YACxC,QAAQ,EAAE,SAAS,CAAC,WAAW,EAAE;YACjC,WAAW,EAAE,SAAS,CAAC,cAAc,EAAE;SACxC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAgB,EAChB,kBAA0B,EAC1B,kBAAgC,EAChC,YAA2B,EAC3B,iBAA0B;QAE1B,MAAM,GAAG,GAAG,IAAI,0BAAW,CACzB,QAAQ,EACR,kBAAkB,EAClB,YAAY,EACZ,iBAAiB,CAClB,CAAC;QAEF,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,OAAO,IAAI,qBAAqB,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAAiB;QAEjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC;IAChB,CAAC;IAID,MAAM,CAAC,WAAW,CAAC,CAAQ;QACzB,IAAI,eAAmC,CAAC;QACxC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,2CAA2C,CAAC,EAAE;YACrE,eAAe,GAAG,IAAI,wBAAY,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YACrD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE;YAC3D,eAAe,GAAG,IAAI,0BAAc,CAAC,CAAC,CAAC,CAAC;SACzC;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;YACtD,eAAe,GAAG,IAAI,8BAAkB,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM;YACL,eAAe,GAAG,IAAI,8BAAkB,CACtC,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,OAAO,CACrB,CAAC;SACH;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;CACF;AAhFD,sDAgFC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiConnectionError,\n  ApiErrorType,\n  DisconnectionError,\n  LargeResponseError,\n  NetworkMetadataPayload,\n  RateLimitError,\n  TimeoutError,\n  IApiConnectionSpecific,\n  IBlock,\n} from '@subql/node-core';\nimport { EthereumBlock, LightEthereumBlock } from '@subql/types-ethereum';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nexport type FetchFunc =\n  | ((api: EthereumApi, batch: number[]) => Promise<IBlock<EthereumBlock>[]>)\n  | ((\n      api: EthereumApi,\n      batch: number[],\n    ) => Promise<IBlock<LightEthereumBlock>[]>);\n\n// We use a function to get the fetch function because it can change depending on the skipBlocks feature\nexport type GetFetchFunc = () => FetchFunc;\n\nexport class EthereumApiConnection\n  implements\n    IApiConnectionSpecific<\n      EthereumApi,\n      SafeEthProvider,\n      IBlock<EthereumBlock>[] | IBlock<LightEthereumBlock>[]\n    >\n{\n  readonly networkMeta: NetworkMetadataPayload;\n\n  private constructor(\n    public unsafeApi: EthereumApi,\n    private fetchBlocksBatches: GetFetchFunc,\n  ) {\n    this.networkMeta = {\n      chain: unsafeApi.getChainId().toString(),\n      specName: unsafeApi.getSpecName(),\n      genesisHash: unsafeApi.getGenesisHash(),\n    };\n  }\n\n  static async create(\n    endpoint: string,\n    blockConfirmations: number,\n    fetchBlocksBatches: GetFetchFunc,\n    eventEmitter: EventEmitter2,\n    unfinalizedBlocks: boolean,\n  ): Promise<EthereumApiConnection> {\n    const api = new EthereumApi(\n      endpoint,\n      blockConfirmations,\n      eventEmitter,\n      unfinalizedBlocks,\n    );\n\n    await api.init();\n\n    return new EthereumApiConnection(api, fetchBlocksBatches);\n  }\n\n  safeApi(height: number): SafeEthProvider {\n    throw new Error(`Not Implemented`);\n  }\n\n  async apiConnect(): Promise<void> {\n    await this.unsafeApi.connect();\n  }\n\n  async apiDisconnect(): Promise<void> {\n    await this.unsafeApi.disconnect();\n  }\n\n  async fetchBlocks(\n    heights: number[],\n  ): Promise<IBlock<EthereumBlock>[] | IBlock<LightEthereumBlock>[]> {\n    const blocks = await this.fetchBlocksBatches()(this.unsafeApi, heights);\n    return blocks;\n  }\n\n  handleError = EthereumApiConnection.handleError;\n\n  static handleError(e: Error): ApiConnectionError {\n    let formatted_error: ApiConnectionError;\n    if (e.message.startsWith(`No response received from RPC endpoint in`)) {\n      formatted_error = new TimeoutError(e);\n    } else if (e.message.startsWith(`disconnected from `)) {\n      formatted_error = new DisconnectionError(e);\n    } else if (e.message.startsWith(`Rate Limited at endpoint`)) {\n      formatted_error = new RateLimitError(e);\n    } else if (e.message.includes(`Exceeded max limit of`)) {\n      formatted_error = new LargeResponseError(e);\n    } else {\n      formatted_error = new ApiConnectionError(\n        e.name,\n        e.message,\n        ApiErrorType.Default,\n      );\n    }\n    return formatted_error;\n  }\n}\n"]}

package/dist/ethereum/api.service.ethereum.js

@@ -46,12 +46,7 @@ let EthereumApiService = class EthereumApiService extends node_core_1.ApiService
         if (this.nodeConfig.primaryNetworkEndpoint) {
             endpoints.push(this.nodeConfig.primaryNetworkEndpoint);
         }
-        await this.createConnections(network, (endpoint) => api_connection_1.EthereumApiConnection.create(endpoint, this.nodeConfig.blockConfirmations, this.fetchBlocksBatches, this.eventEmitter, this.nodeConfig.unfinalizedBlocks), 
-        //eslint-disable-next-line @typescript-eslint/require-await
-        async (connection) => {
-            const api = connection.unsafeApi;
-            return api.getChainId().toString();
-        });
+        await this.createConnections(network, (endpoint) => api_connection_1.EthereumApiConnection.create(endpoint, this.nodeConfig.blockConfirmations, this.fetchBlocksBatches, this.eventEmitter, this.nodeConfig.unfinalizedBlocks));
         return this;
     }
     metadataMismatchError(metadata, expected, actual) {

package/dist/ethereum/api.service.ethereum.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.service.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  getLogger,\n  NodeConfig,\n  profilerWrap,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumBlock,\n  EthereumNetworkConfig,\n  LightEthereumBlock,\n} from '@subql/types-ethereum';\nimport { EthereumNodeConfig } from '../configure/NodeConfig';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { isOnlyEventHandlers } from '../utils/project';\nimport {\n  EthereumApiConnection,\n  FetchFunc,\n  GetFetchFunc,\n} from './api.connection';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nconst logger = getLogger('api');\n\n@Injectable()\nexport class EthereumApiService extends ApiService<\n  EthereumApi,\n  SafeEthProvider,\n  IBlock<EthereumBlock>[] | IBlock<LightEthereumBlock>[]\n> {\n  private fetchBlocksFunction: FetchFunc;\n  private fetchBlocksBatches: GetFetchFunc = () => this.fetchBlocksFunction;\n  private nodeConfig: EthereumNodeConfig;\n\n  constructor(\n    @Inject('ISubqueryProject') private project: SubqueryProject,\n    connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n    eventEmitter: EventEmitter2,\n    nodeConfig: NodeConfig,\n  ) {\n    super(connectionPoolService, eventEmitter);\n    this.nodeConfig = new EthereumNodeConfig(nodeConfig);\n\n    this.updateBlockFetching();\n  }\n\n  async init(): Promise<EthereumApiService> {\n    let network: EthereumNetworkConfig;\n    try {\n      network = this.project.network;\n    } catch (e) {\n      logger.error(Object.keys(e));\n      process.exit(1);\n    }\n\n    const endpoints = Array.isArray(network.endpoint)\n      ? network.endpoint\n      : [network.endpoint];\n\n    if (this.nodeConfig.primaryNetworkEndpoint) {\n      endpoints.push(this.nodeConfig.primaryNetworkEndpoint);\n    }\n\n    await this.createConnections(\n      network,\n      (endpoint) =>\n        EthereumApiConnection.create(\n          endpoint,\n          this.nodeConfig.blockConfirmations,\n          this.fetchBlocksBatches,\n          this.eventEmitter,\n          this.nodeConfig.unfinalizedBlocks,\n        ),\n      //eslint-disable-next-line @typescript-eslint/require-await\n      async (connection: EthereumApiConnection) => {\n        const api = connection.unsafeApi;\n        return api.getChainId().toString();\n      },\n    );\n\n    return this;\n  }\n\n  protected metadataMismatchError(\n    metadata: string,\n    expected: string,\n    actual: string,\n  ): Error {\n    return Error(\n      `Value of ${metadata} does not match across all endpoints. Please check that your endpoints are for the same network.\\n\n       Expected: ${expected}\n       Actual: ${actual}`,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.unsafeApi;\n  }\n\n  safeApi(height: number): SafeEthProvider {\n    const maxRetries = 5;\n\n    const retryErrorCodes = [\n      'UNKNOWN_ERROR',\n      'NOT_IMPLEMENTED',\n      'NETWORK_ERROR',\n      'SERVER_ERROR',\n      'TIMEOUT',\n      'BAD_DATA',\n      'CANCELLED',\n    ];\n\n    const handler: ProxyHandler<SafeEthProvider> = {\n      get: (target, prop, receiver) => {\n        const originalMethod = target[prop as keyof SafeEthProvider];\n        if (typeof originalMethod === 'function') {\n          return async (...args: any[]) => {\n            let retries = 0;\n            let currentApi = target;\n            let throwingError: Error;\n\n            while (retries < maxRetries) {\n              try {\n                return await originalMethod.apply(currentApi, args);\n              } catch (error: any) {\n                // other than retryErrorCodes, other errors does not have anything to do with network request, retrying would not change its outcome\n                if (!retryErrorCodes.includes(error?.code)) {\n                  throw error;\n                }\n\n                logger.warn(\n                  `Request failed with api at height ${height} (retry ${retries}): ${error.message}`,\n                );\n                throwingError = error;\n                currentApi = this.unsafeApi.getSafeApi(height);\n                retries++;\n              }\n            }\n\n            logger.error(\n              `Maximum retries (${maxRetries}) exceeded for api at height ${height}`,\n            );\n            throw throwingError;\n          };\n        }\n        return Reflect.get(target, prop, receiver);\n      },\n    };\n\n    return new Proxy(this.unsafeApi.getSafeApi(height), handler);\n  }\n\n  private async fetchFullBlocksBatch(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<IBlock<EthereumBlock>[]> {\n    return api.fetchBlocks(batch);\n  }\n\n  private async fetchLightBlocksBatch(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<IBlock<LightEthereumBlock>[]> {\n    return api.fetchBlocksLight(batch);\n  }\n\n  updateBlockFetching(): void {\n    const onlyEventHandlers = isOnlyEventHandlers(this.project);\n    const skipTransactions =\n      this.nodeConfig.skipTransactions && onlyEventHandlers;\n\n    if (this.nodeConfig.skipTransactions) {\n      if (onlyEventHandlers) {\n        logger.info(\n          'skipTransactions is enabled, only events and block headers will be fetched.',\n        );\n      } else {\n        logger.info(\n          `skipTransactions is disabled, the project contains handlers that aren't event handlers.`,\n        );\n      }\n    } else {\n      if (onlyEventHandlers) {\n        logger.warn(\n          'skipTransactions is disabled, the project contains only event handlers, it could be enabled to improve indexing performance.',\n        );\n      } else {\n        logger.info(`skipTransactions is disabled.`);\n      }\n    }\n\n    const fetchFunc = skipTransactions\n      ? this.fetchLightBlocksBatch.bind(this)\n      : this.fetchFullBlocksBatch.bind(this);\n\n    if (this.nodeConfig?.profiler) {\n      this.fetchBlocksFunction = profilerWrap(\n        fetchFunc,\n        'SubstrateUtil',\n        'fetchBlocksBatches',\n      );\n    } else {\n      this.fetchBlocksFunction = fetchFunc;\n    }\n  }\n}\n"]}
+{"version":3,"file":"api.service.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  getLogger,\n  NodeConfig,\n  profilerWrap,\n  IBlock,\n} from '@subql/node-core';\nimport {\n  EthereumBlock,\n  EthereumNetworkConfig,\n  LightEthereumBlock,\n} from '@subql/types-ethereum';\nimport { EthereumNodeConfig } from '../configure/NodeConfig';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { isOnlyEventHandlers } from '../utils/project';\nimport {\n  EthereumApiConnection,\n  FetchFunc,\n  GetFetchFunc,\n} from './api.connection';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nconst logger = getLogger('api');\n\n@Injectable()\nexport class EthereumApiService extends ApiService<\n  EthereumApi,\n  SafeEthProvider,\n  IBlock<EthereumBlock>[] | IBlock<LightEthereumBlock>[]\n> {\n  private fetchBlocksFunction: FetchFunc;\n  private fetchBlocksBatches: GetFetchFunc = () => this.fetchBlocksFunction;\n  private nodeConfig: EthereumNodeConfig;\n\n  constructor(\n    @Inject('ISubqueryProject') private project: SubqueryProject,\n    connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n    eventEmitter: EventEmitter2,\n    nodeConfig: NodeConfig,\n  ) {\n    super(connectionPoolService, eventEmitter);\n    this.nodeConfig = new EthereumNodeConfig(nodeConfig);\n\n    this.updateBlockFetching();\n  }\n\n  async init(): Promise<EthereumApiService> {\n    let network: EthereumNetworkConfig;\n    try {\n      network = this.project.network;\n    } catch (e) {\n      logger.error(Object.keys(e));\n      process.exit(1);\n    }\n\n    const endpoints = Array.isArray(network.endpoint)\n      ? network.endpoint\n      : [network.endpoint];\n\n    if (this.nodeConfig.primaryNetworkEndpoint) {\n      endpoints.push(this.nodeConfig.primaryNetworkEndpoint);\n    }\n\n    await this.createConnections(network, (endpoint) =>\n      EthereumApiConnection.create(\n        endpoint,\n        this.nodeConfig.blockConfirmations,\n        this.fetchBlocksBatches,\n        this.eventEmitter,\n        this.nodeConfig.unfinalizedBlocks,\n      ),\n    );\n\n    return this;\n  }\n\n  protected metadataMismatchError(\n    metadata: string,\n    expected: string,\n    actual: string,\n  ): Error {\n    return Error(\n      `Value of ${metadata} does not match across all endpoints. Please check that your endpoints are for the same network.\\n\n       Expected: ${expected}\n       Actual: ${actual}`,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.unsafeApi;\n  }\n\n  safeApi(height: number): SafeEthProvider {\n    const maxRetries = 5;\n\n    const retryErrorCodes = [\n      'UNKNOWN_ERROR',\n      'NOT_IMPLEMENTED',\n      'NETWORK_ERROR',\n      'SERVER_ERROR',\n      'TIMEOUT',\n      'BAD_DATA',\n      'CANCELLED',\n    ];\n\n    const handler: ProxyHandler<SafeEthProvider> = {\n      get: (target, prop, receiver) => {\n        const originalMethod = target[prop as keyof SafeEthProvider];\n        if (typeof originalMethod === 'function') {\n          return async (...args: any[]) => {\n            let retries = 0;\n            let currentApi = target;\n            let throwingError: Error;\n\n            while (retries < maxRetries) {\n              try {\n                return await originalMethod.apply(currentApi, args);\n              } catch (error: any) {\n                // other than retryErrorCodes, other errors does not have anything to do with network request, retrying would not change its outcome\n                if (!retryErrorCodes.includes(error?.code)) {\n                  throw error;\n                }\n\n                logger.warn(\n                  `Request failed with api at height ${height} (retry ${retries}): ${error.message}`,\n                );\n                throwingError = error;\n                currentApi = this.unsafeApi.getSafeApi(height);\n                retries++;\n              }\n            }\n\n            logger.error(\n              `Maximum retries (${maxRetries}) exceeded for api at height ${height}`,\n            );\n            throw throwingError;\n          };\n        }\n        return Reflect.get(target, prop, receiver);\n      },\n    };\n\n    return new Proxy(this.unsafeApi.getSafeApi(height), handler);\n  }\n\n  private async fetchFullBlocksBatch(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<IBlock<EthereumBlock>[]> {\n    return api.fetchBlocks(batch);\n  }\n\n  private async fetchLightBlocksBatch(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<IBlock<LightEthereumBlock>[]> {\n    return api.fetchBlocksLight(batch);\n  }\n\n  updateBlockFetching(): void {\n    const onlyEventHandlers = isOnlyEventHandlers(this.project);\n    const skipTransactions =\n      this.nodeConfig.skipTransactions && onlyEventHandlers;\n\n    if (this.nodeConfig.skipTransactions) {\n      if (onlyEventHandlers) {\n        logger.info(\n          'skipTransactions is enabled, only events and block headers will be fetched.',\n        );\n      } else {\n        logger.info(\n          `skipTransactions is disabled, the project contains handlers that aren't event handlers.`,\n        );\n      }\n    } else {\n      if (onlyEventHandlers) {\n        logger.warn(\n          'skipTransactions is disabled, the project contains only event handlers, it could be enabled to improve indexing performance.',\n        );\n      } else {\n        logger.info(`skipTransactions is disabled.`);\n      }\n    }\n\n    const fetchFunc = skipTransactions\n      ? this.fetchLightBlocksBatch.bind(this)\n      : this.fetchFullBlocksBatch.bind(this);\n\n    if (this.nodeConfig?.profiler) {\n      this.fetchBlocksFunction = profilerWrap(\n        fetchFunc,\n        'SubstrateUtil',\n        'fetchBlocksBatches',\n      );\n    } else {\n      this.fetchBlocksFunction = fetchFunc;\n    }\n  }\n}\n"]}

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

@@ -74,7 +74,7 @@ function callFilterToDictionaryCondition(filter, dsOptions) {
         txConditions.from = fromArray;
     }
     if (funcArray.length !== 0) {
-        txConditions.function = funcArray;
+        txConditions.data = funcArray;
     }
     return txConditions;
 }

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.function = 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('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"]}

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

@@ -121,22 +121,12 @@ describe('eth dictionary v2', () => {
         const ethBlock19217804 = ethBlocks.batchBlocks[1].block;
         expect(ethBlock19217803.number).toBe(19217803);
         expect(ethBlock19217804.number).toBe(19217804);
-        // To match with dictionaryQueryEntries[0].func
-        expect(ethBlock19217803.transactions[0].input.indexOf('0xdb3e2198')).toBe(0);
+        // Sighash of approval tx
+        expect(ethBlock19217803.transactions.filter((tx) => tx.input.indexOf('0x095ea7b3') === 0).length).toBe(4);
         expect(ethBlock19217804.logs.length).toBe(233);
         // This matches with dictionaryQueryEntries[0].topics
         expect(ethBlock19217804.logs[0].topics).toContain('0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef');
     }, 10000);
-    it('is able to convert raw v2 Blocks into eth blocks when getData', async () => {
-        const ethBlocks = (await ethDictionaryV2.getData(19217803, ethDictionaryV2._metadata.end, 2));
-        expect(ethBlocks.batchBlocks[0].block.number).toStrictEqual(19217803);
-        expect(ethBlocks.lastBufferedHeight).toStrictEqual(19217804);
-        // Can include input and hash
-        expect(ethBlocks.batchBlocks[1].block.transactions[1].hash).toBe(`0x3620616acae2c3050e7b993e207338803ceba628141b063430cb321da746c1ec`);
-        expect(ethBlocks.batchBlocks[1].block.transactions[1].input).toBe(`0xa9059cbb0000000000000000000000008ba631c37ce91a2d303be09907f496220a153d6a000000000000000000000000000000000000000000000000000000000c748d43`);
-        // relate logs
-        expect(ethBlocks.batchBlocks[1].block.logs[0].data).toBe(`0x`);
-    }, 10000);
     // Geth currently throwing errors with this request
     it.skip('is able to get transaction with field to is null', async () => {
         const dsMap = makeBlockHeightMap(mockDs2);
@@ -388,7 +378,7 @@ describe('buildDictionaryV2QueryEntry', () => {
             transactions: [
                 {
                     from: ['mockaddress'],
-                    function: ['0x7ef9ea98'],
+                    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    // To match with dictionaryQueryEntries[0].func\n    expect(ethBlock19217803.transactions[0].input.indexOf('0xdb3e2198')).toBe(\n      0,\n    );\n\n    expect(ethBlock19217804.logs.length).toBe(233);\n    // This matches with dictionaryQueryEntries[0].topics\n    expect(ethBlock19217804.logs[0].topics).toContain(\n      '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n    );\n  }, 10000);\n\n  it('is able to convert raw v2 Blocks into eth blocks when getData', 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[0].block.number).toStrictEqual(19217803);\n    expect(ethBlocks.lastBufferedHeight).toStrictEqual(19217804);\n\n    // Can include input and hash\n    expect(ethBlocks.batchBlocks[1].block.transactions[1].hash).toBe(\n      `0x3620616acae2c3050e7b993e207338803ceba628141b063430cb321da746c1ec`,\n    );\n    expect(ethBlocks.batchBlocks[1].block.transactions[1].input).toBe(\n      `0xa9059cbb0000000000000000000000008ba631c37ce91a2d303be09907f496220a153d6a000000000000000000000000000000000000000000000000000000000c748d43`,\n    );\n\n    // relate logs\n    expect(ethBlocks.batchBlocks[1].block.logs[0].data).toBe(`0x`);\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          function: ['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":"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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"]}

package/dist/indexer/dictionary/v2/types.d.ts

@@ -71,5 +71,5 @@ export interface EthDictionaryLogConditions {
 export interface EthDictionaryTxConditions {
     to?: string[];
     from?: string[];
-    function?: string[];
+    data?: string[];
 }

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v2/types.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 { DictionaryV2QueryEntry } from '@subql/node-core';\n\nexport interface RawEthBlock {\n  header: {\n    parentHash: string;\n    sha3Uncles: string;\n    miner: string;\n    stateRoot: string;\n    transactionRoot: string;\n    receiptsRoot: string;\n    logsBloom: string;\n    difficulty: bigint;\n    number: bigint;\n    gasLimit: bigint;\n    gasUsed: bigint;\n    timestamp: bigint;\n    extraData: string;\n    mixHash: string;\n    nonce: string;\n    baseFeePerGas: bigint;\n    withdrawalsRoot: string;\n    blobGasUsed: bigint;\n    excessBlobGas: bigint;\n    parentBeaconBlockRoot: string;\n    hash: string;\n  };\n  transactions: RawEthTransaction[];\n  logs: RawEthLog[];\n}\n\nexport interface RawEthTransaction {\n  type: string;\n  nonce: bigint;\n  to: string;\n  gas: bigint;\n  gasPrice: bigint;\n  maxPriorityFeePerGas: bigint;\n  maxFeePerGas: bigint;\n  value: bigint;\n  v: bigint;\n  r: string;\n  s: string;\n  input: string;\n  hash: string;\n  from: string;\n  func: string;\n  gasLimit: bigint;\n}\n\nexport interface RawEthLog {\n  address: string;\n  topics: string[];\n  data: string;\n  blockNumber: bigint;\n  transactionHash: string;\n  transactionIndex: bigint;\n  blockHash: string;\n  logIndex: bigint;\n  removed: boolean;\n}\n\n/**\n * Eth dictionary RPC request filter conditions\n */\nexport interface EthDictionaryV2QueryEntry extends DictionaryV2QueryEntry {\n  logs: EthDictionaryLogConditions[];\n  transactions: EthDictionaryTxConditions[];\n}\n\nexport interface EthDictionaryLogConditions {\n  address?: string[];\n  topics0?: string[];\n  topics1?: string[];\n  topics2?: string[];\n}\n\nexport interface EthDictionaryTxConditions {\n  to?: string[];\n  from?: string[];\n  function?: string[];\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/indexer/dictionary/v2/types.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 { DictionaryV2QueryEntry } from '@subql/node-core';\n\nexport interface RawEthBlock {\n  header: {\n    parentHash: string;\n    sha3Uncles: string;\n    miner: string;\n    stateRoot: string;\n    transactionRoot: string;\n    receiptsRoot: string;\n    logsBloom: string;\n    difficulty: bigint;\n    number: bigint;\n    gasLimit: bigint;\n    gasUsed: bigint;\n    timestamp: bigint;\n    extraData: string;\n    mixHash: string;\n    nonce: string;\n    baseFeePerGas: bigint;\n    withdrawalsRoot: string;\n    blobGasUsed: bigint;\n    excessBlobGas: bigint;\n    parentBeaconBlockRoot: string;\n    hash: string;\n  };\n  transactions: RawEthTransaction[];\n  logs: RawEthLog[];\n}\n\nexport interface RawEthTransaction {\n  type: string;\n  nonce: bigint;\n  to: string;\n  gas: bigint;\n  gasPrice: bigint;\n  maxPriorityFeePerGas: bigint;\n  maxFeePerGas: bigint;\n  value: bigint;\n  v: bigint;\n  r: string;\n  s: string;\n  input: string;\n  hash: string;\n  from: string;\n  func: string;\n  gasLimit: bigint;\n}\n\nexport interface RawEthLog {\n  address: string;\n  topics: string[];\n  data: string;\n  blockNumber: bigint;\n  transactionHash: string;\n  transactionIndex: bigint;\n  blockHash: string;\n  logIndex: bigint;\n  removed: boolean;\n}\n\n/**\n * Eth dictionary RPC request filter conditions\n */\nexport interface EthDictionaryV2QueryEntry extends DictionaryV2QueryEntry {\n  logs: EthDictionaryLogConditions[];\n  transactions: EthDictionaryTxConditions[];\n}\n\nexport interface EthDictionaryLogConditions {\n  address?: string[];\n  topics0?: string[];\n  topics1?: string[];\n  topics2?: string[];\n}\n\nexport interface EthDictionaryTxConditions {\n  to?: string[];\n  from?: string[];\n  data?: string[];\n}\n"]}

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

@@ -1,9 +1,8 @@
 import { DatasourceParams, DynamicDsService as BaseDynamicDsService } from '@subql/node-core';
 import { EthereumProjectDs, SubqueryProject } from '../configure/SubqueryProject';
 import { DsProcessorService } from './ds-processor.service';
-export declare class DynamicDsService extends BaseDynamicDsService<EthereumProjectDs> {
+export declare class DynamicDsService extends BaseDynamicDsService<EthereumProjectDs, SubqueryProject> {
     private readonly dsProcessorService;
-    private readonly project;
     constructor(dsProcessorService: DsProcessorService, project: SubqueryProject);
     protected getDatasource(params: DatasourceParams): Promise<EthereumProjectDs>;
 }

package/dist/indexer/dynamic-ds.service.js

@@ -20,22 +20,15 @@ const common_ethereum_1 = require("@subql/common-ethereum");
 const node_core_1 = require("@subql/node-core");
 const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
-const lodash_1 = require("lodash");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
 const ds_processor_service_1 = require("./ds-processor.service");
 let DynamicDsService = class DynamicDsService extends node_core_1.DynamicDsService {
     constructor(dsProcessorService, project) {
-        super();
+        super(project);
         this.dsProcessorService = dsProcessorService;
-        this.project = project;
     }
     async getDatasource(params) {
-        var _a;
-        const template = (0, lodash_1.cloneDeep)((_a = this.project.templates) === null || _a === void 0 ? void 0 : _a.find((t) => t.name === params.templateName));
-        if (!template) {
-            throw new Error(`Unable to find matching template in project for name: "${params.templateName}"`);
-        }
-        const dsObj = Object.assign(Object.assign({}, template), { startBlock: params.startBlock });
+        const dsObj = this.getTemplate(params.templateName, params.startBlock);
         try {
             if ((0, common_ethereum_1.isCustomDs)(dsObj)) {
                 dsObj.processor.options = Object.assign(Object.assign({}, dsObj.processor.options), params.args);

package/dist/indexer/dynamic-ds.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,4DAIgC;AAChC,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,mCAAmC;AACnC,kEAGsC;AACtC,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAAuC;IAC3E,YACmB,kBAAsC,EACV,OAAwB;QAErE,KAAK,EAAE,CAAC;QAHS,uBAAkB,GAAlB,kBAAkB,CAAoB;QACV,YAAO,GAAP,OAAO,CAAiB;IAGvE,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,MAAwB;;QAExB,MAAM,QAAQ,GAAG,IAAA,kBAAS,EACxB,MAAA,IAAI,CAAC,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,CAAC,CACpE,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,0DAA0D,MAAM,CAAC,YAAY,GAAG,CACjF,CAAC;SACH;QAED,MAAM,KAAK,GAAG,gCACT,QAAQ,KACX,UAAU,EAAE,MAAM,CAAC,UAAU,GACT,CAAC;QACvB,IAAI;YACF,IAAI,IAAA,4BAAU,EAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,SAAS,CAAC,OAAO,mCAClB,KAAK,CAAC,SAAS,CAAC,OAAO,GACvB,MAAM,CAAC,IAAI,CACf,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,GACb,MAAM,CAAC,IAAI,CACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAA,gCAAY,EAAC,+CAA6B,EAAE,KAAK,CAAC,CAAC;gBAEpE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,QAAQ,EAAE;oBACpC,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,KAAK;iBAC5B,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,MAAM;yBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;yBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;iBACH;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CACF,CAAA;AAzDY,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCADU,yCAAkB;QACD,iCAAe;GAH5D,gBAAgB,CAyD5B;AAzDY,4CAAgB","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  EthereumRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-ethereum';\nimport {\n  DatasourceParams,\n  DynamicDsService as BaseDynamicDsService,\n} from '@subql/node-core';\nimport { plainToClass } from 'class-transformer';\nimport { validateSync } from 'class-validator';\nimport { cloneDeep } from 'lodash';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<EthereumProjectDs> {\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    @Inject('ISubqueryProject') private readonly project: SubqueryProject,\n  ) {\n    super();\n  }\n\n  protected async getDatasource(\n    params: DatasourceParams,\n  ): Promise<EthereumProjectDs> {\n    const template = cloneDeep(\n      this.project.templates?.find((t) => t.name === params.templateName),\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as EthereumProjectDs;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        dsObj.options = {\n          ...dsObj.options,\n          ...params.args,\n        };\n\n        const parsedDs = plainToClass(EthereumRuntimeDataSourceImpl, dsObj);\n\n        const errors = validateSync(parsedDs, {\n          whitelist: true,\n          forbidNonWhitelisted: false,\n        });\n        if (errors.length) {\n          throw new Error(\n            `Dynamic ds is invalid\\n${errors\n              .map((e) => e.toString())\n              .join('\\n')}`,\n          );\n        }\n      }\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AACpD,4DAIgC;AAChC,gDAG0B;AAC1B,yDAAiD;AACjD,qDAA+C;AAC/C,kEAGsC;AACtC,iEAA4D;AAGrD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAGrC;IACC,YACmB,kBAAsC,EAC3B,OAAwB;QAEpD,KAAK,CAAC,OAAO,CAAC,CAAC;QAHE,uBAAkB,GAAlB,kBAAkB,CAAoB;IAIzD,CAAC;IAES,KAAK,CAAC,aAAa,CAC3B,MAAwB;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAC5B,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,UAAU,CAClB,CAAC;QAEF,IAAI;YACF,IAAI,IAAA,4BAAU,EAAC,KAAK,CAAC,EAAE;gBACrB,KAAK,CAAC,SAAS,CAAC,OAAO,mCAClB,KAAK,CAAC,SAAS,CAAC,OAAO,GACvB,MAAM,CAAC,IAAI,CACf,CAAC;gBACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE;gBAC7B,KAAK,CAAC,OAAO,mCACR,KAAK,CAAC,OAAO,GACb,MAAM,CAAC,IAAI,CACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAA,gCAAY,EAAC,+CAA6B,EAAE,KAAK,CAAC,CAAC;gBAEpE,MAAM,MAAM,GAAG,IAAA,8BAAY,EAAC,QAAQ,EAAE;oBACpC,SAAS,EAAE,IAAI;oBACf,oBAAoB,EAAE,KAAK;iBAC5B,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,MAAM;yBAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;yBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;iBACH;aACF;YACD,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACxE;IACH,CAAC;CACF,CAAA;AAnDY,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCADU,yCAAkB;QAClB,iCAAe;GAN3C,gBAAgB,CAmD5B;AAnDY,4CAAgB","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport {\n  EthereumRuntimeDataSourceImpl,\n  isCustomDs,\n  isRuntimeDs,\n} from '@subql/common-ethereum';\nimport {\n  DatasourceParams,\n  DynamicDsService as BaseDynamicDsService,\n} from '@subql/node-core';\nimport { plainToClass } from 'class-transformer';\nimport { validateSync } from 'class-validator';\nimport {\n  EthereumProjectDs,\n  SubqueryProject,\n} from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\n@Injectable()\nexport class DynamicDsService extends BaseDynamicDsService<\n  EthereumProjectDs,\n  SubqueryProject\n> {\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n  ) {\n    super(project);\n  }\n\n  protected async getDatasource(\n    params: DatasourceParams,\n  ): Promise<EthereumProjectDs> {\n    const dsObj = this.getTemplate<EthereumProjectDs>(\n      params.templateName,\n      params.startBlock,\n    );\n\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        dsObj.options = {\n          ...dsObj.options,\n          ...params.args,\n        };\n\n        const parsedDs = plainToClass(EthereumRuntimeDataSourceImpl, dsObj);\n\n        const errors = validateSync(parsedDs, {\n          whitelist: true,\n          forbidNonWhitelisted: false,\n        });\n        if (errors.length) {\n          throw new Error(\n            `Dynamic ds is invalid\\n${errors\n              .map((e) => e.toString())\n              .join('\\n')}`,\n          );\n        }\n      }\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}

package/dist/indexer/fetch.module.js

@@ -30,7 +30,6 @@ FetchModule = __decorate([
             node_core_1.InMemoryCacheService,
             node_core_1.StoreService,
             node_core_1.StoreCacheService,
-            api_service_ethereum_1.EthereumApiService,
             {
                 provide: node_core_1.ApiService,
                 useFactory: async (project, connectionPoolService, eventEmitter, nodeConfig) => {

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.module.js","sourceRoot":"","sources":["../../src/indexer/fetch.module.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 { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  PoiBenchmarkService,\n  IndexingBenchmarkService,\n  StoreService,\n  PoiService,\n  ApiService,\n  NodeConfig,\n  ConnectionPoolService,\n  ConnectionPoolStateManager,\n  SmartBatchService,\n  StoreCacheService,\n  IProjectUpgradeService,\n  PoiSyncService,\n  InMemoryCacheService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../ethereum/api.connection';\nimport { EthereumApiService } from '../ethereum/api.service.ethereum';\nimport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n} from './blockDispatcher';\nimport { EthDictionaryService } from './dictionary/ethDictionary.service';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { FetchService } from './fetch.service';\nimport { IndexerManager } from './indexer.manager';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n@Module({\n  providers: [\n    InMemoryCacheService,\n    StoreService,\n    StoreCacheService,\n    EthereumApiService,\n    {\n      provide: ApiService,\n      useFactory: async (\n        project: SubqueryProject,\n        connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n        eventEmitter: EventEmitter2,\n        nodeConfig: NodeConfig,\n      ) => {\n        const apiService = new EthereumApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n          nodeConfig,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        ConnectionPoolService,\n        EventEmitter2,\n        NodeConfig,\n      ],\n    },\n    IndexerManager,\n    ConnectionPoolStateManager,\n    ConnectionPoolService,\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: 'IBlockDispatcher',\n      useFactory: (\n        nodeConfig: NodeConfig,\n        eventEmitter: EventEmitter2,\n        projectService: ProjectService,\n        projectUpgradeService: IProjectUpgradeService,\n        apiService: EthereumApiService,\n        indexerManager: IndexerManager,\n        smartBatchService: SmartBatchService,\n        cacheService: InMemoryCacheService,\n        storeService: StoreService,\n        storeCacheService: StoreCacheService,\n        poiSyncService: PoiSyncService,\n        project: SubqueryProject,\n        dynamicDsService: DynamicDsService,\n        unfinalizedBlocks: UnfinalizedBlocksService,\n        connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n      ) =>\n        nodeConfig.workers\n          ? new WorkerBlockDispatcherService(\n              nodeConfig,\n              eventEmitter,\n              projectService,\n              projectUpgradeService,\n              smartBatchService,\n              cacheService,\n              storeService,\n              storeCacheService,\n              poiSyncService,\n              project,\n              dynamicDsService,\n              unfinalizedBlocks,\n              connectionPoolState,\n            )\n          : new BlockDispatcherService(\n              apiService,\n              nodeConfig,\n              indexerManager,\n              eventEmitter,\n              projectService,\n              projectUpgradeService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiSyncService,\n              project,\n              dynamicDsService,\n            ),\n      inject: [\n        NodeConfig,\n        EventEmitter2,\n        'IProjectService',\n        'IProjectUpgradeService',\n        ApiService,\n        IndexerManager,\n        SmartBatchService,\n        InMemoryCacheService,\n        StoreService,\n        StoreCacheService,\n        PoiSyncService,\n        'ISubqueryProject',\n        DynamicDsService,\n        UnfinalizedBlocksService,\n        ConnectionPoolStateManager,\n      ],\n    },\n    FetchService,\n    ConnectionPoolService,\n    IndexingBenchmarkService,\n    PoiBenchmarkService,\n    EthDictionaryService,\n    SandboxService,\n    DsProcessorService,\n    DynamicDsService,\n    PoiService,\n    PoiSyncService,\n    {\n      useClass: ProjectService,\n      provide: 'IProjectService',\n    },\n    UnfinalizedBlocksService,\n  ],\n  exports: [StoreService, StoreCacheService],\n})\nexport class FetchModule {}\n"]}
+{"version":3,"file":"fetch.module.js","sourceRoot":"","sources":["../../src/indexer/fetch.module.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 { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  PoiBenchmarkService,\n  IndexingBenchmarkService,\n  StoreService,\n  PoiService,\n  ApiService,\n  NodeConfig,\n  ConnectionPoolService,\n  ConnectionPoolStateManager,\n  SmartBatchService,\n  StoreCacheService,\n  IProjectUpgradeService,\n  PoiSyncService,\n  InMemoryCacheService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from '../ethereum/api.connection';\nimport { EthereumApiService } from '../ethereum/api.service.ethereum';\nimport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n} from './blockDispatcher';\nimport { EthDictionaryService } from './dictionary/ethDictionary.service';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport { FetchService } from './fetch.service';\nimport { IndexerManager } from './indexer.manager';\nimport { ProjectService } from './project.service';\nimport { SandboxService } from './sandbox.service';\nimport { UnfinalizedBlocksService } from './unfinalizedBlocks.service';\n\n@Module({\n  providers: [\n    InMemoryCacheService,\n    StoreService,\n    StoreCacheService,\n    {\n      provide: ApiService,\n      useFactory: async (\n        project: SubqueryProject,\n        connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n        eventEmitter: EventEmitter2,\n        nodeConfig: NodeConfig,\n      ) => {\n        const apiService = new EthereumApiService(\n          project,\n          connectionPoolService,\n          eventEmitter,\n          nodeConfig,\n        );\n        await apiService.init();\n        return apiService;\n      },\n      inject: [\n        'ISubqueryProject',\n        ConnectionPoolService,\n        EventEmitter2,\n        NodeConfig,\n      ],\n    },\n    IndexerManager,\n    ConnectionPoolStateManager,\n    ConnectionPoolService,\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: SmartBatchService,\n      useFactory: (nodeConfig: NodeConfig) => {\n        return new SmartBatchService(nodeConfig.batchSize);\n      },\n      inject: [NodeConfig],\n    },\n    {\n      provide: 'IBlockDispatcher',\n      useFactory: (\n        nodeConfig: NodeConfig,\n        eventEmitter: EventEmitter2,\n        projectService: ProjectService,\n        projectUpgradeService: IProjectUpgradeService,\n        apiService: EthereumApiService,\n        indexerManager: IndexerManager,\n        smartBatchService: SmartBatchService,\n        cacheService: InMemoryCacheService,\n        storeService: StoreService,\n        storeCacheService: StoreCacheService,\n        poiSyncService: PoiSyncService,\n        project: SubqueryProject,\n        dynamicDsService: DynamicDsService,\n        unfinalizedBlocks: UnfinalizedBlocksService,\n        connectionPoolState: ConnectionPoolStateManager<EthereumApiConnection>,\n      ) =>\n        nodeConfig.workers\n          ? new WorkerBlockDispatcherService(\n              nodeConfig,\n              eventEmitter,\n              projectService,\n              projectUpgradeService,\n              smartBatchService,\n              cacheService,\n              storeService,\n              storeCacheService,\n              poiSyncService,\n              project,\n              dynamicDsService,\n              unfinalizedBlocks,\n              connectionPoolState,\n            )\n          : new BlockDispatcherService(\n              apiService,\n              nodeConfig,\n              indexerManager,\n              eventEmitter,\n              projectService,\n              projectUpgradeService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiSyncService,\n              project,\n              dynamicDsService,\n            ),\n      inject: [\n        NodeConfig,\n        EventEmitter2,\n        'IProjectService',\n        'IProjectUpgradeService',\n        ApiService,\n        IndexerManager,\n        SmartBatchService,\n        InMemoryCacheService,\n        StoreService,\n        StoreCacheService,\n        PoiSyncService,\n        'ISubqueryProject',\n        DynamicDsService,\n        UnfinalizedBlocksService,\n        ConnectionPoolStateManager,\n      ],\n    },\n    FetchService,\n    ConnectionPoolService,\n    IndexingBenchmarkService,\n    PoiBenchmarkService,\n    EthDictionaryService,\n    SandboxService,\n    DsProcessorService,\n    DynamicDsService,\n    PoiService,\n    PoiSyncService,\n    {\n      useClass: ProjectService,\n      provide: 'IProjectService',\n    },\n    UnfinalizedBlocksService,\n  ],\n  exports: [StoreService, StoreCacheService],\n})\nexport class FetchModule {}\n"]}

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

@@ -15,8 +15,6 @@ export declare class IndexerManager extends BaseIndexerManager<SafeEthProvider,
     protected updateCustomProcessor: typeof asSecondLayerHandlerProcessor_1_0_0;
     constructor(apiService: ApiService, nodeConfig: NodeConfig, sandboxService: SandboxService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService);
     indexBlock(block: IBlock<BlockContent>, dataSources: SubqlEthereumDataSource[]): Promise<ProcessBlockResponse>;
-    getBlockHeight(block: BlockContent): number;
-    getBlockHash(block: BlockContent): string;
     private getApi;
     protected indexBlockData(block: BlockContent, dataSources: EthereumProjectDs[], getVM: (d: EthereumProjectDs) => Promise<IndexerSandbox>): Promise<void>;
     private indexBlockContent;

package/dist/indexer/indexer.manager.js

@@ -30,15 +30,9 @@ let IndexerManager = class IndexerManager extends node_core_1.BaseIndexerManager
     async indexBlock(block, dataSources) {
         return super.internalIndexBlock(block, dataSources, () => this.getApi(block.block));
     }
-    getBlockHeight(block) {
-        return block.number;
-    }
-    getBlockHash(block) {
-        return block.hash;
-    }
     // eslint-disable-next-line @typescript-eslint/require-await
     async getApi(block) {
-        return this.apiService.safeApi(this.getBlockHeight(block));
+        return this.apiService.safeApi(block.number);
     }
     async indexBlockData(block, dataSources, getVM) {
         var _a, _b;

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"worker.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AAEpD,gDAQ0B;AAK1B,wDAAoD;AAa7C,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,6BAKlC;IACC,YACU,UAIP,EACO,cAA8B,EAEtC,cAAkD,EAElD,qBAA6C,EAC7C,UAAsB;QAEtB,KAAK,CAAC,cAAc,EAAE,qBAAqB,EAAE,UAAU,CAAC,CAAC;QAZjD,eAAU,GAAV,UAAU,CAIjB;QACO,mBAAc,GAAd,cAAc,CAAgB;IAQxC,CAAC;IAES,KAAK,CAAC,eAAe,CAC7B,OAAe,EACf,KAAS;QAET,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IAES,eAAe,CAAC,KAAmB;QAC3C,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,KAA2B,EAC3B,WAAsC;QAEtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AA1CY,aAAa;IADzB,IAAA,mBAAU,GAAE;IAcR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;qCARb,sBAAU;QAKN,gCAAc,kBAK1B,sBAAU;GAjBb,aAAa,CA0CzB;AA1CY,sCAAa","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { SubqlEthereumDataSource } from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  IProjectService,\n  ProcessBlockResponse,\n  ApiService,\n  BaseWorkerService,\n  IProjectUpgradeService,\n  IBlock,\n} from '@subql/node-core';\nimport { EthereumBlock, LightEthereumBlock } from '@subql/types-ethereum';\nimport { EthereumProjectDs } from '../../configure/SubqueryProject';\nimport { EthereumApi } from '../../ethereum';\nimport SafeEthProvider from '../../ethereum/safe-api';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\n\nexport type FetchBlockResponse = { parentHash: string } | undefined;\n\nexport type WorkerStatusResponse = {\n  threadId: number;\n  isIndexing: boolean;\n  fetchedBlocks: number;\n  toFetchBlocks: number;\n};\n\n@Injectable()\nexport class WorkerService extends BaseWorkerService<\n  BlockContent,\n  FetchBlockResponse,\n  SubqlEthereumDataSource,\n  {}\n> {\n  constructor(\n    private apiService: ApiService<\n      EthereumApi,\n      SafeEthProvider,\n      IBlock<BlockContent>[]\n    >,\n    private indexerManager: IndexerManager,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    nodeConfig: NodeConfig,\n  ) {\n    super(projectService, projectUpgradeService, nodeConfig);\n  }\n\n  protected async fetchChainBlock(\n    heights: number,\n    extra: {},\n  ): Promise<IBlock<BlockContent>> {\n    const [block] = await this.apiService.fetchBlocks([heights]);\n    return block;\n  }\n\n  protected toBlockResponse(block: BlockContent): { parentHash: string } {\n    return {\n      parentHash: block.parentHash,\n    };\n  }\n\n  protected async processFetchedBlock(\n    block: IBlock<BlockContent>,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(block, dataSources);\n  }\n}\n"]}
+{"version":3,"file":"worker.service.js","sourceRoot":"","sources":["../../../src/indexer/worker/worker.service.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;;;;;;AAEnC,2CAAoD;AAEpD,gDAQ0B;AAI1B,wDAAoD;AAa7C,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,6BAKlC;IACC,YACU,UAIP,EACO,cAA8B,EAEtC,cAAkD,EAElD,qBAA6C,EAC7C,UAAsB;QAEtB,KAAK,CAAC,cAAc,EAAE,qBAAqB,EAAE,UAAU,CAAC,CAAC;QAZjD,eAAU,GAAV,UAAU,CAIjB;QACO,mBAAc,GAAd,cAAc,CAAgB;IAQxC,CAAC;IAES,KAAK,CAAC,eAAe,CAC7B,OAAe,EACf,KAAS;QAET,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7D,OAAO,KAAK,CAAC;IACf,CAAC;IAES,eAAe,CAAC,KAAmB;QAC3C,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;SAC7B,CAAC;IACJ,CAAC;IAES,KAAK,CAAC,mBAAmB,CACjC,KAA2B,EAC3B,WAAsC;QAEtC,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AA1CY,aAAa;IADzB,IAAA,mBAAU,GAAE;IAcR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAEzB,WAAA,IAAA,eAAM,EAAC,wBAAwB,CAAC,CAAA;qCARb,sBAAU;QAKN,gCAAc,kBAK1B,sBAAU;GAjBb,aAAa,CA0CzB;AA1CY,sCAAa","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { SubqlEthereumDataSource } from '@subql/common-ethereum';\nimport {\n  NodeConfig,\n  IProjectService,\n  ProcessBlockResponse,\n  ApiService,\n  BaseWorkerService,\n  IProjectUpgradeService,\n  IBlock,\n} from '@subql/node-core';\nimport { EthereumProjectDs } from '../../configure/SubqueryProject';\nimport { EthereumApi } from '../../ethereum';\nimport SafeEthProvider from '../../ethereum/safe-api';\nimport { IndexerManager } from '../indexer.manager';\nimport { BlockContent } from '../types';\n\nexport type FetchBlockResponse = { parentHash: string } | undefined;\n\nexport type WorkerStatusResponse = {\n  threadId: number;\n  isIndexing: boolean;\n  fetchedBlocks: number;\n  toFetchBlocks: number;\n};\n\n@Injectable()\nexport class WorkerService extends BaseWorkerService<\n  BlockContent,\n  FetchBlockResponse,\n  SubqlEthereumDataSource,\n  {}\n> {\n  constructor(\n    private apiService: ApiService<\n      EthereumApi,\n      SafeEthProvider,\n      IBlock<BlockContent>[]\n    >,\n    private indexerManager: IndexerManager,\n    @Inject('IProjectService')\n    projectService: IProjectService<EthereumProjectDs>,\n    @Inject('IProjectUpgradeService')\n    projectUpgradeService: IProjectUpgradeService,\n    nodeConfig: NodeConfig,\n  ) {\n    super(projectService, projectUpgradeService, nodeConfig);\n  }\n\n  protected async fetchChainBlock(\n    heights: number,\n    extra: {},\n  ): Promise<IBlock<BlockContent>> {\n    const [block] = await this.apiService.fetchBlocks([heights]);\n    return block;\n  }\n\n  protected toBlockResponse(block: BlockContent): { parentHash: string } {\n    return {\n      parentHash: block.parentHash,\n    };\n  }\n\n  protected async processFetchedBlock(\n    block: IBlock<BlockContent>,\n    dataSources: SubqlEthereumDataSource[],\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(block, dataSources);\n  }\n}\n"]}