envio 3.13.0 → 3.14.0

package/src/db/InternalTable.res

@@ -159,12 +159,14 @@ WHERE "${table.tableName}"."chain_id" = dead.chain_id
     ->Utils.Promise.ignoreValue
   }
 
-  let makeGetRowsQuery = (~pgSchema) =>
+  let makeGetRowsQuery = (~pgSchema, ~onlyConfig=false) =>
     `SELECT "chain_id" as "chainId",
 "address" as "address",
 "contract_id" as "contractId",
 "registration_block" as "registrationBlock"
-FROM "${pgSchema}"."${table.tableName}";`
+FROM "${pgSchema}"."${table.tableName}"${onlyConfig
+        ? ` WHERE "registration_block" = ${AddressRows.configRegistrationBlock->Int.toString}`
+        : ""};`
 }
 
 module Chains = {
@@ -391,6 +393,54 @@ WHERE "${(#id: field :> string)}" = $2
     checkpointId: string,
   }
 
+  let readStoredChains = async (sql, ~pgSchema): array<ResumePlan.storedChain> => {
+    let (rows, configAddressRows) = await Promise.all2((
+      sql
+      ->Postgres.unsafe(
+        `SELECT "${(#id: field :> string)}" as "id",
+"${(#ecosystem: field :> string)}" as "ecosystem",
+"${(#start_block: field :> string)}" as "startBlock",
+"${(#end_block: field :> string)}" as "endBlock",
+"${(#max_reorg_depth: field :> string)}" as "maxReorgDepth"
+FROM "${pgSchema}"."${table.tableName}";`,
+      )
+      ->(
+        Utils.magic: promise<array<unknown>> => promise<
+          array<{
+            "id": ChainId.t,
+            "ecosystem": string,
+            "startBlock": int,
+            "endBlock": Null.t<int>,
+            "maxReorgDepth": int,
+          }>,
+        >
+      ),
+      sql
+      ->Postgres.unsafe(EnvioAddresses.makeGetRowsQuery(~pgSchema, ~onlyConfig=true))
+      ->(Utils.magic: promise<array<unknown>> => promise<array<AddressRows.row>>),
+    ))
+    let configAddressesByChain = Dict.make()
+    configAddressRows->Array.forEach(addressRow =>
+      configAddressesByChain->Utils.Dict.push(
+        addressRow.chainId->ChainId.normalizeOrThrow->ChainId.toString,
+        addressRow,
+      )
+    )
+    rows->Array.map((row): ResumePlan.storedChain => {
+      let id = row["id"]->ChainId.normalizeOrThrow
+      {
+        id,
+        ecosystem: row["ecosystem"],
+        startBlock: row["startBlock"],
+        endBlock: row["endBlock"]->Null.toOption,
+        maxReorgDepth: row["maxReorgDepth"],
+        configAddresses: configAddressesByChain
+        ->Utils.Dict.dangerouslyGetNonOption(id->ChainId.toString)
+        ->Option.getOr([]),
+      }
+    })
+  }
+
   let makeGetInitialStateQuery = (~pgSchema) => {
     `SELECT "${(#id: field :> string)}" as "id",
 "${(#start_block: field :> string)}" as "startBlock",

package/src/db/InternalTable.res.mjs

@@ -133,12 +133,15 @@ function $$delete(sql, pgSchema, keys, chainIdModeOpt) {
   ], {prepare: true});
 }
 
