@subql/node-ethereum 0.4.1-1 → 0.4.1-10

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

@@ -1,13 +1,14 @@
 import { Block, TransactionReceipt } from '@ethersproject/abstract-provider';
 import { RuntimeDataSourceV0_2_0 } from '@subql/common-ethereum';
 import { ApiWrapper, BlockWrapper, EthereumBlockWrapper, EthereumTransaction, EthereumResult, EthereumLog } from '@subql/types-ethereum';
+import { EthereumBlockWrapped } from './block.ethereum';
 export declare class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {
     private endpoint;
     private client;
     private genesisBlock;
     private contractInterfaces;
     private chainId;
-    private endpointSupportsGetBlockReceipts;
+    private supportsFinalization;
     constructor(endpoint: string);
     init(): Promise<void>;
     getFinalizedBlockHeight(): Promise<number>;
@@ -17,9 +18,9 @@ export declare class EthereumApi implements ApiWrapper<EthereumBlockWrapper> {
     getGenesisHash(): string;
     getSpecName(): string;
     getBlockByHeightOrHash(heightOrHash: number | string): Promise<Block>;
-    getBlockPromise(num: number): Promise<any>;
+    private getBlockPromise;
     getTransactionReceipt(transactionHash: string | Promise<string>): Promise<TransactionReceipt>;
-    fetchBlock(num: number): Promise<EthereumBlockWrapper>;
+    fetchBlock(blockNumber: number, includeTx?: boolean): Promise<EthereumBlockWrapped>;
     fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]>;
     freezeApi(processor: any, blockContent: BlockWrapper): void;
     private buildInterface;

package/dist/ethereum/api.ethereum.js

@@ -6,15 +6,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumApi = void 0;
-const assert_1 = __importDefault(require("assert"));
 const fs_1 = __importDefault(require("fs"));
 const abi_1 = require("@ethersproject/abi");
-const bignumber_1 = require("@ethersproject/bignumber");
 const providers_1 = require("@ethersproject/providers");
 const node_core_1 = require("@subql/node-core");
 const utils_1 = require("ethers/lib/utils");
 const project_1 = require("../utils/project");
 const block_ethereum_1 = require("./block.ethereum");
+const safe_api_1 = __importDefault(require("./safe-api"));
 const utils_ethereum_1 = require("./utils.ethereum");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version: packageVersion } = require('../../package.json');
