envio 2.20.0 → 2.21.0

package/evm.schema.json

@@ -27,7 +27,7 @@
       ]
     },
     "schema": {
-      "description": "Custom path to schema.yaml file",
+      "description": "Custom path to schema.graphql file",
       "type": [
         "string",
         "null"
@@ -229,6 +229,7 @@
         "status",
         "yParity",
         "chainId",
+        "accessList",
         "maxFeePerBlobGas",
         "blobVersionedHashes",
         "kind",
@@ -236,7 +237,8 @@
         "l1GasPrice",
         "l1GasUsed",
         "l1FeeScalar",
-        "gasUsedForL1"
+        "gasUsedForL1",
+        "authorizationList"
       ]
     },
     "BlockField": {

package/fuel.schema.json

@@ -20,7 +20,7 @@
       "$ref": "#/$defs/EcosystemTag"
     },
     "schema": {
-      "description": "Custom path to schema.yaml file",
+      "description": "Custom path to schema.graphql file",
       "type": [
         "string",
         "null"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.20.0",
+  "version": "v2.21.0",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,13 +25,13 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.20.0",
-    "envio-linux-arm64": "v2.20.0",
-    "envio-darwin-x64": "v2.20.0",
-    "envio-darwin-arm64": "v2.20.0"
+    "envio-linux-x64": "v2.21.0",
+    "envio-linux-arm64": "v2.21.0",
+    "envio-darwin-x64": "v2.21.0",
+    "envio-darwin-arm64": "v2.21.0"
   },
   "dependencies": {
-    "@envio-dev/hypersync-client": "0.6.3",
+    "@envio-dev/hypersync-client": "0.6.5",
     "rescript": "11.1.3",
     "rescript-schema": "9.3.0",
     "viem": "2.21.0"

package/src/Internal.gen.ts

@@ -3,6 +3,8 @@
 /* eslint-disable */
 /* tslint:disable */
 
+import type {GenericContractRegister as $$genericContractRegister} from './Types.ts';
+
 import type {Invalid as $$noEventFilters} from './Types.ts';
 
 import type {t as Address_t} from './Address.gen';
@@ -22,7 +24,7 @@ export type genericLoader<args,loaderReturn> = (_1:args) => Promise<loaderReturn
 
 export type genericContractRegisterArgs<event,context> = { readonly event: event; readonly context: context };
 
-export type genericContractRegister<args> = (_1:args) => void;
+export type genericContractRegister<args> = $$genericContractRegister<args>;
 
 export type genericHandlerArgs<event,context,loaderReturn> = {
   readonly event: event; 

package/src/Internal.res

@@ -35,8 +35,8 @@ type genericContractRegisterArgs<'event, 'context> = {
   event: 'event,
   context: 'context,
 }
-@genType
-type genericContractRegister<'args> = 'args => unit
+@genType.import(("./Types.ts", "GenericContractRegister"))
+type genericContractRegister<'args> = 'args => promise<unit>
 
 type contractRegisterContext
 type contractRegisterArgs = genericContractRegisterArgs<event, contractRegisterContext>

package/src/Logging.res

@@ -150,7 +150,8 @@ let getEventLogger = (eventItem: Internal.eventItem) => {
   | None => {
       let l = getLogger()->child(
         {
-          "context": `Event '${eventItem.eventConfig.name}' for contract '${eventItem.eventConfig.contractName}'`,
+          "contractName": eventItem.eventConfig.contractName,
+          "eventName": eventItem.eventConfig.name,
           "chainId": eventItem.chain->ChainMap.Chain.toChainId,
           "block": eventItem.blockNumber,
           "logIndex": eventItem.logIndex,
@@ -162,18 +163,16 @@ let getEventLogger = (eventItem: Internal.eventItem) => {
   }
 }
 
-let getUserLogger = {
-  @inline
-  let log = (eventItem, level: Pino.logLevelUser, message: string, ~params) => {
-    (eventItem->getEventLogger->Utils.magic->Js.Dict.unsafeGet((level :> string)))(params, message)
-  }
+@inline
+let logForItem = (eventItem, level: Pino.logLevel, message: string, ~params=?) => {
+  (eventItem->getEventLogger->Utils.magic->Js.Dict.unsafeGet((level :> string)))(params, message)
+}
 
-  (eventItem): Envio.logger => {
-    info: (message: string, ~params=?) => eventItem->log(#uinfo, message, ~params),
-    debug: (message: string, ~params=?) => eventItem->log(#udebug, message, ~params),
-    warn: (message: string, ~params=?) => eventItem->log(#uwarn, message, ~params),
-    error: (message: string, ~params=?) => eventItem->log(#uerror, message, ~params),
-    errorWithExn: (message: string, exn) =>
-      eventItem->log(#uerror, message, ~params={"err": exn->Internal.prettifyExn}),
-  }
+let getUserLogger = (eventItem): Envio.logger => {
+  info: (message: string, ~params=?) => eventItem->logForItem(#uinfo, message, ~params?),
+  debug: (message: string, ~params=?) => eventItem->logForItem(#udebug, message, ~params?),
+  warn: (message: string, ~params=?) => eventItem->logForItem(#uwarn, message, ~params?),
+  error: (message: string, ~params=?) => eventItem->logForItem(#uerror, message, ~params?),
+  errorWithExn: (message: string, exn) =>
+    eventItem->logForItem(#uerror, message, ~params={"err": exn->Internal.prettifyExn}),
 }

package/src/Types.ts

@@ -45,3 +45,7 @@ export type EffectContext = {
    */
   readonly effect: EffectCaller;
 };
+
+export type GenericContractRegister<Args> = (
+  args: Args
+) => void | Promise<void>;

package/src/Utils.res

@@ -328,6 +328,8 @@ let unwrapResultExn = res =>
 external queueMicrotask: (unit => unit) => unit = "queueMicrotask"
 
 module Schema = {
+  let variantTag = S.union([S.string, S.object(s => s.field("TAG", S.string))])
+
   let getNonOptionalFieldNames = schema => {
     let acc = []
     switch schema->S.classify {
@@ -385,6 +387,10 @@ module Schema = {
   }
 }
 
+let getVariantsTags = variants => {
+  variants->Js.Array2.map(variant => variant->S.parseOrThrow(Schema.variantTag))
+}
+
 module Set = {
   type t<'value>
 

package/src/bindings/Promise.res

@@ -50,3 +50,5 @@ external done: promise<'a> => unit = "%ignore"
 
 external unsafe_async: 'a => promise<'a> = "%identity"
 external unsafe_await: promise<'a> => 'a = "?await"
+
+let isCatchable: 'any => bool = %raw(`value => value && typeof value.catch === 'function'`)

package/src/db/EntityHistory.res

@@ -24,6 +24,15 @@ type historyRow<'entity> = {
   current: historyFields,
   previous: option<historyFields>,
   entityData: entityData<'entity>,
+  // In the event of a rollback, some entity updates may have been
+  // been affected by a rollback diff. If there was no rollback diff
+  // this will always be false.
+  // If there was a rollback diff, this will be false in the case of a
+  // new entity update (where entity affected is not present in the diff) b
+  // but true if the update is related to an entity that is
+  // currently present in the diff
+  // Optional since it's discarded during parsing/serialization
+  containsRollbackDiffChange?: bool,
 }
 
 type previousHistoryFields = historyFieldsGeneral<option<int>>
@@ -134,6 +143,7 @@ type t<'entity> = {
   table: table,
   createInsertFnQuery: string,
   schema: S.t<historyRow<'entity>>,
+  // Used for parsing
   schemaRows: S.t<array<historyRow<'entity>>>,
   insertFn: (Postgres.sql, Js.Json.t, ~shouldCopyCurrentEntity: bool) => promise<unit>,
 }
@@ -148,19 +158,13 @@ let insertRow = (
   self.insertFn(sql, row, ~shouldCopyCurrentEntity)
 }
 
-let batchInsertRows = (
-  self: t<'entity>,
-  ~sql,
-  ~rows: array<historyRow<'entity>>,
-  ~shouldCopyCurrentEntity,
-) => {
-  let rows =
-    rows
-    ->S.reverseConvertToJsonOrThrow(self.schemaRows)
-    ->(Utils.magic: Js.Json.t => array<Js.Json.t>)
+let batchInsertRows = (self: t<'entity>, ~sql, ~rows: array<historyRow<'entity>>) => {
   rows
-  ->Belt.Array.map(row => {
-    self.insertFn(sql, row, ~shouldCopyCurrentEntity)
+  ->Belt.Array.map(historyRow => {
+    let containsRollbackDiffChange =
+      historyRow.containsRollbackDiffChange->Belt.Option.getWithDefault(false)
+    let shouldCopyCurrentEntity = !containsRollbackDiffChange
+    self->insertRow(~sql, ~historyRow, ~shouldCopyCurrentEntity)
   })
   ->Promise.all
   ->Promise.thenResolve(_ => ())

package/src/sources/HyperSyncClient.gen.ts

@@ -0,0 +1,19 @@
+/* TypeScript file generated from HyperSyncClient.res by genType. */
+
+/* eslint-disable */
+/* tslint:disable */
+
+import type {t as Address_t} from '../../src/Address.gen';
+
+export type ResponseTypes_accessList = { readonly address?: Address_t; readonly storageKeys?: string[] };
+
+export type ResponseTypes_authorizationList = {
+  readonly chainId: bigint; 
+  readonly address: Address_t; 
+  readonly nonce: number; 
+  readonly yParity: 
+    1
+  | 0; 
+  readonly r: string; 
+  readonly s: string
+};

package/src/sources/HyperSyncClient.res

@@ -75,6 +75,7 @@ module QueryTypes = {
     | L1GasUsed
     | L1FeeScalar
     | GasUsedForL1
+    | AuthorizationList
 
   type logField =
     | Removed
@@ -302,11 +303,36 @@ module ResponseTypes = {
     mixHash?: string,
   }
 
+  @genType
   type accessList = {
     address?: Address.t,
     storageKeys?: array<string>,
   }
 
+  let accessListSchema = S.object(s => {
+    address: ?s.field("address", S.option(Address.schema)),
+    storageKeys: ?s.field("storageKeys", S.option(S.array(S.string))),
+  })
+
+  @genType
+  type authorizationList = {
+    chainId: bigint,
+    address: Address.t,
+    nonce: int,
+    yParity: [#0 | #1],
+    r: string,
+    s: string,
+  }
+
+  let authorizationListSchema = S.object(s => {
+    chainId: s.field("chainId", S.bigint),
+    address: s.field("address", Address.schema),
+    nonce: s.field("nonce", S.int),
+    yParity: s.field("yParity", S.enum([#0, #1])),
+    r: s.field("r", S.string),
+    s: s.field("s", S.string),
+  })
+
   type transaction = {
     blockHash?: string,
     blockNumber?: int,
@@ -342,6 +368,7 @@ module ResponseTypes = {
     l1GasUsed?: bigint,
     l1FeeScalar?: int,
     gasUsedForL1?: bigint,
+    authorizationList?: array<authorizationList>,
   }
 
   type log = {