envio 3.13.0-alpha.0 → 3.13.0

package/src/sources/RpcSource.res.mjs

@@ -1,780 +1,22 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Rpc from "./Rpc.res.mjs";
-import * as Rest from "../vendored/Rest.res.mjs";
-import * as Time from "../Time.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Source from "./Source.res.mjs";
-import * as Address from "../Address.res.mjs";
 import * as ChainId from "../ChainId.res.mjs";
-import * as Logging from "../Logging.res.mjs";
 import * as EvmRpcWs from "./EvmRpcWs.res.mjs";
-import * as Internal from "../Internal.res.mjs";
-import * as BlockStore from "./BlockStore.res.mjs";
-import * as LazyLoader from "../LazyLoader.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
-import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
+import * as EvmEventItem from "./EvmEventItem.res.mjs";
 import * as EvmRpcClient from "./EvmRpcClient.res.mjs";
-import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
-import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
-import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
 import * as HyperSyncClient from "./HyperSyncClient.res.mjs";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
-import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
-let TransactionDataNotFound = /* @__PURE__ */Primitive_exceptions.create("RpcSource.TransactionDataNotFound");
-
-async function getKnownRawBlock(client, blockNumber) {
-  let json = await Rpc.getRawBlock(client, blockNumber);
-  if (json !== undefined) {
-    return json;
-  } else {
-    return Stdlib_JsError.throwWithMessage(`RPC returned null for blockNumber ` + blockNumber.toString());
-  }
-}
-
-function parseBlockInfo(json) {
-  return {
-    number: S$RescriptSchema.parseOrThrow(json["number"], Rpc.hexIntSchema),
-    timestamp: S$RescriptSchema.parseOrThrow(json["timestamp"], Rpc.hexIntSchema),
-    hash: S$RescriptSchema.parseOrThrow(json["hash"], S$RescriptSchema.string),
-    parentHash: S$RescriptSchema.parseOrThrow(json["parentHash"], S$RescriptSchema.string)
-  };
-}
-
-async function getKnownRawBlockWithBackoff(client, sourceName, chainId, blockNumber, backoffMsOnFailure, recordRequest) {
-  let currentBackoff = backoffMsOnFailure;
-  let result;
-  while (Stdlib_Option.isNone(result)) {
-    let timerRef = Performance.now();
-    let exit = 0;
-    let json;
-    try {
-      json = await getKnownRawBlock(client, blockNumber);
-      exit = 1;
-    } catch (raw_err) {
-      let err = Primitive_exceptions.internalToException(raw_err);
-      recordRequest("eth_getBlockByNumber", Performance.secondsSince(timerRef));
-      Logging.warn({
-        err: Utils.prettifyExn(err),
-        msg: `Issue while running fetching batch of events from the RPC. Will wait ` + currentBackoff.toString() + `ms and try again.`,
-        source: sourceName,
-        chainId: chainId,
-        type: "EXPONENTIAL_BACKOFF"
-      });
-      await Time.resolvePromiseAfterDelay(currentBackoff);
-      currentBackoff = (currentBackoff << 1);
-    }
-    if (exit === 1) {
-      recordRequest("eth_getBlockByNumber", Performance.secondsSince(timerRef));
-      result = json;
-    }
-  };
-  return Stdlib_Option.getOrThrow(result, undefined);
-}
-
-function getErrorMessage(exn) {
-  if (exn.RE_EXN_ID === Rpc.JsonRpcError) {
-    return exn._1.message;
-  }
-  if (exn.RE_EXN_ID !== "JsExn") {
-    return;
-  }
-  let msg = Stdlib_JsExn.message(exn._1);
-  if (msg === undefined) {
-    return;
-  }
-  let obj;
-  try {
-    obj = Stdlib_JSON.Decode.object(JSON.parse(msg));
-  } catch (exn$1) {
-    return;
-  }
-  if (obj === undefined) {
-    return;
-  }
-  let match = obj["errorMessage"];
-  if (typeof match === "string") {
-    return match;
-  }
-}
-
-function parseGetNextPageRetryError(exn) {
-  if (exn.RE_EXN_ID !== "JsExn") {
-    return;
-  }
-  let msg = Stdlib_JsExn.message(exn._1);
-  if (msg === undefined) {
-    return;
-  }
-  let obj;
-  try {
-    obj = Stdlib_JSON.Decode.object(JSON.parse(msg));
-  } catch (exn$1) {
-    return;
-  }
-  if (obj === undefined) {
-    return;
-  }
-  let match = obj["kind"];
-  let match$1 = obj["attemptedToBlock"];
-  let match$2 = obj["retry"];
-  if (match === undefined) {
-    return;
-  }
-  if (typeof match !== "string") {
-    return;
-  }
-  if (match !== "Retry") {
-    return;
-  }
-  if (match$1 === undefined) {
-    return;
-  }
-  if (typeof match$1 !== "number") {
-    return;
-  }
-  if (match$2 === undefined) {
-    return;
-  }
-  if (typeof match$2 !== "object" || match$2 === null || Array.isArray(match$2)) {
-    return;
-  }
-  let match$3 = obj["requestStats"];
-  let requestStats = match$3 !== undefined ? (
-      Array.isArray(match$3) ? Stdlib_Array.filterMap(match$3, s => {
-          let o = Stdlib_JSON.Decode.object(s);
-          if (o === undefined) {
-            return;
-          }
-          let match = o["method"];
-          let match$1 = o["seconds"];
-          if (typeof match === "string" && typeof match$1 === "number") {
-            return {
-              method: match,
-              seconds: match$1
-            };
-          }
-        }) : []
-    ) : [];
-  let match$4 = match$2["tag"];
-  let retry;
-  if (typeof match$4 === "string") {
-    switch (match$4) {
-      case "WithBackoff" :
-        let match$5 = match$2["message"];
-        let match$6 = match$2["backoffMillis"];
-        retry = typeof match$5 === "string" && typeof match$6 === "number" ? ({
-            TAG: "WithBackoff",
-            message: match$5,
-            backoffMillis: match$6 | 0
-          }) : undefined;
-        break;
-      case "WithSuggestedToBlock" :
-        let match$7 = match$2["toBlock"];
-        retry = typeof match$7 === "number" ? ({
-            TAG: "WithSuggestedToBlock",
-            toBlock: match$7 | 0
-          }) : undefined;
-        break;
-      default:
-        retry = undefined;
-    }
-  } else {
-    retry = undefined;
-  }
-  return Stdlib_Option.map(retry, retry => [
-    match$1 | 0,
-    retry,
-    requestStats
-  ]);
-}
-
-let lowercaseAddressSchema = S$RescriptSchema.transform(S$RescriptSchema.string, param => ({
-  p: str => str.toLowerCase()
-}));
-
-let checksumAddressSchema = S$RescriptSchema.transform(S$RescriptSchema.string, param => ({
-  p: str => Address.Evm.fromStringOrThrow(str)
-}));
-
-function makeBlockFieldRegistry(addressSchema) {
-  return Utils.Record.fromArray([
-    {
-      location: "number",
-      jsonKey: "number",
-      schema: Rpc.hexIntSchema
-    },
-    {
-      location: "timestamp",
-      jsonKey: "timestamp",
-      schema: Rpc.hexIntSchema
-    },
-    {
-      location: "hash",
-      jsonKey: "hash",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "parentHash",
-      jsonKey: "parentHash",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "nonce",
-      jsonKey: "nonce",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "sha3Uncles",
-      jsonKey: "sha3Uncles",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "logsBloom",
-      jsonKey: "logsBloom",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "transactionsRoot",
-      jsonKey: "transactionsRoot",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "stateRoot",
-      jsonKey: "stateRoot",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "receiptsRoot",
-      jsonKey: "receiptsRoot",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "miner",
-      jsonKey: "miner",
-      schema: addressSchema
-    },
-    {
-      location: "difficulty",
-      jsonKey: "difficulty",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "totalDifficulty",
-      jsonKey: "totalDifficulty",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "extraData",
-      jsonKey: "extraData",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "size",
-      jsonKey: "size",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "gasLimit",
-      jsonKey: "gasLimit",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "gasUsed",
-      jsonKey: "gasUsed",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "uncles",
-      jsonKey: "uncles",
-      schema: S$RescriptSchema.array(S$RescriptSchema.string)
-    },
-    {
-      location: "baseFeePerGas",
-      jsonKey: "baseFeePerGas",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "blobGasUsed",
-      jsonKey: "blobGasUsed",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "excessBlobGas",
-      jsonKey: "excessBlobGas",
-      schema: Rpc.hexBigintSchema
-    },
-    {
-      location: "parentBeaconBlockRoot",
-      jsonKey: "parentBeaconBlockRoot",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "withdrawalsRoot",
-      jsonKey: "withdrawalsRoot",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "l1BlockNumber",
-      jsonKey: "l1BlockNumber",
-      schema: Rpc.hexIntSchema
-    },
-    {
-      location: "sendCount",
-      jsonKey: "sendCount",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "sendRoot",
-      jsonKey: "sendRoot",
-      schema: S$RescriptSchema.string
-    },
-    {
-      location: "mixHash",
-      jsonKey: "mixHash",
-      schema: S$RescriptSchema.string
-    }
-  ].map(def => [
-    def.location,
-    Internal.evmNullableBlockFields.has(def.location) ? ({
-        location: def.location,
-        jsonKey: def.jsonKey,
-        schema: S$RescriptSchema.nullable(def.schema)
-      }) : def
-  ]));
-}
-
-let blockFieldRegistryLowercase = makeBlockFieldRegistry(lowercaseAddressSchema);
-
-let blockFieldRegistryChecksum = makeBlockFieldRegistry(checksumAddressSchema);
-
-function parseBlockFieldsFromJson(mutBlockAcc, fields, json) {
-  fields.forEach(def => {
-    let raw = json[def.jsonKey];
-    try {
-      let parsed = S$RescriptSchema.parseOrThrow(raw, def.schema);
-      mutBlockAcc[def.location] = parsed;
-      return;
-    } catch (raw_error) {
-      let error = Primitive_exceptions.internalToException(raw_error);
-      if (error.RE_EXN_ID === S$RescriptSchema.Raised) {
-        return Stdlib_JsError.throwWithMessage(`Invalid block field "` + def.location + `" found in the RPC response. Error: ` + S$RescriptSchema.$$Error.reason(error._1));
-      }
-      throw error;
-    }
-  });
-}
-
-function makeThrowingGetEventBlock(getBlockJson, lowercaseAddresses) {
-  let blockFieldRegistry = lowercaseAddresses ? blockFieldRegistryLowercase : blockFieldRegistryChecksum;
-  let fnsCache = new WeakMap();
-  return (log, selectedBlockFields) => {
-    let fn = fnsCache.get(selectedBlockFields);
-    let tmp;
-    if (fn !== undefined) {
-      tmp = fn;
-    } else {
-      let fields = [];
-      selectedBlockFields.forEach(fieldName => {
-        fields.push(blockFieldRegistry[fieldName]);
-      });
-      let fn$1 = selectedBlockFields.size === 0 ? param => Promise.resolve({}) : log => getBlockJson(log.blockNumber).then(json => {
-          let mutBlockAcc = {};
-          parseBlockFieldsFromJson(mutBlockAcc, fields, json);
-          return mutBlockAcc;
-        });
-      fnsCache.set(selectedBlockFields, fn$1);
-      tmp = fn$1;
-    }
-    return tmp(log);
-  };
-}
-
-function makeFieldRegistry(addressSchema) {
-  return Utils.Record.fromArray([
-    {
-      location: "gas",
-      jsonKey: "gas",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "gasPrice",
-      jsonKey: "gasPrice",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "input",
-      jsonKey: "input",
-      schema: S$RescriptSchema.string,
-      source: "TransactionOnly"
-    },
-    {
-      location: "nonce",
-      jsonKey: "nonce",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "value",
-      jsonKey: "value",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "v",
-      jsonKey: "v",
-      schema: S$RescriptSchema.string,
-      source: "TransactionOnly"
-    },
-    {
-      location: "r",
-      jsonKey: "r",
-      schema: S$RescriptSchema.string,
-      source: "TransactionOnly"
-    },
-    {
-      location: "s",
-      jsonKey: "s",
-      schema: S$RescriptSchema.string,
-      source: "TransactionOnly"
-    },
-    {
-      location: "yParity",
-      jsonKey: "yParity",
-      schema: S$RescriptSchema.string,
-      source: "TransactionOnly"
-    },
-    {
-      location: "maxPriorityFeePerGas",
-      jsonKey: "maxPriorityFeePerGas",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "maxFeePerGas",
-      jsonKey: "maxFeePerGas",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "maxFeePerBlobGas",
-      jsonKey: "maxFeePerBlobGas",
-      schema: Rpc.hexBigintSchema,
-      source: "TransactionOnly"
-    },
-    {
-      location: "blobVersionedHashes",
-      jsonKey: "blobVersionedHashes",
-      schema: S$RescriptSchema.array(S$RescriptSchema.string),
-      source: "TransactionOnly"
-    },
-    {
-      location: "gasUsed",
-      jsonKey: "gasUsed",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "cumulativeGasUsed",
-      jsonKey: "cumulativeGasUsed",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "effectiveGasPrice",
-      jsonKey: "effectiveGasPrice",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "contractAddress",
-      jsonKey: "contractAddress",
-      schema: addressSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "logsBloom",
-      jsonKey: "logsBloom",
-      schema: S$RescriptSchema.string,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "root",
-      jsonKey: "root",
-      schema: S$RescriptSchema.string,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "status",
-      jsonKey: "status",
-      schema: Rpc.hexIntSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "l1Fee",
-      jsonKey: "l1Fee",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "l1GasPrice",
-      jsonKey: "l1GasPrice",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "l1GasUsed",
-      jsonKey: "l1GasUsed",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "l1FeeScalar",
-      jsonKey: "l1FeeScalar",
-      schema: Rpc.decimalFloatSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "gasUsedForL1",
-      jsonKey: "gasUsedForL1",
-      schema: Rpc.hexBigintSchema,
-      source: "ReceiptOnly"
-    },
-    {
-      location: "from",
-      jsonKey: "from",
-      schema: addressSchema,
-      source: "Both"
-    },
-    {
-      location: "to",
-      jsonKey: "to",
-      schema: addressSchema,
-      source: "Both"
-    },
-    {
-      location: "type",
-      jsonKey: "type",
-      schema: Rpc.hexIntSchema,
-      source: "Both"
-    }
-  ].map(def => [
-    def.location,
-    Internal.evmNullableTransactionFields.has(def.location) ? ({
-        location: def.location,
-        jsonKey: def.jsonKey,
-        schema: S$RescriptSchema.nullable(def.schema),
-        source: def.source
-      }) : def
-  ]));
-}
-
-let fieldRegistryLowercase = makeFieldRegistry(lowercaseAddressSchema);
-
-let fieldRegistryChecksum = makeFieldRegistry(checksumAddressSchema);
-
-function isRpcTransactionField(name) {
-  switch (name) {
-    case "hash" :
-    case "transactionIndex" :
-      return true;
-    default:
-      return Stdlib_Option.isSome(fieldRegistryChecksum[name]);
-  }
-}
-
-function parseFieldsFromJson(mutTransactionAcc, fields, json) {
-  fields.forEach(def => {
-    let raw = json[def.jsonKey];
-    try {
-      let parsed = S$RescriptSchema.parseOrThrow(raw, def.schema);
-      mutTransactionAcc[def.location] = parsed;
-      return;
-    } catch (raw_error) {
-      let error = Primitive_exceptions.internalToException(raw_error);
-      if (error.RE_EXN_ID === S$RescriptSchema.Raised) {
-        return Stdlib_JsError.throwWithMessage(`Invalid transaction field "` + def.location + `" found in the RPC response. Error: ` + S$RescriptSchema.$$Error.reason(error._1));
-      }
-      throw error;
-    }
-  });
-}
-
-let effectiveGasPriceFallbackDef = {
-  location: "effectiveGasPrice",
-  jsonKey: "gasPrice",
-  schema: Rpc.hexBigintSchema,
-  source: "TransactionOnly"
-};
-
-function fillEffectiveGasPriceOrThrow(mutTransactionAcc, txJson) {
-  let gasPrice = txJson["gasPrice"];
-  if (gasPrice !== undefined) {
-    return parseFieldsFromJson(mutTransactionAcc, [effectiveGasPriceFallbackDef], txJson);
-  } else {
-    return Stdlib_JsError.throwWithMessage(`Neither "effectiveGasPrice" nor "gasPrice" is present in the RPC response for the transaction. Remove "effectiveGasPrice" from the field selection, or index this chain via HyperSync.`);
-  }
-}
-
-function makeThrowingGetEventTransaction(getTransactionJson, getReceiptJson, lowercaseAddresses) {
-  let fieldRegistry = lowercaseAddresses ? fieldRegistryLowercase : fieldRegistryChecksum;
-  let fnsCache = new WeakMap();
-  return (log, selectedTransactionFields) => {
-    let fn = fnsCache.get(selectedTransactionFields);
-    let tmp;
-    if (fn !== undefined) {
-      tmp = fn;
-    } else {
-      let hasTransactionIndex = {
-        contents: false
-      };
-      let hasHash = {
-        contents: false
-      };
-      let hasEffectiveGasPrice = {
-        contents: false
-      };
-      let txFields = [];
-      let receiptFields = [];
-      let bothFields = [];
-      selectedTransactionFields.forEach(fieldName => {
-        switch (fieldName) {
-          case "transactionIndex" :
-            hasTransactionIndex.contents = true;
-            return;
-          case "hash" :
-            hasHash.contents = true;
-            return;
-          default:
-            let def = fieldRegistry[fieldName];
-            if (def === undefined) {
-              return;
-            }
-            let def$1 = fieldName === "effectiveGasPrice" ? (hasEffectiveGasPrice.contents = true, {
-                location: def.location,
-                jsonKey: def.jsonKey,
-                schema: S$RescriptSchema.nullable(def.schema),
-                source: def.source
-              }) : def;
-            let match = def$1.source;
-            switch (match) {
-              case "TransactionOnly" :
-                txFields.push(def$1);
-                return;
-              case "ReceiptOnly" :
-                receiptFields.push(def$1);
-                return;
-              case "Both" :
-                bothFields.push(def$1);
-                return;
-            }
-        }
-      });
-      let match = txFields.length !== 0;
-      let match$1 = receiptFields.length !== 0;
-      let strategy = match ? (
-          match$1 ? "TransactionAndReceipt" : "TransactionOnly"
-        ) : (
-          match$1 ? "ReceiptOnly" : (
-              bothFields.length !== 0 ? "TransactionOnly" : "NoRpc"
-            )
-        );
-      let targetForBoth = strategy === "ReceiptOnly" ? receiptFields : txFields;
-      bothFields.forEach(f => {
-        targetForBoth.push(f);
-      });
-      let setLogFields = (mutTransactionAcc, log) => {
-        if (hasTransactionIndex.contents) {
-          mutTransactionAcc["transactionIndex"] = log.transactionIndex;
-        }
-        if (hasHash.contents) {
-          mutTransactionAcc["hash"] = log.transactionHash;
-          return;
-        }
-      };
-      let fn$1 = selectedTransactionFields.size === 0 ? param => Promise.resolve({}) : (
-          strategy === "NoRpc" ? log => {
-              let mutTransactionAcc = {};
-              setLogFields(mutTransactionAcc, log);
-              return Promise.resolve(mutTransactionAcc);
-            } : log => {
-              let txJsonPromise;
-              let exit = 0;
-              switch (strategy) {
-                case "NoRpc" :
-                case "ReceiptOnly" :
-                  txJsonPromise = Promise.resolve(undefined);
-                  break;
-                case "TransactionOnly" :
-                case "TransactionAndReceipt" :
-                  exit = 1;
-                  break;
-              }
-              if (exit === 1) {
-                txJsonPromise = getTransactionJson(log.transactionHash).then(v => v);
-              }
-              let receiptJsonPromise;
-              let exit$1 = 0;
-              switch (strategy) {
-                case "NoRpc" :
-                case "TransactionOnly" :
-                  receiptJsonPromise = Promise.resolve(undefined);
-                  break;
-                case "ReceiptOnly" :
-                case "TransactionAndReceipt" :
-                  exit$1 = 1;
-                  break;
-              }
-              if (exit$1 === 1) {
-                receiptJsonPromise = getReceiptJson(log.transactionHash).then(v => v);
-              }
-              return Promise.all([
-                txJsonPromise,
-                receiptJsonPromise
-              ]).then(param => {
-                let receiptJson = param[1];
-                let txJson = param[0];
-                let mutTransactionAcc = {};
-                setLogFields(mutTransactionAcc, log);
-                if (txJson !== undefined) {
-                  parseFieldsFromJson(mutTransactionAcc, txFields, txJson);
-                }
-                if (receiptJson !== undefined) {
-                  parseFieldsFromJson(mutTransactionAcc, receiptFields, receiptJson);
-                }
-                if (hasEffectiveGasPrice.contents && Stdlib_Option.isNone(mutTransactionAcc["effectiveGasPrice"])) {
-                  if (txJson !== undefined) {
-                    fillEffectiveGasPriceOrThrow(mutTransactionAcc, txJson);
-                    return Promise.resolve(mutTransactionAcc);
-                  } else {
-                    return getTransactionJson(log.transactionHash).then(json => {
-                      fillEffectiveGasPriceOrThrow(mutTransactionAcc, json);
-                      return mutTransactionAcc;
-                    });
-                  }
-                } else {
-                  return Promise.resolve(mutTransactionAcc);
-                }
-              }).then(mutTransactionAcc => mutTransactionAcc);
-            }
-        );
-      fnsCache.set(selectedTransactionFields, fn$1);
-      tmp = fn$1;
-    }
-    return tmp(log);
-  };
-}
-
 function make(param) {
-  let headers = param.headers;
-  let lowercaseAddresses = param.lowercaseAddresses;
+  let transactionStore = param.transactionStore;
+  let blockStore = param.blockStore;
   let onEventRegistrations = param.onEventRegistrations;
   let chainId = param.chainId;
   let url = param.url;
@@ -782,102 +24,10 @@ function make(param) {
   let host = Utils.Url.getHostFromUrl(url);
   let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + ChainId.toString(chainId) + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
-  let client = Rpc.makeClient(url, headers);
-  let rpcClient = EvmRpcClient.make(url, !lowercaseAddresses, syncConfig, undefined, headers, HyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), param.addressStore);
-  let pendingRequestStats = [];
-  let recordRequest = (method, seconds) => {
-    pendingRequestStats.push({
-      method: method,
-      seconds: seconds
-    });
-  };
-  let drainRequestStats = () => {
-    let stats = pendingRequestStats.slice();
-    Utils.$$Array.clearInPlace(pendingRequestStats);
-    return stats;
-  };
-  let makeTransactionLoader = () => LazyLoader.make(transactionHash => {
-    let timerRef = Performance.now();
-    return Rest.fetch(Rpc.GetTransactionByHash.rawRoute, transactionHash, client).then(res => {
-      recordRequest("eth_getTransactionByHash", Performance.secondsSince(timerRef));
-      return res;
-    });
-  }, (am, exn) => Logging.error({
-    err: Utils.prettifyExn(exn),
-    msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
-    source: name,
-    chainId: chainId,
-    metadata: {
-      asyncTaskName: "transactionLoader: fetching transaction data - `getTransaction` rpc call",
-      suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
-    }
-  }), undefined, undefined, undefined, undefined);
-  let makeBlockLoader = () => LazyLoader.make(blockNumber => getKnownRawBlockWithBackoff(client, name, chainId, blockNumber, 1000, recordRequest), (am, exn) => Logging.error({
-    err: Utils.prettifyExn(exn),
-    msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
-    source: name,
-    chainId: chainId,
-    metadata: {
-      asyncTaskName: "blockLoader: fetching block data - `getBlock` rpc call",
-      suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
-    }
-  }), undefined, undefined, undefined, undefined);
-  let makeReceiptLoader = () => LazyLoader.make(transactionHash => {
-    let timerRef = Performance.now();
-    return Rest.fetch(Rpc.GetTransactionReceipt.rawRoute, transactionHash, client).then(res => {
-      recordRequest("eth_getTransactionReceipt", Performance.secondsSince(timerRef));
-      return res;
-    });
-  }, (am, exn) => Logging.error({
-    err: Utils.prettifyExn(exn),
-    msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
-    source: name,
-    chainId: chainId,
-    metadata: {
-      asyncTaskName: "receiptLoader: fetching transaction receipt - `getTransactionReceipt` rpc call",
-      suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
-    }
-  }), undefined, undefined, undefined, undefined);
-  let blockLoader = {
-    contents: makeBlockLoader()
-  };
-  let transactionLoader = {
-    contents: makeTransactionLoader()
-  };
-  let receiptLoader = {
-    contents: makeReceiptLoader()
-  };
-  let resetCachedLoaders = () => {
-    blockLoader.contents = makeBlockLoader();
-    transactionLoader.contents = makeTransactionLoader();
-    receiptLoader.contents = makeReceiptLoader();
-  };
-  let getEventBlockOrThrow = makeThrowingGetEventBlock(blockNumber => LazyLoader.get(blockLoader.contents, blockNumber), lowercaseAddresses);
-  let getEventTransactionOrThrow = makeThrowingGetEventTransaction(async transactionHash => {
-    let json = await LazyLoader.get(transactionLoader.contents, transactionHash);
-    if (json !== undefined) {
-      return json;
-    }
-    throw {
-      RE_EXN_ID: TransactionDataNotFound,
-      message: `Transaction not found for hash: ` + transactionHash,
-      Error: new Error()
-    };
-  }, async transactionHash => {
-    let json = await LazyLoader.get(receiptLoader.contents, transactionHash);
-    if (json !== undefined) {
-      return json;
-    }
-    throw {
-      RE_EXN_ID: TransactionDataNotFound,
-      message: `Transaction receipt not found for hash: ` + transactionHash,
-      Error: new Error()
-    };
-  }, lowercaseAddresses);
+  let rpcClient = EvmRpcClient.make(url, !param.lowercaseAddresses, syncConfig, undefined, param.headers, HyperSyncClient.Registration.fromOnEventRegistrations(onEventRegistrations), param.addressStore);
   let getItemsOrThrow = async (fromBlock, toBlock, addressSet, param, knownHeight, partitionId, selection, param$1, retry, param$2) => {
-    let startFetchingBatchTimeRef = Performance.now();
+    let totalTimeRef = Performance.now();
     let toBlock$1 = toBlock !== undefined ? Primitive_int.min(toBlock, knownHeight) : knownHeight;
-    let firstBlockPromise = fromBlock > 0 && fromBlock <= toBlock$1 ? LazyLoader.get(blockLoader.contents, fromBlock).then(json => parseBlockInfo(json)) : Promise.resolve(undefined);
     if (Utils.$$Array.isEmpty(selection.onEventRegistrations)) {
       throw {
         RE_EXN_ID: Source.GetItemsError,
@@ -888,187 +38,94 @@ function make(param) {
         Error: new Error()
       };
     }
-    let match;
-    try {
-      match = await rpcClient.getNextPage({
-        fromBlock: fromBlock,
-        toBlockCeiling: toBlock$1,
-        partitionId: partitionId,
-        registrationIndexes: selection.onEventRegistrations.map(reg => reg.index),
-        clientFilteredContracts: selection.clientFilteredContracts
-      }, addressSet);
-    } catch (raw_exn) {
-      let exn = Primitive_exceptions.internalToException(raw_exn);
-      let match$1 = parseGetNextPageRetryError(exn);
-      if (match$1 !== undefined) {
-        match$1[2].forEach(stat => recordRequest(stat.method, stat.seconds));
+    let pageFetchTimeRef = Performance.now();
+    let match = await rpcClient.getNextPage({
+      fromBlock: fromBlock,
+      toBlockCeiling: toBlock$1,
+      partitionId: partitionId,
+      registrationIndexes: selection.onEventRegistrations.map(reg => reg.index),
+      clientFilteredContracts: selection.clientFilteredContracts,
+      retry: retry
+    }, addressSet, blockStore, transactionStore);
+    let result = match[0];
+    let pageFetchTime = Performance.secondsSince(pageFetchTimeRef);
+    let exn = Stdlib_Option.map(result.providerMessage, message => Primitive_exceptions.internalToException(new Error(message)));
+    let failedGettingItems = decision => ({
+      RE_EXN_ID: Source.GetItemsError,
+      _1: {
+        TAG: "FailedGettingItems",
+        exn: exn,
+        attemptedToBlock: result.toBlock,
+        retry: decision,
+        requestStats: result.requestStats
+      }
+    });
+    let missing = field => Stdlib_JsError.throwWithMessage(`The RPC client returned a "` + result.kind + `" outcome without a ` + field + `. Please, report to the Envio team.`);
+    let match$1 = result.kind;
+    switch (match$1) {
+      case "Ok" :
+        break;
+      case "SuggestedToBlock" :
+        let toBlock$2 = result.retryToBlock;
+        throw failedGettingItems({
+          TAG: "WithSuggestedToBlock",
+          toBlock: toBlock$2 !== undefined ? toBlock$2 : missing("retryToBlock")
+        });
+      case "Backoff" :
+        let message = result.message;
+        let backoffMillis = result.backoffMillis;
+        throw failedGettingItems({
+          TAG: "WithBackoff",
+          message: message !== undefined ? message : missing("message"),
+          backoffMillis: backoffMillis !== undefined ? backoffMillis : missing("backoffMillis")
+        });
+      case "FieldSelection" :
+        let blockNumber = result.blockNumber;
+        let message$1 = result.message;
         throw {
           RE_EXN_ID: Source.GetItemsError,
           _1: {
-            TAG: "FailedGettingItems",
+            TAG: "FailedGettingFieldSelection",
             exn: exn,
-            attemptedToBlock: match$1[0],
-            retry: match$1[1]
+            blockNumber: blockNumber !== undefined ? blockNumber : missing("blockNumber"),
+            message: message$1 !== undefined ? message$1 : missing("message"),
+            requestStats: result.requestStats
           },
           Error: new Error()
         };
-      }
-      throw {
-        RE_EXN_ID: Source.GetItemsError,
-        _1: {
-          TAG: "FailedGettingItems",
-          exn: exn,
-          attemptedToBlock: toBlock$1,
-          retry: {
-            TAG: "WithBackoff",
-            message: "Unexpected issue while fetching events from the RPC client. Attempt a retry.",
-            backoffMillis: retry !== 0 ? 1000 * retry | 0 : 500
-          }
-        },
-        Error: new Error()
-      };
-    }
-    let items = match.items;
-    match.requestStats.forEach(stat => recordRequest(stat.method, stat.seconds));
-    let latestFetchedBlockInfo = await LazyLoader.get(blockLoader.contents, match.toBlock).then(parseBlockInfo);
-    let parsedQueueItems = await Promise.all(items.map(param => {
-      let decoded = param.params;
-      let log = param.log;
-      let onEventRegistration = onEventRegistrations[param.onEventRegistrationIndex];
-      let eventConfig = onEventRegistration.eventConfig;
-      return (async () => {
-        let match;
-        try {
-          match = await Promise.all([
-            getEventBlockOrThrow(log, onEventRegistration.fieldSelection.blockFields),
-            getEventTransactionOrThrow(log, onEventRegistration.fieldSelection.transactionFields)
-          ]);
-        } catch (raw_exn) {
-          let exn = Primitive_exceptions.internalToException(raw_exn);
-          if (exn.RE_EXN_ID === TransactionDataNotFound) {
-            let backoffMillis = retry !== 0 ? 500 * retry | 0 : 100;
-            throw {
-              RE_EXN_ID: Source.GetItemsError,
-              _1: {
-                TAG: "FailedGettingItems",
-                exn: null,
-                attemptedToBlock: toBlock$1,
-                retry: {
-                  TAG: "WithBackoff",
-                  message: exn.message + `. The RPC provider might be load-balanced between nodes that drift independently slightly from the head. Indexing should continue correctly after retrying the query in ` + backoffMillis.toString() + `ms.`,
-                  backoffMillis: backoffMillis
-                }
-              },
-              Error: new Error()
-            };
-          }
-          throw {
-            RE_EXN_ID: Source.GetItemsError,
-            _1: {
-              TAG: "FailedGettingFieldSelection",
-              exn: exn,
-              blockNumber: log.blockNumber,
-              logIndex: log.logIndex,
-              message: "Failed getting selected fields. Please double-check your RPC provider returns correct data."
-            },
-            Error: new Error()
-          };
-        }
-        let block = match[0];
-        return {
-          kind: 0,
-          onEventRegistration: onEventRegistration,
-          chainId: chainId,
-          blockNumber: block.number,
-          logIndex: log.logIndex,
-          transactionIndex: log.transactionIndex,
-          payload: {
-            contractName: eventConfig.contractName,
-            eventName: eventConfig.name,
-            params: decoded,
-            chainId: chainId,
-            srcAddress: log.address,
-            logIndex: log.logIndex,
-            transaction: Primitive_option.some(match[1]),
-            block: Primitive_option.some(block)
-          }
-        };
-      })();
-    }));
-    let optFirstBlock = await firstBlockPromise;
-    let totalTimeElapsed = Performance.secondsSince(startFetchingBatchTimeRef);
-    let observedBlocks = [];
-    let pushBlockInfo = b => {
-      observedBlocks.push({
-        blockNumber: b.number,
-        blockHash: b.hash,
-        blockTimestamp: b.timestamp
-      });
-      if (b.number > 0) {
-        observedBlocks.push({
-          blockNumber: b.number - 1 | 0,
-          blockHash: b.parentHash
-        });
-        return;
-      }
-    };
-    pushBlockInfo(latestFetchedBlockInfo);
-    if (optFirstBlock !== undefined) {
-      pushBlockInfo(optFirstBlock);
     }
-    items.forEach(param => {
-      let log = param.log;
-      observedBlocks.push({
-        blockNumber: log.blockNumber,
-        blockHash: log.blockHash
-      });
-    });
+    let parsingTimeRef = Performance.now();
+    let parsedQueueItems = EvmEventItem.toInternalItems(result.items, onEventRegistrations, chainId);
+    let parsingTimeElapsed = Performance.secondsSince(parsingTimeRef);
     return {
       knownHeight: knownHeight,
       parsedQueueItems: parsedQueueItems,
-      transactionStore: undefined,
-      blockStore: BlockStore.fromJs(observedBlocks, "evm", !lowercaseAddresses),
-      fromBlockQueried: fromBlock,
-      latestFetchedBlockNumber: latestFetchedBlockInfo.number,
+      transactionStore: Primitive_option.some(match[2]),
+      blockStore: match[1],
+      latestFetchedBlockNumber: result.toBlock,
       stats: {
-        "total time elapsed (s)": totalTimeElapsed
+        "total time elapsed (s)": Performance.secondsSince(totalTimeRef),
+        "parsing time (s)": parsingTimeElapsed,
+        "page fetch time (s)": pageFetchTime
       },
-      requestStats: drainRequestStats()
+      requestStats: result.requestStats
     };
   };
-  let onReorg = () => resetCachedLoaders();
-  let getBlockHashes = (blockNumbers, _currentlyUnusedLogger) => Stdlib_Promise.$$catch(Promise.all(blockNumbers.map(blockNum => LazyLoader.get(blockLoader.contents, blockNum))).then(rawBlocks => {
-    let observedBlocks = [];
-    rawBlocks.forEach(json => {
-      let b = parseBlockInfo(json);
-      observedBlocks.push({
-        blockNumber: b.number,
-        blockHash: b.hash,
-        blockTimestamp: b.timestamp
-      });
-      if (b.number > 0) {
-        observedBlocks.push({
-          blockNumber: b.number - 1 | 0,
-          blockHash: b.parentHash
-        });
-        return;
-      }
-    });
-    let blockStore = BlockStore.fromJs(observedBlocks, "evm", !lowercaseAddresses);
+  let getBlockHashes = async (blockNumbers, param) => {
+    let match = await rpcClient.getBlockHashes(blockNumbers);
+    let result = match[0];
+    let message = result.message;
     return {
-      result: {
-        TAG: "Ok",
-        _0: blockStore
-      },
-      requestStats: drainRequestStats()
+      result: message !== undefined ? ({
+          TAG: "Error",
+          _0: Primitive_exceptions.internalToException(new Error(message))
+        }) : ({
+          TAG: "Ok",
+          _0: match[1]
+        }),
+      requestStats: result.requestStats
     };
-  }), exn => Promise.resolve({
-    result: {
-      TAG: "Error",
-      _0: exn
-    },
-    requestStats: drainRequestStats()
-  }));
+  };
   let createHeightSubscription = Stdlib_Option.map(param.ws, wsUrl => ((onHeight, onStatus) => EvmRpcWs.subscribe(wsUrl, onHeight, onStatus)));
   return {
     name: name,
@@ -1078,51 +135,19 @@ function make(param) {
     pollingInterval: syncConfig.pollingInterval,
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
-      let timerRef = Performance.now();
-      let height;
-      try {
-        height = await rpcClient.getHeight();
-      } catch (exn) {
-        recordRequest("eth_blockNumber", Performance.secondsSince(timerRef));
-        throw exn;
-      }
-      recordRequest("eth_blockNumber", Performance.secondsSince(timerRef));
+      let match = await rpcClient.getHeight();
       return {
-        height: height,
-        requestStats: drainRequestStats()
+        height: match[0],
+        requestStats: match[1]
       };
     },
     getItemsOrThrow: getItemsOrThrow,
     createHeightSubscription: createHeightSubscription,
-    onReorg: onReorg
+    onReorg: () => rpcClient.onReorg()
   };
 }
 
-let effectiveGasPriceKey = "effectiveGasPrice";
-
 export {
-  TransactionDataNotFound,
-  getKnownRawBlock,
-  parseBlockInfo,
-  getKnownRawBlockWithBackoff,
-  getErrorMessage,
-  parseGetNextPageRetryError,
-  lowercaseAddressSchema,
-  checksumAddressSchema,
-  makeBlockFieldRegistry,
-  blockFieldRegistryLowercase,
-  blockFieldRegistryChecksum,
-  parseBlockFieldsFromJson,
-  makeThrowingGetEventBlock,
-  makeFieldRegistry,
-  fieldRegistryLowercase,
-  fieldRegistryChecksum,
-  isRpcTransactionField,
-  parseFieldsFromJson,
-  effectiveGasPriceKey,
-  effectiveGasPriceFallbackDef,
-  fillEffectiveGasPriceOrThrow,
-  makeThrowingGetEventTransaction,
   make,
 }
-/* lowercaseAddressSchema Not a pure module */
+/* Utils Not a pure module */