envio 3.3.0-alpha.1 → 3.3.0-alpha.2

package/src/sources/Fuel.res.mjs

@@ -28,6 +28,7 @@ function make(logger) {
     onEventBlockFilterSchema: S$RescriptSchema.object(s => s.f("block", S$RescriptSchema.option(S$RescriptSchema.object(s2 => s2.f("height", S$RescriptSchema.unknown))))),
     logger: logger,
     toEvent: eventItem => eventItem.payload,
+    transactionFieldMask: param => 0,
     toEventLogger: eventItem => Logging.createChildFrom(logger, {
       contract: eventItem.eventConfig.contractName,
       event: eventItem.eventConfig.name,

package/src/sources/HyperFuelSource.res

@@ -414,6 +414,9 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
         blockNumber: block.height,
         blockHash: block.id,
         logIndex: receiptIndex,
+        // Fuel carries the transaction inline on the payload; the store key is
+        // unused (Fuel identifies transactions by hash, kept on the payload).
+        transactionIndex: 0,
         payload: {
           contractName: eventConfig.contractName,
           eventName: eventConfig.name,
@@ -456,6 +459,8 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     {
       latestFetchedBlockTimestamp,
       parsedQueueItems,
+      // Fuel keeps transaction on the payload; no store page.
+      transactionStore: None,
       latestFetchedBlockNumber: heighestBlockQueried,
       stats,
       knownHeight,

package/src/sources/HyperFuelSource.res.mjs

@@ -355,6 +355,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         blockNumber: block.height,
         blockHash: block.id,
         logIndex: receiptIndex,
+        transactionIndex: 0,
         payload: {
           contractName: eventConfig$1.contractName,
           eventName: eventConfig$1.name,
@@ -397,6 +398,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       knownHeight: knownHeight$1,
       blockHashes: blockHashes,
       parsedQueueItems: parsedQueueItems,
+      transactionStore: undefined,
       fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: heighestBlockQueried,
       latestFetchedBlockTimestamp: latestFetchedBlockTimestamp,

package/src/sources/HyperSync.res

@@ -19,6 +19,8 @@ type logsQueryPage = {
   nextBlock: int,
   archiveHeight: int,
   rollbackGuard: option<HyperSyncClient.ResponseTypes.rollbackGuard>,
+  // Page store owning this page's raw transactions.
+  transactionStore: TransactionStore.t,
 }
 
 type missingParams = {
@@ -121,7 +123,7 @@ module GetLogs = {
       ~fieldSelection,
     )
 
-    let res = switch await client.getEventItems(~query) {
+    let (res, transactionStore) = switch await client.getEventItems(~query) {
     | res => res
     | exception exn =>
       reraisIfRateLimited(exn)
@@ -140,6 +142,7 @@ module GetLogs = {
       nextBlock: res.nextBlock,
       archiveHeight: res.archiveHeight->Option.getOr(0), //Archive Height is only None if height is 0
       rollbackGuard: res.rollbackGuard,
+      transactionStore,
     }
   }
 }

package/src/sources/HyperSync.res.mjs

@@ -101,9 +101,9 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection)
     });
   });
   let query$1 = makeRequestBody(fromBlock, toBlock, addressesWithTopics, fieldSelection);
-  let res;
+  let match;
   try {
-    res = await client.getEventItems(query$1);
+    match = await client.getEventItems(query$1);
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
     reraisIfRateLimited(exn);
@@ -120,6 +120,7 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection)
     }
     throw exn;
   }
+  let res = match[0];
   if (res.nextBlock <= fromBlock) {
     throw {
       RE_EXN_ID: $$Error,
@@ -131,7 +132,8 @@ async function query(client, fromBlock, toBlock, logSelections, fieldSelection)
     items: res.items,
     nextBlock: res.nextBlock,
     archiveHeight: Stdlib_Option.getOr(res.archiveHeight, 0),
-    rollbackGuard: res.rollbackGuard
+    rollbackGuard: res.rollbackGuard,
+    transactionStore: match[1]
   };
 }
 

package/src/sources/HyperSync.resi

