@subql/node-ethereum 0.4.1-8 → 0.4.1-storeCache-0.0.3

package/dist/ethereum/ethers/web/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/web/index.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable */\n'use strict';\n\nimport http from 'http';\nimport https from 'https';\nimport {\n  decode as base64Decode,\n  encode as base64Encode,\n} from '@ethersproject/base64';\nimport { hexlify, isBytesLike } from '@ethersproject/bytes';\nimport { shallowCopy } from '@ethersproject/properties';\nimport { toUtf8Bytes, toUtf8String } from '@ethersproject/strings';\n\nimport { Logger } from '@ethersproject/logger';\nimport { version } from './_version';\nconst logger = new Logger(version);\n\nimport { getUrl, GetUrlResponse, Options } from './geturl';\n\nfunction staller(duration: number): Promise<void> {\n  return new Promise((resolve) => {\n    setTimeout(resolve, duration);\n  });\n}\n\nfunction bodyify(value: any, type: string): string {\n  if (value == null) {\n    return null;\n  }\n\n  if (typeof value === 'string') {\n    return value;\n  }\n\n  if (isBytesLike(value)) {\n    if (\n      type &&\n      (type.split('/')[0] === 'text' ||\n        type.split(';')[0].trim() === 'application/json')\n    ) {\n      try {\n        return toUtf8String(value);\n      } catch (error) {}\n    }\n    return hexlify(value);\n  }\n\n  return value;\n}\n\n// Exported Types\nexport type ConnectionInfo = {\n  url: string;\n  headers?: { [key: string]: string | number };\n\n  user?: string;\n  password?: string;\n\n  allowInsecureAuthentication?: boolean;\n  allowGzip?: boolean;\n\n  throttleLimit?: number;\n  throttleSlotInterval?: number;\n  throttleCallback?: (attempt: number, url: string) => Promise<boolean>;\n\n  skipFetchSetup?: boolean;\n  fetchOptions?: Record<string, string>;\n  errorPassThrough?: boolean;\n\n  timeout?: number;\n\n  agents?: {\n    http?: http.Agent;\n    https?: https.Agent;\n  };\n};\n\nexport interface OnceBlockable {\n  once(eventName: 'block', handler: () => void): void;\n}\n\nexport interface OncePollable {\n  once(eventName: 'poll', handler: () => void): void;\n}\n\nexport type PollOptions = {\n  timeout?: number;\n  floor?: number;\n  ceiling?: number;\n  interval?: number;\n  retryLimit?: number;\n  onceBlock?: OnceBlockable;\n  oncePoll?: OncePollable;\n};\n\nexport type FetchJsonResponse = {\n  statusCode: number;\n  headers: { [header: string]: string };\n};\n\ntype Header = { key: string; value: string };\n\nfunction unpercent(value: string): Uint8Array {\n  return toUtf8Bytes(\n    value.replace(/%([0-9a-f][0-9a-f])/gi, (all, code) => {\n      return String.fromCharCode(parseInt(code, 16));\n    }),\n  );\n}\n\n// This API is still a work in progress; the future changes will likely be:\n// - ConnectionInfo => FetchDataRequest<T = any>\n// - FetchDataRequest.body? = string | Uint8Array | { contentType: string, data: string | Uint8Array }\n//   - If string => text/plain, Uint8Array => application/octet-stream (if content-type unspecified)\n// - FetchDataRequest.processFunc = (body: Uint8Array, response: FetchDataResponse) => T\n// For this reason, it should be considered internal until the API is finalized\nexport function _fetchData<T = Uint8Array>(\n  connection: string | ConnectionInfo,\n  body?: Uint8Array,\n  processFunc?: (value: Uint8Array, response: FetchJsonResponse) => T,\n): Promise<T> {\n  // How many times to retry in the event of a throttle\n  const attemptLimit =\n    typeof connection === 'object' && connection.throttleLimit != null\n      ? connection.throttleLimit\n      : 12;\n  logger.assertArgument(\n    attemptLimit > 0 && attemptLimit % 1 === 0,\n    'invalid connection throttle limit',\n    'connection.throttleLimit',\n    attemptLimit,\n  );\n\n  const throttleCallback =\n    typeof connection === 'object' ? connection.throttleCallback : null;\n  const throttleSlotInterval =\n    typeof connection === 'object' &&\n    typeof connection.throttleSlotInterval === 'number'\n      ? connection.throttleSlotInterval\n      : 100;\n  logger.assertArgument(\n    throttleSlotInterval > 0 && throttleSlotInterval % 1 === 0,\n    'invalid connection throttle slot interval',\n    'connection.throttleSlotInterval',\n    throttleSlotInterval,\n  );\n\n  const errorPassThrough =\n    typeof connection === 'object' ? !!connection.errorPassThrough : false;\n\n  const headers: { [key: string]: Header } = {};\n\n  let url: string = null;\n\n  // @TODO: Allow ConnectionInfo to override some of these values\n  const options: Options = {\n    method: 'GET',\n  };\n\n  let allow304 = false;\n\n  let timeout = 2 * 60 * 1000;\n\n  if (typeof connection === 'string') {\n    url = connection;\n  } else if (typeof connection === 'object') {\n    if (connection == null || connection.url == null) {\n      logger.throwArgumentError('missing URL', 'connection.url', connection);\n    }\n\n    url = connection.url;\n\n    if (typeof connection.timeout === 'number' && connection.timeout > 0) {\n      timeout = connection.timeout;\n    }\n\n    if (connection.headers) {\n      for (const key in connection.headers) {\n        headers[key.toLowerCase()] = {\n          key: key,\n          value: String(connection.headers[key]),\n        };\n        if (\n          ['if-none-match', 'if-modified-since'].indexOf(key.toLowerCase()) >= 0\n        ) {\n          allow304 = true;\n        }\n      }\n    }\n\n    options.allowGzip = !!connection.allowGzip;\n\n    if (connection.user != null && connection.password != null) {\n      if (\n        url.substring(0, 6) !== 'https:' &&\n        connection.allowInsecureAuthentication !== true\n      ) {\n        logger.throwError(\n          'basic authentication requires a secure https url',\n          Logger.errors.INVALID_ARGUMENT,\n          {\n            argument: 'url',\n            url: url,\n            user: connection.user,\n            password: '[REDACTED]',\n          },\n        );\n      }\n\n      const authorization = connection.user + ':' + connection.password;\n      headers['authorization'] = {\n        key: 'Authorization',\n        value: 'Basic ' + base64Encode(toUtf8Bytes(authorization)),\n      };\n    }\n\n    if (connection.skipFetchSetup != null) {\n      options.skipFetchSetup = !!connection.skipFetchSetup;\n    }\n\n    if (connection.fetchOptions != null) {\n      options.fetchOptions = shallowCopy(connection.fetchOptions);\n    }\n\n    if (connection.agents != null) {\n      options.agents = connection.agents;\n    }\n  }\n\n  const reData = new RegExp('^data:([^;:]*)?(;base64)?,(.*)$', 'i');\n  const dataMatch = url ? url.match(reData) : null;\n  if (dataMatch) {\n    try {\n      const response = {\n        statusCode: 200,\n        statusMessage: 'OK',\n        headers: { 'content-type': dataMatch[1] || 'text/plain' },\n        body: dataMatch[2]\n          ? base64Decode(dataMatch[3])\n          : unpercent(dataMatch[3]),\n      };\n\n      let result: T = <T>(<unknown>response.body);\n      if (processFunc) {\n        result = processFunc(response.body, response);\n      }\n      return Promise.resolve(<T>(<unknown>result));\n    } catch (error) {\n      logger.throwError(\n        'processing response error',\n        Logger.errors.SERVER_ERROR,\n        {\n          body: bodyify(dataMatch[1], dataMatch[2]),\n          error: error,\n          requestBody: null,\n          requestMethod: 'GET',\n          url: url,\n        },\n      );\n    }\n  }\n\n  if (body) {\n    options.method = 'POST';\n    options.body = body;\n    if (headers['content-type'] == null) {\n      headers['content-type'] = {\n        key: 'Content-Type',\n        value: 'application/octet-stream',\n      };\n    }\n    if (headers['content-length'] == null) {\n      headers['content-length'] = {\n        key: 'Content-Length',\n        value: String(body.length),\n      };\n    }\n  }\n\n  const flatHeaders: { [key: string]: string } = {};\n  Object.keys(headers).forEach((key) => {\n    const header = headers[key];\n    flatHeaders[header.key] = header.value;\n  });\n  options.headers = flatHeaders;\n\n  const runningTimeout = (function () {\n    let timer: NodeJS.Timer = null;\n    const promise: Promise<never> = new Promise(function (resolve, reject) {\n      if (timeout) {\n        timer = setTimeout(() => {\n          if (timer == null) {\n            return;\n          }\n          timer = null;\n\n          reject(\n            logger.makeError('timeout', Logger.errors.TIMEOUT, {\n              requestBody: bodyify(options.body, flatHeaders['content-type']),\n              requestMethod: options.method,\n              timeout: timeout,\n              url: url,\n            }),\n          );\n        }, timeout);\n      }\n    });\n\n    const cancel = function () {\n      if (timer == null) {\n        return;\n      }\n      clearTimeout(timer);\n      timer = null;\n    };\n\n    return { promise, cancel };\n  })();\n\n  const runningFetch = (async function () {\n    for (let attempt = 0; attempt < attemptLimit; attempt++) {\n      let response: GetUrlResponse = null;\n\n      try {\n        response = await getUrl(url, options);\n\n        if (attempt < attemptLimit) {\n          if (response.statusCode === 301 || response.statusCode === 302) {\n            // Redirection; for now we only support absolute locataions\n            const location = response.headers.location || '';\n            if (options.method === 'GET' && location.match(/^https:/)) {\n              url = response.headers.location;\n              continue;\n            }\n          } else if (response.statusCode === 429) {\n            // Exponential back-off throttling\n            let tryAgain = true;\n            if (throttleCallback) {\n              tryAgain = await throttleCallback(attempt, url);\n            }\n\n            if (tryAgain) {\n              let stall = 0;\n\n              const retryAfter = response.headers['retry-after'];\n              if (\n                typeof retryAfter === 'string' &&\n                retryAfter.match(/^[1-9][0-9]*$/)\n              ) {\n                stall = parseInt(retryAfter) * 1000;\n              } else {\n                stall =\n                  throttleSlotInterval *\n                  parseInt(String(Math.random() * Math.pow(2, attempt)));\n              }\n\n              //console.log(\"Stalling 429\");\n              await staller(stall);\n              continue;\n            }\n          }\n        }\n      } catch (error) {\n        response = (<any>error).response;\n        if (response == null) {\n          runningTimeout.cancel();\n          logger.throwError('missing response', Logger.errors.SERVER_ERROR, {\n            requestBody: bodyify(options.body, flatHeaders['content-type']),\n            requestMethod: options.method,\n            serverError: error,\n            url: url,\n          });\n        }\n      }\n\n      let body = response.body;\n\n      if (allow304 && response.statusCode === 304) {\n        body = null;\n      } else if (\n        !errorPassThrough &&\n        (response.statusCode < 200 || response.statusCode >= 300)\n      ) {\n        runningTimeout.cancel();\n        logger.throwError('bad response', Logger.errors.SERVER_ERROR, {\n          status: response.statusCode,\n          headers: response.headers,\n          body: bodyify(\n            body,\n            response.headers ? response.headers['content-type'] : null,\n          ),\n          requestBody: bodyify(options.body, flatHeaders['content-type']),\n          requestMethod: options.method,\n          url: url,\n        });\n      }\n\n      if (processFunc) {\n        try {\n          const result = await processFunc(body, response);\n          runningTimeout.cancel();\n          return result;\n        } catch (error) {\n          // Allow the processFunc to trigger a throttle\n          if (error.throttleRetry && attempt < attemptLimit) {\n            let tryAgain = true;\n            if (throttleCallback) {\n              tryAgain = await throttleCallback(attempt, url);\n            }\n\n            if (tryAgain) {\n              const timeout =\n                throttleSlotInterval *\n                parseInt(String(Math.random() * Math.pow(2, attempt)));\n              //console.log(\"Stalling callback\");\n              await staller(timeout);\n              continue;\n            }\n          }\n\n          runningTimeout.cancel();\n          logger.throwError(\n            'processing response error',\n            Logger.errors.SERVER_ERROR,\n            {\n              body: bodyify(\n                body,\n                response.headers ? response.headers['content-type'] : null,\n              ),\n              error: error,\n              requestBody: bodyify(options.body, flatHeaders['content-type']),\n              requestMethod: options.method,\n              url: url,\n            },\n          );\n        }\n      }\n\n      runningTimeout.cancel();\n\n      // If we had a processFunc, it either returned a T or threw above.\n      // The \"body\" is now a Uint8Array.\n      return <T>(<unknown>body);\n    }\n\n    return logger.throwError('failed response', Logger.errors.SERVER_ERROR, {\n      requestBody: bodyify(options.body, flatHeaders['content-type']),\n      requestMethod: options.method,\n      url: url,\n    });\n  })();\n\n  return Promise.race([runningTimeout.promise, runningFetch]);\n}\n\nexport function fetchJson(\n  connection: string | ConnectionInfo,\n  json?: string,\n  processFunc?: (value: any, response: FetchJsonResponse) => any,\n): Promise<any> {\n  let processJsonFunc = (value: Uint8Array, response: FetchJsonResponse) => {\n    let result: any = null;\n    if (value != null) {\n      try {\n        result = JSON.parse(toUtf8String(value));\n      } catch (error) {\n        logger.throwError('invalid JSON', Logger.errors.SERVER_ERROR, {\n          body: value,\n          error: error,\n        });\n      }\n    }\n\n    if (processFunc) {\n      result = processFunc(result, response);\n    }\n\n    return result;\n  };\n\n  // If we have json to send, we must\n  // - add content-type of application/json (unless already overridden)\n  // - convert the json to bytes\n  let body: Uint8Array = null;\n  if (json != null) {\n    body = toUtf8Bytes(json);\n\n    // Create a connection with the content-type set for JSON\n    const updated: ConnectionInfo =\n      typeof connection === 'string'\n        ? { url: connection }\n        : shallowCopy(connection);\n    if (updated.headers) {\n      const hasContentType =\n        Object.keys(updated.headers).filter(\n          (k) => k.toLowerCase() === 'content-type',\n        ).length !== 0;\n      if (!hasContentType) {\n        updated.headers = shallowCopy(updated.headers);\n        updated.headers['content-type'] = 'application/json';\n      }\n    } else {\n      updated.headers = { 'content-type': 'application/json' };\n    }\n    connection = updated;\n  }\n\n  return _fetchData<any>(connection, body, processJsonFunc);\n}\n\nexport function poll<T>(\n  func: () => Promise<T>,\n  options?: PollOptions,\n): Promise<T> {\n  if (!options) {\n    options = {};\n  }\n  options = shallowCopy(options);\n  if (options.floor == null) {\n    options.floor = 0;\n  }\n  if (options.ceiling == null) {\n    options.ceiling = 10000;\n  }\n  if (options.interval == null) {\n    options.interval = 250;\n  }\n\n  return new Promise(function (resolve, reject) {\n    let timer: NodeJS.Timer = null;\n    let done: boolean = false;\n\n    // Returns true if cancel was successful. Unsuccessful cancel means we're already done.\n    const cancel = (): boolean => {\n      if (done) {\n        return false;\n      }\n      done = true;\n      if (timer) {\n        clearTimeout(timer);\n      }\n      return true;\n    };\n\n    if (options.timeout) {\n      timer = setTimeout(() => {\n        if (cancel()) {\n          reject(new Error('timeout'));\n        }\n      }, options.timeout);\n    }\n\n    const retryLimit = options.retryLimit;\n\n    let attempt = 0;\n    function check() {\n      return func().then(\n        function (result) {\n          // If we have a result, or are allowed null then we're done\n          if (result !== undefined) {\n            if (cancel()) {\n              resolve(result);\n            }\n          } else if (options.oncePoll) {\n            options.oncePoll.once('poll', check);\n          } else if (options.onceBlock) {\n            options.onceBlock.once('block', check);\n\n            // Otherwise, exponential back-off (up to 10s) our next request\n          } else if (!done) {\n            attempt++;\n            if (attempt > retryLimit) {\n              if (cancel()) {\n                reject(new Error('retry limit reached'));\n              }\n              return;\n            }\n\n            let timeout =\n              options.interval *\n              parseInt(String(Math.random() * Math.pow(2, attempt)));\n            if (timeout < options.floor) {\n              timeout = options.floor;\n            }\n            if (timeout > options.ceiling) {\n              timeout = options.ceiling;\n            }\n\n            setTimeout(check, timeout);\n          }\n\n          return null;\n        },\n        function (error) {\n          if (cancel()) {\n            reject(error);\n          }\n        },\n      );\n    }\n    check();\n  });\n}\n"]}

