@subql/node-ethereum 1.10.1-1 → 1.10.1-3

package/dist/configure/SubqueryProject.d.ts

@@ -1,12 +1,20 @@
 import { RegisteredTypes } from '@polkadot/types/types';
 import { ReaderOptions, RunnerSpecs } from '@subql/common';
-import { EthereumProjectNetworkConfig, SubqlEthereumDataSource, FileType } from '@subql/common-ethereum';
+import { EthereumProjectNetworkConfig, SubqlEthereumDataSource, EthereumBlockFilter, FileType } from '@subql/common-ethereum';
+import Cron from 'cron-converter';
 import { GraphQLSchema } from 'graphql';
+import { EthereumApi } from '../ethereum/api.ethereum';
 export declare type SubqlProjectDs = SubqlEthereumDataSource & {
     mapping: SubqlEthereumDataSource['mapping'] & {
         entryScript: string;
     };
 };
+export declare type SubqlProjectBlockFilter = EthereumBlockFilter & {
+    cronSchedule?: {
+        schedule: Cron.Seeker;
+        next: number;
+    };
+};
 export declare type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {
     name: string;
 };
@@ -27,3 +35,4 @@ export interface SubqueryProjectNetwork {
     dictionary?: string;
     chaintypes?: FileType;
 }
+export declare function generateTimestampReferenceForBlockFilters(dataSources: SubqlProjectDs[], api: EthereumApi): Promise<SubqlProjectDs[]>;

package/dist/configure/SubqueryProject.js

@@ -1,11 +1,15 @@
 "use strict";
 // Copyright 2020-2022 OnFinality Limited authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubqueryProject = void 0;