@@ -3,6 +3,7 @@ type logsQueryPage = {
   nextBlock: int,
   archiveHeight: int,
   rollbackGuard: option<HyperSyncClient.ResponseTypes.rollbackGuard>,
+  transactionStore: TransactionStore.t,
 }
 
 type missingParams = {

package/src/sources/HyperSyncClient.res

@@ -208,72 +208,6 @@ module ResponseTypes = {
     mixHash?: string,
   }
 
-  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))),
-  })
-
-  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,
-    from?: string,
-    gas?: bigint,
-    gasPrice?: bigint,
-    hash?: string,
-    input?: string,
-    nonce?: bigint,
-    to?: string,
-    transactionIndex?: int,
-    value?: bigint,
-    v?: string,
-    r?: string,
-    s?: string,
-    yParity?: string,
-    maxPriorityFeePerGas?: bigint,
-    maxFeePerGas?: bigint,
-    chainId?: int,
-    accessList?: array<accessList>,
-    maxFeePerBlobGas?: bigint,
-    blobVersionedHashes?: array<string>,
-    cumulativeGasUsed?: bigint,
-    effectiveGasPrice?: bigint,
-    gasUsed?: bigint,
-    contractAddress?: string,
-    logsBloom?: string,
-    @as("type") type_?: int,
-    root?: string,
-    status?: int,
-    l1Fee?: bigint,
-    l1GasPrice?: bigint,
-    l1GasUsed?: bigint,
-    l1FeeScalar?: float,
-    gasUsedForL1?: bigint,
-    authorizationList?: array<authorizationList>,
-  }
-
   type log = {
     removed?: bool,
     @as("logIndex") index?: int,
@@ -286,11 +220,9 @@ module ResponseTypes = {
     topics?: array<Nullable.t<EvmTypes.Hex.t>>,
   }
 
-  type event = {
-    transaction?: transaction,
-    block?: block,
-    log: log,
-  }
+  // Only the log is needed for decoding; the transaction/block are served from
+  // the store (event items) or unused (block-hash query).
+  type event = {log: log}
 
   type rollbackGuard = {
     blockNumber: int,
@@ -303,11 +235,7 @@ module ResponseTypes = {
 
 type query = QueryTypes.query
 
-type queryResponseData = {
-  blocks: array<ResponseTypes.block>,
-  transactions: array<ResponseTypes.transaction>,
-  logs: array<ResponseTypes.log>,
-}
+type queryResponseData = {blocks: array<ResponseTypes.block>}
 
 type queryResponse = {
   archiveHeight: option<int>,
@@ -353,7 +281,9 @@ module EventItems = {
     topic0: EvmTypes.Hex.t,
     topicCount: int,
     block: ResponseTypes.block,
-    transaction: ResponseTypes.transaction,
+    // Key (with the block number) into the transaction store; the transaction
+    // is resolved from the store on demand.
+    transactionIndex: int,
     params: Nullable.t<dict<Internal.eventParams>>,
   }
 
@@ -367,7 +297,8 @@ module EventItems = {
 
 type t = {
   get: (~query: query) => promise<queryResponse>,
-  getEventItems: (~query: query) => promise<EventItems.response>,
+  // Returns the response plus a page store owning this page's raw transactions.
+  getEventItems: (~query: query) => promise<(EventItems.response, TransactionStore.t)>,
   getHeight: unit => promise<int>,
 }
 

package/src/sources/HyperSyncClient.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Core from "../Core.res.mjs";
 import * as Utils from "../Utils.res.mjs";
-import * as Address from "../Address.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";
 
@@ -36,27 +35,7 @@ let QueryTypes = {
   makeLogSelection: makeLogSelection
 };
 
-let accessListSchema = S$RescriptSchema.object(s => ({
-  address: s.f("address", S$RescriptSchema.option(Address.schema)),
-  storageKeys: s.f("storageKeys", S$RescriptSchema.option(S$RescriptSchema.array(S$RescriptSchema.string)))
-}));
-
-let authorizationListSchema = S$RescriptSchema.object(s => ({
-  chainId: s.f("chainId", S$RescriptSchema.bigint),
-  address: s.f("address", Address.schema),
-  nonce: s.f("nonce", S$RescriptSchema.int),
-  yParity: s.f("yParity", S$RescriptSchema.$$enum([
-    0,
-    1
-  ])),
-  r: s.f("r", S$RescriptSchema.string),
-  s: s.f("s", S$RescriptSchema.string)
-}));
-
-let ResponseTypes = {
-  accessListSchema: accessListSchema,
-  authorizationListSchema: authorizationListSchema
-};
+let ResponseTypes = {};
 
 function fromParams(eventParams, checksumAddresses) {
   return Core.getAddon().EvmDecoder.fromParams(eventParams, checksumAddresses !== undefined ? Primitive_option.valFromOption(checksumAddresses) : undefined);

package/src/sources/HyperSyncSource.res

@@ -196,7 +196,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     ~params: Internal.eventParams,
     ~eventConfig: Internal.evmEventConfig,
   ): Internal.item => {
-    let {block, transaction, logIndex, srcAddress} = item
+    let {block, transactionIndex, logIndex, srcAddress} = item
     let chainId = chain->ChainMap.Chain.toChainId
 
     Internal.Event({
@@ -206,14 +206,12 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
       blockNumber: block.number->Option.getUnsafe,
       blockHash: block.hash->Option.getUnsafe,
       logIndex,
+      transactionIndex,
       payload: {
         contractName: eventConfig.contractName,
         eventName: eventConfig.name,
         chainId,
         params,
-        transaction: transaction->(
-          Utils.magic: HyperSyncClient.ResponseTypes.transaction => Internal.eventTransaction
-        ),
         block: block->(Utils.magic: HyperSyncClient.ResponseTypes.block => Internal.eventBlock),
         srcAddress,
         logIndex,
@@ -426,6 +424,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`)
     {
       latestFetchedBlockTimestamp,
       parsedQueueItems,
+      transactionStore: Some(pageUnsafe.transactionStore),
       latestFetchedBlockNumber: heighestBlockQueried,
       stats,
       knownHeight,

package/src/sources/HyperSyncSource.res.mjs

@@ -135,6 +135,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       blockNumber: block.number,
       blockHash: block.hash,
       logIndex: logIndex,
+      transactionIndex: item.transactionIndex,
       payload: {
         contractName: eventConfig.contractName,
         eventName: eventConfig.name,
@@ -142,7 +143,6 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
         chainId: chain,
         srcAddress: item.srcAddress,
         logIndex: logIndex,
-        transaction: item.transaction,
         block: block
       }
     };
@@ -292,6 +292,7 @@ Learn more or get a free Envio API token at: https://envio.dev/app/api-tokens`);
       knownHeight: knownHeight$1,
       blockHashes: blockHashes,
       parsedQueueItems: parsedQueueItems,
+      transactionStore: Primitive_option.some(pageUnsafe.transactionStore),
       fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: heighestBlockQueried,
       latestFetchedBlockTimestamp: latestFetchedBlockTimestamp,

package/src/sources/RpcSource.res

@@ -1160,7 +1160,9 @@ let make = (
                 let (block, transaction) = try await Promise.all2((
                   log->getEventBlockOrThrow(~selectedBlockFields=eventConfig.selectedBlockFields),
                   log->getEventTransactionOrThrow(
-                    ~selectedTransactionFields=eventConfig.selectedTransactionFields,
+                    ~selectedTransactionFields=eventConfig.selectedTransactionFields->(
+                      Utils.magic: Utils.Set.t<string> => Utils.Set.t<Internal.evmTransactionField>
+                    ),
                   ),
                 )) catch {
                 | TransactionDataNotFound({message}) =>
@@ -1200,13 +1202,14 @@ let make = (
                   blockHash: block->getBlockHash,
                   chain,
                   logIndex: log.logIndex,
+                  transactionIndex: log.transactionIndex,
                   payload: {
                     contractName: eventConfig.contractName,
                     eventName: eventConfig.name,
                     chainId: chain->ChainMap.Chain.toChainId,
                     params: decoded,
-                    transaction,
                     block,
+                    transaction,
                     srcAddress: routedAddress,
                     logIndex: log.logIndex,
                   }->Evm.fromPayload,
@@ -1250,6 +1253,8 @@ let make = (
       latestFetchedBlockTimestamp: latestFetchedBlockInfo.timestamp,
       latestFetchedBlockNumber: latestFetchedBlockInfo.number,
       parsedQueueItems,
+      // RPC keeps the transaction inline on the payload; no store page.
+      transactionStore: None,
       stats: {
         totalTimeElapsed: totalTimeElapsed,
       },

package/src/sources/RpcSource.res.mjs

@@ -1131,6 +1131,7 @@ function make(param) {
           blockNumber: block.number,
           blockHash: block.hash,
           logIndex: log.logIndex,
+          transactionIndex: log.transactionIndex,
           payload: {
             contractName: eventConfig.contractName,
             eventName: eventConfig.name,
@@ -1138,7 +1139,7 @@ function make(param) {
             chainId: chain,
             srcAddress: routedAddress,
             logIndex: log.logIndex,
-            transaction: match[1],
+            transaction: Primitive_option.some(match[1]),
             block: block
           }
         };
@@ -1174,6 +1175,7 @@ function make(param) {
       knownHeight: knownHeight,
       blockHashes: blockHashes,
       parsedQueueItems: parsedQueueItems,
+      transactionStore: undefined,
       fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: latestFetchedBlockInfo.number,
       latestFetchedBlockTimestamp: latestFetchedBlockInfo.timestamp,

package/src/sources/SimulateSource.res

@@ -28,7 +28,7 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
       ~retry as _,
       ~logger as _,
     ) => {
-      // Return all items on first call, empty on subsequent calls
+      // Return all items on the first call, empty on subsequent.
       let result = if delivered.contents {
         []
       } else {
@@ -41,6 +41,8 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
         Source.knownHeight: reportedHeight,
         blockHashes: [],
         parsedQueueItems: result,
+        // Simulate keeps the transaction inline on the payload; no store page.
+        transactionStore: None,
         fromBlockQueried: 0,
         latestFetchedBlockNumber: reportedHeight,
         latestFetchedBlockTimestamp: 0,

package/src/sources/SimulateSource.res.mjs

@@ -24,6 +24,7 @@ function make(items, endBlock, chain) {
         knownHeight: reportedHeight,
         blockHashes: [],
         parsedQueueItems: result,
+        transactionStore: undefined,
         fromBlockQueried: 0,
         latestFetchedBlockNumber: reportedHeight,
         latestFetchedBlockTimestamp: 0,

package/src/sources/Source.res

@@ -18,6 +18,10 @@ type blockRangeFetchResponse = {
   // a within-array hash mismatch on the same block number as a reorg.
   blockHashes: array<ReorgDetection.blockData>,
   parsedQueueItems: array<Internal.item>,
+  // Page of transactions for this response's items, keyed by (blockNumber,
+  // transactionIndex); merged into the chain's store on apply. `None` for
+  // sources that keep the transaction inline on the payload (RPC/Fuel/Simulate).
+  transactionStore: option<TransactionStore.t>,
   fromBlockQueried: int,
   latestFetchedBlockNumber: int,
   latestFetchedBlockTimestamp: int,

package/src/sources/Svm.res

@@ -4,10 +4,32 @@ let cleanUpRawEventFieldsInPlace: JSON.t => unit = %raw(`fields => {
     delete fields.time
   }`)
 
+// Ordered transaction field names. The index of each is the field code shared
+// with the Rust store (`SvmTxField`) — keep this order in sync.
+let transactionFields = [
+  "transactionIndex",
+  "signatures",
+  "feePayer",
+  "success",
+  "err",
+  "fee",
+  "computeUnitsConsumed",
+  "accountKeys",
+  "recentBlockhash",
+  "version",
+  "tokenBalances",
+]
+
+// Field name → bit index (the code shared with the Rust store), built once.
+let transactionFieldCodes = TransactionStore.fieldCodes(transactionFields)
+
+let transactionFieldMask = (eventConfigs: array<Internal.eventConfig>): float =>
+  eventConfigs->TransactionStore.mask(~codes=transactionFieldCodes)
+
 let make = (~logger: Pino.t): Ecosystem.t => {
   name: Svm,
   blockFields: ["slot"],
-  transactionFields: [],
+  transactionFields,
   blockNumberName: "height",
   blockTimestampName: "time",
   blockHashName: "hash",
@@ -20,7 +42,8 @@ let make = (~logger: Pino.t): Ecosystem.t => {
   // parse. The schema is a no-op object that always surfaces `None`.
   onEventBlockFilterSchema: S.object(_ => None),
   logger,
-  toEvent: eventItem => eventItem.payload->Internal.payloadToEvent,
+  transactionFieldMask,
+  toEvent: eventItem => eventItem.payload->(Utils.magic: Internal.eventPayload => Internal.event),
   toEventLogger: eventItem => {
     let instruction =
       eventItem.payload->(Utils.magic: Internal.eventPayload => Envio.svmInstruction)

package/src/sources/Svm.res.mjs

@@ -8,6 +8,7 @@ import * as Logging from "../Logging.res.mjs";
 import * as Prometheus from "../Prometheus.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
+import * as TransactionStore from "./TransactionStore.res.mjs";
 
 let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.hash
@@ -15,11 +16,31 @@ let cleanUpRawEventFieldsInPlace = (fields => {
     delete fields.time
   });
 
+let transactionFields = [
+  "transactionIndex",
+  "signatures",
+  "feePayer",
+  "success",
+  "err",
+  "fee",
+  "computeUnitsConsumed",
+  "accountKeys",
+  "recentBlockhash",
+  "version",
+  "tokenBalances"
+];
+
+let transactionFieldCodes = TransactionStore.fieldCodes(transactionFields);
+
+function transactionFieldMask(eventConfigs) {
+  return TransactionStore.mask(eventConfigs, transactionFieldCodes);
+}
+
 function make(logger) {
   return {
     name: "svm",
     blockFields: ["slot"],
-    transactionFields: [],
+    transactionFields: transactionFields,
     blockNumberName: "height",
     blockTimestampName: "time",
     blockHashName: "hash",
@@ -29,6 +50,7 @@ function make(logger) {
     onEventBlockFilterSchema: S$RescriptSchema.object(param => {}),
     logger: logger,
     toEvent: eventItem => eventItem.payload,
+    transactionFieldMask: transactionFieldMask,
     toEventLogger: eventItem => {
       let instruction = eventItem.payload;
       return Logging.createChildFrom(logger, {
@@ -80,8 +102,11 @@ function makeRPCSource(chain, rpc, sourceForOpt) {
 
 export {
   cleanUpRawEventFieldsInPlace,
+  transactionFields,
+  transactionFieldCodes,
+  transactionFieldMask,
   make,
   GetFinalizedSlot,
   makeRPCSource,
 }
-/* route Not a pure module */
+/* transactionFieldCodes Not a pure module */

package/src/sources/SvmHyperSyncClient.res

@@ -147,22 +147,6 @@ module ResponseTypes = {
     blockHeight?: int,
   }
 
-  type transaction = {
-    slot: int,
-    transactionIndex: int,
-    signatures: array<string>,
-    feePayer?: string,
-    success?: bool,
-    err?: string,
-    fee?: int,
-    computeUnitsConsumed?: int,
-    accountKeys: array<string>,
-    recentBlockhash?: string,
-    version?: string,
-    loadedAddressesWritable: array<string>,
-    loadedAddressesReadonly: array<string>,
-  }
-
   /// Borsh-decoded view attached by the Rust client. `argsJson`/`accountsJson`
   /// are stringified to side-step napi-rs's lack of native JSON passthrough.
   /** Solana instruction record.
@@ -204,22 +188,10 @@ module ResponseTypes = {
     message?: string,
   }
 
-  type tokenBalance = {
-    slot: int,
-    transactionIndex?: int,
-    account?: string,
-    mint?: string,
-    owner?: string,
-    preAmount?: string,
-    postAmount?: string,
-  }
-
   type queryResponseData = {
     blocks: array<block>,
-    transactions: array<transaction>,
     instructions: array<instruction>,
     logs: array<log>,
-    tokenBalances: array<tokenBalance>,
   }
 
   type queryResponse = {
@@ -234,7 +206,9 @@ type queryResponse = ResponseTypes.queryResponse
 
 type t = {
   getHeight: unit => promise<int>,
-  get: (~query: query) => promise<queryResponse>,
+  // Returns the response plus a page of raw transactions (kept in Rust),
+  // keyed by (slot, transactionIndex), materialised at batch prep.
+  get: (~query: query) => promise<(queryResponse, TransactionStore.t)>,
 }
 
 @send