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

package/dist/configure/NodeConfig.d.ts

@@ -0,0 +1,21 @@
+import { IConfig, NodeConfig } from '@subql/node-core';
+export interface IEthereumConfig extends IConfig {
+    skipTransactions: boolean;
+    blockConfirmations: number;
+}
+export declare class EthereumNodeConfig extends NodeConfig<IEthereumConfig> {
+    /**
+     * This is a wrapper around the core NodeConfig to get additional properties that are provided through args or node runner options
+     * NOTE: This isn't injected anywhere so you need to wrap the injected node config
+     *
+     * @example
+     * constructor(
+     *   nodeConfig: NodeConfig,
+     * ) {
+     *   this.nodeConfig = new EthereumNodeConfig(nodeConfig);
+     * }
+     * */
+    constructor(config: NodeConfig);
+    get skipTransactions(): boolean;
+    get blockConfirmations(): number;
+}

package/dist/configure/NodeConfig.js

@@ -0,0 +1,31 @@
+"use strict";
+// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors
+// SPDX-License-Identifier: GPL-3.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EthereumNodeConfig = void 0;
+const node_core_1 = require("@subql/node-core");
+class EthereumNodeConfig extends node_core_1.NodeConfig {
+    /**
+     * This is a wrapper around the core NodeConfig to get additional properties that are provided through args or node runner options
+     * NOTE: This isn't injected anywhere so you need to wrap the injected node config
+     *
+     * @example
+     * constructor(
+     *   nodeConfig: NodeConfig,
+     * ) {
+     *   this.nodeConfig = new EthereumNodeConfig(nodeConfig);
+     * }
+     * */
+    constructor(config) {
+        // Rebuild with internal config
+        super(config._config, config._isTest);
+    }
+    get skipTransactions() {
+        return !!this._config.skipTransactions;
+    }
+    get blockConfirmations() {
+        return this._config.blockConfirmations;
+    }
+}
+exports.EthereumNodeConfig = EthereumNodeConfig;
+//# sourceMappingURL=NodeConfig.js.map

