envio 2.26.0-alpha.9 → 2.26.0-rc.0

package/evm.schema.json

@@ -33,13 +33,6 @@
         "null"
       ]
     },
-    "output": {
-      "description": "Path where the generated directory will be placed. By default it's 'generated' relative to the current working directory. If set, it'll be a path relative to the config file location.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "contracts": {
       "description": "Global contract definitions that must contain all definitions except addresses. You can share a single handler/abi/event definitions for contracts across multiple chains.",
       "type": [

package/fuel.schema.json

@@ -26,13 +26,6 @@
         "null"
       ]
     },
-    "output": {
-      "description": "Path where the generated directory will be placed. By default it's 'generated' relative to the current working directory. If set, it'll be a path relative to the config file location.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "contracts": {
       "description": "Global contract definitions that must contain all definitions except addresses. You can share a single handler/abi/event definitions for contracts across multiple chains.",
       "type": [

package/index.d.ts

@@ -105,8 +105,6 @@ export function experimental_createEffect<
     readonly input: IS;
     /** The output schema of the effect. */
     readonly output: OS;
-    /** Whether the effect should be cached. */
-    readonly cache?: boolean;
   },
   handler: (args: EffectArgs<I>) => Promise<R>
 ): Effect<I, O>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "v2.26.0-alpha.9",
+  "version": "v2.26.0-rc.0",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.js",
   "main": "./index.js",
@@ -25,10 +25,10 @@
   },
   "homepage": "https://envio.dev",
   "optionalDependencies": {
-    "envio-linux-x64": "v2.26.0-alpha.9",
-    "envio-linux-arm64": "v2.26.0-alpha.9",
-    "envio-darwin-x64": "v2.26.0-alpha.9",
-    "envio-darwin-arm64": "v2.26.0-alpha.9"
+    "envio-linux-x64": "v2.26.0-rc.0",
+    "envio-linux-arm64": "v2.26.0-rc.0",
+    "envio-darwin-x64": "v2.26.0-rc.0",
+    "envio-darwin-arm64": "v2.26.0-rc.0"
   },
   "dependencies": {
     "@envio-dev/hypersync-client": "0.6.5",

package/src/Envio.gen.ts

@@ -21,9 +21,7 @@ export type effectOptions<input,output> = {
   /** The input schema of the effect. */
   readonly input: RescriptSchema_S_t<input>; 
   /** The output schema of the effect. */
-  readonly output: RescriptSchema_S_t<output>; 
-  /** Whether the effect should be cached. */
-  readonly cache?: boolean
+  readonly output: RescriptSchema_S_t<output>
 };
 
 export type effectContext = $$effectContext;

package/src/Envio.res

@@ -22,8 +22,6 @@ and effectOptions<'input, 'output> = {
   input: S.t<'input>,
   /** The output schema of the effect. */
   output: S.t<'output>,
-  /** Whether the effect should be cached. */
-  cache?: bool,
 }
 @genType.import(("./Types.ts", "EffectContext"))
 and effectContext = {
@@ -50,6 +48,5 @@ let experimental_createEffect = (
       >
     ),
     callsCount: 0,
-    cache: options.cache->Belt.Option.getWithDefault(false),
   }->(Utils.magic: Internal.effect => effect<'input, 'output>)
 }

package/src/Envio.res.js

@@ -2,14 +2,12 @@
 'use strict';
 
 var Prometheus = require("./Prometheus.res.js");
-var Belt_Option = require("rescript/lib/js/belt_Option.js");
 
 function experimental_createEffect(options, handler) {
   Prometheus.EffectCallsCount.set(0, options.name);
   return {
           name: options.name,
           handler: handler,
-          cache: Belt_Option.getWithDefault(options.cache, false),
           callsCount: 0
         };
 }

package/src/FetchState.res

@@ -901,7 +901,10 @@ let queueItemIsInReorgThreshold = (
   if currentBlockHeight === 0 {
     false
   } else {
-    queueItem->queueItemBlockNumber > highestBlockBelowThreshold
+    switch queueItem {
+    | Item(_) => queueItem->queueItemBlockNumber > highestBlockBelowThreshold
+    | NoItem(_) => queueItem->queueItemBlockNumber > highestBlockBelowThreshold
+    }
   }
 }
 

package/src/Internal.res

@@ -197,7 +197,6 @@ type effectArgs = {
 type effect = {
   name: string,
   handler: effectArgs => promise<effectOutput>,
-  cache: bool,
   mutable callsCount: int,
 }
 

package/src/Logging.res

@@ -168,14 +168,6 @@ let logForItem = (eventItem, level: Pino.logLevel, message: string, ~params=?) =
   (eventItem->getEventLogger->Utils.magic->Js.Dict.unsafeGet((level :> string)))(params, message)
 }
 
