envio 3.0.0-alpha.21 → 3.0.0-alpha.22

package/src/sources/HyperFuel.res

@@ -1,18 +1,16 @@
-open Belt
-
 //Manage clients in cache so we don't need to reinstantiate each time
 //Ideally client should be passed in as a param to the functions but
 //we are still sharing the same signature with eth archive query builder
 
 module CachedClients = {
-  let cache: Js.Dict.t<HyperFuelClient.t> = Js.Dict.empty()
+  let cache: dict<HyperFuelClient.t> = Dict.make()
 
   let getClient = url => {
     switch cache->Utils.Dict.dangerouslyGetNonOption(url) {
     | Some(client) => client
     | None =>
       let newClient = HyperFuelClient.make({url: url})
-      cache->Js.Dict.set(url, newClient)
+      cache->Dict.set(url, newClient)
       newClient
     }
   }
@@ -55,7 +53,7 @@ let queryErrorToMsq = (e: queryError): string => {
   switch e {
   | UnexpectedMissingParams({queryName, missingParams}) =>
     `${queryName} query failed due to unexpected missing params on response:
-      ${missingParams->Js.Array2.joinWith(", ")}`
+      ${missingParams->Array.joinUnsafe(", ")}`
   }
 }
 
@@ -106,7 +104,7 @@ module GetLogs = {
     switch param {
     | Some(v) => v
     | None =>
-      raise(
+      throw(
         Error(
           UnexpectedMissingParams({
             missingParams: [name],
@@ -122,11 +120,11 @@ module GetLogs = {
   > => {
     let {receipts, blocks} = response_data
 
-    let blocksDict = Js.Dict.empty()
+    let blocksDict = Dict.make()
     blocks
     ->(Utils.magic: option<'a> => 'a)
     ->Array.forEach(block => {
-      blocksDict->Js.Dict.set(block.height->(Utils.magic: int => string), block)
+      blocksDict->Dict.set(block.height->(Utils.magic: int => string), block)
     })
 
     let items = []
@@ -163,7 +161,7 @@ module GetLogs = {
     let page: logsQueryPage = {
       items: res.data->decodeLogQueryPageItems,
       nextBlock,
-      archiveHeight: archiveHeight->Option.getWithDefault(0), // TODO: FIXME: Shouldn't have a default here
+      archiveHeight: archiveHeight->Option.getOr(0), // TODO: FIXME: Shouldn't have a default here
     }
     page
   }
@@ -180,7 +178,7 @@ module GetLogs = {
     let res = await hyperFuelClient->HyperFuelClient.getSelectedData(query)
     if res.nextBlock <= fromBlock {
       // Might happen when /height response was from another instance of HyperSync
-      raise(Error(WrongInstance))
+      throw(Error(WrongInstance))
     }
     res->convertResponse
   }

package/src/sources/HyperFuel.res.mjs

@@ -2,136 +2,136 @@
 
 import * as Time from "../Time.res.mjs";
 import * as Logging from "../Logging.res.mjs";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as HyperFuelClient from "./HyperFuelClient.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";
 
-var cache = {};
+let cache = {};
 
 function getClient(url) {
-  var client = cache[url];
+  let client = cache[url];
   if (client !== undefined) {
-    return Caml_option.valFromOption(client);
+    return Primitive_option.valFromOption(client);
   }
-  var newClient = HyperFuelClient.make({
-        url: url
-      });
+  let newClient = HyperFuelClient.make({
+    url: url
+  });
   cache[url] = newClient;
   return newClient;
 }
 
 function queryErrorToMsq(e) {
-  var match = e._0;
-  return match.queryName + " query failed due to unexpected missing params on response:\n      " + match.missingParams.join(", ");
+  let match = e._0;
+  return match.queryName + ` query failed due to unexpected missing params on response:
+      ` + match.missingParams.join(", ");
 }
 
-var $$Error = /* @__PURE__ */Caml_exceptions.create("HyperFuel.GetLogs.Error");
+let $$Error = /* @__PURE__ */Primitive_exceptions.create("HyperFuel.GetLogs.Error");
 
 function makeRequestBody(fromBlock, toBlockInclusive, recieptsSelection) {
   return {
-          fromBlock: fromBlock,
-          toBlock: toBlockInclusive !== undefined ? toBlockInclusive + 1 | 0 : undefined,
-          receipts: recieptsSelection,
-          fieldSelection: {
-            block: [
-              "id",
-              "height",
-              "time"
-            ],
-            receipt: [
-              "tx_id",
-              "block_height",
-              "root_contract_id",
-              "data",
-              "receipt_index",
-              "receipt_type",
-              "rb",
-              "sub_id",
-              "val",
-              "amount",
-              "to_address",
-              "asset_id",
-              "to"
-            ]
-          }
-        };
+    fromBlock: fromBlock,
+    toBlock: toBlockInclusive !== undefined ? toBlockInclusive + 1 | 0 : undefined,
+    receipts: recieptsSelection,
+    fieldSelection: {
+      block: [
+        "id",
+        "height",
+        "time"
+      ],
+      receipt: [
+        "tx_id",
+        "block_height",
+        "root_contract_id",
+        "data",
+        "receipt_index",
+        "receipt_type",
+        "rb",
+        "sub_id",
+        "val",
+        "amount",
+        "to_address",
+        "asset_id",
+        "to"
+      ]
+    }
+  };
 }
 
 function getParam(param, name) {
   if (param !== undefined) {
-    return Caml_option.valFromOption(param);
+    return Primitive_option.valFromOption(param);
   }
   throw {
-        RE_EXN_ID: $$Error,
-        _1: {
-          TAG: "UnexpectedMissingParams",
-          missingParams: [name]
-        },
-        Error: new Error()
-      };
+    RE_EXN_ID: $$Error,
+    _1: {
+      TAG: "UnexpectedMissingParams",
+      missingParams: [name]
+    },
+    Error: new Error()
+  };
 }
 
 function decodeLogQueryPageItems(response_data) {
-  var blocksDict = {};
-  Belt_Array.forEach(response_data.blocks, (function (block) {
-          blocksDict[block.height] = block;
-        }));
-  var items = [];
-  Belt_Array.forEach(response_data.receipts, (function (receipt) {
-          var contractId = receipt.rootContractId;
-          if (contractId === undefined) {
-            return ;
-          }
-          var block = getParam(blocksDict[receipt.blockHeight], "Failed to find block associated to receipt");
-          items.push({
-                transactionId: receipt.txId,
-                contractId: Caml_option.valFromOption(contractId),
-                receipt: receipt,
-                receiptIndex: receipt.receiptIndex,
-                block: {
-                  id: block.id,
-                  time: block.time,
-                  height: block.height
-                }
-              });
-        }));
+  let blocksDict = {};
+  response_data.blocks.forEach(block => {
+    blocksDict[block.height] = block;
+  });
+  let items = [];
+  response_data.receipts.forEach(receipt => {
+    let contractId = receipt.rootContractId;
+    if (contractId === undefined) {
+      return;
+    }
+    let block = getParam(blocksDict[receipt.blockHeight], "Failed to find block associated to receipt");
+    items.push({
+      transactionId: receipt.txId,
+      contractId: Primitive_option.valFromOption(contractId),
+      receipt: receipt,
+      receiptIndex: receipt.receiptIndex,
+      block: {
+        id: block.id,
+        time: block.time,
+        height: block.height
+      }
+    });
+  });
   return items;
 }
 
 async function query(serverUrl, fromBlock, toBlock, recieptsSelection) {
-  var query$1 = makeRequestBody(fromBlock, toBlock, recieptsSelection);
-  var hyperFuelClient = getClient(serverUrl);
-  var res = await hyperFuelClient.getSelectedData(query$1);
+  let query$1 = makeRequestBody(fromBlock, toBlock, recieptsSelection);
+  let hyperFuelClient = getClient(serverUrl);
+  let res = await hyperFuelClient.getSelectedData(query$1);
   if (res.nextBlock <= fromBlock) {
     throw {
-          RE_EXN_ID: $$Error,
-          _1: "WrongInstance",
-          Error: new Error()
-        };
+      RE_EXN_ID: $$Error,
+      _1: "WrongInstance",
+      Error: new Error()
+    };
   }
   return {
-          items: decodeLogQueryPageItems(res.data),
-          nextBlock: res.nextBlock,
-          archiveHeight: Belt_Option.getWithDefault(res.archiveHeight, 0)
-        };
+    items: decodeLogQueryPageItems(res.data),
+    nextBlock: res.nextBlock,
+    archiveHeight: Stdlib_Option.getOr(res.archiveHeight, 0)
+  };
 }
 
 async function queryBlockData(serverUrl, blockNumber, logger) {
-  var query_toBlock = blockNumber + 1 | 0;
-  var query_inputs = [{}];
-  var query_outputs = [{}];
-  var query_includeAllBlocks = true;
-  var query_fieldSelection = {
+  let query_toBlock = blockNumber + 1 | 0;
+  let query_inputs = [{}];
+  let query_outputs = [{}];
+  let query_includeAllBlocks = true;
+  let query_fieldSelection = {
     block: [
       "height",
       "id",
       "time"
     ]
   };
-  var query = {
+  let query = {
     fromBlock: blockNumber,
     toBlock: query_toBlock,
     inputs: query_inputs,
@@ -139,56 +139,46 @@ async function queryBlockData(serverUrl, blockNumber, logger) {
     includeAllBlocks: query_includeAllBlocks,
     fieldSelection: query_fieldSelection
   };
-  var hyperFuelClient = getClient(serverUrl);
-  var logger$1 = Logging.createChildFrom(logger, {
-        logType: "hypersync get blockhash query",
-        blockNumber: blockNumber
-      });
-  var executeQuery = function () {
-    return hyperFuelClient.getSelectedData(query);
-  };
-  var res = await Time.retryAsyncWithExponentialBackOff(undefined, undefined, undefined, undefined, logger$1, executeQuery);
+  let hyperFuelClient = getClient(serverUrl);
+  let logger$1 = Logging.createChildFrom(logger, {
+    logType: "hypersync get blockhash query",
+    blockNumber: blockNumber
+  });
+  let executeQuery = () => hyperFuelClient.getSelectedData(query);
+  let res = await Time.retryAsyncWithExponentialBackOff(undefined, undefined, undefined, undefined, logger$1, executeQuery);
   if (res.nextBlock > blockNumber) {
-    return Belt_Option.flatMap(res.data.blocks, (function (blocks) {
-                  return Belt_Option.map(Belt_Array.get(blocks, 0), (function (block) {
-                                return {
-                                        blockHash: block.id,
-                                        blockNumber: block.height,
-                                        blockTimestamp: block.time
-                                      };
-                              }));
-                }));
+    return Stdlib_Option.flatMap(res.data.blocks, blocks => Stdlib_Option.map(blocks[0], block => ({
+      blockHash: block.id,
+      blockNumber: block.height,
+      blockTimestamp: block.time
+    })));
   }
-  var logger$2 = Logging.createChild({
-        url: serverUrl
-      });
-  Logging.childInfo(logger$2, "Block #" + String(blockNumber) + " not found in HyperFuel. HyperFuel has multiple instances and it's possible that they drift independently slightly from the head. Indexing should continue correctly after retrying the query in " + String(100) + "ms.");
+  let logger$2 = Logging.createChild({
+    url: serverUrl
+  });
+  Logging.childInfo(logger$2, `Block #` + blockNumber.toString() + ` not found in HyperFuel. HyperFuel has multiple instances and it's possible that they drift independently slightly from the head. Indexing should continue correctly after retrying the query in ` + (100).toString() + `ms.`);
   await Time.resolvePromiseAfterDelay(100);
   return await queryBlockData(serverUrl, blockNumber, logger$2);
 }
 
 function heightRoute() {
   return {
-          method: "GET",
-          path: "/height",
-          input: (function (param) {
-              
-            }),
-          responses: [(function (s) {
-                return s.field("height", S$RescriptSchema.$$int);
-              })]
-        };
+    method: "GET",
+    path: "/height",
+    input: param => {},
+    responses: [s => s.field("height", S$RescriptSchema.int)]
+  };
 }
 
-var GetLogs = {
+let GetLogs = {
   $$Error: $$Error,
   query: query
 };
 
 export {
-  queryErrorToMsq ,
-  GetLogs ,
-  queryBlockData ,
-  heightRoute ,
+  queryErrorToMsq,
+  GetLogs,
+  queryBlockData,
+  heightRoute,
 }
 /* Time Not a pure module */

package/src/sources/HyperFuelClient.res.mjs

@@ -1,20 +1,19 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Caml_obj from "rescript/lib/es6/caml_obj.js";
 import * as HyperfuelClient from "@envio-dev/hyperfuel-client";
 
-var QueryTypes = {};
+let QueryTypes = {};
 
-var FuelTypes = {};
+let FuelTypes = {};
 
 function make(cfg) {
-  var newrecord = Caml_obj.obj_dup(cfg);
+  let newrecord = {...cfg};
   return HyperfuelClient.HyperfuelClient.new((newrecord.bearerToken = "3dc856dd-b0ea-494f-b27e-017b8b6b7e07", newrecord));
 }
 
 export {
-  QueryTypes ,
-  FuelTypes ,
-  make ,
+  QueryTypes,
+  FuelTypes,
+  make,
 }
 /* @envio-dev/hyperfuel-client Not a pure module */

package/src/sources/HyperFuelSource.res

@@ -1,5 +1,4 @@
 open Source
-open Belt
 
 exception EventRoutingFailed
 
@@ -39,7 +38,7 @@ let makeGetNormalRecieptsSelection = (
           ) {
           | Some(receiptTypes) =>
             selection
-            ->Js.Array2.push({
+            ->Array.push({
               rootContractId: addresses,
               receiptType: receiptTypes,
               txStatus: txStatusSelection,
@@ -52,7 +51,7 @@ let makeGetNormalRecieptsSelection = (
           | Some([]) => ()
           | Some(nonWildcardLogDataRbs) =>
             selection
-            ->Js.Array2.push({
+            ->Array.push({
               rootContractId: addresses,
               receiptType: logDataReceiptTypeSelection,
               txStatus: txStatusSelection,
@@ -75,7 +74,7 @@ let makeWildcardRecieptsSelection = (~wildcardLogDataRbs, ~nonLogDataWildcardRec
   | [] => ()
   | nonLogDataWildcardReceiptTypes =>
     selection
-    ->Js.Array2.push(
+    ->Array.push(
       (
         {
           receiptType: nonLogDataWildcardReceiptTypes,
@@ -90,7 +89,7 @@ let makeWildcardRecieptsSelection = (~wildcardLogDataRbs, ~nonLogDataWildcardRec
   | [] => ()
   | wildcardLogDataRbs =>
     selection
-    ->Js.Array2.push(
+    ->Array.push(
       (
         {
           receiptType: logDataReceiptTypeSelection,
@@ -107,11 +106,11 @@ let makeWildcardRecieptsSelection = (~wildcardLogDataRbs, ~nonLogDataWildcardRec
 
 let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
   let eventRouter = EventRouter.empty()
-  let nonWildcardLogDataRbsByContract = Js.Dict.empty()
+  let nonWildcardLogDataRbsByContract = Dict.make()
   let wildcardLogDataRbs = []
 
   // This is for non-LogData events, since they don't have rb filter and can be grouped
-  let nonLogDataReceiptTypesByContract = Js.Dict.empty()
+  let nonLogDataReceiptTypesByContract = Dict.make()
   let nonLogDataWildcardReceiptTypes = []
 
   let addNonLogDataWildcardReceiptTypes = (receiptType: FuelSDK.receiptType) => {
@@ -119,7 +118,7 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
   }
   let addNonLogDataReceiptType = (contractName, receiptType: FuelSDK.receiptType) => {
     switch nonLogDataReceiptTypesByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
-    | None => nonLogDataReceiptTypesByContract->Js.Dict.set(contractName, [receiptType])
+    | None => nonLogDataReceiptTypesByContract->Dict.set(contractName, [receiptType])
     | Some(receiptTypes) => receiptTypes->Array.push(receiptType)->ignore // Duplication prevented by EventRouter
     }
   }
@@ -157,15 +156,15 @@ let getSelectionConfig = (selection: FetchState.selection, ~chain) => {
       }
     | {kind: Call, isWildcard: true} => addNonLogDataWildcardReceiptTypes(Call)
     | {kind: Call} =>
-      Js.Exn.raiseError("Call receipt indexing currently supported only in wildcard mode")
+      JsError.throwWithMessage("Call receipt indexing currently supported only in wildcard mode")
     | {kind: LogData({logId}), isWildcard} => {
-        let rb = logId->BigInt.fromStringUnsafe
+        let rb = logId->BigInt.fromStringOrThrow
         if isWildcard {
           wildcardLogDataRbs->Array.push(rb)->ignore
         } else {
           switch nonWildcardLogDataRbsByContract->Utils.Dict.dangerouslyGetNonOption(contractName) {
           | Some(arr) => arr->Belt.Array.push(rb)
-          | None => nonWildcardLogDataRbsByContract->Js.Dict.set(contractName, [rb])
+          | None => nonWildcardLogDataRbsByContract->Dict.set(contractName, [rb])
           }
         }
       }
@@ -219,7 +218,7 @@ let make = ({chain, endpointUrl}: options): t => {
     ~fromBlock,
     ~toBlock,
     ~addressesByContractName,
-    ~indexingContracts,
+    ~indexingAddresses,
     ~knownHeight,
     ~partitionId as _,
     ~selection: FetchState.selection,
@@ -247,11 +246,11 @@ let make = ({chain, endpointUrl}: options): t => {
       ~recieptsSelection,
     ) catch {
     | HyperSync.GetLogs.Error(error) =>
-      raise(
+      throw(
         Source.GetItemsError(
           Source.FailedGettingItems({
             exn: %raw(`null`),
-            attemptedToBlock: toBlock->Option.getWithDefault(knownHeight),
+            attemptedToBlock: toBlock->Option.getOr(knownHeight),
             retry: switch error {
             | WrongInstance =>
               let backoffMillis = switch retry {
@@ -264,7 +263,7 @@ let make = ({chain, endpointUrl}: options): t => {
               })
             | UnexpectedMissingParams({missingParams}) =>
               ImpossibleForTheQuery({
-                message: `Source returned invalid data with missing required fields: ${missingParams->Js.Array2.joinWith(
+                message: `Source returned invalid data with missing required fields: ${missingParams->Array.joinUnsafe(
                     ", ",
                   )}`,
               })
@@ -273,11 +272,11 @@ let make = ({chain, endpointUrl}: options): t => {
         ),
       )
     | exn =>
-      raise(
+      throw(
         Source.GetItemsError(
           Source.FailedGettingItems({
             exn,
-            attemptedToBlock: toBlock->Option.getWithDefault(knownHeight),
+            attemptedToBlock: toBlock->Option.getOr(knownHeight),
             retry: WithBackoff({
               message: `Unexpected issue while fetching events from HyperFuel client. Attempt a retry.`,
               backoffMillis: switch retry {
@@ -366,7 +365,7 @@ let make = ({chain, endpointUrl}: options): t => {
 
       let eventConfig = switch selectionConfig.eventRouter->EventRouter.get(
         ~tag=eventId,
-        ~indexingContracts,
+        ~indexingAddresses,
         ~contractAddress,
         ~blockNumber=block.height,
       ) {
@@ -438,7 +437,7 @@ let make = ({chain, endpointUrl}: options): t => {
           }: Internal.fuelTransferParams
         )->Obj.magic
       // This should never happen unless there's a bug in the routing logic
-      | _ => Js.Exn.raiseError("Unexpected bug in the event routing logic")
+      | _ => JsError.throwWithMessage("Unexpected bug in the event routing logic")
       }
 
       Internal.Event({
@@ -491,7 +490,7 @@ let make = ({chain, endpointUrl}: options): t => {
   }
 
   let getBlockHashes = (~blockNumbers as _, ~logger as _) =>
-    Js.Exn.raiseError("HyperFuel does not support getting block hashes")
+    JsError.throwWithMessage("HyperFuel does not support getting block hashes")
 
   let jsonApiClient = Rest.client(endpointUrl)