package/dist/configure/NodeConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeConfig.js","sourceRoot":"","sources":["../../src/configure/NodeConfig.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAEnC,gDAAuD;AAOvD,MAAa,kBAAmB,SAAQ,sBAA2B;IACjE;;;;;;;;;;SAUK;IACL,YAAY,MAAkB;QAC5B,+BAA+B;QAC/B,KAAK,CAAE,MAAc,CAAC,OAAO,EAAG,MAAc,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;IACzC,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;IACzC,CAAC;CACF;AAxBD,gDAwBC","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { IConfig, NodeConfig } from '@subql/node-core';\n\nexport interface IEthereumConfig extends IConfig {\n  skipTransactions: boolean;\n  blockConfirmations: number;\n}\n\nexport class EthereumNodeConfig extends NodeConfig<IEthereumConfig> {\n  /**\n   * This is a wrapper around the core NodeConfig to get additional properties that are provided through args or node runner options\n   * NOTE: This isn't injected anywhere so you need to wrap the injected node config\n   *\n   * @example\n   * constructor(\n   *   nodeConfig: NodeConfig,\n   * ) {\n   *   this.nodeConfig = new EthereumNodeConfig(nodeConfig);\n   * }\n   * */\n  constructor(config: NodeConfig) {\n    // Rebuild with internal config\n    super((config as any)._config, (config as any)._isTest);\n  }\n\n  get skipTransactions(): boolean {\n    return !!this._config.skipTransactions;\n  }\n\n  get blockConfirmations(): number {\n    return this._config.blockConfirmations;\n  }\n}\n"]}

package/dist/configure/SubqueryProject.d.ts

@@ -1,34 +1,26 @@
-import { Reader, RunnerSpecs } from '@subql/common';
-import { EthereumProjectNetworkConfig, SubqlEthereumDataSource, EthereumBlockFilter } from '@subql/common-ethereum';
-import Cron from 'cron-converter';
+import { SubqlEthereumDataSource } from '@subql/common-ethereum';
+import { ISubqueryProject, SubqlProjectDs } from '@subql/node-core';
+import { ParentProject, Reader, RunnerSpecs } from '@subql/types-core';
+import { EthereumNetworkConfig, RuntimeDatasourceTemplate, CustomDatasourceTemplate } from '@subql/types-ethereum';
 import { GraphQLSchema } from 'graphql';
-import { EthereumApi } from '../ethereum/api.ethereum';
-export type SubqlProjectDs = SubqlEthereumDataSource & {
-    mapping: SubqlEthereumDataSource['mapping'] & {
-        entryScript: string;
-    };
-};
-export type SubqlProjectBlockFilter = EthereumBlockFilter & {
-    cronSchedule?: {
-        schedule: Cron.Seeker;
-        next: number;
-    };
-};
-export type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {
-    name: string;
-};
-type NetworkConfig = EthereumProjectNetworkConfig & {
+export type EthereumProjectDs = SubqlProjectDs<SubqlEthereumDataSource>;
+export type EthereumProjectDsTemplate = SubqlProjectDs<RuntimeDatasourceTemplate> | SubqlProjectDs<CustomDatasourceTemplate>;
+type NetworkConfig = EthereumNetworkConfig & {
     chainId: string;
 };
-export declare class SubqueryProject {
-    id: string;
-    root: string;
-    network: NetworkConfig;
-    dataSources: SubqlProjectDs[];
-    schema: GraphQLSchema;
-    templates: SubqlProjectDsTemplate[];
-    runner?: RunnerSpecs;
-    static create(path: string, rawManifest: unknown, reader: Reader, networkOverrides?: Partial<EthereumProjectNetworkConfig>, root?: string): Promise<SubqueryProject>;
+export declare class SubqueryProject implements ISubqueryProject {
+    #private;
+    readonly id: string;
+    readonly root: string;
+    readonly network: NetworkConfig;
+    readonly schema: GraphQLSchema;
+    readonly templates: EthereumProjectDsTemplate[];
+    readonly runner?: RunnerSpecs;
+    readonly parent?: ParentProject;
+    constructor(id: string, root: string, network: NetworkConfig, dataSources: EthereumProjectDs[], schema: GraphQLSchema, templates: EthereumProjectDsTemplate[], runner?: RunnerSpecs, parent?: ParentProject);
+    get dataSources(): EthereumProjectDs[];
+    applyCronTimestamps(getTimestamp: (height: number) => Promise<Date>): Promise<void>;
+    static create(path: string, rawManifest: unknown, reader: Reader, root: string, // If project local then directory otherwise temp directory
+    networkOverrides?: Partial<EthereumNetworkConfig>): Promise<SubqueryProject>;
 }
-export declare function generateTimestampReferenceForBlockFilters(dataSources: SubqlProjectDs[], api: EthereumApi): Promise<SubqlProjectDs[]>;
 export {};

package/dist/configure/SubqueryProject.js

@@ -7,23 +7,58 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _SubqueryProject_dataSources;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTimestampReferenceForBlockFilters = exports.SubqueryProject = void 0;
+exports.SubqueryProject = void 0;
+const assert_1 = __importDefault(require("assert"));
 const common_1 = require("@nestjs/common");
 const common_2 = require("@subql/common");
 const common_ethereum_1 = require("@subql/common-ethereum");
 const node_core_1 = require("@subql/node-core");
 const utils_1 = require("@subql/utils");
-const cron_converter_1 = __importDefault(require("cron-converter"));
+const graphql_1 = require("graphql");
 const project_1 = require("../utils/project");
+const { version: packageVersion } = require('../../package.json');
 const NOT_SUPPORT = (name) => {
     throw new Error(`Manifest specVersion ${name} is not supported`);
 };
 let SubqueryProject = class SubqueryProject {
-    static async create(path, rawManifest, reader, networkOverrides, root) {
+    constructor(id, root, network, dataSources, schema, templates, runner, parent) {
+        this.id = id;
+        this.root = root;
+        this.network = network;
+        this.schema = schema;
+        this.templates = templates;
+        this.runner = runner;
+        this.parent = parent;
+        _SubqueryProject_dataSources.set(this, void 0);
+        __classPrivateFieldSet(this, _SubqueryProject_dataSources, dataSources, "f");
+    }
+    get dataSources() {
+        return __classPrivateFieldGet(this, _SubqueryProject_dataSources, "f");
+    }
+    async applyCronTimestamps(getTimestamp) {
+        __classPrivateFieldSet(this, _SubqueryProject_dataSources, await (0, node_core_1.insertBlockFiltersCronSchedules)(this.dataSources, getTimestamp, common_ethereum_1.isRuntimeDs, common_ethereum_1.EthereumHandlerKind.Block), "f");
+    }
+    static async create(path, rawManifest, reader, root, // If project local then directory otherwise temp directory
+    networkOverrides) {
         // rawManifest and reader can be reused here.
         // It has been pre-fetched and used for rebase manifest runner options with args
         // in order to generate correct configs.
@@ -34,15 +69,17 @@ let SubqueryProject = class SubqueryProject {
         }
         const manifest = (0, common_ethereum_1.parseEthereumProjectManifest)(rawManifest);
         if (manifest.isV1_0_0) {
-            return loadProjectFromManifest1_0_0(manifest.asV1_0_0, reader, path, networkOverrides, root);
+            return loadProjectFromManifestBase(manifest.asV1_0_0, reader, path, root, networkOverrides);
         }
         else {
             NOT_SUPPORT(manifest.specVersion);
         }
     }
 };
+_SubqueryProject_dataSources = new WeakMap();
 SubqueryProject = __decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [String, String, Object, Array, graphql_1.GraphQLSchema, Array, Object, Object])
 ], SubqueryProject);
 exports.SubqueryProject = SubqueryProject;
 function processChainId(network) {
@@ -55,8 +92,7 @@ function processChainId(network) {
     delete network.genesisHash;
     return network;
 }
-async function loadProjectFromManifestBase(projectManifest, reader, path, networkOverrides, root) {
-    root = root !== null && root !== void 0 ? root : (await (0, node_core_1.getProjectRoot)(reader));
+async function loadProjectFromManifestBase(projectManifest, reader, path, root, networkOverrides) {
     if (typeof projectManifest.network.endpoint === 'string') {
         projectManifest.network.endpoint = [projectManifest.network.endpoint];
     }
@@ -73,70 +109,10 @@ async function loadProjectFromManifestBase(projectManifest, reader, path, networ
     }
     const schema = (0, utils_1.buildSchemaFromString)(schemaString);
     const dataSources = await (0, project_1.updateDatasourcesFlare)(projectManifest.dataSources, reader, root);
-    const templates = await loadProjectTemplates(projectManifest, root, reader);
-    return {
-        id: reader.root ? reader.root : path,
-        root,
-        network,
-        dataSources,
-        schema,
-        templates,
-    };
-}
-const { version: packageVersion } = require('../../package.json');
-async function loadProjectFromManifest1_0_0(projectManifest, reader, path, networkOverrides, root) {
-    const project = await loadProjectFromManifestBase(projectManifest, reader, path, networkOverrides, root);
-    project.runner = projectManifest.runner;
-    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;
-}
-async function loadProjectTemplates(projectManifest, root, reader) {
-    if (!projectManifest.templates || !projectManifest.templates.length) {
-        return [];
-    }
-    const dsTemplates = await (0, project_1.updateDatasourcesFlare)(projectManifest.templates, reader, root);
-    return dsTemplates.map((ds, index) => (Object.assign(Object.assign({}, ds), { name: projectManifest.templates[index].name })));
-}
-// eslint-disable-next-line @typescript-eslint/require-await
-async function generateTimestampReferenceForBlockFilters(dataSources, api) {
-    const cron = new cron_converter_1.default();
-    dataSources = await Promise.all(dataSources.map(async (ds) => {
-        var _a;
-        if ((0, common_ethereum_1.isRuntimeDs)(ds)) {
-            const startBlock = (_a = ds.startBlock) !== null && _a !== void 0 ? _a : 1;
-            let block;
-            let timestampReference;
-            ds.mapping.handlers = await Promise.all(ds.mapping.handlers.map(async (handler) => {
-                var _a;
-                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.getBlockByHeightOrHash(startBlock);
-                            timestampReference = new Date(block.timestamp * 1000); // Add millis
-                        }
-                        try {
-                            cron.fromString(handler.filter.timestamp);
-                        }
-                        catch (e) {
-                            throw new Error(`Invalid Cron string: ${handler.filter.timestamp}`);
-                        }
-                        const schedule = cron.schedule(timestampReference);
-                        handler.filter.cronSchedule = {
-                            schedule: schedule,
-                            get next() {
-                                return Date.parse(this.schedule.next().format());
-                            },
-                        };
-                    }
-                }
-                return handler;
-            }));
-        }
-        return ds;
-    }));
-    return dataSources;
+    const templates = await (0, node_core_1.loadProjectTemplates)(projectManifest.templates, root, reader, common_ethereum_1.isCustomDs);
+    const runner = projectManifest.runner;
+    (0, assert_1.default)((0, common_2.validateSemver)(packageVersion, runner.node.version), new Error(`Runner require node version ${runner.node.version}, current node ${packageVersion}`));
+    return new SubqueryProject(reader.root ? reader.root : path, //TODO, need to method to get project_id
+    root, network, dataSources, schema, templates, runner, projectManifest.parent);
 }
-exports.generateTimestampReferenceForBlockFilters = generateTimestampReferenceForBlockFilters;
 //# sourceMappingURL=SubqueryProject.js.map

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-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Block } from '@ethersproject/abstract-provider';\nimport { Injectable } from '@nestjs/common';\nimport { Reader, RunnerSpecs, validateSemver } from '@subql/common';\nimport {\n  EthereumProjectNetworkConfig,\n  parseEthereumProjectManifest,\n  SubqlEthereumDataSource,\n  EthereumBlockFilter,\n  ProjectManifestV1_0_0Impl,\n  isRuntimeDs,\n  EthereumHandlerKind,\n  isCustomDs,\n} from '@subql/common-ethereum';\nimport { getProjectRoot, updateDataSourcesV1_0_0 } from '@subql/node-core';\nimport { buildSchemaFromString } from '@subql/utils';\nimport Cron from 'cron-converter';\nimport { GraphQLSchema } from 'graphql';\nimport { EthereumApi } from '../ethereum/api.ethereum';\nimport { updateDatasourcesFlare } from '../utils/project';\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  runner?: RunnerSpecs;\n\n  static async create(\n    path: string,\n    rawManifest: unknown,\n    reader: Reader,\n    networkOverrides?: Partial<EthereumProjectNetworkConfig>,\n    root?: string,\n  ): Promise<SubqueryProject> {\n    // rawManifest and reader can be reused here.\n    // It has been pre-fetched and used for rebase manifest runner options with args\n    // in order to generate correct configs.\n\n    // But we still need reader here, because path can be remote or local\n    // and the `loadProjectManifest(projectPath)` only support local mode\n    if (rawManifest === undefined) {\n      throw new Error(`Get manifest from project path ${path} failed`);\n    }\n    const manifest = parseEthereumProjectManifest(rawManifest);\n\n    if (manifest.isV1_0_0) {\n      return loadProjectFromManifest1_0_0(\n        manifest.asV1_0_0,\n        reader,\n        path,\n        networkOverrides,\n        root,\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  root?: string,\n): Promise<SubqueryProject> {\n  root = 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 dataSources = await updateDatasourcesFlare(\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    templates,\n  };\n}\n\nconst { version: packageVersion } = 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  root?: string,\n): Promise<SubqueryProject> {\n  const project = await loadProjectFromManifestBase(\n    projectManifest,\n    reader,\n    path,\n    networkOverrides,\n    root,\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) {\n    return [];\n  }\n  const dsTemplates = await updateDatasourcesFlare(\n    projectManifest.templates,\n    reader,\n    root,\n  );\n\n  return dsTemplates.map((ds, index) => ({\n    ...ds,\n    name: projectManifest.templates[index].name,\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"]}
+{"version":3,"file":"SubqueryProject.js","sourceRoot":"","sources":["../../src/configure/SubqueryProject.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 assert from 'assert';\nimport { Injectable } from '@nestjs/common';\nimport { validateSemver } from '@subql/common';\nimport {\n  parseEthereumProjectManifest,\n  SubqlEthereumDataSource,\n  ProjectManifestV1_0_0Impl,\n  isRuntimeDs,\n  EthereumHandlerKind,\n  isCustomDs,\n} from '@subql/common-ethereum';\nimport {\n  insertBlockFiltersCronSchedules,\n  ISubqueryProject,\n  loadProjectTemplates,\n  SubqlProjectDs,\n} from '@subql/node-core';\nimport { ParentProject, Reader, RunnerSpecs } from '@subql/types-core';\nimport {\n  EthereumNetworkConfig,\n  RuntimeDatasourceTemplate,\n  CustomDatasourceTemplate,\n} from '@subql/types-ethereum';\nimport { buildSchemaFromString } from '@subql/utils';\nimport { GraphQLSchema } from 'graphql';\nimport { updateDatasourcesFlare } from '../utils/project';\n\nconst { version: packageVersion } = require('../../package.json');\n\nexport type EthereumProjectDs = SubqlProjectDs<SubqlEthereumDataSource>;\n\nexport type EthereumProjectDsTemplate =\n  | SubqlProjectDs<RuntimeDatasourceTemplate>\n  | SubqlProjectDs<CustomDatasourceTemplate>;\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 = EthereumNetworkConfig & { chainId: string };\n\n@Injectable()\nexport class SubqueryProject implements ISubqueryProject {\n  #dataSources: EthereumProjectDs[];\n\n  constructor(\n    readonly id: string,\n    readonly root: string,\n    readonly network: NetworkConfig,\n    dataSources: EthereumProjectDs[],\n    readonly schema: GraphQLSchema,\n    readonly templates: EthereumProjectDsTemplate[],\n    readonly runner?: RunnerSpecs,\n    readonly parent?: ParentProject,\n  ) {\n    this.#dataSources = dataSources;\n  }\n\n  get dataSources(): EthereumProjectDs[] {\n    return this.#dataSources;\n  }\n\n  async applyCronTimestamps(\n    getTimestamp: (height: number) => Promise<Date>,\n  ): Promise<void> {\n    this.#dataSources = await insertBlockFiltersCronSchedules(\n      this.dataSources,\n      getTimestamp,\n      isRuntimeDs,\n      EthereumHandlerKind.Block,\n    );\n  }\n\n  static async create(\n    path: string,\n    rawManifest: unknown,\n    reader: Reader,\n    root: string, // If project local then directory otherwise temp directory\n    networkOverrides?: Partial<EthereumNetworkConfig>,\n  ): Promise<SubqueryProject> {\n    // rawManifest and reader can be reused here.\n    // It has been pre-fetched and used for rebase manifest runner options with args\n    // in order to generate correct configs.\n\n    // But we still need reader here, because path can be remote or local\n    // and the `loadProjectManifest(projectPath)` only support local mode\n    if (rawManifest === undefined) {\n      throw new Error(`Get manifest from project path ${path} failed`);\n    }\n    const manifest = parseEthereumProjectManifest(rawManifest);\n\n    if (manifest.isV1_0_0) {\n      return loadProjectFromManifestBase(\n        manifest.asV1_0_0,\n        reader,\n        path,\n        root,\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  root: string,\n  networkOverrides?: Partial<EthereumNetworkConfig>,\n): Promise<SubqueryProject> {\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 dataSources = await updateDatasourcesFlare(\n    projectManifest.dataSources,\n    reader,\n    root,\n  );\n\n  const templates = await loadProjectTemplates(\n    projectManifest.templates,\n    root,\n    reader,\n    isCustomDs,\n  );\n  const runner = projectManifest.runner;\n  assert(\n    validateSemver(packageVersion, runner.node.version),\n    new Error(\n      `Runner require node version ${runner.node.version}, current node ${packageVersion}`,\n    ),\n  );\n\n  return new SubqueryProject(\n    reader.root ? reader.root : path, //TODO, need to method to get project_id\n    root,\n    network,\n    dataSources,\n    schema,\n    templates,\n    runner,\n    projectManifest.parent,\n  );\n}\n"]}

package/dist/configure/configure.module.d.ts

@@ -3,8 +3,8 @@ import { NodeConfig } from '@subql/node-core';
 import { SubqueryProject } from './SubqueryProject';
 export declare class ConfigureModule {
     static getInstance(): Promise<{
-        config: NodeConfig;
-        project: () => Promise<SubqueryProject>;
+        nodeConfig: NodeConfig;
+        project: SubqueryProject;
     }>;
     static register(): Promise<DynamicModule>;
 }

package/dist/configure/configure.module.js

@@ -7,117 +7,47 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 };
-};
 var ConfigureModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigureModule = void 0;
