envio 3.10.0-subgraph → 3.11.0

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

package/src/TestIndexer.res.mjs

@@ -268,16 +268,17 @@ function parseBlockRange(chainIdStr, config, rawChainConfig, progressBlock) {
     Stdlib_JsError.throwWithMessage(`Chain ` + chainIdStr + ` is not configured in config.yaml`);
   }
   let configChain = ChainMap.get(config.chainMap, chain);
+  let configStartBlock = Config.startBlockOrZero(configChain);
   let sb = rawChainConfig.startBlock;
   let startBlock = sb !== undefined ? sb : (
-      progressBlock !== undefined ? progressBlock + 1 | 0 : configChain.startBlock
+      progressBlock !== undefined ? progressBlock + 1 | 0 : configStartBlock
     );
   let eb = rawChainConfig.endBlock;
   let endBlock = eb !== undefined ? eb : (
       Stdlib_Option.isSome(rawChainConfig.simulate) ? getSimulateEndBlock(Stdlib_Option.getOrThrow(rawChainConfig.simulate, undefined), config, startBlock) : undefined
     );
-  if (startBlock < configChain.startBlock) {
-    Stdlib_JsError.throwWithMessage(`Invalid block range for chain ` + chainIdStr + `: startBlock (` + startBlock.toString() + `) is less than config.startBlock (` + configChain.startBlock.toString() + `). ` + (`Either use startBlock >= ` + configChain.startBlock.toString() + ` or create a new test indexer with createTestIndexer().`));
+  if (startBlock < configStartBlock) {
+    Stdlib_JsError.throwWithMessage(`Invalid block range for chain ` + chainIdStr + `: startBlock (` + startBlock.toString() + `) is less than config.startBlock (` + configStartBlock.toString() + `). ` + (`Either use startBlock >= ` + configStartBlock.toString() + ` or create a new test indexer with createTestIndexer().`));
   }
   let match = configChain.endBlock;
   if (endBlock !== undefined && match !== undefined && endBlock > match) {
@@ -480,7 +481,7 @@ function createTestIndexer() {
       value: chainConfig.id
     }), "startBlock", {
       enumerable: true,
-      value: chainConfig.startBlock
+      value: Config.startBlockOrZero(chainConfig)
     }), "endBlock", {
       enumerable: true,
       value: chainConfig.endBlock