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

package/src/sources/RpcSource.res.mjs

@@ -4,7 +4,6 @@ import * as Rpc from "./Rpc.res.mjs";
 import * as Caml from "rescript/lib/es6/caml.js";
 import * as Rest from "../vendored/Rest.res.mjs";
 import * as Time from "../Time.res.mjs";
-import * as Viem from "../bindings/Viem.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Ethers from "../bindings/Ethers.res.mjs";
 import * as Hrtime from "../bindings/Hrtime.res.mjs";
@@ -506,7 +505,6 @@ function sanitizeUrl(url) {
 
 function make(param) {
   var lowercaseAddresses = param.lowercaseAddresses;
-  var shouldUseHypersyncClientDecoder = param.shouldUseHypersyncClientDecoder;
   var allEventSignatures = param.allEventSignatures;
   var eventRouter = param.eventRouter;
   var chain = param.chain;
@@ -518,9 +516,10 @@ function make(param) {
   var provider = Ethers.JsonRpcProvider.make(url, chain);
   var getSelectionConfig = memoGetSelectionConfig(chain);
   var mutSuggestedBlockIntervals = {};
+  var client = Rest.client(url, undefined);
   var makeTransactionLoader = function () {
     return LazyLoader.make((function (transactionHash) {
-                  return provider.getTransaction(transactionHash);
+                  return Rest.$$fetch(Rpc.GetTransactionByHash.route, transactionHash, client);
                 }), (function (am, exn) {
                   Logging.error({
                         err: Utils.prettifyExn(exn),
@@ -559,13 +558,14 @@ function make(param) {
   var getEventBlockOrThrow = makeThrowingGetEventBlock(function (blockNumber) {
         return LazyLoader.get(blockLoader.contents, blockNumber);
       });
-  var getEventTransactionOrThrow = makeThrowingGetEventTransaction(Ethers.JsonRpcProvider.makeGetTransactionFields((function (__x) {
-              return LazyLoader.get(transactionLoader.contents, __x);
+  var getEventTransactionOrThrow = makeThrowingGetEventTransaction(Ethers.JsonRpcProvider.makeGetTransactionFields((async function (transactionHash) {
+              var tx = await LazyLoader.get(transactionLoader.contents, transactionHash);
+              if (tx !== undefined) {
+                return tx;
+              } else {
+                return Js_exn.raiseError("Transaction not found for hash: " + transactionHash);
+              }
             }), lowercaseAddresses));
-  var contractNameAbiMapping = {};
-  Belt_Array.forEach(param.contracts, (function (contract) {
-          contractNameAbiMapping[contract.name] = contract.abi;
-        }));
   var convertEthersLogToHyperSyncEvent = function (log) {
     var hyperSyncLog_removed = Belt_Option.getWithDefault(log.removed, false);
     var hyperSyncLog_logIndex = log.index;
@@ -604,11 +604,11 @@ function make(param) {
       return HyperSyncClient.Decoder.fromSignatures(allEventSignatures);
     }
   };
-  var getItemsOrThrow = async function (fromBlock, toBlock, addressesByContractName, indexingContracts, currentBlockHeight, partitionId, selection, param, param$1) {
+  var getItemsOrThrow = async function (fromBlock, toBlock, addressesByContractName, indexingContracts, knownHeight, partitionId, selection, param, param$1) {
     var startFetchingBatchTimeRef = Hrtime.makeTimer();
     var maxSuggestedBlockInterval = mutSuggestedBlockIntervals[maxSuggestedBlockIntervalKey];
     var suggestedBlockInterval = maxSuggestedBlockInterval !== undefined ? maxSuggestedBlockInterval : Belt_Option.getWithDefault(mutSuggestedBlockIntervals[partitionId], syncConfig.initialBlockInterval);
-    var toBlock$1 = toBlock !== undefined && toBlock < currentBlockHeight ? toBlock : currentBlockHeight;
+    var toBlock$1 = toBlock !== undefined && toBlock < knownHeight ? toBlock : knownHeight;
     var suggestedToBlock = Caml.int_max(Caml.int_min((fromBlock + suggestedBlockInterval | 0) - 1 | 0, toBlock$1), fromBlock);
     var firstBlockParentPromise = fromBlock > 0 ? LazyLoader.get(blockLoader.contents, fromBlock - 1 | 0).then(function (res) {
             return res;
@@ -624,88 +624,34 @@ function make(param) {
     if (executedBlockInterval >= suggestedBlockInterval && !Utils.Dict.has(mutSuggestedBlockIntervals, maxSuggestedBlockIntervalKey)) {
       mutSuggestedBlockIntervals[partitionId] = Caml.int_min(executedBlockInterval + syncConfig.accelerationAdditive | 0, syncConfig.intervalCeiling);
     }
-    var parsedQueueItems;
-    if (shouldUseHypersyncClientDecoder) {
-      var hyperSyncEvents = Belt_Array.map(logs, convertEthersLogToHyperSyncEvent);
-      var parsedEvents;
-      try {
-        parsedEvents = await getHscDecoder().decodeEvents(hyperSyncEvents);
-      }
-      catch (raw_exn){
-        var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-        throw {
-              RE_EXN_ID: Source.GetItemsError,
-              _1: {
-                TAG: "FailedGettingItems",
-                exn: exn,
-                attemptedToBlock: toBlock$1,
-                retry: {
-                  TAG: "ImpossibleForTheQuery",
-                  message: "Failed to parse events using hypersync client decoder. Please double-check your ABI."
-                }
-              },
-              Error: new Error()
-            };
-      }
-      parsedQueueItems = await Promise.all(Belt_Array.keepMap(Belt_Array.zip(logs, parsedEvents), (function (param) {
-                  var maybeDecodedEvent = param[1];
-                  var log = param[0];
-                  var topic0 = Belt_Option.getWithDefault(Belt_Array.get(log.topics, 0), "0x0");
-                  var routedAddress = lowercaseAddresses ? Address.Evm.fromAddressLowercaseOrThrow(log.address) : log.address;
-                  var eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, log.blockNumber, indexingContracts);
-                  if (eventConfig !== undefined && !(maybeDecodedEvent === null || maybeDecodedEvent === undefined)) {
-                    return Caml_option.some((async function () {
-                                    var match;
-                                    try {
-                                      match = await Promise.all([
-                                            getEventBlockOrThrow(log),
-                                            getEventTransactionOrThrow(log, eventConfig.transactionSchema)
-                                          ]);
-                                    }
-                                    catch (raw_exn){
-                                      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-                                      throw {
-                                            RE_EXN_ID: Source.GetItemsError,
-                                            _1: {
-                                              TAG: "FailedGettingFieldSelection",
-                                              exn: exn,
-                                              blockNumber: log.blockNumber,
-                                              logIndex: log.index,
-                                              message: "Failed getting selected fields. Please double-check your RPC provider returns correct data."
-                                            },
-                                            Error: new Error()
-                                          };
-                                    }
-                                    var block = match[0];
-                                    return {
-                                            kind: 0,
-                                            eventConfig: eventConfig,
-                                            timestamp: block.timestamp,
-                                            chain: chain,
-                                            blockNumber: block.number,
-                                            logIndex: log.index,
-                                            event: {
-                                              params: eventConfig.convertHyperSyncEventArgs(maybeDecodedEvent),
-                                              chainId: chain,
-                                              srcAddress: routedAddress,
-                                              logIndex: log.index,
-                                              transaction: match[1],
-                                              block: block
-                                            }
-                                          };
-                                  })());
-                  }
-                  
-                })));
-    } else {
-      parsedQueueItems = await Promise.all(Belt_Array.keepMap(logs, (function (log) {
-                  var topic0 = log.topics[0];
-                  var eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), log.address, log.blockNumber, indexingContracts);
-                  if (eventConfig === undefined) {
-                    return ;
-                  }
-                  var blockNumber = log.blockNumber;
-                  var logIndex = log.index;
+    var hyperSyncEvents = Belt_Array.map(logs, convertEthersLogToHyperSyncEvent);
+    var parsedEvents;
+    try {
+      parsedEvents = await getHscDecoder().decodeEvents(hyperSyncEvents);
+    }
+    catch (raw_exn){
+      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
+      throw {
+            RE_EXN_ID: Source.GetItemsError,
+            _1: {
+              TAG: "FailedGettingItems",
+              exn: exn,
+              attemptedToBlock: toBlock$1,
+              retry: {
+                TAG: "ImpossibleForTheQuery",
+                message: "Failed to parse events using hypersync client decoder. Please double-check your ABI."
+              }
+            },
+            Error: new Error()
+          };
+    }
+    var parsedQueueItems = await Promise.all(Belt_Array.keepMap(Belt_Array.zip(logs, parsedEvents), (function (param) {
+                var maybeDecodedEvent = param[1];
+                var log = param[0];
+                var topic0 = Belt_Option.getWithDefault(Belt_Array.get(log.topics, 0), "0x0");
+                var routedAddress = lowercaseAddresses ? Address.Evm.fromAddressLowercaseOrThrow(log.address) : log.address;
+                var eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, log.blockNumber, indexingContracts);
+                if (eventConfig !== undefined && !(maybeDecodedEvent === null || maybeDecodedEvent === undefined)) {
                   return Caml_option.some((async function () {
                                   var match;
                                   try {
@@ -721,34 +667,14 @@ function make(param) {
                                           _1: {
                                             TAG: "FailedGettingFieldSelection",
                                             exn: exn,
-                                            blockNumber: blockNumber,
-                                            logIndex: logIndex,
+                                            blockNumber: log.blockNumber,
+                                            logIndex: log.index,
                                             message: "Failed getting selected fields. Please double-check your RPC provider returns correct data."
                                           },
                                           Error: new Error()
                                         };
                                   }
                                   var block = match[0];
-                                  var decodedEvent;
-                                  try {
-                                    decodedEvent = Viem.parseLogOrThrow(contractNameAbiMapping, eventConfig.contractName, log.topics, log.data);
-                                  }
-                                  catch (raw_exn$1){
-                                    var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
-                                    throw {
-                                          RE_EXN_ID: Source.GetItemsError,
-                                          _1: {
-                                            TAG: "FailedGettingItems",
-                                            exn: exn$1,
-                                            attemptedToBlock: toBlock$1,
-                                            retry: {
-                                              TAG: "ImpossibleForTheQuery",
-                                              message: "Failed to parse event with viem, please double-check your ABI. Block number: " + String(blockNumber) + ", log index: " + String(logIndex)
-                                            }
-                                          },
-                                          Error: new Error()
-                                        };
-                                  }
                                   return {
                                           kind: 0,
                                           eventConfig: eventConfig,
@@ -757,17 +683,18 @@ function make(param) {
                                           blockNumber: block.number,
                                           logIndex: log.index,
                                           event: {
-                                            params: decodedEvent.args,
+                                            params: eventConfig.convertHyperSyncEventArgs(maybeDecodedEvent),
                                             chainId: chain,
-                                            srcAddress: log.address,
+                                            srcAddress: routedAddress,
                                             logIndex: log.index,
                                             transaction: match[1],
                                             block: block
                                           }
                                         };
                                 })());
-                })));
-    }
+                }
+                
+              })));
     var optFirstBlockParent = await firstBlockParentPromise;
     var totalTimeElapsed = Hrtime.intFromMillis(Hrtime.toMillis(Hrtime.timeSince(startFetchingBatchTimeRef)));
     var reorgGuard_rangeLastBlock = {
@@ -785,7 +712,7 @@ function make(param) {
       prevRangeLastBlock: reorgGuard_prevRangeLastBlock
     };
     return {
-            currentBlockHeight: currentBlockHeight,
+            knownHeight: knownHeight,
             reorgGuard: reorgGuard,
             parsedQueueItems: parsedQueueItems,
             fromBlockQueried: fromBlock,
@@ -819,7 +746,6 @@ function make(param) {
                             });
                 }));
   };
-  var client = Rest.client(url, undefined);
   return {
           name: name,
           sourceFor: param.sourceFor,

package/src/sources/Source.res

@@ -11,7 +11,7 @@ type blockRangeFetchStats = {
 Thes response returned from a block range fetch
 */
 type blockRangeFetchResponse = {
-  currentBlockHeight: int,
+  knownHeight: int,
   reorgGuard: ReorgDetection.reorgGuard,
   parsedQueueItems: array<Internal.item>,
   fromBlockQueried: int,
@@ -50,10 +50,11 @@ type t = {
     ~toBlock: option<int>,
     ~addressesByContractName: dict<array<Address.t>>,
     ~indexingContracts: dict<Internal.indexingContract>,
-    ~currentBlockHeight: int,
+    ~knownHeight: int,
     ~partitionId: string,
     ~selection: FetchState.selection,
     ~retry: int,
     ~logger: Pino.t,
   ) => promise<blockRangeFetchResponse>,
+  createHeightSubscription?: (~onHeight: int => unit) => unit => unit,
 }