-let noopLogger: Envio.logger = {
-  info: (_message: string, ~params as _=?) => (),
-  debug: (_message: string, ~params as _=?) => (),
-  warn: (_message: string, ~params as _=?) => (),
-  error: (_message: string, ~params as _=?) => (),
-  errorWithExn: (_message: string, _exn) => (),
-}
-
 let getUserLogger = (eventItem): Envio.logger => {
   info: (message: string, ~params=?) => eventItem->logForItem(#uinfo, message, ~params?),
   debug: (message: string, ~params=?) => eventItem->logForItem(#udebug, message, ~params?),

package/src/Logging.res.js

@@ -197,34 +197,6 @@ function logForItem(eventItem, level, message, params) {
   return getEventLogger(eventItem)[level](params, message);
 }
 
-function noopLogger_debug(_message, param) {
-  
-}
-
-function noopLogger_info(_message, param) {
-  
-}
-
-function noopLogger_warn(_message, param) {
-  
-}
-
-function noopLogger_error(_message, param) {
-  
-}
-
-function noopLogger_errorWithExn(_message, _exn) {
-  
-}
-
-var noopLogger = {
-  debug: noopLogger_debug,
-  info: noopLogger_info,
-  warn: noopLogger_warn,
-  error: noopLogger_error,
-  errorWithExn: noopLogger_errorWithExn
-};
-
 function getUserLogger(eventItem) {
   return {
           debug: (function (message, params) {
@@ -271,6 +243,5 @@ exports.createChild = createChild;
 exports.createChildFrom = createChildFrom;
 exports.getEventLogger = getEventLogger;
 exports.logForItem = logForItem;
-exports.noopLogger = noopLogger;
 exports.getUserLogger = getUserLogger;
 /* logLevels Not a pure module */

package/src/Persistence.res

@@ -5,18 +5,6 @@
 // Currently there are quite many code spread across
 // DbFunctions, Db, Migrations, InMemoryStore modules which use codegen code directly.
 
-// The type reflects an effect cache table in the db
-// It might be present even if the effect is not used in the application
-type effectCache = {
-  name: string,
-  // Number of rows in the table
-  mutable size: int,
-  // Lazily attached table definition when effect is used in the application
-  mutable table: option<Table.table>,
-}
-
-type operator = [#">" | #"="]
-
 type storage = {
   // Should return true if we already have persisted data
   // and we can skip initialization
@@ -27,8 +15,9 @@ type storage = {
     ~entities: array<Internal.entityConfig>=?,
     ~generalTables: array<Table.table>=?,
     ~enums: array<Internal.enumConfig<Internal.enum>>=?,
+    // If true, the storage should clear existing data
+    ~cleanRun: bool=?,
   ) => promise<unit>,
-  loadEffectCaches: unit => promise<array<effectCache>>,
   @raises("StorageError")
   loadByIdsOrThrow: 'item. (
     ~ids: array<string>,
@@ -36,15 +25,6 @@ type storage = {
     ~rowsSchema: S.t<array<'item>>,
   ) => promise<array<'item>>,
   @raises("StorageError")
-  loadByFieldOrThrow: 'item 'value. (
-    ~fieldName: string,
-    ~fieldSchema: S.t<'value>,
-    ~fieldValue: 'value,
-    ~operator: operator,
-    ~table: Table.table,
-    ~rowsSchema: S.t<array<'item>>,
-  ) => promise<array<'item>>,
-  @raises("StorageError")
   setOrThrow: 'item. (
     ~items: array<'item>,
     ~table: Table.table,
@@ -57,7 +37,7 @@ exception StorageError({message: string, reason: exn})
 type storageStatus =
   | Unknown
   | Initializing(promise<unit>)
-  | Ready({cleanRun: bool, effectCaches: dict<effectCache>})
+  | Ready({cleanRun: bool})
 
 type t = {
   userEntities: array<Internal.entityConfig>,
@@ -67,6 +47,7 @@ type t = {
   mutable storageStatus: storageStatus,
   storage: storage,
   onStorageInitialize: option<unit => promise<unit>>,
+  cacheStorage: storage,
 }
 
 let entityHistoryActionEnumConfig: Internal.enumConfig<EntityHistory.RowAction.t> = {
@@ -83,6 +64,7 @@ let make = (
   ~allEnums,
   ~staticTables,
   ~storage,
+  ~cacheStorage,
   ~onStorageInitialize=?,
 ) => {
   let allEntities = userEntities->Js.Array2.concat([dcRegistryEntityConfig])
@@ -96,10 +78,18 @@ let make = (
     storageStatus: Unknown,
     storage,
     onStorageInitialize,
+    cacheStorage,
   }
 }
 
-let init = async (persistence, ~reset=false) => {
+let init = async (
+  persistence,
+  // There are not much sense in the option,
+  // but this is how the runUpMigration used to work
+  // and we want to keep the upsert behavior without breaking changes.
+  ~skipIsInitializedCheck=false,
+  ~reset=false,
+) => {
   try {
     let shouldRun = switch persistence.storageStatus {
     | Unknown => true
@@ -115,37 +105,20 @@ let init = async (persistence, ~reset=false) => {
         resolveRef := resolve
       })
       persistence.storageStatus = Initializing(promise)
-      if reset || !(await persistence.storage.isInitialized()) {
+      if !(reset || skipIsInitializedCheck) && (await persistence.storage.isInitialized()) {
+        persistence.storageStatus = Ready({cleanRun: false})
+      } else {
         let _ = await persistence.storage.initialize(
           ~entities=persistence.allEntities,
           ~generalTables=persistence.staticTables,
           ~enums=persistence.allEnums,
+          ~cleanRun=reset || !skipIsInitializedCheck,
         )
-
-        persistence.storageStatus = Ready({
-          cleanRun: true,
-          effectCaches: Js.Dict.empty(),
-        })
+        persistence.storageStatus = Ready({cleanRun: true})
         switch persistence.onStorageInitialize {
         | Some(onStorageInitialize) => await onStorageInitialize()
         | None => ()
         }
-      } else if (
-        // In case of a race condition,
-        // we want to set the initial status to Ready only once.
-        switch persistence.storageStatus {
-        | Initializing(_) => true
-        | _ => false
-        }
-      ) {
-        let effectCaches = Js.Dict.empty()
-        (await persistence.storage.loadEffectCaches())->Js.Array2.forEach(effectCache => {
-          effectCaches->Js.Dict.set(effectCache.name, effectCache)
-        })
-        persistence.storageStatus = Ready({
-          cleanRun: false,
-          effectCaches,
-        })
       }
       resolveRef.contents()
     }

package/src/Persistence.res.js

@@ -22,7 +22,7 @@ var entityHistoryActionEnumConfig = {
   default: "SET"
 };
 
-function make(userEntities, dcRegistryEntityConfig, allEnums, staticTables, storage, onStorageInitialize) {
+function make(userEntities, dcRegistryEntityConfig, allEnums, staticTables, storage, cacheStorage, onStorageInitialize) {
   var allEntities = userEntities.concat([dcRegistryEntityConfig]);
   var allEnums$1 = allEnums.concat([entityHistoryActionEnumConfig]);
   return {
@@ -32,11 +32,13 @@ function make(userEntities, dcRegistryEntityConfig, allEnums, staticTables, stor
           allEnums: allEnums$1,
           storageStatus: "Unknown",
           storage: storage,
-          onStorageInitialize: onStorageInitialize
+          onStorageInitialize: onStorageInitialize,
+          cacheStorage: cacheStorage
         };
 }
 
-async function init(persistence, resetOpt) {
+async function init(persistence, skipIsInitializedCheckOpt, resetOpt) {
+  var skipIsInitializedCheck = skipIsInitializedCheckOpt !== undefined ? skipIsInitializedCheckOpt : false;
   var reset = resetOpt !== undefined ? resetOpt : false;
   try {
     var promise = persistence.storageStatus;
@@ -62,34 +64,22 @@ async function init(persistence, resetOpt) {
       TAG: "Initializing",
       _0: promise$1
     };
-    if (reset || !await persistence.storage.isInitialized()) {
-      await persistence.storage.initialize(persistence.allEntities, persistence.staticTables, persistence.allEnums);
+    if (!(reset || skipIsInitializedCheck) && await persistence.storage.isInitialized()) {
       persistence.storageStatus = {
         TAG: "Ready",
-        cleanRun: true,
-        effectCaches: {}
+        cleanRun: false
+      };
+    } else {
+      await persistence.storage.initialize(persistence.allEntities, persistence.staticTables, persistence.allEnums, reset || !skipIsInitializedCheck);
+      persistence.storageStatus = {
+        TAG: "Ready",
+        cleanRun: true
       };
       var onStorageInitialize = persistence.onStorageInitialize;
       if (onStorageInitialize !== undefined) {
         await onStorageInitialize();
       }
       
-    } else {
-      var match = persistence.storageStatus;
-      var tmp;
-      tmp = typeof match !== "object" || match.TAG !== "Initializing" ? false : true;
-      if (tmp) {
-        var effectCaches = {};
-        (await persistence.storage.loadEffectCaches()).forEach(function (effectCache) {
-              effectCaches[effectCache.name] = effectCache;
-            });
-        persistence.storageStatus = {
-          TAG: "Ready",
-          cleanRun: false,
-          effectCaches: effectCaches
-        };
-      }
-      
     }
     return resolveRef.contents();
   }