envio 3.10.0 → 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)
 }));
@@ -538,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 {
@@ -572,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];
@@ -644,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;
@@ -877,7 +926,6 @@ function stripSensitiveData(json) {
         return;
       }
       Utils.Dict.deleteInPlace(chainJson, "rpcs");
-      Utils.Dict.deleteInPlace(chainJson, "rpc");
       Utils.Dict.deleteInPlace(chainJson, "hypersync");
     });
   };
@@ -1083,7 +1131,12 @@ export {
   rpcSourceForSchema,
   rpcConfigSchema,
   chainContractSchema,
+  startBlockOrThrow,
+  startBlockOrZero,
+  startBlockSchema,
   publicConfigChainSchema,
+  svmAccountSlotSchema,
+  svmAccountSlotFromItem,
   svmEventDescriptorSchema,
   svmAbiSchema,
   contractEventItemSchema,

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/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,

package/src/Main.res

@@ -126,7 +126,9 @@ let buildChainsObject = (~config: Config.t) => {
         get: () => {
           switch getInitialChainState(~chainId=chainConfig.id) {
           | Some(chainState) => chainState.startBlock
-          | None => chainConfig.startBlock
+          // Only before persistence is ready, which in a real run is before any
+          // handler module has loaded. The test indexer sits here for good.
+          | None => chainConfig->Config.startBlockOrZero
           }
         },
       },
@@ -589,6 +591,10 @@ let migrate = async (~reset) => {
     ~envioInfo=getEnvioInfo(),
     ~resetCommand="envio local db-migrate setup",
     ~runCommand=None,
+    ~lowercaseAddresses=config.lowercaseAddresses,
+    // A migration command runs once and exits, with nobody watching it recover:
+    // an unreachable chain should say so now rather than hold the command open.
+    ~startBlockRetry=StartBlockResolver.Once,
   )
   await persistence.storage.close()
 }
@@ -641,6 +647,7 @@ let start = async (
     ~envioInfo=getEnvioInfo(),
     ~resetCommand=isDevelopmentMode ? "envio dev -r" : "envio start -r",
     ~runCommand=Some(isDevelopmentMode ? "envio dev" : "envio start"),
+    ~lowercaseAddresses=config.lowercaseAddresses,
   )
 
   // Loads user handler files, which register handler/contractRegister/where

package/src/Main.res.mjs

