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

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

@@ -1,11 +1,23 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ApiConnection } from '@subql/node-core';
+import { ApiConnectionError, IApiConnectionSpecific, NetworkMetadataPayload } from '@subql/node-core';
+import { EthereumBlockWrapper } from '@subql/types-ethereum';
 import { EthereumApi } from './api.ethereum';
-export declare class EthereumApiConnection implements ApiConnection {
-    private _api;
-    private constructor();
-    static create(endpoint: string, eventEmitter: EventEmitter2): Promise<EthereumApiConnection>;
-    get api(): EthereumApi;
+import SafeEthProvider from './safe-api';
+type FetchFunc = (api: EthereumApi, batch: number[]) => Promise<EthereumBlockWrapper[]>;
+export declare class EthereumApiConnection implements IApiConnectionSpecific<EthereumApi, SafeEthProvider, EthereumBlockWrapper> {
+    unsafeApi: EthereumApi;
+    private fetchBlocksBatches;
+    readonly networkMeta: NetworkMetadataPayload;
+    constructor(unsafeApi: EthereumApi, fetchBlocksBatches: FetchFunc);
+    static create(endpoint: string, fetchBlockBatches: FetchFunc, eventEmitter: EventEmitter2): Promise<EthereumApiConnection>;
+    safeApi(height: number): SafeEthProvider;
     apiConnect(): Promise<void>;
     apiDisconnect(): Promise<void>;
+    fetchBlocks(heights: number[]): Promise<EthereumBlockWrapper[]>;
+    handleError: typeof EthereumApiConnection.handleError;
+    static handleError(e: Error): ApiConnectionError;
+    static handleRateLimitError(e: Error): ApiConnectionError;
+    static handleTimeoutError(e: Error): ApiConnectionError;
+    static handleDisconnectionError(e: Error): ApiConnectionError;
 }
+export {};

package/dist/ethereum/api.connection.js

@@ -3,24 +3,61 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumApiConnection = void 0;
+const node_core_1 = require("@subql/node-core");
 const api_ethereum_1 = require("./api.ethereum");
 class EthereumApiConnection {
-    constructor(_api) {
-        this._api = _api;
+    constructor(unsafeApi, fetchBlocksBatches) {
+        this.unsafeApi = unsafeApi;
+        this.fetchBlocksBatches = fetchBlocksBatches;
+        this.handleError = EthereumApiConnection.handleError;
+        this.networkMeta = {
+            chain: unsafeApi.getChainId().toString(),
+            specName: unsafeApi.getSpecName(),
+            genesisHash: unsafeApi.getGenesisHash(),
+        };
     }
-    static async create(endpoint, eventEmitter) {
+    static async create(endpoint, fetchBlockBatches, eventEmitter) {
         const api = new api_ethereum_1.EthereumApi(endpoint, eventEmitter);
         await api.init();
-        return new EthereumApiConnection(api);
+        return new EthereumApiConnection(api, fetchBlockBatches);
     }
-    get api() {
-        return this._api;
+    safeApi(height) {
+        throw new Error(`Not Implemented`);
     }
     async apiConnect() {
-        await this._api.connect();
+        await this.unsafeApi.connect();
     }
     async apiDisconnect() {
-        await this._api.disconnect();
+        await this.unsafeApi.disconnect();
+    }
+    async fetchBlocks(heights) {
+        const blocks = await this.fetchBlocksBatches(this.unsafeApi, heights);
+        return blocks;
+    }
+    static handleError(e) {
+        let formatted_error;
+        if (e.message.startsWith(`No response received from RPC endpoint in`)) {
+            formatted_error = EthereumApiConnection.handleTimeoutError(e);
+        }
+        else if (e.message.startsWith(`disconnected from `)) {
+            formatted_error = EthereumApiConnection.handleDisconnectionError(e);
+        }
+        else if (e.message.startsWith(`Rate Limited at endpoint`)) {
+            formatted_error = EthereumApiConnection.handleRateLimitError(e);
+        }
+        else {
+            formatted_error = new node_core_1.ApiConnectionError(e.name, e.message, node_core_1.ApiErrorType.Default);
+        }
+        return formatted_error;
+    }
+    static handleRateLimitError(e) {
+        return new node_core_1.ApiConnectionError('RateLimit', e.message, node_core_1.ApiErrorType.RateLimit);
+    }
+    static handleTimeoutError(e) {
+        return new node_core_1.ApiConnectionError('TimeoutError', e.message, node_core_1.ApiErrorType.Timeout);
+    }
+    static handleDisconnectionError(e) {
+        return new node_core_1.ApiConnectionError('ConnectionError', e.message, node_core_1.ApiErrorType.Connection);
     }
 }
 exports.EthereumApiConnection = EthereumApiConnection;

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,gEAAgE;AAChE,sCAAsC;;;AAItC,iDAA6C;AAE7C,MAAa,qBAAqB;IAChC,YAA4B,IAAiB;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAAG,CAAC;IAEjD,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAgB,EAChB,YAA2B;QAE3B,MAAM,GAAG,GAAG,IAAI,0BAAW,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEpD,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,OAAO,IAAI,qBAAqB,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;IACD,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;IAC/B,CAAC;CACF;AAxBD,sDAwBC","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { ApiConnection } from '@subql/node-core';\nimport { EthereumApi } from './api.ethereum';\n\nexport class EthereumApiConnection implements ApiConnection {\n  private constructor(private _api: EthereumApi) {}\n\n  static async create(\n    endpoint: string,\n    eventEmitter: EventEmitter2,\n  ): Promise<EthereumApiConnection> {\n    const api = new EthereumApi(endpoint, eventEmitter);\n\n    await api.init();\n\n    return new EthereumApiConnection(api);\n  }\n\n  get api(): EthereumApi {\n    return this._api;\n  }\n\n  async apiConnect(): Promise<void> {\n    await this._api.connect();\n  }\n  async apiDisconnect(): Promise<void> {\n    await this._api.disconnect();\n  }\n}\n"]}
+{"version":3,"file":"api.connection.js","sourceRoot":"","sources":["../../src/ethereum/api.connection.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;AAGtC,gDAK0B;AAE1B,iDAA6C;AAQ7C,MAAa,qBAAqB;IAMhC,YACS,SAAsB,EACrB,kBAA6B;QAD9B,cAAS,GAAT,SAAS,CAAa;QACrB,uBAAkB,GAAlB,kBAAkB,CAAW;QAsCvC,gBAAW,GAAG,qBAAqB,CAAC,WAAW,CAAC;QApC9C,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,iBAA4B,EAC5B,YAA2B;QAE3B,MAAM,GAAG,GAAG,IAAI,0BAAW,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAEpD,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAEjB,OAAO,IAAI,qBAAqB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IAC3D,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,CAAC,OAAiB;QACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACtE,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,qBAAqB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;SAC/D;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE;YACrD,eAAe,GAAG,qBAAqB,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;SACrE;aAAM,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,0BAA0B,CAAC,EAAE;YAC3D,eAAe,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;SACjE;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;IAED,MAAM,CAAC,oBAAoB,CAAC,CAAQ;QAClC,OAAO,IAAI,8BAAkB,CAC3B,WAAW,EACX,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,SAAS,CACvB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,CAAQ;QAChC,OAAO,IAAI,8BAAkB,CAC3B,cAAc,EACd,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,OAAO,CACrB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,CAAQ;QACtC,OAAO,IAAI,8BAAkB,CAC3B,iBAAiB,EACjB,CAAC,CAAC,OAAO,EACT,wBAAY,CAAC,UAAU,CACxB,CAAC;IACJ,CAAC;CACF;AAzFD,sDAyFC","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiConnectionError,\n  ApiErrorType,\n  IApiConnectionSpecific,\n  NetworkMetadataPayload,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\ntype FetchFunc = (\n  api: EthereumApi,\n  batch: number[],\n) => Promise<EthereumBlockWrapper[]>;\n\nexport class EthereumApiConnection\n  implements\n    IApiConnectionSpecific<EthereumApi, SafeEthProvider, EthereumBlockWrapper>\n{\n  readonly networkMeta: NetworkMetadataPayload;\n\n  constructor(\n    public unsafeApi: EthereumApi,\n    private fetchBlocksBatches: FetchFunc,\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    fetchBlockBatches: FetchFunc,\n    eventEmitter: EventEmitter2,\n  ): Promise<EthereumApiConnection> {\n    const api = new EthereumApi(endpoint, eventEmitter);\n\n    await api.init();\n\n    return new EthereumApiConnection(api, fetchBlockBatches);\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(heights: number[]): Promise<EthereumBlockWrapper[]> {\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 = EthereumApiConnection.handleTimeoutError(e);\n    } else if (e.message.startsWith(`disconnected from `)) {\n      formatted_error = EthereumApiConnection.handleDisconnectionError(e);\n    } else if (e.message.startsWith(`Rate Limited at endpoint`)) {\n      formatted_error = EthereumApiConnection.handleRateLimitError(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  static handleRateLimitError(e: Error): ApiConnectionError {\n    return new ApiConnectionError(\n      'RateLimit',\n      e.message,\n      ApiErrorType.RateLimit,\n    );\n  }\n\n  static handleTimeoutError(e: Error): ApiConnectionError {\n    return new ApiConnectionError(\n      'TimeoutError',\n      e.message,\n      ApiErrorType.Timeout,\n    );\n  }\n\n  static handleDisconnectionError(e: Error): ApiConnectionError {\n    return new ApiConnectionError(\n      'ConnectionError',\n      e.message,\n      ApiErrorType.Connection,\n    );\n  }\n}\n"]}

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

@@ -4,13 +4,14 @@ import { EthereumBlockWrapper } from '@subql/types-ethereum';
 import { SubqueryProject } from '../configure/SubqueryProject';
 import { EthereumApiConnection } from './api.connection';
 import { EthereumApi } from './api.ethereum';
-export declare class EthereumApiService extends ApiService {
-    private connectionPoolService;
+import SafeEthProvider from './safe-api';
+export declare class EthereumApiService extends ApiService<EthereumApi, SafeEthProvider, EthereumBlockWrapper> {
+    private project;
     private eventEmitter;
     constructor(project: SubqueryProject, connectionPoolService: ConnectionPoolService<EthereumApiConnection>, eventEmitter: EventEmitter2);
     networkMeta: NetworkMetadataPayload;
     init(): Promise<EthereumApiService>;
-    fetchBlocks(batch: number[]): Promise<EthereumBlockWrapper[]>;
     private metadataMismatchError;
     get api(): EthereumApi;
+    private fetchBlockBatches;
 }

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

@@ -21,10 +21,11 @@ const node_core_1 = require("@subql/node-core");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
 const api_connection_1 = require("./api.connection");
 const logger = (0, node_core_1.getLogger)('api');
+const MAX_RECONNECT_ATTEMPTS = 5;
 let EthereumApiService = class EthereumApiService extends node_core_1.ApiService {
     constructor(project, connectionPoolService, eventEmitter) {
-        super(project);
-        this.connectionPoolService = connectionPoolService;
+        super(connectionPoolService);
+        this.project = project;
         this.eventEmitter = eventEmitter;
     }
     async init() {
@@ -40,27 +41,24 @@ let EthereumApiService = class EthereumApiService extends node_core_1.ApiService
             const endpoints = Array.isArray(network.endpoint)
                 ? network.endpoint
                 : [network.endpoint];
-            const connections = await Promise.all(endpoints.map(async (endpoint, i) => {
-                const connection = await api_connection_1.EthereumApiConnection.create(endpoint, this.eventEmitter);
-                const { api } = connection;
+            const endpointToApiIndex = {};
+            await Promise.all(endpoints.map(async (endpoint, i) => {
+                const connection = await api_connection_1.EthereumApiConnection.create(endpoint, this.fetchBlockBatches, this.eventEmitter);
+                const api = connection.unsafeApi;
                 this.eventEmitter.emit(node_core_1.IndexerEvent.ApiConnected, {
                     value: 1,
                     apiIndex: i,
                     endpoint: endpoint,
                 });
                 if (!this.networkMeta) {
-                    this.networkMeta = {
-                        chain: api.getChainId().toString(),
-                        specName: api.getSpecName(),
-                        genesisHash: api.getGenesisHash(),
-                    };
+                    this.networkMeta = connection.networkMeta;
                 }
                 if (network.chainId !== api.getChainId().toString()) {
                     throw this.metadataMismatchError('ChainId', network.chainId, api.getChainId().toString());
                 }
-                return connection;
+                endpointToApiIndex[endpoint] = connection;
             }));
-            this.connectionPoolService.addBatchToConnections(connections);
+            this.connectionPoolService.addBatchToConnections(endpointToApiIndex);
             return this;
         }
         catch (e) {
@@ -68,16 +66,16 @@ let EthereumApiService = class EthereumApiService extends node_core_1.ApiService
             process.exit(1);
         }
     }
-    async fetchBlocks(batch) {
-        return this.fetchBlocksGeneric(() => (b) => this.api.fetchBlocks(b), batch);
-    }
     metadataMismatchError(metadata, expected, actual) {
         return Error(`Value of ${metadata} does not match across all endpoints. Please check that your endpoints are for the same network.\n
        Expected: ${expected}
        Actual: ${actual}`);
     }
     get api() {
-        return this.connectionPoolService.api.api;
+        return this.unsafeApi;
+    }
+    async fetchBlockBatches(api, batch) {
+        return api.fetchBlocks(batch);
     }
 };
 EthereumApiService = __decorate([

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-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { ProjectNetworkV1_0_0 } from '@subql/common-ethereum';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  NetworkMetadataPayload,\n  getLogger,\n  IndexerEvent,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from './api.connection';\nimport { EthereumApi } from './api.ethereum';\n\nconst logger = getLogger('api');\n\n@Injectable()\nexport class EthereumApiService extends ApiService {\n  constructor(\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    private connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n    private eventEmitter: EventEmitter2,\n  ) {\n    super(project);\n  }\n\n  networkMeta: NetworkMetadataPayload;\n\n  async init(): Promise<EthereumApiService> {\n    try {\n      let network: ProjectNetworkV1_0_0;\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      const connections = await Promise.all(\n        endpoints.map(async (endpoint, i) => {\n          const connection = await EthereumApiConnection.create(\n            endpoint,\n            this.eventEmitter,\n          );\n\n          const { api } = connection;\n\n          this.eventEmitter.emit(IndexerEvent.ApiConnected, {\n            value: 1,\n            apiIndex: i,\n            endpoint: endpoint,\n          });\n\n          if (!this.networkMeta) {\n            this.networkMeta = {\n              chain: api.getChainId().toString(),\n              specName: api.getSpecName(),\n              genesisHash: api.getGenesisHash(),\n            };\n          }\n\n          if (network.chainId !== api.getChainId().toString()) {\n            throw this.metadataMismatchError(\n              'ChainId',\n              network.chainId,\n              api.getChainId().toString(),\n            );\n          }\n\n          return connection;\n        }),\n      );\n\n      this.connectionPoolService.addBatchToConnections(connections);\n\n      return this;\n    } catch (e) {\n      logger.error(e, 'Failed to init api service');\n      process.exit(1);\n    }\n  }\n\n  async fetchBlocks(batch: number[]): Promise<EthereumBlockWrapper[]> {\n    return this.fetchBlocksGeneric<EthereumBlockWrapper>(\n      () => (b: number[]) => this.api.fetchBlocks(b),\n      batch,\n    );\n  }\n\n  private 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.connectionPoolService.api.api;\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-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { ProjectNetworkV1_0_0 } from '@subql/common-ethereum';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  NetworkMetadataPayload,\n  getLogger,\n  IndexerEvent,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiConnection } from './api.connection';\nimport { EthereumApi } from './api.ethereum';\nimport SafeEthProvider from './safe-api';\n\nconst logger = getLogger('api');\n\nconst MAX_RECONNECT_ATTEMPTS = 5;\n\n@Injectable()\nexport class EthereumApiService extends ApiService<\n  EthereumApi,\n  SafeEthProvider,\n  EthereumBlockWrapper\n> {\n  constructor(\n    @Inject('ISubqueryProject') private project: SubqueryProject,\n    connectionPoolService: ConnectionPoolService<EthereumApiConnection>,\n    private eventEmitter: EventEmitter2,\n  ) {\n    super(connectionPoolService);\n  }\n\n  networkMeta: NetworkMetadataPayload;\n\n  async init(): Promise<EthereumApiService> {\n    try {\n      let network: ProjectNetworkV1_0_0;\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      const endpointToApiIndex: Record<string, EthereumApiConnection> = {};\n\n      await Promise.all(\n        endpoints.map(async (endpoint, i) => {\n          const connection = await EthereumApiConnection.create(\n            endpoint,\n            this.fetchBlockBatches,\n            this.eventEmitter,\n          );\n\n          const api = connection.unsafeApi;\n\n          this.eventEmitter.emit(IndexerEvent.ApiConnected, {\n            value: 1,\n            apiIndex: i,\n            endpoint: endpoint,\n          });\n\n          if (!this.networkMeta) {\n            this.networkMeta = connection.networkMeta;\n          }\n\n          if (network.chainId !== api.getChainId().toString()) {\n            throw this.metadataMismatchError(\n              'ChainId',\n              network.chainId,\n              api.getChainId().toString(),\n            );\n          }\n\n          endpointToApiIndex[endpoint] = connection;\n        }),\n      );\n\n      this.connectionPoolService.addBatchToConnections(endpointToApiIndex);\n\n      return this;\n    } catch (e) {\n      logger.error(e, 'Failed to init api service');\n      process.exit(1);\n    }\n  }\n\n  private 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  private async fetchBlockBatches(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<EthereumBlockWrapper[]> {\n    return api.fetchBlocks(batch);\n  }\n}\n"]}

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

@@ -103,7 +103,7 @@ class JsonRpcBatchProvider extends providers_1.JsonRpcProvider {
                 request: request,
                 provider: this,
             });
-            logger.error(error);
+            //logger.error(error);
             batch.forEach((inflightRequest) => {
                 inflightRequest.reject(error);
             });

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

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

package/dist/indexer/fetch.module.js

@@ -29,10 +29,7 @@ FetchModule = __decorate([
         providers: [
             node_core_1.StoreService,
             node_core_1.StoreCacheService,
-            {
-                provide: node_core_1.ApiService,
-                useClass: api_service_ethereum_1.EthereumApiService,
-            },
+            api_service_ethereum_1.EthereumApiService,
             indexer_manager_1.IndexerManager,
             node_core_1.ConnectionPoolService,
             {
@@ -58,7 +55,7 @@ FetchModule = __decorate([
                     node_core_1.NodeConfig,
                     event_emitter_1.EventEmitter2,
                     'IProjectService',
-                    node_core_1.ApiService,
+                    api_service_ethereum_1.EthereumApiService,
                     indexer_manager_1.IndexerManager,
                     node_core_1.SmartBatchService,
                     node_core_1.StoreService,

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.module.js","sourceRoot":"","sources":["../../src/indexer/fetch.module.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;AAEtC,2CAAwC;AACxC,yDAAsD;AACtD,gDAU0B;AAE1B,2EAAsE;AACtE,uDAG2B;AAC3B,6DAAyD;AACzD,iEAA4D;AAC5D,6DAAwD;AACxD,mDAA+C;AAC/C,uDAAmD;AACnD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AA2GhE,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAzGvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,wBAAY;YACZ,6BAAiB;YACjB;gBACE,OAAO,EAAE,sBAAU;gBACnB,QAAQ,EAAE,yCAAkB;aAC7B;YACD,gCAAc;YACd,iCAAqB;YACrB;gBACE,OAAO,EAAE,6BAAiB;gBAC1B,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,IAAI,6BAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAU,CAAC;aACrB;YACD;gBACE,OAAO,EAAE,6BAAiB;gBAC1B,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,IAAI,6BAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAU,CAAC;aACrB;YACD;gBACE,OAAO,EAAE,kBAAkB;gBAC3B,UAAU,EAAE,CACV,UAAsB,EACtB,YAA2B,EAC3B,cAA8B,EAC9B,UAA8B,EAC9B,cAA8B,EAC9B,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACtB,OAAwB,EACxB,gBAAkC,EAClC,iBAA2C,EAC3C,EAAE,CACF,UAAU,CAAC,OAAO,KAAK,SAAS;oBAC9B,CAAC,CAAC,IAAI,8CAA4B,CAC9B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,iBAAiB,CAClB;oBACH,CAAC,CAAC,IAAI,wCAAsB,CACxB,UAAU,EACV,UAAU,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB;gBACP,MAAM,EAAE;oBACN,sBAAU;oBACV,6BAAa;oBACb,iBAAiB;oBACjB,sBAAU;oBACV,gCAAc;oBACd,6BAAiB;oBACjB,wBAAY;oBACZ,6BAAiB;oBACjB,sBAAU;oBACV,kBAAkB;oBAClB,qCAAgB;oBAChB,oDAAwB;iBACzB;aACF;YACD,4BAAY;YACZ,4BAAgB;YAChB;gBACE,OAAO,EAAE,sCAAiB;gBAC1B,UAAU,EAAE,KAAK,EAAE,OAAwB,EAAE,UAAsB,EAAE,EAAE;oBACrE,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBACrE,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;oBAC/B,OAAO,iBAAiB,CAAC;gBAC3B,CAAC;gBACD,MAAM,EAAE,CAAC,kBAAkB,EAAE,sBAAU,CAAC;aACzC;YACD,gCAAc;YACd,yCAAkB;YAClB,qCAAgB;YAChB,sBAAU;YACV,sBAAU;YACV;gBACE,QAAQ,EAAE,gCAAc;gBACxB,OAAO,EAAE,iBAAiB;aAC3B;YACD,oDAAwB;SACzB;QACD,OAAO,EAAE,CAAC,wBAAY,EAAE,sBAAU,EAAE,6BAAiB,CAAC;KACvD,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  BenchmarkService,\n  MmrService,\n  StoreService,\n  PoiService,\n  ApiService,\n  NodeConfig,\n  ConnectionPoolService,\n  SmartBatchService,\n  StoreCacheService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from '../ethereum/api.service.ethereum';\nimport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n} from './blockDispatcher';\nimport { DictionaryService } from './dictionary.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    StoreService,\n    StoreCacheService,\n    {\n      provide: ApiService,\n      useClass: EthereumApiService,\n    },\n    IndexerManager,\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        apiService: EthereumApiService,\n        indexerManager: IndexerManager,\n        smartBatchService: SmartBatchService,\n        storeService: StoreService,\n        storeCacheService: StoreCacheService,\n        poiService: PoiService,\n        project: SubqueryProject,\n        dynamicDsService: DynamicDsService,\n        unfinalizedBlocks: UnfinalizedBlocksService,\n      ) =>\n        nodeConfig.workers !== undefined\n          ? new WorkerBlockDispatcherService(\n              nodeConfig,\n              eventEmitter,\n              projectService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n              unfinalizedBlocks,\n            )\n          : new BlockDispatcherService(\n              apiService,\n              nodeConfig,\n              indexerManager,\n              eventEmitter,\n              projectService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n            ),\n      inject: [\n        NodeConfig,\n        EventEmitter2,\n        'IProjectService',\n        ApiService,\n        IndexerManager,\n        SmartBatchService,\n        StoreService,\n        StoreCacheService,\n        PoiService,\n        'ISubqueryProject',\n        DynamicDsService,\n        UnfinalizedBlocksService,\n      ],\n    },\n    FetchService,\n    BenchmarkService,\n    {\n      provide: DictionaryService,\n      useFactory: async (project: SubqueryProject, nodeConfig: NodeConfig) => {\n        const dictionaryService = new DictionaryService(project, nodeConfig);\n        await dictionaryService.init();\n        return dictionaryService;\n      },\n      inject: ['ISubqueryProject', NodeConfig],\n    },\n    SandboxService,\n    DsProcessorService,\n    DynamicDsService,\n    PoiService,\n    MmrService,\n    {\n      useClass: ProjectService,\n      provide: 'IProjectService',\n    },\n    UnfinalizedBlocksService,\n  ],\n  exports: [StoreService, MmrService, StoreCacheService],\n})\nexport class FetchModule {}\n"]}
+{"version":3,"file":"fetch.module.js","sourceRoot":"","sources":["../../src/indexer/fetch.module.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;AAEtC,2CAAwC;AACxC,yDAAsD;AACtD,gDAU0B;AAE1B,2EAAsE;AACtE,uDAG2B;AAC3B,6DAAyD;AACzD,iEAA4D;AAC5D,6DAAwD;AACxD,mDAA+C;AAC/C,uDAAmD;AACnD,uDAAmD;AACnD,uDAAmD;AACnD,2EAAuE;AAwGhE,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAtGvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,wBAAY;YACZ,6BAAiB;YACjB,yCAAkB;YAClB,gCAAc;YACd,iCAAqB;YACrB;gBACE,OAAO,EAAE,6BAAiB;gBAC1B,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,IAAI,6BAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAU,CAAC;aACrB;YACD;gBACE,OAAO,EAAE,6BAAiB;gBAC1B,UAAU,EAAE,CAAC,UAAsB,EAAE,EAAE;oBACrC,OAAO,IAAI,6BAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBACrD,CAAC;gBACD,MAAM,EAAE,CAAC,sBAAU,CAAC;aACrB;YACD;gBACE,OAAO,EAAE,kBAAkB;gBAC3B,UAAU,EAAE,CACV,UAAsB,EACtB,YAA2B,EAC3B,cAA8B,EAC9B,UAA8B,EAC9B,cAA8B,EAC9B,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACtB,OAAwB,EACxB,gBAAkC,EAClC,iBAA2C,EAC3C,EAAE,CACF,UAAU,CAAC,OAAO,KAAK,SAAS;oBAC9B,CAAC,CAAC,IAAI,8CAA4B,CAC9B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,iBAAiB,CAClB;oBACH,CAAC,CAAC,IAAI,wCAAsB,CACxB,UAAU,EACV,UAAU,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,CACjB;gBACP,MAAM,EAAE;oBACN,sBAAU;oBACV,6BAAa;oBACb,iBAAiB;oBACjB,yCAAkB;oBAClB,gCAAc;oBACd,6BAAiB;oBACjB,wBAAY;oBACZ,6BAAiB;oBACjB,sBAAU;oBACV,kBAAkB;oBAClB,qCAAgB;oBAChB,oDAAwB;iBACzB;aACF;YACD,4BAAY;YACZ,4BAAgB;YAChB;gBACE,OAAO,EAAE,sCAAiB;gBAC1B,UAAU,EAAE,KAAK,EAAE,OAAwB,EAAE,UAAsB,EAAE,EAAE;oBACrE,MAAM,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBACrE,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;oBAC/B,OAAO,iBAAiB,CAAC;gBAC3B,CAAC;gBACD,MAAM,EAAE,CAAC,kBAAkB,EAAE,sBAAU,CAAC;aACzC;YACD,gCAAc;YACd,yCAAkB;YAClB,qCAAgB;YAChB,sBAAU;YACV,sBAAU;YACV;gBACE,QAAQ,EAAE,gCAAc;gBACxB,OAAO,EAAE,iBAAiB;aAC3B;YACD,oDAAwB;SACzB;QACD,OAAO,EAAE,CAAC,wBAAY,EAAE,sBAAU,EAAE,6BAAiB,CAAC;KACvD,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Module } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  BenchmarkService,\n  MmrService,\n  StoreService,\n  PoiService,\n  ApiService,\n  NodeConfig,\n  ConnectionPoolService,\n  SmartBatchService,\n  StoreCacheService,\n} from '@subql/node-core';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from '../ethereum/api.service.ethereum';\nimport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n} from './blockDispatcher';\nimport { DictionaryService } from './dictionary.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    StoreService,\n    StoreCacheService,\n    EthereumApiService,\n    IndexerManager,\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        apiService: EthereumApiService,\n        indexerManager: IndexerManager,\n        smartBatchService: SmartBatchService,\n        storeService: StoreService,\n        storeCacheService: StoreCacheService,\n        poiService: PoiService,\n        project: SubqueryProject,\n        dynamicDsService: DynamicDsService,\n        unfinalizedBlocks: UnfinalizedBlocksService,\n      ) =>\n        nodeConfig.workers !== undefined\n          ? new WorkerBlockDispatcherService(\n              nodeConfig,\n              eventEmitter,\n              projectService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n              unfinalizedBlocks,\n            )\n          : new BlockDispatcherService(\n              apiService,\n              nodeConfig,\n              indexerManager,\n              eventEmitter,\n              projectService,\n              smartBatchService,\n              storeService,\n              storeCacheService,\n              poiService,\n              project,\n              dynamicDsService,\n            ),\n      inject: [\n        NodeConfig,\n        EventEmitter2,\n        'IProjectService',\n        EthereumApiService,\n        IndexerManager,\n        SmartBatchService,\n        StoreService,\n        StoreCacheService,\n        PoiService,\n        'ISubqueryProject',\n        DynamicDsService,\n        UnfinalizedBlocksService,\n      ],\n    },\n    FetchService,\n    BenchmarkService,\n    {\n      provide: DictionaryService,\n      useFactory: async (project: SubqueryProject, nodeConfig: NodeConfig) => {\n        const dictionaryService = new DictionaryService(project, nodeConfig);\n        await dictionaryService.init();\n        return dictionaryService;\n      },\n      inject: ['ISubqueryProject', NodeConfig],\n    },\n    SandboxService,\n    DsProcessorService,\n    DynamicDsService,\n    PoiService,\n    MmrService,\n    {\n      useClass: ProjectService,\n      provide: 'IProjectService',\n    },\n    UnfinalizedBlocksService,\n  ],\n  exports: [StoreService, MmrService, StoreCacheService],\n})\nexport class FetchModule {}\n"]}

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

@@ -1,19 +1,24 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { SchedulerRegistry } from '@nestjs/schedule';
-import { ApiService, NodeConfig, BaseFetchService } from '@subql/node-core';
+import { SubqlEthereumProcessorOptions } from '@subql/common-ethereum';
+import { NodeConfig, BaseFetchService } from '@subql/node-core';
 import { DictionaryQueryEntry } from '@subql/types';
 import { SubqlDatasource } from '@subql/types-ethereum';
 import { MetaData } from '@subql/utils';
 import { SubqueryProject } from '../configure/SubqueryProject';
-import { EthereumApi } from '../ethereum';
+import { EthereumApi, EthereumApiService } from '../ethereum';
 import { IEthereumBlockDispatcher } from './blockDispatcher';
 import { DictionaryService } from './dictionary.service';
 import { DsProcessorService } from './ds-processor.service';
 import { DynamicDsService } from './dynamic-ds.service';
 import { UnfinalizedBlocksService } from './unfinalizedBlocks.service';
-export declare class FetchService extends BaseFetchService<SubqlDatasource, IEthereumBlockDispatcher, DictionaryService> {
+type GroupedSubqlProjectDs = SubqlDatasource & {
+    groupedOptions?: SubqlEthereumProcessorOptions[];
+};
+export declare function buildDictionaryQueryEntries(dataSources: GroupedSubqlProjectDs[], startBlock: number): DictionaryQueryEntry[];
+export declare class FetchService extends BaseFetchService<EthereumApiService, SubqlDatasource, IEthereumBlockDispatcher, DictionaryService> {
     private unfinalizedBlocksService;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, project: SubqueryProject, blockDispatcher: IEthereumBlockDispatcher, dictionaryService: DictionaryService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
+    constructor(apiService: EthereumApiService, nodeConfig: NodeConfig, project: SubqueryProject, blockDispatcher: IEthereumBlockDispatcher, dictionaryService: DictionaryService, dsProcessorService: DsProcessorService, dynamicDsService: DynamicDsService, unfinalizedBlocksService: UnfinalizedBlocksService, eventEmitter: EventEmitter2, schedulerRegistry: SchedulerRegistry);
     get api(): EthereumApi;
     buildDictionaryQueryEntries(startBlock: number): DictionaryQueryEntry[];
     protected getFinalizedHeight(): Promise<number>;
@@ -25,3 +30,4 @@ export declare class FetchService extends BaseFetchService<SubqlDatasource, IEth
     protected validatateDictionaryMeta(metaData: MetaData): Promise<boolean>;
     protected preLoopHook(): Promise<void>;
 }
+export {};

package/dist/indexer/fetch.service.js

@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FetchService = void 0;
+exports.FetchService = exports.buildDictionaryQueryEntries = void 0;
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const schedule_1 = require("@nestjs/schedule");
@@ -22,6 +22,7 @@ const common_ethereum_1 = require("@subql/common-ethereum");
 const node_core_1 = require("@subql/node-core");
 const lodash_1 = require("lodash");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
+const ethereum_1 = require("../ethereum");
 const utils_ethereum_1 = require("../ethereum/utils.ethereum");
 const string_1 = require("../utils/string");
 const dictionary_service_1 = require("./dictionary.service");
@@ -87,6 +88,13 @@ function callFilterToQueryEntry(filter) {
             matcher: 'equalTo',
         });
     }
+    else if (filter.to === null) {
+        conditions.push({
+            field: 'to',
+            value: true,
+            matcher: 'isNull',
+        });
+    }
     if (filter.function) {
         conditions.push({
             field: 'func',
@@ -99,17 +107,63 @@ function callFilterToQueryEntry(filter) {
         conditions,
     };
 }
+function buildDictionaryQueryEntries(dataSources, startBlock) {
+    var _a;
+    const queryEntries = [];
+    // Only run the ds that is equal or less than startBlock
+    // sort array from lowest ds.startBlock to highest
+    const filteredDs = dataSources
+        .filter((ds) => ds.startBlock <= startBlock)
+        .sort((a, b) => a.startBlock - b.startBlock);
+    for (const ds of filteredDs) {
+        for (const handler of ds.mapping.handlers) {
+            // No filters, cant use dictionary
+            if (!handler.filter)
+                return [];
+            switch (handler.kind) {
+                case common_ethereum_1.EthereumHandlerKind.Block:
+                    return [];
+                case common_ethereum_1.EthereumHandlerKind.Call: {
+                    const filter = handler.filter;
+                    if (filter.from !== undefined ||
+                        filter.to !== undefined ||
+                        filter.function) {
+                        queryEntries.push(callFilterToQueryEntry(filter));
+                    }
+                    else {
+                        return [];
+                    }
+                    break;
+                }
+                case common_ethereum_1.EthereumHandlerKind.Event: {
+                    const filter = handler.filter;
+                    if (ds.groupedOptions) {
+                        queryEntries.push(eventFilterToQueryEntry(filter, ds.groupedOptions));
+                    }
+                    else if (((_a = ds.options) === null || _a === void 0 ? void 0 : _a.address) || filter.topics) {
+                        queryEntries.push(eventFilterToQueryEntry(filter, ds.options));
+                    }
+                    else {
+                        return [];
+                    }
+                    break;
+                }
+                default:
+            }
+        }
+    }
+    return (0, lodash_1.uniqBy)(queryEntries, (item) => `${item.entity}|${JSON.stringify((0, lodash_1.sortBy)(item.conditions, (c) => c.field))}`);
+}
+exports.buildDictionaryQueryEntries = buildDictionaryQueryEntries;
 let FetchService = class FetchService extends node_core_1.BaseFetchService {
     constructor(apiService, nodeConfig, project, blockDispatcher, dictionaryService, dsProcessorService, dynamicDsService, unfinalizedBlocksService, eventEmitter, schedulerRegistry) {
         super(apiService, nodeConfig, project, blockDispatcher, dictionaryService, dsProcessorService, dynamicDsService, eventEmitter, schedulerRegistry);
         this.unfinalizedBlocksService = unfinalizedBlocksService;
     }
     get api() {
-        return this.apiService.api;
+        return this.apiService.unsafeApi;
     }
     buildDictionaryQueryEntries(startBlock) {
-        var _a;
-        const queryEntries = [];
         const groupdDynamicDs = Object.values((0, lodash_1.groupBy)(this.templateDynamicDatasouces, (ds) => ds.name)).map((grouped) => {
             const options = grouped.map((ds) => ds.options);
             const ref = grouped[0];
@@ -117,48 +171,8 @@ let FetchService = class FetchService extends node_core_1.BaseFetchService {
         });
         // Only run the ds that is equal or less than startBlock
         // sort array from lowest ds.startBlock to highest
-        const filteredDs = this.project.dataSources
-            .concat(groupdDynamicDs)
-            .filter((ds) => ds.startBlock <= startBlock)
-            .sort((a, b) => a.startBlock - b.startBlock);
-        for (const ds of filteredDs) {
-            for (const handler of ds.mapping.handlers) {
-                // No filters, cant use dictionary
-                if (!handler.filter)
-                    return [];
-                switch (handler.kind) {
-                    case common_ethereum_1.EthereumHandlerKind.Block:
-                        return [];
-                    case common_ethereum_1.EthereumHandlerKind.Call: {
-                        const filter = handler.filter;
-                        if (filter.from !== undefined ||
-                            filter.to !== undefined ||
-                            filter.function) {
-                            queryEntries.push(callFilterToQueryEntry(filter));
-                        }
-                        else {
-                            return [];
-                        }
-                        break;
-                    }
-                    case common_ethereum_1.EthereumHandlerKind.Event: {
-                        const filter = handler.filter;
-                        if (ds.groupedOptions) {
-                            queryEntries.push(eventFilterToQueryEntry(filter, ds.groupedOptions));
-                        }
-                        else if (((_a = ds.options) === null || _a === void 0 ? void 0 : _a.address) || filter.topics) {
-                            queryEntries.push(eventFilterToQueryEntry(filter, ds.options));
-                        }
-                        else {
-                            return [];
-                        }
-                        break;
-                    }
-                    default:
-                }
-            }
-        }
-        return (0, lodash_1.uniqBy)(queryEntries, (item) => `${item.entity}|${JSON.stringify((0, lodash_1.sortBy)(item.conditions, (c) => c.field))}`);
+        const filteredDs = this.project.dataSources.concat(groupdDynamicDs);
+        return buildDictionaryQueryEntries(filteredDs, startBlock);
     }
     async getFinalizedHeight() {
         const block = await this.api.getFinalizedBlock();
@@ -212,7 +226,7 @@ FetchService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, common_1.Inject)('ISubqueryProject')),
     __param(3, (0, common_1.Inject)('IBlockDispatcher')),
-    __metadata("design:paramtypes", [node_core_1.ApiService,
+    __metadata("design:paramtypes", [ethereum_1.EthereumApiService,
         node_core_1.NodeConfig,
         SubqueryProject_1.SubqueryProject, Object, dictionary_service_1.DictionaryService,
         ds_processor_service_1.DsProcessorService,

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.service.js","sourceRoot":"","sources":["../../src/indexer/fetch.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { SchedulerRegistry } from '@nestjs/schedule';\n\nimport {\n  isCustomDs,\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  SubqlEthereumProcessorOptions,\n  EthereumTransactionFilter,\n} from '@subql/common-ethereum';\nimport { ApiService, NodeConfig, BaseFetchService } from '@subql/node-core';\nimport { DictionaryQueryCondition, DictionaryQueryEntry } from '@subql/types';\nimport {\n  // DictionaryQueryCondition,\n  // DictionaryQueryEntry,\n  SubqlDatasource,\n} from '@subql/types-ethereum';\nimport { MetaData } from '@subql/utils';\nimport { groupBy, sortBy, uniqBy } from 'lodash';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApi } from '../ethereum';\nimport { calcInterval } from '../ethereum/utils.ethereum';\nimport { eventToTopic, functionToSighash } from '../utils/string';\nimport { IEthereumBlockDispatcher } from './blockDispatcher';\nimport { DictionaryService } from './dictionary.service';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport {\n  blockToHeader,\n  UnfinalizedBlocksService,\n} from './unfinalizedBlocks.service';\n\nconst BLOCK_TIME_VARIANCE = 5000;\n\nconst INTERVAL_PERCENT = 0.9;\nconst QUERY_ADDRESS_LIMIT = 50;\n\nfunction eventFilterToQueryEntry(\n  filter: EthereumLogFilter,\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): DictionaryQueryEntry {\n  const conditions: DictionaryQueryCondition[] = [];\n\n  if (Array.isArray(dsOptions)) {\n    const addresses = dsOptions.map((option) => option.address).filter(Boolean);\n\n    if (addresses.length !== 0 && addresses.length <= QUERY_ADDRESS_LIMIT) {\n      conditions.push({\n        field: 'address',\n        value: addresses,\n        matcher: 'in',\n      });\n    }\n  } else {\n    if (dsOptions?.address) {\n      conditions.push({\n        field: 'address',\n        value: dsOptions.address.toLowerCase(),\n        matcher: 'equalTo',\n      });\n    }\n  }\n  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      conditions.push({\n        field,\n        value: eventToTopic(topic),\n        matcher: 'equalTo',\n      });\n    }\n  }\n  return {\n    entity: 'evmLogs',\n    conditions,\n  };\n}\n\nfunction callFilterToQueryEntry(\n  filter: EthereumTransactionFilter,\n): DictionaryQueryEntry {\n  const conditions: DictionaryQueryCondition[] = [];\n  if (filter.from) {\n    conditions.push({\n      field: 'from',\n      value: filter.from.toLowerCase(),\n      matcher: 'equalTo',\n    });\n  }\n  if (filter.to) {\n    conditions.push({\n      field: 'to',\n      value: filter.to.toLowerCase(),\n      matcher: 'equalTo',\n    });\n  }\n  if (filter.function) {\n    conditions.push({\n      field: 'func',\n      value: functionToSighash(filter.function),\n      matcher: 'equalTo',\n    });\n  }\n  return {\n    entity: 'evmTransactions',\n    conditions,\n  };\n}\n\n@Injectable()\nexport class FetchService extends BaseFetchService<\n  SubqlDatasource,\n  IEthereumBlockDispatcher,\n  DictionaryService\n> {\n  constructor(\n    apiService: ApiService,\n    nodeConfig: NodeConfig,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    @Inject('IBlockDispatcher')\n    blockDispatcher: IEthereumBlockDispatcher,\n    dictionaryService: DictionaryService,\n    dsProcessorService: DsProcessorService,\n    dynamicDsService: DynamicDsService,\n    private unfinalizedBlocksService: UnfinalizedBlocksService,\n    eventEmitter: EventEmitter2,\n    schedulerRegistry: SchedulerRegistry,\n  ) {\n    super(\n      apiService,\n      nodeConfig,\n      project,\n      blockDispatcher,\n      dictionaryService,\n      dsProcessorService,\n      dynamicDsService,\n      eventEmitter,\n      schedulerRegistry,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.apiService.api;\n  }\n\n  buildDictionaryQueryEntries(startBlock: number): DictionaryQueryEntry[] {\n    const queryEntries: DictionaryQueryEntry[] = [];\n\n    type GroupedSubqlProjectDs = SubqlDatasource & {\n      groupedOptions?: SubqlEthereumProcessorOptions[];\n    };\n\n    const groupdDynamicDs: GroupedSubqlProjectDs[] = Object.values(\n      groupBy(this.templateDynamicDatasouces, (ds) => ds.name),\n    ).map((grouped: SubqlProjectDs[]) => {\n      const options = grouped.map((ds) => ds.options);\n      const ref = grouped[0];\n\n      return {\n        ...ref,\n        groupedOptions: options,\n      };\n    });\n\n    // Only run the ds that is equal or less than startBlock\n    // sort array from lowest ds.startBlock to highest\n    const filteredDs: GroupedSubqlProjectDs[] = this.project.dataSources\n      .concat(groupdDynamicDs)\n      .filter((ds) => ds.startBlock <= startBlock)\n      .sort((a, b) => a.startBlock - b.startBlock);\n\n    for (const ds of filteredDs) {\n      for (const handler of ds.mapping.handlers) {\n        // No filters, cant use dictionary\n        if (!handler.filter) return [];\n\n        switch (handler.kind) {\n          case EthereumHandlerKind.Block:\n            return [];\n          case EthereumHandlerKind.Call: {\n            const filter = handler.filter as EthereumTransactionFilter;\n            if (\n              filter.from !== undefined ||\n              filter.to !== undefined ||\n              filter.function\n            ) {\n              queryEntries.push(callFilterToQueryEntry(filter));\n            } else {\n              return [];\n            }\n            break;\n          }\n          case EthereumHandlerKind.Event: {\n            const filter = handler.filter as EthereumLogFilter;\n            if (ds.groupedOptions) {\n              queryEntries.push(\n                eventFilterToQueryEntry(filter, ds.groupedOptions),\n              );\n            } else if (ds.options?.address || filter.topics) {\n              queryEntries.push(eventFilterToQueryEntry(filter, ds.options));\n            } else {\n              return [];\n            }\n            break;\n          }\n          default:\n        }\n      }\n    }\n\n    return uniqBy(\n      queryEntries,\n      (item) =>\n        `${item.entity}|${JSON.stringify(\n          sortBy(item.conditions, (c) => c.field),\n        )}`,\n    );\n  }\n\n  protected async getFinalizedHeight(): Promise<number> {\n    const block = await this.api.getFinalizedBlock();\n\n    const header = blockToHeader(block);\n\n    this.unfinalizedBlocksService.registerFinalizedBlock(header);\n    return header.blockHeight;\n  }\n\n  protected async getBestHeight(): Promise<number> {\n    return this.api.getBestBlockHeight();\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  protected async getChainInterval(): Promise<number> {\n    const CHAIN_INTERVAL = calcInterval(this.api) * INTERVAL_PERCENT;\n\n    return Math.min(BLOCK_TIME_VARIANCE, CHAIN_INTERVAL);\n  }\n\n  protected async getChainId(): Promise<string> {\n    return Promise.resolve(this.api.getChainId().toString());\n  }\n\n  protected getModulos(): number[] {\n    const modulos: number[] = [];\n    for (const ds of this.project.dataSources) {\n      if (isCustomDs(ds)) {\n        continue;\n      }\n      for (const handler of ds.mapping.handlers) {\n        if (\n          handler.kind === EthereumHandlerKind.Block &&\n          handler.filter &&\n          handler.filter.modulo\n        ) {\n          modulos.push(handler.filter.modulo);\n        }\n      }\n    }\n    return modulos;\n  }\n\n  protected async initBlockDispatcher(): Promise<void> {\n    await this.blockDispatcher.init(this.resetForNewDs.bind(this));\n  }\n\n  protected async validatateDictionaryMeta(\n    metaData: MetaData,\n  ): Promise<boolean> {\n    return Promise.resolve(\n      // When alias is not used\n      metaData.genesisHash !== this.api.getGenesisHash() &&\n        // Case when an alias is used\n        metaData.genesisHash !== this.dictionaryService.chainId,\n    );\n  }\n\n  protected async preLoopHook(): Promise<void> {\n    // Ethereum doesn't need to do anything here\n    return Promise.resolve();\n  }\n}\n"]}
+{"version":3,"file":"fetch.service.js","sourceRoot":"","sources":["../../src/indexer/fetch.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport { SchedulerRegistry } from '@nestjs/schedule';\n\nimport {\n  isCustomDs,\n  EthereumHandlerKind,\n  EthereumLogFilter,\n  SubqlEthereumProcessorOptions,\n  EthereumTransactionFilter,\n} from '@subql/common-ethereum';\nimport { NodeConfig, BaseFetchService } from '@subql/node-core';\nimport { DictionaryQueryCondition, DictionaryQueryEntry } from '@subql/types';\nimport { SubqlDatasource } from '@subql/types-ethereum';\nimport { MetaData } from '@subql/utils';\nimport { groupBy, sortBy, uniqBy } from 'lodash';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApi, EthereumApiService } from '../ethereum';\nimport SafeEthProvider from '../ethereum/safe-api';\nimport { calcInterval } from '../ethereum/utils.ethereum';\nimport { eventToTopic, functionToSighash } from '../utils/string';\nimport { IEthereumBlockDispatcher } from './blockDispatcher';\nimport { DictionaryService } from './dictionary.service';\nimport { DsProcessorService } from './ds-processor.service';\nimport { DynamicDsService } from './dynamic-ds.service';\nimport {\n  blockToHeader,\n  UnfinalizedBlocksService,\n} from './unfinalizedBlocks.service';\n\nconst BLOCK_TIME_VARIANCE = 5000;\n\nconst INTERVAL_PERCENT = 0.9;\nconst QUERY_ADDRESS_LIMIT = 50;\n\nfunction eventFilterToQueryEntry(\n  filter: EthereumLogFilter,\n  dsOptions: SubqlEthereumProcessorOptions | SubqlEthereumProcessorOptions[],\n): DictionaryQueryEntry {\n  const conditions: DictionaryQueryCondition[] = [];\n\n  if (Array.isArray(dsOptions)) {\n    const addresses = dsOptions.map((option) => option.address).filter(Boolean);\n\n    if (addresses.length !== 0 && addresses.length <= QUERY_ADDRESS_LIMIT) {\n      conditions.push({\n        field: 'address',\n        value: addresses,\n        matcher: 'in',\n      });\n    }\n  } else {\n    if (dsOptions?.address) {\n      conditions.push({\n        field: 'address',\n        value: dsOptions.address.toLowerCase(),\n        matcher: 'equalTo',\n      });\n    }\n  }\n  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      conditions.push({\n        field,\n        value: eventToTopic(topic),\n        matcher: 'equalTo',\n      });\n    }\n  }\n  return {\n    entity: 'evmLogs',\n    conditions,\n  };\n}\n\nfunction callFilterToQueryEntry(\n  filter: EthereumTransactionFilter,\n): DictionaryQueryEntry {\n  const conditions: DictionaryQueryCondition[] = [];\n  if (filter.from) {\n    conditions.push({\n      field: 'from',\n      value: filter.from.toLowerCase(),\n      matcher: 'equalTo',\n    });\n  }\n  if (filter.to) {\n    conditions.push({\n      field: 'to',\n      value: filter.to.toLowerCase(),\n      matcher: 'equalTo',\n    });\n  } else if (filter.to === null) {\n    conditions.push({\n      field: 'to',\n      value: true as any, // TODO update types to allow boolean\n      matcher: 'isNull',\n    });\n  }\n  if (filter.function) {\n    conditions.push({\n      field: 'func',\n      value: functionToSighash(filter.function),\n      matcher: 'equalTo',\n    });\n  }\n  return {\n    entity: 'evmTransactions',\n    conditions,\n  };\n}\n\ntype GroupedSubqlProjectDs = SubqlDatasource & {\n  groupedOptions?: SubqlEthereumProcessorOptions[];\n};\nexport function buildDictionaryQueryEntries(\n  dataSources: GroupedSubqlProjectDs[],\n  startBlock: number,\n): DictionaryQueryEntry[] {\n  const queryEntries: DictionaryQueryEntry[] = [];\n\n  // Only run the ds that is equal or less than startBlock\n  // sort array from lowest ds.startBlock to highest\n  const filteredDs = dataSources\n    .filter((ds) => ds.startBlock <= startBlock)\n    .sort((a, b) => a.startBlock - b.startBlock);\n\n  for (const ds of filteredDs) {\n    for (const handler of ds.mapping.handlers) {\n      // No filters, cant use dictionary\n      if (!handler.filter) return [];\n\n      switch (handler.kind) {\n        case EthereumHandlerKind.Block:\n          return [];\n        case EthereumHandlerKind.Call: {\n          const filter = handler.filter as EthereumTransactionFilter;\n          if (\n            filter.from !== undefined ||\n            filter.to !== undefined ||\n            filter.function\n          ) {\n            queryEntries.push(callFilterToQueryEntry(filter));\n          } else {\n            return [];\n          }\n          break;\n        }\n        case EthereumHandlerKind.Event: {\n          const filter = handler.filter as EthereumLogFilter;\n          if (ds.groupedOptions) {\n            queryEntries.push(\n              eventFilterToQueryEntry(filter, ds.groupedOptions),\n            );\n          } else if (ds.options?.address || filter.topics) {\n            queryEntries.push(eventFilterToQueryEntry(filter, ds.options));\n          } else {\n            return [];\n          }\n          break;\n        }\n        default:\n      }\n    }\n  }\n\n  return uniqBy(\n    queryEntries,\n    (item) =>\n      `${item.entity}|${JSON.stringify(\n        sortBy(item.conditions, (c) => c.field),\n      )}`,\n  );\n}\n\n@Injectable()\nexport class FetchService extends BaseFetchService<\n  EthereumApiService,\n  SubqlDatasource,\n  IEthereumBlockDispatcher,\n  DictionaryService\n> {\n  constructor(\n    apiService: EthereumApiService,\n    nodeConfig: NodeConfig,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    @Inject('IBlockDispatcher')\n    blockDispatcher: IEthereumBlockDispatcher,\n    dictionaryService: DictionaryService,\n    dsProcessorService: DsProcessorService,\n    dynamicDsService: DynamicDsService,\n    private unfinalizedBlocksService: UnfinalizedBlocksService,\n    eventEmitter: EventEmitter2,\n    schedulerRegistry: SchedulerRegistry,\n  ) {\n    super(\n      apiService,\n      nodeConfig,\n      project,\n      blockDispatcher,\n      dictionaryService,\n      dsProcessorService,\n      dynamicDsService,\n      eventEmitter,\n      schedulerRegistry,\n    );\n  }\n\n  get api(): EthereumApi {\n    return this.apiService.unsafeApi;\n  }\n\n  buildDictionaryQueryEntries(startBlock: number): DictionaryQueryEntry[] {\n    const groupdDynamicDs: GroupedSubqlProjectDs[] = Object.values(\n      groupBy(this.templateDynamicDatasouces, (ds) => ds.name),\n    ).map((grouped: SubqlProjectDs[]) => {\n      const options = grouped.map((ds) => ds.options);\n      const ref = grouped[0];\n\n      return {\n        ...ref,\n        groupedOptions: options,\n      };\n    });\n\n    // Only run the ds that is equal or less than startBlock\n    // sort array from lowest ds.startBlock to highest\n    const filteredDs: GroupedSubqlProjectDs[] =\n      this.project.dataSources.concat(groupdDynamicDs);\n\n    return buildDictionaryQueryEntries(filteredDs, startBlock);\n  }\n\n  protected async getFinalizedHeight(): Promise<number> {\n    const block = await this.api.getFinalizedBlock();\n\n    const header = blockToHeader(block);\n\n    this.unfinalizedBlocksService.registerFinalizedBlock(header);\n    return header.blockHeight;\n  }\n\n  protected async getBestHeight(): Promise<number> {\n    return this.api.getBestBlockHeight();\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  protected async getChainInterval(): Promise<number> {\n    const CHAIN_INTERVAL = calcInterval(this.api) * INTERVAL_PERCENT;\n\n    return Math.min(BLOCK_TIME_VARIANCE, CHAIN_INTERVAL);\n  }\n\n  protected async getChainId(): Promise<string> {\n    return Promise.resolve(this.api.getChainId().toString());\n  }\n\n  protected getModulos(): number[] {\n    const modulos: number[] = [];\n    for (const ds of this.project.dataSources) {\n      if (isCustomDs(ds)) {\n        continue;\n      }\n      for (const handler of ds.mapping.handlers) {\n        if (\n          handler.kind === EthereumHandlerKind.Block &&\n          handler.filter &&\n          handler.filter.modulo\n        ) {\n          modulos.push(handler.filter.modulo);\n        }\n      }\n    }\n    return modulos;\n  }\n\n  protected async initBlockDispatcher(): Promise<void> {\n    await this.blockDispatcher.init(this.resetForNewDs.bind(this));\n  }\n\n  protected async validatateDictionaryMeta(\n    metaData: MetaData,\n  ): Promise<boolean> {\n    return Promise.resolve(\n      // When alias is not used\n      metaData.genesisHash !== this.api.getGenesisHash() &&\n        // Case when an alias is used\n        metaData.genesisHash !== this.dictionaryService.chainId,\n    );\n  }\n\n  protected async preLoopHook(): Promise<void> {\n    // Ethereum doesn't need to do anything here\n    return Promise.resolve();\n  }\n}\n"]}

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

@@ -0,0 +1 @@
+export {};