package/dist/ethereum/ethers/web/types.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import http from 'http';
+import https from 'https';
+export declare type GetUrlResponse = {
+    statusCode: number;
+    statusMessage: string;
+    headers: {
+        [key: string]: string;
+    };
+    body: Uint8Array;
+};
+export declare type Options = {
+    method?: string;
+    allowGzip?: boolean;
+    body?: Uint8Array;
+    headers?: {
+        [key: string]: string;
+    };
+    skipFetchSetup?: boolean;
+    fetchOptions?: Record<string, string>;
+    agents?: {
+        http?: http.Agent;
+        https?: https.Agent;
+    };
+};

package/dist/ethereum/ethers/web/types.js

@@ -0,0 +1,4 @@
+/* eslint-disable */
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/ethereum/ethers/web/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/web/types.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,YAAY,CAAC","sourcesContent":["/* eslint-disable */\n'use strict';\nimport http from 'http';\nimport https from 'https';\n\nexport type GetUrlResponse = {\n  statusCode: number;\n  statusMessage: string;\n  headers: { [key: string]: string };\n  body: Uint8Array;\n};\n\nexport type Options = {\n  method?: string;\n  allowGzip?: boolean;\n  body?: Uint8Array;\n  headers?: { [key: string]: string };\n  skipFetchSetup?: boolean;\n  fetchOptions?: Record<string, string>;\n  agents?: {\n    http?: http.Agent;\n    https?: https.Agent;\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', 'toJSON']));
+        } });
 }
 exports.formatLog = formatLog;
 function formatTransaction(tx) {
@@ -43,11 +51,16 @@ 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, ['block', 'receipt', 'toJSON']));
+        } });
 }
 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(), 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 | 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(): 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