@@ -130,7 +130,7 @@ function buildChainsObject(config) {
         if (chainState !== undefined) {
           return chainState.startBlock;
         } else {
-          return chainConfig.startBlock;
+          return Config.startBlockOrZero(chainConfig);
         }
       }
     }), "endBlock", {
@@ -467,7 +467,7 @@ function getEnvioInfo() {
 async function migrate(reset) {
   let config = Config.load();
   let persistence = PgStorage.makePersistenceFromConfig(config, undefined);
-  await Persistence.init(persistence, ChainMap.values(config.chainMap), config.contractMapping, Config.stripSensitiveData(Config.getPublicConfigJson()), "envio local db-migrate setup", undefined, reset);
+  await Persistence.init(persistence, ChainMap.values(config.chainMap), config.contractMapping, Config.stripSensitiveData(Config.getPublicConfigJson()), "envio local db-migrate setup", undefined, reset, config.lowercaseAddresses, "Once");
   return await persistence.storage.close();
 }
 
@@ -494,7 +494,7 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
   let isDevelopmentMode = !isTest && config.isDev;
   let persistence$1 = persistence !== undefined ? persistence : PgStorage.makePersistenceFromConfig(config, undefined);
   EnvioGlobal.value.persistence = Primitive_option.some(persistence$1);
-  await Persistence.init(persistence$1, ChainMap.values(config.chainMap), config.contractMapping, Config.stripSensitiveData(Config.getPublicConfigJson()), isDevelopmentMode ? "envio dev -r" : "envio start -r", isDevelopmentMode ? "envio dev" : "envio start", reset);
+  await Persistence.init(persistence$1, ChainMap.values(config.chainMap), config.contractMapping, Config.stripSensitiveData(Config.getPublicConfigJson()), isDevelopmentMode ? "envio dev -r" : "envio start -r", isDevelopmentMode ? "envio dev" : "envio start", reset, config.lowercaseAddresses, undefined);
   let registrationsByChainId = await HandlerLoader.registerAllHandlers(config);
   let config$1;
   if (isTest) {

package/src/Persistence.res

@@ -235,12 +235,14 @@ let make = (
 let init = {
   async (
     persistence,
-    ~chainConfigs,
+    ~chainConfigs: array<Config.chain>,
     ~contractMapping,
     ~envioInfo,
     ~resetCommand,
     ~runCommand,
     ~reset=false,
+    ~lowercaseAddresses=false,
+    ~startBlockRetry=StartBlockResolver.UntilItAnswers,
   ) => {
     try {
       let shouldRun = switch persistence.storageStatus {
@@ -259,6 +261,14 @@ let init = {
         persistence.storageStatus = Initializing(promise)
         if reset || !(await persistence.storage.isInitialized()) {
           Logging.info(`Initializing the indexer storage...`)
+          // Only runs once per schema (this branch is the "first deploy or
+          // reset" gate), which is exactly when a `latest` start block must be
+          // resolved: every later resume reads `envio_chains.start_block` back
+          // verbatim instead of re-running this.
+          let chainConfigs = await chainConfigs->StartBlockResolver.resolveAllOrThrow(
+            ~lowercaseAddresses,
+            ~retry=startBlockRetry,
+          )
           let initialState = await persistence.storage.initialize(
             ~entities=persistence.allEntities,
             ~enums=persistence.allEnums,

package/src/Persistence.res.mjs

@@ -5,6 +5,7 @@ import * as Logging from "./Logging.res.mjs";
 import * as EntityHistory from "./db/EntityHistory.res.mjs";
 import * as ErrorHandling from "./ErrorHandling.res.mjs";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
+import * as StartBlockResolver from "./sources/StartBlockResolver.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 
 let StorageError = /* @__PURE__ */Primitive_exceptions.create("Persistence.StorageError");
@@ -20,8 +21,10 @@ function make(userEntities, allEnums, storage) {
   };
 }
 
-async function init(persistence, chainConfigs, contractMapping, envioInfo, resetCommand, runCommand, resetOpt) {
+async function init(persistence, chainConfigs, contractMapping, envioInfo, resetCommand, runCommand, resetOpt, lowercaseAddressesOpt, startBlockRetryOpt) {
   let reset = resetOpt !== undefined ? resetOpt : false;
+  let lowercaseAddresses = lowercaseAddressesOpt !== undefined ? lowercaseAddressesOpt : false;
+  let startBlockRetry = startBlockRetryOpt !== undefined ? startBlockRetryOpt : "UntilItAnswers";
   try {
     let promise = persistence.storageStatus;
     let shouldRun;
@@ -48,7 +51,8 @@ async function init(persistence, chainConfigs, contractMapping, envioInfo, reset
     };
     if (reset || !await persistence.storage.isInitialized()) {
       Logging.info(`Initializing the indexer storage...`);
-      let initialState = await persistence.storage.initialize(chainConfigs, persistence.allEntities, persistence.allEnums, contractMapping, envioInfo);
+      let chainConfigs$1 = await StartBlockResolver.resolveAllOrThrow(chainConfigs, lowercaseAddresses, startBlockRetry, undefined, undefined);
+      let initialState = await persistence.storage.initialize(chainConfigs$1, persistence.allEntities, persistence.allEnums, contractMapping, envioInfo);
       Logging.info(`The indexer storage is ready. Starting indexing!`);
       persistence.storageStatus = {
         TAG: "Ready",

package/src/PgStorage.res

@@ -1917,7 +1917,7 @@ let make = (
         idx,
       ): Persistence.initialChainState => {
         id: chainConfig.id,
-        startBlock: chainConfig.startBlock,
+        startBlock: chainConfig->Config.startBlockOrThrow,
         endBlock: chainConfig.endBlock,
         maxReorgDepth: chainConfig.maxReorgDepth,
         progressBlockNumber: -1,

package/src/PgStorage.res.mjs

@@ -1161,7 +1161,7 @@ function make(sql, pgHost, pgSchema, pgPort, pgUser, pgDatabase, pgPassword, isH
       cache: cache,
       chains: chainConfigs.map((chainConfig, idx) => ({
         id: chainConfig.id,
-        startBlock: chainConfig.startBlock,
+        startBlock: Config.startBlockOrThrow(chainConfig),
         endBlock: chainConfig.endBlock,
         maxReorgDepth: chainConfig.maxReorgDepth,
         progressBlockNumber: -1,

package/src/SimulateItems.res

@@ -299,7 +299,7 @@ let parse = (
   ~onEventRegistrations: array<Internal.onEventRegistration>,
 ): parseResult => {
   let chainId = chainConfig.id
-  let startBlock = chainConfig.startBlock
+  let startBlock = chainConfig->Config.startBlockOrZero
   let currentBlock = ref(startBlock)
   let currentLogIndex = ref(0)
 
@@ -358,15 +358,22 @@ let parse = (
       let path = item.path->Option.getOr([0])
       let programId =
         item.programId->Option.getOr(svmEventConfig.programId->SvmTypes.Pubkey.toString)
+      // `accountArguments` is the list the call carries, so it stands as
+      // written: a short one leaves the later slots absent, the way a
+      // truncated instruction reads from chain. Named accounts speak about
+      // some slots instead, so they go back onto their declared positions and
+      // a slot the item leaves out carries the program id — chain's own
+      // stand-in for an absent account, which reads back as absent for an
+      // optional slot and as the program for a required one.
       let accountArguments = switch item.accountArguments {
       | Some(args) => args
       | None =>
         switch item.accounts {
         | Some(named) =>
-          svmEventConfig.accounts->Array.map(name =>
-            switch named->Dict.get(name) {
-            | Some({address}) => address
-            | None => ""
+          svmEventConfig.accounts->Array.map(slot =>
+            switch slot->Internal.svmAccountSlotName {
+            | None => programId
+            | Some(name) => named->Dict.get(name)->Option.mapOr(programId, ({address}) => address)
             }
           )
         | None => []
@@ -695,7 +702,7 @@ let patchConfig = (
           let endBlock: int = raw["endBlock"]->(Utils.magic: 'a => int)
           // Parse with the process's startBlock so items default into the range
           // the source will be queried over; the source now filters by range.
-          let chainConfig = {...chainConfig, startBlock, endBlock}
+          let chainConfig = {...chainConfig, startBlock: Config.Block(startBlock), endBlock}
           let {items, transactionStore, blockStore} = parse(
             ~simulateItems,
             ~config,

package/src/SimulateItems.res.mjs

@@ -5,6 +5,7 @@ import * as Config from "./Config.res.mjs";
 import * as Address from "./Address.res.mjs";
 import * as ChainId from "./ChainId.res.mjs";
 import * as ChainMap from "./ChainMap.res.mjs";
+import * as Internal from "./Internal.res.mjs";
 import * as BlockStore from "./sources/BlockStore.res.mjs";
 import * as Stdlib_Null from "@rescript/runtime/lib/es6/Stdlib_Null.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -184,7 +185,7 @@ function liveRegistrationsFor(config, chainId, eventConfig) {
 
 function parse(simulateItems, config, chainConfig, onEventRegistrations) {
   let chainId = chainConfig.id;
-  let startBlock = chainConfig.startBlock;
+  let startBlock = Config.startBlockOrZero(chainConfig);
   let currentBlock = {
     contents: startBlock
   };
@@ -236,12 +237,12 @@ function parse(simulateItems, config, chainConfig, onEventRegistrations) {
           accountArguments = args;
         } else {
           let named = rawJson.accounts;
-          accountArguments = named !== undefined ? eventConfig.accounts.map(name => {
-              let match = named[name];
-              if (match !== undefined) {
-                return match.address;
+          accountArguments = named !== undefined ? eventConfig.accounts.map(slot => {
+              let name = Internal.svmAccountSlotName(slot);
+              if (name !== undefined) {
+                return Stdlib_Option.mapOr(named[name], programId, param => param.address);
               } else {
-                return "";
+                return programId;
               }
             }) : [];
         }

package/src/TestIndexer.res

@@ -355,13 +355,14 @@ let parseBlockRange = (
     JsError.throwWithMessage(`Chain ${chainIdStr} is not configured in config.yaml`)
   }
   let configChain = config.chainMap->ChainMap.get(chain)
+  let configStartBlock = configChain->Config.startBlockOrZero
 
   let startBlock = switch rawChainConfig.startBlock {
   | Some(sb) => sb
   | None =>
     switch progressBlock {
     | Some(prevEndBlock) => prevEndBlock + 1
-    | None => configChain.startBlock
+    | None => configStartBlock
     }
   }
 
@@ -378,10 +379,10 @@ let parseBlockRange = (
   | None => None // auto-exit mode: will fetch first block with events and exit
   }
 
-  if startBlock < configChain.startBlock {
+  if startBlock < configStartBlock {
     JsError.throwWithMessage(
-      `Invalid block range for chain ${chainIdStr}: startBlock (${startBlock->Int.toString}) is less than config.startBlock (${configChain.startBlock->Int.toString}). ` ++
-      `Either use startBlock >= ${configChain.startBlock->Int.toString} or create a new test indexer with createTestIndexer().`,
+      `Invalid block range for chain ${chainIdStr}: startBlock (${startBlock->Int.toString}) is less than config.startBlock (${configStartBlock->Int.toString}). ` ++
+      `Either use startBlock >= ${configStartBlock->Int.toString} or create a new test indexer with createTestIndexer().`,
     )
   }
 
@@ -754,7 +755,7 @@ let createTestIndexer = (): t<'processConfig> => {
     ->Utils.Object.definePropertyWithValue("id", {enumerable: true, value: chainConfig.id})
     ->Utils.Object.definePropertyWithValue(
       "startBlock",
-      {enumerable: true, value: chainConfig.startBlock},
+      {enumerable: true, value: chainConfig->Config.startBlockOrZero},
     )
     ->Utils.Object.definePropertyWithValue(
       "endBlock",