envio 3.2.1 → 3.3.0-alpha.0

package/src/sources/HyperFuelClient.res

@@ -1,119 +1,43 @@
-type unchecksummedEthAddress = string
-
 type t
 
 type cfg = {
   url: string,
-  bearerToken?: string,
-  http_req_timeout_millis?: int,
+  apiToken: string,
 }
 module QueryTypes = {
   type blockFieldOptions =
     | @as("id") Id
-    | @as("da_height") DaHeight
-    | @as("transactions_count") TransactionsCount
-    | @as("message_receipt_count") MessageReceiptCount
-    | @as("transactions_root") TransactionsRoot
-    | @as("message_receipt_root") MessageReceiptRoot
     | @as("height") Height
-    | @as("prev_root") PrevRoot
     | @as("time") Time
-    | @as("application_hash") ApplicationHash
 
   type blockFieldSelection = array<blockFieldOptions>
 
-  type transactionFieldOptions =
-    | @as("id") Id
-    | @as("block_height") BlockHeight
-    | @as("input_asset_ids") InputAssetIds
-    | @as("input_contracts") InputContracts
-    | @as("input_contract_utxo_id") InputContractUtxoId
-    | @as("input_contract_balance_root") InputContractBalanceRoot
-    | @as("input_contract_state_root") InputContractStateRoot
-    | @as("input_contract_tx_pointer_block_height") InputContractTxPointerBlockHeight
-    | @as("input_contract_tx_pointer_tx_index") InputContractTxPointerTxIndex
-    | @as("input_contract") InputContract
-    | @as("gas_price") GasPrice
-    | @as("gas_limit") GasLimit
-    | @as("maturity") Maturity
-    | @as("mint_amount") MintAmount
-    | @as("mint_asset_id") MintAssetId
-    | @as("tx_pointer_block_height") TxPointerBlockHeight
-    | @as("tx_pointer_tx_index") TxPointerTxIndex
-    | @as("tx_type") TxType
-    | @as("output_contract_input_index") OutputContractInputIndex
-    | @as("output_contract_balance_root") OutputContractBalanceRoot
-    | @as("output_contract_state_root") OutputContractStateRoot
-    | @as("witnesses") Witnesses
-    | @as("receipts_root") ReceiptsRoot
-    | @as("status") Status
-    | @as("time") Time
-    | @as("reason") Reason
-    | @as("script") Script
-    | @as("script_data") ScriptData
-    | @as("bytecode_witness_index") BytecodeWitnessIndex
-    | @as("bytecode_length") BytecodeLength
-    | @as("salt") Salt
-
-  type transactionFieldSelection = array<transactionFieldOptions>
-
   type receiptFieldOptions =
     | @as("tx_id") TxId
-    | @as("tx_status") TxStatus
     | @as("block_height") BlockHeight
-    | @as("pc") Pc
-    | @as("is") Is
-    | @as("to") To
     | @as("to_address") ToAddress
     | @as("amount") Amount
     | @as("asset_id") AssetId
-    | @as("gas") Gas
-    | @as("param1") Param1
-    | @as("param2") Param2
     | @as("val") Val
-    | @as("ptr") Ptr
-    | @as("digest") Digest
-    | @as("reason") Reason
-    | @as("ra") Ra
     | @as("rb") Rb
-    | @as("rc") Rc
-    | @as("rd") Rd
-    | @as("len") Len
     | @as("receipt_type") ReceiptType
     | @as("receipt_index") ReceiptIndex
-    | @as("result") Result
-    | @as("gas_used") GasUsed
     | @as("data") Data
-    | @as("sender") Sender
-    | @as("recipient") Recipient
-    | @as("nonce") Nonce
-    | @as("contract_id") ContractId
     | @as("root_contract_id") RootContractId
     | @as("sub_id") SubId
+    | @as("to") To
 
   type receiptFieldSelection = array<receiptFieldOptions>
 
   type fieldSelection = {
     block?: blockFieldSelection,
-    transaction?: transactionFieldSelection,
     receipt?: receiptFieldSelection,
   }
 
-  type inputSelection
-  type outputSelection
-
   type receiptSelection = {
     rootContractId?: array<Address.t>,
-    toAddress?: array<string>,
-    assetId?: array<string>,
     receiptType?: array<FuelSDK.receiptType>,
-    sender?: array<string>,
-    recipient?: array<string>,
-    contractId?: array<Address.t>,
-    ra?: array<bigint>,
     rb?: array<bigint>,
-    rc?: array<bigint>,
-    rd?: array<bigint>,
     txStatus?: array<int>,
   }
 
@@ -137,254 +61,44 @@ module QueryTypes = {
    */
     receipts?: array<receiptSelection>,
     /**
-   * List of input selections, the query will return inputs that match any of these selections and
-   *  it will return inputs that are related to the returned objects.
-   */
-    inputs?: array<inputSelection>,
-    /**
-   * List of output selections, the query will return outputs that match any of these selections and
-   *  it will return outputs that are related to the returned objects.
-   */
-    outputs?: array<outputSelection>,
-    /**
-   * Whether to include all blocks regardless of if they are related to a returned transaction or log. Normally
-   *  the server will return only the blocks that are related to the transaction or logs in the response. But if this
-   *  is set to true, the server will return data for all blocks in the requested range [from_block, to_block).
-   */
-    includeAllBlocks?: bool,
-    /**
    * Field selection. The user can select which fields they are interested in, requesting less fields will improve
    *  query execution time and reduce the payload size so the user should always use a minimal number of fields.
    */
     fieldSelection: fieldSelection,
-    /**
-   * Maximum number of blocks that should be returned, the server might return more blocks than this number but
-   *  it won't overshoot by too much.
-   */
-    maxNumBlocks?: int,
-    /**
-   * Maximum number of transactions that should be returned, the server might return more transactions than this number but
-   *  it won't overshoot by too much.
-   */
-    maxNumTransactions?: int,
   }
 }
 
 module FuelTypes = {
-  /** An object containing information about a transaction. */
-  type transaction = {
-    /** block the transaction is in. */
-    blockHeight: int,
-    /** A unique transaction id. */
-    id: string,
-    /** An array of asset ids used for the transaction inputs. */
-    inputAssetIds?: array<string>,
-    /** An array of contracts used for the transaction inputs. */
-    inputContracts?: array<string>,
-    /**
-   * A contract used for the transaction input.
-   * A unique 32 byte identifier for the UTXO for a contract used for the transaction input.
-   */
-    inputContractUtxoId?: string,
-    /** The root of amount of coins owned by contract before transaction execution for a contract used for the transaction input. */
-    inputContractBalanceRoot?: string,
-    /** The state root of contract before transaction execution for a contract used for the transaction input. */
-    inputContractStateRoot?: string,
-    /** A pointer to the TX whose output is being spent for a contract used for the transaction input. */
-    inputContractTxPointerBlockHeight?: int,
-    /** A pointer to the TX whose output is being spent for a contract used for the transaction input. */
-    inputContractTxPointerTxIndex?: int,
-    /** The contract id for a contract used for the transaction input. */
-    inputContract?: string,
-    /** The gas price for the transaction. */
-    gasPrice?: bigint,
-    /** The gas limit for the transaction. */
-    gasLimit?: bigint,
-    /** The minimum block height that the transaction can be included at. */
-    maturity?: int,
-    /** The amount minted in the transaction. */
-    mintAmount?: bigint,
-    /** The asset ID for coins minted in the transaction. */
-    mintAssetId?: string,
-    /** The location of the transaction in the block. */
-    txPointerBlockHeight?: int,
-    txPointerTxIndex?: int,
-    /** Script, creating a new contract, or minting new coins */
-    txType: int,
-    /** The index of the input from a transaction that changed the state of a contract. */
-    outputContractInputIndex?: int,
-    /** The root of amount of coins owned by contract after transaction execution from a transaction that changed the state of a contract. */
-    outputContractBalanceRoot?: string,
-    /** The state root of contract after transaction execution from a transaction that changed the state of a contract. */
-    outputContractStateRoot?: string,
-    /** An array of witnesses. */
-    witnesses?: string,
-    /** The root of the receipts. */
-    receiptsRoot?: string,
-    /** The status type of the transaction. */
-    status: int,
-    /** for SubmittedStatus, SuccessStatus, and FailureStatus, the time a transaction was submitted, successful, or failed */
-    time: int,
-    /**
-   * for SuccessStatus, the state of the program execution
-   * for SqueezedOutStatus & FailureStatus, the reason the transaction was squeezed out or failed
-   */
-    reason?: string,
-    /** The script to execute. */
-    script?: string,
-    /** The script input parameters. */
-    scriptData?: string,
-    /** The witness index of contract bytecode. */
-    bytecodeWitnessIndex?: int,
-    /** The length of the transaction bytecode. */
-    bytecodeLength?: int,
-    /** The salt value for the transaction. */
-    salt?: string,
-  }
-  /** An object representing all possible types of receipts. */
   type receipt = {
-    /** Index of the receipt in the block */
     receiptIndex: int,
-    /** Contract that produced the receipt */
     rootContractId?: Address.t,
-    /** transaction that this receipt originated from */
     txId: string,
-    /** The status type of the transaction this receipt originated from */
-    txStatus: int,
-    /** block that the receipt originated in */
     blockHeight: int,
-    /** The value of the program counter register $pc, which is the memory address of the current instruction. */
-    pc?: int,
-    /** The value of register $is, which is the pointer to the start of the currently-executing code. */
-    is?: int,
-    /** The recipient contract */
-    to?: string,
-    /** The recipient address */
-    toAddress?: string,
-    /** The amount of coins transferred. */
-    amount?: bigint,
-    /** The asset id of the coins transferred. */
-    assetId?: string,
-    /** The gas used for the transaction. */
-    gas?: int,
-    /** The first parameter for a CALL receipt type, holds the function selector. */
-    param1?: bigint,
-    /** The second parameter for a CALL receipt type, typically used for the user-specified input to the ABI function being selected. */
-    param2?: bigint,
-    /** The value of registers at the end of execution, used for debugging. */
-    val?: bigint,
-    /** The value of the pointer register, used for debugging. */
-    ptr?: bigint,
-    /** A 32-byte String of MEM[$rC, $rD]. The syntax MEM[x, y] means the memory range starting at byte x, of length y bytes. */
-    digest?: string,
-    /** The decimal string representation of an 8-bit unsigned integer for the panic reason. Only returned if the receipt type is PANIC. */
-    reason?: int,
-    /** The value of register $rA. */
-    ra?: bigint,
-    /** The value of register $rB. */
-    rb?: bigint,
-    /** The value of register $rC. */
-    rc?: bigint,
-    /** The value of register $rD. */
-    rd?: bigint,
-    /** The length of the receipt. */
-    len?: bigint,
-    /** The type of receipt. */
     receiptType: FuelSDK.receiptType,
-    /** 0 if script exited successfully, any otherwise. */
-    result?: int,
-    /** The amount of gas consumed by the script. */
-    gasUsed?: int,
-    /** The receipt data. */
     data?: string,
-    /** The address of the message sender. */
-    sender?: string,
-    /** The address of the message recipient. */
-    recipient?: string,
-    /** The nonce value for a message. */
-    nonce?: string,
-    /** Current context if in an internal context. null otherwise */
-    contractId?: Address.t,
-    /** The sub id. */
+    rb?: bigint,
+    val?: bigint,
     subId?: string,
-  }
-
-  // Unused - in indexer currently
-  type input = {
-    txId: string,
-    blockHeight: int,
-    inputType: int,
-    utxoId?: string,
-    owner?: string,
     amount?: bigint,
     assetId?: string,
-    txPointerBlockHeight?: int,
-    txPointerTxIndex?: int,
-    witnessIndex?: int,
-    predicateGasUsed?: int,
-    predicate?: string,
-    predicateData?: string,
-    balanceRoot?: string,
-    stateRoot?: string,
-    contract?: string,
-    sender?: string,
-    recipient?: string,
-    nonce?: string,
-    data?: string,
-  }
-
-  // Unused in indexer currently
-  type output = {
-    txId: string,
-    blockHeight: int,
-    outputType: int,
     to?: string,
-    amount?: bigint,
-    assetId?: string,
-    inputIndex?: int,
-    balanceRoot?: string,
-    stateRoot?: string,
-    contract?: string,
+    toAddress?: string,
   }
 
-  // Unused in indexer currently
-  /** The block header contains metadata about a certain block. */
   type block = {
-    /** String of the header */
     id: string,
-    /** The block height for the data availability layer up to which (inclusive) input messages are processed. */
-    daHeight: int,
-    consensusParametersVersion: int,
-    stateTransitionBytecodeVersion: int,
-    /** The number of transactions in the block. */
-    transactionsCount: string,
-    /** The number of receipt messages in the block. */
-    messageReceiptCount: string,
-    /** The merkle root of the transactions in the block. */
-    transactionsRoot: string,
-    messageOutboxRoot: string,
-    eventInboxRoot: string,
-    /** The block height. */
     height: int,
-    /** The merkle root of all previous consensus header Stringes (not including this block). */
-    prevRoot: string,
-    /** The timestamp for the block. */
     time: int,
-    /** The String of the serialized application header for this block. */
-    applicationHash: string,
   }
 }
 
 type queryResponseDataTyped = {
-  transactions: array<FuelTypes.transaction>,
   receipts: array<FuelTypes.receipt>,
-  blocks: option<array<FuelTypes.block>>,
-  inputs: array<FuelTypes.input>,
-  outputs: array<FuelTypes.output>,
+  blocks: array<FuelTypes.block>,
 }
 
 type queryResponseTyped = {
-  /** Current height of the source hypersync instance */
+  /** Current height of the source HyperFuel instance */
   archiveHeight?: int,
   /**
    * Next block to query for, the responses are paginated so
@@ -392,17 +106,22 @@ type queryResponseTyped = {
    * didn't get responses up to the to_block they specified in the Query.
    */
   nextBlock: int,
-  /** Total time it took the hypersync instance to execute the query. */
+  /** Total time it took the HyperFuel instance to execute the query. */
   totalExecutionTime: int,
   /** Response data */
   data: queryResponseDataTyped,
 }
 