@@ -1,23 +1,16 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { ApiService, NodeConfig, Queue } from '@subql/node-core';
+import { NodeConfig, SmartBatchService, StoreCacheService, StoreService, IProjectService, PoiService, BlockDispatcher, ProcessBlockResponse, ApiService } from '@subql/node-core';
+import { EthereumBlockWrapper } from '@subql/types-ethereum';
+import { SubqlProjectDs, SubqueryProject } from '../../configure/SubqueryProject';
+import { DynamicDsService } from '../dynamic-ds.service';
 import { IndexerManager } from '../indexer.manager';
-import { ProjectService } from '../project.service';
-import { BaseBlockDispatcher } from './base-block-dispatcher';
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
-export declare class BlockDispatcherService extends BaseBlockDispatcher<Queue<number>> implements OnApplicationShutdown {
-    private apiService;
+export declare class BlockDispatcherService extends BlockDispatcher<EthereumBlockWrapper, SubqlProjectDs> implements OnApplicationShutdown {
     private indexerManager;
-    private processQueue;
-    private fetching;
-    private isShutdown;
-    private fetchBlocksBatches;
-    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: ProjectService);
-    init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;
-    onApplicationShutdown(): void;
-    enqueueBlocks(cleanedBlocks: number[], latestBufferHeight?: number): void;
-    flushQueue(height: number): void;
-    private fetchBlocksFromQueue;
+    constructor(apiService: ApiService, nodeConfig: NodeConfig, indexerManager: IndexerManager, eventEmitter: EventEmitter2, projectService: IProjectService, 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

@@ -10,133 +10,45 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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 lodash_1 = require("lodash");
+const SubqueryProject_1 = require("../../configure/SubqueryProject");
+const dynamic_ds_service_1 = require("../dynamic-ds.service");
 const indexer_manager_1 = require("../indexer.manager");
-const project_service_1 = require("../project.service");
-const base_block_dispatcher_1 = require("./base-block-dispatcher");
-const logger = (0, node_core_1.getLogger)('BlockDispatcherService');
 /**
  * @description Intended to behave the same as WorkerBlockDispatcherService but doesn't use worker threads or any parallel processing
  */
-let BlockDispatcherService = class BlockDispatcherService extends base_block_dispatcher_1.BaseBlockDispatcher {
-    constructor(apiService, nodeConfig, indexerManager, eventEmitter, projectService) {
-        super(nodeConfig, eventEmitter, projectService, new node_core_1.Queue(nodeConfig.batchSize * 3));
-        this.apiService = apiService;
+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.api.fetchBlocks.bind(apiService.api));
         this.indexerManager = indexerManager;
-        this.fetching = false;
-        this.isShutdown = false;
-        this.processQueue = new node_core_1.AutoQueue(nodeConfig.batchSize * 3);
-        const fetchBlocks = this.apiService.api.fetchBlocks.bind(this.apiService.api);
-        if (this.nodeConfig.profiler) {
-            this.fetchBlocksBatches = (0, node_core_1.profilerWrap)(fetchBlocks, 'EthereumUtil', 'fetchBlocksBatches');
-        }
-        else {
-            this.fetchBlocksBatches = fetchBlocks;
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/require-await
-    async init(onDynamicDsCreated) {
-        this.onDynamicDsCreated = onDynamicDsCreated;
-        const blockAmount = await this.projectService.getProcessedBlockCount();
-        this.setProcessedBlockCount(blockAmount !== null && blockAmount !== void 0 ? blockAmount : 0);
-    }
-    onApplicationShutdown() {
-        this.isShutdown = true;
-        this.processQueue.abort();
-    }
-    enqueueBlocks(cleanedBlocks, latestBufferHeight) {
-        // // In the case where factors of batchSize is equal to bypassBlock or when cleanedBatchBlocks is []
-        // // to ensure block is bypassed, latestBufferHeight needs to be manually set
-        // If cleanedBlocks = []
-        if (!!latestBufferHeight && !cleanedBlocks.length) {
-            this.latestBufferedHeight = latestBufferHeight;
-            return;
-        }
-        logger.info(`Enqueueing blocks ${cleanedBlocks[0]}...${(0, lodash_1.last)(cleanedBlocks)}, total ${cleanedBlocks.length} blocks`);
-        this.queue.putMany(cleanedBlocks);
-        this.latestBufferedHeight = latestBufferHeight !== null && latestBufferHeight !== void 0 ? latestBufferHeight : (0, lodash_1.last)(cleanedBlocks);
-        void this.fetchBlocksFromQueue().catch((e) => {
-            logger.error(e, 'Failed to fetch blocks from queue');
-            if (!this.isShutdown) {
-                process.exit(1);
-            }
-        });
     }
-    flushQueue(height) {
-        super.flushQueue(height);
-        this.processQueue.flush();
+    getBlockHeight(block) {
+        return block.blockHeight;
     }
-    async fetchBlocksFromQueue() {
-        if (this.fetching || this.isShutdown)
-            return;
-        // Process queue is full, no point in fetching more blocks
-        // if (this.processQueue.freeSpace < this.nodeConfig.batchSize) return;
-        this.fetching = true;
-        try {
-            while (!this.isShutdown) {
-                const blockNums = this.queue.takeMany(Math.min(this.nodeConfig.batchSize, this.processQueue.freeSpace));
-                // Used to compare before and after as a way to check if queue was flushed
-                const bufferedHeight = this._latestBufferedHeight;
-                // Queue is empty
-                if (!blockNums.length) {
-                    // The process queue might be full so no block nums were taken, wait and try again
-                    if (this.queue.size) {
-                        await (0, node_core_1.delay)(1);
-                        continue;
-                    }
-                    break;
-                }
-                logger.info(`fetch block [${blockNums[0]},${blockNums[blockNums.length - 1]}], total ${blockNums.length} blocks`);
-                const blocks = await this.fetchBlocksBatches(blockNums);
-                // 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 () => {
-                    var _a;
-                    const height = block.blockHeight;
-                    try {
-                        this.preProcessBlock(height);
-                        const processBlockResponse = await this.indexerManager.indexBlock(block);
-                        await this.postProcessBlock(height, processBlockResponse);
-                    }
-                    catch (e) {
-                        if (this.isShutdown) {
-                            return;
-                        }
-                        logger.error(e, `failed to index block at height ${height} ${e.handler ? `${e.handler}(${(_a = e.stack) !== null && _a !== void 0 ? _a : ''})` : ''}`);
-                        throw e;
-                    }
-                });
-                // There can be enough of a delay after fetching blocks that shutdown could now be true
-                if (this.isShutdown)
-                    break;
-                this.processQueue.putMany(blockTasks);
-                this.eventEmitter.emit(node_core_1.IndexerEvent.BlockQueueSize, {
-                    value: this.processQueue.size,
-                });
-            }
-        }
-        finally {
-            this.fetching = false;
-        }
+    async indexBlock(block) {
+        return this.indexerManager.indexBlock(block);
     }
 };
 BlockDispatcherService = __decorate([
     (0, common_1.Injectable)(),
+    __param(4, (0, common_1.Inject)('IProjectService')),
+    __param(9, (0, common_1.Inject)('ISubqueryProject')),
     __metadata("design:paramtypes", [node_core_1.ApiService,
         node_core_1.NodeConfig,
         indexer_manager_1.IndexerManager,
-        event_emitter_1.EventEmitter2,
-        project_service_1.ProjectService])
+        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

@@ -1 +1 @@
-{"version":3,"file":"block-dispatcher.service.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/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 { Injectable, OnApplicationShutdown } from '@nestjs/common';\nimport { EventEmitter2 } from '@nestjs/event-emitter';\nimport {\n  ApiService,\n  getLogger,\n  NodeConfig,\n  IndexerEvent,\n  delay,\n  profilerWrap,\n  AutoQueue,\n  Queue,\n} from '@subql/node-core';\nimport { last } from 'lodash';\nimport { EthereumApiService } from '../../ethereum';\nimport { IndexerManager } from '../indexer.manager';\nimport { ProjectService } from '../project.service';\nimport { BaseBlockDispatcher } from './base-block-dispatcher';\n\nconst logger = getLogger('BlockDispatcherService');\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 BaseBlockDispatcher<Queue<number>>\n  implements OnApplicationShutdown\n{\n  private processQueue: AutoQueue<void>;\n\n  private fetching = false;\n  private isShutdown = false;\n  private fetchBlocksBatches: EthereumApiService['api']['fetchBlocks'];\n\n  constructor(\n    private apiService: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    projectService: ProjectService,\n  ) {\n    super(\n      nodeConfig,\n      eventEmitter,\n      projectService,\n      new Queue(nodeConfig.batchSize * 3),\n    );\n    this.processQueue = new AutoQueue(nodeConfig.batchSize * 3);\n\n    const fetchBlocks = this.apiService.api.fetchBlocks.bind(\n      this.apiService.api,\n    );\n    if (this.nodeConfig.profiler) {\n      this.fetchBlocksBatches = profilerWrap(\n        fetchBlocks,\n        'EthereumUtil',\n        'fetchBlocksBatches',\n      );\n    } else {\n      this.fetchBlocksBatches = fetchBlocks;\n    }\n  }\n\n  // eslint-disable-next-line @typescript-eslint/require-await\n  async init(\n    onDynamicDsCreated: (height: number) => Promise<void>,\n  ): Promise<void> {\n    this.onDynamicDsCreated = onDynamicDsCreated;\n    const blockAmount = await this.projectService.getProcessedBlockCount();\n    this.setProcessedBlockCount(blockAmount ?? 0);\n  }\n\n  onApplicationShutdown(): void {\n    this.isShutdown = true;\n    this.processQueue.abort();\n  }\n\n  enqueueBlocks(cleanedBlocks: number[], latestBufferHeight?: number): void {\n    // // In the case where factors of batchSize is equal to bypassBlock or when cleanedBatchBlocks is []\n    // // to ensure block is bypassed, latestBufferHeight needs to be manually set\n    // If cleanedBlocks = []\n    if (!!latestBufferHeight && !cleanedBlocks.length) {\n      this.latestBufferedHeight = latestBufferHeight;\n      return;\n    }\n\n    logger.info(\n      `Enqueueing blocks ${cleanedBlocks[0]}...${last(cleanedBlocks)}, total ${\n        cleanedBlocks.length\n      } blocks`,\n    );\n\n    this.queue.putMany(cleanedBlocks);\n\n    this.latestBufferedHeight = latestBufferHeight ?? last(cleanedBlocks);\n    void this.fetchBlocksFromQueue().catch((e) => {\n      logger.error(e, 'Failed to fetch blocks from queue');\n      if (!this.isShutdown) {\n        process.exit(1);\n      }\n    });\n  }\n\n  flushQueue(height: number): void {\n    super.flushQueue(height);\n    this.processQueue.flush();\n  }\n\n  private async fetchBlocksFromQueue(): Promise<void> {\n    if (this.fetching || this.isShutdown) return;\n    // Process queue is full, no point in fetching more blocks\n    // if (this.processQueue.freeSpace < this.nodeConfig.batchSize) return;\n\n    this.fetching = true;\n\n    try {\n      while (!this.isShutdown) {\n        const blockNums = this.queue.takeMany(\n          Math.min(this.nodeConfig.batchSize, this.processQueue.freeSpace),\n        );\n        // Used to compare before and after as a way to check if queue was flushed\n        const bufferedHeight = this._latestBufferedHeight;\n\n        // Queue is empty\n        if (!blockNums.length) {\n          // The process queue might be full so no block nums were taken, wait and try again\n          if (this.queue.size) {\n            await delay(1);\n            continue;\n          }\n          break;\n        }\n\n        logger.info(\n          `fetch block [${blockNums[0]},${\n            blockNums[blockNums.length - 1]\n          }], total ${blockNums.length} blocks`,\n        );\n\n        const blocks = await this.fetchBlocksBatches(blockNums);\n\n        // Check if the queues have been flushed between queue.takeMany and fetchBlocksBatches resolving\n        // Peeking the queue is because the latestBufferedHeight could have regrown since fetching block\n        if (\n          bufferedHeight > this._latestBufferedHeight ||\n          this.queue.peek() < Math.min(...blockNums)\n        ) {\n          logger.info(`Queue was reset for new DS, discarding fetched blocks`);\n          continue;\n        }\n\n        const blockTasks = blocks.map((block) => async () => {\n          const height = block.blockHeight;\n          try {\n            this.preProcessBlock(height);\n\n            const processBlockResponse = await this.indexerManager.indexBlock(\n              block,\n            );\n\n            await this.postProcessBlock(height, processBlockResponse);\n          } catch (e) {\n            if (this.isShutdown) {\n              return;\n            }\n            logger.error(\n              e,\n              `failed to index block at height ${height} ${\n                e.handler ? `${e.handler}(${e.stack ?? ''})` : ''\n              }`,\n            );\n            throw e;\n          }\n        });\n\n        // There can be enough of a delay after fetching blocks that shutdown could now be true\n        if (this.isShutdown) break;\n\n        this.processQueue.putMany(blockTasks);\n\n        this.eventEmitter.emit(IndexerEvent.BlockQueueSize, {\n          value: this.processQueue.size,\n        });\n      }\n    } finally {\n      this.fetching = false;\n    }\n  }\n}\n"]}
+{"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,gDAU0B;AAE1B,qEAGyC;AACzC,8DAAyD;AACzD,wDAAoD;AAEpD;;GAEG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBACX,SAAQ,2BAAqD;IAG7D,YACE,UAAsB,EACtB,UAAsB,EACd,cAA8B,EACtC,YAA2B,EACA,cAA+B,EAC1D,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,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAChD,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,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AAxCY,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAUR,WAAA,IAAA,eAAM,EAAC,iBAAiB,CAAC,CAAA;IAKzB,WAAA,IAAA,eAAM,EAAC,kBAAkB,CAAC,CAAA;qCATf,sBAAU;QACV,sBAAU;QACE,gCAAc;QACxB,6BAAa,UAER,6BAAiB;QACtB,wBAAY;QACP,6BAAiB;QACxB,sBAAU;QACe,iCAAe;QAClC,qCAAgB;GAfzB,sBAAsB,CAwClC;AAxCY,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  ApiService,\n} from '@subql/node-core';\nimport { EthereumBlockWrapper } from '@subql/types-ethereum';\nimport {\n  SubqlProjectDs,\n  SubqueryProject,\n} from '../../configure/SubqueryProject';\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: ApiService,\n    nodeConfig: NodeConfig,\n    private indexerManager: IndexerManager,\n    eventEmitter: EventEmitter2,\n    @Inject('IProjectService') projectService: IProjectService,\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.api.fetchBlocks.bind(apiService.api),\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(block);\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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexer/blockDispatcher/index.ts"],"names":[],"mappings":";AAAA,gEAAgE;AAChE,sCAAsC;;;AAGtC,yEAAoE;AAKlE,uGALO,iDAAsB,OAKP;AAJxB,uFAAiF;AAK/E,6GALO,8DAA4B,OAKP","sourcesContent":["// Copyright 2020-2021 OnFinality Limited authors & contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport { IBlockDispatcher } from './base-block-dispatcher';\nimport { BlockDispatcherService } from './block-dispatcher.service';\nimport { WorkerBlockDispatcherService } from './worker-block-dispatcher.service';\n\nexport {\n  IBlockDispatcher,\n  BlockDispatcherService,\n  WorkerBlockDispatcherService,\n};\n"]}
+{"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

@@ -1,20 +1,15 @@
 import { OnApplicationShutdown } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { NodeConfig, AutoQueue } from '@subql/node-core';
-import { ProjectService } from '../project.service';
-import { BaseBlockDispatcher } from './base-block-dispatcher';
-export declare class WorkerBlockDispatcherService extends BaseBlockDispatcher<AutoQueue<void>> implements OnApplicationShutdown {
-    private workers;
-    private numWorkers;
-    private taskCounter;
-    private isShutdown;
-    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: ProjectService);
-    init(onDynamicDsCreated: (height: number) => Promise<void>): Promise<void>;
-    onApplicationShutdown(): Promise<void>;
-    enqueueBlocks(heights: number[], latestBufferHeight?: number): void;
-    private enqueueBlock;
-    sampleWorkerStatus(): Promise<void>;
-    get latestBufferedHeight(): number;
-    set latestBufferedHeight(height: number);
-    private getNextWorkerIndex;
+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';
+declare type IndexerWorker = IIndexerWorker & {
+    terminate: () => Promise<number>;
+};
+export declare class WorkerBlockDispatcherService extends WorkerBlockDispatcher<SubqlProjectDs, IndexerWorker> implements OnApplicationShutdown {
+    constructor(nodeConfig: NodeConfig, eventEmitter: EventEmitter2, projectService: IProjectService, smartBatchService: SmartBatchService, storeService: StoreService, storeCacheService: StoreCacheService, poiService: PoiService, project: SubqueryProject, dynamicDsService: DynamicDsService, unfinalizedBlocksSevice: UnfinalizedBlocksService);
+    protected fetchBlock(worker: IndexerWorker, height: number): Promise<void>;
 }
+export {};