envio 3.3.0-alpha.3 → 3.3.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envio",
-  "version": "3.3.0-alpha.3",
+  "version": "3.3.0-alpha.4",
   "type": "module",
   "description": "A latency and sync speed optimized, developer friendly blockchain data indexer.",
   "bin": "./bin.mjs",
@@ -69,10 +69,10 @@
     "tsx": "4.21.0"
   },
   "optionalDependencies": {
-    "envio-linux-x64": "3.3.0-alpha.3",
-    "envio-linux-x64-musl": "3.3.0-alpha.3",
-    "envio-linux-arm64": "3.3.0-alpha.3",
-    "envio-darwin-x64": "3.3.0-alpha.3",
-    "envio-darwin-arm64": "3.3.0-alpha.3"
+    "envio-linux-x64": "3.3.0-alpha.4",
+    "envio-linux-x64-musl": "3.3.0-alpha.4",
+    "envio-linux-arm64": "3.3.0-alpha.4",
+    "envio-darwin-x64": "3.3.0-alpha.4",
+    "envio-darwin-arm64": "3.3.0-alpha.4"
   }
 }

package/src/Bin.res

@@ -71,6 +71,9 @@ let run = async args => {
       }
     }
   } catch {
+  | Main.FatalError(_) =>
+    // Already logged with full context by Main.start's onError; just exit.
+    NodeJs.process->NodeJs.exitWithCode(Failure)
   | exn =>
     // Log just the exception's own message — wrapping it in "Failed at
     // initialization" and pino's err serializer buries the real cause under

package/src/Bin.res.mjs

@@ -79,6 +79,10 @@ async function run(args) {
     }
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
+    if (exn.RE_EXN_ID === Main.FatalError) {
+      Process.exit(1);
+      return;
+    }
     let e = Primitive_exceptions.internalToException(exn);
     let message = e.RE_EXN_ID === "JsExn" ? Stdlib_Option.getOr(Stdlib_JsExn.message(e._1), "Failed at initialization") : "Failed at initialization";
     Logging.error(message);

package/src/ChainFetching.res

@@ -11,13 +11,12 @@ type partitionQueryResponse = {
 let runContractRegistersOrThrow = async (
   ~itemsWithContractRegister: array<Internal.item>,
   ~config: Config.t,
-  ~chainState: ChainState.t,
   ~page: option<TransactionStore.t>,
 ) => {
   // contractRegister handlers can read event.transaction, so materialise the
   // selected fields onto the payloads before running them. All items belong to
   // the chain being fetched, hence its single page store and mask.
-  await chainState->ChainState.materializePageItems(~items=itemsWithContractRegister, ~page)
+  await ChainState.materializePageItems(~items=itemsWithContractRegister, ~page)
 
   let itemsWithDcs = []
 
@@ -233,7 +232,6 @@ let rec onQueryResponse = async (
         switch await runContractRegistersOrThrow(
           ~itemsWithContractRegister,
           ~config=state->IndexerState.config,
-          ~chainState,
           ~page=transactionStore,
         ) {
         | exception exn => IndexerState.errorExit(state, exn->ErrorHandling.make)

package/src/ChainFetching.res.mjs

@@ -16,8 +16,8 @@ import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as ContractRegisterContext from "./ContractRegisterContext.res.mjs";
 
-async function runContractRegistersOrThrow(itemsWithContractRegister, config, chainState, page) {
-  await ChainState.materializePageItems(chainState, itemsWithContractRegister, page);
+async function runContractRegistersOrThrow(itemsWithContractRegister, config, page) {
+  await ChainState.materializePageItems(itemsWithContractRegister, page);
   let itemsWithDcs = [];
   let onRegister = (item, contractAddress, contractName) => {
     let dc_registrationBlock = item.blockNumber;
@@ -145,7 +145,7 @@ async function onQueryResponse(state, param, stateId, scheduleFetch, schedulePro
   }
   let newItemsWithDcs;
   try {
-    newItemsWithDcs = await runContractRegistersOrThrow(itemsWithContractRegister, IndexerState.config(state), chainState, transactionStore);
+    newItemsWithDcs = await runContractRegistersOrThrow(itemsWithContractRegister, IndexerState.config(state), transactionStore);
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
     return IndexerState.errorExit(state, ErrorHandling.make(exn, undefined, undefined));

package/src/ChainState.res

@@ -21,8 +21,6 @@ type t = {
   // transactionIndex). Fetch responses merge their page in; entries are pruned
   // as the chain progresses and dropped above the target on rollback.
   transactionStore: TransactionStore.t,
-  // Bitmask of the transaction fields the store materialises at batch prep.
-  transactionFieldMask: float,
 }
 
 // Per-chain shape returned by the status API.
@@ -67,7 +65,6 @@ let make = (
   ~numEventsProcessed=0.,
   ~timestampCaughtUpToHeadOrEndblock=None,
   ~isProgressAtHead=false,
-  ~transactionFieldMask=0.,
   ~logger: Pino.t,
 ): t => {
   logger,
@@ -82,7 +79,6 @@ let make = (
   reorgDetection,
   safeCheckpointTracking,
   transactionStore: TransactionStore.make(),
-  transactionFieldMask,
 }
 
 let makeInternal = (
@@ -328,7 +324,6 @@ let makeInternal = (
     ~committedProgressBlockNumber=progressBlockNumber,
     ~timestampCaughtUpToHeadOrEndblock,
     ~numEventsProcessed,
-    ~transactionFieldMask=config.ecosystem.transactionFieldMask(eventConfigs),
     ~logger,
   )
 }
@@ -503,18 +498,14 @@ let isAtHeadWithoutEndBlock = (cs: t) =>
 // Materialise the chain store's selected transaction fields onto a batch's
 // items at batch prep (the persistent-store path).
 let materializeBatchItems = (cs: t, ~items: array<Internal.item>) =>
-  cs.transactionStore->TransactionStore.materializeItems(~items, ~mask=cs.transactionFieldMask)
+  cs.transactionStore->TransactionStore.materializeItems(~items)
 
 // Materialise a fetch-response page's transactions onto its items before
 // contract-register handlers read them. `None` pages (RPC/Fuel/Simulate keep the
 // transaction inline) are a no-op.
-let materializePageItems = (
-  cs: t,
-  ~items: array<Internal.item>,
-  ~page: option<TransactionStore.t>,
-) =>
+let materializePageItems = (~items: array<Internal.item>, ~page: option<TransactionStore.t>) =>
   switch page {
-  | Some(store) => store->TransactionStore.materializeItems(~items, ~mask=cs.transactionFieldMask)
+  | Some(store) => store->TransactionStore.materializeItems(~items)
   | None => Promise.resolve()
   }
 

package/src/ChainState.res.mjs

@@ -38,12 +38,11 @@ function configAddresses(chainConfig) {
   return addresses;
 }
 
-function make(chainConfig, fetchState, sourceManager, reorgDetection, committedProgressBlockNumber, safeCheckpointTrackingOpt, numEventsProcessedOpt, timestampCaughtUpToHeadOrEndblockOpt, isProgressAtHeadOpt, transactionFieldMaskOpt, logger) {
+function make(chainConfig, fetchState, sourceManager, reorgDetection, committedProgressBlockNumber, safeCheckpointTrackingOpt, numEventsProcessedOpt, timestampCaughtUpToHeadOrEndblockOpt, isProgressAtHeadOpt, logger) {
   let safeCheckpointTracking = safeCheckpointTrackingOpt !== undefined ? Primitive_option.valFromOption(safeCheckpointTrackingOpt) : undefined;
   let numEventsProcessed = numEventsProcessedOpt !== undefined ? numEventsProcessedOpt : 0;
   let timestampCaughtUpToHeadOrEndblock = timestampCaughtUpToHeadOrEndblockOpt !== undefined ? Primitive_option.valFromOption(timestampCaughtUpToHeadOrEndblockOpt) : undefined;
   let isProgressAtHead = isProgressAtHeadOpt !== undefined ? isProgressAtHeadOpt : false;
-  let transactionFieldMask = transactionFieldMaskOpt !== undefined ? transactionFieldMaskOpt : 0;
   return {
     logger: logger,
     fetchState: fetchState,
@@ -56,8 +55,7 @@ function make(chainConfig, fetchState, sourceManager, reorgDetection, committedP
     pendingBudget: 0,
     reorgDetection: reorgDetection,
     safeCheckpointTracking: safeCheckpointTracking,
-    transactionStore: TransactionStore.make(),
-    transactionFieldMask: transactionFieldMask
+    transactionStore: TransactionStore.make()
   };
 }
 
@@ -176,7 +174,7 @@ function makeInternal(chainConfig, indexingAddresses, startBlock, endBlock, firs
       sources$1 = sources._0;
       break;
   }
-  return make(chainConfig, fetchState, SourceManager.make(sources$1, isRealtime, undefined, undefined, undefined, reducedPollingInterval, undefined, undefined), ReorgDetection.make(chainReorgCheckpoints, maxReorgDepth, config.shouldRollbackOnReorg), progressBlockNumber, Primitive_option.some(SafeCheckpointTracking.make(maxReorgDepth, config.shouldRollbackOnReorg, chainReorgCheckpoints)), numEventsProcessed, Primitive_option.some(timestampCaughtUpToHeadOrEndblock), undefined, config.ecosystem.transactionFieldMask(eventConfigs), logger);
+  return make(chainConfig, fetchState, SourceManager.make(sources$1, isRealtime, undefined, undefined, undefined, reducedPollingInterval, undefined, undefined), ReorgDetection.make(chainReorgCheckpoints, maxReorgDepth, config.shouldRollbackOnReorg), progressBlockNumber, Primitive_option.some(SafeCheckpointTracking.make(maxReorgDepth, config.shouldRollbackOnReorg, chainReorgCheckpoints)), numEventsProcessed, Primitive_option.some(timestampCaughtUpToHeadOrEndblock), undefined, logger);
 }
 
 function makeFromConfig(chainConfig, config, registrations, knownHeight) {
@@ -326,12 +324,12 @@ function isAtHeadWithoutEndBlock(cs) {
 }
 
 function materializeBatchItems(cs, items) {
-  return TransactionStore.materializeItems(cs.transactionStore, items, cs.transactionFieldMask);
+  return TransactionStore.materializeItems(cs.transactionStore, items);
 }
 
-function materializePageItems(cs, items, page) {
+function materializePageItems(items, page) {
   if (page !== undefined) {
-    return TransactionStore.materializeItems(Primitive_option.valFromOption(page), items, cs.transactionFieldMask);
+    return TransactionStore.materializeItems(Primitive_option.valFromOption(page), items);
   } else {
     return Promise.resolve();
   }

package/src/ChainState.resi

@@ -15,7 +15,6 @@ let make: (
   ~numEventsProcessed: float=?,
   ~timestampCaughtUpToHeadOrEndblock: option<Date.t>=?,
   ~isProgressAtHead: bool=?,
-  ~transactionFieldMask: float=?,
   ~logger: Pino.t,
 ) => t
 
@@ -112,7 +111,6 @@ let handleQueryResult: (
 ) => unit
 let materializeBatchItems: (t, ~items: array<Internal.item>) => promise<unit>
 let materializePageItems: (
-  t,
   ~items: array<Internal.item>,
   ~page: option<TransactionStore.t>,
 ) => promise<unit>

package/src/Ecosystem.res

@@ -34,10 +34,6 @@ type t = {
       registration from an item's opaque payload. `event.transaction` is written
       onto the payload at batch prep (HyperSync) or inline (RPC/simulate). */
   toEvent: Internal.eventItem => Internal.event,
-  /** Bitmask (as a float) of the transaction fields selected across the chain's
-      events — the set the store materialises at batch prep. `0.` when the
-      ecosystem carries transactions inline. */
-  transactionFieldMask: array<Internal.eventConfig> => float,
   /** Build the per-item child logger for an event item, with
       ecosystem-specific log fields (EVM/Fuel: contract/event/address; SVM:
       program/instruction/programId). Closes over the injected logger. */

package/src/EventConfigBuilder.res

@@ -442,6 +442,7 @@ let buildEvmEventConfig = (
     startBlock: resolvedStartBlock,
     selectedBlockFields,
     selectedTransactionFields,
+    transactionFieldMask: Evm.eventTransactionFieldMask(selectedTransactionFields),
     sighash,
     topicCount,
     paramsMetadata: params,
@@ -500,6 +501,7 @@ let buildSvmInstructionEventConfig = (
     discriminatorByteLen,
     includeLogs,
     selectedTransactionFields,
+    transactionFieldMask: Svm.eventTransactionFieldMask(selectedTransactionFields),
     accountFilters,
     isInner,
     accounts,
@@ -568,6 +570,7 @@ let buildFuelEventConfig = (
     startBlock,
     // Fuel keeps the transaction inline on the payload; nothing to materialise.
     selectedTransactionFields: Utils.Set.make(),
+    transactionFieldMask: 0.,
     kind: fuelKind,
   }
 }

package/src/EventConfigBuilder.res.mjs

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Evm from "./sources/Evm.res.mjs";
+import * as Svm from "./sources/Svm.res.mjs";
 import * as Utils from "./Utils.res.mjs";
 import * as Address from "./Address.res.mjs";
 import * as FuelSDK from "./sources/FuelSDK.res.mjs";
@@ -294,6 +296,7 @@ function buildEvmEventConfig(contractName, eventName, sighash, params, isWildcar
   let filterByAddresses = match.filterByAddresses;
   let resolvedStartBlock = whereStartBlock !== undefined ? whereStartBlock : startBlock;
   let match$1 = resolveFieldSelection(blockFields, transactionFields, globalBlockFieldsSet, globalTransactionFieldsSet);
+  let selectedTransactionFields = match$1[1];
   return {
     id: sighash + "_" + topicCount.toString(),
     name: eventName,
@@ -307,7 +310,8 @@ function buildEvmEventConfig(contractName, eventName, sighash, params, isWildcar
     paramsRawEventSchema: buildParamsSchema(params),
     simulateParamsSchema: buildSimulateParamsSchema(params),
     startBlock: resolvedStartBlock,
-    selectedTransactionFields: match$1[1],
+    selectedTransactionFields: selectedTransactionFields,
+    transactionFieldMask: Evm.eventTransactionFieldMask(selectedTransactionFields),
     getEventFiltersOrThrow: match.getEventFiltersOrThrow,
     selectedBlockFields: match$1[0],
     sighash: sighash,
@@ -337,6 +341,7 @@ function buildSvmInstructionEventConfig(contractName, instructionName, programId
     simulateParamsSchema: paramsSchema,
     startBlock: startBlock,
     selectedTransactionFields: selectedTransactionFields,
+    transactionFieldMask: Svm.eventTransactionFieldMask(selectedTransactionFields),
     programId: programId,
     discriminator: discriminator,
     discriminatorByteLen: discriminatorByteLen,
@@ -406,6 +411,7 @@ function buildFuelEventConfig(contractName, eventName, kind, sighash, rawAbi, is
     simulateParamsSchema: paramsSchema,
     startBlock: startBlock,
     selectedTransactionFields: new Set(),
+    transactionFieldMask: 0,
     kind: fuelKind
   };
 }

package/src/FetchState.res

@@ -41,12 +41,6 @@ type partition = {
   latestFetchedBlock: blockNumberAndTimestamp,
   selection: selection,
   addressesByContractName: dict<array<Address.t>>,
-  // Reverse index address→contractName, derived from addressesByContractName.
-  // Used by EventRouter to resolve a log's owning contract from the partition
-  // that fetched it (instead of a chain-wide snapshot). Always recomputed in
-  // OptimizedPartitions.make, so partition literals can seed it with an empty
-  // dict.
-  contractNameByAddress: dict<string>,
   mergeBlock: option<int>,
   // When set, partition indexes a single dynamic contract type.
   // The addressesByContractName must contain only addresses for this contract.
@@ -82,16 +76,17 @@ type query = {
   mutable progress: float,
   selection: selection,
   addressesByContractName: dict<array<Address.t>>,
-  // The owning partition's reverse index, referenced (not copied) so routing
-  // resolves ownership without a chain-wide snapshot.
-  contractNameByAddress: dict<string>,
 }
 
-// Invert addressesByContractName into address→contractName. 1:1 today (each
-// address belongs to one contract), so no key collisions.
-let deriveContractNameByAddress = (addressesByContractName: dict<array<Address.t>>): dict<
+// Invert addressesByContractName into address→contractName for log-ownership
+// routing. 1:1 today (each address belongs to one contract), so no key
+// collisions. Memoized on the addressesByContractName object so a partition's
+// many responses share one derivation and a large factory never rebuilds the
+// whole index; sound because the dict is immutable after construction (every
+// mutation produces a new dict).
+let deriveContractNameByAddress: dict<array<Address.t>> => dict<
   string,
-> => {
+> = Utils.WeakMap.memoize(addressesByContractName => {
   let result = Dict.make()
   addressesByContractName->Utils.Dict.forEachWithKey((addresses, contractName) => {
     for i in 0 to addresses->Array.length - 1 {
@@ -99,7 +94,7 @@ let deriveContractNameByAddress = (addressesByContractName: dict<array<Address.t
     }
   })
   result
-}
+})
 
 // Default estimate for a query whose partition hasn't responded yet, so the
 // shared budget still accounts for unknown queries instead of treating them as
@@ -214,7 +209,6 @@ module OptimizedPartitions = {
         latestFetchedBlock: {blockNumber: potentialMergeBlock, blockTimestamp: 0},
         mergeBlock: None,
         addressesByContractName: Dict.make(), // set below
-        contractNameByAddress: Dict.make(), // derived in make
         mutPendingQueries: [],
         prevQueryRange: minRange,
         prevPrevQueryRange: minRange,
@@ -397,12 +391,7 @@ module OptimizedPartitions = {
     for idx in 0 to partitionsCount - 1 {
       let p = newPartitions->Array.getUnsafe(idx)
       idsInAscOrder->Array.setUnsafe(idx, p.id)
-      // Single point where every partition's reverse index is (re)derived, so all
-      // construction paths (literals, spreads, merges, splits) stay consistent.
-      entities->Dict.set(
-        p.id,
-        {...p, contractNameByAddress: deriveContractNameByAddress(p.addressesByContractName)},
-      )
+      entities->Dict.set(p.id, p)
     }
 
     {
@@ -901,7 +890,6 @@ OptimizedPartitions.t => {
             selection: normalSelection,
             dynamicContract: isDynamic ? Some(contractName) : None,
             addressesByContractName,
-            contractNameByAddress: Dict.make(), // derived in make
             mergeBlock: None,
             mutPendingQueries: [],
             prevQueryRange: 0,
@@ -1244,7 +1232,6 @@ let registerDynamicContracts = (
                         selection: fetchState.normalSelection,
                         dynamicContract: Some(contractName),
                         addressesByContractName,
-                        contractNameByAddress: Dict.make(), // derived in make
                         mergeBlock: None,
                         mutPendingQueries: p.mutPendingQueries,
                         prevQueryRange: p.prevQueryRange,
@@ -1396,7 +1383,6 @@ let pushQueriesForRange = (
           chainId: 0,
           progress: 0.,
           addressesByContractName,
-          contractNameByAddress: partition.contractNameByAddress,
         })
       | Some(chunkRange) =>
         let maxBlock = switch rangeEndBlock {
@@ -1426,7 +1412,6 @@ let pushQueriesForRange = (
               chainId: 0,
               progress: 0.,
               addressesByContractName,
-              contractNameByAddress: partition.contractNameByAddress,
             })
             chunkFromBlock := chunkToBlock + 1
             chunkIdx := chunkIdx.contents + 1
@@ -1448,7 +1433,6 @@ let pushQueriesForRange = (
             chainId: 0,
             progress: 0.,
             addressesByContractName,
-            contractNameByAddress: partition.contractNameByAddress,
           })
         }
       }
@@ -1703,7 +1687,6 @@ let make = (
         eventConfigs: notDependingOnAddresses,
       },
       addressesByContractName: Dict.make(),
-      contractNameByAddress: Dict.make(), // derived in make
       mergeBlock: None,
       dynamicContract: None,
       mutPendingQueries: [],