envio 3.10.0-subgraph → 3.11.0

package/src/Config.res.mjs

@@ -60,26 +60,72 @@ let chainContractSchema = S$RescriptSchema.schema(s => ({
   startBlock: s.m(S$RescriptSchema.option(S$RescriptSchema.int))
 }));
 
+function startBlockOrThrow(chain) {
+  let startBlock = chain.startBlock;
+  if (startBlock === "latest") {
+    return Stdlib_JsError.throwWithMessage(`Chain ` + ChainId.toString(chain.id) + `: the "latest" start block was read before it was resolved. This is a bug in envio - please report it.`);
+  } else {
+    return startBlock;
+  }
+}
+
+function startBlockOrZero(chain) {
+  let startBlock = chain.startBlock;
+  if (startBlock === "latest") {
+    return 0;
+  } else {
+    return startBlock;
+  }
+}
+
+let startBlockSchema = S$RescriptSchema.union([
+  S$RescriptSchema.shape(S$RescriptSchema.int, n => (n)),
+  S$RescriptSchema.shape(S$RescriptSchema.literal("latest"), param => "latest")
+]);
+
 let publicConfigChainSchema = S$RescriptSchema.schema(s => ({
   id: s.m(ChainId.schema),
-  startBlock: s.m(S$RescriptSchema.int),
+  startBlock: s.m(startBlockSchema),
   endBlock: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
   maxReorgDepth: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
   blockLag: s.m(S$RescriptSchema.option(S$RescriptSchema.int)),
   hypersync: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   rpcs: s.m(S$RescriptSchema.option(S$RescriptSchema.array(rpcConfigSchema))),
-  rpc: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
   contracts: s.m(S$RescriptSchema.option(S$RescriptSchema.dict(chainContractSchema)))
 }));
 
+let svmAccountSlotSchema = S$RescriptSchema.schema(s => ({
+  name: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
+  optional: s.m(S$RescriptSchema.option(S$RescriptSchema.bool))
+}));
+
+function svmAccountSlotFromItem(slot) {
+  let match = slot.name;
+  let match$1 = slot.optional;
+  if (match !== undefined) {
+    if (match$1 !== undefined && match$1) {
+      return {
+        TAG: "Optional",
+        _0: match
+      };
+    } else {
+      return {
+        TAG: "Required",
+        _0: match
+      };
+    }
+  } else {
+    return "Unnamed";
+  }
+}
+
 let svmEventDescriptorSchema = S$RescriptSchema.schema(s => ({
   discriminator: s.m(S$RescriptSchema.option(S$RescriptSchema.string)),
-  accounts: s.m(S$RescriptSchema.option(S$RescriptSchema.array(S$RescriptSchema.string))),
+  accounts: s.m(S$RescriptSchema.option(S$RescriptSchema.array(svmAccountSlotSchema))),
   args: s.m(S$RescriptSchema.option(S$RescriptSchema.json(false)))
 }));
 
 let svmAbiSchema = S$RescriptSchema.schema(s => ({
-  programId: s.m(S$RescriptSchema.string),
   definedTypes: s.m(S$RescriptSchema.json(false)),
   source: s.m(S$RescriptSchema.string)
 }));
