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

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

@@ -13,87 +13,46 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumApiService = void 0;
 const common_1 = require("@nestjs/common");
 const event_emitter_1 = require("@nestjs/event-emitter");
 const node_core_1 = require("@subql/node-core");
+const NodeConfig_1 = require("../configure/NodeConfig");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
+const project_1 = require("../utils/project");
 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, nodeConfig) {
-        super(connectionPoolService);
+        super(connectionPoolService, eventEmitter);
         this.project = project;
-        this.eventEmitter = eventEmitter;
-        this.nodeConfig = nodeConfig;
+        this.fetchBlocksBatches = () => this.fetchBlocksFunction;
+        this.nodeConfig = new NodeConfig_1.EthereumNodeConfig(nodeConfig);
+        this.updateBlockFetching();
     }
     async init() {
-        var _a, e_1, _b, _c;
+        let network;
         try {
-            let network;
-            try {
-                network = this.project.network;
-            }
-            catch (e) {
-                logger.error(Object.keys(e));
-                process.exit(1);
-            }
-            const endpoints = Array.isArray(network.endpoint)
-                ? network.endpoint
-                : [network.endpoint];
-            if (this.nodeConfig.primaryNetworkEndpoint) {
-                endpoints.push(this.nodeConfig.primaryNetworkEndpoint);
-            }
-            const endpointToApiIndex = {};
-            try {
-                for (var _d = true, _e = __asyncValues(endpoints.entries()), _f; _f = await _e.next(), _a = _f.done, !_a;) {
-                    _c = _f.value;
-                    _d = false;
-                    try {
-                        const [i, endpoint] = _c;
-                        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 = connection.networkMeta;
-                        }
-                        if (network.chainId !== api.getChainId().toString()) {
-                            throw this.metadataMismatchError('ChainId', network.chainId, api.getChainId().toString());
-                        }
-                        endpointToApiIndex[endpoint] = connection;
-                    }
-                    finally {
-                        _d = true;
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            await this.connectionPoolService.addBatchToConnections(endpointToApiIndex);
-            return this;
+            network = this.project.network;
         }
         catch (e) {
-            logger.error(e, 'Failed to init api service');
+            logger.error(Object.keys(e));
             process.exit(1);
         }
+        const endpoints = Array.isArray(network.endpoint)
+            ? network.endpoint
+            : [network.endpoint];
+        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), 
+        //eslint-disable-next-line @typescript-eslint/require-await
+        async (connection) => {
+            const api = connection.unsafeApi;
+            return api.getChainId().toString();
+        });
+        return this;
     }
     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
@@ -146,9 +105,42 @@ let EthereumApiService = class EthereumApiService extends node_core_1.ApiService
         };
         return new Proxy(this.unsafeApi.getSafeApi(height), handler);
     }