-@module("@envio-dev/hyperfuel-client") @scope("HyperfuelClient")
-external make: cfg => t = "new"
+@send
+external classNew: (Core.hyperfuelClientCtor, cfg, ~userAgent: string) => t = "new"
+
 let make = (cfg: cfg) => {
-  make({...cfg, bearerToken: "3dc856dd-b0ea-494f-b27e-017b8b6b7e07"})
+  let envioVersion = Utils.EnvioPackage.value.version
+  Core.getAddon().hyperfuelClient->classNew(cfg, ~userAgent=`hyperindex/${envioVersion}`)
 }
 
 @send
 external getSelectedData: (t, QueryTypes.query) => promise<queryResponseTyped> = "getSelectedData"
+
+@send
+external getHeight: t => promise<int> = "getHeight"

package/src/sources/HyperFuelClient.res.mjs

@@ -1,14 +1,15 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as HyperfuelClient from "@envio-dev/hyperfuel-client";
+import * as Core from "../Core.res.mjs";
+import * as Utils from "../Utils.res.mjs";
 
 let QueryTypes = {};
 
 let FuelTypes = {};
 
 function make(cfg) {
-  let newrecord = {...cfg};
-  return HyperfuelClient.HyperfuelClient.new((newrecord.bearerToken = "3dc856dd-b0ea-494f-b27e-017b8b6b7e07", newrecord));
+  let envioVersion = Utils.EnvioPackage.value.version;
+  return Core.getAddon().HyperfuelClient.new(cfg, `hyperindex/` + envioVersion);
 }
 
 export {
@@ -16,4 +17,4 @@ export {
   FuelTypes,
   make,
 }
-/* @envio-dev/hyperfuel-client Not a pure module */
+/* Core Not a pure module */

package/src/sources/HyperFuelSource.res

@@ -2,6 +2,8 @@ open Source
 
 exception EventRoutingFailed
 
+let isUnauthorizedError = (message: string) => message->String.includes("401 Unauthorized")
+
 let mintEventTag = "mint"
 let burnEventTag = "burn"
 let transferEventTag = "transfer"
@@ -207,11 +209,26 @@ let memoGetSelectionConfig = (~chain) => {
 type options = {
   chain: ChainMap.Chain.t,
   endpointUrl: string,
+  apiToken: option<string>,
 }
 
-let make = ({chain, endpointUrl}: options): t => {
+let make = ({chain, endpointUrl, apiToken}: options): t => {
   let name = "HyperFuel"
 
+  let apiToken = switch apiToken {
+  | Some(token) => token
+  | None =>
+    JsError.throwWithMessage(`An Envio API token is required for using HyperFuel as a data-source.
+Set the ENVIO_API_TOKEN environment variable in your .env file.
+Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
+  }
+
+  let client = switch HyperFuelClient.make({url: endpointUrl, apiToken}) {
+  | client => client
+  | exception exn =>
+    exn->ErrorHandling.mkLogAndRaise(~msg="Failed to instantiate the HyperFuel client")
+  }
+
   let getSelectionConfig = memoGetSelectionConfig(~chain)
 
   let getItemsOrThrow = async (
@@ -239,12 +256,12 @@ let make = ({chain, endpointUrl}: options): t => {
       ~method="getLogs",
     )
     let pageUnsafe = try await HyperFuel.GetLogs.query(
-      ~serverUrl=endpointUrl,
+      ~client,
       ~fromBlock,
       ~toBlock,
       ~recieptsSelection,
     ) catch {
-    | HyperSync.GetLogs.Error(error) =>
+    | HyperFuel.GetLogs.Error(error) =>
       throw(
         Source.GetItemsError(
           Source.FailedGettingItems({
@@ -397,7 +414,7 @@ let make = ({chain, endpointUrl}: options): t => {
         blockNumber: block.height,
         blockHash: block.id,
         logIndex: receiptIndex,
-        event: {
+        payload: {
           contractName: eventConfig.contractName,
           eventName: eventConfig.name,
           chainId,
@@ -408,7 +425,7 @@ let make = ({chain, endpointUrl}: options): t => {
           block: block->Obj.magic,
           srcAddress: contractAddress,
           logIndex: receiptIndex,
-        }->Internal.fromGenericEvent,
+        }->Fuel.fromPayload,
       })
     })
 
@@ -450,8 +467,6 @@ let make = ({chain, endpointUrl}: options): t => {
   let getBlockHashes = (~blockNumbers as _, ~logger as _) =>
     JsError.throwWithMessage("HyperFuel does not support getting block hashes")
 
-  let jsonApiClient = EnvioApiClient.make(endpointUrl)
-
   {
     name,
     sourceFor: Sync,
@@ -461,7 +476,17 @@ let make = ({chain, endpointUrl}: options): t => {
     poweredByHyperSync: true,
     getHeightOrThrow: async () => {
       let timerRef = Hrtime.makeTimer()
-      let height = await HyperFuel.heightRoute->Rest.fetch((), ~client=jsonApiClient)
+      let height = try await client->HyperFuelClient.getHeight catch {
+      | JsExn(e) =>
+        switch e->JsExn.message {
+        | Some(message) if message->isUnauthorizedError =>
+          Logging.error(`Your ENVIO_API_TOKEN was rejected by HyperFuel (401 Unauthorized). The indexer will not be able to fetch events. Update the token and try again using 'envio start' or 'envio dev'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens`)
+          // Retrying an unauthorized request can never succeed, so block forever
+          let _ = await Promise.make((_, _) => ())
+          0
+        | _ => throw(JsExn(e))
+        }
+      }
       let seconds = timerRef->Hrtime.timeSince->Hrtime.toSecondsFloat
       Prometheus.SourceRequestCount.increment(
         ~sourceName=name,

package/src/sources/HyperFuelSource.res.mjs

@@ -1,21 +1,24 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Rest from "../vendored/Rest.res.mjs";
 import * as Hrtime from "../bindings/Hrtime.res.mjs";
 import * as Source from "./Source.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as HyperFuel from "./HyperFuel.res.mjs";
-import * as HyperSync from "./HyperSync.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as EventRouter from "./EventRouter.res.mjs";
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as ErrorHandling from "../ErrorHandling.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
-import * as EnvioApiClient from "./EnvioApiClient.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as HyperFuelClient from "./HyperFuelClient.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
 let EventRoutingFailed = /* @__PURE__ */Primitive_exceptions.create("HyperFuelSource.EventRoutingFailed");
 
+function isUnauthorizedError(message) {
+  return message.includes("401 Unauthorized");
+}
+
 let mintEventTag = "mint";
 
 let burnEventTag = "burn";
@@ -176,9 +179,22 @@ function memoGetSelectionConfig(chain) {
 }
 
 function make(param) {
-  let endpointUrl = param.endpointUrl;
+  let apiToken = param.apiToken;
   let chain = param.chain;
   let name = "HyperFuel";
+  let apiToken$1 = apiToken !== undefined ? apiToken : Stdlib_JsError.throwWithMessage(`An Envio API token is required for using HyperFuel as a data-source.
+Set the ENVIO_API_TOKEN environment variable in your .env file.
+Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
+  let client;
+  try {
+    client = HyperFuelClient.make({
+      url: param.endpointUrl,
+      apiToken: apiToken$1
+    });
+  } catch (raw_exn) {
+    let exn = Primitive_exceptions.internalToException(raw_exn);
+    client = ErrorHandling.mkLogAndRaise(undefined, "Failed to instantiate the HyperFuel client", exn);
+  }
   let getSelectionConfig = memoGetSelectionConfig(chain);
   let getItemsOrThrow = async (fromBlock, toBlock, addressesByContractName, indexingAddresses, knownHeight, param, selection, retry, logger) => {
     let totalTimeRef = Hrtime.makeTimer();
@@ -188,10 +204,10 @@ function make(param) {
     Prometheus.SourceRequestCount.increment(name, chain, "getLogs");
     let pageUnsafe;
     try {
-      pageUnsafe = await HyperFuel.GetLogs.query(endpointUrl, fromBlock, toBlock, recieptsSelection);
+      pageUnsafe = await HyperFuel.GetLogs.query(client, fromBlock, toBlock, recieptsSelection);
     } catch (raw_error) {
       let error = Primitive_exceptions.internalToException(raw_error);
-      if (error.RE_EXN_ID === HyperSync.GetLogs.$$Error) {
+      if (error.RE_EXN_ID === HyperFuel.GetLogs.$$Error) {
         let error$1 = error._1;
         let tmp;
         if (typeof error$1 !== "object") {
@@ -339,7 +355,7 @@ function make(param) {
         blockNumber: block.height,
         blockHash: block.id,
         logIndex: receiptIndex,
-        event: {
+        payload: {
           contractName: eventConfig$1.contractName,
           eventName: eventConfig$1.name,
           params: params,
@@ -388,7 +404,6 @@ function make(param) {
     };
   };
   let getBlockHashes = (param, param$1) => Stdlib_JsError.throwWithMessage("HyperFuel does not support getting block hashes");
-  let jsonApiClient = EnvioApiClient.make(endpointUrl);
   return {
     name: name,
     sourceFor: "Sync",
@@ -398,7 +413,37 @@ function make(param) {
     getBlockHashes: getBlockHashes,
     getHeightOrThrow: async () => {
       let timerRef = Hrtime.makeTimer();
-      let height = await Rest.fetch(HyperFuel.heightRoute, undefined, jsonApiClient);
+      let height;
+      try {
+        height = await client.getHeight();
+      } catch (raw_e) {
+        let e = Primitive_exceptions.internalToException(raw_e);
+        if (e.RE_EXN_ID === "JsExn") {
+          let e$1 = e._1;
+          let message = Stdlib_JsExn.message(e$1);
+          if (message !== undefined) {
+            if (message.includes("401 Unauthorized")) {
+              Logging.error(`Your ENVIO_API_TOKEN was rejected by HyperFuel (401 Unauthorized). The indexer will not be able to fetch events. Update the token and try again using 'envio start' or 'envio dev'. For more info: https://docs.envio.dev/docs/HyperSync/api-tokens`);
+              await new Promise((param, param$1) => {});
+              height = 0;
+            } else {
+              throw {
+                RE_EXN_ID: "JsExn",
+                _1: e$1,
+                Error: new Error()
+              };
+            }
+          } else {
+            throw {
+              RE_EXN_ID: "JsExn",
+              _1: e$1,
+              Error: new Error()
+            };
+          }
+        } else {
+          throw e;
+        }
+      }
       let seconds = Hrtime.toSecondsFloat(Hrtime.timeSince(timerRef));
       Prometheus.SourceRequestCount.increment(name, chain, "getHeight");
       Prometheus.SourceRequestCount.addSeconds(name, chain, "getHeight", seconds);
@@ -410,6 +455,7 @@ function make(param) {
 
 export {
   EventRoutingFailed,
+  isUnauthorizedError,
   mintEventTag,
   burnEventTag,
   transferEventTag,
@@ -422,4 +468,4 @@ export {
   memoGetSelectionConfig,
   make,
 }
-/* Rest Not a pure module */
+/* Logging Not a pure module */

package/src/sources/HyperSyncSource.res

@@ -206,16 +206,18 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       blockNumber: block.number->Option.getUnsafe,
       blockHash: block.hash->Option.getUnsafe,
       logIndex,
-      event: {
+      payload: {
         contractName: eventConfig.contractName,
         eventName: eventConfig.name,
         chainId,
         params,
-        transaction,
+        transaction: transaction->(
+          Utils.magic: HyperSyncClient.ResponseTypes.transaction => Internal.eventTransaction
+        ),
         block: block->(Utils.magic: HyperSyncClient.ResponseTypes.block => Internal.eventBlock),
         srcAddress,
         logIndex,
-      }->Internal.fromGenericEvent,
+      }->Evm.fromPayload,
     })
   }