@@ -401,8 +447,7 @@ let publicConfigSchema = S$RescriptSchema.schema(s => ({
   fuel: s.m(S$RescriptSchema.option(publicConfigEcosystemSchema)),
   svm: s.m(S$RescriptSchema.option(publicConfigEcosystemSchema)),
   enums: s.m(S$RescriptSchema.option(S$RescriptSchema.dict(S$RescriptSchema.array(S$RescriptSchema.string)))),
-  entities: s.m(S$RescriptSchema.option(S$RescriptSchema.array(entityJsonSchema))),
-  subgraph: s.m(S$RescriptSchema.option(S$RescriptSchema.json(false)))
+  entities: s.m(S$RescriptSchema.option(S$RescriptSchema.array(entityJsonSchema)))
 }));
 
 function contractMappingOf(chainConfigs) {
@@ -539,7 +584,7 @@ function fromPublic(publicConfigJson) {
               ) : addresses[0];
             let s = eventItem.svm;
             let svm = s !== undefined ? Primitive_option.valFromOption(s) : Stdlib_JsError.throwWithMessage(`SVM instruction ` + contractName + `.` + eventName + ` is missing the "svm" descriptor in internal config`);
-            return EventConfigBuilder.buildSvmInstructionEventConfig(contractName, eventName, programId, svm.discriminator, Stdlib_Option.getOr(svm.accounts, []), Stdlib_Option.getOr(svm.args, null), svmDefinedTypes);
+            return EventConfigBuilder.buildSvmInstructionEventConfig(contractName, eventName, programId, svm.discriminator, Stdlib_Option.getOr(svm.accounts, []).map(svmAccountSlotFromItem), Stdlib_Option.getOr(svm.args, null), svmDefinedTypes);
         }
       });
     } else {
@@ -573,7 +618,15 @@ function fromPublic(publicConfigJson) {
     let publicChainConfig = publicChainsConfig[chainName];
     let chainId = publicChainConfig.id;
     let chainContracts = Stdlib_Option.getOr(publicChainConfig.contracts, {});
-    let contracts = Object.entries(contractDataByName).map(param => {
+    let contracts = Object.entries(contractDataByName).filter(param => {
+      switch (ecosystemName) {
+        case "evm" :
+        case "fuel" :
+          return true;
+        case "svm" :
+          return Stdlib_Option.isSome(chainContracts[param[0]]);
+      }
+    }).map(param => {
       let contractData = param[1];
       let capitalizedName = param[0];
       let chainContract = chainContracts[capitalizedName];
@@ -645,15 +698,10 @@ function fromPublic(publicConfigJson) {
         break;
       case "svm" :
         let hypersync$1 = publicChainConfig.hypersync;
-        let rpc = publicChainConfig.rpc;
-        if (Stdlib_Option.isNone(hypersync$1) && Stdlib_Option.isNone(rpc)) {
-          Stdlib_JsError.throwWithMessage(`Chain ` + chainName + ` is missing a data source: provide either an rpc endpoint or an experimental hypersync config`);
-        }
-        sourceConfig = {
-          TAG: "SvmSourceConfig",
-          hypersync: hypersync$1,
-          rpc: rpc
-        };
+        sourceConfig = hypersync$1 !== undefined ? ({
+            TAG: "SvmSourceConfig",
+            hypersync: hypersync$1
+          }) : Stdlib_JsError.throwWithMessage(`Chain ` + chainName + ` is missing hypersync endpoint in config`);
         break;
     }
     let tmp;
@@ -730,8 +778,7 @@ function fromPublic(publicConfigJson) {
     isDev: Stdlib_Option.getOr(publicConfig.isDev, false),
     userEntitiesByName: userEntitiesByName,
     userEntities: userEntities,
-    allEnums: allEnums,
-    subgraph: publicConfig.subgraph
+    allEnums: allEnums
   };
 }
 
@@ -879,7 +926,6 @@ function stripSensitiveData(json) {
         return;
       }
       Utils.Dict.deleteInPlace(chainJson, "rpcs");
-      Utils.Dict.deleteInPlace(chainJson, "rpc");
       Utils.Dict.deleteInPlace(chainJson, "hypersync");
     });
   };
@@ -888,7 +934,6 @@ function stripSensitiveData(json) {
     stripChains(cloned["evm"]);
     stripChains(cloned["fuel"]);
     stripChains(cloned["svm"]);
-    Utils.Dict.deleteInPlace(cloned, "subgraph");
   }
   return cloned;
 }
@@ -1086,7 +1131,12 @@ export {
   rpcSourceForSchema,
   rpcConfigSchema,
   chainContractSchema,
+  startBlockOrThrow,
+  startBlockOrZero,
+  startBlockSchema,
   publicConfigChainSchema,
+  svmAccountSlotSchema,
+  svmAccountSlotFromItem,
   svmEventDescriptorSchema,
   svmAbiSchema,
   contractEventItemSchema,

package/src/Core.res

@@ -27,16 +27,8 @@ type fromUserApiResult = {
   indexerCode: Null.t<string>,
 }
 
-type fromSubgraphOptions = {
-  name?: string,
-  env?: dict<string>,
-  files?: dict<string>,
-  root?: string,
-}
-
 type addon = {
   getConfigJson: (~configPath: Null.t<string>, ~directory: Null.t<string>) => string,
-  fromSubgraph: (string, string, fromSubgraphOptions) => fromUserApiResult,
   encodeIndexedTopic: (~abiType: string, ~value: unknown) => EvmTypes.Hex.t,
   isSvmPubkey: (~value: string) => bool,
   fromUserApi: (string, fromUserApiOptions) => fromUserApiResult,
@@ -269,13 +261,6 @@ let fromUserApi = (~schema=?, ~env=?, ~files=?, ~withIndexerTypes=false, yaml) =
   )
 }
 
-/// Parses a subgraph project without touching the filesystem: subgraph.yaml and
-/// its schema inline, ABI bodies through `files`.
-let fromSubgraph = (~name=?, ~env=?, ~files=?, ~root=?, ~manifest, ~schema) => {
-  let addon = getAddon()
-  addon.fromSubgraph(manifest, schema, {?name, ?env, ?files, ?root})
-}
-
 let runCli = args => {
   let addon = getAddon()
   addon.runCli(~args, ~envioPackageDir=Null.make(envioPackageDir))

package/src/Core.res.mjs

@@ -195,16 +195,6 @@ function fromUserApi(schema, env, files, withIndexerTypesOpt, yaml) {
   });
 }
 