@@ -38,7 +37,8 @@ class EthereumApi {
     constructor(endpoint) {
         this.endpoint = endpoint;
         this.contractInterfaces = {};
-        this.endpointSupportsGetBlockReceipts = true;
+        // Ethereum POS
+        this.supportsFinalization = true;
         const { hostname, pathname, port, protocol, searchParams } = new URL(endpoint);
         const protocolStr = protocol.replace(':', '');
         logger.info(this.endpoint.split('?')[0]);
@@ -66,10 +66,24 @@ class EthereumApi {
         this.chainId = (await this.client.getNetwork()).chainId;
     }
     async getFinalizedBlockHeight() {
-        return (await this.client.getBlock('finalized')).number;
+        try {
+            if (this.supportsFinalization) {
+                return (await this.client.getBlock('finalised')).number;
+            }
+            else {
+                // TODO make number of blocks finalised configurable
+                return (await this.getBestBlockHeight()) - 15; // Consider 15 blocks finalized
+            }
+        }
+        catch (e) {
+            // TODO handle specific error for this
+            this.supportsFinalization = false;
+            return this.getFinalizedBlockHeight();
+        }
     }
     async getBestBlockHeight() {
-        return (await this.client.getBlock('safe')).number;
+        const tag = this.supportsFinalization ? 'safe' : 'latest';
+        return (await this.client.getBlock(tag)).number;
     }
     getRuntimeChain() {
         return 'ethereum';
@@ -84,68 +98,50 @@ class EthereumApi {
         return 'ethereum';
     }
     async getBlockByHeightOrHash(heightOrHash) {
+        if (typeof heightOrHash === 'number') {
+            heightOrHash = (0, utils_1.hexValue)(heightOrHash);
+        }
         return this.client.getBlock(heightOrHash);
     }
-    async getBlockPromise(num) {
-        return (0, project_1.retryOnFailEth)(() => this.client.send('eth_getBlockByNumber', [(0, utils_1.hexValue)(num), true]));
+    async getBlockPromise(num, includeTx = true) {
+        const rawBlock = await (0, project_1.retryOnFailEth)(() => this.client.send('eth_getBlockByNumber', [(0, utils_1.hexValue)(num), includeTx]));
+        const block = (0, utils_ethereum_1.formatBlock)(rawBlock);
+        block.stateRoot = this.client.formatter.hash(block.stateRoot);
+        return block;
     }
     async getTransactionReceipt(transactionHash) {
         return (0, project_1.retryOnFailEth)(this.client.getTransactionReceipt.bind(this.client, transactionHash));
     }
-    async fetchBlock(num) {
-        var _a;
-        const block_promise = await this.getBlockPromise(num);
-        const block = (0, utils_ethereum_1.formatBlock)(block_promise);
-        block.stateRoot = this.client.formatter.hash(block.stateRoot);
-        if (this.endpointSupportsGetBlockReceipts) {
-            try {
-                const rawReceipts = await this.client.send('eth_getBlockReceipts', [(0, utils_1.hexValue)(block.number)]);
-                const receipts = rawReceipts.map((receipt) => (0, utils_ethereum_1.formatReceipt)(receipt, block));
-                const txs = block.transactions.map((tx) => {
-                    const transaction = (0, utils_ethereum_1.formatTransaction)(tx);
-                    transaction.receipt =
-                        receipts[bignumber_1.BigNumber.from(transaction.transactionIndex).toNumber()];
-                    (0, assert_1.default)(transaction.hash === transaction.receipt.transactionHash, 'Failed to match receipt to transaction');
-                    return transaction;
-                });
-                return new block_ethereum_1.EthereumBlockWrapped(block, txs);
-            }
-            catch (e) {
-                // Method not avaialble https://eips.ethereum.org/EIPS/eip-1474
-                if (((_a = e === null || e === void 0 ? void 0 : e.error) === null || _a === void 0 ? void 0 : _a.code) === -32601) {
-                    logger.warn(`The endpoint doesn't support 'eth_getBlockReceipts', individual receipts will be fetched instead, this will greatly impact performance.`);
-                    this.endpointSupportsGetBlockReceipts = false;
-                    // Should continue and use old method here
-                }
-                else {
-                    throw e;
-                }
-            }
-        }
-        const transactions = await Promise.all(block.transactions.map(async (tx) => {
-            const transaction = (0, utils_ethereum_1.formatTransaction)(tx);
-            const receipt = await this.getTransactionReceipt(tx.hash);
-            transaction.receipt = (0, utils_ethereum_1.formatReceipt)(receipt, block);
-            return transaction;
-        }));
-        return new block_ethereum_1.EthereumBlockWrapped(block, transactions);
+    async fetchBlock(blockNumber, includeTx) {
+        const [block, logs] = await Promise.all([
+            this.getBlockPromise(blockNumber, includeTx),
+            this.client.getLogs({
+                fromBlock: (0, utils_1.hexValue)(blockNumber),
+                toBlock: (0, utils_1.hexValue)(blockNumber),
+            }),
+        ]);
+        return new block_ethereum_1.EthereumBlockWrapped(block, includeTx
+            ? block.transactions.map((tx) => (Object.assign(Object.assign({}, (0, utils_ethereum_1.formatTransaction)(tx)), { 
+                // TODO memoise
+                receipt: () => this.getTransactionReceipt(tx).then((r) => (0, utils_ethereum_1.formatReceipt)(r, block)) })))
+            : [], logs.map((l) => (0, utils_ethereum_1.formatLog)(l, block)));
     }
     async fetchBlocks(bufferBlocks) {
         return Promise.all(bufferBlocks.map(async (num) => {
             try {
                 // Fetch Block
-                return await this.fetchBlock(num);
+                return await this.fetchBlock(num, true);
             }
             catch (e) {
                 // Wrap error from an axios error to fix issue with error being undefined
                 const error = new Error(e.message);
-                logger.error(error, `Failed to fetch block at height ${num}`);
+                logger.error(e, `Failed to fetch block at height ${num}`);
                 throw error;
             }
         }));
     }
     freezeApi(processor, blockContent) {
-        processor.freeze(this.client, 'api');
+        processor.freeze(new safe_api_1.default(this.client, blockContent.blockHeight), 'api');
     }
     buildInterface(abiName, assets) {
         if (!assets[abiName]) {

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 assert from 'assert';\nimport fs from 'fs';\nimport http from 'http';\nimport https from 'https';\nimport { Interface } from '@ethersproject/abi';\nimport { Block, TransactionReceipt } from '@ethersproject/abstract-provider';\nimport { BigNumber } from '@ethersproject/bignumber';\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 { retryOnFailEth } from '../utils/project';\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  private endpointSupportsGetBlockReceipts = true;\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    logger.info(this.endpoint.split('?')[0]);\n    if (protocolStr === 'https' || protocolStr === 'http') {\n      const connection: ConnectionInfo = {\n        url: this.endpoint.split('?')[0],\n        headers: {\n          'User-Agent': `Subquery-Node ${packageVersion}`,\n        },\n      };\n      searchParams.forEach((value, name, searchParams) => {\n        (connection.headers as any)[name] = value;\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 getFinalizedBlockHeight(): Promise<number> {\n    return (await this.client.getBlock('finalized')).number;\n  }\n\n  async getBestBlockHeight(): Promise<number> {\n    return (await this.client.getBlock('safe')).number;\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 getBlockByHeightOrHash(heightOrHash: number | string): Promise<Block> {\n    return this.client.getBlock(heightOrHash);\n  }\n\n  async getBlockPromise(num: number): Promise<any> {\n    return retryOnFailEth(() =>\n      this.client.send('eth_getBlockByNumber', [hexValue(num), true]),\n    );\n  }\n\n  async getTransactionReceipt(\n    transactionHash: string | Promise<string>,\n  ): Promise<TransactionReceipt> {\n    return retryOnFailEth<TransactionReceipt>(\n      this.client.getTransactionReceipt.bind(this.client, transactionHash),\n    );\n  }\n  async fetchBlock(num: number): Promise<EthereumBlockWrapper> {\n    const block_promise = await this.getBlockPromise(num);\n\n    const block = formatBlock(block_promise);\n    block.stateRoot = this.client.formatter.hash(block.stateRoot);\n\n    if (this.endpointSupportsGetBlockReceipts) {\n      try {\n        const rawReceipts: any[] = await this.client.send(\n          'eth_getBlockReceipts',\n          [hexValue(block.number)],\n        );\n\n        const receipts = rawReceipts.map((receipt) =>\n          formatReceipt(receipt, block),\n        );\n\n        const txs = block.transactions.map((tx) => {\n          const transaction = formatTransaction(tx);\n          transaction.receipt =\n            receipts[BigNumber.from(transaction.transactionIndex).toNumber()];\n\n          assert(\n            transaction.hash === transaction.receipt.transactionHash,\n            'Failed to match receipt to transaction',\n          );\n\n          return transaction;\n        });\n\n        return new EthereumBlockWrapped(block, txs);\n      } catch (e) {\n        // Method not avaialble https://eips.ethereum.org/EIPS/eip-1474\n        if (e?.error?.code === -32601) {\n          logger.warn(\n            `The endpoint doesn't support 'eth_getBlockReceipts', individual receipts will be fetched instead, this will greatly impact performance.`,\n          );\n          this.endpointSupportsGetBlockReceipts = false;\n\n          // Should continue and use old method here\n        } else {\n          throw e;\n        }\n      }\n    }\n\n    const transactions = await Promise.all(\n      block.transactions.map(async (tx) => {\n        const transaction = formatTransaction(tx);\n        const receipt = await this.getTransactionReceipt(tx.hash);\n        transaction.receipt = formatReceipt(receipt, block);\n        return transaction;\n      }),\n    );\n    return new EthereumBlockWrapped(block, transactions);\n  }\n\n  async fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]> {\n    return Promise.all(\n      bufferBlocks.map(async (num) => {\n        try {\n          // Fetch Block\n          return await this.fetchBlock(num);\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 { Interface } from '@ethersproject/abi';\nimport { Block, TransactionReceipt } 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 { retryOnFailEth } from '../utils/project';\nimport { EthereumBlockWrapped } from './block.ethereum';\nimport SafeEthProvider from './safe-api';\nimport {\n  formatBlock,\n  formatLog,\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  // Ethereum POS\n  private supportsFinalization = true;\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    logger.info(this.endpoint.split('?')[0]);\n    if (protocolStr === 'https' || protocolStr === 'http') {\n      const connection: ConnectionInfo = {\n        url: this.endpoint.split('?')[0],\n        headers: {\n          'User-Agent': `Subquery-Node ${packageVersion}`,\n        },\n      };\n      searchParams.forEach((value, name, searchParams) => {\n        (connection.headers as any)[name] = value;\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 getFinalizedBlockHeight(): Promise<number> {\n    try {\n      if (this.supportsFinalization) {\n        return (await this.client.getBlock('finalised')).number;\n      } else {\n        // TODO make number of blocks finalised configurable\n        return (await this.getBestBlockHeight()) - 15; // Consider 15 blocks finalized\n      }\n    } catch (e) {\n      // TODO handle specific error for this\n      this.supportsFinalization = false;\n      return this.getFinalizedBlockHeight();\n    }\n  }\n\n  async getBestBlockHeight(): Promise<number> {\n    const tag = this.supportsFinalization ? 'safe' : 'latest';\n    return (await this.client.getBlock(tag)).number;\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 getBlockByHeightOrHash(heightOrHash: number | string): Promise<Block> {\n    if (typeof heightOrHash === 'number') {\n      heightOrHash = hexValue(heightOrHash);\n    }\n    return this.client.getBlock(heightOrHash);\n  }\n\n  private async getBlockPromise(num: number, includeTx = true): Promise<any> {\n    const rawBlock = await retryOnFailEth(() =>\n      this.client.send('eth_getBlockByNumber', [hexValue(num), includeTx]),\n    );\n\n    const block = formatBlock(rawBlock);\n\n    block.stateRoot = this.client.formatter.hash(block.stateRoot);\n\n    return block;\n  }\n\n  async getTransactionReceipt(\n    transactionHash: string | Promise<string>,\n  ): Promise<TransactionReceipt> {\n    return retryOnFailEth<TransactionReceipt>(\n      this.client.getTransactionReceipt.bind(this.client, transactionHash),\n    );\n  }\n\n  async fetchBlock(\n    blockNumber: number,\n    includeTx?: boolean,\n  ): Promise<EthereumBlockWrapped> {\n    const [block, logs] = await Promise.all([\n      this.getBlockPromise(blockNumber, includeTx),\n      this.client.getLogs({\n        fromBlock: hexValue(blockNumber),\n        toBlock: hexValue(blockNumber),\n      }),\n    ]);\n\n    return new EthereumBlockWrapped(\n      block,\n      includeTx\n        ? block.transactions.map((tx) => ({\n            ...formatTransaction(tx),\n            // TODO memoise\n            receipt: () =>\n              this.getTransactionReceipt(tx).then((r) =>\n                formatReceipt(r, block),\n              ),\n          }))\n        : [],\n      logs.map((l) => formatLog(l, block)),\n    );\n  }\n\n  async fetchBlocks(bufferBlocks: number[]): Promise<EthereumBlockWrapper[]> {\n    return Promise.all(\n      bufferBlocks.map(async (num) => {\n        try {\n          // Fetch Block\n          return await this.fetchBlock(num, true);\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(e, `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(\n      new SafeEthProvider(this.client, blockContent.blockHeight),\n      'api',\n    );\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/ethereum/block.ethereum.d.ts

@@ -3,7 +3,7 @@ export declare class EthereumBlockWrapped implements EthereumBlockWrapper {
     private _block;
     private _txs;
     private _logs;
-    constructor(_block: EthereumBlock, _txs: EthereumTransaction[]);
+    constructor(_block: EthereumBlock, _txs: EthereumTransaction[], _logs: EthereumLog[]);
     get block(): EthereumBlock;
     get blockHeight(): number;
     get hash(): string;

package/dist/ethereum/block.ethereum.js

@@ -3,23 +3,20 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EthereumBlockWrapped = void 0;
-const lodash_1 = require("lodash");
 const string_1 = require("../utils/string");
-const utils_ethereum_1 = require("./utils.ethereum");
 class EthereumBlockWrapped {
-    constructor(_block, _txs) {
+    constructor(_block, _txs, _logs) {
         this._block = _block;
         this._txs = _txs;
-        this._logs = (0, lodash_1.flatten)(_txs.map((tx) => tx.receipt.logs)).map((log) => (0, utils_ethereum_1.formatLog)(log, _block));
-        this._logs.map((log) => {
-            log.block = this.block;
-            return log;
-        });
+        this._logs = _logs;
         this._block.transactions = this._txs;
-        this._block.logs = this._logs.map((log) => {
-            const logCopy = Object.assign({}, log);
-            logCopy.block = undefined;
-            return logCopy;
+        this._block.logs = this._logs;
+        // Set logs on tx
+        this._logs.forEach((l) => {
+            const tx = this._txs.find((tx) => tx.hash === l.transactionHash);
+            if (!tx)
+                return;
+            tx.logs = tx.logs ? [...tx.logs, l] : [l];
         });
     }
     get block() {

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

@@ -1 +1 @@
-{"version":3,"file":"block.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/block.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport {\n  EthereumBlock,\n  EthereumTransactionFilter,\n  EthereumLog,\n  EthereumLogFilter,\n  EthereumResult,\n  EthereumBlockFilter,\n  EthereumBlockWrapper,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\nimport { flatten } from 'lodash';\nimport {\n  eventToTopic,\n  functionToSighash,\n  hexStringEq,\n  stringNormalizedEq,\n} from '../utils/string';\nimport { formatLog } from './utils.ethereum';\n\nexport class EthereumBlockWrapped implements EthereumBlockWrapper {\n  private _logs: EthereumLog[];\n  constructor(\n    private _block: EthereumBlock,\n    private _txs: EthereumTransaction[],\n  ) {\n    this._logs = flatten(_txs.map((tx) => tx.receipt.logs)).map((log) =>\n      formatLog(log, _block),\n    ) as EthereumLog[];\n    this._logs.map((log) => {\n      log.block = this.block;\n      return log;\n    });\n    this._block.transactions = this._txs;\n    this._block.logs = this._logs.map((log) => {\n      const logCopy = { ...log };\n      logCopy.block = undefined;\n      return logCopy;\n    });\n  }\n\n  get block(): EthereumBlock {\n    return this._block;\n  }\n\n  get blockHeight(): number {\n    return this.block.number;\n  }\n\n  get hash(): string {\n    return this.block.hash;\n  }\n\n  get transactions(): EthereumTransaction[] {\n    return this._txs;\n  }\n\n  get logs(): EthereumLog[] {\n    return this._logs;\n  }\n\n  static filterBlocksProcessor(\n    block: EthereumBlock,\n    filter: EthereumBlockFilter,\n    address?: string,\n  ): boolean {\n    if (filter?.modulo && block.number % filter.modulo !== 0) {\n      return false;\n    }\n    return true;\n  }\n\n  static filterTransactionsProcessor(\n    transaction: EthereumTransaction,\n    filter: EthereumTransactionFilter,\n    address?: string,\n  ): boolean {\n    if (!filter) return true;\n    if (filter.to && !stringNormalizedEq(filter.to, transaction.to)) {\n      return false;\n    }\n    if (filter.from && !stringNormalizedEq(filter.from, transaction.from)) {\n      return false;\n    }\n    if (address && !filter.to && !stringNormalizedEq(address, transaction.to)) {\n      return false;\n    }\n    if (\n      filter.function &&\n      transaction.input.indexOf(functionToSighash(filter.function)) !== 0\n    ) {\n      return false;\n    }\n    return true;\n  }\n\n  static filterLogsProcessor(\n    log: EthereumLog,\n    filter: EthereumLogFilter,\n    address?: string,\n  ): boolean {\n    if (address && !stringNormalizedEq(address, log.address)) {\n      return false;\n    }\n\n    if (!filter) return true;\n\n    if (filter.topics) {\n      for (let i = 0; i < Math.min(filter.topics.length, 4); i++) {\n        const topic = filter.topics[i];\n        if (!topic) {\n          continue;\n        }\n\n        if (!log.topics[i]) {\n          return false;\n        }\n        if (!hexStringEq(eventToTopic(topic), log.topics[i])) {\n          return false;\n        }\n      }\n    }\n    return true;\n  }\n}\n"]}
+{"version":3,"file":"block.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/block.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport {\n  EthereumBlock,\n  EthereumTransactionFilter,\n  EthereumLog,\n  EthereumLogFilter,\n  EthereumBlockFilter,\n  EthereumBlockWrapper,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\nimport {\n  eventToTopic,\n  functionToSighash,\n  hexStringEq,\n  stringNormalizedEq,\n} from '../utils/string';\n\nexport class EthereumBlockWrapped implements EthereumBlockWrapper {\n  constructor(\n    private _block: EthereumBlock,\n    private _txs: EthereumTransaction[],\n    private _logs: EthereumLog[],\n  ) {\n    this._block.transactions = this._txs;\n    this._block.logs = this._logs;\n\n    // Set logs on tx\n    this._logs.forEach((l) => {\n      const tx = this._txs.find((tx) => tx.hash === l.transactionHash);\n\n      if (!tx) return;\n      tx.logs = tx.logs ? [...tx.logs, l] : [l];\n    });\n  }\n\n  get block(): EthereumBlock {\n    return this._block;\n  }\n\n  get blockHeight(): number {\n    return this.block.number;\n  }\n\n  get hash(): string {\n    return this.block.hash;\n  }\n\n  get transactions(): EthereumTransaction[] {\n    return this._txs;\n  }\n\n  get logs(): EthereumLog[] {\n    return this._logs;\n  }\n\n  static filterBlocksProcessor(\n    block: EthereumBlock,\n    filter: EthereumBlockFilter,\n    address?: string,\n  ): boolean {\n    if (filter?.modulo && block.number % filter.modulo !== 0) {\n      return false;\n    }\n    return true;\n  }\n\n  static filterTransactionsProcessor(\n    transaction: EthereumTransaction,\n    filter: EthereumTransactionFilter,\n    address?: string,\n  ): boolean {\n    if (!filter) return true;\n    if (filter.to && !stringNormalizedEq(filter.to, transaction.to)) {\n      return false;\n    }\n    if (filter.from && !stringNormalizedEq(filter.from, transaction.from)) {\n      return false;\n    }\n    if (address && !filter.to && !stringNormalizedEq(address, transaction.to)) {\n      return false;\n    }\n    if (\n      filter.function &&\n      transaction.input.indexOf(functionToSighash(filter.function)) !== 0\n    ) {\n      return false;\n    }\n    return true;\n  }\n\n  static filterLogsProcessor(\n    log: EthereumLog,\n    filter: EthereumLogFilter,\n    address?: string,\n  ): boolean {\n    if (address && !stringNormalizedEq(address, log.address)) {\n      return false;\n    }\n\n    if (!filter) return true;\n\n    if (filter.topics) {\n      for (let i = 0; i < Math.min(filter.topics.length, 4); i++) {\n        const topic = filter.topics[i];\n        if (!topic) {\n          continue;\n        }\n\n        if (!log.topics[i]) {\n          return false;\n        }\n        if (!hexStringEq(eventToTopic(topic), log.topics[i])) {\n          return false;\n        }\n      }\n    }\n    return true;\n  }\n}\n"]}

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

@@ -0,0 +1,34 @@
+import { Block, BlockTag, BlockWithTransactions, EventType, Filter, Listener, Log, TransactionReceipt, TransactionRequest, TransactionResponse, Provider } from '@ethersproject/abstract-provider';
+import { BigNumber, BigNumberish } from '@ethersproject/bignumber';
+import type { Network } from '@ethersproject/networks';
+import type { Deferrable } from '@ethersproject/properties';
+export default class SafeEthProvider extends Provider {
+    private baseApi;
+    private blockHeight;
+    constructor(baseApi: Provider, blockHeight: BlockTag | Promise<BlockTag>);
+    getBalance(addressOrName: string | Promise<string>, blockTag?: BlockTag | Promise<BlockTag>): Promise<BigNumber>;
+    getTransactionCount(addressOrName: string | Promise<string>, blockTag?: BlockTag | Promise<BlockTag>): Promise<number>;
+    getCode(addressOrName: string | Promise<string>, blockTag?: BlockTag | Promise<BlockTag>): Promise<string>;
+    getStorageAt(addressOrName: string | Promise<string>, position: BigNumberish | Promise<BigNumberish>, blockTag?: BlockTag | Promise<BlockTag>): Promise<string>;
+    call(transaction: Deferrable<TransactionRequest>, blockTag?: BlockTag | Promise<BlockTag>): Promise<string>;
+    getBlockWithTransactions(blockHashOrBlockTag: BlockTag | Promise<BlockTag>): Promise<BlockWithTransactions>;
+    getBlock(blockHashOrBlockTag: BlockTag | Promise<BlockTag>): Promise<Block>;
+    getTransaction(transactionHash: string): Promise<TransactionResponse>;
+    getTransactionReceipt(transactionHash: string): Promise<TransactionReceipt>;
+    getLogs(filter: Filter): Promise<Log[]>;
+    getBlockNumber(): Promise<number>;
+    getNetwork(): Promise<Network>;
+    getGasPrice(): Promise<BigNumber>;
+    estimateGas(transaction: Deferrable<TransactionRequest>): Promise<BigNumber>;
+    sendTransaction(signedTransaction: string | Promise<string>): Promise<TransactionResponse>;
+    resolveName(name: string | Promise<string>): Promise<string | null>;
+    lookupAddress(address: string | Promise<string>): Promise<string | null>;
+    on(eventName: EventType, listener: Listener): Provider;
+    once(eventName: EventType, listener: Listener): Provider;
+    emit(eventName: EventType, ...args: any[]): boolean;
+    listenerCount(eventName?: EventType): number;
+    listeners(eventName?: EventType): Listener[];
+    off(eventName: EventType, listener?: Listener): Provider;
+    removeAllListeners(eventName?: EventType): Provider;
+    waitForTransaction(transactionHash: string, confirmations?: number, timeout?: number): Promise<TransactionReceipt>;
+}

package/dist/ethereum/safe-api.js

@@ -0,0 +1,114 @@
+"use strict";
+// Copyright 2020-2022 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+const abstract_provider_1 = require("@ethersproject/abstract-provider");
+const node_core_1 = require("@subql/node-core");
+const logger = (0, node_core_1.getLogger)('safe.api.ethereum');
+class SafeEthProvider extends abstract_provider_1.Provider {
+    constructor(baseApi, blockHeight) {
+        super();
+        this.baseApi = baseApi;
+        this.blockHeight = blockHeight;
+    }
+    async getBalance(addressOrName, blockTag) {
+        if (blockTag)
+            logger.warn(`Provided parameter 'blockTag' will not be used`);
+        return this.baseApi.getBalance(addressOrName, this.blockHeight);
+    }
+    async getTransactionCount(addressOrName, blockTag) {
+        if (blockTag)
+            logger.warn(`Provided parameter 'blockTag' will not be used`);
+        return this.baseApi.getTransactionCount(addressOrName, this.blockHeight);
+    }
+    async getCode(addressOrName, blockTag) {
+        if (blockTag)
+            logger.warn(`Provided parameter 'blockTag' will not be used`);
+        return this.baseApi.getCode(addressOrName, this.blockHeight);
+    }
+    async getStorageAt(addressOrName, position, blockTag) {
+        if (blockTag)
+            logger.warn(`Provided parameter 'blockTag' will not be used`);
+        return this.baseApi.getStorageAt(addressOrName, position, this.blockHeight);
+    }
+    async call(transaction, blockTag) {
+        if (blockTag)
+            logger.warn(`Provided parameter 'blockTag' will not be used`);
+        return this.baseApi.call(transaction, this.blockHeight);
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getBlockWithTransactions(blockHashOrBlockTag) {
+        throw new Error('Method `getBlockWithTransactions` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getBlock(blockHashOrBlockTag) {
+        throw new Error('Method `getBlock` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getTransaction(transactionHash) {
+        throw new Error('Method `getTransaction` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getTransactionReceipt(transactionHash) {
+        throw new Error('Method `getTransactionReceipt` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getLogs(filter) {
+        throw new Error('Method `getLogs` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getBlockNumber() {
+        throw new Error('Method `getBlockNumber` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getNetwork() {
+        throw new Error('Method `getNetwork` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    getGasPrice() {
+        throw new Error('Method `getGasPrice` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    estimateGas(transaction) {
+        throw new Error('Method `estimateGas` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    sendTransaction(signedTransaction) {
+        throw new Error('Method `sendTransaction` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    resolveName(name) {
+        throw new Error('Method `resolveName` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    lookupAddress(address) {
+        throw new Error('Method `lookupAddress` not supported.');
+    }
+    on(eventName, listener) {
+        throw new Error('Method `on` not supported.');
+    }
+    once(eventName, listener) {
+        throw new Error('Method `once` not supported.');
+    }
+    emit(eventName, ...args) {
+        throw new Error('Method `emit` not supported.');
+    }
+    listenerCount(eventName) {
+        throw new Error('Method `listenerCount` not supported.');
+    }
+    listeners(eventName) {
+        throw new Error('Method `listeners` not supported.');
+    }
+    off(eventName, listener) {
+        throw new Error('Method `off` not supported.');
+    }
+    removeAllListeners(eventName) {
+        throw new Error('Method `removeAllListeners` not supported.');
+    }
+    // eslint-disable-next-line @typescript-eslint/promise-function-async
+    waitForTransaction(transactionHash, confirmations, timeout) {
+        throw new Error('Method `waitForTransaction` not supported.');
+    }
+}
+exports.default = SafeEthProvider;
+//# sourceMappingURL=safe-api.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"safe-api.js","sourceRoot":"","sources":["../../src/ethereum/safe-api.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2022 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport {\n  Block,\n  BlockTag,\n  BlockWithTransactions,\n  EventType,\n  Filter,\n  Listener,\n  Log,\n  TransactionReceipt,\n  TransactionRequest,\n  TransactionResponse,\n  Provider,\n} from '@ethersproject/abstract-provider';\nimport { BigNumber, BigNumberish } from '@ethersproject/bignumber';\nimport type { Network } from '@ethersproject/networks';\nimport type { Deferrable } from '@ethersproject/properties';\nimport { getLogger } from '@subql/node-core';\n\nconst logger = getLogger('safe.api.ethereum');\n\nexport default class SafeEthProvider extends Provider {\n  constructor(\n    private baseApi: Provider,\n    private blockHeight: BlockTag | Promise<BlockTag>,\n  ) {\n    super();\n  }\n\n  async getBalance(\n    addressOrName: string | Promise<string>,\n    blockTag?: BlockTag | Promise<BlockTag>,\n  ): Promise<BigNumber> {\n    if (blockTag) logger.warn(`Provided parameter 'blockTag' will not be used`);\n    return this.baseApi.getBalance(addressOrName, this.blockHeight);\n  }\n\n  async getTransactionCount(\n    addressOrName: string | Promise<string>,\n    blockTag?: BlockTag | Promise<BlockTag>,\n  ): Promise<number> {\n    if (blockTag) logger.warn(`Provided parameter 'blockTag' will not be used`);\n    return this.baseApi.getTransactionCount(addressOrName, this.blockHeight);\n  }\n\n  async getCode(\n    addressOrName: string | Promise<string>,\n    blockTag?: BlockTag | Promise<BlockTag>,\n  ): Promise<string> {\n    if (blockTag) logger.warn(`Provided parameter 'blockTag' will not be used`);\n    return this.baseApi.getCode(addressOrName, this.blockHeight);\n  }\n\n  async getStorageAt(\n    addressOrName: string | Promise<string>,\n    position: BigNumberish | Promise<BigNumberish>,\n    blockTag?: BlockTag | Promise<BlockTag>,\n  ): Promise<string> {\n    if (blockTag) logger.warn(`Provided parameter 'blockTag' will not be used`);\n    return this.baseApi.getStorageAt(addressOrName, position, this.blockHeight);\n  }\n\n  async call(\n    transaction: Deferrable<TransactionRequest>,\n    blockTag?: BlockTag | Promise<BlockTag>,\n  ): Promise<string> {\n    if (blockTag) logger.warn(`Provided parameter 'blockTag' will not be used`);\n\n    return this.baseApi.call(transaction, this.blockHeight);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getBlockWithTransactions(\n    blockHashOrBlockTag: BlockTag | Promise<BlockTag>,\n  ): Promise<BlockWithTransactions> {\n    throw new Error('Method `getBlockWithTransactions` not supported.');\n  }\n\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getBlock(blockHashOrBlockTag: BlockTag | Promise<BlockTag>): Promise<Block> {\n    throw new Error('Method `getBlock` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getTransaction(transactionHash: string): Promise<TransactionResponse> {\n    throw new Error('Method `getTransaction` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getTransactionReceipt(transactionHash: string): Promise<TransactionReceipt> {\n    throw new Error('Method `getTransactionReceipt` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getLogs(filter: Filter): Promise<Log[]> {\n    throw new Error('Method `getLogs` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getBlockNumber(): Promise<number> {\n    throw new Error('Method `getBlockNumber` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getNetwork(): Promise<Network> {\n    throw new Error('Method `getNetwork` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  getGasPrice(): Promise<BigNumber> {\n    throw new Error('Method `getGasPrice` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  estimateGas(transaction: Deferrable<TransactionRequest>): Promise<BigNumber> {\n    throw new Error('Method `estimateGas` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  sendTransaction(\n    signedTransaction: string | Promise<string>,\n  ): Promise<TransactionResponse> {\n    throw new Error('Method `sendTransaction` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  resolveName(name: string | Promise<string>): Promise<string | null> {\n    throw new Error('Method `resolveName` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  lookupAddress(address: string | Promise<string>): Promise<string | null> {\n    throw new Error('Method `lookupAddress` not supported.');\n  }\n  on(eventName: EventType, listener: Listener): Provider {\n    throw new Error('Method `on` not supported.');\n  }\n  once(eventName: EventType, listener: Listener): Provider {\n    throw new Error('Method `once` not supported.');\n  }\n  emit(eventName: EventType, ...args: any[]): boolean {\n    throw new Error('Method `emit` not supported.');\n  }\n  listenerCount(eventName?: EventType): number {\n    throw new Error('Method `listenerCount` not supported.');\n  }\n  listeners(eventName?: EventType): Listener[] {\n    throw new Error('Method `listeners` not supported.');\n  }\n  off(eventName: EventType, listener?: Listener): Provider {\n    throw new Error('Method `off` not supported.');\n  }\n  removeAllListeners(eventName?: EventType): Provider {\n    throw new Error('Method `removeAllListeners` not supported.');\n  }\n  // eslint-disable-next-line @typescript-eslint/promise-function-async\n  waitForTransaction(\n    transactionHash: string,\n    confirmations?: number,\n    timeout?: number,\n  ): Promise<TransactionReceipt> {\n    throw new Error('Method `waitForTransaction` not supported.');\n  }\n}\n"]}

package/dist/ethereum/utils.ethereum.d.ts

@@ -1,6 +1,6 @@
 import { ApiWrapper, EthereumBlock, EthereumLog, EthereumReceipt, EthereumResult, EthereumTransaction } from '@subql/types-ethereum';
 export declare function calcInterval(api: ApiWrapper): number;
 export declare function formatBlock(block: Record<string, any>): EthereumBlock;
-export declare function formatLog(log: EthereumLog<EthereumResult> | EthereumLog, block: EthereumBlock): EthereumLog<EthereumResult> | EthereumLog;
+export declare function formatLog(log: Omit<EthereumLog<EthereumResult> | EthereumLog, 'blockTimestamp' | 'block' | 'transaction'>, block: EthereumBlock): EthereumLog<EthereumResult> | EthereumLog;
 export declare function formatTransaction(tx: Record<string, any>): EthereumTransaction;
 export declare function formatReceipt(receipt: Record<string, any>, block: EthereumBlock): EthereumReceipt;

package/dist/ethereum/utils.ethereum.js

@@ -6,6 +6,7 @@ exports.formatReceipt = exports.formatTransaction = exports.formatLog = exports.
 const address_1 = require("@ethersproject/address");
 const bignumber_1 = require("@ethersproject/bignumber");
 const constants_1 = require("@ethersproject/constants");
+const lodash_1 = require("lodash");
 function calcInterval(api) {
     // TODO find a way to get this from the blockchain
     return 6000;
@@ -35,7 +36,14 @@ function formatBlock(block) {
 }
 exports.formatBlock = formatBlock;
 function formatLog(log, block) {
-    return Object.assign(Object.assign({}, log), { address: handleAddress(log.address), blockNumber: handleNumber(log.blockNumber).toNumber(), transactionIndex: handleNumber(log.transactionIndex).toNumber(), logIndex: handleNumber(log.logIndex).toNumber(), block });
+    return Object.assign(Object.assign({}, log), { address: handleAddress(log.address), blockNumber: handleNumber(log.blockNumber).toNumber(), transactionIndex: handleNumber(log.transactionIndex).toNumber(), logIndex: handleNumber(log.logIndex).toNumber(), block,
+        get transaction() {
+            var _a;
+            return (_a = block.transactions) === null || _a === void 0 ? void 0 : _a.find((tx) => tx.hash === log.transactionHash);
+        },
+        toJson() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['transaction', 'block']));
+        } });
 }
 exports.formatLog = formatLog;
 function formatTransaction(tx) {
@@ -43,11 +51,14 @@ function formatTransaction(tx) {
             ? handleNumber(tx.maxFeePerGas).toBigInt()
             : undefined, maxPriorityFeePerGas: tx.maxPriorityFeePerGas
             ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()
-            : undefined, receipt: undefined });
+            : undefined, receipt: undefined, // Filled in at AvalancheApi.fetchBlocks
+        toJson() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['logs']));
+        } });
 }
 exports.formatTransaction = formatTransaction;
 function formatReceipt(receipt, block) {
-    return Object.assign(Object.assign({}, receipt), { from: handleAddress(receipt.from), to: handleAddress(receipt.to), blockNumber: handleNumber(receipt.blockNumber).toNumber(), cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(), effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(), gasUsed: handleNumber(receipt.gasUsed).toBigInt(), logs: receipt.logs.map((log) => formatLog(log, block)), status: Boolean(handleNumber(receipt.status).toNumber()), transactionIndex: handleNumber(receipt.transactionIndex).toNumber() });
+    return Object.assign(Object.assign({}, receipt), { from: handleAddress(receipt.from), to: handleAddress(receipt.to), blockNumber: handleNumber(receipt.blockNumber).toNumber(), cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(), effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(), gasUsed: handleNumber(receipt.gasUsed).toBigInt(), logs: receipt.logs.map(formatLog), status: Boolean(handleNumber(receipt.status).toNumber()), transactionIndex: handleNumber(receipt.transactionIndex).toNumber() });
 }
 exports.formatReceipt = formatReceipt;
 //# sourceMappingURL=utils.ethereum.js.map

package/dist/ethereum/utils.ethereum.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/utils.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 { getAddress } from '@ethersproject/address';\nimport { BigNumber } from '@ethersproject/bignumber';\nimport { Zero } from '@ethersproject/constants';\nimport {\n  ApiWrapper,\n  EthereumBlock,\n  EthereumLog,\n  EthereumReceipt,\n  EthereumResult,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\n\nexport function calcInterval(api: ApiWrapper): number {\n  // TODO find a way to get this from the blockchain\n  return 6000;\n}\n\nfunction handleAddress(value: string): string | null {\n  if (!value || value === '0x') {\n    return null;\n  }\n  return getAddress(value);\n}\n\nfunction handleNumber(value: string | number): BigNumber {\n  if (value === undefined) {\n    return Zero;\n  }\n  if (value === '0x') {\n    return Zero;\n  }\n  return BigNumber.from(value);\n}\n\nexport function formatBlock(block: Record<string, any>): EthereumBlock {\n  return {\n    ...block,\n    difficulty: handleNumber(block.difficulty).toBigInt(),\n    gasLimit: handleNumber(block.gasLimit).toBigInt(),\n    gasUsed: handleNumber(block.gasUsed).toBigInt(),\n    number: handleNumber(block.number).toNumber(),\n    size: handleNumber(block.size).toBigInt(),\n    timestamp: handleNumber(block.timestamp).toBigInt(),\n    totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n    baseFeePerGas: block.baseFeePerGas\n      ? handleNumber(block.baseFeePerGas).toBigInt()\n      : undefined,\n    blockGasCost: block.blockGasCost\n      ? handleNumber(block.blockGasCost).toBigInt()\n      : undefined,\n    logs: [], // Filled in at AvalancheBlockWrapped constructor\n  } as EthereumBlock;\n}\nexport function formatLog(\n  log: EthereumLog<EthereumResult> | EthereumLog,\n  block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n  return {\n    ...log,\n    address: handleAddress(log.address),\n    blockNumber: handleNumber(log.blockNumber).toNumber(),\n    transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n    logIndex: handleNumber(log.logIndex).toNumber(),\n    block,\n  } as EthereumLog<EthereumResult>;\n}\n\nexport function formatTransaction(\n  tx: Record<string, any>,\n): EthereumTransaction {\n  return {\n    ...tx,\n    from: handleAddress(tx.from),\n    to: handleAddress(tx.to),\n    blockNumber: handleNumber(tx.blockNumber).toNumber(),\n    gas: handleNumber(tx.gas).toBigInt(),\n    gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n    nonce: handleNumber(tx.nonce).toBigInt(),\n    transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n    value: handleNumber(tx.value).toBigInt(),\n    v: handleNumber(tx.v).toBigInt(),\n    maxFeePerGas: tx.maxFeePerGas\n      ? handleNumber(tx.maxFeePerGas).toBigInt()\n      : undefined,\n    maxPriorityFeePerGas: tx.maxPriorityFeePerGas\n      ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()\n      : undefined,\n    receipt: undefined, // Filled in at AvalancheApi.fetchBlocks\n  } as EthereumTransaction;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n  block: EthereumBlock,\n): EthereumReceipt {\n  return {\n    ...receipt,\n    from: handleAddress(receipt.from),\n    to: handleAddress(receipt.to),\n    blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n    cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n    effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n    gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n    logs: receipt.logs.map((log) => formatLog(log, block)),\n    status: Boolean(handleNumber(receipt.status).toNumber()),\n    transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n  } as EthereumReceipt;\n}\n"]}
+{"version":3,"file":"utils.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/utils.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 { getAddress } from '@ethersproject/address';\nimport { BigNumber } from '@ethersproject/bignumber';\nimport { Zero } from '@ethersproject/constants';\nimport {\n  ApiWrapper,\n  EthereumBlock,\n  EthereumLog,\n  EthereumReceipt,\n  EthereumResult,\n  EthereumTransaction,\n} from '@subql/types-ethereum';\nimport { omit } from 'lodash';\n\nexport function calcInterval(api: ApiWrapper): number {\n  // TODO find a way to get this from the blockchain\n  return 6000;\n}\n\nfunction handleAddress(value: string): string | null {\n  if (!value || value === '0x') {\n    return null;\n  }\n  return getAddress(value);\n}\n\nfunction handleNumber(value: string | number): BigNumber {\n  if (value === undefined) {\n    return Zero;\n  }\n  if (value === '0x') {\n    return Zero;\n  }\n  return BigNumber.from(value);\n}\n\nexport function formatBlock(block: Record<string, any>): EthereumBlock {\n  return {\n    ...block,\n    difficulty: handleNumber(block.difficulty).toBigInt(),\n    gasLimit: handleNumber(block.gasLimit).toBigInt(),\n    gasUsed: handleNumber(block.gasUsed).toBigInt(),\n    number: handleNumber(block.number).toNumber(),\n    size: handleNumber(block.size).toBigInt(),\n    timestamp: handleNumber(block.timestamp).toBigInt(),\n    totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n    baseFeePerGas: block.baseFeePerGas\n      ? handleNumber(block.baseFeePerGas).toBigInt()\n      : undefined,\n    blockGasCost: block.blockGasCost\n      ? handleNumber(block.blockGasCost).toBigInt()\n      : undefined,\n    logs: [], // Filled in at AvalancheBlockWrapped constructor\n  } as EthereumBlock;\n}\nexport function formatLog(\n  log: Omit<\n    EthereumLog<EthereumResult> | EthereumLog,\n    'blockTimestamp' | 'block' | 'transaction'\n  >,\n  block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n  return {\n    ...log,\n    address: handleAddress(log.address),\n    blockNumber: handleNumber(log.blockNumber).toNumber(),\n    transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n    logIndex: handleNumber(log.logIndex).toNumber(),\n    block,\n    get transaction() {\n      return block.transactions?.find((tx) => tx.hash === log.transactionHash);\n    },\n\n    toJson() {\n      return JSON.stringify(omit(this, ['transaction', 'block']));\n    },\n  } as EthereumLog<EthereumResult>;\n}\n\nexport function formatTransaction(\n  tx: Record<string, any>,\n): EthereumTransaction {\n  return {\n    ...(tx as Partial<EthereumTransaction>),\n    from: handleAddress(tx.from),\n    to: handleAddress(tx.to),\n    blockNumber: handleNumber(tx.blockNumber).toNumber(),\n    gas: handleNumber(tx.gas).toBigInt(),\n    gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n    nonce: handleNumber(tx.nonce).toBigInt(),\n    transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n    value: handleNumber(tx.value).toBigInt(),\n    v: handleNumber(tx.v).toBigInt(),\n    maxFeePerGas: tx.maxFeePerGas\n      ? handleNumber(tx.maxFeePerGas).toBigInt()\n      : undefined,\n    maxPriorityFeePerGas: tx.maxPriorityFeePerGas\n      ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()\n      : undefined,\n    receipt: undefined, // Filled in at AvalancheApi.fetchBlocks\n    toJson() {\n      return JSON.stringify(omit(this, ['logs']));\n    },\n  } as EthereumTransaction;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n  block: EthereumBlock,\n): EthereumReceipt {\n  return {\n    ...receipt,\n    from: handleAddress(receipt.from),\n    to: handleAddress(receipt.to),\n    blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n    cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n    effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n    gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n    logs: receipt.logs.map(formatLog),\n    status: Boolean(handleNumber(receipt.status).toNumber()),\n    transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n  } as EthereumReceipt;\n}\n"]}

package/dist/indexer/blockDispatcher/block-dispatcher.service.js

@@ -93,8 +93,11 @@ let BlockDispatcherService = class BlockDispatcherService extends base_block_dis
                 }
                 logger.info(`fetch block [${blockNums[0]},${blockNums[blockNums.length - 1]}], total ${blockNums.length} blocks`);
                 const blocks = await this.fetchBlocksBatches(blockNums);
-                if (bufferedHeight > this._latestBufferedHeight) {
-                    logger.debug(`Queue was reset for new DS, discarding fetched blocks`);
+                // Check if the queues have been flushed between queue.takeMany and fetchBlocksBatches resolving
+                // Peeking the queue is because the latestBufferedHeight could have regrown since fetching block
+                if (bufferedHeight > this._latestBufferedHeight ||
+                    this.queue.peek() < Math.min(...blockNums)) {
+                    logger.info(`Queue was reset for new DS, discarding fetched blocks`);
                     continue;
                 }
                 const blockTasks = blocks.map((block) => async () => {