-function makeGetRowsQuery(pgSchema) {
+function makeGetRowsQuery(pgSchema, onlyConfigOpt) {
+  let onlyConfig = onlyConfigOpt !== undefined ? onlyConfigOpt : false;
   return `SELECT "chain_id" as "chainId",
 "address" as "address",
 "contract_id" as "contractId",
 "registration_block" as "registrationBlock"
-FROM "` + pgSchema + `"."` + table$1.tableName + `";`;
+FROM "` + pgSchema + `"."` + table$1.tableName + `"` + (
+    onlyConfig ? ` WHERE "registration_block" = ` + AddressRows.configRegistrationBlock.toString() : ""
+  ) + `;`;
 }
 
 let EnvioAddresses = {
@@ -264,6 +267,31 @@ WHERE "` + "id" + `" = $2
   AND "` + "ready_at" + `" IS NULL;`;
 }
 
+async function readStoredChains(sql, pgSchema) {
+  let match = await Promise.all([
+    sql.unsafe(`SELECT "` + "id" + `" as "id",
+"` + "ecosystem" + `" as "ecosystem",
+"` + "start_block" + `" as "startBlock",
+"` + "end_block" + `" as "endBlock",
+"` + "max_reorg_depth" + `" as "maxReorgDepth"
+FROM "` + pgSchema + `"."` + table$2.tableName + `";`),
+    sql.unsafe(makeGetRowsQuery(pgSchema, true))
+  ]);
+  let configAddressesByChain = {};
+  match[1].forEach(addressRow => Utils.Dict.push(configAddressesByChain, ChainId.toString(ChainId.normalizeOrThrow(addressRow.chainId)), addressRow));
+  return match[0].map(row => {
+    let id = ChainId.normalizeOrThrow(row.id);
+    return {
+      id: id,
+      ecosystem: row.ecosystem,
+      startBlock: row.startBlock,
+      endBlock: Primitive_option.fromNull(row.endBlock),
+      maxReorgDepth: row.maxReorgDepth,
+      configAddresses: Stdlib_Option.getOr(configAddressesByChain[ChainId.toString(id)], [])
+    };
+  });
+}
+
 function makeGetInitialStateQuery(pgSchema) {
   return `SELECT "` + "id" + `" as "id",
 "` + "start_block" + `" as "startBlock",
@@ -282,7 +310,7 @@ FROM "` + pgSchema + `"."` + table$2.tableName + `";`;
 async function getInitialState(sql, pgSchema) {
   let match = await Promise.all([
     sql.unsafe(makeGetInitialStateQuery(pgSchema)),
-    sql.unsafe(makeGetRowsQuery(pgSchema))
+    sql.unsafe(makeGetRowsQuery(pgSchema, undefined))
   ]);
   let addressRowsByChainId = AddressRows.group(match[1]);
   return match[0].map(rawInitialState => {
@@ -384,6 +412,7 @@ let Chains = {
   metaFields: metaFields,
   makeMetaFieldsUpdateQuery: makeMetaFieldsUpdateQuery,
   makeSetReadyAtQuery: makeSetReadyAtQuery,
+  readStoredChains: readStoredChains,
   makeGetInitialStateQuery: makeGetInitialStateQuery,
   getInitialState: getInitialState,
   blockTimeToDb: blockTimeToDb,

package/src/sources/FuelHyperSync.res

@@ -1,5 +1,6 @@
 type logsQueryPage = {
   items: array<FuelHyperSyncClient.EventItems.item>,
+  rejectedLogData: array<FuelHyperSyncClient.EventItems.rejectedLogData>,
   // Blocks referenced by `items`, one per height.
   nextBlock: int,
   archiveHeight: int,
@@ -72,6 +73,7 @@ module GetLogs = {
     }
     {
       items: res.items,
+      rejectedLogData: res.rejectedLogData,
       nextBlock: res.nextBlock,
       archiveHeight: res.archiveHeight->Option.getOr(0), // TODO: FIXME: Shouldn't have a default here
       blockStore,

package/src/sources/FuelHyperSync.res.mjs

@@ -64,6 +64,7 @@ async function query(client, fromBlock, toBlock, registrationIndexes, addressSet
   }
   return {
     items: res.items,
+    rejectedLogData: res.rejectedLogData,
     nextBlock: res.nextBlock,
     archiveHeight: Stdlib_Option.getOr(res.archiveHeight, 0),
     blockStore: match[1]

package/src/sources/FuelHyperSync.resi

@@ -1,5 +1,6 @@
 type logsQueryPage = {
   items: array<FuelHyperSyncClient.EventItems.item>,
+  rejectedLogData: array<FuelHyperSyncClient.EventItems.rejectedLogData>,
   nextBlock: int,
   archiveHeight: int,
   // Page store owning this page's raw blocks (built on the Rust side); its ids

package/src/sources/FuelHyperSyncClient.res

@@ -27,6 +27,9 @@ module Registration = {
     kind: kind,
     // The LogData `rb` value as a decimal string; absent for other kinds.
     logId?: string,
+    // The contract's Fuel ABI, which LogData receipts are decoded against in
+    // Rust; absent for other kinds.
+    abi?: JSON.t,
   }
 
   let fromOnEventRegistrations = (
@@ -35,12 +38,12 @@ module Registration = {
     onEventRegistrations->Array.map(reg => {
       let eventConfig =
         reg.eventConfig->(Utils.magic: Internal.eventConfig => Internal.fuelEventConfig)
-      let (kind, logId) = switch eventConfig.kind {
-      | LogData({logId}) => (LogData, Some(logId))
-      | Mint => (Mint, None)
-      | Burn => (Burn, None)
-      | Transfer => (Transfer, None)
-      | Call => (Call, None)
+      let (kind, logId, abi) = switch eventConfig.kind {
+      | LogData({logId, abi}) => (LogData, Some(logId), Some(abi))
+      | Mint => (Mint, None, None)
+      | Burn => (Burn, None, None)
+      | Transfer => (Transfer, None, None)
+      | Call => (Call, None, None)
       }
       {
         index: reg.index,
@@ -50,6 +53,7 @@ module Registration = {
         startBlock: reg.startBlock,
         kind,
         ?logId,
+        ?abi,
       }
     })
 }
@@ -70,7 +74,8 @@ module EventItems = {
   }
 
   // One routed receipt with its kind-specific columns flattened: LogData
-  // carries `data` (decoded here in JS), Mint/Burn carry `val`/`subId`,
+  // carries `params` decoded against the ABI (a receipt its logged type
+  // rejects is dropped in Rust), Mint/Burn carry `val`/`subId`,
   // Transfer/TransferOut/Call carry `amount`/`assetId`/`to` (TransferOut's
   // wallet recipient normalised into `to`).
   type item = {
@@ -79,7 +84,7 @@ module EventItems = {
     txId: string,
     blockHeight: int,
     srcAddress: Address.t,
-    data?: string,
+    params?: Internal.eventParams,
     subId?: string,
     val?: bigint,
     amount?: bigint,
@@ -87,10 +92,22 @@ module EventItems = {
     to?: string,
   }
 
+  // The page's first LogData receipt a contract-bound registration's ABI
+  // rejected, with how many it rejected. The receipts themselves are dropped.
+  type rejectedLogData = {
+    onEventRegistrationIndex: int,
+    blockHeight: int,
+    receiptIndex: int,
+    txId: string,
+    dataLength: int,
+    count: int,
+  }
+
   type response = {
     archiveHeight: option<int>,
     nextBlock: int,
     items: array<item>,
+    rejectedLogData: array<rejectedLogData>,
   }
 }
 

package/src/sources/FuelHyperSyncClient.res.mjs

@@ -13,24 +13,28 @@ function fromOnEventRegistrations(onEventRegistrations) {
         case "Mint" :
           match$1 = [
             "Mint",
+            undefined,
             undefined
           ];
           break;
         case "Burn" :
           match$1 = [
             "Burn",
+            undefined,
             undefined
           ];
           break;
         case "Transfer" :
           match$1 = [
             "Transfer",
+            undefined,
             undefined
           ];
           break;
         case "Call" :
           match$1 = [
             "Call",
+            undefined,
             undefined
           ];
           break;
@@ -38,7 +42,8 @@ function fromOnEventRegistrations(onEventRegistrations) {
     } else {
       match$1 = [
         "LogData",
-        match.logId
+        match.logId,
+        match.abi
       ];
     }
     return {
@@ -48,7 +53,8 @@ function fromOnEventRegistrations(onEventRegistrations) {
       isWildcard: reg.isWildcard,
       startBlock: reg.startBlock,
       kind: match$1[0],
-      logId: match$1[1]
+      logId: match$1[1],
+      abi: match$1[2]
     };
   });
 }

package/src/sources/FuelHyperSyncSource.res

@@ -16,6 +16,9 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
   // Per source, so one rejected token is reported once rather than on every
   // height retry for the life of the process.
   let unauthorizedWarned = ref(false)
+  // Registration indexes already warned about undecodable LogData — a stale
+  // ABI rejects every receipt, so one line per event is enough.
+  let rejectedLogDataWarned = Utils.Set.make()
 
   let apiToken = apiToken->HyperSync.requireApiToken
 
@@ -106,6 +109,24 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
 
     let parsingTimeRef = Performance.now()
 
+    pageUnsafe.rejectedLogData->Array.forEach(rejected => {
+      if !(rejectedLogDataWarned->Utils.Set.has(rejected.onEventRegistrationIndex)) {
+        rejectedLogDataWarned->Utils.Set.add(rejected.onEventRegistrationIndex)->ignore
+        let eventConfig = (
+          onEventRegistrations->Array.getUnsafe(rejected.onEventRegistrationIndex)
+        ).eventConfig
+        logger->Logging.childWarn({
+          "msg": `Skipped ${eventConfig.contractName}.${eventConfig.name} LogData receipts whose data doesn't decode against the contract ABI. Check that the ABI matches the deployed contract.`,
+          "chainId": chainId,
+          "blockNumber": rejected.blockHeight,
+          "logIndex": rejected.receiptIndex,
+          "txId": rejected.txId,
+          "dataLength": rejected.dataLength,
+          "skippedInPage": rejected.count,
+        })
+      }
+    })
+
     let parsedQueueItems = pageUnsafe.items->Array.map(item => {
       // Routing happened in Rust; the item references its registration by
       // chain-scoped index.
@@ -116,24 +137,8 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
         )
 
       let params = switch eventConfig.kind {
-      | LogData({decode}) =>
-        // Kind-required columns are validated present in Rust before the item
-        // crosses the boundary.
-        let data = item.data->Option.getOr("")
-        try decode(data) catch {
-        | exn => {
-            let params = {
-              "chainId": chainId,
-              "blockNumber": item.blockHeight,
-              "logIndex": item.receiptIndex,
-            }
-            let logger = Logging.createChildFrom(~logger, ~params)
-            exn->ErrorHandling.mkLogAndRaise(
-              ~msg="Failed to decode Fuel LogData receipt, please double check your ABI.",
-              ~logger,
-            )
-          }
-        }
+      // Rust only routes a LogData receipt once its data decoded.
+      | LogData(_) => item.params->Option.getUnsafe
       | Mint | Burn =>
         (
           {
@@ -213,10 +218,7 @@ let make = ({chainId, endpointUrl, apiToken, onEventRegistrations, addressStore}
       let timerRef = Performance.now()
       let height = try await client->FuelHyperSyncClient.getHeight catch {
       | exn =>
-        exn->HyperSync.rethrowLoggingUnauthorized(
-          ~warned=unauthorizedWarned,
-          ~product="HyperFuel",
-        )
+        exn->HyperSync.rethrowLoggingUnauthorized(~warned=unauthorizedWarned, ~product="HyperFuel")
       }
       let seconds = timerRef->Performance.secondsSince
       {height, requestStats: [{method: "getHeight", seconds}]}

package/src/sources/FuelHyperSyncSource.res.mjs

@@ -18,6 +18,7 @@ function make(param) {
   let unauthorizedWarned = {
     contents: false
   };
+  let rejectedLogDataWarned = new Set();
   let apiToken = HyperSync.requireApiToken(param.apiToken);
   let client;
   try {
@@ -82,6 +83,22 @@ function make(param) {
     let knownHeight$1 = pageUnsafe.archiveHeight;
     let heighestBlockQueried = pageUnsafe.nextBlock - 1 | 0;
     let parsingTimeRef = Performance.now();
+    pageUnsafe.rejectedLogData.forEach(rejected => {
+      if (rejectedLogDataWarned.has(rejected.onEventRegistrationIndex)) {
+        return;
+      }
+      rejectedLogDataWarned.add(rejected.onEventRegistrationIndex);
+      let eventConfig = onEventRegistrations[rejected.onEventRegistrationIndex].eventConfig;
+      Logging.childWarn(logger, {
+        msg: `Skipped ` + eventConfig.contractName + `.` + eventConfig.name + ` LogData receipts whose data doesn't decode against the contract ABI. Check that the ABI matches the deployed contract.`,
+        chainId: chainId,
+        blockNumber: rejected.blockHeight,
+        logIndex: rejected.receiptIndex,
+        txId: rejected.txId,
+        dataLength: rejected.dataLength,
+        skippedInPage: rejected.count
+      });
+    });
     let parsedQueueItems = pageUnsafe.items.map(item => {
       let onEventRegistration = onEventRegistrations[item.onEventRegistrationIndex];
       let eventConfig = onEventRegistration.eventConfig;
@@ -100,19 +117,7 @@ function make(param) {
             break;
         }
       } else {
-        let data = Stdlib_Option.getOr(item.data, "");
-        try {
-          params = match.decode(data);
-        } catch (raw_exn) {
-          let exn = Primitive_exceptions.internalToException(raw_exn);
-          let params$1 = {
-            chainId: chainId,
-            blockNumber: item.blockHeight,
-            logIndex: item.receiptIndex
-          };
-          let logger$1 = Logging.createChildFrom(logger, params$1);
-          params = ErrorHandling.mkLogAndRaise(logger$1, "Failed to decode Fuel LogData receipt, please double check your ABI.", exn);
-        }
+        params = item.params;
       }
       switch (exit) {
         case 1 :

package/src/tui/InitApi.res

@@ -0,0 +1,85 @@
+type ecosystem = | @as("evm") Evm | @as("fuel") Fuel | @as("svm") Svm
+type body = {
+  envioVersion: string,
+  envioApiToken: option<string>,
+  ecosystem: ecosystem,
+  hyperSyncNetworks: array<ChainId.t>,
+  rpcNetworks: array<ChainId.t>,
+}
+
+let bodySchema = S.object(s => {
+  envioVersion: s.field("envioVersion", S.string),
+  envioApiToken: s.field("envioApiToken", S.option(S.string)),
+  ecosystem: s.field("ecosystem", S.enum([Evm, Fuel, Svm])),
+  hyperSyncNetworks: s.field("hyperSyncNetworks", S.array(ChainId.schema)),
+  rpcNetworks: s.field("rpcNetworks", S.array(ChainId.schema)),
+})
+
+let makeBody = (~envioVersion, ~envioApiToken, ~config: Config.t) => {
+  let hyperSyncNetworks = []
+  let rpcNetworks = []
+  config.chainMap
+  ->ChainMap.values
+  ->Array.forEach(({sourceConfig, id}) => {
+    let usesHyperSync = switch sourceConfig {
+    | Config.EvmSourceConfig({hypersync: Some(_)}) => true
+    | Config.EvmSourceConfig({hypersync: None}) => false
+    | Config.FuelSourceConfig(_) => true // Fuel always uses HyperFuel
+    | Config.SvmSourceConfig(_) => false
+    | Config.SimulateSourceConfig(_) => false
+    | Config.CustomSources(sources) => sources->Array.some(s => s.poweredByHyperSync)
+    }
+    switch usesHyperSync {
+    | true => hyperSyncNetworks
+    | false => rpcNetworks
+    }
+    ->Array.push(id)
+    ->ignore
+  })
+
+  {
+    envioVersion,
+    envioApiToken,
+    ecosystem: (config.ecosystem.name :> ecosystem),
+    hyperSyncNetworks,
+    rpcNetworks,
+  }
+}
+
+type messageColor =
+  | @as("primary") Primary
+  | @as("secondary") Secondary
+  | @as("info") Info
+  | @as("danger") Danger
+  | @as("success") Success
+  | @as("white") White
+  | @as("gray") Gray
+
+type message = {
+  color: messageColor,
+  content: string,
+}
+
+let messageSchema = S.object(s => {
+  color: s.field("color", S.enum([Primary, Secondary, Info, Danger, Success, White, Gray])),
+  content: s.field("content", S.string),
+})
+
+let client = Rest.client(Env.envioAppUrl ++ "/api")
+
+let route = Rest.route(() => {
+  method: Post,
+  path: "/hyperindex/init",
+  input: s => s.body(bodySchema),
+  responses: [s => s.field("messages", S.array(messageSchema))],
+})
+
+let getMessages = async (~config) => {
+  let envioVersion = Utils.EnvioPackage.value.version
+  let body = makeBody(~envioVersion, ~envioApiToken=Env.envioApiToken, ~config)
+
+  switch await route->Rest.fetch(body, ~client) {
+  | exception exn => Error(exn)
+  | messages => Ok(messages)
+  }
+}

package/src/tui/{components/CustomHooks.res.mjs → InitApi.res.mjs}

@@ -1,12 +1,10 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Env from "../../Env.res.mjs";
-import * as Rest from "../../vendored/Rest.res.mjs";
-import * as Utils from "../../Utils.res.mjs";
-import * as React from "react";
-import * as ChainId from "../../ChainId.res.mjs";
-import * as Logging from "../../Logging.res.mjs";
-import * as ChainMap from "../../ChainMap.res.mjs";
+import * as Env from "../Env.res.mjs";
+import * as Rest from "../vendored/Rest.res.mjs";
+import * as Utils from "../Utils.res.mjs";
+import * as ChainId from "../ChainId.res.mjs";
+import * as ChainMap from "../ChainMap.res.mjs";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
@@ -56,25 +54,6 @@ function makeBody(envioVersion, envioApiToken, config) {
   };
 }
 
-function toTheme(color) {
-  switch (color) {
-    case "primary" :
-      return "#9860E5";
-    case "secondary" :
-      return "#FFBB2F";
-    case "info" :
-      return "#6CBFEE";
-    case "danger" :
-      return "#FF8269";
-    case "success" :
-      return "#3B8C3D";
-    case "white" :
-      return "white";
-    case "gray" :
-      return "gray";
-  }
-}
-
 let messageSchema = S$RescriptSchema.object(s => ({
   color: s.f("color", S$RescriptSchema.$$enum([
     "primary",
@@ -118,44 +97,12 @@ async function getMessages(config) {
   };
 }
 
-let InitApi = {
-  bodySchema: bodySchema,
-  makeBody: makeBody,
-  toTheme: toTheme,
-  messageSchema: messageSchema,
-  client: client,
-  route: route,
-  getMessages: getMessages
-};
-
-function useMessages(config) {
-  let match = React.useState(() => "Loading");
-  let setRequest = match[1];
-  React.useEffect(() => {
-    getMessages(config).then(res => {
-      if (res.TAG === "Ok") {
-        let data = res._0;
-        return setRequest(param => ({
-          TAG: "Data",
-          _0: data
-        }));
-      }
-      let e = res._0;
-      Logging.error({
-        msg: "Failed to load messages from envio server",
-        err: Utils.prettifyExn(e)
-      });
-      setRequest(param => ({
-        TAG: "Err",
-        _0: e
-      }));
-    });
-  }, []);
-  return match[0];
-}
-
 export {
-  InitApi,
-  useMessages,
+  bodySchema,
+  makeBody,
+  messageSchema,
+  client,
+  route,
+  getMessages,
 }
 /* bodySchema Not a pure module */