@subql/node-ethereum 1.10.1-3 → 2.0.1-0

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,13 +6,14 @@ 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;
 }
 exports.calcInterval = calcInterval;
 function handleAddress(value) {
-    if (value === '0x') {
+    if (!value || value === '0x') {
         return null;
     }
     return (0, address_1.getAddress)(value);
@@ -27,105 +28,39 @@ function handleNumber(value) {
     return bignumber_1.BigNumber.from(value);
 }
 function formatBlock(block) {
-    const newBlock = {
-        difficulty: handleNumber(block.difficulty).toBigInt(),
-        extDataGasUsed: block.extDataGasUsed,
-        extDataHash: block.extDataHash,
-        gasLimit: handleNumber(block.gasLimit).toBigInt(),
-        gasUsed: handleNumber(block.gasUsed).toBigInt(),
-        hash: block.hash,
-        logsBloom: block.logsBloom,
-        miner: block.miner,
-        mixHash: block.mixHash,
-        nonce: block.nonce,
-        number: handleNumber(block.number).toNumber(),
-        parentHash: block.parentHash,
-        receiptsRoot: block.receiptsRoot,
-        sha3Uncles: block.sha3Uncles,
-        size: handleNumber(block.size).toBigInt(),
-        stateRoot: block.stateRoot,
-        timestamp: handleNumber(block.timestamp).toBigInt(),
-        totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),
-        transactions: block.transactions,
-        transactionsRoot: block.transactionsRoot,
-        uncles: block.uncles,
-        baseFeePerGas: block.baseFeePerGas
+    return Object.assign(Object.assign({}, block), { difficulty: handleNumber(block.difficulty).toBigInt(), gasLimit: handleNumber(block.gasLimit).toBigInt(), gasUsed: handleNumber(block.gasUsed).toBigInt(), number: handleNumber(block.number).toNumber(), size: handleNumber(block.size).toBigInt(), timestamp: handleNumber(block.timestamp).toBigInt(), totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(), baseFeePerGas: block.baseFeePerGas
             ? handleNumber(block.baseFeePerGas).toBigInt()
-            : undefined,
-        blockGasCost: block.blockGasCost
+            : undefined, blockGasCost: block.blockGasCost
             ? handleNumber(block.blockGasCost).toBigInt()
-            : undefined,
-        blockExtraData: block.blockExtraData,
-        logs: [], // Filled in at AvalancheBlockWrapped constructor
-    };
-    return newBlock;
+            : undefined, logs: [] });
 }
 exports.formatBlock = formatBlock;
 function formatLog(log, block) {
-    const newLog = {
-        address: log.address,
-        topics: log.topics,
-        data: log.data,
-        blockNumber: handleNumber(log.blockNumber).toNumber(),
-        transactionHash: log.transactionHash,
-        transactionIndex: handleNumber(log.transactionIndex).toNumber(),
-        blockHash: log.blockHash,
-        logIndex: handleNumber(log.logIndex).toNumber(),
-        removed: log.removed,
-        args: log.args,
-        block,
-    };
-    return newLog;
+    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', 'toJSON']));
+        } });
 }
 exports.formatLog = formatLog;
 function formatTransaction(tx) {
-    const transaction = {
-        blockHash: tx.blockHash,
-        blockNumber: handleNumber(tx.blockNumber).toNumber(),
-        from: tx.from,
-        gas: handleNumber(tx.gas).toBigInt(),
-        gasPrice: handleNumber(tx.gasPrice).toBigInt(),
-        hash: tx.hash,
-        input: tx.input,
-        nonce: handleNumber(tx.nonce).toBigInt(),
-        to: tx.to,
-        transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),
-        value: handleNumber(tx.value).toBigInt(),
-        type: tx.type,
-        v: handleNumber(tx.v).toBigInt(),
-        r: tx.r,
-        s: tx.s,
-        accessList: tx.accessList,
-        chainId: tx.chainId,
-        maxFeePerGas: tx.maxFeePerGas
+    return Object.assign(Object.assign({}, tx), { from: handleAddress(tx.from), to: handleAddress(tx.to), blockNumber: handleNumber(tx.blockNumber).toNumber(), gas: handleNumber(tx.gas).toBigInt(), gasPrice: handleNumber(tx.gasPrice).toBigInt(), nonce: handleNumber(tx.nonce).toBigInt(), transactionIndex: handleNumber(tx.transactionIndex).toBigInt(), value: handleNumber(tx.value).toBigInt(), v: handleNumber(tx.v).toBigInt(), maxFeePerGas: tx.maxFeePerGas
             ? handleNumber(tx.maxFeePerGas).toBigInt()
-            : undefined,
-        maxPriorityFeePerGas: tx.maxPriorityFeePerGas
+            : undefined, maxPriorityFeePerGas: tx.maxPriorityFeePerGas
             ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()
-            : undefined,
-        receipt: undefined, // Filled in at AvalancheApi.fetchBlocks
-    };
-    return transaction;
+            : undefined, receipt: undefined, // Filled in at AvalancheApi.fetchBlocks
+        toJSON() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['block', 'receipt', 'toJSON']));
+        } });
 }
 exports.formatTransaction = formatTransaction;
 function formatReceipt(receipt, block) {
-    const newReceipt = {
-        blockHash: receipt.blockHash,
-        blockNumber: handleNumber(receipt.blockNumber).toNumber(),
-        contractAddress: receipt.contractAddress,
-        cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),
-        effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),
-        from: receipt.from,
-        gasUsed: handleNumber(receipt.gasUsed).toBigInt(),
-        logs: receipt.logs.map((log) => formatLog(log, block)),
-        logsBloom: receipt.logsBloom,
-        status: Boolean(handleNumber(receipt.status).toNumber()),
-        to: receipt.to,
-        transactionHash: receipt.transactionHash,
-        transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),
-        type: receipt.type,
-    };
-    return newReceipt;
+    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(), toJSON() {
+            return JSON.stringify((0, lodash_1.omit)(this, ['toJSON']));
+        } });
 }
 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 {\n  if (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  const newBlock: EthereumBlock = {\n    difficulty: handleNumber(block.difficulty).toBigInt(),\n    extDataGasUsed: block.extDataGasUsed,\n    extDataHash: block.extDataHash,\n    gasLimit: handleNumber(block.gasLimit).toBigInt(),\n    gasUsed: handleNumber(block.gasUsed).toBigInt(),\n    hash: block.hash,\n    logsBloom: block.logsBloom,\n    miner: block.miner,\n    mixHash: block.mixHash,\n    nonce: block.nonce,\n    number: handleNumber(block.number).toNumber(),\n    parentHash: block.parentHash,\n    receiptsRoot: block.receiptsRoot,\n    sha3Uncles: block.sha3Uncles,\n    size: handleNumber(block.size).toBigInt(),\n    stateRoot: block.stateRoot,\n    timestamp: handleNumber(block.timestamp).toBigInt(),\n    totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n    transactions: block.transactions,\n    transactionsRoot: block.transactionsRoot,\n    uncles: block.uncles,\n    baseFeePerGas: block.baseFeePerGas\n      ? handleNumber(block.baseFeePerGas).toBigInt()\n      : undefined,\n    blockGasCost: block.blockGasCost\n      ? handleNumber(block.blockGasCost).toBigInt()\n      : undefined,\n    blockExtraData: block.blockExtraData,\n    logs: [], // Filled in at AvalancheBlockWrapped constructor\n  };\n\n  return newBlock;\n}\nexport function formatLog(\n  log: EthereumLog<EthereumResult> | EthereumLog,\n  block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n  const newLog: EthereumLog<EthereumResult> = {\n    address: log.address,\n    topics: log.topics,\n    data: log.data,\n    blockNumber: handleNumber(log.blockNumber).toNumber(),\n    transactionHash: log.transactionHash,\n    transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n    blockHash: log.blockHash,\n    logIndex: handleNumber(log.logIndex).toNumber(),\n    removed: log.removed,\n    args: log.args,\n    block,\n  };\n  return newLog;\n}\n\nexport function formatTransaction(\n  tx: Record<string, any>,\n): EthereumTransaction {\n  const transaction: EthereumTransaction = {\n    blockHash: tx.blockHash,\n    blockNumber: handleNumber(tx.blockNumber).toNumber(),\n    from: tx.from,\n    gas: handleNumber(tx.gas).toBigInt(),\n    gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n    hash: tx.hash,\n    input: tx.input,\n    nonce: handleNumber(tx.nonce).toBigInt(),\n    to: tx.to,\n    transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n    value: handleNumber(tx.value).toBigInt(),\n    type: tx.type,\n    v: handleNumber(tx.v).toBigInt(),\n    r: tx.r,\n    s: tx.s,\n    accessList: tx.accessList,\n    chainId: tx.chainId,\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  };\n  return transaction;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n  block: EthereumBlock,\n): EthereumReceipt {\n  const newReceipt: EthereumReceipt = {\n    blockHash: receipt.blockHash,\n    blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n    contractAddress: receipt.contractAddress,\n    cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n    effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n    from: receipt.from,\n    gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n    logs: receipt.logs.map((log) => formatLog(log, block)),\n    logsBloom: receipt.logsBloom,\n    status: Boolean(handleNumber(receipt.status).toNumber()),\n    to: receipt.to,\n    transactionHash: receipt.transactionHash,\n    transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n    type: receipt.type,\n  };\n  return newReceipt;\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(): string {\n      return JSON.stringify(omit(this, ['transaction', 'block', 'toJSON']));\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(): string {\n      return JSON.stringify(omit(this, ['block', 'receipt', 'toJSON']));\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    toJSON(): string {\n      return JSON.stringify(omit(this, ['toJSON']));\n    },\n  } as unknown as EthereumReceipt;\n}\n"]}

package/dist/indexer/blockDispatcher/block-dispatcher.service.d.ts

@@ -0,0 +1,17 @@
+import { OnApplicationShutdown } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { NodeConfig, SmartBatchService, StoreCacheService, StoreService, IProjectService, PoiService, BlockDispatcher, ProcessBlockResponse } from '@subql/node-core';
+import { EthereumBlockWrapper } from '@subql/types-ethereum';
+import { SubqlProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
+import { EthereumApiService } from '../../ethereum';
+import { DynamicDsService } from '../dynamic-ds.service';
+import { IndexerManager } from '../indexer.manager';
+/**
+ * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
+ */
+export declare class BlockDispatcherService extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs> implements OnApplicationShutdown {
+    private indexerManager;
+    constructor(apiService: EthereumApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService<SubqlProjectDs>, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService);
+    protected getBlockHeight(block: EthereumBlockWrapper): number;
+    protected indexBlock(block: EthereumBlockWrapper): Promise<ProcessBlockResponse>;
+}

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

@@ -0,0 +1,55 @@
+"use strict";
+// Copyright 2020-2021 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockDispatcherService = void 0;
+const common_1 = require("@nestjs/common");
+const event_emitter_1 = require("@nestjs/event-emitter");
+const node_core_1 = require("@subql/node-core");
+const SubqueryProject_1 = require("../../configure/SubqueryProject");
+const ethereum_1 = require("../../ethereum");
+const dynamic_ds_service_1 = require("../dynamic-ds.service");
+const indexer_manager_1 = require("../indexer.manager");
+/**
+ * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
+ */
+let BlockDispatcherService = class BlockDispatcherService extends node_core_1.BlockDispatcher {
+    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService) {
+        super(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, apiService.fetchBlocks.bind(apiService));
+        this.indexerManager = indexerManager;
+    }
+    getBlockHeight(block) {
+        return block.blockHeight;
+    }
+    async indexBlock(block) {
+        return this.indexerManager.indexBlock(block, await this.projectService.getAllDataSources(this.getBlockHeight(block)));
+    }
+};
+BlockDispatcherService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(4, (0, common_1.Inject)('IProjectService')),
+    __param(9, (0, common_1.Inject)('ISubqueryProject')),
+    __metadata("design:paramtypes", [ethereum_1.EthereumApiService,
+        node_core_1.NodeConfig,
+        indexer_manager_1.IndexerManager,
+        event_emitter_1.EventEmitter2, Object, node_core_1.SmartBatchService,
+        node_core_1.StoreService,
+        node_core_1.StoreCacheService,
+        node_core_1.PoiService,
+        SubqueryProject_1.SubqueryProject,
+        dynamic_ds_service_1.DynamicDsService])
+], BlockDispatcherService);
+exports.BlockDispatcherService = BlockDispatcherService;
+//# sourceMappingURL=block-dispatcher.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/block-dispatcher.service.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;;;;;;;;;;;;;AAEtC,2CAA2E;AAC3E,yDAAsD;AACtD,gDAS0B;AAE1B,qEAGyC;AACzC,6CAAoD;AACpD,8DAAyD;AACzD,wDAAoD;AAEpD;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBACX,SAAQ,2BAAqD;IAG7D,YACE,UAA8B,EAC9B,UAAsB,EACd,cAA8B,EACtC,YAA2B,EACA,cAA+C,EAC1E,iBAAoC,EACpC,YAA0B,EAC1B,iBAAoC,EACpC,UAAsB,EACM,OAAwB,EACpD,gBAAkC;QAElC,KAAK,CACH,UAAU,EACV,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,OAAO,EACP,gBAAgB,EAChB,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CACxC,CAAC;QArBM,mBAAc,GAAd,cAAc,CAAgB;IAsBxC,CAAC;IAES,cAAc,CAAC,KAA2B;QAClD,OAAO,KAAK,CAAC,WAAW,CAAC;IAC3B,CAAC;IAES,KAAK,CAAC,UAAU,CACxB,KAA2B;QAE3B,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,KAAK,EACL,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CACxE,CAAC;IACJ,CAAC;CACF,CAAA;AA3CY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAKzB,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCATf,6BAAkB;QAClB,sBAAU;QACE,gCAAc;QACxB,6BAAa,UAER,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;GAfzB,sBAAsB,CA2ClC;AA3CY,wDAAsB","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  NodeConfig,\n  SmartBatchService,\n  StoreCacheService,\n  StoreService,\n  IProjectService,\n  PoiService,\n  BlockDispatcher,\n  ProcessBlockResponse,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { EthereumApiService } from '../../ethereum';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport { IndexerManager } from '../indexer.manager';\n\n/**\n * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing\n */\n@Injectable()\nexport class BlockDispatcherService\n  extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs>\n  implements OnApplicationShutdown\n{\n  constructor(\n    apiService: EthereumApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService') projectService: IProjectService<SubqlProjectDs>,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      apiService.fetchBlocks.bind(apiService),\n    );\n  }\n\n  protected getBlockHeight(block: EthereumBlockWrapper): number {\n    return block.blockHeight;\n  }\n\n  protected async indexBlock(\n    block: EthereumBlockWrapper,\n  ): Promise<ProcessBlockResponse> {\n    return this.indexerManager.indexBlock(\n      block,\n      await this.projectService.getAllDataSources(this.getBlockHeight(block)),\n    );\n  }\n}\n"]}

package/dist/indexer/blockDispatcher/ethereum-block-dispatcher.d.ts

@@ -0,0 +1,4 @@
+import { IBlockDispatcher } from '@subql/node-core';
+export interface IEthereumBlockDispatcher extends IBlockDispatcher {
+    init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;
+}

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

@@ -0,0 +1,5 @@
+"use strict";
+// / Copyright 2020-2021 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ethereum-block-dispatcher.js.map

package/dist/indexer/blockDispatcher/ethereum-block-dispatcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ethereum-block-dispatcher.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/ethereum-block-dispatcher.ts"],"names":[],"mappings":";AAAA,kEAAkE;AAClE,sCAAsC","sourcesContent":["// / Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { IBlockDispatcher } from '@subql/node-core';\n\nexport interface IEthereumBlockDispatcher extends IBlockDispatcher {\n  init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;\n}\n"]}

package/dist/indexer/blockDispatcher/index.d.ts

@@ -0,0 +1,4 @@
+import { BlockDispatcherService } from './block-dispatcher.service';
+import { IEthereumBlockDispatcher } from './ethereum-block-dispatcher';
+import { WorkerBlockDispatcherService } from './worker-block-dispatcher.service';
+export { BlockDispatcherService, WorkerBlockDispatcherService, IEthereumBlockDispatcher, };

package/dist/indexer/blockDispatcher/index.js

@@ -0,0 +1,10 @@
+"use strict";
+// Copyright 2020-2021 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkerBlockDispatcherService = exports.BlockDispatcherService = void 0;
+const block_dispatcher_service_1 = require("./block-dispatcher.service");
+Object.defineProperty(exports, "BlockDispatcherService", { enumerable: true, get: function () { return block_dispatcher_service_1.BlockDispatcherService; } });
+const worker_block_dispatcher_service_1 = require("./worker-block-dispatcher.service");
+Object.defineProperty(exports, "WorkerBlockDispatcherService", { enumerable: true, get: function () { return worker_block_dispatcher_service_1.WorkerBlockDispatcherService; } });
+//# sourceMappingURL=index.js.map

package/dist/indexer/blockDispatcher/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/index.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;AAEtC,yEAAoE;AAKlE,uGALO,iDAAsB,OAKP;AAHxB,uFAAiF;AAI/E,6GAJO,8DAA4B,OAIP","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { BlockDispatcherService } from './block-dispatcher.service';\nimport { IEthereumBlockDispatcher } from './ethereum-block-dispatcher';\nimport { WorkerBlockDispatcherService } from './worker-block-dispatcher.service';\n\nexport {\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n  IEthereumBlockDispatcher,\n};\n"]}

package/dist/indexer/blockDispatcher/worker-block-dispatcher.service.d.ts

@@ -0,0 +1,15 @@
+import { OnApplicationShutdown } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { NodeConfig, SmartBatchService, StoreService, PoiService, StoreCacheService, IProjectService, WorkerBlockDispatcher } from '@subql/node-core';
+import { SubqlProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
+import { DynamicDsService } from '../dynamic-ds.service';
+import { UnfinalizedBlocksService } from '../unfinalizedBlocks.service';
+import { IIndexerWorker } from '../worker/worker';
+type IndexerWorker = IIndexerWorker & {
+    terminate: () => Promise<number>;
+};
+export declare class WorkerBlockDispatcherService extends WorkerBlockDispatcher<SubqlProjectDs, IndexerWorker> implements OnApplicationShutdown {
+    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService<SubqlProjectDs>, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService);
+    protected fetchBlock(worker: IndexerWorker, height: number): Promise<void>;
+}
+export {};

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

@@ -0,0 +1,88 @@
+"use strict";
+// Copyright 2020-2021 OnFinality Limited authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkerBlockDispatcherService = void 0;
+const path_1 = __importDefault(require("path"));
+const common_1 = require("@nestjs/common");
+const event_emitter_1 = require("@nestjs/event-emitter");
+const node_core_1 = require("@subql/node-core");
+const SubqueryProject_1 = require("../../configure/SubqueryProject");
+const dynamic_ds_service_1 = require("../dynamic-ds.service");
+const unfinalizedBlocks_service_1 = require("../unfinalizedBlocks.service");
+const logger = (0, node_core_1.getLogger)('WorkerBlockDispatcherService');
+async function createIndexerWorker(store, dynamicDsService, unfinalizedBlocksService) {
+    const indexerWorker = node_core_1.Worker.create(path_1.default.resolve(__dirname, '../../../dist/indexer/worker/worker.js'), [
+        'initWorker',
+        'processBlock',
+        'fetchBlock',
+        'numFetchedBlocks',
+        'numFetchingBlocks',
+        'getStatus',
+        'getMemoryLeft',
+        'waitForWorkerBatchSize',
+    ], {
+        storeGet: store.get.bind(store),
+        storeGetByField: store.getByField.bind(store),
+        storeGetOneByField: store.getOneByField.bind(store),
+        storeSet: store.set.bind(store),
+        storeBulkCreate: store.bulkCreate.bind(store),
+        storeBulkUpdate: store.bulkUpdate.bind(store),
+        storeRemove: store.remove.bind(store),
+        dynamicDsCreateDynamicDatasource: dynamicDsService.createDynamicDatasource.bind(dynamicDsService),
+        dynamicDsGetDynamicDatasources: dynamicDsService.getDynamicDatasources.bind(dynamicDsService),
+        unfinalizedBlocksProcess: unfinalizedBlocksService.processUnfinalizedBlocks.bind(unfinalizedBlocksService),
+    });
+    await indexerWorker.initWorker();
+    return indexerWorker;
+}
+let WorkerBlockDispatcherService = class WorkerBlockDispatcherService extends node_core_1.WorkerBlockDispatcher {
+    constructor(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, unfinalizedBlocksSevice) {
+        super(nodeConfig, eventEmitter, projectService, smartBatchService, storeService, storeCacheService, poiService, project, dynamicDsService, () => createIndexerWorker(storeService.getStore(), dynamicDsService, unfinalizedBlocksSevice));
+    }
+    async fetchBlock(worker, height) {
+        const start = new Date();
+        await worker.fetchBlock(height);
+        const end = new Date();
+        // const waitTime = end.getTime() - start.getTime();
+        // if (waitTime > 1000) {
+        //   logger.info(
+        //     `Waiting to fetch block ${height}: ${chalk.red(`${waitTime}ms`)}`,
+        //   );
+        // } else if (waitTime > 200) {
+        //   logger.info(
+        //     `Waiting to fetch block ${height}: ${chalk.yellow(`${waitTime}ms`)}`,
+        //   );
+        // }
+    }
+};
+WorkerBlockDispatcherService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(2, (0, common_1.Inject)('IProjectService')),
+    __param(7, (0, common_1.Inject)('ISubqueryProject')),
+    __metadata("design:paramtypes", [node_core_1.NodeConfig,
+        event_emitter_1.EventEmitter2, Object, node_core_1.SmartBatchService,
+        node_core_1.StoreService,
+        node_core_1.StoreCacheService,
+        node_core_1.PoiService,
+        SubqueryProject_1.SubqueryProject,
+        dynamic_ds_service_1.DynamicDsService,
+        unfinalizedBlocks_service_1.UnfinalizedBlocksService])
+], WorkerBlockDispatcherService);
+exports.WorkerBlockDispatcherService = WorkerBlockDispatcherService;
+//# sourceMappingURL=worker-block-dispatcher.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"worker-block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/worker-block-dispatcher.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport path from 'path';\nimport { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  getLogger,\n  NodeConfig,\n  Worker,\n  SmartBatchService,\n  StoreService,\n  PoiService,\n  StoreCacheService,\n  IProjectService,\n  IDynamicDsService,\n  HostStore,\n  HostDynamicDS,\n  WorkerBlockDispatcher,\n} from '@subql/node-core';\nimport { Store } from '@subql/types';\nimport chalk from 'chalk';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\nimport { DynamicDsService } from '../dynamic-ds.service';\nimport {\n  IUnfinalizedBlocksService,\n  UnfinalizedBlocksService,\n} from '../unfinalizedBlocks.service';\nimport { IIndexerWorker, IInitIndexerWorker } from '../worker/worker';\nimport { HostUnfinalizedBlocks } from '../worker/worker.unfinalizedBlocks.service';\n\nconst logger = getLogger('WorkerBlockDispatcherService');\n\ntype IndexerWorker = IIndexerWorker & {\n  terminate: () => Promise<number>;\n};\n\nasync function createIndexerWorker(\n  store: Store,\n  dynamicDsService: IDynamicDsService<SubqlProjectDs>,\n  unfinalizedBlocksService: IUnfinalizedBlocksService,\n): Promise<IndexerWorker> {\n  const indexerWorker = Worker.create<\n    IInitIndexerWorker,\n    HostDynamicDS<SubqlProjectDs> & HostStore & HostUnfinalizedBlocks\n  >(\n    path.resolve(__dirname, '../../../dist/indexer/worker/worker.js'),\n    [\n      'initWorker',\n      'processBlock',\n      'fetchBlock',\n      'numFetchedBlocks',\n      'numFetchingBlocks',\n      'getStatus',\n      'getMemoryLeft',\n      'waitForWorkerBatchSize',\n    ],\n    {\n      storeGet: store.get.bind(store),\n      storeGetByField: store.getByField.bind(store),\n      storeGetOneByField: store.getOneByField.bind(store),\n      storeSet: store.set.bind(store),\n      storeBulkCreate: store.bulkCreate.bind(store),\n      storeBulkUpdate: store.bulkUpdate.bind(store),\n      storeRemove: store.remove.bind(store),\n      dynamicDsCreateDynamicDatasource:\n        dynamicDsService.createDynamicDatasource.bind(dynamicDsService),\n      dynamicDsGetDynamicDatasources:\n        dynamicDsService.getDynamicDatasources.bind(dynamicDsService),\n      unfinalizedBlocksProcess:\n        unfinalizedBlocksService.processUnfinalizedBlocks.bind(\n          unfinalizedBlocksService,\n        ),\n    },\n  );\n\n  await indexerWorker.initWorker();\n\n  return indexerWorker;\n}\n\n@Injectable()\nexport class WorkerBlockDispatcherService\n  extends WorkerBlockDispatcher<SubqlProjectDs, IndexerWorker>\n  implements OnApplicationShutdown\n{\n  constructor(\n    nodeConfig: NodeConfig,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService') projectService: IProjectService<SubqlProjectDs>,\n    smartBatchService: SmartBatchService,\n    storeService: StoreService,\n    storeCacheService: StoreCacheService,\n    poiService: PoiService,\n    @Inject('ISubqueryProject') project: SubqueryProject,\n    dynamicDsService: DynamicDsService,\n    unfinalizedBlocksSevice: UnfinalizedBlocksService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      smartBatchService,\n      storeService,\n      storeCacheService,\n      poiService,\n      project,\n      dynamicDsService,\n      () =>\n        createIndexerWorker(\n          storeService.getStore(),\n          dynamicDsService,\n          unfinalizedBlocksSevice,\n        ),\n    );\n  }\n\n  protected async fetchBlock(\n    worker: IndexerWorker,\n    height: number,\n  ): Promise<void> {\n    const start = new Date();\n    await worker.fetchBlock(height);\n    const end = new Date();\n\n    // const waitTime = end.getTime() - start.getTime();\n    // if (waitTime > 1000) {\n    //   logger.info(\n    //     `Waiting to fetch block ${height}: ${chalk.red(`${waitTime}ms`)}`,\n    //   );\n    // } else if (waitTime > 200) {\n    //   logger.info(\n    //     `Waiting to fetch block ${height}: ${chalk.yellow(`${waitTime}ms`)}`,\n    //   );\n    // }\n  }\n}\n"]}

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

@@ -4,4 +4,5 @@ import { SubqueryProject } from '../configure/SubqueryProject';
 export declare class DictionaryService extends CoreDictionaryService implements OnApplicationShutdown {
     protected project: SubqueryProject;
     constructor(project: SubqueryProject, nodeConfig: NodeConfig);
+    getEvmChainId(): Promise<string>;
 }