+exports.generateTimestampReferenceForBlockFilters = exports.SubqueryProject = void 0;
 const common_1 = 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"));
 const project_1 = require("../utils/project");
 const NOT_SUPPORT = (name) => {
     throw new Error(`Manifest specVersion ${name}() is not supported`);
@@ -57,6 +61,7 @@ async function loadProjectFromManifestBase(projectManifest, reader, path, networ
         ? await (0, project_1.getChainTypes)(reader, root, projectManifest.network.chaintypes.file)
         : undefined;
     const dataSources = await (0, project_1.updateDataSourcesV0_2_0)(projectManifest.dataSources, reader, root);
+    const templates = await loadProjectTemplates(projectManifest, root, reader);
     return {
         id: reader.root ? reader.root : path,
         root,
@@ -64,7 +69,7 @@ async function loadProjectFromManifestBase(projectManifest, reader, path, networ
         dataSources,
         schema,
         chainTypes,
-        templates: [],
+        templates,
     };
 }
 const { name: packageName, version: packageVersion, } = require('../../package.json');
@@ -79,4 +84,50 @@ async function loadProjectFromManifest1_0_0(projectManifest, reader, path, netwo
     }
     return project;
 }
+async function loadProjectTemplates(projectManifest, root, reader) {
+    if (projectManifest.templates && projectManifest.templates.length !== 0) {
+        const dsTemplates = await (0, project_1.updateDataSourcesV0_2_0)(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.getBlockByHeight(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;
+}
+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-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\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  FileType,\n  ProjectManifestV1_0_0Impl,\n} from '@subql/common-ethereum';\nimport { buildSchemaFromString } from '@subql/utils';\nimport { GraphQLSchema } from 'graphql';\nimport {\n  getChainTypes,\n  getProjectRoot,\n  updateDataSourcesV0_2_0,\n} from '../utils/project';\n\nexport type SubqlProjectDs = SubqlEthereumDataSource & {\n  mapping: SubqlEthereumDataSource['mapping'] & { entryScript: string };\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  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"]}
+{"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"]}

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

@@ -1,3 +1,4 @@
+import { Block } from '@ethersproject/abstract-provider';
 import { RuntimeDataSourceV0_2_0 } from '@subql/common-ethereum';
 import { ApiWrapper, BlockWrapper, EthereumBlockWrapper, EthereumTransaction, EthereumResult, EthereumLog } from '@subql/types-ethereum';
 export declare class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {
@@ -14,6 +15,7 @@ export declare class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {
     getGenesisHash(): string;
     getSpecName(): string;
     getFinalizedBlockHeight(): Promise<number>;
+    getBlockByHeight(height: number): Promise<Block>;
     fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]>;
     freezeApi(processor: any, blockContent: BlockWrapper): void;
     private buildInterface;

package/dist/ethereum/api.ethereum.js

@@ -7,16 +7,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumApi = void 0;
 const fs_1 = __importDefault(require("fs"));
-const http_1 = __importDefault(require("http"));
-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 utils_1 = require("ethers/lib/utils");
 const block_ethereum_1 = require("./block.ethereum");
 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');
@@ -40,60 +36,29 @@ class EthereumApi {
         this.endpoint = endpoint;
         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 });
         const protocolStr = protocol.replace(':', '');
-        const portNum = port
-            ? parseInt(port, 10)
-            : protocolStr === 'https'
-                ? undefined
-                : 80;
-        let provider;
         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,
                 headers: {
                     'User-Agent': `Subquery-Node ${packageVersion}`,
                 },
-                clientConfig: {
-                    keepAlive: true,
-                },
             };
             if (searchParams.apiKey) {
-                options.headers.apiKey = searchParams.get('apiKey');
+                connection.headers.apiKey = searchParams.get('apiKey');
             }
-            provider = new Web3WsProvider(endpoint, options);
+            this.client = new providers_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.genesisBlock = await this.client.getBlock(0);
+        this.chainId = (await this.client.getNetwork()).chainId;
     }
     async getLastHeight() {
         return this.client.getBlockNumber();
@@ -114,6 +79,9 @@ class EthereumApi {
         // Doesn't seem to be a difference between finalized and latest
         return this.client.getBlockNumber();
     }
+    async getBlockByHeight(height) {
+        return this.client.getBlock(height);
+    }
     async fetchBlocks(bufferBlocks) {
         return Promise.all(bufferBlocks.map(async (num) => {
             try {
@@ -129,7 +97,7 @@ class EthereumApi {
                 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]);
+                    const receipt = await this.client.getTransactionReceipt(tx.hash);
                     transaction.receipt = (0, utils_ethereum_1.formatReceipt)(receipt, block);
                     return transaction;
                 }));

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

@@ -1 +1 @@
-{"version":3,"file":"api.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/api.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport fs from 'fs';\nimport http from 'http';\nimport https from 'https';\nimport { Interface } from '@ethersproject/abi';\nimport { Web3Provider } from '@ethersproject/providers';\nimport { RuntimeDataSourceV0_2_0 } from '@subql/common-ethereum';\nimport { getLogger } from '@subql/node-core';\nimport {\n  ApiWrapper,\n  BlockWrapper,\n  EthereumBlockWrapper,\n  EthereumTransaction,\n  EthereumResult,\n  EthereumLog,\n} from '@subql/types-ethereum';\nimport { hexDataSlice, hexValue } from 'ethers/lib/utils';\nimport { EthereumBlockWrapped } from './block.ethereum';\nimport {\n  formatBlock,\n  formatReceipt,\n  formatTransaction,\n} from './utils.ethereum';\nconst Web3HttpProvider = require('web3-providers-http');\nconst Web3WsProvider = require('web3-providers-ws');\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst { version: packageVersion } = require('../../package.json');\n\nconst logger = getLogger('api.ethereum');\n\nasync function loadAssets(\n  ds: RuntimeDataSourceV0_2_0,\n): Promise<Record<string, string>> {\n  if (!ds.assets) {\n    return {};\n  }\n  const res: Record<string, string> = {};\n\n  for (const [name, { file }] of Object.entries(ds.assets)) {\n    try {\n      res[name] = await fs.promises.readFile(file, { encoding: 'utf8' });\n    } catch (e) {\n      throw new Error(`Failed to load datasource asset ${file}`);\n    }\n  }\n\n  return res;\n}\n\nexport class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {\n  private client: Web3Provider;\n  private genesisBlock: Record<string, any>;\n  private contractInterfaces: Record<string, Interface> = {};\n  private chainId: number;\n\n  constructor(private endpoint: string) {\n    const { hostname, pathname, port, protocol, searchParams } = new URL(\n      endpoint,\n    );\n    const httpAgent = new http.Agent({ keepAlive: true, maxSockets: 10 });\n    const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 10 });\n\n    const protocolStr = protocol.replace(':', '');\n    const portNum = port\n      ? parseInt(port, 10)\n      : protocolStr === 'https'\n      ? undefined\n      : 80;\n\n    let provider;\n    if (protocolStr === 'https' || protocolStr === 'http') {\n      const options = {\n        keepAlive: true,\n        headers: [\n          {\n            name: 'User-Agent',\n            value: `Subquery-Node ${packageVersion}`,\n          },\n        ],\n        agent: {\n          http: httpAgent,\n          https: httpsAgent,\n        },\n      };\n      if ((searchParams as any).apiKey) {\n        (options.headers as any).apiKey = searchParams.get('apiKey');\n      }\n      provider = new Web3HttpProvider(this.endpoint, options);\n    } else if (protocolStr === 'ws' || protocolStr === 'wss') {\n      const options = {\n        headers: {\n          'User-Agent': `Subquery-Node ${packageVersion}`,\n        },\n        clientConfig: {\n          keepAlive: true,\n        },\n      };\n      if ((searchParams as any).apiKey) {\n        (options.headers as any).apiKey = searchParams.get('apiKey');\n      }\n\n      provider = new Web3WsProvider(endpoint, options);\n    } else {\n      throw new Error(`Unsupported protocol: ${protocol}`);\n    }\n\n    this.client = new Web3Provider(provider);\n  }\n\n  async init(): Promise<void> {\n    this.genesisBlock = await this.client.send('eth_getBlockByNumber', [\n      hexValue(0),\n      true,\n    ]);\n    logger.info(this.endpoint);\n\n    this.chainId = await this.client.send('net_version', []);\n  }\n\n  async getLastHeight(): Promise<number> {\n    return this.client.getBlockNumber();\n  }\n\n  getRuntimeChain(): string {\n    return 'ethereum';\n  }\n\n  getChainId(): number {\n    return this.chainId;\n  }\n\n  getGenesisHash(): string {\n    return this.genesisBlock.hash;\n  }\n\n  getSpecName(): string {\n    return 'ethereum';\n  }\n\n  async getFinalizedBlockHeight(): Promise<number> {\n    // Doesn't seem to be a difference between finalized and latest\n    return this.client.getBlockNumber();\n  }\n\n  async fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]> {\n    return Promise.all(\n      bufferBlocks.map(async (num) => {\n        try {\n          // Fetch Block\n          const block_promise = await this.client.send('eth_getBlockByNumber', [\n            hexValue(num),\n            true,\n          ]);\n\n          const block = formatBlock(block_promise);\n          //const block = this.client.formatter.blockWithTransactions(rawBlock);\n          block.stateRoot = this.client.formatter.hash(block.stateRoot);\n          // Get transaction receipts\n          const transactions = await Promise.all(\n            block.transactions.map(async (tx) => {\n              //logger.info(JSON.stringify(tx))\n              const transaction = formatTransaction(tx);\n              const receipt = await this.client.send(\n                'eth_getTransactionReceipt',\n                [tx.hash],\n              );\n\n              transaction.receipt = formatReceipt(receipt, block);\n              return transaction;\n            }),\n          );\n          return new EthereumBlockWrapped(block, transactions);\n        } catch (e) {\n          // Wrap error from an axios error to fix issue with error being undefined\n          const error = new Error(e.message);\n          logger.error(error, `Failed to fetch block at height ${num}`);\n          throw error;\n        }\n      }),\n    );\n  }\n\n  freezeApi(processor: any, blockContent: BlockWrapper): void {\n    processor.freeze(this.client, 'api');\n  }\n\n  private buildInterface(\n    abiName: string,\n    assets: Record<string, string>,\n  ): Interface | undefined {\n    if (!assets[abiName]) {\n      throw new Error(`ABI named \"${abiName}\" not referenced in assets`);\n    }\n\n    // This assumes that all datasources have a different abi name or they are the same abi\n    if (!this.contractInterfaces[abiName]) {\n      // Constructing the interface validates the ABI\n      try {\n        let abiObj = JSON.parse(assets[abiName]);\n\n        /*\n         * Allows parsing JSON artifacts as well as ABIs\n         * https://trufflesuite.github.io/artifact-updates/background.html#what-are-artifacts\n         */\n        if (!Array.isArray(abiObj) && abiObj.abi) {\n          abiObj = abiObj.abi;\n        }\n\n        this.contractInterfaces[abiName] = new Interface(abiObj);\n      } catch (e) {\n        logger.error(`Unable to parse ABI: ${e.message}`);\n        throw new Error('ABI is invalid');\n      }\n    }\n\n    return this.contractInterfaces[abiName];\n  }\n\n  async parseLog<T extends EthereumResult = EthereumResult>(\n    log: EthereumLog,\n    ds: RuntimeDataSourceV0_2_0,\n  ): Promise<EthereumLog<T> | EthereumLog> {\n    try {\n      if (!ds?.options?.abi) {\n        logger.warn('No ABI provided for datasource');\n        return log;\n      }\n      const iface = this.buildInterface(ds.options.abi, await loadAssets(ds));\n      return {\n        ...log,\n        args: iface?.parseLog(log).args as T,\n      };\n    } catch (e) {\n      logger.warn(`Failed to parse log data: ${e.message}`);\n      return log;\n    }\n  }\n\n  async parseTransaction<T extends EthereumResult = EthereumResult>(\n    transaction: EthereumTransaction,\n    ds: RuntimeDataSourceV0_2_0,\n  ): Promise<EthereumTransaction<T> | EthereumTransaction> {\n    try {\n      if (!ds?.options?.abi) {\n        logger.warn('No ABI provided for datasource');\n        return transaction;\n      }\n      const assets = await loadAssets(ds);\n      const iface = this.buildInterface(ds.options.abi, assets);\n      const func = iface.getFunction(hexDataSlice(transaction.input, 0, 4));\n      const args = iface.decodeFunctionData(func, transaction.input) as T;\n      return {\n        ...transaction,\n        args,\n      };\n    } catch (e) {\n      logger.warn(`Failed to parse transaction data: ${e.message}`);\n      return transaction;\n    }\n  }\n}\n"]}
+{"version":3,"file":"api.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/api.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport fs from 'fs';\nimport http from 'http';\nimport https from 'https';\nimport { Interface } from '@ethersproject/abi';\nimport { Block } from '@ethersproject/abstract-provider';\nimport { JsonRpcProvider, WebSocketProvider } from '@ethersproject/providers';\nimport { RuntimeDataSourceV0_2_0 } from '@subql/common-ethereum';\nimport { getLogger } from '@subql/node-core';\nimport {\n  ApiWrapper,\n  BlockWrapper,\n  EthereumBlockWrapper,\n  EthereumTransaction,\n  EthereumResult,\n  EthereumLog,\n} from '@subql/types-ethereum';\nimport { ConnectionInfo, hexDataSlice, hexValue } from 'ethers/lib/utils';\nimport { EthereumBlockWrapped } from './block.ethereum';\nimport {\n  formatBlock,\n  formatReceipt,\n  formatTransaction,\n} from './utils.ethereum';\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst { version: packageVersion } = require('../../package.json');\n\nconst logger = getLogger('api.ethereum');\n\nasync function loadAssets(\n  ds: RuntimeDataSourceV0_2_0,\n): Promise<Record<string, string>> {\n  if (!ds.assets) {\n    return {};\n  }\n  const res: Record<string, string> = {};\n\n  for (const [name, { file }] of Object.entries(ds.assets)) {\n    try {\n      res[name] = await fs.promises.readFile(file, { encoding: 'utf8' });\n    } catch (e) {\n      throw new Error(`Failed to load datasource asset ${file}`);\n    }\n  }\n\n  return res;\n}\n\nexport class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {\n  private client: JsonRpcProvider;\n  private genesisBlock: Record<string, any>;\n  private contractInterfaces: Record<string, Interface> = {};\n  private chainId: number;\n\n  constructor(private endpoint: string) {\n    const { hostname, pathname, port, protocol, searchParams } = new URL(\n      endpoint,\n    );\n\n    const protocolStr = protocol.replace(':', '');\n\n    if (protocolStr === 'https' || protocolStr === 'http') {\n      const connection: ConnectionInfo = {\n        url: this.endpoint,\n        headers: {\n          'User-Agent': `Subquery-Node ${packageVersion}`,\n        },\n      };\n      if ((searchParams as any).apiKey) {\n        (connection.headers as any).apiKey = searchParams.get('apiKey');\n      }\n      this.client = new JsonRpcProvider(connection);\n    } else if (protocolStr === 'ws' || protocolStr === 'wss') {\n      this.client = new WebSocketProvider(this.endpoint);\n    } else {\n      throw new Error(`Unsupported protocol: ${protocol}`);\n    }\n  }\n\n  async init(): Promise<void> {\n    this.genesisBlock = await this.client.getBlock(0);\n\n    this.chainId = (await this.client.getNetwork()).chainId;\n  }\n\n  async getLastHeight(): Promise<number> {\n    return this.client.getBlockNumber();\n  }\n\n  getRuntimeChain(): string {\n    return 'ethereum';\n  }\n\n  getChainId(): number {\n    return this.chainId;\n  }\n\n  getGenesisHash(): string {\n    return this.genesisBlock.hash;\n  }\n\n  getSpecName(): string {\n    return 'ethereum';\n  }\n\n  async getFinalizedBlockHeight(): Promise<number> {\n    // Doesn't seem to be a difference between finalized and latest\n    return this.client.getBlockNumber();\n  }\n\n  async getBlockByHeight(height: number): Promise<Block> {\n    return this.client.getBlock(height);\n  }\n\n  async fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]> {\n    return Promise.all(\n      bufferBlocks.map(async (num) => {\n        try {\n          // Fetch Block\n          const block_promise = await this.client.send('eth_getBlockByNumber', [\n            hexValue(num),\n            true,\n          ]);\n\n          const block = formatBlock(block_promise);\n\n          //const block = this.client.formatter.blockWithTransactions(rawBlock);\n          block.stateRoot = this.client.formatter.hash(block.stateRoot);\n          // Get transaction receipts\n          const transactions = await Promise.all(\n            block.transactions.map(async (tx) => {\n              //logger.info(JSON.stringify(tx))\n              const transaction = formatTransaction(tx);\n              const receipt = await this.client.getTransactionReceipt(tx.hash);\n\n              transaction.receipt = formatReceipt(receipt, block);\n              return transaction;\n            }),\n          );\n          return new EthereumBlockWrapped(block, transactions);\n        } catch (e) {\n          // Wrap error from an axios error to fix issue with error being undefined\n          const error = new Error(e.message);\n          logger.error(error, `Failed to fetch block at height ${num}`);\n          throw error;\n        }\n      }),\n    );\n  }\n\n  freezeApi(processor: any, blockContent: BlockWrapper): void {\n    processor.freeze(this.client, 'api');\n  }\n\n  private buildInterface(\n    abiName: string,\n    assets: Record<string, string>,\n  ): Interface | undefined {\n    if (!assets[abiName]) {\n      throw new Error(`ABI named \"${abiName}\" not referenced in assets`);\n    }\n\n    // This assumes that all datasources have a different abi name or they are the same abi\n    if (!this.contractInterfaces[abiName]) {\n      // Constructing the interface validates the ABI\n      try {\n        let abiObj = JSON.parse(assets[abiName]);\n\n        /*\n         * Allows parsing JSON artifacts as well as ABIs\n         * https://trufflesuite.github.io/artifact-updates/background.html#what-are-artifacts\n         */\n        if (!Array.isArray(abiObj) && abiObj.abi) {\n          abiObj = abiObj.abi;\n        }\n\n        this.contractInterfaces[abiName] = new Interface(abiObj);\n      } catch (e) {\n        logger.error(`Unable to parse ABI: ${e.message}`);\n        throw new Error('ABI is invalid');\n      }\n    }\n\n    return this.contractInterfaces[abiName];\n  }\n\n  async parseLog<T extends EthereumResult = EthereumResult>(\n    log: EthereumLog,\n    ds: RuntimeDataSourceV0_2_0,\n  ): Promise<EthereumLog<T> | EthereumLog> {\n    try {\n      if (!ds?.options?.abi) {\n        logger.warn('No ABI provided for datasource');\n        return log;\n      }\n      const iface = this.buildInterface(ds.options.abi, await loadAssets(ds));\n      return {\n        ...log,\n        args: iface?.parseLog(log).args as T,\n      };\n    } catch (e) {\n      logger.warn(`Failed to parse log data: ${e.message}`);\n      return log;\n    }\n  }\n\n  async parseTransaction<T extends EthereumResult = EthereumResult>(\n    transaction: EthereumTransaction,\n    ds: RuntimeDataSourceV0_2_0,\n  ): Promise<EthereumTransaction<T> | EthereumTransaction> {\n    try {\n      if (!ds?.options?.abi) {\n        logger.warn('No ABI provided for datasource');\n        return transaction;\n      }\n      const assets = await loadAssets(ds);\n      const iface = this.buildInterface(ds.options.abi, assets);\n      const func = iface.getFunction(hexDataSlice(transaction.input, 0, 4));\n      const args = iface.decodeFunctionData(func, transaction.input) as T;\n      return {\n        ...transaction,\n        args,\n      };\n    } catch (e) {\n      logger.warn(`Failed to parse transaction data: ${e.message}`);\n      return transaction;\n    }\n  }\n}\n"]}

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

@@ -11,11 +11,13 @@ export declare class DynamicDsService {
     private readonly dsProcessorService;
     private readonly project;
     private metaDataRepo;
+    private tempDsRecords;
     constructor(dsProcessorService: DsProcessorService, project: SubqueryProject);
     init(metaDataRepo: MetadataRepo): void;
     private _datasources;
     createDynamicDatasource(params: DatasourceParams, tx: Transaction): Promise<SubqlProjectDs>;
     getDynamicDatasources(): Promise<SubqlProjectDs[]>;
+    deleteTempDsRecords(blockHeight: number): void;
     private getDynamicDatasourceParams;
     private saveDynamicDatasourceParams;
     private getDatasource;

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

@@ -19,10 +19,12 @@ const assert_1 = __importDefault(require("assert"));
 const common_1 = require("@nestjs/common");
 const common_ethereum_1 = require("@subql/common-ethereum");
 const node_core_1 = require("@subql/node-core");
+const lodash_1 = require("lodash");
 const SubqueryProject_1 = require("../configure/SubqueryProject");
 const ds_processor_service_1 = require("./ds-processor.service");
 const logger = (0, node_core_1.getLogger)('dynamic-ds');
 const METADATA_KEY = 'dynamicDatasources';
+const TEMP_DS_PREFIX = 'ds_';
 let DynamicDsService = class DynamicDsService {
     constructor(dsProcessorService, project) {
         this.dsProcessorService = dsProcessorService;
@@ -59,22 +61,39 @@ let DynamicDsService = class DynamicDsService {
         }
         return this._datasources;
     }
-    async getDynamicDatasourceParams() {
+    deleteTempDsRecords(blockHeight) {
+        delete this.tempDsRecords[TEMP_DS_PREFIX + blockHeight];
+    }
+    async getDynamicDatasourceParams(blockHeight) {
+        var _a;
         (0, assert_1.default)(this.metaDataRepo, `Model _metadata does not exist`);
         const record = await this.metaDataRepo.findByPk(METADATA_KEY);
-        const results = record === null || record === void 0 ? void 0 : record.value;
+        let results = record === null || record === void 0 ? void 0 : record.value;
         if (!results || typeof results !== 'string') {
-            return [];
+            if (blockHeight !== undefined) {
+                results = (_a = this.tempDsRecords) === null || _a === void 0 ? void 0 : _a[TEMP_DS_PREFIX + blockHeight];
+                if (!results || typeof results !== 'string') {
+                    return [];
+                }
+            }
+            else {
+                return [];
+            }
         }
         return JSON.parse(results);
     }
     async saveDynamicDatasourceParams(dsParams, tx) {
-        const existing = await this.getDynamicDatasourceParams();
+        const existing = await this.getDynamicDatasourceParams(dsParams.startBlock);
         (0, assert_1.default)(this.metaDataRepo, `Model _metadata does not exist`);
-        await this.metaDataRepo.upsert({ key: METADATA_KEY, value: JSON.stringify([...existing, dsParams]) }, { transaction: tx });
+        const dsRecords = JSON.stringify([...existing, dsParams]);
+        await this.metaDataRepo
+            .upsert({ key: METADATA_KEY, value: dsRecords }, { transaction: tx })
+            .then(() => {
+            this.tempDsRecords = Object.assign(Object.assign({}, this.tempDsRecords), { [TEMP_DS_PREFIX + dsParams.startBlock]: dsRecords });
+        });
     }
     async getDatasource(params) {
-        const template = this.project.templates.find((t) => t.name === params.templateName);
+        const template = (0, lodash_1.cloneDeep)(this.project.templates.find((t) => t.name === params.templateName));
         if (!template) {
             throw new Error(`Unable to find matching template in project for name: "${params.templateName}"`);
         }

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

@@ -1 +1 @@
-{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":"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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 { Injectable } from '@nestjs/common';\nimport { isCustomDs, isRuntimeDs } from '@subql/common-ethereum';\nimport { getLogger, MetadataRepo } from '@subql/node-core';\nimport { Transaction } from 'sequelize/types';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\nconst logger = getLogger('dynamic-ds');\n\nconst METADATA_KEY = 'dynamicDatasources';\n\ninterface DatasourceParams {\n  templateName: string;\n  args?: Record<string, unknown>;\n  startBlock: number;\n}\n\n@Injectable()\nexport class DynamicDsService {\n  private metaDataRepo: MetadataRepo;\n\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    private readonly project: SubqueryProject,\n  ) {}\n\n  init(metaDataRepo: MetadataRepo): void {\n    this.metaDataRepo = metaDataRepo;\n  }\n\n  private _datasources: SubqlProjectDs[];\n\n  async createDynamicDatasource(\n    params: DatasourceParams,\n    tx: Transaction,\n  ): Promise<SubqlProjectDs> {\n    try {\n      const ds = await this.getDatasource(params);\n\n      await this.saveDynamicDatasourceParams(params, tx);\n\n      logger.info(\n        `Created new dynamic datasource from template: \"${params.templateName}\"`,\n      );\n\n      if (!this._datasources) this._datasources = [];\n      this._datasources.push(ds);\n\n      return ds;\n    } catch (e) {\n      logger.error(e.message);\n      process.exit(1);\n    }\n  }\n\n  async getDynamicDatasources(): Promise<SubqlProjectDs[]> {\n    if (!this._datasources) {\n      try {\n        const params = await this.getDynamicDatasourceParams();\n\n        this._datasources = await Promise.all(\n          params.map((params) => this.getDatasource(params)),\n        );\n      } catch (e) {\n        logger.error(`Unable to get dynamic datasources:\\n${e.message}`);\n        process.exit(1);\n      }\n    }\n\n    return this._datasources;\n  }\n\n  private async getDynamicDatasourceParams(): Promise<DatasourceParams[]> {\n    assert(this.metaDataRepo, `Model _metadata does not exist`);\n    const record = await this.metaDataRepo.findByPk(METADATA_KEY);\n    const results = record?.value;\n\n    if (!results || typeof results !== 'string') {\n      return [];\n    }\n\n    return JSON.parse(results);\n  }\n\n  private async saveDynamicDatasourceParams(\n    dsParams: DatasourceParams,\n    tx: Transaction,\n  ): Promise<void> {\n    const existing = await this.getDynamicDatasourceParams();\n\n    assert(this.metaDataRepo, `Model _metadata does not exist`);\n    await this.metaDataRepo.upsert(\n      { key: METADATA_KEY, value: JSON.stringify([...existing, dsParams]) },\n      { transaction: tx },\n    );\n  }\n\n  private async getDatasource(\n    params: DatasourceParams,\n  ): Promise<SubqlProjectDs> {\n    const template = this.project.templates.find(\n      (t) => t.name === params.templateName,\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    logger.info(\n      `Initialised dynamic datasource from template: \"${params.templateName}\"`,\n    );\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as SubqlProjectDs;\n    delete dsObj.name;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        // XXX add any modifications to the ds here\n      }\n\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}
+{"version":3,"file":"dynamic-ds.service.js","sourceRoot":"","sources":["../../src/indexer/dynamic-ds.service.ts"],"names":[],"mappings":"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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 { Injectable } from '@nestjs/common';\nimport { isCustomDs, isRuntimeDs } from '@subql/common-ethereum';\nimport { getLogger, MetadataRepo } from '@subql/node-core';\nimport { cloneDeep } from 'lodash';\nimport { Transaction } from 'sequelize/types';\nimport { SubqlProjectDs, SubqueryProject } from '../configure/SubqueryProject';\nimport { DsProcessorService } from './ds-processor.service';\n\nconst logger = getLogger('dynamic-ds');\n\nconst METADATA_KEY = 'dynamicDatasources';\nconst TEMP_DS_PREFIX = 'ds_';\n\ninterface DatasourceParams {\n  templateName: string;\n  args?: Record<string, unknown>;\n  startBlock: number;\n}\n\n@Injectable()\nexport class DynamicDsService {\n  private metaDataRepo: MetadataRepo;\n  private tempDsRecords: Record<string, string>;\n\n  constructor(\n    private readonly dsProcessorService: DsProcessorService,\n    private readonly project: SubqueryProject,\n  ) {}\n\n  init(metaDataRepo: MetadataRepo): void {\n    this.metaDataRepo = metaDataRepo;\n  }\n\n  private _datasources: SubqlProjectDs[];\n\n  async createDynamicDatasource(\n    params: DatasourceParams,\n    tx: Transaction,\n  ): Promise<SubqlProjectDs> {\n    try {\n      const ds = await this.getDatasource(params);\n\n      await this.saveDynamicDatasourceParams(params, tx);\n\n      logger.info(\n        `Created new dynamic datasource from template: \"${params.templateName}\"`,\n      );\n\n      if (!this._datasources) this._datasources = [];\n      this._datasources.push(ds);\n\n      return ds;\n    } catch (e) {\n      logger.error(e.message);\n      process.exit(1);\n    }\n  }\n\n  async getDynamicDatasources(): Promise<SubqlProjectDs[]> {\n    if (!this._datasources) {\n      try {\n        const params = await this.getDynamicDatasourceParams();\n\n        this._datasources = await Promise.all(\n          params.map((params) => this.getDatasource(params)),\n        );\n      } catch (e) {\n        logger.error(`Unable to get dynamic datasources:\\n${e.message}`);\n        process.exit(1);\n      }\n    }\n\n    return this._datasources;\n  }\n\n  deleteTempDsRecords(blockHeight: number) {\n    delete this.tempDsRecords[TEMP_DS_PREFIX + blockHeight];\n  }\n\n  private async getDynamicDatasourceParams(\n    blockHeight?: number,\n  ): Promise<DatasourceParams[]> {\n    assert(this.metaDataRepo, `Model _metadata does not exist`);\n    const record = await this.metaDataRepo.findByPk(METADATA_KEY);\n    let results = record?.value;\n\n    if (!results || typeof results !== 'string') {\n      if (blockHeight !== undefined) {\n        results = this.tempDsRecords?.[TEMP_DS_PREFIX + blockHeight];\n        if (!results || typeof results !== 'string') {\n          return [];\n        }\n      } else {\n        return [];\n      }\n    }\n\n    return JSON.parse(results);\n  }\n\n  private async saveDynamicDatasourceParams(\n    dsParams: DatasourceParams,\n    tx: Transaction,\n  ): Promise<void> {\n    const existing = await this.getDynamicDatasourceParams(dsParams.startBlock);\n\n    assert(this.metaDataRepo, `Model _metadata does not exist`);\n    const dsRecords = JSON.stringify([...existing, dsParams]);\n    await this.metaDataRepo\n      .upsert({ key: METADATA_KEY, value: dsRecords }, { transaction: tx })\n      .then(() => {\n        this.tempDsRecords = {\n          ...this.tempDsRecords,\n          ...{ [TEMP_DS_PREFIX + dsParams.startBlock]: dsRecords },\n        };\n      });\n  }\n\n  private async getDatasource(\n    params: DatasourceParams,\n  ): Promise<SubqlProjectDs> {\n    const template = cloneDeep(\n      this.project.templates.find((t) => t.name === params.templateName),\n    );\n\n    if (!template) {\n      throw new Error(\n        `Unable to find matching template in project for name: \"${params.templateName}\"`,\n      );\n    }\n\n    logger.info(\n      `Initialised dynamic datasource from template: \"${params.templateName}\"`,\n    );\n\n    const dsObj = {\n      ...template,\n      startBlock: params.startBlock,\n    } as SubqlProjectDs;\n    delete dsObj.name;\n    try {\n      if (isCustomDs(dsObj)) {\n        dsObj.processor.options = {\n          ...dsObj.processor.options,\n          ...params.args,\n        };\n        await this.dsProcessorService.validateCustomDs([dsObj]);\n      } else if (isRuntimeDs(dsObj)) {\n        // XXX add any modifications to the ds here\n      }\n\n      return dsObj;\n    } catch (e) {\n      throw new Error(`Unable to create dynamic datasource.\\n ${e.message}`);\n    }\n  }\n}\n"]}

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

@@ -36,6 +36,7 @@ export declare class FetchService implements OnApplicationShutdown {
     startLoop(initBlockHeight: number): Promise<void>;
     getModulos(): number[];
     getModuloBlocks(startHeight: number, endHeight: number): number[];
+    getEnqueuedModuloBlocks(startBlockHeight: number): number[];
     fillNextBlockBuffer(initBlockHeight: number): Promise<void>;
     private nextEndBlockHeight;
     private dictionaryValidation;

package/dist/indexer/fetch.service.js

@@ -243,9 +243,14 @@ let FetchService = class FetchService {
         }
         return moduloBlocks;
     }
+    getEnqueuedModuloBlocks(startBlockHeight) {
+        return this.getModuloBlocks(startBlockHeight, this.nodeConfig.batchSize * Math.max(...this.getModulos()) +
+            startBlockHeight).slice(0, this.nodeConfig.batchSize);
+    }
     async fillNextBlockBuffer(initBlockHeight) {
         let startBlockHeight;
         let scaledBatchSize;
+        const handlers = [].concat(...this.project.dataSources.map((ds) => ds.mapping.handlers));
         const getStartBlockHeight = () => {
             return this.blockDispatcher.latestBufferedHeight
                 ? this.blockDispatcher.latestBufferedHeight + 1
@@ -292,9 +297,13 @@ let FetchService = class FetchService {
                     this.eventEmitter.emit(node_core_1.IndexerEvent.SkipDictionary);
                 }
             }
-            // the original method: fill next batch size of blocks
             const endHeight = this.nextEndBlockHeight(startBlockHeight, scaledBatchSize);
-            this.blockDispatcher.enqueueBlocks((0, lodash_1.range)(startBlockHeight, endHeight + 1));
+            if (this.getModulos().length === handlers.length) {
+                this.blockDispatcher.enqueueBlocks(this.getEnqueuedModuloBlocks(startBlockHeight));
+            }
+            else {
+                this.blockDispatcher.enqueueBlocks((0, lodash_1.range)(startBlockHeight, endHeight + 1));
+            }
         }
     }
     nextEndBlockHeight(startBlockHeight, scaledBatchSize) {
@@ -323,6 +332,7 @@ let FetchService = class FetchService {
     }
     async resetForNewDs(blockHeight) {
         await this.syncDynamicDatascourcesFromMeta();
+        this.dynamicDsService.deleteTempDsRecords(blockHeight);
         this.updateDictionary();
         this.blockDispatcher.flushQueue(blockHeight);
     }