-    async fetchBlockBatches(api, batch) {
+    async fetchFullBlocksBatch(api, batch) {
         return api.fetchBlocks(batch);
     }
+    async fetchLightBlocksBatch(api, batch) {
+        return api.fetchBlocksLight(batch);
+    }
+    updateBlockFetching() {
+        var _a;
+        const onlyEventHandlers = (0, project_1.isOnlyEventHandlers)(this.project);
+        const skipTransactions = this.nodeConfig.skipTransactions && onlyEventHandlers;
+        if (this.nodeConfig.skipTransactions) {
+            if (onlyEventHandlers) {
+                logger.info('skipTransactions is enabled, only events and block headers will be fetched.');
+            }
+            else {
+                logger.info(`skipTransactions is disabled, the project contains handlers that aren't event handlers.`);
+            }
+        }
+        else {
+            if (onlyEventHandlers) {
+                logger.warn('skipTransactions is disabled, the project contains only event handlers, it could be enabled to improve indexing performance.');
+            }
+            else {
+                logger.info(`skipTransactions is disabled.`);
+            }
+        }
+        const fetchFunc = skipTransactions
+            ? this.fetchLightBlocksBatch.bind(this)
+            : this.fetchFullBlocksBatch.bind(this);
+        if ((_a = this.nodeConfig) === null || _a === void 0 ? void 0 : _a.profiler) {
+            this.fetchBlocksFunction = (0, node_core_1.profilerWrap)(fetchFunc, 'SubstrateUtil', 'fetchBlocksBatches');
+        }
+        else {
+            this.fetchBlocksFunction = fetchFunc;
+        }
+    }
 };
 EthereumApiService = __decorate([
     (0, common_1.Injectable)(),

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-2023 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 { ProjectNetworkV1_0_0 } from '@subql/common-ethereum';\nimport {\n  ApiService,\n  ConnectionPoolService,\n  NetworkMetadataPayload,\n  getLogger,\n  NodeConfig,\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    private nodeConfig: NodeConfig,\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      if (this.nodeConfig.primaryNetworkEndpoint) {\n        endpoints.push(this.nodeConfig.primaryNetworkEndpoint);\n      }\n\n      const endpointToApiIndex: Record<string, EthereumApiConnection> = {};\n\n      for await (const [i, endpoint] of endpoints.entries()) {\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      await this.connectionPoolService.addBatchToConnections(\n        endpointToApiIndex,\n      );\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  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 fetchBlockBatches(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<EthereumBlockWrapper[]> {\n    return api.fetchBlocks(batch);\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-2023 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} from '@subql/node-core';\nimport { EthereumBlock, EthereumNetworkConfig, LightEthereumBlock } 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  EthereumBlock[] | 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        ),\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<EthereumBlock[]> {\n    return api.fetchBlocks(batch);\n  }\n\n  private async fetchLightBlocksBatch(\n    api: EthereumApi,\n    batch: number[],\n  ): Promise<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/ethereum/api.service.ethereum.test.js

@@ -14,7 +14,7 @@ const HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';
 function testSubqueryProject(endpoint) {
     return {
         network: {
-            endpoint,
+            endpoint: [endpoint],
             chainId: '1',
         },
         dataSources: [],
@@ -57,13 +57,11 @@ describe('ApiService', () => {
     afterEach(async () => {
         return app === null || app === void 0 ? void 0 : app.close();
     });
-    it('can instantiate api', async () => {
-        console.log(apiService.api.getChainId());
-        await (0, node_core_1.delay)(0.5);
+    it('can instantiate api', () => {
+        expect(apiService.api.getChainId()).toEqual(1);
     });
     it('can fetch blocks', async () => {
-        await apiService.api.fetchBlocks((0, lodash_1.range)(12369621, 12369625));
-        await (0, node_core_1.delay)(0.5);
+        await expect(apiService.api.fetchBlocks((0, lodash_1.range)(12369621, 12369625))).resolves.toHaveLength(4);
     });
     it('can get the finalized height', async () => {
         const height = await apiService.api.getFinalizedBlockHeight();
@@ -71,18 +69,15 @@ describe('ApiService', () => {
         expect(height).toBeGreaterThan(16000000);
     });
     it('ensure api errorCode is exposed when throwing', async () => {
-        expect.assertions(1);
-        return apiService
+        await expect(apiService
             .safeApi(17520376)
-            .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')
-            .catch((e) => expect(e.code).toBe('INVALID_ARGUMENT'));
+            .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')).rejects.toHaveProperty('code', 'INVALID_ARGUMENT');
     });
     it('should not retry on any errors not in the retry list', async () => {
         const callSpy = jest.spyOn(apiService.unsafeApi, 'getSafeApi');
-        await apiService
+        await expect(apiService
             .safeApi(17520376)
-            .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')
-            .catch((e) => expect(e.code).toBe('INVALID_ARGUMENT'));
+            .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')).rejects.toHaveProperty('code', 'INVALID_ARGUMENT');
         expect(callSpy).toHaveBeenCalledTimes(1);
     });
 });

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

@@ -1 +1 @@
-{"version":3,"file":"api.service.ethereum.test.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { INestApplication } from '@nestjs/common';\nimport { EventEmitterModule } from '@nestjs/event-emitter';\nimport { Test } from '@nestjs/testing';\nimport {\n  ConnectionPoolService,\n  ConnectionPoolStateManager,\n  delay,\n  NodeConfig,\n} from '@subql/node-core';\nimport { GraphQLSchema } from 'graphql';\nimport { range } from 'lodash';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from './api.service.ethereum';\n\n// Add api key to work\nconst WS_ENDPOINT = 'wss://eth.api.onfinality.io/ws?apikey=';\nconst HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';\n\nfunction testSubqueryProject(endpoint: string): SubqueryProject {\n  return {\n    network: {\n      endpoint,\n      chainId: '1',\n    },\n    dataSources: [],\n    id: 'test',\n    root: './',\n    schema: new GraphQLSchema({}),\n    templates: [],\n  };\n}\n\nconst prepareApiService = async (\n  endpoint: string = HTTP_ENDPOINT,\n): Promise<[EthereumApiService, INestApplication]> => {\n  const module = await Test.createTestingModule({\n    providers: [\n      ConnectionPoolService,\n      ConnectionPoolStateManager,\n      {\n        provide: NodeConfig,\n        useFactory: () => ({}),\n      },\n      {\n        provide: 'ISubqueryProject',\n        useFactory: () => testSubqueryProject(endpoint),\n      },\n      EthereumApiService,\n    ],\n    imports: [EventEmitterModule.forRoot()],\n  }).compile();\n\n  const app = module.createNestApplication();\n  await app.init();\n  const apiService = app.get(EthereumApiService);\n  await apiService.init();\n  return [apiService, app];\n};\n\njest.setTimeout(90000);\ndescribe('ApiService', () => {\n  let apiService: EthereumApiService;\n  let app: INestApplication;\n\n  beforeEach(async () => {\n    [apiService, app] = await prepareApiService();\n  });\n\n  afterEach(async () => {\n    return app?.close();\n  });\n\n  it('can instantiate api', async () => {\n    console.log(apiService.api.getChainId());\n    await delay(0.5);\n  });\n\n  it('can fetch blocks', async () => {\n    await apiService.api.fetchBlocks(range(12369621, 12369625));\n    await delay(0.5);\n  });\n\n  it('can get the finalized height', async () => {\n    const height = await apiService.api.getFinalizedBlockHeight();\n\n    console.log('Finalized height', height);\n    expect(height).toBeGreaterThan(16_000_000);\n  });\n\n  it('ensure api errorCode is exposed when throwing', async () => {\n    expect.assertions(1);\n    return apiService\n      .safeApi(17520376)\n      .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')\n      .catch((e) => expect(e.code).toBe('INVALID_ARGUMENT'));\n  });\n  it('should not retry on any errors not in the retry list', async () => {\n    const callSpy = jest.spyOn(apiService.unsafeApi, 'getSafeApi');\n    await apiService\n      .safeApi(17520376)\n      .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5')\n      .catch((e) => expect(e.code).toBe('INVALID_ARGUMENT'));\n\n    expect(callSpy).toHaveBeenCalledTimes(1);\n  });\n});\n"]}
+{"version":3,"file":"api.service.ethereum.test.js","sourceRoot":"","sources":["../../src/ethereum/api.service.ethereum.test.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { INestApplication } from '@nestjs/common';\nimport { EventEmitterModule } from '@nestjs/event-emitter';\nimport { Test } from '@nestjs/testing';\nimport {\n  ConnectionPoolService,\n  ConnectionPoolStateManager,\n  NodeConfig,\n} from '@subql/node-core';\nimport { GraphQLSchema } from 'graphql';\nimport { range } from 'lodash';\nimport { SubqueryProject } from '../configure/SubqueryProject';\nimport { EthereumApiService } from './api.service.ethereum';\n\n// Add api key to work\nconst WS_ENDPOINT = 'wss://eth.api.onfinality.io/ws?apikey=';\nconst HTTP_ENDPOINT = 'https://eth.api.onfinality.io/public';\n\nfunction testSubqueryProject(endpoint: string): SubqueryProject {\n  return {\n    network: {\n      endpoint: [endpoint],\n      chainId: '1',\n    },\n    dataSources: [],\n    id: 'test',\n    root: './',\n    schema: new GraphQLSchema({}),\n    templates: [],\n  } as any;\n}\n\nconst prepareApiService = async (\n  endpoint: string = HTTP_ENDPOINT,\n): Promise<[EthereumApiService, INestApplication]> => {\n  const module = await Test.createTestingModule({\n    providers: [\n      ConnectionPoolService,\n      ConnectionPoolStateManager,\n      {\n        provide: NodeConfig,\n        useFactory: () => ({}),\n      },\n      {\n        provide: 'ISubqueryProject',\n        useFactory: () => testSubqueryProject(endpoint),\n      },\n      EthereumApiService,\n    ],\n    imports: [EventEmitterModule.forRoot()],\n  }).compile();\n\n  const app = module.createNestApplication();\n  await app.init();\n  const apiService = app.get(EthereumApiService);\n  await apiService.init();\n  return [apiService, app];\n};\n\njest.setTimeout(90000);\ndescribe('ApiService', () => {\n  let apiService: EthereumApiService;\n  let app: INestApplication;\n\n  beforeEach(async () => {\n    [apiService, app] = await prepareApiService();\n  });\n\n  afterEach(async () => {\n    return app?.close();\n  });\n\n  it('can instantiate api', () => {\n    expect(apiService.api.getChainId()).toEqual(1);\n  });\n\n  it('can fetch blocks', async () => {\n    await expect(\n      apiService.api.fetchBlocks(range(12369621, 12369625)),\n    ).resolves.toHaveLength(4);\n  });\n\n  it('can get the finalized height', async () => {\n    const height = await apiService.api.getFinalizedBlockHeight();\n\n    console.log('Finalized height', height);\n    expect(height).toBeGreaterThan(16_000_000);\n  });\n\n  it('ensure api errorCode is exposed when throwing', async () => {\n    await expect(\n      apiService\n        .safeApi(17520376)\n        .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5'),\n    ).rejects.toHaveProperty('code', 'INVALID_ARGUMENT');\n  });\n  it('should not retry on any errors not in the retry list', async () => {\n    const callSpy = jest.spyOn(apiService.unsafeApi, 'getSafeApi');\n    await expect(\n      apiService\n        .safeApi(17520376)\n        .getCode('0x75F0398549C9fDEa03BbDde388361827cb376D5'),\n    ).rejects.toHaveProperty('code', 'INVALID_ARGUMENT');\n\n    expect(callSpy).toHaveBeenCalledTimes(1);\n  });\n});\n"]}

package/dist/ethereum/block.ethereum.d.ts

@@ -1,15 +1,6 @@
-import { EthereumBlock, EthereumTransactionFilter, EthereumLog, EthereumLogFilter, EthereumBlockFilter, EthereumBlockWrapper, EthereumTransaction } from '@subql/types-ethereum';
-export declare class EthereumBlockWrapped implements EthereumBlockWrapper {
-    private _block;
-    private _txs;
-    private _logs;
-    constructor(_block: EthereumBlock, _txs: EthereumTransaction[], _logs: EthereumLog[]);
-    get block(): EthereumBlock;
-    get blockHeight(): number;
-    get hash(): string;
-    get transactions(): EthereumTransaction[];
-    get logs(): EthereumLog[];
-    static filterBlocksProcessor(block: EthereumBlock, filter: EthereumBlockFilter, address?: string): boolean;
-    static filterTransactionsProcessor(transaction: EthereumTransaction, filter: EthereumTransactionFilter, address?: string): boolean;
-    static filterLogsProcessor(log: EthereumLog, filter: EthereumLogFilter, address?: string): boolean;
-}
+import { EthereumBlock, EthereumTransactionFilter, EthereumLog, EthereumLogFilter, EthereumBlockFilter, EthereumTransaction, LightEthereumLog } from '@subql/types-ethereum';
+import { BlockContent } from '../indexer/types';
+export declare function filterBlocksProcessor(block: EthereumBlock, filter: EthereumBlockFilter, address?: string): boolean;
+export declare function filterTransactionsProcessor(transaction: EthereumTransaction, filter: EthereumTransactionFilter, address?: string): boolean;
+export declare function filterLogsProcessor(log: EthereumLog | LightEthereumLog, filter: EthereumLogFilter, address?: string): boolean;
+export declare function isFullBlock(block: BlockContent): block is EthereumBlock;

package/dist/ethereum/block.ethereum.js

@@ -2,93 +2,69 @@
 // Copyright 2020-2023 SubQuery Pte Ltd authors & contributors
 // SPDX-License-Identifier: GPL-3.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EthereumBlockWrapped = void 0;
+exports.isFullBlock = exports.filterLogsProcessor = exports.filterTransactionsProcessor = exports.filterBlocksProcessor = void 0;
 const string_1 = require("../utils/string");
-class EthereumBlockWrapped {
-    constructor(_block, _txs, _logs) {
-        this._block = _block;
-        this._txs = _txs;
-        this._logs = _logs;
-        this._block.transactions = this._txs;
-        this._block.logs = this._logs;
-        // Set logs on tx
-        this._logs.forEach((l) => {
-            const tx = this._txs.find((tx) => tx.hash === l.transactionHash);
-            if (!tx)
-                return;
-            tx.logs = tx.logs ? [...tx.logs, l] : [l];
-        });
+function filterBlocksProcessor(block, filter, address) {
+    if ((filter === null || filter === void 0 ? void 0 : filter.modulo) && block.number % filter.modulo !== 0) {
+        return false;
     }
-    get block() {
-        return this._block;
+    return true;
+}
+exports.filterBlocksProcessor = filterBlocksProcessor;
+function filterTransactionsProcessor(transaction, filter, address) {
+    if (!filter)
+        return true;
+    if (filter.to === null &&
+        !(transaction.to === null || transaction.to === undefined)) {
+        return false;
     }
-    get blockHeight() {
-        return this.block.number;
+    if (filter.to && !(0, string_1.stringNormalizedEq)(filter.to, transaction.to)) {
+        return false;
     }
-    get hash() {
-        return this.block.hash;
+    if (filter.from && !(0, string_1.stringNormalizedEq)(filter.from, transaction.from)) {
+        return false;
     }
-    get transactions() {
-        return this._txs;
+    if (address &&
+        filter.to === undefined &&
+        !(0, string_1.stringNormalizedEq)(address, transaction.to)) {
+        return false;
     }
-    get logs() {
-        return this._logs;
+    if (filter.function &&
+        transaction.input.indexOf((0, string_1.functionToSighash)(filter.function)) !== 0) {
+        return false;
     }
-    static filterBlocksProcessor(block, filter, address) {
-        if ((filter === null || filter === void 0 ? void 0 : filter.modulo) && block.number % filter.modulo !== 0) {
-            return false;
-        }
-        return true;
+    return true;
+}
+exports.filterTransactionsProcessor = filterTransactionsProcessor;
+function filterLogsProcessor(log, filter, address) {
+    if (address && !(0, string_1.stringNormalizedEq)(address, log.address)) {
+        return false;
     }
-    static filterTransactionsProcessor(transaction, filter, address) {
-        if (!filter)
-            return true;
-        if (filter.to === null &&
-            !(transaction.to === null || transaction.to === undefined)) {
-            return false;
-        }
-        if (filter.to && !(0, string_1.stringNormalizedEq)(filter.to, transaction.to)) {
-            return false;
-        }
-        if (filter.from && !(0, string_1.stringNormalizedEq)(filter.from, transaction.from)) {
-            return false;
-        }
-        if (address &&
-            filter.to === undefined &&
-            !(0, string_1.stringNormalizedEq)(address, transaction.to)) {
-            return false;
-        }
-        if (filter.function &&
-            transaction.input.indexOf((0, string_1.functionToSighash)(filter.function)) !== 0) {
-            return false;
-        }
+    if (!filter)
         return true;
-    }
-    static filterLogsProcessor(log, filter, address) {
-        if (address && !(0, string_1.stringNormalizedEq)(address, log.address)) {
-            return false;
-        }
-        if (!filter)
-            return true;
-        if (filter.topics) {
-            for (let i = 0; i < Math.min(filter.topics.length, 4); i++) {
-                const topic = filter.topics[i];
-                if (!topic) {
-                    continue;
-                }
-                if (!log.topics[i]) {
-                    return false;
-                }
-                if (topic === '!null') {
-                    return true;
-                }
-                if (!(0, string_1.hexStringEq)((0, string_1.eventToTopic)(topic), log.topics[i])) {
-                    return false;
-                }
+    if (filter.topics) {
+        for (let i = 0; i < Math.min(filter.topics.length, 4); i++) {
+            const topic = filter.topics[i];
+            if (!topic) {
+                continue;
+            }
+            if (!log.topics[i]) {
+                return false;
+            }
+            if (topic === '!null') {
+                return true;
+            }
+            if (!(0, string_1.hexStringEq)((0, string_1.eventToTopic)(topic), log.topics[i])) {
+                return false;
             }
         }
-        return true;
     }
+    return true;
+}
+exports.filterLogsProcessor = filterLogsProcessor;
+function isFullBlock(block) {
+    // Light etherum block just contains transaction hashes for transactions. If the block has no transactions then both types would be the same
+    return typeof block.transactions[0] !== 'string';
 }
-exports.EthereumBlockWrapped = EthereumBlockWrapped;
+exports.isFullBlock = isFullBlock;
 //# sourceMappingURL=block.ethereum.js.map

package/dist/ethereum/block.ethereum.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/block.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport {\n  EthereumBlock,\n  EthereumTransactionFilter,\n  EthereumLog,\n  EthereumLogFilter,\n  EthereumBlockFilter,\n  EthereumBlockWrapper,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\nimport {\n  eventToTopic,\n  functionToSighash,\n  hexStringEq,\n  stringNormalizedEq,\n} from '../utils/string';\n\nexport class EthereumBlockWrapped implements EthereumBlockWrapper {\n  constructor(\n    private _block: EthereumBlock,\n    private _txs: EthereumTransaction[],\n    private _logs: EthereumLog[],\n  ) {\n    this._block.transactions = this._txs;\n    this._block.logs = this._logs;\n\n    // Set logs on tx\n    this._logs.forEach((l) => {\n      const tx = this._txs.find((tx) => tx.hash === l.transactionHash);\n\n      if (!tx) return;\n      tx.logs = tx.logs ? [...tx.logs, l] : [l];\n    });\n  }\n\n  get block(): EthereumBlock {\n    return this._block;\n  }\n\n  get blockHeight(): number {\n    return this.block.number;\n  }\n\n  get hash(): string {\n    return this.block.hash;\n  }\n\n  get transactions(): EthereumTransaction[] {\n    return this._txs;\n  }\n\n  get logs(): EthereumLog[] {\n    return this._logs;\n  }\n\n  static filterBlocksProcessor(\n    block: EthereumBlock,\n    filter: EthereumBlockFilter,\n    address?: string,\n  ): boolean {\n    if (filter?.modulo && block.number % filter.modulo !== 0) {\n      return false;\n    }\n    return true;\n  }\n\n  static filterTransactionsProcessor(\n    transaction: EthereumTransaction,\n    filter: EthereumTransactionFilter,\n    address?: string,\n  ): boolean {\n    if (!filter) return true;\n\n    if (\n      filter.to === null &&\n      !(transaction.to === null || transaction.to === undefined)\n    ) {\n      return false;\n    }\n\n    if (filter.to && !stringNormalizedEq(filter.to, transaction.to)) {\n      return false;\n    }\n    if (filter.from && !stringNormalizedEq(filter.from, transaction.from)) {\n      return false;\n    }\n    if (\n      address &&\n      filter.to === undefined &&\n      !stringNormalizedEq(address, transaction.to)\n    ) {\n      return false;\n    }\n    if (\n      filter.function &&\n      transaction.input.indexOf(functionToSighash(filter.function)) !== 0\n    ) {\n      return false;\n    }\n    return true;\n  }\n\n  static filterLogsProcessor(\n    log: EthereumLog,\n    filter: EthereumLogFilter,\n    address?: string,\n  ): boolean {\n    if (address && !stringNormalizedEq(address, log.address)) {\n      return false;\n    }\n\n    if (!filter) return true;\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\n        if (!log.topics[i]) {\n          return false;\n        }\n\n        if (topic === '!null') {\n          return true;\n        }\n\n        if (!hexStringEq(eventToTopic(topic), log.topics[i])) {\n          return false;\n        }\n      }\n    }\n    return true;\n  }\n}\n"]}
+{"version":3,"file":"block.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/block.ethereum.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAYnC,4CAKyB;AAEzB,SAAgB,qBAAqB,CACnC,KAAoB,EACpB,MAA2B,EAC3B,OAAgB;IAEhB,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACxD,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AATD,sDASC;AAED,SAAgB,2BAA2B,CACzC,WAAgC,EAChC,MAAiC,EACjC,OAAgB;IAEhB,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,IACE,MAAM,CAAC,EAAE,KAAK,IAAI;QAClB,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,IAAI,IAAI,WAAW,CAAC,EAAE,KAAK,SAAS,CAAC,EAC1D;QACA,OAAO,KAAK,CAAC;KACd;IAED,IAAI,MAAM,CAAC,EAAE,IAAI,CAAC,IAAA,2BAAkB,EAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE;QAC/D,OAAO,KAAK,CAAC;KACd;IACD,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE;QACrE,OAAO,KAAK,CAAC;KACd;IACD,IACE,OAAO;QACP,MAAM,CAAC,EAAE,KAAK,SAAS;QACvB,CAAC,IAAA,2BAAkB,EAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,EAC5C;QACA,OAAO,KAAK,CAAC;KACd;IACD,IACE,MAAM,CAAC,QAAQ;QACf,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAA,0BAAiB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EACnE;QACA,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAlCD,kEAkCC;AAED,SAAgB,mBAAmB,CACjC,GAAmC,EACnC,MAAyB,EACzB,OAAgB;IAEhB,IAAI,OAAO,IAAI,CAAC,IAAA,2BAAkB,EAAC,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE;QACxD,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,KAAK,EAAE;gBACV,SAAS;aACV;YAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBAClB,OAAO,KAAK,CAAC;aACd;YAED,IAAI,KAAK,KAAK,OAAO,EAAE;gBACrB,OAAO,IAAI,CAAC;aACb;YAED,IAAI,CAAC,IAAA,oBAAW,EAAC,IAAA,qBAAY,EAAC,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;gBACpD,OAAO,KAAK,CAAC;aACd;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAhCD,kDAgCC;AAED,SAAgB,WAAW,CAAC,KAAmB;IAC7C,4IAA4I;IAC5I,OAAO,OAAQ,KAAuB,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AACtE,CAAC;AAHD,kCAGC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport {\n  EthereumBlock,\n  EthereumTransactionFilter,\n  EthereumLog,\n  EthereumLogFilter,\n  EthereumBlockFilter,\n  EthereumTransaction,\n  LightEthereumLog,\n} from '@subql/types-ethereum';\nimport { BlockContent } from '../indexer/types';\nimport {\n  eventToTopic,\n  functionToSighash,\n  hexStringEq,\n  stringNormalizedEq,\n} from '../utils/string';\n\nexport function filterBlocksProcessor(\n  block: EthereumBlock,\n  filter: EthereumBlockFilter,\n  address?: string,\n): boolean {\n  if (filter?.modulo && block.number % filter.modulo !== 0) {\n    return false;\n  }\n  return true;\n}\n\nexport function filterTransactionsProcessor(\n  transaction: EthereumTransaction,\n  filter: EthereumTransactionFilter,\n  address?: string,\n): boolean {\n  if (!filter) return true;\n\n  if (\n    filter.to === null &&\n    !(transaction.to === null || transaction.to === undefined)\n  ) {\n    return false;\n  }\n\n  if (filter.to && !stringNormalizedEq(filter.to, transaction.to)) {\n    return false;\n  }\n  if (filter.from && !stringNormalizedEq(filter.from, transaction.from)) {\n    return false;\n  }\n  if (\n    address &&\n    filter.to === undefined &&\n    !stringNormalizedEq(address, transaction.to)\n  ) {\n    return false;\n  }\n  if (\n    filter.function &&\n    transaction.input.indexOf(functionToSighash(filter.function)) !== 0\n  ) {\n    return false;\n  }\n  return true;\n}\n\nexport function filterLogsProcessor(\n  log: EthereumLog | LightEthereumLog,\n  filter: EthereumLogFilter,\n  address?: string,\n): boolean {\n  if (address && !stringNormalizedEq(address, log.address)) {\n    return false;\n  }\n\n  if (!filter) return true;\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\n      if (!log.topics[i]) {\n        return false;\n      }\n\n      if (topic === '!null') {\n        return true;\n      }\n\n      if (!hexStringEq(eventToTopic(topic), log.topics[i])) {\n        return false;\n      }\n    }\n  }\n  return true;\n}\n\nexport function isFullBlock(block: BlockContent): block is EthereumBlock {\n  // Light etherum block just contains transaction hashes for transactions. If the block has no transactions then both types would be the same\n  return typeof (block as EthereumBlock).transactions[0] !== 'string';\n}\n"]}

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

@@ -8,7 +8,7 @@ const celo_json_rpc_batch_provider_1 = require("./celo-json-rpc-batch-provider")
 describe('CeloJsonRpcProvider', () => {
     let provider;
     beforeEach(() => {
-        provider = new celo_json_rpc_batch_provider_1.CeloJsonRpcBatchProvider('https://forno.celo.org');
+        provider = new celo_json_rpc_batch_provider_1.CeloJsonRpcBatchProvider('https://celo.api.onfinality.io/public');
     });
     // Test if gasLimit is correctly set for blocks before the hard fork
     it('should set gasLimit to zero for blocks before the hard fork', async () => {
@@ -20,11 +20,8 @@ describe('CeloJsonRpcProvider', () => {
     });
     // Test if gasLimit is correctly set for blocks after the hard fork
     it('should not set gasLimit to zero for blocks after the hard fork', async () => {
-        const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', [
-            ethers_1.utils.hexValue(21055596),
-            true,
-        ]));
-        expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.BigNumber.from(0x1312d00));
+        const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', ['latest', true]));
+        expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.BigNumber.from(0x01e84800));
     });
 });
 //# sourceMappingURL=celo-json-rpc-batch-provider.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"celo-json-rpc-batch-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-json-rpc-batch-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,mCAAqD;AACrD,yDAAmD;AACnD,iFAA0E;AAE1E,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,QAAkC,CAAC;IAEvC,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,uDAAwB,CAAC,wBAAwB,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { BigNumber, constants, utils } from 'ethers';\nimport { formatBlock } from '../../utils.ethereum';\nimport { CeloJsonRpcBatchProvider } from './celo-json-rpc-batch-provider';\n\ndescribe('CeloJsonRpcProvider', () => {\n  let provider: CeloJsonRpcBatchProvider;\n\n  beforeEach(() => {\n    provider = new CeloJsonRpcBatchProvider('https://forno.celo.org');\n  });\n\n  // Test if gasLimit is correctly set for blocks before the hard fork\n  it('should set gasLimit to zero for blocks before the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(16068684),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(constants.Zero);\n  });\n\n  // Test if gasLimit is correctly set for blocks after the hard fork\n  it('should not set gasLimit to zero for blocks after the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(21055596),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(BigNumber.from(0x1312d00));\n  });\n});\n"]}
+{"version":3,"file":"celo-json-rpc-batch-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-json-rpc-batch-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,mCAAqD;AACrD,yDAAmD;AACnD,iFAA0E;AAE1E,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,QAAkC,CAAC;IAEvC,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,uDAAwB,CACrC,uCAAuC,CACxC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAC9D,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { BigNumber, constants, utils } from 'ethers';\nimport { formatBlock } from '../../utils.ethereum';\nimport { CeloJsonRpcBatchProvider } from './celo-json-rpc-batch-provider';\n\ndescribe('CeloJsonRpcProvider', () => {\n  let provider: CeloJsonRpcBatchProvider;\n\n  beforeEach(() => {\n    provider = new CeloJsonRpcBatchProvider(\n      'https://celo.api.onfinality.io/public',\n    );\n  });\n\n  // Test if gasLimit is correctly set for blocks before the hard fork\n  it('should set gasLimit to zero for blocks before the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(16068684),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(constants.Zero);\n  });\n\n  // Test if gasLimit is correctly set for blocks after the hard fork\n  it('should not set gasLimit to zero for blocks after the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', ['latest', true]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(BigNumber.from(0x01e84800));\n  });\n});\n"]}

package/dist/ethereum/ethers/celo/celo-json-rpc-provider.spec.js

@@ -8,7 +8,7 @@ const celo_json_rpc_provider_1 = require("./celo-json-rpc-provider");
 describe('CeloJsonRpcProvider', () => {
     let provider;
     beforeEach(() => {
-        provider = new celo_json_rpc_provider_1.CeloJsonRpcProvider('https://forno.celo.org');
+        provider = new celo_json_rpc_provider_1.CeloJsonRpcProvider('https://celo.api.onfinality.io/public	');
     });
     // Test if gasLimit is correctly set for blocks before the hard fork
     it('should set gasLimit to zero for blocks before the hard fork', async () => {
@@ -20,11 +20,8 @@ describe('CeloJsonRpcProvider', () => {
     });
     // Test if gasLimit is correctly set for blocks after the hard fork
     it('should not set gasLimit to zero for blocks after the hard fork', async () => {
-        const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', [
-            ethers_1.utils.hexValue(21055596),
-            true,
-        ]));
-        expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.BigNumber.from(0x1312d00));
+        const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', ['latest', true]));
+        expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.BigNumber.from(0x01e84800));
     });
 });
 //# sourceMappingURL=celo-json-rpc-provider.spec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"celo-json-rpc-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-json-rpc-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,mCAAqD;AACrD,yDAAmD;AACnD,qEAA+D;AAE/D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,QAA6B,CAAC;IAElC,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,4CAAmB,CAAC,wBAAwB,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { BigNumber, constants, utils } from 'ethers';\nimport { formatBlock } from '../../utils.ethereum';\nimport { CeloJsonRpcProvider } from './celo-json-rpc-provider';\n\ndescribe('CeloJsonRpcProvider', () => {\n  let provider: CeloJsonRpcProvider;\n\n  beforeEach(() => {\n    provider = new CeloJsonRpcProvider('https://forno.celo.org');\n  });\n\n  // Test if gasLimit is correctly set for blocks before the hard fork\n  it('should set gasLimit to zero for blocks before the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(16068684),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(constants.Zero);\n  });\n\n  // Test if gasLimit is correctly set for blocks after the hard fork\n  it('should not set gasLimit to zero for blocks after the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(21055596),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(BigNumber.from(0x1312d00));\n  });\n});\n"]}
+{"version":3,"file":"celo-json-rpc-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-json-rpc-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,mCAAqD;AACrD,yDAAmD;AACnD,qEAA+D;AAE/D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,QAA6B,CAAC;IAElC,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,4CAAmB,CAAC,wCAAwC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAC9D,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { BigNumber, constants, utils } from 'ethers';\nimport { formatBlock } from '../../utils.ethereum';\nimport { CeloJsonRpcProvider } from './celo-json-rpc-provider';\n\ndescribe('CeloJsonRpcProvider', () => {\n  let provider: CeloJsonRpcProvider;\n\n  beforeEach(() => {\n    provider = new CeloJsonRpcProvider('https://celo.api.onfinality.io/public\t');\n  });\n\n  // Test if gasLimit is correctly set for blocks before the hard fork\n  it('should set gasLimit to zero for blocks before the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(16068684),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(constants.Zero);\n  });\n\n  // Test if gasLimit is correctly set for blocks after the hard fork\n  it('should not set gasLimit to zero for blocks after the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', ['latest', true]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(BigNumber.from(0x01e84800));\n  });\n});\n"]}

package/dist/ethereum/ethers/celo/celo-ws-provider.spec.js

@@ -8,7 +8,7 @@ const celo_ws_provider_1 = require("./celo-ws-provider");
 describe('CeloJsonRpcProvider', () => {
     let provider;
     beforeEach(() => {
-        provider = new celo_ws_provider_1.CeloWsProvider('https://forno.celo.org');
+        provider = new celo_ws_provider_1.CeloWsProvider('wss://forno.celo.org/ws');
     });
     // Test if gasLimit is correctly set for blocks before the hard fork
     it('should set gasLimit to zero for blocks before the hard fork', async () => {
@@ -20,11 +20,8 @@ describe('CeloJsonRpcProvider', () => {
     });
     // Test if gasLimit is correctly set for blocks after the hard fork
     it('should not set gasLimit to zero for blocks after the hard fork', async () => {
-        const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', [
-            ethers_1.utils.hexValue(21055596),
-            true,
-        ]));
-        expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.BigNumber.from(0x1312d00));
+        const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', ['latest', true]));
+        expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.BigNumber.from(0x01e84800));
     });
 });
 //# sourceMappingURL=celo-ws-provider.spec.js.map

package/dist/ethereum/ethers/celo/celo-ws-provider.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"celo-ws-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-ws-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,mCAAqD;AACrD,yDAAmD;AACnD,yDAAoD;AAEpD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,QAAwB,CAAC;IAE7B,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,iCAAc,CAAC,wBAAwB,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { BigNumber, constants, utils } from 'ethers';\nimport { formatBlock } from '../../utils.ethereum';\nimport { CeloWsProvider } from './celo-ws-provider';\n\ndescribe('CeloJsonRpcProvider', () => {\n  let provider: CeloWsProvider;\n\n  beforeEach(() => {\n    provider = new CeloWsProvider('https://forno.celo.org');\n  });\n\n  // Test if gasLimit is correctly set for blocks before the hard fork\n  it('should set gasLimit to zero for blocks before the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(16068684),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(constants.Zero);\n  });\n\n  // Test if gasLimit is correctly set for blocks after the hard fork\n  it('should not set gasLimit to zero for blocks after the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(21055596),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(BigNumber.from(0x1312d00));\n  });\n});\n"]}
+{"version":3,"file":"celo-ws-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-ws-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAEnC,mCAAqD;AACrD,yDAAmD;AACnD,yDAAoD;AAEpD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,QAAwB,CAAC;IAE7B,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,iCAAc,CAAC,yBAAyB,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,oEAAoE;IACpE,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC1C,cAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACxB,IAAI;SACL,CAAC,CACH,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,mEAAmE;IACnE,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,IAAA,4BAAW,EACvB,MAAM,QAAQ,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAC9D,CAAC;QACF,MAAM,CAAC,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { BigNumber, constants, utils } from 'ethers';\nimport { formatBlock } from '../../utils.ethereum';\nimport { CeloWsProvider } from './celo-ws-provider';\n\ndescribe('CeloJsonRpcProvider', () => {\n  let provider: CeloWsProvider;\n\n  beforeEach(() => {\n    provider = new CeloWsProvider('wss://forno.celo.org/ws');\n  });\n\n  // Test if gasLimit is correctly set for blocks before the hard fork\n  it('should set gasLimit to zero for blocks before the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', [\n        utils.hexValue(16068684),\n        true,\n      ]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(constants.Zero);\n  });\n\n  // Test if gasLimit is correctly set for blocks after the hard fork\n  it('should not set gasLimit to zero for blocks after the hard fork', async () => {\n    const block = formatBlock(\n      await provider.send('eth_getBlockByNumber', ['latest', true]),\n    );\n    expect(BigNumber.from(block.gasLimit)).toEqual(BigNumber.from(0x01e84800));\n  });\n});\n"]}