-const assert_1 = __importDefault(require("assert"));
 const common_1 = require("@nestjs/common");
-const common_2 = require("@subql/common");
 const node_core_1 = require("@subql/node-core");
-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 = {};
-function yargsToIConfig(yargs) {
-    return Object.entries(yargs).reduce((acc, [key, value]) => {
-        var _a;
-        if (['_', '$0'].includes(key))
-            return acc;
-        if (key === 'network-registry') {
-            try {
-                value = JSON.parse(value);
-            }
-            catch (e) {
-                throw new Error('Argument `network-registry` is not valid JSON');
-            }
-        }
-        acc[(_a = YargsNameMapping[key]) !== null && _a !== void 0 ? _a : (0, lodash_1.camelCase)(key)] = value;
-        return acc;
-    }, {});
-}
-function warnDeprecations() {
-    const { argv } = yargs_1.yargsOptions;
-    if (argv['subquery-name']) {
-        logger.warn('Note that argument --subquery-name has been deprecated in favour of --db-schema');
-    }
-    if (argv.local) {
-        logger.warn('Note that argument --local has been deprecated');
-    }
-}
+const pjson = require('../../package.json');
 let ConfigureModule = ConfigureModule_1 = class ConfigureModule {
     static async getInstance() {
         const { argv } = yargs_1.yargsOptions;
-        let config;
-        let rawManifest;
-        let reader;
-        const isTest = argv._[0] === 'test';
-        // Override order : Sub-command/Args/Flags > Manifest Runner options > Default configs
-        // Therefore, we should rebase the manifest runner options with args first but not the config in the end
-        if (argv.config) {
-            // get manifest options
-            config = node_core_1.NodeConfig.fromFile(argv.config, yargsToIConfig(argv), isTest);
-            reader = await common_2.ReaderFactory.create(config.subquery, {
-                ipfs: config.ipfs,
-            });
-            rawManifest = await reader.getProjectSchema();
-            (0, node_core_1.rebaseArgsWithManifest)(argv, rawManifest);
-            // use rebased argv generate config to override current config
-            config = node_core_1.NodeConfig.rebaseWithArgs(config, yargsToIConfig(argv), isTest);
-        }
-        else {
-            if (!argv.subquery) {
-                logger.error('Subquery path is missing neither in cli options nor in config file');
-                yargs_1.yargsOptions.showHelp();
-                process.exit(1);
-            }
-            warnDeprecations();
-            (0, assert_1.default)(argv.subquery, 'subquery path is missing');
-            reader = await common_2.ReaderFactory.create(argv.subquery, {
-                ipfs: argv.ipfs,
-            });
-            rawManifest = await reader.getProjectSchema();
-            (0, node_core_1.rebaseArgsWithManifest)(argv, rawManifest);
-            // Create new nodeConfig with rebased argv
-            config = new node_core_1.NodeConfig((0, node_core_1.defaultSubqueryName)(yargsToIConfig(argv)), isTest);
-        }
-        if (!(0, node_core_1.validDbSchemaName)(config.dbSchema)) {
-            process.exit(1);
-        }
-        if (config.debug) {
-            (0, node_core_1.setLevel)('debug');
-        }
-        const project = async () => {
-            const p = await SubqueryProject_1.SubqueryProject.create(argv.subquery, rawManifest, reader, (0, lodash_1.omitBy)({
-                endpoint: config.networkEndpoints,
-                dictionary: config.networkDictionary,
-            }, lodash_1.isNil), config.root).catch((err) => {
-                const pjson = require('../../package.json');
-                (0, common_2.handleCreateSubqueryProjectError)(err, pjson, rawManifest, logger);
-                process.exit(1);
-            });
-            return p;
-        };
-        return { config, project };
+        return (0, node_core_1.registerApp)(argv, SubqueryProject_1.SubqueryProject.create.bind(SubqueryProject_1.SubqueryProject), yargs_1.yargsOptions.showHelp.bind(yargs_1.yargsOptions), pjson);
     }
     static async register() {
-        const { config, project } = await ConfigureModule_1.getInstance();
+        const { nodeConfig, project } = await ConfigureModule_1.getInstance();
         return {
             module: ConfigureModule_1,
             providers: [
                 {
                     provide: node_core_1.NodeConfig,
-                    useValue: config,
+                    useValue: nodeConfig,
                 },
                 {
                     provide: 'ISubqueryProject',
-                    useFactory: project,
+                    useValue: project,
                 },
+                {
+                    provide: 'IProjectUpgradeService',
+                    useValue: project,
+                },
+                {
+                    provide: 'Null',
+                    useValue: null,
+                },
+            ],
+            exports: [
+                node_core_1.NodeConfig,
+                'ISubqueryProject',
+                'IProjectUpgradeService',
+                'Null',
             ],
-            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-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport assert from 'assert';\nimport { DynamicModule, Global, Module } from '@nestjs/common';\nimport {\n  handleCreateSubqueryProjectError,\n  Reader,\n  ReaderFactory,\n} from '@subql/common';\nimport { EthereumProjectNetworkConfig } from '@subql/common-ethereum';\nimport {\n  IConfig,\n  NodeConfig,\n  getLogger,\n  setLevel,\n  rebaseArgsWithManifest,\n  defaultSubqueryName,\n  validDbSchemaName,\n} from '@subql/node-core';\nimport { camelCase, 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 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 async getInstance(): Promise<{\n    config: NodeConfig;\n    project: () => Promise<SubqueryProject>;\n  }> {\n    const { argv } = yargsOptions;\n    let config: NodeConfig;\n    let rawManifest: unknown;\n    let reader: Reader;\n\n    const isTest = argv._[0] === 'test';\n\n    // Override order : Sub-command/Args/Flags > Manifest Runner options > Default configs\n    // Therefore, we should rebase the manifest runner options with args first but not the config in the end\n    if (argv.config) {\n      // get manifest options\n      config = NodeConfig.fromFile(argv.config, yargsToIConfig(argv), isTest);\n      reader = await ReaderFactory.create(config.subquery, {\n        ipfs: config.ipfs,\n      });\n      rawManifest = await reader.getProjectSchema();\n      rebaseArgsWithManifest(argv, rawManifest);\n      // use rebased argv generate config to override current config\n      config = NodeConfig.rebaseWithArgs(config, yargsToIConfig(argv), isTest);\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      reader = await ReaderFactory.create(argv.subquery, {\n        ipfs: argv.ipfs,\n      });\n      rawManifest = await reader.getProjectSchema();\n      rebaseArgsWithManifest(argv, rawManifest);\n      // Create new nodeConfig with rebased argv\n      config = new NodeConfig(\n        defaultSubqueryName(yargsToIConfig(argv)),\n        isTest,\n      );\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        rawManifest,\n        reader,\n        omitBy<EthereumProjectNetworkConfig>(\n          {\n            endpoint: config.networkEndpoints,\n            dictionary: config.networkDictionary,\n          },\n          isNil,\n        ),\n        config.root,\n      ).catch((err) => {\n        const pjson = require('../../package.json');\n        handleCreateSubqueryProjectError(err, pjson, rawManifest, logger);\n        process.exit(1);\n      });\n      return p;\n    };\n    return { config, project };\n  }\n  static async register(): Promise<DynamicModule> {\n    const { config, project } = await ConfigureModule.getInstance();\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"]}
+{"version":3,"file":"configure.module.js","sourceRoot":"","sources":["../../src/configure/configure.module.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;;;;;;;;AAEnC,2CAA+D;AAC/D,gDAA2D;AAC3D,oCAAwC;AACxC,uDAAoD;AAEpD,MAAM,KAAK,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAIrC,IAAM,eAAe,uBAArB,MAAM,eAAe;IAC1B,MAAM,CAAC,KAAK,CAAC,WAAW;QAItB,MAAM,EAAE,IAAI,EAAE,GAAG,oBAAY,CAAC;QAC9B,OAAO,IAAA,uBAAW,EAChB,IAAI,EACJ,iCAAe,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAe,CAAC,EAC5C,oBAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,oBAAY,CAAC,EACxC,KAAK,CACN,CAAC;IACJ,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,QAAQ;QACnB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,iBAAe,CAAC,WAAW,EAAE,CAAC;QAEpE,OAAO;YACL,MAAM,EAAE,iBAAe;YACvB,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,sBAAU;oBACnB,QAAQ,EAAE,UAAU;iBACrB;gBACD;oBACE,OAAO,EAAE,kBAAkB;oBAC3B,QAAQ,EAAE,OAAO;iBAClB;gBACD;oBACE,OAAO,EAAE,wBAAwB;oBACjC,QAAQ,EAAE,OAAO;iBAClB;gBACD;oBACE,OAAO,EAAE,MAAM;oBACf,QAAQ,EAAE,IAAI;iBACf;aACF;YACD,OAAO,EAAE;gBACP,sBAAU;gBACV,kBAAkB;gBAClB,wBAAwB;gBACxB,MAAM;aACP;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA5CY,eAAe;IAF3B,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,eAAe,CA4C3B;AA5CY,0CAAe","sourcesContent":["// Copyright 2020-2023 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { DynamicModule, Global, Module } from '@nestjs/common';\nimport { NodeConfig, registerApp } from '@subql/node-core';\nimport { yargsOptions } from '../yargs';\nimport { SubqueryProject } from './SubqueryProject';\n\nconst pjson = require('../../package.json');\n\n@Global()\n@Module({})\nexport class ConfigureModule {\n  static async getInstance(): Promise<{\n    nodeConfig: NodeConfig;\n    project: SubqueryProject;\n  }> {\n    const { argv } = yargsOptions;\n    return registerApp<SubqueryProject>(\n      argv,\n      SubqueryProject.create.bind(SubqueryProject),\n      yargsOptions.showHelp.bind(yargsOptions),\n      pjson,\n    );\n  }\n  static async register(): Promise<DynamicModule> {\n    const { nodeConfig, project } = await ConfigureModule.getInstance();\n\n    return {\n      module: ConfigureModule,\n      providers: [\n        {\n          provide: NodeConfig,\n          useValue: nodeConfig,\n        },\n        {\n          provide: 'ISubqueryProject',\n          useValue: project,\n        },\n        {\n          provide: 'IProjectUpgradeService',\n          useValue: project,\n        },\n        {\n          provide: 'Null',\n          useValue: null,\n        },\n      ],\n      exports: [\n        NodeConfig,\n        'ISubqueryProject',\n        'IProjectUpgradeService',\n        'Null',\n      ],\n    };\n  }\n}\n"]}

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

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

package/dist/ethereum/api.connection.js

@@ -16,10 +16,10 @@ class EthereumApiConnection {
             genesisHash: unsafeApi.getGenesisHash(),
         };
     }
-    static async create(endpoint, fetchBlockBatches, eventEmitter) {
-        const api = new api_ethereum_1.EthereumApi(endpoint, eventEmitter);
+    static async create(endpoint, blockConfirmations, fetchBlocksBatches, eventEmitter) {
+        const api = new api_ethereum_1.EthereumApi(endpoint, blockConfirmations, eventEmitter);
         await api.init();
-        return new EthereumApiConnection(api, fetchBlockBatches);
+        return new EthereumApiConnection(api, fetchBlocksBatches);
     }
     safeApi(height) {
         throw new Error(`Not Implemented`);
@@ -31,7 +31,7 @@ class EthereumApiConnection {
         await this.unsafeApi.disconnect();
     }
     async fetchBlocks(heights) {
-        const blocks = await this.fetchBlocksBatches(this.unsafeApi, heights);
+        const blocks = await this.fetchBlocksBatches()(this.unsafeApi, heights);
         return blocks;
     }
     static handleError(e) {

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

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