envio 2.11.10 → 2.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.11.10",
+  "version": "v2.12.0",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "repository": {
@@ -23,10 +23,10 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.11.10",
-    "envio-linux-arm64": "v2.11.10",
-    "envio-darwin-x64": "v2.11.10",
-    "envio-darwin-arm64": "v2.11.10"
+    "envio-linux-x64": "v2.12.0",
+    "envio-linux-arm64": "v2.12.0",
+    "envio-darwin-x64": "v2.12.0",
+    "envio-darwin-arm64": "v2.12.0"
   },
   "dependencies": {
     "@envio-dev/hypersync-client": "0.6.3",

package/src/Internal.res

@@ -90,6 +90,7 @@ type fuelEventKind =
   | Call
 type fuelEventConfig = {
   name: string,
+  contractName: string,
   kind: fuelEventKind,
   isWildcard: bool,
   loader: option<loader>,

package/src/LogSelection.res

@@ -26,7 +26,7 @@ let hasFilters = ({topic1, topic2, topic3}: topicSelection) => {
 For a group of topic selections, if multiple only use topic0, then they can be compressed into one
 selection combining the topic0s
 */
-let compressTopicSelectionsOrThrow = (topicSelections: array<topicSelection>) => {
+let compressTopicSelections = (topicSelections: array<topicSelection>) => {
   let topic0sOfSelectionsWithoutFilters = []
 
   let selectionsWithFilters = []
@@ -44,7 +44,12 @@ let compressTopicSelectionsOrThrow = (topicSelections: array<topicSelection>) =>
   switch topic0sOfSelectionsWithoutFilters {
   | [] => selectionsWithFilters
   | topic0 =>
-    let selectionWithoutFilters = makeTopicSelection(~topic0)->Utils.unwrapResultExn
+    let selectionWithoutFilters = {
+      topic0,
+      topic1: [],
+      topic2: [],
+      topic3: [],
+    }
     Belt.Array.concat([selectionWithoutFilters], selectionsWithFilters)
   }
 }
@@ -54,7 +59,7 @@ type t = {
   topicSelections: array<topicSelection>,
 }
 
-let makeOrThrow = (~addresses, ~topicSelections) => {
-  let topicSelections = compressTopicSelectionsOrThrow(topicSelections)
+let make = (~addresses, ~topicSelections) => {
+  let topicSelections = compressTopicSelections(topicSelections)
   {addresses, topicSelections}
 }

package/src/Utils.res

@@ -354,6 +354,8 @@ module Set = {
   @send
   external add: (t<'value>, 'value) => t<'value> = "add"
 
+  let addMany = (set, values) => values->Js.Array2.forEach(value => set->add(value)->ignore)
+
   @ocaml.doc("Removes all elements from the `Set` object.") @send
   external clear: t<'value> => unit = "clear"
 

package/src/bindings/Ethers.res

@@ -47,62 +47,20 @@ module Addresses = {
     mockAddresses[0]
 }
 
-module BlockTag = {
-  type t
-
-  type semanticTag = [#latest | #earliest | #pending]
-  type hexString = string
-  type blockNumber = int
-
-  type blockTagVariant = Latest | Earliest | Pending | HexString(string) | BlockNumber(int)
-
-  let blockTagFromSemantic = (semanticTag: semanticTag): t => semanticTag->Utils.magic
-  let blockTagFromBlockNumber = (blockNumber: blockNumber): t => blockNumber->Utils.magic
-  let blockTagFromHexString = (hexString: hexString): t => hexString->Utils.magic
-
-  let blockTagFromVariant = variant =>
-    switch variant {
-    | Latest => #latest->blockTagFromSemantic
-    | Earliest => #earliest->blockTagFromSemantic
-    | Pending => #pending->blockTagFromSemantic
-    | HexString(str) => str->blockTagFromHexString
-    | BlockNumber(num) => num->blockTagFromBlockNumber
-    }
-}
-
-module EventFilter = {
-  type topic = EvmTypes.Hex.t
-  type t = {
-    address: Address.t,
-    topics: array<topic>,
-  }
-}
 module Filter = {
   type t
-
-  //This can be used as a filter but should not assume all filters  are the same type
-  //address could be an array of addresses like in combined filter
-  type filterRecord = {
-    address: Address.t,
-    topics: array<EventFilter.topic>,
-    fromBlock: BlockTag.t,
-    toBlock: BlockTag.t,
-  }
-
-  let filterFromRecord = (filterRecord: filterRecord): t => filterRecord->Utils.magic
 }
 
 module CombinedFilter = {
   type combinedFilterRecord = {
-    address: array<Address.t>,
+    address?: array<Address.t>,
     //The second element of the tuple is the
-    topics: array<array<EventFilter.topic>>,
-    fromBlock: BlockTag.t,
-    toBlock: BlockTag.t,
+    topics: array<array<EvmTypes.Hex.t>>,
+    fromBlock: int,
+    toBlock: int,
   }
 
-  let combinedFilterToFilter = (combinedFilter: combinedFilterRecord): Filter.t =>
-    combinedFilter->Utils.magic
+  let toFilter = (combinedFilter: combinedFilterRecord): Filter.t => combinedFilter->Utils.magic
 }
 
 type log = {
@@ -112,7 +70,7 @@ type log = {
   //Note: this is the index of the log in the transaction and should be used whenever we use "logIndex"
   address: Address.t,
   data: string,
-  topics: array<EventFilter.topic>,
+  topics: array<EvmTypes.Hex.t>,
   transactionHash: txHash,
   transactionIndex: int,
   //Note: this logIndex is the index of the log in the block, not the transaction
@@ -121,7 +79,7 @@ type log = {
 
 type transaction
 
-type minimumParseableLogData = {topics: array<EventFilter.topic>, data: string}
+type minimumParseableLogData = {topics: array<EvmTypes.Hex.t>, data: string}
 
 //Can safely convert from log to minimumParseableLogData since it contains
 //both data points required

package/src/bindings/Viem.res

@@ -26,3 +26,27 @@ type sizeOptions = {size: int}
 @module("viem") external boolToHex: (bool, ~options: sizeOptions=?) => hex = "boolToHex"
 @module("viem") external bytesToHex: (bytes, ~options: sizeOptions=?) => hex = "bytesToHex"
 @module("viem") external concat: array<hex> => hex = "concat"
+
+exception ParseError(exn)
+exception UnknownContractName({contractName: string})
+
+let parseLogOrThrow = (
+  contractNameAbiMapping: dict<EvmTypes.Abi.t>,
+  ~contractName,
+  ~topics,
+  ~data,
+) => {
+  switch contractNameAbiMapping->Utils.Dict.dangerouslyGetNonOption(contractName) {
+  | None => raise(UnknownContractName({contractName: contractName}))
+  | Some(abi) =>
+    let viemLog: eventLog = {
+      abi,
+      data,
+      topics,
+    }
+
+    try viemLog->decodeEventLogOrThrow catch {
+    | exn => raise(ParseError(exn))
+    }
+  }
+}

package/src/sources/HyperSyncJsonApi.res

@@ -156,7 +156,7 @@ module QueryTypes = {
 
   type logParams = {
     address?: array<Address.t>,
-    topics: array<array<Ethers.EventFilter.topic>>,
+    topics: array<array<EvmTypes.Hex.t>>,
   }
 
   let logParamsSchema = S.object(s => {
@@ -309,10 +309,10 @@ module ResponseTypes = {
     blockNumber?: int,
     address?: unchecksummedEthAddress,
     data?: string,
-    topic0?: option<Ethers.EventFilter.topic>,
-    topic1?: option<Ethers.EventFilter.topic>,
-    topic2?: option<Ethers.EventFilter.topic>,
-    topic3?: option<Ethers.EventFilter.topic>,
+    topic0?: option<EvmTypes.Hex.t>,
+    topic1?: option<EvmTypes.Hex.t>,
+    topic2?: option<EvmTypes.Hex.t>,
+    topic3?: option<EvmTypes.Hex.t>,
   }
 
   let logDataSchema = S.object(s => {
@@ -361,16 +361,12 @@ let queryRoute = Rest.route(() => {
   path: "/query",
   method: Post,
   variables: s => s.body(QueryTypes.postQueryBodySchema),
-  responses: [
-    s => s.data(ResponseTypes.queryResponseSchema),
-  ]
+  responses: [s => s.data(ResponseTypes.queryResponseSchema)],
 })
 
 let heightRoute = Rest.route(() => {
   path: "/height",
   method: Get,
   variables: _ => (),
-  responses: [
-    s => s.field("height", S.int),
-  ]
+  responses: [s => s.field("height", S.int)],
 })