@subql/node-ethereum 1.10.1-2 → 2.0.0

package/dist/configure/SubqueryProject.d.ts

@@ -1,27 +1,30 @@
 import { RegisteredTypes } from '@polkadot/types/types';
 import { ReaderOptions, RunnerSpecs } from '@subql/common';
-import { EthereumProjectNetworkConfig, SubqlEthereumDataSource, EthereumBlockFilter, FileType } from '@subql/common-ethereum';
+import { EthereumProjectNetworkConfig, SubqlEthereumDataSource, EthereumBlockFilter } from '@subql/common-ethereum';
 import Cron from 'cron-converter';
 import { GraphQLSchema } from 'graphql';
 import { EthereumApi } from '../ethereum/api.ethereum';
-export declare type SubqlProjectDs = SubqlEthereumDataSource & {
+export type SubqlProjectDs = SubqlEthereumDataSource & {
     mapping: SubqlEthereumDataSource['mapping'] & {
         entryScript: string;
     };
 };
-export declare type SubqlProjectBlockFilter = EthereumBlockFilter & {
+export type SubqlProjectBlockFilter = EthereumBlockFilter & {
     cronSchedule?: {
         schedule: Cron.Seeker;
         next: number;
     };
 };
-export declare type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {
+export type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {
     name: string;
 };
+type NetworkConfig = EthereumProjectNetworkConfig & {
+    chainId: string;
+};
 export declare class SubqueryProject {
     id: string;
     root: string;
-    network: Partial<EthereumProjectNetworkConfig>;
+    network: NetworkConfig;
     dataSources: SubqlProjectDs[];
     schema: GraphQLSchema;
     templates: SubqlProjectDsTemplate[];
@@ -29,10 +32,5 @@ export declare class SubqueryProject {
     runner?: RunnerSpecs;
     static create(path: string, networkOverrides?: Partial<EthereumProjectNetworkConfig>, readerOptions?: ReaderOptions): Promise<SubqueryProject>;
 }
-export interface SubqueryProjectNetwork {
-    chainId: string;
-    endpoint?: string;
-    dictionary?: string;
-    chaintypes?: FileType;
-}
 export declare function generateTimestampReferenceForBlockFilters(dataSources: SubqlProjectDs[], api: EthereumApi): Promise<SubqlProjectDs[]>;
+export {};

package/dist/configure/SubqueryProject.js

@@ -1,12 +1,19 @@
 "use strict";
 // Copyright 2020-2022 OnFinality Limited authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTimestampReferenceForBlockFilters = exports.SubqueryProject = void 0;
-const common_1 = require("@subql/common");
+const common_1 = require("@nestjs/common");
+const common_2 = require("@subql/common");
 const common_ethereum_1 = require("@subql/common-ethereum");
 const utils_1 = require("@subql/utils");
 const cron_converter_1 = __importDefault(require("cron-converter"));
@@ -14,11 +21,11 @@ const project_1 = require("../utils/project");
 const NOT_SUPPORT = (name) => {
     throw new Error(`Manifest specVersion ${name}() is not supported`);
 };
-class SubqueryProject {
+let SubqueryProject = class SubqueryProject {
     static async create(path, networkOverrides, readerOptions) {
         // We have to use reader here, because path can be remote or local
         // and the `loadProjectManifest(projectPath)` only support local mode
-        const reader = await common_1.ReaderFactory.create(path, readerOptions);
+        const reader = await common_2.ReaderFactory.create(path, readerOptions);
         const projectSchema = await reader.getProjectSchema();
         if (projectSchema === undefined) {
             throw new Error(`Get manifest from project path ${path} failed`);
@@ -31,7 +38,10 @@ class SubqueryProject {
             NOT_SUPPORT(manifest.specVersion);
         }
     }
-}
+};
+SubqueryProject = __decorate([
+    (0, common_1.Injectable)()
+], SubqueryProject);
 exports.SubqueryProject = SubqueryProject;
 function processChainId(network) {
     if (network.chainId && network.genesisHash) {
@@ -45,6 +55,9 @@ function processChainId(network) {
 }
 async function loadProjectFromManifestBase(projectManifest, reader, path, networkOverrides) {
     const root = await (0, project_1.getProjectRoot)(reader);
+    if (typeof projectManifest.network.endpoint === 'string') {
+        projectManifest.network.endpoint = [projectManifest.network.endpoint];
+    }
     const network = processChainId(Object.assign(Object.assign({}, projectManifest.network), networkOverrides));
     if (!network.endpoint) {
         throw new Error(`Network endpoint must be provided for network. chainId="${network.chainId}"`);
@@ -76,10 +89,7 @@ const { name: packageName, version: packageVersion, } = require('../../package.j
 async function loadProjectFromManifest1_0_0(projectManifest, reader, path, networkOverrides) {
     const project = await loadProjectFromManifestBase(projectManifest, reader, path, networkOverrides);
     project.runner = projectManifest.runner;
-    if (packageName !== project.runner.node.name) {
-        throw new Error(`Runner requires ${project.runner.node.name}, current node ${packageName}`);
-    }
-    if (!(0, common_1.validateSemver)(packageVersion, project.runner.node.version)) {
+    if (!(0, common_2.validateSemver)(packageVersion, project.runner.node.version)) {
         throw new Error(`Runner require node version ${project.runner.node.version}, current node ${packageVersion}`);
     }
     return project;
@@ -104,7 +114,7 @@ async function generateTimestampReferenceForBlockFilters(dataSources, api) {
                 if (handler.kind === common_ethereum_1.EthereumHandlerKind.Block) {
                     if ((_a = handler.filter) === null || _a === void 0 ? void 0 : _a.timestamp) {
                         if (!block) {
-                            block = await api.getBlockByHeight(startBlock);
+                            block = await api.getBlockByHeightOrHash(startBlock);
                             timestampReference = new Date(block.timestamp * 1000); // Add millis
                         }
                         try {

package/dist/configure/SubqueryProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubqueryProject.js","sourceRoot":"","sources":["../../src/configure/SubqueryProject.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Block } from '@ethersproject/abstract-provider';\nimport { RegisteredTypes } from '@polkadot/types/types';\nimport {\n  ReaderFactory,\n  ReaderOptions,\n  Reader,\n  RunnerSpecs,\n  validateSemver,\n} from '@subql/common';\nimport {\n  EthereumProjectNetworkConfig,\n  parseEthereumProjectManifest,\n  SubqlEthereumDataSource,\n  EthereumBlockFilter,\n  FileType,\n  ProjectManifestV1_0_0Impl,\n  isRuntimeDs,\n  EthereumHandlerKind,\n} from '@subql/common-ethereum';\nimport { buildSchemaFromString } from '@subql/utils';\nimport Cron from 'cron-converter';\nimport { GraphQLSchema } from 'graphql';\nimport { EthereumApi } from '../ethereum/api.ethereum';\nimport {\n  getChainTypes,\n  getProjectRoot,\n  updateDataSourcesV0_2_0,\n} from '../utils/project';\n// import { getBlockByHeight, getTimestamp } from '../utils/substrate';\n\nexport type SubqlProjectDs = SubqlEthereumDataSource & {\n  mapping: SubqlEthereumDataSource['mapping'] & { entryScript: string };\n};\n\nexport type SubqlProjectBlockFilter = EthereumBlockFilter & {\n  cronSchedule?: {\n    schedule: Cron.Seeker;\n    next: number;\n  };\n};\n\nexport type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {\n  name: string;\n};\n\nconst NOT_SUPPORT = (name: string) => {\n  throw new Error(`Manifest specVersion ${name}() is not supported`);\n};\n\nexport class SubqueryProject {\n  id: string;\n  root: string;\n  network: Partial<EthereumProjectNetworkConfig>;\n  dataSources: SubqlProjectDs[];\n  schema: GraphQLSchema;\n  templates: SubqlProjectDsTemplate[];\n  chainTypes?: RegisteredTypes;\n  runner?: RunnerSpecs;\n\n  static async create(\n    path: string,\n    networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n    readerOptions?: ReaderOptions,\n  ): Promise<SubqueryProject> {\n    // We have to use reader here, because path can be remote or local\n    // and the `loadProjectManifest(projectPath)` only support local mode\n    const reader = await ReaderFactory.create(path, readerOptions);\n    const projectSchema = await reader.getProjectSchema();\n    if (projectSchema === undefined) {\n      throw new Error(`Get manifest from project path ${path} failed`);\n    }\n    const manifest = parseEthereumProjectManifest(projectSchema);\n\n    if (manifest.isV1_0_0) {\n      return loadProjectFromManifest1_0_0(\n        manifest.asV1_0_0,\n        reader,\n        path,\n        networkOverrides,\n      );\n    } else {\n      NOT_SUPPORT(manifest.specVersion);\n    }\n  }\n}\n\nexport interface SubqueryProjectNetwork {\n  chainId: string;\n  endpoint?: string;\n  dictionary?: string;\n  chaintypes?: FileType;\n}\n\nfunction processChainId(network: any): SubqueryProjectNetwork {\n  if (network.chainId && network.genesisHash) {\n    throw new Error('Please only provide one of chainId and genesisHash');\n  } else if (network.genesisHash && !network.chainId) {\n    network.chainId = network.genesisHash;\n  }\n  delete network.genesisHash;\n  return network;\n}\n\ntype SUPPORT_MANIFEST = ProjectManifestV1_0_0Impl;\n\nasync function loadProjectFromManifestBase(\n  projectManifest: SUPPORT_MANIFEST,\n  reader: Reader,\n  path: string,\n  networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n): Promise<SubqueryProject> {\n  const root = await getProjectRoot(reader);\n\n  const network = processChainId({\n    ...projectManifest.network,\n    ...networkOverrides,\n  });\n\n  if (!network.endpoint) {\n    throw new Error(\n      `Network endpoint must be provided for network. chainId=\"${network.chainId}\"`,\n    );\n  }\n\n  let schemaString: string;\n  try {\n    schemaString = await reader.getFile(projectManifest.schema.file);\n  } catch (e) {\n    throw new Error(\n      `unable to fetch the schema from ${projectManifest.schema.file}`,\n    );\n  }\n  const schema = buildSchemaFromString(schemaString);\n\n  const chainTypes = projectManifest.network.chaintypes\n    ? await getChainTypes(reader, root, projectManifest.network.chaintypes.file)\n    : undefined;\n\n  const dataSources = await updateDataSourcesV0_2_0(\n    projectManifest.dataSources,\n    reader,\n    root,\n  );\n\n  const templates = await loadProjectTemplates(projectManifest, root, reader);\n\n  return {\n    id: reader.root ? reader.root : path, //TODO, need to method to get project_id\n    root,\n    network,\n    dataSources,\n    schema,\n    chainTypes,\n    templates,\n  };\n}\n\nconst {\n  name: packageName,\n  version: packageVersion,\n} = require('../../package.json');\n\nasync function loadProjectFromManifest1_0_0(\n  projectManifest: ProjectManifestV1_0_0Impl,\n  reader: Reader,\n  path: string,\n  networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n): Promise<SubqueryProject> {\n  const project = await loadProjectFromManifestBase(\n    projectManifest,\n    reader,\n    path,\n    networkOverrides,\n  );\n  project.runner = projectManifest.runner;\n  if (packageName !== project.runner.node.name) {\n    throw new Error(\n      `Runner requires ${project.runner.node.name}, current node ${packageName}`,\n    );\n  }\n  if (!validateSemver(packageVersion, project.runner.node.version)) {\n    throw new Error(\n      `Runner require node version ${project.runner.node.version}, current node ${packageVersion}`,\n    );\n  }\n  return project;\n}\n\nasync function loadProjectTemplates(\n  projectManifest: ProjectManifestV1_0_0Impl,\n  root: string,\n  reader: Reader,\n): Promise<SubqlProjectDsTemplate[]> {\n  if (projectManifest.templates && projectManifest.templates.length !== 0) {\n    const dsTemplates = await updateDataSourcesV0_2_0(\n      projectManifest.templates,\n      reader,\n      root,\n    );\n    return dsTemplates.map((ds, index) => ({\n      ...ds,\n      name: projectManifest.templates[index].name,\n    }));\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/require-await\nexport async function generateTimestampReferenceForBlockFilters(\n  dataSources: SubqlProjectDs[],\n  api: EthereumApi,\n): Promise<SubqlProjectDs[]> {\n  const cron = new Cron();\n\n  dataSources = await Promise.all(\n    dataSources.map(async (ds) => {\n      if (isRuntimeDs(ds)) {\n        const startBlock = ds.startBlock ?? 1;\n        let block: Block;\n        let timestampReference: Date;\n\n        ds.mapping.handlers = await Promise.all(\n          ds.mapping.handlers.map(async (handler) => {\n            if (handler.kind === EthereumHandlerKind.Block) {\n              if (handler.filter?.timestamp) {\n                if (!block) {\n                  block = await api.getBlockByHeight(startBlock);\n                  timestampReference = new Date(block.timestamp * 1000); // Add millis\n                }\n                try {\n                  cron.fromString(handler.filter.timestamp);\n                } catch (e) {\n                  throw new Error(\n                    `Invalid Cron string: ${handler.filter.timestamp}`,\n                  );\n                }\n\n                const schedule = cron.schedule(timestampReference);\n                (handler.filter as SubqlProjectBlockFilter).cronSchedule = {\n                  schedule: schedule,\n                  get next() {\n                    return Date.parse(this.schedule.next().format());\n                  },\n                };\n              }\n            }\n            return handler;\n          }),\n        );\n      }\n      return ds;\n    }),\n  );\n\n  return dataSources;\n}\n"]}
+{"version":3,"file":"SubqueryProject.js","sourceRoot":"","sources":["../../src/configure/SubqueryProject.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Block } from '@ethersproject/abstract-provider';\nimport { Injectable } from '@nestjs/common';\nimport { RegisteredTypes } from '@polkadot/types/types';\nimport {\n  ReaderFactory,\n  ReaderOptions,\n  Reader,\n  RunnerSpecs,\n  validateSemver,\n} from '@subql/common';\nimport {\n  EthereumProjectNetworkConfig,\n  parseEthereumProjectManifest,\n  SubqlEthereumDataSource,\n  EthereumBlockFilter,\n  ProjectManifestV1_0_0Impl,\n  isRuntimeDs,\n  EthereumHandlerKind,\n} from '@subql/common-ethereum';\nimport { buildSchemaFromString } from '@subql/utils';\nimport Cron from 'cron-converter';\nimport { GraphQLSchema } from 'graphql';\nimport { EthereumApi } from '../ethereum/api.ethereum';\nimport {\n  getChainTypes,\n  getProjectRoot,\n  updateDataSourcesV0_2_0,\n} from '../utils/project';\n// import { getBlockByHeight, getTimestamp } from '../utils/substrate';\n\nexport type SubqlProjectDs = SubqlEthereumDataSource & {\n  mapping: SubqlEthereumDataSource['mapping'] & { entryScript: string };\n};\n\nexport type SubqlProjectBlockFilter = EthereumBlockFilter & {\n  cronSchedule?: {\n    schedule: Cron.Seeker;\n    next: number;\n  };\n};\n\nexport type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {\n  name: string;\n};\n\nconst NOT_SUPPORT = (name: string) => {\n  throw new Error(`Manifest specVersion ${name}() is not supported`);\n};\n\n// This is the runtime type after we have mapped genesisHash to chainId and endpoint/dict have been provided when dealing with deployments\ntype NetworkConfig = EthereumProjectNetworkConfig & { chainId: string };\n\n@Injectable()\nexport class SubqueryProject {\n  id: string;\n  root: string;\n  network: NetworkConfig;\n  dataSources: SubqlProjectDs[];\n  schema: GraphQLSchema;\n  templates: SubqlProjectDsTemplate[];\n  chainTypes?: RegisteredTypes;\n  runner?: RunnerSpecs;\n\n  static async create(\n    path: string,\n    networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n    readerOptions?: ReaderOptions,\n  ): Promise<SubqueryProject> {\n    // We have to use reader here, because path can be remote or local\n    // and the `loadProjectManifest(projectPath)` only support local mode\n    const reader = await ReaderFactory.create(path, readerOptions);\n    const projectSchema = await reader.getProjectSchema();\n    if (projectSchema === undefined) {\n      throw new Error(`Get manifest from project path ${path} failed`);\n    }\n    const manifest = parseEthereumProjectManifest(projectSchema);\n\n    if (manifest.isV1_0_0) {\n      return loadProjectFromManifest1_0_0(\n        manifest.asV1_0_0,\n        reader,\n        path,\n        networkOverrides,\n      );\n    } else {\n      NOT_SUPPORT(manifest.specVersion);\n    }\n  }\n}\n\nfunction processChainId(network: any): NetworkConfig {\n  if (network.chainId && network.genesisHash) {\n    throw new Error('Please only provide one of chainId and genesisHash');\n  } else if (network.genesisHash && !network.chainId) {\n    network.chainId = network.genesisHash;\n  }\n  delete network.genesisHash;\n  return network;\n}\n\ntype SUPPORT_MANIFEST = ProjectManifestV1_0_0Impl;\n\nasync function loadProjectFromManifestBase(\n  projectManifest: SUPPORT_MANIFEST,\n  reader: Reader,\n  path: string,\n  networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n): Promise<SubqueryProject> {\n  const root = await getProjectRoot(reader);\n\n  if (typeof projectManifest.network.endpoint === 'string') {\n    projectManifest.network.endpoint = [projectManifest.network.endpoint];\n  }\n\n  const network = processChainId({\n    ...projectManifest.network,\n    ...networkOverrides,\n  });\n\n  if (!network.endpoint) {\n    throw new Error(\n      `Network endpoint must be provided for network. chainId=\"${network.chainId}\"`,\n    );\n  }\n\n  let schemaString: string;\n  try {\n    schemaString = await reader.getFile(projectManifest.schema.file);\n  } catch (e) {\n    throw new Error(\n      `unable to fetch the schema from ${projectManifest.schema.file}`,\n    );\n  }\n  const schema = buildSchemaFromString(schemaString);\n\n  const chainTypes = projectManifest.network.chaintypes\n    ? await getChainTypes(reader, root, projectManifest.network.chaintypes.file)\n    : undefined;\n\n  const dataSources = await updateDataSourcesV0_2_0(\n    projectManifest.dataSources,\n    reader,\n    root,\n  );\n\n  const templates = await loadProjectTemplates(projectManifest, root, reader);\n\n  return {\n    id: reader.root ? reader.root : path, //TODO, need to method to get project_id\n    root,\n    network,\n    dataSources,\n    schema,\n    chainTypes,\n    templates,\n  };\n}\n\nconst {\n  name: packageName,\n  version: packageVersion,\n} = require('../../package.json');\n\nasync function loadProjectFromManifest1_0_0(\n  projectManifest: ProjectManifestV1_0_0Impl,\n  reader: Reader,\n  path: string,\n  networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n): Promise<SubqueryProject> {\n  const project = await loadProjectFromManifestBase(\n    projectManifest,\n    reader,\n    path,\n    networkOverrides,\n  );\n  project.runner = projectManifest.runner;\n  if (!validateSemver(packageVersion, project.runner.node.version)) {\n    throw new Error(\n      `Runner require node version ${project.runner.node.version}, current node ${packageVersion}`,\n    );\n  }\n  return project;\n}\n\nasync function loadProjectTemplates(\n  projectManifest: ProjectManifestV1_0_0Impl,\n  root: string,\n  reader: Reader,\n): Promise<SubqlProjectDsTemplate[]> {\n  if (projectManifest.templates && projectManifest.templates.length !== 0) {\n    const dsTemplates = await updateDataSourcesV0_2_0(\n      projectManifest.templates,\n      reader,\n      root,\n    );\n    return dsTemplates.map((ds, index) => ({\n      ...ds,\n      name: projectManifest.templates[index].name,\n    }));\n  }\n}\n\n// eslint-disable-next-line @typescript-eslint/require-await\nexport async function generateTimestampReferenceForBlockFilters(\n  dataSources: SubqlProjectDs[],\n  api: EthereumApi,\n): Promise<SubqlProjectDs[]> {\n  const cron = new Cron();\n\n  dataSources = await Promise.all(\n    dataSources.map(async (ds) => {\n      if (isRuntimeDs(ds)) {\n        const startBlock = ds.startBlock ?? 1;\n        let block: Block;\n        let timestampReference: Date;\n\n        ds.mapping.handlers = await Promise.all(\n          ds.mapping.handlers.map(async (handler) => {\n            if (handler.kind === EthereumHandlerKind.Block) {\n              if (handler.filter?.timestamp) {\n                if (!block) {\n                  block = await api.getBlockByHeightOrHash(startBlock);\n                  timestampReference = new Date(block.timestamp * 1000); // Add millis\n                }\n                try {\n                  cron.fromString(handler.filter.timestamp);\n                } catch (e) {\n                  throw new Error(\n                    `Invalid Cron string: ${handler.filter.timestamp}`,\n                  );\n                }\n\n                const schedule = cron.schedule(timestampReference);\n                (handler.filter as SubqlProjectBlockFilter).cronSchedule = {\n                  schedule: schedule,\n                  get next() {\n                    return Date.parse(this.schedule.next().format());\n                  },\n                };\n              }\n            }\n            return handler;\n          }),\n        );\n      }\n      return ds;\n    }),\n  );\n\n  return dataSources;\n}\n"]}

package/dist/configure/configure.module.js

@@ -22,9 +22,7 @@ const lodash_1 = require("lodash");
 const yargs_1 = require("../yargs");
 const SubqueryProject_1 = require("./SubqueryProject");
 const logger = (0, node_core_1.getLogger)('configure');
-const YargsNameMapping = {
-    local: 'localMode',
-};
+const YargsNameMapping = {};
 function yargsToIConfig(yargs) {
     return Object.entries(yargs).reduce((acc, [key, value]) => {
         var _a;
@@ -89,7 +87,7 @@ let ConfigureModule = ConfigureModule_1 = class ConfigureModule {
         }
         const project = async () => {
             const p = await SubqueryProject_1.SubqueryProject.create(config.subquery, (0, lodash_1.omitBy)({
-                endpoint: config.networkEndpoint,
+                endpoint: config.networkEndpoints,
                 dictionary: config.networkDictionary,
             }, lodash_1.isNil), {
                 ipfs: config.ipfs,
@@ -138,7 +136,7 @@ let ConfigureModule = ConfigureModule_1 = class ConfigureModule {
         }
         const project = async () => {
             const p = await SubqueryProject_1.SubqueryProject.create(argv.subquery, (0, lodash_1.omitBy)({
-                endpoint: config.networkEndpoint,
+                endpoint: config.networkEndpoints,
                 dictionary: config.networkDictionary,
             }, lodash_1.isNil), {
                 ipfs: config.ipfs,
@@ -156,11 +154,11 @@ let ConfigureModule = ConfigureModule_1 = class ConfigureModule {
                     useValue: config,
                 },
                 {
-                    provide: SubqueryProject_1.SubqueryProject,
+                    provide: 'ISubqueryProject',
                     useFactory: project,
                 },
             ],
-            exports: [node_core_1.NodeConfig, SubqueryProject_1.SubqueryProject],
+            exports: [node_core_1.NodeConfig, 'ISubqueryProject'],
         };
     }
 };

package/dist/configure/configure.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"configure.module.js","sourceRoot":"","sources":["../../src/configure/configure.module.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport assert from 'assert';\nimport path from 'path';\nimport { DynamicModule, Global, Module } from '@nestjs/common';\nimport { getProjectRootAndManifest, IPFS_REGEX } from '@subql/common';\nimport { EthereumProjectNetworkConfig } from '@subql/common-ethereum';\nimport {\n  IConfig,\n  MinConfig,\n  NodeConfig,\n  getLogger,\n  setLevel,\n} from '@subql/node-core';\nimport { camelCase, last, omitBy, isNil } from 'lodash';\nimport { yargsOptions } from '../yargs';\nimport { SubqueryProject } from './SubqueryProject';\n\nconst logger = getLogger('configure');\n\nconst YargsNameMapping: Record<string, string> = {\n  local: 'localMode',\n};\n\ntype Args = typeof yargsOptions.argv['argv'];\n\nfunction yargsToIConfig(yargs: Args): Partial<IConfig> {\n  return Object.entries(yargs).reduce((acc, [key, value]) => {\n    if (['_', '$0'].includes(key)) return acc;\n\n    if (key === 'network-registry') {\n      try {\n        value = JSON.parse(value as string);\n      } catch (e) {\n        throw new Error('Argument `network-registry` is not valid JSON');\n      }\n    }\n    acc[YargsNameMapping[key] ?? camelCase(key)] = value;\n    return acc;\n  }, {} as any);\n}\n\nfunction defaultSubqueryName(config: Partial<IConfig>): MinConfig {\n  const ipfsMatch = config.subquery.match(IPFS_REGEX);\n  return {\n    ...config,\n    subqueryName:\n      config.subqueryName ??\n      (ipfsMatch\n        ? config.subquery.replace(IPFS_REGEX, '')\n        : last(\n            getProjectRootAndManifest(config.subquery).root.split(path.sep),\n          )),\n  } as MinConfig;\n}\n\n// Check if a subquery name is a valid schema name\nexport function validDbSchemaName(name: string): boolean {\n  if (name.length === 0) {\n    return false;\n  } else {\n    name = name.toLowerCase();\n    const regexp = new RegExp('^[a-zA-Z_][a-zA-Z0-9_\\\\-\\\\/]{0,62}$');\n    const flag0 = !name.startsWith('pg_'); // Reserved identifier\n    const flag1 = regexp.test(name); // <= Valid characters, less than 63 bytes\n    if (!flag0) {\n      logger.error(\n        `Invalid schema name '${name}', schema name must not be prefixed with 'pg_'`,\n      );\n    }\n    if (!flag1) {\n      logger.error(\n        `Invalid schema name '${name}', schema name must start with a letter or underscore, \n         be less than 63 bytes and must contain only valid alphanumeric characters (can include characters '_-/')`,\n      );\n    }\n    return flag0 && flag1;\n  }\n}\n\nfunction warnDeprecations() {\n  const { argv } = yargsOptions;\n  if (argv['subquery-name']) {\n    logger.warn(\n      'Note that argument --subquery-name has been deprecated in favour of --db-schema',\n    );\n  }\n  if (argv.local) {\n    logger.warn('Note that argument --local has been deprecated');\n  }\n}\n\n@Global()\n@Module({})\nexport class ConfigureModule {\n  static registerWithConfig(config: NodeConfig): DynamicModule {\n    if (!validDbSchemaName(config.dbSchema)) {\n      process.exit(1);\n    }\n\n    if (config.debug) {\n      setLevel('debug');\n    }\n\n    const project = async () => {\n      const p = await SubqueryProject.create(\n        config.subquery,\n        omitBy<EthereumProjectNetworkConfig>(\n          {\n            endpoint: config.networkEndpoint,\n            dictionary: config.networkDictionary,\n          },\n          isNil,\n        ),\n        {\n          ipfs: config.ipfs,\n        },\n      ).catch((err) => {\n        logger.error(err, 'Create Subquery project from given path failed!');\n        process.exit(1);\n      });\n      return p;\n    };\n\n    return {\n      module: ConfigureModule,\n      providers: [\n        {\n          provide: NodeConfig,\n          useValue: config,\n        },\n        {\n          provide: SubqueryProject,\n          useFactory: project,\n        },\n      ],\n      exports: [NodeConfig, SubqueryProject],\n    };\n  }\n  static register(): DynamicModule {\n    const { argv } = yargsOptions;\n    let config: NodeConfig;\n    if (argv.config) {\n      config = NodeConfig.fromFile(argv.config, yargsToIConfig(argv));\n    } else {\n      if (!argv.subquery) {\n        logger.error(\n          'Subquery path is missing neither in cli options nor in config file',\n        );\n        yargsOptions.showHelp();\n        process.exit(1);\n      }\n\n      warnDeprecations();\n      assert(argv.subquery, 'subquery path is missing');\n      config = new NodeConfig(defaultSubqueryName(yargsToIConfig(argv)));\n    }\n\n    if (!validDbSchemaName(config.dbSchema)) {\n      process.exit(1);\n    }\n\n    if (config.debug) {\n      setLevel('debug');\n    }\n\n    const project = async () => {\n      const p = await SubqueryProject.create(\n        argv.subquery,\n        omitBy<Partial<EthereumProjectNetworkConfig>>(\n          {\n            endpoint: config.networkEndpoint,\n            dictionary: config.networkDictionary,\n          },\n          isNil,\n        ),\n        {\n          ipfs: config.ipfs,\n        },\n      ).catch((err) => {\n        logger.error(err, 'Create Subquery project from given path failed!');\n        process.exit(1);\n      });\n      return p;\n    };\n\n    return {\n      module: ConfigureModule,\n      providers: [\n        {\n          provide: NodeConfig,\n          useValue: config,\n        },\n        {\n          provide: SubqueryProject,\n          useFactory: project,\n        },\n      ],\n      exports: [NodeConfig, SubqueryProject],\n    };\n  }\n}\n"]}
+{"version":3,"file":"configure.module.js","sourceRoot":"","sources":["../../src/configure/configure.module.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport assert from 'assert';\nimport path from 'path';\nimport { DynamicModule, Global, Module } from '@nestjs/common';\nimport { getProjectRootAndManifest, IPFS_REGEX } from '@subql/common';\nimport { EthereumProjectNetworkConfig } from '@subql/common-ethereum';\nimport {\n  IConfig,\n  MinConfig,\n  NodeConfig,\n  getLogger,\n  setLevel,\n} from '@subql/node-core';\nimport { camelCase, last, omitBy, isNil } from 'lodash';\nimport { yargsOptions } from '../yargs';\nimport { SubqueryProject } from './SubqueryProject';\n\nconst logger = getLogger('configure');\n\nconst YargsNameMapping: Record<string, string> = {};\n\ntype Args = typeof yargsOptions.argv['argv'];\n\nfunction yargsToIConfig(yargs: Args): Partial<IConfig> {\n  return Object.entries(yargs).reduce((acc, [key, value]) => {\n    if (['_', '$0'].includes(key)) return acc;\n\n    if (key === 'network-registry') {\n      try {\n        value = JSON.parse(value as string);\n      } catch (e) {\n        throw new Error('Argument `network-registry` is not valid JSON');\n      }\n    }\n    acc[YargsNameMapping[key] ?? camelCase(key)] = value;\n    return acc;\n  }, {} as any);\n}\n\nfunction defaultSubqueryName(config: Partial<IConfig>): MinConfig {\n  const ipfsMatch = config.subquery.match(IPFS_REGEX);\n  return {\n    ...config,\n    subqueryName:\n      config.subqueryName ??\n      (ipfsMatch\n        ? config.subquery.replace(IPFS_REGEX, '')\n        : last(\n            getProjectRootAndManifest(config.subquery).root.split(path.sep),\n          )),\n  } as MinConfig;\n}\n\n// Check if a subquery name is a valid schema name\nexport function validDbSchemaName(name: string): boolean {\n  if (name.length === 0) {\n    return false;\n  } else {\n    name = name.toLowerCase();\n    const regexp = new RegExp('^[a-zA-Z_][a-zA-Z0-9_\\\\-\\\\/]{0,62}$');\n    const flag0 = !name.startsWith('pg_'); // Reserved identifier\n    const flag1 = regexp.test(name); // <= Valid characters, less than 63 bytes\n    if (!flag0) {\n      logger.error(\n        `Invalid schema name '${name}', schema name must not be prefixed with 'pg_'`,\n      );\n    }\n    if (!flag1) {\n      logger.error(\n        `Invalid schema name '${name}', schema name must start with a letter or underscore, \n         be less than 63 bytes and must contain only valid alphanumeric characters (can include characters '_-/')`,\n      );\n    }\n    return flag0 && flag1;\n  }\n}\n\nfunction warnDeprecations() {\n  const { argv } = yargsOptions;\n  if (argv['subquery-name']) {\n    logger.warn(\n      'Note that argument --subquery-name has been deprecated in favour of --db-schema',\n    );\n  }\n  if (argv.local) {\n    logger.warn('Note that argument --local has been deprecated');\n  }\n}\n\n@Global()\n@Module({})\nexport class ConfigureModule {\n  static registerWithConfig(config: NodeConfig): DynamicModule {\n    if (!validDbSchemaName(config.dbSchema)) {\n      process.exit(1);\n    }\n\n    if (config.debug) {\n      setLevel('debug');\n    }\n\n    const project = async () => {\n      const p = await SubqueryProject.create(\n        config.subquery,\n        omitBy<EthereumProjectNetworkConfig>(\n          {\n            endpoint: config.networkEndpoints,\n            dictionary: config.networkDictionary,\n          },\n          isNil,\n        ),\n        {\n          ipfs: config.ipfs,\n        },\n      ).catch((err) => {\n        logger.error(err, 'Create Subquery project from given path failed!');\n        process.exit(1);\n      });\n      return p;\n    };\n\n    return {\n      module: ConfigureModule,\n      providers: [\n        {\n          provide: NodeConfig,\n          useValue: config,\n        },\n        {\n          provide: SubqueryProject,\n          useFactory: project,\n        },\n      ],\n      exports: [NodeConfig, SubqueryProject],\n    };\n  }\n  static register(): DynamicModule {\n    const { argv } = yargsOptions;\n    let config: NodeConfig;\n    if (argv.config) {\n      config = NodeConfig.fromFile(argv.config, yargsToIConfig(argv));\n    } else {\n      if (!argv.subquery) {\n        logger.error(\n          'Subquery path is missing neither in cli options nor in config file',\n        );\n        yargsOptions.showHelp();\n        process.exit(1);\n      }\n\n      warnDeprecations();\n      assert(argv.subquery, 'subquery path is missing');\n      config = new NodeConfig(defaultSubqueryName(yargsToIConfig(argv)));\n    }\n\n    if (!validDbSchemaName(config.dbSchema)) {\n      process.exit(1);\n    }\n\n    if (config.debug) {\n      setLevel('debug');\n    }\n\n    const project = async () => {\n      const p = await SubqueryProject.create(\n        argv.subquery,\n        omitBy<Partial<EthereumProjectNetworkConfig>>(\n          {\n            endpoint: config.networkEndpoints,\n            dictionary: config.networkDictionary,\n          },\n          isNil,\n        ),\n        {\n          ipfs: config.ipfs,\n        },\n      ).catch((err) => {\n        logger.error(err, 'Create Subquery project from given path failed!');\n        process.exit(1);\n      });\n      return p;\n    };\n\n    return {\n      module: ConfigureModule,\n      providers: [\n        {\n          provide: NodeConfig,\n          useValue: config,\n        },\n        {\n          provide: 'ISubqueryProject',\n          useFactory: project,\n        },\n      ],\n      exports: [NodeConfig, 'ISubqueryProject'],\n    };\n  }\n}\n"]}

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

@@ -0,0 +1,11 @@
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { ApiConnection } from '@subql/node-core';
+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;
+    apiConnect(): Promise<void>;
+    apiDisconnect(): Promise<void>;
+}

package/dist/ethereum/api.connection.js

@@ -0,0 +1,27 @@
+"use strict";
+// Copyright 2020-2022 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthereumApiConnection = void 0;
+const api_ethereum_1 = require("./api.ethereum");
+class EthereumApiConnection {
+    constructor(_api) {
+        this._api = _api;
+    }
+    static async create(endpoint, eventEmitter) {
+        const api = new api_ethereum_1.EthereumApi(endpoint, eventEmitter);
+        await api.init();
+        return new EthereumApiConnection(api);
+    }
+    get api() {
+        return this._api;
+    }
+    async apiConnect() {
+        await this._api.connect();
+    }
+    async apiDisconnect() {
+        await this._api.disconnect();
+    }
+}
+exports.EthereumApiConnection = EthereumApiConnection;
+//# sourceMappingURL=api.connection.js.map

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

@@ -0,0 +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"]}

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

@@ -1,24 +1,37 @@
-import { Block } from '@ethersproject/abstract-provider';
+import { Block, TransactionReceipt } from '@ethersproject/abstract-provider';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { RuntimeDataSourceV0_2_0 } from '@subql/common-ethereum';
 import { ApiWrapper, BlockWrapper, EthereumBlockWrapper, EthereumTransaction, EthereumResult, EthereumLog } from '@subql/types-ethereum';
+import { EthereumBlockWrapped } from './block.ethereum';
 export declare class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {
     private endpoint;
+    private eventEmitter;
     private client;
+    private nonBatchClient?;
     private genesisBlock;
     private contractInterfaces;
     private chainId;
-    constructor(endpoint: string);
+    private supportsFinalization;
+    private blockConfirmations;
+    constructor(endpoint: string, eventEmitter: EventEmitter2);
     init(): Promise<void>;
-    getLastHeight(): Promise<number>;
+    private injectClient;
+    getFinalizedBlockHeight(): Promise<number>;
+    getBestBlockHeight(): Promise<number>;
     getRuntimeChain(): string;
     getChainId(): number;
     getGenesisHash(): string;
     getSpecName(): string;
-    getFinalizedBlockHeight(): Promise<number>;
-    getBlockByHeight(height: number): Promise<Block>;
+    getBlockByHeightOrHash(heightOrHash: number | string): Promise<Block>;
+    private getBlockPromise;
+    getTransactionReceipt(transactionHash: string | Promise<string>): Promise<TransactionReceipt>;
+    fetchBlock(blockNumber: number, includeTx?: boolean): Promise<EthereumBlockWrapped>;
     fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]>;
     freezeApi(processor: any, blockContent: BlockWrapper): void;
     private buildInterface;
     parseLog<T extends EthereumResult = EthereumResult>(log: EthereumLog, ds: RuntimeDataSourceV0_2_0): Promise<EthereumLog<T> | EthereumLog>;
     parseTransaction<T extends EthereumResult = EthereumResult>(transaction: EthereumTransaction, ds: RuntimeDataSourceV0_2_0): Promise<EthereumTransaction<T> | EthereumTransaction>;
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    handleError(e: Error): Error;
 }

package/dist/ethereum/api.ethereum.js

@@ -12,11 +12,15 @@ const https_1 = __importDefault(require("https"));
 const abi_1 = require("@ethersproject/abi");
 const providers_1 = require("@ethersproject/providers");
 const node_core_1 = require("@subql/node-core");
+const cacheable_lookup_1 = __importDefault(require("cacheable-lookup"));
 const utils_1 = require("ethers/lib/utils");
+const project_1 = require("../utils/project");
+const yargs_1 = require("../yargs");
 const block_ethereum_1 = require("./block.ethereum");
+const json_rpc_batch_provider_1 = require("./ethers/json-rpc-batch-provider");
+const json_rpc_provider_1 = require("./ethers/json-rpc-provider");
+const safe_api_1 = __importDefault(require("./safe-api"));
 const utils_ethereum_1 = require("./utils.ethereum");
-const Web3HttpProvider = require('web3-providers-http');
-const Web3WsProvider = require('web3-providers-ws');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version: packageVersion } = require('../../package.json');
 const logger = (0, node_core_1.getLogger)('api.ethereum');
@@ -35,68 +39,91 @@ async function loadAssets(ds) {
     }
     return res;
 }
+function getHttpAgents() {
+    // By default Nodejs doesn't cache DNS lookups
+    // https://httptoolkit.com/blog/configuring-nodejs-dns/
+    const lookup = new cacheable_lookup_1.default();
+    const options = {
+        keepAlive: true,
+        /*, maxSockets: 100*/
+    };
+    const httpAgent = new http_1.default.Agent(options);
+    const httpsAgent = new https_1.default.Agent(options);
+    lookup.install(httpAgent);
+    lookup.install(httpsAgent);
+    return {
+        http: httpAgent,
+        https: httpsAgent,
+    };
+}
 class EthereumApi {
-    constructor(endpoint) {
+    constructor(endpoint, eventEmitter) {
         this.endpoint = endpoint;
+        this.eventEmitter = eventEmitter;
         this.contractInterfaces = {};
-        const { hostname, pathname, port, protocol, searchParams } = new URL(endpoint);
-        const httpAgent = new http_1.default.Agent({ keepAlive: true, maxSockets: 10 });
-        const httpsAgent = new https_1.default.Agent({ keepAlive: true, maxSockets: 10 });
+        // Ethereum POS
+        this.supportsFinalization = true;
+        this.blockConfirmations = yargs_1.yargsOptions.argv['block-confirmations'];
+        const { hostname, protocol, searchParams } = new URL(endpoint);
         const protocolStr = protocol.replace(':', '');
-        const portNum = port
-            ? parseInt(port, 10)
-            : protocolStr === 'https'
-                ? undefined
-                : 80;
-        let provider;
+        logger.info(`Api host: ${hostname}, method: ${protocolStr}`);
         if (protocolStr === 'https' || protocolStr === 'http') {
-            const options = {
-                keepAlive: true,
-                headers: [
-                    {
-                        name: 'User-Agent',
-                        value: `Subquery-Node ${packageVersion}`,
-                    },
-                ],
-                agent: {
-                    http: httpAgent,
-                    https: httpsAgent,
-                },
-            };
-            if (searchParams.apiKey) {
-                options.headers.apiKey = searchParams.get('apiKey');
-            }
-            provider = new Web3HttpProvider(this.endpoint, options);
-        }
-        else if (protocolStr === 'ws' || protocolStr === 'wss') {
-            const options = {
+            const connection = {
+                url: this.endpoint.split('?')[0],
                 headers: {
                     'User-Agent': `Subquery-Node ${packageVersion}`,
                 },
-                clientConfig: {
-                    keepAlive: true,
-                },
+                allowGzip: true,
+                throttleLimit: 5,
+                throttleSlotInterval: 1,
+                agents: getHttpAgents(),
             };
-            if (searchParams.apiKey) {
-                options.headers.apiKey = searchParams.get('apiKey');
-            }
-            provider = new Web3WsProvider(endpoint, options);
+            searchParams.forEach((value, name, searchParams) => {
+                connection.headers[name] = value;
+            });
+            this.client = new json_rpc_batch_provider_1.JsonRpcBatchProvider(connection);
+            this.nonBatchClient = new json_rpc_provider_1.JsonRpcProvider(connection);
+        }
+        else if (protocolStr === 'ws' || protocolStr === 'wss') {
+            this.client = new providers_1.WebSocketProvider(this.endpoint);
         }
         else {
             throw new Error(`Unsupported protocol: ${protocol}`);
         }
-        this.client = new providers_1.Web3Provider(provider);
     }
     async init() {
-        this.genesisBlock = await this.client.send('eth_getBlockByNumber', [
-            (0, utils_1.hexValue)(0),
-            true,
-        ]);
-        logger.info(this.endpoint);
-        this.chainId = await this.client.send('net_version', []);
+        this.injectClient();
+        this.genesisBlock = await this.client.getBlock(0);
+        const network = await this.client.getNetwork();
+        this.chainId = network.chainId;
+    }
+    injectClient() {
+        const orig = this.client.send.bind(this.client);
+        Object.defineProperty(this.client, 'send', {
+            value: (...args) => {
+                this.eventEmitter.emit('rpcCall');
+                return orig(...args);
+            },
+        });
+    }
+    async getFinalizedBlockHeight() {
+        try {
+            if (this.supportsFinalization) {
+                return (await this.client.getBlock('finalized')).number;
+            }
+            else {
+                return (await this.getBestBlockHeight()) - this.blockConfirmations;
+            }
+        }
+        catch (e) {
+            // TODO handle specific error for this
+            this.supportsFinalization = false;
+            return this.getFinalizedBlockHeight();
+        }
     }
-    async getLastHeight() {
-        return this.client.getBlockNumber();
+    async getBestBlockHeight() {
+        const tag = this.supportsFinalization ? 'safe' : 'latest';
+        return (await this.client.getBlock(tag)).number;
     }
     getRuntimeChain() {
         return 'ethereum';
@@ -110,44 +137,54 @@ class EthereumApi {
     getSpecName() {
         return 'ethereum';
     }
-    async getFinalizedBlockHeight() {
-        // Doesn't seem to be a difference between finalized and latest
-        return this.client.getBlockNumber();
+    async getBlockByHeightOrHash(heightOrHash) {
+        if (typeof heightOrHash === 'number') {
+            heightOrHash = (0, utils_1.hexValue)(heightOrHash);
+        }
+        return this.client.getBlock(heightOrHash);
+    }
+    async getBlockPromise(num, includeTx = true) {
+        const rawBlock = await this.client.send('eth_getBlockByNumber', [
+            (0, utils_1.hexValue)(num),
+            includeTx,
+        ]);
+        const block = (0, utils_ethereum_1.formatBlock)(rawBlock);
+        block.stateRoot = this.client.formatter.hash(block.stateRoot);
+        return block;
+    }
+    async getTransactionReceipt(transactionHash) {
+        return (0, project_1.retryOnFailEth)(this.client.getTransactionReceipt.bind(this.client, transactionHash));
     }
-    async getBlockByHeight(height) {
-        return this.client.getBlock(height);
+    async fetchBlock(blockNumber, includeTx) {
+        try {
+            const [block, logs] = await Promise.all([
+                this.getBlockPromise(blockNumber, includeTx),
+                this.client.getLogs({
+                    fromBlock: (0, utils_1.hexValue)(blockNumber),
+                    toBlock: (0, utils_1.hexValue)(blockNumber),
+                }),
+            ]);
+            const ret = new block_ethereum_1.EthereumBlockWrapped(block, includeTx
+                ? block.transactions.map((tx) => (Object.assign(Object.assign({}, (0, utils_ethereum_1.formatTransaction)(tx)), { 
+                    // TODO memoise
+                    receipt: () => this.getTransactionReceipt(tx.hash).then((r) => (0, utils_ethereum_1.formatReceipt)(r, block)) })))
+                : [], logs.map((l) => (0, utils_ethereum_1.formatLog)(l, block)));
+            this.eventEmitter.emit('fetchBlock');
+            return ret;
+        }
+        catch (e) {
+            throw this.handleError(e);
+        }
     }
     async fetchBlocks(bufferBlocks) {
-        return Promise.all(bufferBlocks.map(async (num) => {
-            try {
-                // Fetch Block
-                const block_promise = await this.client.send('eth_getBlockByNumber', [
-                    (0, utils_1.hexValue)(num),
-                    true,
-                ]);
-                const block = (0, utils_ethereum_1.formatBlock)(block_promise);
-                //const block = this.client.formatter.blockWithTransactions(rawBlock);
-                block.stateRoot = this.client.formatter.hash(block.stateRoot);
-                // Get transaction receipts
-                const transactions = await Promise.all(block.transactions.map(async (tx) => {
-                    //logger.info(JSON.stringify(tx))
-                    const transaction = (0, utils_ethereum_1.formatTransaction)(tx);
-                    const receipt = await this.client.send('eth_getTransactionReceipt', [tx.hash]);
-                    transaction.receipt = (0, utils_ethereum_1.formatReceipt)(receipt, block);
-                    return transaction;
-                }));
-                return new block_ethereum_1.EthereumBlockWrapped(block, transactions);
-            }
-            catch (e) {
-                // Wrap error from an axios error to fix issue with error being undefined
-                const error = new Error(e.message);
-                logger.error(error, `Failed to fetch block at height ${num}`);
-                throw error;
-            }
-        }));
+        return Promise.all(bufferBlocks.map(async (num) => this.fetchBlock(num, true)));
     }
     freezeApi(processor, blockContent) {
-        processor.freeze(this.client, 'api');
+        // We cannot use a batch http client because OnF don't support routing historical queries in batches to an archive nodes
+        const client = this.client instanceof providers_1.WebSocketProvider
+            ? this.client
+            : this.nonBatchClient;
+        processor.freeze(new safe_api_1.default(client, blockContent.blockHeight), 'api');
     }
     buildInterface(abiName, assets) {
         if (!assets[abiName]) {
@@ -207,6 +244,26 @@ class EthereumApi {
             return transaction;
         }
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async connect() {
+        logger.error('Ethereum API connect is not implemented');
+        throw new Error('Not implemented');
+    }
+    async disconnect() {
+        if (this.client instanceof providers_1.WebSocketProvider) {
+            await this.client.destroy();
+        }
+        else {
+            logger.warn('Disconnect called on HTTP provider');
+        }
+    }
+    handleError(e) {
+        if ((e === null || e === void 0 ? void 0 : e.status) === 429) {
+            const { hostname } = new URL(this.endpoint);
+            return new Error(`Rate Limited at endpoint: ${hostname}`);
+        }
+        return e;
+    }
 }
 exports.EthereumApi = EthereumApi;
 //# sourceMappingURL=api.ethereum.js.map