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

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();
@@ -132,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 { Block } from '@ethersproject/abstract-provider';\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 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          //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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subql/node-ethereum",
-  "version": "1.10.1-2",
+  "version": "1.10.1-3",
   "description": "",
   "author": "Ian He",
   "license": "Apache-2.0",
@@ -74,5 +74,5 @@
     "/dist",
     "/bin"
   ],
-  "stableVersion": "1.10.1-1"
+  "stableVersion": "1.10.1-2"
 }