envio 3.0.0-alpha.0 → 3.0.0-alpha.10

package/src/sources/HyperSyncSource.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Viem from "../bindings/Viem.res.mjs";
+import * as Rest from "../vendored/Rest.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Js_exn from "rescript/lib/es6/js_exn.js";
@@ -15,7 +15,9 @@ import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
 import * as HyperSyncClient from "./HyperSyncClient.res.mjs";
 import * as Caml_splice_call from "rescript/lib/es6/caml_splice_call.js";
+import * as HyperSyncJsonApi from "./HyperSyncJsonApi.res.mjs";
 import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js";
+import * as HyperSyncHeightStream from "./HyperSyncHeightStream.res.mjs";
 
 function getSelectionConfig(selection, chain) {
   var nonOptionalBlockFieldNames = new Set();
@@ -120,71 +122,16 @@ function memoGetSelectionConfig(chain) {
   };
 }
 
-async function makeInternal(client) {
-  return {
-          heightStream: await client.streamHeight(),
-          currentHeight: 0,
-          errMessage: undefined
-        };
-}
-
-async function start(state, chainId) {
-  while(true) {
-    var height = await state.heightStream.recv();
-    if (typeof height !== "object") {
-      Logging.trace({
-            msg: "HyperSync height stream is connected",
-            chainId: chainId
-          });
-      state.errMessage = undefined;
-    } else if (height.type === "Height") {
-      state.currentHeight = height.height;
-    } else {
-      var errorMsg = height.errorMsg;
-      Logging.trace({
-            msg: "HyperSync height stream is reconnecting",
-            err: errorMsg,
-            delayMillis: height.delayMillis,
-            chainId: chainId
-          });
-      state.errMessage = errorMsg;
-    }
-  };
-}
-
-async function make(client, chainId) {
-  var state = await makeInternal(client);
-  start(state, chainId);
-  return state;
-}
-
-async function getHeight(state) {
-  while(state.currentHeight === 0 && Belt_Option.isNone(state.errMessage)) {
-    await Utils.delay(200);
-  };
-  var errMessage = state.errMessage;
-  if (errMessage !== undefined) {
-    return Js_exn.raiseError(errMessage);
-  } else {
-    return state.currentHeight;
-  }
-}
-
-var HeightState = {
-  make: make,
-  getHeight: getHeight
-};
-
-function make$1(param) {
+function make(param) {
   var lowercaseAddresses = param.lowercaseAddresses;
+  var apiToken = param.apiToken;
   var eventRouter = param.eventRouter;
-  var shouldUseHypersyncClientDecoder = param.shouldUseHypersyncClientDecoder;
   var allEventSignatures = param.allEventSignatures;
   var endpointUrl = param.endpointUrl;
   var chain = param.chain;
   var getSelectionConfig = memoGetSelectionConfig(chain);
-  var apiToken = Belt_Option.getWithDefault(param.apiToken, "3dc856dd-b0ea-494f-b27e-017b8b6b7e07");
-  var client = HyperSyncClient.make(endpointUrl, apiToken, param.clientTimeoutMillis, param.clientMaxRetries, !lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined);
+  var apiToken$1 = apiToken !== undefined ? apiToken : Js_exn.raiseError("An API token is required for using HyperSync as a data-source.\nSet the ENVIO_API_TOKEN environment variable in your .env file.\nLearn more or get a free API token at: https://envio.dev/app/api-tokens");
+  var client = HyperSyncClient.make(endpointUrl, apiToken$1, param.clientTimeoutMillis, param.clientMaxRetries, !lowercaseAddresses, param.serializationFormat, param.enableQueryCaching, undefined, undefined, undefined);
   var hscDecoder = {
     contents: undefined
   };
@@ -199,7 +146,7 @@ function make$1(param) {
     }
     catch (raw_exn){
       var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      return ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate a decoder from hypersync client, please double check your ABI or try using 'event_decoder: viem' config option", exn);
+      return ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate a decoder from hypersync client, please double check your ABI", exn);
     }
     if (lowercaseAddresses) {
       decoder$1.disableChecksummedAddresses();
@@ -229,11 +176,7 @@ function make$1(param) {
             }
           };
   };
-  var contractNameAbiMapping = {};
-  Belt_Array.forEach(param.contracts, (function (contract) {
-          contractNameAbiMapping[contract.name] = contract.abi;
-        }));
-  var getItemsOrThrow = async function (fromBlock, toBlock, addressesByContractName, indexingContracts, currentBlockHeight, param, selection, retry, logger) {
+  var getItemsOrThrow = async function (fromBlock, toBlock, addressesByContractName, indexingContracts, knownHeight, param, selection, retry, logger) {
     var mkLogAndRaise = function (extra, extra$1) {
       return ErrorHandling.mkLogAndRaise(logger, extra, extra$1);
     };
@@ -275,7 +218,7 @@ function make$1(param) {
               _1: {
                 TAG: "FailedGettingItems",
                 exn: null,
-                attemptedToBlock: Belt_Option.getWithDefault(toBlock, currentBlockHeight),
+                attemptedToBlock: Belt_Option.getWithDefault(toBlock, knownHeight),
                 retry: tmp
               },
               Error: new Error()
@@ -286,7 +229,7 @@ function make$1(param) {
             _1: {
               TAG: "FailedGettingItems",
               exn: error,
-              attemptedToBlock: Belt_Option.getWithDefault(toBlock, currentBlockHeight),
+              attemptedToBlock: Belt_Option.getWithDefault(toBlock, knownHeight),
               retry: {
                 TAG: "WithBackoff",
                 message: "Unexpected issue while fetching events from HyperSync client. Attempt a retry.",
@@ -297,7 +240,7 @@ function make$1(param) {
           };
     }
     var pageFetchTime = Hrtime.intFromMillis(Hrtime.toMillis(Hrtime.timeSince(startFetchingBatchTimeRef)));
-    var currentBlockHeight$1 = pageUnsafe.archiveHeight;
+    var knownHeight$1 = pageUnsafe.archiveHeight;
     var heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
     var match = pageUnsafe.rollbackGuard;
     var lastBlockQueriedPromise;
@@ -325,7 +268,7 @@ function make$1(param) {
         exit = 1;
       }
       if (exit === 1) {
-        lastBlockQueriedPromise = HyperSync.queryBlockData(endpointUrl, apiToken, heighestBlockQueried, logger).then(function (res) {
+        lastBlockQueriedPromise = HyperSync.queryBlockData(endpointUrl, apiToken$1, heighestBlockQueried, logger).then(function (res) {
               if (res.TAG !== "Ok") {
                 return mkLogAndRaise("Failed to query blockData for block " + String(heighestBlockQueried), HyperSync.queryErrorToMsq(res._0));
               }
@@ -343,67 +286,46 @@ function make$1(param) {
     }
     var parsingTimeRef = Hrtime.makeTimer();
     var parsedQueueItems = [];
-    var handleDecodeFailure = function (eventConfig, decoder, logIndex, blockNumber, chainId, exn) {
-      if (eventConfig.isWildcard) {
-        return ;
-      }
-      var msg = "Event " + eventConfig.name + " was unexpectedly parsed as undefined";
-      var logger$1 = Logging.createChildFrom(logger, {
-            chainId: chainId,
-            blockNumber: blockNumber,
-            logIndex: logIndex,
-            decoder: decoder
-          });
-      ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
-    };
-    if (shouldUseHypersyncClientDecoder) {
-      var parsedEvents;
-      try {
-        parsedEvents = await getHscDecoder().decodeEvents(pageUnsafe.events);
-      }
-      catch (raw_exn$1){
-        var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
-        parsedEvents = mkLogAndRaise("Failed to parse events using hypersync client, please double check your ABI.", exn$1);
-      }
-      Belt_Array.forEachWithIndex(pageUnsafe.items, (function (index, item) {
-              var block = item.block;
-              var log = item.log;
-              var topic0 = log.topics[0];
-              var maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), log.address, block.number, indexingContracts);
-              var maybeDecodedEvent = parsedEvents[index];
-              if (maybeEventConfig === undefined) {
-                return ;
-              }
-              if (maybeDecodedEvent === null || maybeDecodedEvent === undefined) {
-                maybeDecodedEvent === null;
-              } else {
-                parsedQueueItems.push(makeEventBatchQueueItem(item, maybeEventConfig.convertHyperSyncEventArgs(maybeDecodedEvent), maybeEventConfig));
-                return ;
-              }
-              handleDecodeFailure(maybeEventConfig, "hypersync-client", log.logIndex, block.number, chain, {
-                    RE_EXN_ID: UndefinedValue
-                  });
-            }));
-    } else {
-      Belt_Array.forEach(pageUnsafe.items, (function (item) {
-              var block = item.block;
-              var log = item.log;
-              var topic0 = log.topics[0];
-              var eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), log.address, block.number, indexingContracts);
-              if (eventConfig === undefined) {
-                return ;
-              }
-              var decodedEvent;
-              try {
-                decodedEvent = Viem.parseLogOrThrow(contractNameAbiMapping, eventConfig.contractName, log.topics, log.data);
-              }
-              catch (raw_exn){
-                var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                return handleDecodeFailure(eventConfig, "viem", log.logIndex, block.number, chain, exn);
-              }
-              parsedQueueItems.push(makeEventBatchQueueItem(item, decodedEvent.args, eventConfig));
-            }));
+    var parsedEvents;
+    try {
+      parsedEvents = await getHscDecoder().decodeEvents(pageUnsafe.events);
+    }
+    catch (raw_exn$1){
+      var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
+      parsedEvents = mkLogAndRaise("Failed to parse events using hypersync client, please double check your ABI.", exn$1);
     }
+    Belt_Array.forEachWithIndex(pageUnsafe.items, (function (index, item) {
+            var block = item.block;
+            var log = item.log;
+            var topic0 = log.topics[0];
+            var maybeEventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), log.address, block.number, indexingContracts);
+            var maybeDecodedEvent = parsedEvents[index];
+            if (maybeEventConfig === undefined) {
+              return ;
+            }
+            if (maybeDecodedEvent === null || maybeDecodedEvent === undefined) {
+              maybeDecodedEvent === null;
+            } else {
+              parsedQueueItems.push(makeEventBatchQueueItem(item, maybeEventConfig.convertHyperSyncEventArgs(maybeDecodedEvent), maybeEventConfig));
+              return ;
+            }
+            var logIndex = log.logIndex;
+            var blockNumber = block.number;
+            var exn = {
+              RE_EXN_ID: UndefinedValue
+            };
+            if (maybeEventConfig.isWildcard) {
+              return ;
+            }
+            var msg = "Event " + maybeEventConfig.name + " was unexpectedly parsed as undefined";
+            var logger$1 = Logging.createChildFrom(logger, {
+                  chainId: chain,
+                  blockNumber: blockNumber,
+                  logIndex: logIndex,
+                  decoder: "hypersync-client"
+                });
+            ErrorHandling.mkLogAndRaise(logger$1, msg, exn);
+          }));
     var parsingTimeElapsed = Hrtime.intFromMillis(Hrtime.toMillis(Hrtime.timeSince(parsingTimeRef)));
     var rangeLastBlock = await lastBlockQueriedPromise;
     var reorgGuard_prevRangeLastBlock = Belt_Option.map(pageUnsafe.rollbackGuard, (function (v) {
@@ -425,7 +347,7 @@ function make$1(param) {
       "page fetch time (ms)": stats_page$unknownfetch$unknowntime$unknown$lparms$rpar
     };
     return {
-            currentBlockHeight: currentBlockHeight$1,
+            knownHeight: knownHeight$1,
             reorgGuard: reorgGuard,
             parsedQueueItems: parsedQueueItems,
             fromBlockQueried: fromBlock,
@@ -435,44 +357,40 @@ function make$1(param) {
           };
   };
   var getBlockHashes = function (blockNumbers, logger) {
-    return HyperSync.queryBlockDataMulti(endpointUrl, apiToken, blockNumbers, logger).then(HyperSync.mapExn);
+    return HyperSync.queryBlockDataMulti(endpointUrl, apiToken$1, blockNumbers, logger).then(HyperSync.mapExn);
   };
-  var heightStatePromise = make(client, chain);
+  var jsonApiClient = Rest.client(endpointUrl, undefined);
   return {
           name: "HyperSync",
           sourceFor: "Sync",
           chain: chain,
           poweredByHyperSync: true,
-          pollingInterval: 32,
+          pollingInterval: 100,
           getBlockHashes: getBlockHashes,
           getHeightOrThrow: (async function () {
-              var heightState = await heightStatePromise;
-              try {
-                return await getHeight(heightState);
-              }
-              catch (raw_exn){
-                var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                if (exn.RE_EXN_ID === Js_exn.$$Error) {
-                  if (Belt_Option.getWithDefault(exn._1.message, "").includes("Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.")) {
-                    Logging.error("Your ENVIO_API_TOKEN is malformed. The indexer will not be able to fetch events. Update the token and restart the indexer using 'pnpm envio start'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens");
-                    await new Promise((function (param, param$1) {
-                            
-                          }));
-                    return 0;
-                  }
-                  throw exn;
-                }
-                throw exn;
+              var height = await Rest.$$fetch(HyperSyncJsonApi.heightRoute, apiToken$1, jsonApiClient);
+              if (typeof height === "number") {
+                return height;
+              } else if (height === "Your token is malformed. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens.") {
+                Logging.error("Your ENVIO_API_TOKEN is malformed. The indexer will not be able to fetch events. Update the token and restart the indexer using 'pnpm envio start'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens");
+                await new Promise((function (param, param$1) {
+                        
+                      }));
+                return 0;
+              } else {
+                return Js_exn.raiseError(height);
               }
             }),
-          getItemsOrThrow: getItemsOrThrow
+          getItemsOrThrow: getItemsOrThrow,
+          createHeightSubscription: (function (onHeight) {
+              return HyperSyncHeightStream.subscribe(endpointUrl, apiToken$1, onHeight);
+            })
         };
 }
 
 export {
   getSelectionConfig ,
   memoGetSelectionConfig ,
-  HeightState ,
-  make$1 as make,
+  make ,
 }
-/* Viem Not a pure module */
+/* Rest Not a pure module */

package/src/sources/Rpc.res

@@ -179,3 +179,46 @@ module GetBlockByNumber = {
 module GetBlockHeight = {
   let route = makeRpcRoute("eth_blockNumber", S.tuple(_ => ()), hexIntSchema)
 }
+
+module GetTransactionByHash = {
+  let transactionSchema = S.object((s): Internal.evmTransactionFields => {
+    // We already know the data so ignore the fields
+    // blockHash: ?s.field("blockHash", S.option(S.string)),
+    // blockNumber: ?s.field("blockNumber", S.option(hexIntSchema)),
+    // chainId: ?s.field("chainId", S.option(hexIntSchema)),
+    from: ?s.field("from", S.option(S.string->(Utils.magic: S.t<string> => S.t<Address.t>))),
+    to: ?s.field("to", S.option(S.string->(Utils.magic: S.t<string> => S.t<Address.t>))),
+    gas: ?s.field("gas", S.option(hexBigintSchema)),
+    gasPrice: ?s.field("gasPrice", S.option(hexBigintSchema)),
+    hash: ?s.field("hash", S.option(S.string)),
+    input: ?s.field("input", S.option(S.string)),
+    nonce: ?s.field("nonce", S.option(hexBigintSchema)),
+    transactionIndex: ?s.field("transactionIndex", S.option(hexIntSchema)),
+    value: ?s.field("value", S.option(hexBigintSchema)),
+    type_: ?s.field("type", S.option(hexIntSchema)),
+    // Signature fields - optional for ZKSync EIP-712 compatibility
+    v: ?s.field("v", S.option(S.string)),
+    r: ?s.field("r", S.option(S.string)),
+    s: ?s.field("s", S.option(S.string)),
+    yParity: ?s.field("yParity", S.option(S.string)),
+    // EIP-1559 fields
+    maxPriorityFeePerGas: ?s.field("maxPriorityFeePerGas", S.option(hexBigintSchema)),
+    maxFeePerGas: ?s.field("maxFeePerGas", S.option(hexBigintSchema)),
+    // EIP-4844 blob fields
+    maxFeePerBlobGas: ?s.field("maxFeePerBlobGas", S.option(hexBigintSchema)),
+    blobVersionedHashes: ?s.field("blobVersionedHashes", S.option(S.array(S.string))),
+    // TODO: Fields to add:
+    // pub access_list: Option<Vec<AccessList>>,
+    // pub authorization_list: Option<Vec<Authorization>>,
+    // // OP stack fields
+    // pub deposit_receipt_version: Option<Quantity>,
+    // pub mint: Option<Quantity>,
+    // pub source_hash: Option<Hash>,
+  })
+
+  let route = makeRpcRoute(
+    "eth_getTransactionByHash",
+    S.tuple1(S.string),
+    S.null(transactionSchema),
+  )
+}

package/src/sources/Rpc.res.mjs

@@ -187,6 +187,36 @@ var GetBlockHeight = {
   route: route$2
 };
 
+var transactionSchema = S$RescriptSchema.object(function (s) {
+      return {
+              from: s.f("from", S$RescriptSchema.option(S$RescriptSchema.string)),
+              to: s.f("to", S$RescriptSchema.option(S$RescriptSchema.string)),
+              gas: s.f("gas", S$RescriptSchema.option(hexBigintSchema)),
+              gasPrice: s.f("gasPrice", S$RescriptSchema.option(hexBigintSchema)),
+              hash: s.f("hash", S$RescriptSchema.option(S$RescriptSchema.string)),
+              input: s.f("input", S$RescriptSchema.option(S$RescriptSchema.string)),
+              nonce: s.f("nonce", S$RescriptSchema.option(hexBigintSchema)),
+              transactionIndex: s.f("transactionIndex", S$RescriptSchema.option(hexIntSchema)),
+              value: s.f("value", S$RescriptSchema.option(hexBigintSchema)),
+              v: s.f("v", S$RescriptSchema.option(S$RescriptSchema.string)),
+              r: s.f("r", S$RescriptSchema.option(S$RescriptSchema.string)),
+              s: s.f("s", S$RescriptSchema.option(S$RescriptSchema.string)),
+              yParity: s.f("yParity", S$RescriptSchema.option(S$RescriptSchema.string)),
+              maxPriorityFeePerGas: s.f("maxPriorityFeePerGas", S$RescriptSchema.option(hexBigintSchema)),
+              maxFeePerGas: s.f("maxFeePerGas", S$RescriptSchema.option(hexBigintSchema)),
+              maxFeePerBlobGas: s.f("maxFeePerBlobGas", S$RescriptSchema.option(hexBigintSchema)),
+              blobVersionedHashes: s.f("blobVersionedHashes", S$RescriptSchema.option(S$RescriptSchema.array(S$RescriptSchema.string))),
+              type: s.f("type", S$RescriptSchema.option(hexIntSchema))
+            };
+    });
+
+var route$3 = makeRpcRoute("eth_getTransactionByHash", S$RescriptSchema.tuple1(S$RescriptSchema.string), S$RescriptSchema.$$null(transactionSchema));
+
+var GetTransactionByHash = {
+  transactionSchema: transactionSchema,
+  route: route$3
+};
+
 export {
   makeRpcRoute ,
   makeHexSchema ,
@@ -195,5 +225,6 @@ export {
   GetLogs ,
   GetBlockByNumber ,
   GetBlockHeight ,
+  GetTransactionByHash ,
 }
 /* hexBigintSchema Not a pure module */

package/src/sources/RpcSource.res

@@ -468,25 +468,13 @@ type options = {
   syncConfig: Config.sourceSync,
   url: string,
   chain: ChainMap.Chain.t,
-  contracts: array<Internal.evmContractConfig>,
   eventRouter: EventRouter.t<Internal.evmEventConfig>,
   allEventSignatures: array<string>,
-  shouldUseHypersyncClientDecoder: bool,
   lowercaseAddresses: bool,
 }
 
 let make = (
-  {
-    sourceFor,
-    syncConfig,
-    url,
-    chain,
-    contracts,
-    eventRouter,
-    allEventSignatures,
-    shouldUseHypersyncClientDecoder,
-    lowercaseAddresses,
-  }: options,
+  {sourceFor, syncConfig, url, chain, eventRouter, allEventSignatures, lowercaseAddresses}: options,
 ): t => {
   let urlHost = switch sanitizeUrl(url) {
   | None =>
@@ -503,10 +491,12 @@ let make = (
 
   let mutSuggestedBlockIntervals = Js.Dict.empty()
 
+  let client = Rest.client(url)
+
   let makeTransactionLoader = () =>
     LazyLoader.make(
       ~loaderFn=transactionHash =>
-        provider->Ethers.JsonRpcProvider.getTransaction(~transactionHash),
+        Rpc.GetTransactionByHash.route->Rest.fetch(transactionHash, ~client),
       ~onError=(am, ~exn) => {
         Logging.error({
           "err": exn->Utils.prettifyExn,
@@ -560,16 +550,16 @@ let make = (
   )
   let getEventTransactionOrThrow = makeThrowingGetEventTransaction(
     ~getTransactionFields=Ethers.JsonRpcProvider.makeGetTransactionFields(
-      ~getTransactionByHash=LazyLoader.get(transactionLoader.contents, _),
+      ~getTransactionByHash=async transactionHash => {
+        switch await transactionLoader.contents->LazyLoader.get(transactionHash) {
+        | Some(tx) => tx
+        | None => Js.Exn.raiseError(`Transaction not found for hash: ${transactionHash}`)
+        }
+      },
       ~lowercaseAddresses,
     ),
   )
 
-  let contractNameAbiMapping = Js.Dict.empty()
-  contracts->Belt.Array.forEach(contract => {
-    contractNameAbiMapping->Js.Dict.set(contract.name, contract.abi)
-  })
-
   let convertEthersLogToHyperSyncEvent = (log: Ethers.log): HyperSyncClient.ResponseTypes.event => {
     let hyperSyncLog: HyperSyncClient.ResponseTypes.log = {
       removed: log.removed->Option.getWithDefault(false),
@@ -601,7 +591,7 @@ let make = (
     ~toBlock,
     ~addressesByContractName,
     ~indexingContracts,
-    ~currentBlockHeight,
+    ~knownHeight,
     ~partitionId,
     ~selection: FetchState.selection,
     ~retry as _,
@@ -621,8 +611,8 @@ let make = (
 
     // Always have a toBlock for an RPC worker
     let toBlock = switch toBlock {
-    | Some(toBlock) => Pervasives.min(toBlock, currentBlockHeight)
-    | None => currentBlockHeight
+    | Some(toBlock) => Pervasives.min(toBlock, knownHeight)
+    | None => knownHeight
     }
 
     let suggestedToBlock = Pervasives.min(fromBlock + suggestedBlockInterval - 1, toBlock)
@@ -669,26 +659,26 @@ let make = (
       )
     }
 
-    let parsedQueueItems = if shouldUseHypersyncClientDecoder {
-      // Convert Ethers logs to HyperSync events
-      let hyperSyncEvents = logs->Belt.Array.map(convertEthersLogToHyperSyncEvent)
-
-      // Decode using HyperSyncClient decoder
-      let parsedEvents = try await getHscDecoder().decodeEvents(hyperSyncEvents) catch {
-      | exn =>
-        raise(
-          Source.GetItemsError(
-            FailedGettingItems({
-              exn,
-              attemptedToBlock: toBlock,
-              retry: ImpossibleForTheQuery({
-                message: "Failed to parse events using hypersync client decoder. Please double-check your ABI.",
-              }),
+    // Convert Ethers logs to HyperSync events
+    let hyperSyncEvents = logs->Belt.Array.map(convertEthersLogToHyperSyncEvent)
+
+    // Decode using HyperSyncClient decoder
+    let parsedEvents = try await getHscDecoder().decodeEvents(hyperSyncEvents) catch {
+    | exn =>
+      raise(
+        Source.GetItemsError(
+          FailedGettingItems({
+            exn,
+            attemptedToBlock: toBlock,
+            retry: ImpossibleForTheQuery({
+              message: "Failed to parse events using hypersync client decoder. Please double-check your ABI.",
             }),
-          ),
-        )
-      }
+          }),
+        ),
+      )
+    }
 
+    let parsedQueueItems =
       await logs
       ->Array.zip(parsedEvents)
       ->Array.keepMap(((
@@ -764,92 +754,6 @@ let make = (
         }
       })
       ->Promise.all
-    } else {
-      // Decode using Viem
-      await logs
-      ->Belt.Array.keepMap(log => {
-        let topic0 = log.topics->Js.Array2.unsafe_get(0)
-
-        switch eventRouter->EventRouter.get(
-          ~tag=EventRouter.getEvmEventId(
-            ~sighash=topic0->EvmTypes.Hex.toString,
-            ~topicCount=log.topics->Array.length,
-          ),
-          ~indexingContracts,
-          ~contractAddress=log.address,
-          ~blockNumber=log.blockNumber,
-        ) {
-        | None => None //ignore events that aren't registered
-        | Some(eventConfig) =>
-          let blockNumber = log.blockNumber
-          let logIndex = log.logIndex
-          Some(
-            (
-              async () => {
-                let (block, transaction) = try await Promise.all2((
-                  log->getEventBlockOrThrow,
-                  log->getEventTransactionOrThrow(~transactionSchema=eventConfig.transactionSchema),
-                )) catch {
-                // Promise.catch won't work here, because the error
-                // might be thrown before a microtask is created
-                | exn =>
-                  raise(
-                    Source.GetItemsError(
-                      FailedGettingFieldSelection({
-                        message: "Failed getting selected fields. Please double-check your RPC provider returns correct data.",
-                        exn,
-                        blockNumber,
-                        logIndex,
-                      }),
-                    ),
-                  )
-                }
-
-                let decodedEvent = try contractNameAbiMapping->Viem.parseLogOrThrow(
-                  ~contractName=eventConfig.contractName,
-                  ~topics=log.topics,
-                  ~data=log.data,
-                ) catch {
-                | exn =>
-                  raise(
-                    Source.GetItemsError(
-                      FailedGettingItems({
-                        exn,
-                        attemptedToBlock: toBlock,
-                        retry: ImpossibleForTheQuery({
-                          message: `Failed to parse event with viem, please double-check your ABI. Block number: ${blockNumber->Int.toString}, log index: ${logIndex->Int.toString}`,
-                        }),
-                      }),
-                    ),
-                  )
-                }
-
-                Internal.Event({
-                  eventConfig: (eventConfig :> Internal.eventConfig),
-                  timestamp: block.timestamp,
-                  blockNumber: block.number,
-                  chain,
-                  logIndex: log.logIndex,
-                  event: {
-                    chainId: chain->ChainMap.Chain.toChainId,
-                    params: decodedEvent.args,
-                    transaction,
-                    // Unreliably expect that the Ethers block fields match the types in HyperIndex
-                    // I assume this is wrong in some cases, so we need to fix it in the future
-                    block: block->(
-                      Utils.magic: Ethers.JsonRpcProvider.block => Internal.eventBlock
-                    ),
-                    srcAddress: log.address,
-                    logIndex: log.logIndex,
-                  }->Internal.fromGenericEvent,
-                })
-              }
-            )(),
-          )
-        }
-      })
-      ->Promise.all
-    }
 
     let optFirstBlockParent = await firstBlockParentPromise
 
@@ -874,7 +778,7 @@ let make = (
       stats: {
         totalTimeElapsed: totalTimeElapsed,
       },
-      currentBlockHeight,
+      knownHeight,
       reorgGuard,
       fromBlockQueried: fromBlock,
     }
@@ -902,8 +806,6 @@ let make = (
     ->Promise.catch(exn => exn->Error->Promise.resolve)
   }
 
-  let client = Rest.client(url)
-
   {
     name,
     sourceFor,