-function fromSubgraph(name, env, files, root, manifest, schema) {
-  let addon = getAddon();
-  return addon.fromSubgraph(manifest, schema, {
-    name: name,
-    env: env,
-    files: files,
-    root: root
-  });
-}
-
 function runCli(args) {
   let addon = getAddon();
   return addon.runCli(args, envioPackageDir);
@@ -222,7 +212,6 @@ export {
   getAddon,
   getConfigJson,
   fromUserApi,
-  fromSubgraph,
   runCli,
 }
 /* envioPackageDir Not a pure module */

package/src/EventConfigBuilder.res

@@ -635,7 +635,7 @@ let buildSvmInstructionEventConfig = (
   ~instructionName: string,
   ~programId: SvmTypes.Pubkey.t,
   ~discriminator: option<string>,
-  ~accounts: array<string>=[],
+  ~accounts: array<Internal.svmAccountSlot>=[],
   ~args: JSON.t=JSON.Null,
   ~definedTypes: JSON.t=JSON.Null,
 ): Internal.svmInstructionEventConfig => {
@@ -699,7 +699,7 @@ let resolveSvmWhereOrThrow = (
   where: JSON.t,
   ~contractName: string,
   ~eventName: string,
-  ~accountNames: array<string>,
+  ~accounts: array<Internal.svmAccountSlot>,
 ): parsedSvmWhere => {
   let invalid = message =>
     JsError.throwWithMessage(
@@ -722,26 +722,30 @@ let resolveSvmWhereOrThrow = (
   | Some(_) => invalid(`The "isInner" filter must be a boolean.`)
   }
 
+  let namedAccounts = accounts->Array.filterMap(Internal.svmAccountSlotName)
+
   let parseGroup = (group: dict<JSON.t>): Internal.svmAccountFilterGroup =>
     group
     ->Dict.toArray
     ->Array.map(((name, value)) => {
-      let position = switch accountNames->Array.indexOf(name) {
-      | -1 if accountNames->Utils.Array.isEmpty =>
+      let position = switch accounts->Array.findIndexOpt(slot =>
+        slot->Internal.svmAccountSlotName == Some(name)
+      ) {
+      | None if namedAccounts->Utils.Array.isEmpty =>
         invalid(
-          "The instruction has no named accounts to filter on. Add `accounts` and `args` to it in config.yaml, or attach an IDL.",
+          "The instruction has no named accounts to filter on. Add `accounts` to it in config.yaml, or attach an IDL.",
         )
-      | -1 =>
+      | None =>
         invalid(
           `The instruction has no account named "${name}" to filter on. Named accounts: ${Utils.Array.quotedJoin(
-              accountNames,
+              namedAccounts,
             )}.`,
         )
-      | position if position >= filterableAccountCount =>
+      | Some(position) if position >= filterableAccountCount =>
         invalid(
           `Account "${name}" is at position ${position->Int.toString}, and only the first ${filterableAccountCount->Int.toString} accounts of an instruction can be filtered.`,
         )
-      | position => position
+      | Some(position) => position
       }
       let values = value->normalizeOrThrow
       if values->Utils.Array.isEmpty {
@@ -817,7 +821,7 @@ let buildSvmOnEventRegistration = (
     where->resolveSvmWhereOrThrow(
       ~contractName=eventConfig.contractName,
       ~eventName=eventConfig.name,
-      ~accountNames=eventConfig.accounts,
+      ~accounts=eventConfig.accounts,
     )
   }
 

package/src/EventConfigBuilder.res.mjs

@@ -12,6 +12,7 @@ import * as LogSelection from "./LogSelection.res.mjs";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -464,7 +465,7 @@ let svmBlockFilterSchema = S$RescriptSchema.strict(S$RescriptSchema.object(s =>
   slot: s.f("slot", S$RescriptSchema.option(LogSelection.eventBlockRangeSchema))
 })));
 
-function resolveSvmWhereOrThrow(where, contractName, eventName, accountNames) {
+function resolveSvmWhereOrThrow(where, contractName, eventName, accounts) {
   let invalid = message => Stdlib_JsError.throwWithMessage(`Invalid where configuration for the "` + eventName + `" instruction on program "` + contractName + `". ` + message);
   let obj;
   obj = typeof where === "object" && where !== null && !Array.isArray(where) ? where : invalid("Expected an object.");
@@ -477,13 +478,14 @@ function resolveSvmWhereOrThrow(where, contractName, eventName, accountNames) {
   let isInner = match !== undefined ? (
       typeof match === "boolean" ? match : invalid(`The "isInner" filter must be a boolean.`)
     ) : undefined;
+  let namedAccounts = Stdlib_Array.filterMap(accounts, Internal.svmAccountSlotName);
   let parseGroup = group => Object.entries(group).map(param => {
     let name = param[0];
-    let position = accountNames.indexOf(name);
-    let position$1 = position !== -1 ? (
+    let position = Stdlib_Array.findIndexOpt(accounts, slot => Primitive_object.equal(Internal.svmAccountSlotName(slot), name));
+    let position$1 = position !== undefined ? (
         position >= 10 ? invalid(`Account "` + name + `" is at position ` + position.toString() + `, and only the first ` + (10).toString() + ` accounts of an instruction can be filtered.`) : position
       ) : (
-        Utils.$$Array.isEmpty(accountNames) ? invalid("The instruction has no named accounts to filter on. Add `accounts` and `args` to it in config.yaml, or attach an IDL.") : invalid(`The instruction has no account named "` + name + `" to filter on. Named accounts: ` + Utils.$$Array.quotedJoin(accountNames) + `.`)
+        Utils.$$Array.isEmpty(namedAccounts) ? invalid("The instruction has no named accounts to filter on. Add `accounts` to it in config.yaml, or attach an IDL.") : invalid(`The instruction has no account named "` + name + `" to filter on. Named accounts: ` + Utils.$$Array.quotedJoin(namedAccounts) + `.`)
       );
     let values = normalizeOrThrow(param[1]);
     if (Utils.$$Array.isEmpty(values)) {

package/src/EventProcessing.res

@@ -51,7 +51,7 @@ let runEventHandlerOrThrow = async (
       isPreload: false,
       chains,
       config,
-      sync: UserContext.makeSyncState(),
+      isResolved: false,
     }
     await handler(
       (
@@ -61,7 +61,7 @@ let runEventHandlerOrThrow = async (
         }: Internal.handlerArgs
       ),
     )
-    contextParams.sync.status = Resolved
+    contextParams.isResolved = true
   } catch {
   | exn =>
     throw(
@@ -102,7 +102,7 @@ let runHandlerOrThrow = async (
         isPreload: false,
         chains,
         config,
-        sync: UserContext.makeSyncState(),
+        isResolved: false,
       }
       await handler(
         Ecosystem.makeOnBlockArgs(
@@ -111,7 +111,7 @@ let runHandlerOrThrow = async (
           ~context=UserContext.getHandlerContext(contextParams),
         ),
       )
-      contextParams.sync.status = Resolved
+      contextParams.isResolved = true
     } catch {
     | exn =>
       throw(
@@ -186,7 +186,7 @@ let preloadBatchOrThrow = async (
                   checkpointId,
                   isPreload: true,
                   chains,
-                  sync: UserContext.makeSyncState(),
+                  isResolved: false,
                   config,
                 }),
               })
@@ -221,7 +221,7 @@ let preloadBatchOrThrow = async (
                   checkpointId,
                   isPreload: true,
                   chains,
-                  sync: UserContext.makeSyncState(),
+                  isResolved: false,
                   config,
                 }),
               )

package/src/EventProcessing.res.mjs

@@ -38,7 +38,6 @@ let ProcessingError = /* @__PURE__ */Primitive_exceptions.create("EventProcessin
 async function runEventHandlerOrThrow(item, checkpointId, handler, indexerState, loadManager, persistence, chains, config) {
   let timeBeforeHandler = Performance.now();
   try {
-    let contextParams_sync = UserContext.makeSyncState();
     let contextParams = {
       item: item,
       checkpointId: checkpointId,
@@ -48,13 +47,13 @@ async function runEventHandlerOrThrow(item, checkpointId, handler, indexerState,
       isPreload: false,
       chains: chains,
       config: config,
-      sync: contextParams_sync
+      isResolved: false
     };
     await handler({
       event: Ecosystem.getItemEvent(item, config.ecosystem),
       context: UserContext.getHandlerContext(contextParams)
     });
-    contextParams_sync.status = "Resolved";
+    contextParams.isResolved = true;
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
     throw {
@@ -80,7 +79,6 @@ async function runHandlerOrThrow(item, checkpointId, indexerState, loadManager,
     }
   }
   try {
-    let contextParams_sync = UserContext.makeSyncState();
     let contextParams = {
       item: item,
       checkpointId: checkpointId,
@@ -90,10 +88,10 @@ async function runHandlerOrThrow(item, checkpointId, indexerState, loadManager,
       isPreload: false,
       chains: chains,
       config: config,
-      sync: contextParams_sync
+      isResolved: false
     };
     await item.onBlockRegistration.handler(Ecosystem.makeOnBlockArgs(item.blockNumber, config.ecosystem, UserContext.getHandlerContext(contextParams)));
-    contextParams_sync.status = "Resolved";
+    contextParams.isResolved = true;
     return;
   } catch (raw_exn) {
     let exn = Primitive_exceptions.internalToException(raw_exn);
@@ -135,7 +133,7 @@ async function preloadBatchOrThrow(batch, loadManager, persistence, config, inde
                 isPreload: true,
                 chains: chains,
                 config: config,
-                sync: UserContext.makeSyncState()
+                isResolved: false
               })
             }).then(() => IndexerState.endPreloadHandler(indexerState, timerRef, contractName, eventName))));
           } catch (exn) {
@@ -153,7 +151,7 @@ async function preloadBatchOrThrow(batch, loadManager, persistence, config, inde
             isPreload: true,
             chains: chains,
             config: config,
-            sync: UserContext.makeSyncState()
+            isResolved: false
           })))));
         } catch (exn$1) {
           

package/src/HandlerLoader.res

@@ -77,30 +77,18 @@ let autoLoadFromSrcHandlers = async (~handlers: string) => {
 // `HandlerRegister.finishRegistration`. This loads the user handler files
 // (populating the global `HandlerRegister` registry as a side effect) and
 // returns the resulting per-chain registrations.
-// The subgraph runtime lives in this package but is never exported: it's
-// reached only from here, when the resolved config carries a translated
-// manifest.
-let registerSubgraph: (JSON.t, ~isDev: bool) => promise<unit> = %raw(`(subgraph, isDev) =>
-  import("./subgraph/runtime.ts").then((m) => m.registerSubgraph({ ...subgraph, isDev }))`)
-
 let registerAllHandlers = async (~config: Config.t): HandlerRegister.registrationsByChainId => {
   HandlerRegister.startRegistration(~config)
 
-  switch config.subgraph {
-  // A subgraph project's `src/` holds AssemblyScript mappings, not envio
-  // handlers, so the usual auto-load would import them without a scope.
-  | Some(subgraph) => await registerSubgraph(subgraph, ~isDev=config.isDev)
-  | None =>
-    // Auto-load all .js files from src/handlers directory
-    await autoLoadFromSrcHandlers(~handlers=config.handlers)
+  // Auto-load all .js files from src/handlers directory
+  await autoLoadFromSrcHandlers(~handlers=config.handlers)
 
-    // Load contract-specific handlers
-    let _ = await config.contractHandlers
-    ->Array.map(({name, handler}) => {
-      registerContractHandlers(~contractName=name, ~handler)
-    })
-    ->Promise.all
-  }
+  // Load contract-specific handlers
+  let _ = await config.contractHandlers
+  ->Array.map(({name, handler}) => {
+    registerContractHandlers(~contractName=name, ~handler)
+  })
+  ->Promise.all
 
   HandlerRegister.finishRegistration(~config)
 }

package/src/HandlerLoader.res.mjs

@@ -56,18 +56,10 @@ async function autoLoadFromSrcHandlers(handlers) {
   })));
 }
 
-let registerSubgraph = ((subgraph, isDev) =>
-  import("./subgraph/runtime.ts").then((m) => m.registerSubgraph({ ...subgraph, isDev })));
-
 async function registerAllHandlers(config) {
   HandlerRegister.startRegistration(config);
-  let subgraph = config.subgraph;
-  if (subgraph !== undefined) {
-    await registerSubgraph(subgraph, config.isDev);
-  } else {
-    await autoLoadFromSrcHandlers(config.handlers);
-    await Promise.all(config.contractHandlers.map(param => registerContractHandlers(param.name, param.handler)));
-  }
+  await autoLoadFromSrcHandlers(config.handlers);
+  await Promise.all(config.contractHandlers.map(param => registerContractHandlers(param.name, param.handler)));
   return HandlerRegister.finishRegistration(config);
 }
 
@@ -75,7 +67,6 @@ export {
   toImportUrl,
   registerContractHandlers,
   autoLoadFromSrcHandlers,
-  registerSubgraph,
   registerAllHandlers,
 }
 /*  Not a pure module */

package/src/HandlerRegister.res

@@ -312,13 +312,7 @@ let addOnEventRegistration = (
         ),
       )
     | Svm =>
-      Some(
-        EventConfigBuilder.resolveSvmInlineFieldSelection(
-          fields,
-          ~contractName,
-          ~eventName,
-        ),
-      )
+      Some(EventConfigBuilder.resolveSvmInlineFieldSelection(fields, ~contractName, ~eventName))
     | Fuel =>
       JsError.throwWithMessage(
         `The fields option of the "${eventName}" event registration on contract "${contractName}" is not supported on Fuel. Select the fields in your config instead.`,
@@ -340,13 +334,16 @@ let addOnEventRegistration = (
         | (Svm, Some(fieldSelection)) if fieldSelection.instructionFields->Utils.Set.has("args") =>
           let svmEventConfig =
             eventConfig->(Utils.magic: Internal.eventConfig => Internal.svmInstructionEventConfig)
+          // An empty layout is still a layout: it decodes to `{}` and filters
+          // out the calls that carry a payload. Only an absent one has nothing
+          // to decode.
           let declaresArgs = switch svmEventConfig.args {
-          | JSON.Array(args) => args->Array.length > 0
+          | JSON.Array(_) => true
           | _ => false
           }
           if !declaresArgs {
             JsError.throwWithMessage(
-              `Invalid "args" field in the fields.instruction option of the "${eventName}" instruction on program "${contractName}". The instruction declares no args in config.yaml, so there is nothing to decode. Remove "args" from the selection, or declare the instruction's args.`,
+              `Invalid "args" field in the fields.instruction option of the "${eventName}" instruction on program "${contractName}". The instruction attaches no args layout in config.yaml, so there is nothing to decode. Remove "args" from the selection, or give the instruction an \`args\` layout — \`args: []\` if it takes none.`,
             )
           }
         | _ => ()
@@ -800,9 +797,13 @@ let registerOnBlock = (
 
       if shouldRegister {
         matchedAny := true
-        if range._gte->Option.getOr(chainConfig.startBlock) < chainConfig.startBlock {
+        // Off the same object the predicate above was handed, not off
+        // `chainConfig`: that one still says whatever config.yaml said, and for
+        // `start_block: latest` the resolved head only lives in persisted state.
+        let chainStartBlock = (chainObj->(Utils.magic: unknown => {"startBlock": int}))["startBlock"]
+        if range._gte->Option.getOr(chainStartBlock) < chainStartBlock {
           JsError.throwWithMessage(
-            `The start block for onBlock handler "${name}" is less than the chain start block (${chainConfig.startBlock->Int.toString}). This is not supported yet.`,
+            `The start block for onBlock handler "${name}" is less than the chain start block (${chainStartBlock->Int.toString}). This is not supported yet.`,
           )
         }
         switch chainConfig.endBlock {

package/src/HandlerRegister.res.mjs

@@ -238,11 +238,11 @@ function addOnEventRegistration(registration, contractName, eventName, handler,
         break;
       case "svm" :
         if (fieldSelection !== undefined && fieldSelection.instructionFields.has("args")) {
-          let args = eventConfig.args;
+          let match$1 = eventConfig.args;
           let declaresArgs;
-          declaresArgs = Array.isArray(args) ? args.length !== 0 : false;
+          declaresArgs = Array.isArray(match$1);
           if (!declaresArgs) {
-            Stdlib_JsError.throwWithMessage(`Invalid "args" field in the fields.instruction option of the "` + eventName + `" instruction on program "` + contractName + `". The instruction declares no args in config.yaml, so there is nothing to decode. Remove "args" from the selection, or declare the instruction's args.`);
+            Stdlib_JsError.throwWithMessage(`Invalid "args" field in the fields.instruction option of the "` + eventName + `" instruction on program "` + contractName + `". The instruction attaches no args layout in config.yaml, so there is nothing to decode. Remove "args" from the selection, or give the instruction an \`args\` layout — \`args: []\` if it takes none.`);
           }
         }
         break;
@@ -492,8 +492,9 @@ function registerOnBlock(name, where, handler, getChainsObject) {
       }
       let range = match[1];
       matchedAny.contents = true;
-      if (Stdlib_Option.getOr(range._gte, chainConfig.startBlock) < chainConfig.startBlock) {
-        Stdlib_JsError.throwWithMessage(`The start block for onBlock handler "` + name + `" is less than the chain start block (` + chainConfig.startBlock.toString() + `). This is not supported yet.`);
+      let chainStartBlock = chainObj.startBlock;
+      if (Stdlib_Option.getOr(range._gte, chainStartBlock) < chainStartBlock) {
+        Stdlib_JsError.throwWithMessage(`The start block for onBlock handler "` + name + `" is less than the chain start block (` + chainStartBlock.toString() + `). This is not supported yet.`);
       }
       let chainEndBlock = chainConfig.endBlock;
       if (chainEndBlock !== undefined && Stdlib_Option.getOr(range._lte, chainEndBlock) > chainEndBlock) {

package/src/Internal.res

@@ -567,17 +567,33 @@ type svmAccountFilter = {
 /** AND-group: every entry must match the same instruction. */
 type svmAccountFilterGroup = array<svmAccountFilter>
 
+/** One positional account slot of an instruction. An `Optional` slot is absent
+ from the payload when the call carries no such slot, or fills it with the id of
+ the program being invoked. `Unnamed` holds a position and surfaces nothing. */
+type svmAccountSlot =
+  | Unnamed
+  | Required(string)
+  | Optional(string)
+
+let svmAccountSlotName = slot =>
+  switch slot {
+  | Unnamed => None
+  | Required(name) | Optional(name) => Some(name)
+  }
+
 type svmInstructionEventConfig = {
   ...eventConfig,
   /** Base58 Solana program id this instruction belongs to. */
   programId: SvmTypes.Pubkey.t,
   /** Hex-encoded discriminator. `None` matches every instruction in the program. */
   discriminator: option<string>,
-  /** Positional account names from the Borsh schema, in declared order.
-   `[]` means no schema is attached for this instruction. */
-  accounts: array<string>,
+  /** Positional account slots in declared order. `[]` means no schema is
+   attached for this instruction. */
+  accounts: array<svmAccountSlot>,
   /** Borsh args layout as `Vec<ArgDef>` JSON (see `human_config::svm::ArgDef`
-   on the Rust side). `JSON.Null` means no schema is attached. */
+   on the Rust side). `JSON.Null` attaches no decoder, so every matched call is
+   delivered with its payload raw. An array attaches one, `[]` included: a call
+   whose data the layout rejects is skipped. */
   args: JSON.t,
   /** Program-level nominal-type registry (`BTreeMap<String, ArgType>` JSON).
    Duplicated on every event of the same program — the runtime dedups by

package/src/Internal.res.mjs

@@ -174,6 +174,14 @@ function dependsOnAddresses(isWildcard, filterByAddresses) {
   }
 }
 
+function svmAccountSlotName(slot) {
+  if (typeof slot !== "object") {
+    return;
+  } else {
+    return slot._0;
+  }
+}
+
 function getItemChainId(item) {
   if (item.kind === 0) {
     return item.chainId;
@@ -334,6 +342,7 @@ export {
   unionFields,
   unionFieldSelection,
   dependsOnAddresses,
+  svmAccountSlotName,
   getItemChainId,
   fuelSupplyParamsSchema,
   fuelTransferParamsSchema,